summaryrefslogtreecommitdiff
path: root/wm
diff options
context:
space:
mode:
authorjoerg <joerg>2009-07-07 19:39:55 +0000
committerjoerg <joerg>2009-07-07 19:39:55 +0000
commit665f4ec212e89eb4920495b99ea7bb8d1d1a492e (patch)
tree646e11b31ec5d0c6814dd68834c8bc48103b96f0 /wm
parent4efbf9c1698da9158296b86bb6be24e0b7692fa8 (diff)
downloadpkgsrc-665f4ec212e89eb4920495b99ea7bb8d1d1a492e.tar.gz
user-destdir support
Diffstat (limited to 'wm')
-rw-r--r--wm/jwm/Makefile6
-rw-r--r--wm/jwm/distinfo5
-rw-r--r--wm/jwm/patches/patch-aa10
-rw-r--r--wm/jwm/patches/patch-ab15
4 files changed, 28 insertions, 8 deletions
diff --git a/wm/jwm/Makefile b/wm/jwm/Makefile
index d04d16332c1..aac5ce10638 100644
--- a/wm/jwm/Makefile
+++ b/wm/jwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2009/03/21 16:29:45 darcy Exp $
+# $NetBSD: Makefile,v 1.12 2009/07/07 19:39:55 joerg Exp $
#
DISTNAME= jwm-2.0.1
@@ -11,6 +11,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.joewing.net/programs/jwm/
COMMENT= Lightweight window manager with virtual desktops
+PKG_DESTDIR_SUPPORT= user-destdir
+
GNU_CONFIGURE= yes
.include "../../mk/bsd.prefs.mk"
@@ -31,6 +33,8 @@ PKG_SYSCONFSUBDIR= jwm
EGDIR= ${PREFIX}/share/examples/jwm
CONF_FILES= ${EGDIR}/system.jwmrc ${PKG_SYSCONFDIR}/system.jwmrc
+INSTALLATION_DIRS= bin
+
.include "options.mk"
BUILDLINK_DEPMETHOD.libXt?= build
diff --git a/wm/jwm/distinfo b/wm/jwm/distinfo
index 1882abfcad4..87d0e49da83 100644
--- a/wm/jwm/distinfo
+++ b/wm/jwm/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.4 2008/06/17 00:00:30 abs Exp $
+$NetBSD: distinfo,v 1.5 2009/07/07 19:39:55 joerg Exp $
SHA1 (jwm-2.0.1.tar.bz2) = 209bc5e8c41f6a827d38a9b365405a2dc9bef082
RMD160 (jwm-2.0.1.tar.bz2) = 84d16886056e77abd65717852df1530cebb6817b
Size (jwm-2.0.1.tar.bz2) = 248607 bytes
-SHA1 (patch-aa) = ac33481d7e4d081960977a05f87c698865d19c63
+SHA1 (patch-aa) = b4ab344c6cc3079ad5b8d9badcf57995c3dca20f
+SHA1 (patch-ab) = e8684d4e7245d86f4d24e769db407d2ff304f90b
diff --git a/wm/jwm/patches/patch-aa b/wm/jwm/patches/patch-aa
index af722204fd9..7996cdb208a 100644
--- a/wm/jwm/patches/patch-aa
+++ b/wm/jwm/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/08/04 01:08:21 reed Exp $
+$NetBSD: patch-aa,v 1.2 2009/07/07 19:39:56 joerg Exp $
--- Makefile.in.orig 2005-11-21 04:02:12.000000000 +0000
+++ Makefile.in
@@ -17,10 +17,10 @@ $NetBSD: patch-aa,v 1.1.1.1 2006/08/04 01:08:21 reed Exp $
- install -m 644 example.jwmrc $(SYSCONF)/system.jwmrc
- install -d $(MANDIR)/man1
- install -m 644 jwm.1 $(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
++ ${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
depend:
cd src ; $(MAKE) depend
diff --git a/wm/jwm/patches/patch-ab b/wm/jwm/patches/patch-ab
new file mode 100644
index 00000000000..c5ab27b07b9
--- /dev/null
+++ b/wm/jwm/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.3 2009/07/07 19:39:56 joerg Exp $
+
+--- src/Makefile.in.orig 2009-07-07 21:38:19.000000000 +0200
++++ src/Makefile.in
+@@ -20,9 +20,7 @@ EXE = jwm
+ all: $(EXE)
+
+ install: all
+- strip $(EXE)
+- install -d $(BINDIR)
+- install $(EXE) $(BINDIR)/$(EXE)
++ ${BSD_INSTALL_PROGRAM} $(EXE) ${DESTDIR}$(BINDIR)/$(EXE)
+
+ depend:
+ makedepend -m -DMAKE_DEPEND -- $(CFLAGS) -- *.c