user-destdir support

7 files changed, 38 insertions, 24 deletions

diff --git a/x11/fspanel/Makefile b/x11/fspanel/Makefile
index 174cabb5b70..2929eb4fa3c 100644
--- a/x11/fspanel/Makefile
+++ b/x11/fspanel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/12/15 20:33:03 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2009/07/07 18:25:09 joerg Exp $
 #
 
 DISTNAME=	fspanel-0.8beta1
@@ -12,6 +12,7 @@ HOMEPAGE=	http://www.chatjunkies.org/fspanel/
 COMMENT=	F***ing Small Panel for listing X11 windows
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 HAS_CONFIGURE=	YES
 
@@ -20,8 +21,8 @@ CFLAGS+=	-DHAVE_XPM -DXFT
 INSTALLATION_DIRS=	bin share/doc/fspanel
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/fspanel ${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/fspanel/
+	${INSTALL_PROGRAM} ${WRKSRC}/fspanel ${DESTDIR}${PREFIX}/bin/
+	${INSTALL_MAN} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/fspanel/
 
 .include "../../x11/libXft/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
diff --git a/x11/gromit/Makefile b/x11/gromit/Makefile
index f7a076f106d..306b4c9afd8 100644
--- a/x11/gromit/Makefile
+++ b/x11/gromit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2007/01/13 18:26:29 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2009/07/07 18:24:42 joerg Exp $
 #
 
 DISTNAME=		gromit-20041213
@@ -10,15 +10,17 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.home.unix-ag.org/simon/gromit/
 COMMENT=		Text marker tool for the X11 screen
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=		pkg-config
 INSTALLATION_DIRS=	bin
 
 LDFLAGS+=	${X11_LDFLAGS} -lX11
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/gromit ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gromit
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/gromit
+	${INSTALL_PROGRAM} ${WRKSRC}/gromit ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/gromit
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/gromit
 
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
diff --git a/x11/gtk2-theme-switch/Makefile b/x11/gtk2-theme-switch/Makefile
index 2e2bf563d40..fccee1bcbec 100644
--- a/x11/gtk2-theme-switch/Makefile
+++ b/x11/gtk2-theme-switch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2007/01/07 09:14:16 rillig Exp $
+# $NetBSD: Makefile,v 1.20 2009/07/07 18:23:55 joerg Exp $
 #
 
 DISTNAME=		gtk-theme-switch-2.0.0rc2
@@ -11,6 +11,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.muhri.net/
 COMMENT=		Allows quick & easy switching of GTK+ 2.x themes
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=		gmake pkg-config
 
 BUILDLINK_TRANSFORM+=	rm:-DGTK_DISABLE_DEPRECATED
@@ -18,9 +20,9 @@ INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/switch2 \
-		${PREFIX}/bin/gtk2-theme-switch
+		${DESTDIR}${PREFIX}/bin/gtk2-theme-switch
 	${INSTALL_MAN} ${WRKSRC}/switch.1 \
-		${PREFIX}/${PKGMANDIR}/man1/gtk2-theme-switch.1
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/gtk2-theme-switch.1
 
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/modeline/Makefile b/x11/modeline/Makefile
index a3b8bf822a7..0cdfb383fbc 100644
--- a/x11/modeline/Makefile
+++ b/x11/modeline/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2007/02/22 19:01:27 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2009/07/07 18:22:43 joerg Exp $
 
 DISTNAME=		modeline_vfr.c
 PKGNAME=		modeline-20001121
@@ -10,6 +10,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.bohne-lang.de/spec/linux/modeline/
 COMMENT=		Calculates XF86 Modelines to configure your monitor for X11R6
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}/modeline
 INSTALLATION_DIRS=	bin
 
@@ -21,6 +23,6 @@ do-build:
 	cd ${WRKSRC}; ${CC} ${CFLAGS} ${DISTNAME} -o ${DISTNAME:S/.c//}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${DISTNAME:S/.c//} ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/${DISTNAME:S/.c//} ${DESTDIR}${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/neXtaw/Makefile b/x11/neXtaw/Makefile
index fcf109769de..bf24747abfa 100644
--- a/x11/neXtaw/Makefile
+++ b/x11/neXtaw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2008/01/04 01:25:51 rillig Exp $
+# $NetBSD: Makefile,v 1.26 2009/07/07 18:22:37 joerg Exp $
 
 DISTNAME=	neXtaw-0.15.1
 PKGREVISION=	3
@@ -9,6 +9,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://siag.nu/neXtaw/
 COMMENT=	NeXTstep-like widgets based on the Athena Widget set
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_X11BASE=		yes
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
@@ -22,17 +24,17 @@ EGDIR=		${PREFIX}/share/examples/${PKGBASE}
 GCC_REQD+=	2.95
 .endif
 
+INSTALLATION_DIRS=	${DOCDIR} ${EGDIR}
+
 post-install:
-	${INSTALL_DATA_DIR} ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/FAQ ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/README.XAW3D ${DOCDIR}
-	${INSTALL_DATA_DIR} ${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/FAQ ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/README.XAW3D ${DESTDIR}${DOCDIR}
 	set -e; cd ${WRKSRC}/doc/app-defaults; for file in *; do	\
 		case "$${file}" in					\
 		Makefile*)	continue ;;				\
 		esac;							\
-		${INSTALL_DATA} "$$file" ${EGDIR};			\
+		${INSTALL_DATA} "$$file" ${DESTDIR}${EGDIR};			\
 	done
 
 .include "../../x11/libXext/buildlink3.mk"
diff --git a/x11/tk-BWidget/Makefile b/x11/tk-BWidget/Makefile
index 1912a612934..0e7433de893 100644
--- a/x11/tk-BWidget/Makefile
+++ b/x11/tk-BWidget/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2007/05/21 09:58:23 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2009/07/07 18:21:47 joerg Exp $
 
 DISTNAME=	BWidget-1.7.0
 PKGNAME=	tk-${DISTNAME}
@@ -14,6 +14,7 @@ DEPENDS+=	tcl>=8.4:../../lang/tcl
 DEPENDS+=	tk>=8.4:../../x11/tk
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 NO_EXTRACT=	YES
 NO_BUILD=	YES
@@ -21,9 +22,10 @@ NO_CONFIGURE=	YES
 
 USE_TOOLS+=	gtar
 
+INSTALLATION_DIRS=	lib/tcl
+
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/tcl
-	cd ${PREFIX}/lib/tcl && ${GTAR} zxpf ${DISTDIR}/${DISTFILES}
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/tcl/${DISTNAME}
+	cd ${DESTDIR}${PREFIX}/lib/tcl && ${GTAR} zxpf ${DISTDIR}/${DISTFILES}
+	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${PREFIX}/lib/tcl/${DISTNAME}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/tk-Tix/Makefile b/x11/tk-Tix/Makefile
index 470ad5c35c4..754440d3a1a 100644
--- a/x11/tk-Tix/Makefile
+++ b/x11/tk-Tix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2009/06/30 00:07:25 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2009/07/07 18:22:02 joerg Exp $
 #
 
 DISTNAME=	tix8.2.0b1
@@ -11,6 +11,8 @@ MAINTAINER=	he@NetBSD.org
 HOMEPAGE=	http://tixlibrary.sourceforge.net/
 COMMENT=	Powerful widget library for Tcl/Tk
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 MAKE_JOBS_SAFE=		no
 
 WRKSRC=			${WRKDIR}/tix8.2.0/unix
@@ -20,6 +22,7 @@ CONFIGURE_ARGS+=	--enable-shared --with-tcl=${BUILDLINK_PREFIX.tcl}/lib \
 			--disable-stubs
 MAKE_ENV+=		TCL_DIR=${BUILDLINK_PREFIX.tcl}
 MAKE_ENV+=		TK_DIR=${BUILDLINK_PREFIX.tk}
+INSTALL_MAKE_FLAGS+=	INSTALL_ROOT=${DESTDIR}
 TEST_TARGET=		test
 
 .include "../../lang/tcl/buildlink3.mk"