diff options
| author | jperkin <jperkin@pkgsrc.org> | 2017-05-11 15:09:14 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2017-05-11 15:09:14 +0000 |
| commit | 68a402d1465f2bf29337238ef9061eceb59b8463 (patch) | |
| tree | dd7e8403c4e7223b7e609a8390b738bdd0f71ce5 | |
| parent | a3af29aaa41790e1fadb50ca6e2967cdacbac539 (diff) | |
| download | pkgsrc-68a402d1465f2bf29337238ef9061eceb59b8463.tar.gz | |
Use PKGLOCALEDIR. Fix build on SunOS.
| -rw-r--r-- | x11/matchbox-panel/Makefile | 8 | ||||
| -rw-r--r-- | x11/matchbox-panel/distinfo | 3 | ||||
| -rw-r--r-- | x11/matchbox-panel/patches/patch-po_Makefile.in | 28 |
3 files changed, 35 insertions, 4 deletions
diff --git a/x11/matchbox-panel/Makefile b/x11/matchbox-panel/Makefile index 1d2b3b10ae5..94776e5e954 100644 --- a/x11/matchbox-panel/Makefile +++ b/x11/matchbox-panel/Makefile @@ -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 diff --git a/x11/matchbox-panel/distinfo b/x11/matchbox-panel/distinfo index e5cc7a78f15..18b0121294a 100644 --- a/x11/matchbox-panel/distinfo +++ b/x11/matchbox-panel/distinfo @@ -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) = 58b5fd75675823bd3b8d74e5c782aac146902d26 SHA1 (patch-ab) = 344b035bc716fad713d70f2e64578b2792799ebb SHA1 (patch-ae) = f3581aa0621b82f62f26d2b248ac68316b243832 SHA1 (patch-af) = 994f4097ca63201a7606b75bcca52b366172cf85 +SHA1 (patch-po_Makefile.in) = ad88b17cb60c3cc4a7edc20035915b1b4901f9a9 diff --git a/x11/matchbox-panel/patches/patch-po_Makefile.in b/x11/matchbox-panel/patches/patch-po_Makefile.in new file mode 100644 index 00000000000..2628009cf9f --- /dev/null +++ b/x11/matchbox-panel/patches/patch-po_Makefile.in @@ -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. |