diff options
Diffstat (limited to 'wm')
| -rw-r--r-- | wm/jwm/Makefile | 11 | ||||
| -rw-r--r-- | wm/jwm/distinfo | 14 | ||||
| -rw-r--r-- | wm/jwm/patches/patch-Makefile.in (renamed from wm/jwm/patches/patch-aa) | 15 | ||||
| -rw-r--r-- | wm/jwm/patches/patch-ab | 15 | ||||
| -rw-r--r-- | wm/jwm/patches/patch-src_Makefile.in | 16 |
5 files changed, 40 insertions, 31 deletions
diff --git a/wm/jwm/Makefile b/wm/jwm/Makefile index e2956414654..cd91ca943a2 100644 --- a/wm/jwm/Makefile +++ b/wm/jwm/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.26 2014/06/01 14:28:16 tsutsui Exp $ +# $NetBSD: Makefile,v 1.27 2015/12/13 15:02:36 tsutsui Exp $ # -DISTNAME= jwm-2.2.2 +DISTNAME= jwm-2.3.4 CATEGORIES= wm x11 MASTER_SITES= http://www.joewing.net/programs/jwm/releases/ EXTRACT_SUFX= .tar.xz -MAINTAINER= pkgsrc-users@NetBSD.org +MAINTAINER= tsutsui@NetBSD.org HOMEPAGE= http://www.joewing.net/programs/jwm/ COMMENT= Lightweight window manager with virtual desktops LICENSE= gnu-gpl-v2 @@ -29,6 +29,11 @@ SUBST_STAGE.egdir= pre-configure SUBST_FILES.egdir= Makefile.in SUBST_SED.egdir= -e 's,@@EGDIR@@,${EGDIR},g' +SUBST_CLASSES+= icondir +SUBST_STAGE.icondir= post-patch +SUBST_FILES.icondir= example.jwmrc +SUBST_SED.icondir= -e 's|/usr/share/icons|${PREFIX}/share/icons|g' + PKG_SYSCONFSUBDIR= jwm EGDIR= ${PREFIX}/share/examples/jwm CONF_FILES= ${EGDIR}/system.jwmrc ${PKG_SYSCONFDIR}/system.jwmrc diff --git a/wm/jwm/distinfo b/wm/jwm/distinfo index 06a5aee868c..80daa508f19 100644 --- a/wm/jwm/distinfo +++ b/wm/jwm/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.9 2015/11/02 23:42:52 agc Exp $ +$NetBSD: distinfo,v 1.10 2015/12/13 15:02:36 tsutsui Exp $ -SHA1 (jwm-2.2.2.tar.xz) = a3c41acef393c9cba9a2ab9bf227ec0673586335 -RMD160 (jwm-2.2.2.tar.xz) = bb073fae04e5d9273aefab49e1777de6f0dcc5ab -SHA512 (jwm-2.2.2.tar.xz) = 327a4d282fddfa032b1b8c82da76cbf60c019f8b8aa80c22402f8bf9f27af81720a5e4c4e506b980bbe8f546e104c73a504bd999d52106513e7bd0de0756dc34 -Size (jwm-2.2.2.tar.xz) = 283884 bytes -SHA1 (patch-aa) = 49509dcc4c24c30ce8e01088d3ab1fedb50b31f9 -SHA1 (patch-ab) = 2f71f1c641b244e8689c71e938d8372f47260911 +SHA1 (jwm-2.3.4.tar.xz) = c37458ba5f5b676c2c374c45da5abe3e3c78246c +RMD160 (jwm-2.3.4.tar.xz) = a1b244c1a2cd4266b000939460a841c73f103cb7 +SHA512 (jwm-2.3.4.tar.xz) = db9f46ced4b1f8128673b551cd865b6c9b6c8d43f839cfe898168251e8326d402a510ce77144273488c1e65a96d66e16124e4b4749a5a96a9057c1eb20c2bee1 +Size (jwm-2.3.4.tar.xz) = 332140 bytes +SHA1 (patch-Makefile.in) = a458542a4c5330b4d2d3272b625943471830c968 +SHA1 (patch-src_Makefile.in) = db9b310a04e0542fbbacaba7633bfd0a286d778c diff --git a/wm/jwm/patches/patch-aa b/wm/jwm/patches/patch-Makefile.in index 98dbd607068..effa9a43185 100644 --- a/wm/jwm/patches/patch-aa +++ b/wm/jwm/patches/patch-Makefile.in @@ -1,6 +1,9 @@ -$NetBSD: patch-aa,v 1.4 2014/01/19 15:27:16 tsutsui Exp $ +$NetBSD: patch-Makefile.in,v 1.1 2015/12/13 15:02:36 tsutsui Exp $ ---- Makefile.in.orig 2014-01-05 15:06:33.000000000 +0000 +- put config files into the example dir +- use pkgsrc INSTALL_MACROS + +--- Makefile.in.orig 2015-11-22 20:29:54.000000000 +0000 +++ Makefile.in @@ -1,5 +1,5 @@ PACKAGE = jwm @@ -11,8 +14,8 @@ $NetBSD: patch-aa,v 1.4 2014/01/19 15:27:16 tsutsui Exp $ USE_NLS = @USE_NLS@ @@ -11,10 +11,10 @@ all: install: all - cd src ; $(MAKE) install ; cd .. - cd po ; $(MAKE) install ; cd .. + $(MAKE) -C src install + $(MAKE) -C po install - install -d -m 0755 $(SYSCONF) - install -m 644 example.jwmrc $(SYSCONF)/system.jwmrc - install -d -m 0755 $(MANDIR)/man1 @@ -22,5 +25,5 @@ $NetBSD: patch-aa,v 1.4 2014/01/19 15:27:16 tsutsui Exp $ + ${BSD_INSTALL_MAN_DIR} $(MANDIR)/man1 + ${BSD_INSTALL_MAN} jwm.1 $(MANDIR)/man1/jwm.1 - depend: - cd src ; $(MAKE) depend + install-strip: all install-conf + $(MAKE) -C src install-strip diff --git a/wm/jwm/patches/patch-ab b/wm/jwm/patches/patch-ab deleted file mode 100644 index cba413ddcdf..00000000000 --- a/wm/jwm/patches/patch-ab +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ab,v 1.4 2014/01/19 15:27:16 tsutsui Exp $ - ---- src/Makefile.in.orig 2014-01-05 15:06:33.000000000 +0000 -+++ src/Makefile.in -@@ -22,9 +22,7 @@ EXE = jwm - all: $(EXE) - - install: all -- install -d $(BINDIR) -- install $(EXE) $(BINDIR)/$(EXE) -- strip $(BINDIR)/$(EXE) -+ ${BSD_INSTALL_PROGRAM} $(EXE) $(BINDIR)/$(EXE) - - depend: - makedepend -m -DMAKE_DEPEND -- $(CFLAGS) -- *.c diff --git a/wm/jwm/patches/patch-src_Makefile.in b/wm/jwm/patches/patch-src_Makefile.in new file mode 100644 index 00000000000..78f350f8149 --- /dev/null +++ b/wm/jwm/patches/patch-src_Makefile.in @@ -0,0 +1,16 @@ +$NetBSD: patch-src_Makefile.in,v 1.1 2015/12/13 15:02:36 tsutsui Exp $ + +- use pkgsrc INSTALL_MACROS + +--- src/Makefile.in.orig 2015-11-22 20:29:54.000000000 +0000 ++++ src/Makefile.in +@@ -21,8 +21,7 @@ EXE = jwm + all: $(EXE) + + install: all +- install -d $(BINDIR) +- install $(EXE) $(BINDIR)/$(EXE) ++ ${BSD_INSTALL_PROGRAM} $(EXE) $(BINDIR)/$(EXE) + + install-strip: install + strip $(BINDIR)/$(EXE) |