CVS commit: pkgsrc/x11/matchbox-panel

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu May 11 15:09:14 UTC 2017

Modified Files:
        pkgsrc/x11/matchbox-panel: Makefile distinfo
Added Files:
        pkgsrc/x11/matchbox-panel/patches: patch-po_Makefile.in

Log Message:
Use PKGLOCALEDIR.  Fix build on SunOS.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/x11/matchbox-panel/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/matchbox-panel/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/matchbox-panel/patches/patch-po_Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/matchbox-panel/Makefile
diff -u pkgsrc/x11/matchbox-panel/Makefile:1.31 pkgsrc/x11/matchbox-panel/Makefile:1.32
--- pkgsrc/x11/matchbox-panel/Makefile:1.31     Sun Feb 16 01:36:31 2014
+++ pkgsrc/x11/matchbox-panel/Makefile  Thu May 11 15:09:14 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2014/02/16 01:36:31 wiedi Exp $
+# $NetBSD: Makefile,v 1.32 2017/05/11 15:09:14 jperkin Exp $
 #
 
 DISTNAME=              matchbox-panel-0.9.2
@@ -23,11 +23,13 @@ CONFIGURE_ARGS+=    --enable-nls
 
 CFLAGS.SunOS+=         -Du_int64_t=uint64_t
 
+MAKE_ENV+=             PKGLOCALEDIR=${PKGLOCALEDIR}
+
 .include "../../mk/bsd.prefs.mk"
 
 PLIST_VARS=            apm
-.if ${OPSYS} == "DragonFly" || \
-    ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "x86_64"
+.if ${OPSYS} == "DragonFly" || ${OPSYS} == "SunOS" || \
+    (${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "x86_64")
 # Nada
 .else
 PLIST.apm=             yes

Index: pkgsrc/x11/matchbox-panel/distinfo
diff -u pkgsrc/x11/matchbox-panel/distinfo:1.3 pkgsrc/x11/matchbox-panel/distinfo:1.4
--- pkgsrc/x11/matchbox-panel/distinfo:1.3      Wed Nov  4 03:28:49 2015
+++ pkgsrc/x11/matchbox-panel/distinfo  Thu May 11 15:09:14 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2015/11/04 03:28:49 agc Exp $
+$NetBSD: distinfo,v 1.4 2017/05/11 15:09:14 jperkin Exp $
 
 SHA1 (matchbox-panel-0.9.2.tar.bz2) = 438830e4f4bd59e953f1c131939a2081c0b6ec95
 RMD160 (matchbox-panel-0.9.2.tar.bz2) = 65e5849c04433354cae645af05aff7f6dd9e21e2
@@ -8,3 +8,4 @@ SHA1 (patch-aa) = 58b5fd75675823bd3b8d74
 SHA1 (patch-ab) = 344b035bc716fad713d70f2e64578b2792799ebb
 SHA1 (patch-ae) = f3581aa0621b82f62f26d2b248ac68316b243832
 SHA1 (patch-af) = 994f4097ca63201a7606b75bcca52b366172cf85
+SHA1 (patch-po_Makefile.in) = ad88b17cb60c3cc4a7edc20035915b1b4901f9a9

Added files:

Index: pkgsrc/x11/matchbox-panel/patches/patch-po_Makefile.in
diff -u /dev/null pkgsrc/x11/matchbox-panel/patches/patch-po_Makefile.in:1.1
--- /dev/null   Thu May 11 15:09:14 2017
+++ pkgsrc/x11/matchbox-panel/patches/patch-po_Makefile.in      Thu May 11 15:09:14 2017
@@ -0,0 +1,28 @@
+$NetBSD: patch-po_Makefile.in,v 1.1 2017/05/11 15:09:14 jperkin Exp $
+
+Use PKGLOCALEDIR.
+
+--- po/Makefile.in.orig        2005-04-11 09:18:54.000000000 +0000
++++ po/Makefile.in
+@@ -324,15 +324,15 @@ update.po: matchbox.pot
+       done
+ 
+ install-data-local:  $(CATALOGS)
+-      $(mkinstalldirs) $(DESTDIR)$(datadir)/locale
+-      chmod 755 $(DESTDIR)$(datadir)/locale 
++      $(mkinstalldirs) $(DESTDIR)$(PREFIX)/$(PKGLOCALEDIR)/locale
++      chmod 755 $(DESTDIR)$(PREFIX)/$(PKGLOCALEDIR)/locale 
+       for n in $(CATALOGS) __DuMmY ; do \
+               if test "$$n" -a "$$n" != "__DuMmY" ; then \
+                       l=`basename $$n .mo`; \
+-                      $(mkinstalldirs) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES; \
+-                      chmod 755 $(DESTDIR)$(datadir)/locale/$$l; \
+-                      chmod 755 $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES; \
+-                      $(INSTALL_DATA) -m 644 $$n $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/matchbox-panel.mo; \
++                      $(mkinstalldirs) $(DESTDIR)$(PREFIX)/$(PKGLOCALEDIR)/locale/$$l/LC_MESSAGES; \
++                      chmod 755 $(DESTDIR)$(PREFIX)/$(PKGLOCALEDIR)/locale/$$l; \
++                      chmod 755 $(DESTDIR)$(PREFIX)/$(PKGLOCALEDIR)/locale/$$l/LC_MESSAGES; \
++                      $(INSTALL_DATA) -m 644 $$n $(DESTDIR)$(PREFIX)/$(PKGLOCALEDIR)/locale/$$l/LC_MESSAGES/matchbox-panel.mo; \
+               fi; \
+       done
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.