user-destdir support

5 files changed, 24 insertions, 13 deletions

diff --git a/x11/xmove/Makefile b/x11/xmove/Makefile
index 836e5932ef9..105afc4815c 100644
--- a/x11/xmove/Makefile
+++ b/x11/xmove/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2009/05/12 21:03:33 zafer Exp $
+# $NetBSD: Makefile,v 1.17 2009/07/07 17:07:38 joerg Exp $
 #
 
 DISTNAME=	xmove.2.0beta2
@@ -10,10 +10,14 @@ MASTER_SITES=	ftp://ftp.ntplx.net/pub/unix/source/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Move an X11 display between screens and displays
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/xmove
 USE_IMAKE=	yes
 XMOVEDOCDIR=	${PREFIX}/share/doc/xmove
 
+INSTALLATION_DIRS=	${XMOVEDOCDIR}
+
 pre-configure:
 	@${SED} -e 's|@x11base@|'${X11PREFIX}'|' < ${WRKSRC}/xmove/Imakefile > ${WRKSRC}/xmove/Imakefile.new && \
 		${MV} ${WRKSRC}/xmove/Imakefile.new ${WRKSRC}/xmove/Imakefile
@@ -21,10 +25,9 @@ pre-configure:
 	${CP} ${WRKSRC}/man/man1/xmovectrl.1 ${WRKSRC}/xmovectrl/xmovectrl.man
 
 post-install:
-	@${INSTALL_DATA_DIR} ${XMOVEDOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/features.txt ${XMOVEDOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/limitations.txt ${XMOVEDOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/using_xmove.txt ${XMOVEDOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/features.txt ${DESTDIR}${XMOVEDOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/limitations.txt ${DESTDIR}${XMOVEDOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/using_xmove.txt ${DESTDIR}${XMOVEDOCDIR}
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xneko/Makefile b/x11/xneko/Makefile
index 8396666cd09..18c927ab2ec 100644
--- a/x11/xneko/Makefile
+++ b/x11/xneko/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2008/02/07 13:24:36 tnn Exp $
+# $NetBSD: Makefile,v 1.28 2009/07/07 17:10:46 joerg Exp $
 
 DISTNAME=	xneko
 PKGNAME=	xneko-4.4
@@ -9,6 +9,8 @@ MASTER_SITES=	ftp://ftp.cdrom.com/pub/bsd-sources/4.4BSD-Lite/usr/src/games/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Classic BSD4.4 cat-and-mouse
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/pub/bsd-sources/4.4BSD-Lite/usr/src/games/xneko
 MANCOMPRESSED_IF_MANZ=	yes
 
@@ -19,7 +21,7 @@ BUILD_DEFS+=	MANINSTALL
 USE_BSD_MAKEFILE=	yes
 USE_TOOLS+=		groff nroff
 
-INSTALLATION_DIRS+=	${PKGMANDIR}/cat6 ${PKGMANDIR}/man6
+INSTALLATION_DIRS+=	bin ${PKGMANDIR}/cat6 ${PKGMANDIR}/man6
 
 post-install:
 	@${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
diff --git a/x11/xnodecor/Makefile b/x11/xnodecor/Makefile
index 0e08ffe354e..fa2cc1dddda 100644
--- a/x11/xnodecor/Makefile
+++ b/x11/xnodecor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2007/02/22 19:27:28 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2009/07/07 17:14:39 joerg Exp $
 
 DISTNAME=	xnodecor-0.1
 PKGREVISION=	1
@@ -10,9 +10,13 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	# none
 COMMENT=	Borderless or undecorated window support utility
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_X11BASE=	yes
 NO_CONFIGURE=	yes
 
+INSTALLATION_DIRS=	bin
+
 do-extract:
 	@${MKDIR} ${WRKSRC}
 	${CP} ${FILESDIR}/Makefile ${WRKSRC}
diff --git a/x11/xnodecor/files/Makefile b/x11/xnodecor/files/Makefile
index 59fa340a9bb..568dcaecbc9 100644
--- a/x11/xnodecor/files/Makefile
+++ b/x11/xnodecor/files/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/01/21 21:04:43 kristerw Exp $
+# $NetBSD: Makefile,v 1.2 2009/07/07 17:14:39 joerg Exp $
 # $FreeBSD: ports/x11/xnodecor/files/Makefile,v 1.1 2003/09/08 07:08:14 edwin Exp $
 
 all:	xnodecor
@@ -7,7 +7,7 @@ xnodecor:
 	$(CC) -o xnodecor xnodecor.c $(CFLAGS) $(LDFLAGS) $(LIBS) -lX11
 
 install:
-	${BSD_INSTALL_PROGRAM} xnodecor ${PREFIX}/bin
+	${BSD_INSTALL_PROGRAM} xnodecor ${DESTDIR}${PREFIX}/bin
 
 clean:
 	rm -f *.rej a.out core xnodecor
diff --git a/x11/xpmicons/Makefile b/x11/xpmicons/Makefile
index 142749cfc5d..4e31def301f 100644
--- a/x11/xpmicons/Makefile
+++ b/x11/xpmicons/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2008/01/19 09:16:26 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2009/07/07 17:16:35 joerg Exp $
 
 DISTNAME=	xpmicons-1.0
 PKGREVISION=	5
@@ -14,6 +14,8 @@ DISTFILES=	icons.tar.gz KDEicons.tgz \
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Huge collection of icons for any windowmanager
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	icons
 USE_X11BASE=	yes
@@ -26,8 +28,8 @@ post-extract:
 
 do-install:
 	set -e; cd ${WRKSRC}; find * -name \*.xpm -print | \
-		while read f; do ${INSTALL_DATA} $$f ${PREFIX}/include/X11/pixmaps; done
+		while read f; do ${INSTALL_DATA} $$f ${DESTDIR}${PREFIX}/include/X11/pixmaps; done
 	set -e; cd ${WRKSRC}; find * -name \*.xbm -print | \
-		while read f; do ${INSTALL_DATA} $$f ${PREFIX}/include/X11/bitmaps; done
+		while read f; do ${INSTALL_DATA} $$f ${DESTDIR}${PREFIX}/include/X11/bitmaps; done
 
 .include "../../mk/bsd.pkg.mk"