DESTDIR support

6 files changed, 23 insertions, 17 deletions

diff --git a/wm/matchbox-wm/Makefile b/wm/matchbox-wm/Makefile
index 4c60509222f..779002f3a5c 100644
--- a/wm/matchbox-wm/Makefile
+++ b/wm/matchbox-wm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2009/07/22 09:01:50 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2010/02/12 20:37:53 joerg Exp $
 #
 
 DISTNAME=		matchbox-window-manager-1.1
@@ -10,6 +10,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://projects.o-hand.com/matchbox/
 COMMENT=		Window manager designed for computers with small displays
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=		pkg-config
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
@@ -19,10 +21,11 @@ PKG_SYSCONFSUBDIR=	matchbox
 EGDIR=			${PREFIX}/share/examples/matchbox
 CONF_FILES=		${EGDIR}/kbdconfig ${PKG_SYSCONFDIR}/kbdconfig
 
+INSTALLATION_DIRS+=	share/examples/matchbox
+
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/matchbox
-	${MV} ${PKG_SYSCONFDIR}/kbdconfig \
-		${PREFIX}/share/examples/matchbox/
+	${MV} ${DESTDIR}${PKG_SYSCONFDIR}/kbdconfig \
+		${DESTDIR}${PREFIX}/share/examples/matchbox/
 
 .include "../../devel/libmatchbox/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
diff --git a/wm/windowlab/Makefile b/wm/windowlab/Makefile
index 9d0f4b96f1f..2afd4dfaa7d 100644
--- a/wm/windowlab/Makefile
+++ b/wm/windowlab/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2007/02/22 19:01:26 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2010/02/12 20:34:16 joerg Exp $
 #
 
 DISTNAME=	windowlab-1.33
@@ -11,6 +11,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://nickgravgaard.com/windowlab/
 COMMENT=	Small and simple window manager
 
+PKG_DESTDIR_SUPPORT=	user-destdir
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_TOOLS+=	gmake pkg-config
@@ -21,8 +22,7 @@ CONF_FILES=	${EGDIR}/windowlab.menurc ${PKG_SYSCONFDIR}/windowlab.menurc
 INSTALLATION_DIRS=	share/examples/windowlab
 
 post-install:
-	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/windowlab.menurc ${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/windowlab.menurc ${DESTDIR}${EGDIR}
 
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
diff --git a/wm/wmii/Makefile b/wm/wmii/Makefile
index 48e5c905380..2f084ea18ad 100644
--- a/wm/wmii/Makefile
+++ b/wm/wmii/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2009/06/15 12:43:15 ghen Exp $
+# $NetBSD: Makefile,v 1.22 2010/02/12 20:42:33 joerg Exp $
 
 DISTNAME=		wmii-3.6
 PKGREVISION=		4
@@ -9,6 +9,8 @@ MAINTAINER=		ghen@NetBSD.org
 HOMEPAGE=		http://wmii.suckless.org/
 COMMENT=		Modular and keyboard-friendly window manager
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=		dmenu>=3.7:../../x11/dmenu
 
 USE_TOOLS+=		tbl
diff --git a/wm/wmii/distinfo b/wm/wmii/distinfo
index d44abd0b4fe..3d95273da12 100644
--- a/wm/wmii/distinfo
+++ b/wm/wmii/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.9 2009/03/29 09:07:37 wiz Exp $
+$NetBSD: distinfo,v 1.10 2010/02/12 20:42:33 joerg Exp $
 
 SHA1 (wmii-3.6.tar.gz) = 48e24f84f60b9c6ce37f715a46bc32e35d2086f3
 RMD160 (wmii-3.6.tar.gz) = 29462b9ecc7d68e8e00e5f3eec82c2a46e268a52
 Size (wmii-3.6.tar.gz) = 208249 bytes
-SHA1 (patch-aa) = 71d5bb9d546e0cc562f463c03af458464fd4e782
-SHA1 (patch-ab) = 64d8f1b79d2ebf307c3189d0e5bcfc53957e3fcf
+SHA1 (patch-aa) = 51f86a9517527effda87dce33e0996abc2bb5ddc
+SHA1 (patch-ab) = 5e208344ea8bde06ec4cc8084eef0e3ba2f165f7
 SHA1 (patch-ac) = 8e4712bd308caeba9ca5dad023e32db8b27f3b31
diff --git a/wm/wmii/patches/patch-aa b/wm/wmii/patches/patch-aa
index 42f9876601c..8ad8a15808b 100644
--- a/wm/wmii/patches/patch-aa
+++ b/wm/wmii/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.6 2008/01/06 21:55:38 ghen Exp $
+$NetBSD: patch-aa,v 1.7 2010/02/12 20:42:33 joerg Exp $
 
 --- config.mk.orig	2007-11-16 14:59:15.000000000 +0100
 +++ config.mk
@@ -7,11 +7,12 @@ $NetBSD: patch-aa,v 1.6 2008/01/06 21:55:38 ghen Exp $
  
  # paths
 -PREFIX = /usr/local
- BIN = ${PREFIX}/bin
+-BIN = ${PREFIX}/bin
++BIN = ${DESTDIR}${PREFIX}/bin
 -MAN = ${PREFIX}/share/man
 -ETC = ${PREFIX}/etc
-+MAN = ${PREFIX}/${PKGMANDIR}
-+ETC = ${PKG_SYSCONFBASE}
++MAN = ${DESTDIR}${PREFIX}/${PKGMANDIR}
++ETC = ${DESTDIR}${PKG_SYSCONFBASE}
  LIBDIR = ${PREFIX}/lib
  INCLUDE = ${PREFIX}/include
  
diff --git a/wm/wmii/patches/patch-ab b/wm/wmii/patches/patch-ab
index 03c0ef5484d..fae7df6d6e1 100644
--- a/wm/wmii/patches/patch-ab
+++ b/wm/wmii/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.5 2008/01/06 21:55:39 ghen Exp $
+$NetBSD: patch-ab,v 1.6 2010/02/12 20:42:33 joerg Exp $
 
 --- rc/Makefile.orig	2007-11-16 14:59:15.000000000 +0100
 +++ rc/Makefile
@@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.5 2008/01/06 21:55:39 ghen Exp $
  include ${ROOT}/mk/wmii.mk
  
 -BIN = ${ETC}/wmii-${CONFVERSION}
-+BIN = ${PREFIX}/share/examples/wmii-${CONFVERSION}
++BIN = ${DESTDIR}${PREFIX}/share/examples/wmii-${CONFVERSION}
  TARG =	rc.wmii   \
  	wmiirc    \
  	welcome