diff options
| -rw-r--r-- | wm/jwm/Makefile | 10 | ||||
| -rw-r--r-- | wm/jwm/distinfo | 12 | ||||
| -rw-r--r-- | wm/jwm/options.mk | 3 | ||||
| -rw-r--r-- | wm/jwm/patches/patch-aa | 30 | ||||
| -rw-r--r-- | wm/jwm/patches/patch-ab | 10 |
5 files changed, 32 insertions, 33 deletions
diff --git a/wm/jwm/Makefile b/wm/jwm/Makefile index f897cbfba64..4b9c76535e5 100644 --- a/wm/jwm/Makefile +++ b/wm/jwm/Makefile @@ -1,12 +1,10 @@ -# $NetBSD: Makefile,v 1.24 2013/06/06 12:55:09 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2014/01/19 15:27:16 tsutsui Exp $ # -DISTNAME= jwm-2.1.0 -PKGREVISION= 4 +DISTNAME= jwm-2.2.0 CATEGORIES= wm x11 -MASTER_SITES= http://www.joewing.net/programs/jwm/releases/ \ - ${MASTER_SITE_SOURCEFORGE:=jwm/} -EXTRACT_SUFX= .tar.bz2 +MASTER_SITES= http://www.joewing.net/programs/jwm/releases/ +EXTRACT_SUFX= .tar.xz MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.joewing.net/programs/jwm/ diff --git a/wm/jwm/distinfo b/wm/jwm/distinfo index fc07cf5884e..dc01b9320b2 100644 --- a/wm/jwm/distinfo +++ b/wm/jwm/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.6 2012/05/20 06:42:01 tsutsui Exp $ +$NetBSD: distinfo,v 1.7 2014/01/19 15:27:16 tsutsui Exp $ -SHA1 (jwm-2.1.0.tar.bz2) = 5b7973d8b3621087485b6e14be23693e92f21628 -RMD160 (jwm-2.1.0.tar.bz2) = 1977e14b1acfadec759de3c227860b063d166be8 -Size (jwm-2.1.0.tar.bz2) = 163590 bytes -SHA1 (patch-aa) = 35d60f56211d7ca6b116e89feb5c45447083aa9f -SHA1 (patch-ab) = e8684d4e7245d86f4d24e769db407d2ff304f90b +SHA1 (jwm-2.2.0.tar.xz) = bf492c6c2c6413512e17a6eb4b41ba8eff52f59d +RMD160 (jwm-2.2.0.tar.xz) = 43b738d256584cf085d55eb76651f7a75c534830 +Size (jwm-2.2.0.tar.xz) = 281136 bytes +SHA1 (patch-aa) = 49509dcc4c24c30ce8e01088d3ab1fedb50b31f9 +SHA1 (patch-ab) = 2f71f1c641b244e8689c71e938d8372f47260911 diff --git a/wm/jwm/options.mk b/wm/jwm/options.mk index 7a0fb2c2c88..9456bec2358 100644 --- a/wm/jwm/options.mk +++ b/wm/jwm/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2010/12/23 11:44:57 dsainty Exp $ +# $NetBSD: options.mk,v 1.5 2014/01/19 15:27:16 tsutsui Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.jwm PKG_SUPPORTED_OPTIONS= debug fribidi jpeg png @@ -12,6 +12,7 @@ CONFIGURE_ARGS+= --enable-debug .if !empty(PKG_OPTIONS:Mfribidi) .include "../../converters/fribidi/buildlink3.mk" +BUILDLINK_API_DEPENDS.fribidi+= fribidi>=0.19.2 .endif .if !empty(PKG_OPTIONS:Mjpeg) diff --git a/wm/jwm/patches/patch-aa b/wm/jwm/patches/patch-aa index 742ebac6166..98dbd607068 100644 --- a/wm/jwm/patches/patch-aa +++ b/wm/jwm/patches/patch-aa @@ -1,26 +1,26 @@ -$NetBSD: patch-aa,v 1.3 2012/05/20 06:42:01 tsutsui Exp $ +$NetBSD: patch-aa,v 1.4 2014/01/19 15:27:16 tsutsui Exp $ ---- Makefile.in.orig 2011-09-25 22:28:02.000000000 +0000 +--- Makefile.in.orig 2014-01-05 15:06:33.000000000 +0000 +++ Makefile.in @@ -1,5 +1,5 @@ - --SYSCONF = @SYSCONF@ -+SYSCONF = @@EGDIR@@ - MANDIR = @MANDIR@ + PACKAGE = jwm +-SYSCONF = $(DESTDIR)@SYSCONF@ ++SYSCONF = $(DESTDIR)@@EGDIR@@ + MANDIR = $(DESTDIR)@MANDIR@ VERSION ?= @VERSION@ - -@@ -8,10 +8,10 @@ all: - + USE_NLS = @USE_NLS@ +@@ -11,10 +11,10 @@ all: install: all cd src ; $(MAKE) install ; cd .. -- install -d $(SYSCONF) + cd po ; $(MAKE) install ; cd .. +- install -d -m 0755 $(SYSCONF) - install -m 644 example.jwmrc $(SYSCONF)/system.jwmrc -- install -d $(MANDIR)/man1 +- install -d -m 0755 $(MANDIR)/man1 - install -m 644 jwm.1 $(MANDIR)/man1/jwm.1 -+ ${BSD_INSTALL_DATA_DIR} ${DESTDIR}$(SYSCONF) -+ ${BSD_INSTALL_DATA} example.jwmrc ${DESTDIR}$(SYSCONF)/system.jwmrc -+ ${BSD_INSTALL_MAN_DIR} ${DESTDIR}$(MANDIR)/man1 -+ ${BSD_INSTALL_MAN} jwm.1 ${DESTDIR}$(MANDIR)/man1/jwm.1 ++ ${BSD_INSTALL_DATA_DIR} $(SYSCONF) ++ ${BSD_INSTALL_DATA} example.jwmrc $(SYSCONF)/system.jwmrc ++ ${BSD_INSTALL_MAN_DIR} $(MANDIR)/man1 ++ ${BSD_INSTALL_MAN} jwm.1 $(MANDIR)/man1/jwm.1 depend: cd src ; $(MAKE) depend diff --git a/wm/jwm/patches/patch-ab b/wm/jwm/patches/patch-ab index c5ab27b07b9..cba413ddcdf 100644 --- a/wm/jwm/patches/patch-ab +++ b/wm/jwm/patches/patch-ab @@ -1,15 +1,15 @@ -$NetBSD: patch-ab,v 1.3 2009/07/07 19:39:56 joerg Exp $ +$NetBSD: patch-ab,v 1.4 2014/01/19 15:27:16 tsutsui Exp $ ---- src/Makefile.in.orig 2009-07-07 21:38:19.000000000 +0200 +--- src/Makefile.in.orig 2014-01-05 15:06:33.000000000 +0000 +++ src/Makefile.in -@@ -20,9 +20,7 @@ EXE = jwm +@@ -22,9 +22,7 @@ EXE = jwm all: $(EXE) install: all -- strip $(EXE) - install -d $(BINDIR) - install $(EXE) $(BINDIR)/$(EXE) -+ ${BSD_INSTALL_PROGRAM} $(EXE) ${DESTDIR}$(BINDIR)/$(EXE) +- strip $(BINDIR)/$(EXE) ++ ${BSD_INSTALL_PROGRAM} $(EXE) $(BINDIR)/$(EXE) depend: makedepend -m -DMAKE_DEPEND -- $(CFLAGS) -- *.c |