Flag a number of packages I use as supporting (user-)destdir.

apg is a bit special as it has some hardcoded ownership, so
mark that as "destdir".

8 files changed, 30 insertions, 21 deletions

diff --git a/devel/GConf2-ui/Makefile b/devel/GConf2-ui/Makefile
index 4df2e4e5684..e0a2ab92377 100644
--- a/devel/GConf2-ui/Makefile
+++ b/devel/GConf2-ui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2006/04/17 13:46:09 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2006/10/09 12:52:34 joerg Exp $
 #
 
 .include "../../devel/GConf2/Makefile.common"
@@ -17,7 +17,7 @@ INSTALLATION_DIRS=	libexec
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gconf/.libs/gconf-sanity-check-2 \
-		${PREFIX}/libexec
+		${DESTDIR}${PREFIX}/libexec
 
 .include "../../devel/GConf2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/devel/GConf2/Makefile b/devel/GConf2/Makefile
index e6be83de849..7ae4eb616a6 100644
--- a/devel/GConf2/Makefile
+++ b/devel/GConf2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2006/03/30 20:50:02 jmmv Exp $
+# $NetBSD: Makefile,v 1.39 2006/10/09 12:52:34 joerg Exp $
 #
 
 .include "../../devel/GConf2/Makefile.common"
@@ -23,7 +23,7 @@ PRINT_PLIST_AWK+=	/^@dirrm (include\/gconf|lib\/GConf|share\/gconf)$$/ \
 #      But we have to wait until a public identifier is choosen for it.
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/gconf/schemas
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/gconf/schemas
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
diff --git a/devel/GConf2/Makefile.common b/devel/GConf2/Makefile.common
index 7c0f7a16328..699945ef361 100644
--- a/devel/GConf2/Makefile.common
+++ b/devel/GConf2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.39 2006/04/13 18:23:30 jlam Exp $
+# $NetBSD: Makefile.common,v 1.40 2006/10/09 12:52:34 joerg Exp $
 #
 
 GCONF2_VERSION=		2.14.0
@@ -12,6 +12,8 @@ MAINTAINER=		jmmv@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/projects/gconf/
 COMMENT=		Configuration database system used by GNOME (v2)
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 # not ready yet.  .schemas are installed in the depot.
 #PKG_INSTALLATION_TYPES= overwrite pkgviews
 
diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile
index 47f5ae4f7df..af8394533af 100644
--- a/devel/SDL/Makefile
+++ b/devel/SDL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2006/08/04 22:12:28 markd Exp $
+# $NetBSD: Makefile,v 1.74 2006/10/09 12:52:34 joerg Exp $
 
 DISTNAME=	SDL-1.2.11
 PKGREVISION=	1
@@ -9,6 +9,8 @@ MAINTAINER=	wiz@NetBSD.org
 HOMEPAGE=	http://www.libsdl.org/
 COMMENT=	Simple DirectMedia Layer, a cross-platform multimedia library
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake
diff --git a/devel/apr/Makefile b/devel/apr/Makefile
index 18a8b149565..5744c50917e 100644
--- a/devel/apr/Makefile
+++ b/devel/apr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2006/10/05 17:05:59 tron Exp $
+# $NetBSD: Makefile,v 1.47 2006/10/09 12:52:34 joerg Exp $
 
 .include "../../www/apache2/Makefile.common"
 
@@ -9,6 +9,8 @@ CATEGORIES=	devel
 HOMEPAGE=	http://apr.apache.org/
 COMMENT=	Apache Portable Runtime
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 # Don't bump this when apache upgrades; it is only apache2-2.0.45 and
 # under that includes its own apr.  apr was split out in 2.0.45nb1.
 CONFLICTS=		apache2<=2.0.45
@@ -53,14 +55,14 @@ do-configure:
 		${APU_CONFIGURE_ARGS}
 
 post-install:
-	${RM} ${PREFIX}/libexec/apr/libtool
-	${INSTALL_SCRIPT} ${PKG_LIBTOOL} ${PREFIX}/libexec/apr/libtool
-	${INSTALL_DATA_DIR} ${PREFIX}/include/apr-0/arch/unix
-	${INSTALL_DATA} ${WRKSRC}/apr/include/arch/*.h ${PREFIX}/include/apr-0/arch
-	${INSTALL_DATA} ${WRKSRC}/apr/include/arch/unix/*.h ${PREFIX}/include/apr-0/arch/unix/
-	${CHMOD} ${SHAREMODE} ${PREFIX}/include/apr-0/*.h
-	${CHMOD} ${PKGDIRMODE} ${PREFIX}/include/apr-0
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/include/apr-0/
+	${RM} ${DESTDIR}${PREFIX}/libexec/apr/libtool
+	${INSTALL_SCRIPT} ${PKG_LIBTOOL} ${DESTDIR}${PREFIX}/libexec/apr/libtool
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/apr-0/arch/unix
+	${INSTALL_DATA} ${WRKSRC}/apr/include/arch/*.h ${DESTDIR}${PREFIX}/include/apr-0/arch
+	${INSTALL_DATA} ${WRKSRC}/apr/include/arch/unix/*.h ${DESTDIR}${PREFIX}/include/apr-0/arch/unix/
+	${CHMOD} ${SHAREMODE} ${DESTDIR}${PREFIX}/include/apr-0/*.h
+	${CHMOD} ${PKGDIRMODE} ${DESTDIR}${PREFIX}/include/apr-0
+	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${PREFIX}/include/apr-0/
 
 .include "../../converters/libiconv/buildlink3.mk"
 
diff --git a/devel/atk/Makefile b/devel/atk/Makefile
index 05312db00b8..85f41baa461 100644
--- a/devel/atk/Makefile
+++ b/devel/atk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2006/10/06 06:01:25 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2006/10/09 12:52:34 joerg Exp $
 #
 
 DISTNAME=		atk-1.12.3
@@ -11,6 +11,7 @@ HOMEPAGE=		http://developer.gnome.org/projects/gap/
 COMMENT=		Set of interfaces for accessibility
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_TOOLS+=		gmake pkg-config msgfmt
 GNU_CONFIGURE=		yes
diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index e77a8bb1e6d..11bb06b493f 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.107 2006/10/06 18:05:21 wiz Exp $
+# $NetBSD: Makefile,v 1.108 2006/10/09 12:52:34 joerg Exp $
 
 DISTNAME=		glib-2.12.4
 PKGNAME=		${DISTNAME:S/glib/glib2/}
@@ -13,6 +13,7 @@ HOMEPAGE=		http://www.gtk.org/docs/glib_toc.html
 COMMENT=		Some useful routines for C programming (glib2)
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake msgfmt perl:run pkg-config
diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile
index a06ec6c573c..761e55983b7 100644
--- a/devel/gmake/Makefile
+++ b/devel/gmake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2006/07/06 12:45:50 joerg Exp $
+# $NetBSD: Makefile,v 1.69 2006/10/09 12:52:34 joerg Exp $
 
 DISTNAME=	make-3.81
 PKGNAME=	g${DISTNAME}
@@ -10,6 +10,7 @@ HOMEPAGE=	http://www.gnu.org/software/make/make.html
 COMMENT=	GNU version of 'make' utility
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		yes
 TEXINFO_REQD+=		4.0
@@ -50,10 +51,10 @@ CONFIGURE_ARGS+=	--without-libiconv
 .endif
 
 post-install:
-	${CHMOD} g-s ${PREFIX}/bin/${GNU_PROGRAM_PREFIX}make
-	${CHGRP} ${BINGRP} ${PREFIX}/bin/${GNU_PROGRAM_PREFIX}make
+	${CHMOD} g-s ${DESTDIR}${PREFIX}/bin/${GNU_PROGRAM_PREFIX}make
+	${CHGRP} ${BINGRP} ${DESTDIR}${PREFIX}/bin/${GNU_PROGRAM_PREFIX}make
 .if !defined(GNU_PROGRAM_PREFIX) || ${GNU_PROGRAM_PREFIX} != "g"
-	${LN} -sf ${GNU_PROGRAM_PREFIX}make ${PREFIX}/bin/gmake
+	${LN} -sf ${GNU_PROGRAM_PREFIX}make ${DESTDIR}${PREFIX}/bin/gmake
 .endif
 
 .include "../../mk/bsd.pkg.mk"