Mechanical changes to add DESTDIR support to packages that install

their files via a custom do-install target.

19 files changed, 227 insertions, 156 deletions

diff --git a/databases/adodb/Makefile b/databases/adodb/Makefile
index 9cb04a5e36a..df9e8deb542 100644
--- a/databases/adodb/Makefile
+++ b/databases/adodb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2007/11/25 17:53:23 adrianp Exp $
+# $NetBSD: Makefile,v 1.12 2008/03/03 15:21:07 jlam Exp $
 #
 
 DISTNAME=	adodb496a
@@ -11,6 +11,8 @@ MAINTAINER=	adrianp@NetBSD.org
 HOMEPAGE=	http://adodb.sourceforge.net/
 COMMENT=	Active Data Objects Data Base for php4
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}/adodb
 NO_CONFIGURE=		YES
 NO_BUILD=		YES
@@ -26,37 +28,46 @@ NO_BUILD=		YES
 .endif
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/adodb
-	${INSTALL_DATA_DIR} ${PREFIX}/share/adodb/cute_icons_for_site
-	${INSTALL_DATA_DIR} ${PREFIX}/share/adodb/datadict
-	${INSTALL_DATA_DIR} ${PREFIX}/share/adodb/drivers
-	${INSTALL_DATA_DIR} ${PREFIX}/share/adodb/lang
-	${INSTALL_DATA_DIR} ${PREFIX}/share/adodb/perf
-	${INSTALL_DATA_DIR} ${PREFIX}/share/adodb/tests
-	${INSTALL_DATA_DIR} ${PREFIX}/share/adodb/xsl
-	${INSTALL_DATA_DIR} ${PREFIX}/share/adodb/session
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/adodb
-
-	${INSTALL_DATA} ${WRKSRC}/*.php ${PREFIX}/share/adodb
-	${INSTALL_DATA} ${WRKSRC}/*.dtd ${PREFIX}/share/adodb
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/adodb
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/adodb/cute_icons_for_site
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/adodb/datadict
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/adodb/drivers
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/adodb/lang
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/adodb/perf
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/adodb/tests
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/adodb/xsl
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/adodb/session
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/adodb
+
+	${INSTALL_DATA} ${WRKSRC}/*.php ${DESTDIR}${PREFIX}/share/adodb
+	${INSTALL_DATA} ${WRKSRC}/*.dtd ${DESTDIR}${PREFIX}/share/adodb
 	${INSTALL_DATA} ${WRKSRC}/cute_icons_for_site/*.gif \
-		${PREFIX}/share/adodb/cute_icons_for_site
+		${DESTDIR}${PREFIX}/share/adodb/cute_icons_for_site
 	${INSTALL_DATA} ${WRKSRC}/datadict/*.php \
-		${PREFIX}/share/adodb/datadict
-	${INSTALL_DATA} ${WRKSRC}/drivers/*.php ${PREFIX}/share/adodb/drivers
-	${INSTALL_DATA} ${WRKSRC}/lang/*.php ${PREFIX}/share/adodb/lang
-	${INSTALL_DATA} ${WRKSRC}/perf/*.php ${PREFIX}/share/adodb/perf
-	${INSTALL_DATA} ${WRKSRC}/tests/*.php ${PREFIX}/share/adodb/tests
-	${INSTALL_DATA} ${WRKSRC}/tests/*.xml ${PREFIX}/share/adodb/tests
-	${INSTALL_DATA} ${WRKSRC}/session/*.php ${PREFIX}/share/adodb/session
-	${INSTALL_DATA} ${WRKSRC}/session/*.txt ${PREFIX}/share/adodb/session
-	${INSTALL_DATA} ${WRKSRC}/session/*.sql ${PREFIX}/share/adodb/session
-	${INSTALL_DATA} ${WRKSRC}/session/*.xml ${PREFIX}/share/adodb/session
-	${INSTALL_DATA} ${WRKSRC}/xsl/*.xsl ${PREFIX}/share/adodb/xsl
-	${INSTALL_DATA} ${WRKSRC}/docs/*.htm ${PREFIX}/share/doc/adodb
-	${INSTALL_DATA} ${WRKSRC}/*.txt ${PREFIX}/share/doc/adodb
-
-	${FIND} ${PREFIX}/share/adodb -name \*.\* -type f -print | \
+		${DESTDIR}${PREFIX}/share/adodb/datadict
+	${INSTALL_DATA} ${WRKSRC}/drivers/*.php \
+		${DESTDIR}${PREFIX}/share/adodb/drivers
+	${INSTALL_DATA} ${WRKSRC}/lang/*.php \
+		${DESTDIR}${PREFIX}/share/adodb/lang
+	${INSTALL_DATA} ${WRKSRC}/perf/*.php \
+		${DESTDIR}${PREFIX}/share/adodb/perf
+	${INSTALL_DATA} ${WRKSRC}/tests/*.php \
+		${DESTDIR}${PREFIX}/share/adodb/tests
+	${INSTALL_DATA} ${WRKSRC}/tests/*.xml \
+		${DESTDIR}${PREFIX}/share/adodb/tests
+	${INSTALL_DATA} ${WRKSRC}/session/*.php \
+		${DESTDIR}${PREFIX}/share/adodb/session
+	${INSTALL_DATA} ${WRKSRC}/session/*.txt \
+		${DESTDIR}${PREFIX}/share/adodb/session
+	${INSTALL_DATA} ${WRKSRC}/session/*.sql \
+		${DESTDIR}${PREFIX}/share/adodb/session
+	${INSTALL_DATA} ${WRKSRC}/session/*.xml \
+		${DESTDIR}${PREFIX}/share/adodb/session
+	${INSTALL_DATA} ${WRKSRC}/xsl/*.xsl ${DESTDIR}${PREFIX}/share/adodb/xsl
+	${INSTALL_DATA} ${WRKSRC}/docs/*.htm ${DESTDIR}${PREFIX}/share/doc/adodb
+	${INSTALL_DATA} ${WRKSRC}/*.txt ${DESTDIR}${PREFIX}/share/doc/adodb
+
+	${FIND} ${DESTDIR}${PREFIX}/share/adodb -name \*.\* -type f -print | \
 		${XARGS} ${CHMOD} ${SHAREMODE}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/cstore/Makefile b/databases/cstore/Makefile
index 597decc4401..9e0eec4db03 100644
--- a/databases/cstore/Makefile
+++ b/databases/cstore/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/02/28 11:58:47 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2008/03/03 15:21:07 jlam Exp $
 
 DISTNAME=	cstore0.2
 PKGNAME=	cstore-0.2
@@ -12,6 +12,8 @@ MAINTAINER=	agc@NetBSD.org
 HOMEPAGE=	http://db.lcs.mit.edu/projects/cstore/
 COMMENT=	Read-optimised column store relational DBMS
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=	gmake perl
 USE_LANGUAGES+=	c c++
 WRKSRC=		${WRKDIR}/cstore
@@ -62,11 +64,12 @@ do-build:
 	cd ${WRKSRC}/src &&  ./cstoreqptest 0 createData.cnf global.cnf
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/cstoreqptest ${PREFIX}/bin/cstoreqp
-	${INSTALL_DATA_DIR} ${PREFIX}/cstore/data
-	cd ${WRKSRC}/data && pax -rwpe . ${PREFIX}/cstore/data
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/cstore
-	cd ${WRKSRC}/doc && pax -rwpe . ${PREFIX}/share/doc/cstore
+	${INSTALL_PROGRAM} ${WRKSRC}/src/cstoreqptest \
+		${DESTDIR}${PREFIX}/bin/cstoreqp
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/cstore/data
+	cd ${WRKSRC}/data && pax -rwpe . ${DESTDIR}${PREFIX}/cstore/data
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/cstore
+	cd ${WRKSRC}/doc && pax -rwpe . ${DESTDIR}${PREFIX}/share/doc/cstore
 
 .include "../../archivers/lzo/buildlink3.mk"
 .include "../../databases/db4/buildlink3.mk"
diff --git a/databases/geneweb/Makefile b/databases/geneweb/Makefile
index 0a5ec89e770..0b569c37cd4 100644
--- a/databases/geneweb/Makefile
+++ b/databases/geneweb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2006/04/06 06:21:41 reed Exp $
+# $NetBSD: Makefile,v 1.31 2008/03/03 15:21:07 jlam Exp $
 #
 
 DISTNAME=	geneweb-4.10
@@ -11,6 +11,9 @@ HOMEPAGE=	http://cristal.inria.fr/~ddr/GeneWeb/
 COMMENT=	GeneWeb is a comprehensive genealogy database application
 
 DIST_SUBDIR=	${PKGNAME_NOREV}nb1
+
+PKG_DESTDIR_SUPPORT=	destdir
+
 USE_TOOLS+=	gmake
 
 RCD_SCRIPTS=	geneweb
@@ -49,35 +52,35 @@ post-build:
 		cd ${WRKSRC} && ${GMAKE} distrib
 
 do-install:
-		${INSTALL_DATA_DIR} ${PREFIX}/share/examples/geneweb
-		${INSTALL_DATA_DIR} ${PREFIX}/share/doc/geneweb
-		${INSTALL_DATA_DIR} ${PREFIX}/share/geneweb/etc
-		${INSTALL_DATA_DIR} ${PREFIX}/share/geneweb/gwtp_tmp
-		${INSTALL_DATA_DIR} ${PREFIX}/share/geneweb/images
-		${INSTALL_DATA_DIR} ${PREFIX}/share/geneweb/lang
-		${INSTALL_DATA_DIR} ${PREFIX}/share/geneweb/setup
+		${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/geneweb
+		${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/geneweb
+		${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/geneweb/etc
+		${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/geneweb/gwtp_tmp
+		${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/geneweb/images
+		${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/geneweb/lang
+		${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/geneweb/setup
 		cd ${WRKSRC}/distribution/gw && \
-		${INSTALL_PROGRAM} gwd ${PREFIX}/libexec && \
-		${INSTALL_PROGRAM} consang ${PREFIX}/bin && \
-		${INSTALL_PROGRAM} gwc ${PREFIX}/bin && \
-		${INSTALL_PROGRAM} gwtp_tmp/gwtp ${PREFIX}/bin && \
-		${INSTALL_PROGRAM} ged2gwb ${PREFIX}/bin && \
-		${INSTALL_PROGRAM} gwb2ged ${PREFIX}/bin && \
-		${INSTALL_PROGRAM} gwsetup ${PREFIX}/sbin && \
-		${INSTALL_PROGRAM} gwu ${PREFIX}/bin && \
-		${CP} -Rp doc/* ${PREFIX}/share/doc/geneweb && \
-		${CP} -Rp etc ${PREFIX}/share/geneweb && \
-		${CP} -Rp gwtp_tmp ${PREFIX}/share/geneweb && \
-		${CP} -Rp images ${PREFIX}/share/geneweb && \
-		${CP} -Rp lang ${PREFIX}/share/geneweb && \
-		${CP} -Rp setup ${PREFIX}/share/geneweb && \
-		${INSTALL_DATA} a.gwf ${PREFIX}/share/examples/geneweb && \
-		${INSTALL_DATA} only.txt ${PREFIX}/share/examples/geneweb
-		${TOUCH} ${PREFIX}/share/geneweb/gwtp_tmp/passwd
-		${TOUCH} ${PREFIX}/share/geneweb/gwtp_tmp/gwtp.log
-		${CHMOD} 600 ${PREFIX}/share/geneweb/gwtp_tmp/passwd
-		${CHMOD} 600 ${PREFIX}/share/geneweb/gwtp_tmp/gwtp.log
-		${CHOWN} -R nobody.${ROOT_GROUP} ${PREFIX}/share/geneweb
+		${INSTALL_PROGRAM} gwd ${DESTDIR}${PREFIX}/libexec && \
+		${INSTALL_PROGRAM} consang ${DESTDIR}${PREFIX}/bin && \
+		${INSTALL_PROGRAM} gwc ${DESTDIR}${PREFIX}/bin && \
+		${INSTALL_PROGRAM} gwtp_tmp/gwtp ${DESTDIR}${PREFIX}/bin && \
+		${INSTALL_PROGRAM} ged2gwb ${DESTDIR}${PREFIX}/bin && \
+		${INSTALL_PROGRAM} gwb2ged ${DESTDIR}${PREFIX}/bin && \
+		${INSTALL_PROGRAM} gwsetup ${DESTDIR}${PREFIX}/sbin && \
+		${INSTALL_PROGRAM} gwu ${DESTDIR}${PREFIX}/bin && \
+		${CP} -Rp doc/* ${DESTDIR}${PREFIX}/share/doc/geneweb && \
+		${CP} -Rp etc ${DESTDIR}${PREFIX}/share/geneweb && \
+		${CP} -Rp gwtp_tmp ${DESTDIR}${PREFIX}/share/geneweb && \
+		${CP} -Rp images ${DESTDIR}${PREFIX}/share/geneweb && \
+		${CP} -Rp lang ${DESTDIR}${PREFIX}/share/geneweb && \
+		${CP} -Rp setup ${DESTDIR}${PREFIX}/share/geneweb && \
+		${INSTALL_DATA} a.gwf ${DESTDIR}${PREFIX}/share/examples/geneweb && \
+		${INSTALL_DATA} only.txt ${DESTDIR}${PREFIX}/share/examples/geneweb
+		${TOUCH} ${DESTDIR}${PREFIX}/share/geneweb/gwtp_tmp/passwd
+		${TOUCH} ${DESTDIR}${PREFIX}/share/geneweb/gwtp_tmp/gwtp.log
+		${CHMOD} 600 ${DESTDIR}${PREFIX}/share/geneweb/gwtp_tmp/passwd
+		${CHMOD} 600 ${DESTDIR}${PREFIX}/share/geneweb/gwtp_tmp/gwtp.log
+		${CHOWN} -R nobody.${ROOT_GROUP} ${DESTDIR}${PREFIX}/share/geneweb
 
 .include "../../lang/ocaml/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/jdbc-postgresql80/Makefile b/databases/jdbc-postgresql80/Makefile
index b705a321406..59c03532945 100644
--- a/databases/jdbc-postgresql80/Makefile
+++ b/databases/jdbc-postgresql80/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2008/01/07 23:18:09 abs Exp $
+# $NetBSD: Makefile,v 1.9 2008/03/03 15:21:07 jlam Exp $
 #
 
 DISTNAME=		postgresql-jdbc-8.0-${PGBUILD}.src
@@ -16,6 +16,8 @@ JARDIST=		postgresql-8.0-${PGBUILD}.jdbc3.jar
 JARFILE=		postgresql80.jar
 EXTRACT_ONLY=		${DISTFILES:N*.jar}
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_JAVA=		run
 USE_JAVA2=		1.4
 NO_BUILD=		YES
@@ -27,12 +29,14 @@ PLIST_SUBST+=		EXAMPLEDIR=${EXAMPLEDIR:Q}
 PLIST_SUBST+=		DOCDIR=${DOCDIR:Q}
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/java
-	${INSTALL_DATA} ${DISTDIR}/${JARDIST} ${PREFIX}/lib/java/${JARFILE}
-	${INSTALL_DATA_DIR} ${PREFIX}/${EXAMPLEDIR}
-	${INSTALL_DATA} ${WRKSRC}/example/*.java ${PREFIX}/${EXAMPLEDIR}
-	${INSTALL_DATA_DIR} ${PREFIX}/${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/${DOCDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/java
+	${INSTALL_DATA} ${DISTDIR}/${JARDIST} \
+		${DESTDIR}${PREFIX}/lib/java/${JARFILE}
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/${EXAMPLEDIR}
+	${INSTALL_DATA} ${WRKSRC}/example/*.java \
+		${DESTDIR}${PREFIX}/${EXAMPLEDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/${DOCDIR}
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/jdbc-postgresql81/Makefile b/databases/jdbc-postgresql81/Makefile
index 65b3111130f..9d599361979 100644
--- a/databases/jdbc-postgresql81/Makefile
+++ b/databases/jdbc-postgresql81/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/01/07 23:15:01 abs Exp $
+# $NetBSD: Makefile,v 1.8 2008/03/03 15:21:07 jlam Exp $
 #
 
 DISTNAME=		postgresql-jdbc-8.1-${PGBUILD}.src
@@ -16,6 +16,8 @@ JARDIST=		postgresql-8.1-${PGBUILD}.jdbc3.jar
 JARFILE=		postgresql81.jar
 EXTRACT_ONLY=		${DISTFILES:N*.jar}
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_JAVA=		run
 USE_JAVA2=		1.4
 NO_BUILD=		YES
@@ -27,12 +29,14 @@ PLIST_SUBST+=		EXAMPLEDIR=${EXAMPLEDIR:Q}
 PLIST_SUBST+=		DOCDIR=${DOCDIR:Q}
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/java
-	${INSTALL_DATA} ${DISTDIR}/${JARDIST} ${PREFIX}/lib/java/${JARFILE}
-	${INSTALL_DATA_DIR} ${PREFIX}/${EXAMPLEDIR}
-	${INSTALL_DATA} ${WRKSRC}/example/*.java ${PREFIX}/${EXAMPLEDIR}
-	${INSTALL_DATA_DIR} ${PREFIX}/${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/${DOCDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/java
+	${INSTALL_DATA} ${DISTDIR}/${JARDIST} \
+		${DESTDIR}${PREFIX}/lib/java/${JARFILE}
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/${EXAMPLEDIR}
+	${INSTALL_DATA} ${WRKSRC}/example/*.java \
+		${DESTDIR}${PREFIX}/${EXAMPLEDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/${DOCDIR}
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/jdbc-postgresql82/Makefile b/databases/jdbc-postgresql82/Makefile
index 4c1cda014cf..b8a760dc869 100644
--- a/databases/jdbc-postgresql82/Makefile
+++ b/databases/jdbc-postgresql82/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/01/07 23:04:56 abs Exp $
+# $NetBSD: Makefile,v 1.3 2008/03/03 15:21:07 jlam Exp $
 #
 
 DISTNAME=		postgresql-jdbc-8.2-${PGBUILD}.src
@@ -16,6 +16,8 @@ JARDIST=		postgresql-8.2-${PGBUILD}.jdbc3.jar
 JARFILE=		postgresql82.jar
 EXTRACT_ONLY=           ${DISTFILES:N*.jar}
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_JAVA=		run
 USE_JAVA2=		1.4
 NO_BUILD=       	YES
@@ -25,10 +27,11 @@ PLIST_SUBST+=		JARFILE=${JARFILE:Q}
 PLIST_SUBST+=		DOCDIR=${DOCDIR:Q}
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/java
-	${INSTALL_DATA} ${DISTDIR}/${JARDIST} ${PREFIX}/lib/java/${JARFILE}
-	${INSTALL_DATA_DIR} ${PREFIX}/${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/${DOCDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/java
+	${INSTALL_DATA} ${DISTDIR}/${JARDIST} \
+		${DESTDIR}${PREFIX}/lib/java/${JARFILE}
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/${DOCDIR}
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/libpqxx-doc/Makefile b/databases/libpqxx-doc/Makefile
index 714cda269d3..93539f1d13a 100644
--- a/databases/libpqxx-doc/Makefile
+++ b/databases/libpqxx-doc/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2007/02/15 15:36:04 rillig Exp $
+# $NetBSD: Makefile,v 1.3 2008/03/03 15:21:07 jlam Exp $
 #
 
 PKGNAME=	libpqxx-doc-${LIBPQXX_VERSION}
 PKGREVISION=	1
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../databases/libpqxx/Makefile.common"
 
 COMMENT=	Documentation for libpqxx
@@ -17,9 +19,13 @@ INSTALLATION_DIRS+=	${PQXXDOC}/Reference ${PQXXDOC}/Tutorial
 INSTALLATION_DIRS+=	share/examples/libpqxx
 
 do-install:
-	${INSTALL_DATA} ${PQXXDOCSRC}/Reference/*.html ${PQXXDOC}/Reference
-	${INSTALL_DATA} ${PQXXDOCSRC}/Reference/doxygen.* ${PQXXDOC}/Reference
-	${INSTALL_DATA} ${PQXXDOCSRC}/Tutorial/*.html	${PQXXDOC}/Tutorial
-	${INSTALL_DATA} ${WRKSRC}/test/*.cxx ${PREFIX}/share/examples/libpqxx
+	${INSTALL_DATA} ${PQXXDOCSRC}/Reference/*.html \
+		${DESTDIR}${PQXXDOC}/Reference
+	${INSTALL_DATA} ${PQXXDOCSRC}/Reference/doxygen.* \
+		${DESTDIR}${PQXXDOC}/Reference
+	${INSTALL_DATA} ${PQXXDOCSRC}/Tutorial/*.html	\
+		${DESTDIR}${PQXXDOC}/Tutorial
+	${INSTALL_DATA} ${WRKSRC}/test/*.cxx \
+		${DESTDIR}${PREFIX}/share/examples/libpqxx
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/lua-sqlite/Makefile b/databases/lua-sqlite/Makefile
index bacd353c4d1..84c34d28a2a 100644
--- a/databases/lua-sqlite/Makefile
+++ b/databases/lua-sqlite/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2008/02/28 11:58:48 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2008/03/03 15:21:07 jlam Exp $
 #
 
 DISTNAME=	lsqlite_src
@@ -12,21 +12,25 @@ MAINTAINER=	pancake@phreaker.net
 HOMEPAGE=	http://lua-users.org/wiki/LuaSqlite
 COMMENT=	SQLite binding for LUA
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}
 
 CFLAGS+=	-fPIC
 LIBS+=		-llua -lsqlite
 
-AUTO_MKDIRS=			yes
+AUTO_MKDIRS=	yes
 
 do-build:
 	cd ${WRKSRC}; ${CC} -shared ${CFLAGS} ${LDFLAGS} lsqlite.c	\
 		-o libluasqlite.so ${LIBS}
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/libluasqlite.so ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/readme.txt ${PREFIX}/share/doc/lua-sqlite
-	${INSTALL_DATA} ${WRKSRC}/test.lua ${PREFIX}/share/examples/lua-sqlite
+	${INSTALL_DATA} ${WRKSRC}/libluasqlite.so ${DESTDIR}${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/readme.txt \
+		${DESTDIR}${PREFIX}/share/doc/lua-sqlite
+	${INSTALL_DATA} ${WRKSRC}/test.lua \
+		${DESTDIR}${PREFIX}/share/examples/lua-sqlite
 
 .include "../../databases/sqlite/buildlink3.mk"
 .include "../../lang/lua/buildlink3.mk"
diff --git a/databases/mysqlcc/Makefile b/databases/mysqlcc/Makefile
index fd6f92f3a37..aeae76d58f0 100644
--- a/databases/mysqlcc/Makefile
+++ b/databases/mysqlcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2008/01/18 05:06:28 tnn Exp $
+# $NetBSD: Makefile,v 1.22 2008/03/03 15:21:07 jlam Exp $
 #
 
 DISTNAME=		mysqlcc-0.9.4-src
@@ -11,6 +11,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.mysql.com/
 COMMENT=		MySQL Control Center
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_LANGUAGES=		c c++
 USE_PKGLOCALEDIR=	YES
 USE_TOOLS+=		automake
@@ -31,7 +33,7 @@ pre-configure:
 	cd ${WRKSRC} && aclocal && autoconf
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/mysqlcc ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/mysqlcc ${DESTDIR}${PREFIX}/bin
 
 .include "../../security/openssl/buildlink3.mk"
 .include "../../x11/qt3-tools/buildlink3.mk"
diff --git a/databases/oraedit/Makefile b/databases/oraedit/Makefile
index d1ccfe51c3e..63a02bb6101 100644
--- a/databases/oraedit/Makefile
+++ b/databases/oraedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/02/05 23:08:32 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2008/03/03 15:21:07 jlam Exp $
 
 DISTNAME=	oraedit-0.1.4
 PKGREVISION=	1
@@ -9,6 +9,8 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	jdolecek@NetBSD.org
 COMMENT=	Editor of PL/SQL source stored in Oracle database
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
@@ -16,7 +18,7 @@ PYTHON_PATCH_SCRIPTS=	oraedit
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/oraedit ${PREFIX}/bin/oraedit
+	${INSTALL_SCRIPT} ${WRKSRC}/oraedit ${DESTDIR}${PREFIX}/bin/oraedit
 
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/phpldapadmin/Makefile b/databases/phpldapadmin/Makefile
index ff8ef142440..8dc354dbc9b 100644
--- a/databases/phpldapadmin/Makefile
+++ b/databases/phpldapadmin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2007/10/03 14:45:42 heinz Exp $
+# $NetBSD: Makefile,v 1.28 2008/03/03 15:21:07 jlam Exp $
 
 DISTNAME=	phpldapadmin-${VERSION}
 CATEGORIES=	databases www
@@ -9,6 +9,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://phpldapadmin.sourceforge.net/
 COMMENT=	Set of PHP-scripts to administer an LDAP directory over the WWW
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../mk/bsd.prefs.mk"
 .include "../../lang/php/phpversion.mk"
 
@@ -32,31 +34,35 @@ do-configure:
 		${FILESDIR}/phpldapadmin.conf > ${WRKDIR}/phpldapadmin.conf
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/phpldapadmin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/phpldapadmin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/phpldapadmin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/phpldapadmin/config
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/phpldapadmin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/phpldapadmin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/phpldapadmin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/phpldapadmin/config
 
 	${INSTALL_DATA} ${WRKSRC}/config/config.php.example \
-		${PREFIX}/share/examples/phpldapadmin/config.php.example
+		${DESTDIR}${PREFIX}/share/examples/phpldapadmin/config.php.example
 	${INSTALL_DATA} ${WRKDIR}/phpldapadmin.conf \
-		${PREFIX}/share/examples/phpldapadmin/phpldapadmin.conf
+		${DESTDIR}${PREFIX}/share/examples/phpldapadmin/phpldapadmin.conf
 
 	${RM} ${WRKSRC}/.cvsignore
 	${RM} ${WRKSRC}/config/.cvsignore
 
-	${INSTALL_DATA} ${WRKSRC}/index.php ${PREFIX}/share/phpldapadmin
+	${INSTALL_DATA} ${WRKSRC}/index.php \
+		${DESTDIR}${PREFIX}/share/phpldapadmin
 
 .for i in ${PAX_DIRS}
 	cd ${WRKSRC}/${i:Q} && ${PAX} \
-		-rwppm . ${PREFIX}/share/phpldapadmin/${i:Q}
+		-rwppm . ${DESTDIR}${PREFIX}/share/phpldapadmin/${i:Q}
 .endfor
 
-	${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/phpldapadmin
-	${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/share/doc/phpldapadmin
-	${INSTALL_DATA} ${WRKSRC}/VERSION ${PREFIX}/share/phpldapadmin
+	${INSTALL_DATA} ${WRKSRC}/INSTALL \
+		${DESTDIR}${PREFIX}/share/doc/phpldapadmin
+	${INSTALL_DATA} ${WRKSRC}/LICENSE \
+		${DESTDIR}${PREFIX}/share/doc/phpldapadmin
+	${INSTALL_DATA} ${WRKSRC}/VERSION \
+		${DESTDIR}${PREFIX}/share/phpldapadmin
 
-	${FIND} ${PREFIX}/share/phpldapadmin -type d | \
+	${FIND} ${DESTDIR}${PREFIX}/share/phpldapadmin -type d | \
 		${XARGS} ${CHMOD} ${PKGDIRMODE}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile
index bd15a7f04bd..d638ac25b07 100644
--- a/databases/phpmyadmin/Makefile
+++ b/databases/phpmyadmin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2007/11/27 15:20:47 tron Exp $
+# $NetBSD: Makefile,v 1.64 2008/03/03 15:21:07 jlam Exp $
 
 DISTNAME=	phpMyAdmin-${DIST_VERSION}-all-languages
 PKGNAME=	phpmyadmin-${DIST_VERSION:S/-//}
@@ -14,6 +14,8 @@ COMMENT=	Set of PHP-scripts to adminstrate MySQL over the WWW
 DEPENDS+=	${PHP_PKG_PREFIX}-mbstring>=4.3.3:../../misc/php-mbstring
 DEPENDS+=	${PHP_PKG_PREFIX}-mysql{,i}>=4.3.3:../../databases/php-mysql
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 FILES_SUBST+=	CONF_INC_PHP=${CONF_INC_PHP:Q} PMCONFFILE=${PMCONFFILE:Q}
 PLIST_SUBST+=	DIST_VERSION=${DIST_VERSION:Q}
 MESSAGE_SUBST+=	CONF_INC_PHP=${CONF_INC_PHP} PMCONFFILE=${PMCONFFILE:Q} \
@@ -59,22 +61,22 @@ do-configure:
 
 do-install:
 	${FIND} ${WRKSRC} -name "*.orig" -print | ${XARGS} ${RM}
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/phpmyadmin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/phpmyadmin
-	${INSTALL_DATA_DIR} ${PMDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/phpmyadmin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/phpmyadmin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PMDIR}
 	for dir in ${INSTALL_DIRS}; do \
-		${INSTALL_DATA_DIR} ${PMDIR}/$$dir; \
+		${INSTALL_DATA_DIR} ${DESTDIR}${PMDIR}/$$dir; \
 	done
-	${INSTALL_DATA_DIR} ${PMDIR}/scripts
+	${INSTALL_DATA_DIR} ${DESTDIR}${PMDIR}/scripts
 
-	${INSTALL_DATA} ${WRKSRC}/*.php ${PMDIR}
-	${INSTALL_DATA} ${WRKSRC}/*.css ${PMDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.php ${DESTDIR}${PMDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.css ${DESTDIR}${PMDIR}
 	${MV} ${PREFIX}/share/phpmyadmin/config.sample.inc.php \
-	  ${EXDIR}/config.inc.php
+	  ${DESTDIR}${EXDIR}/config.inc.php
 
-	${INSTALL_DATA} ${WRKSRC}/Documentation.html ${PMDIR}
-	${INSTALL_DATA} ${WRKSRC}/translators.html ${PMDIR}
-	${INSTALL_DATA}	${WRKSRC}/ChangeLog ${PMDIR}
+	${INSTALL_DATA} ${WRKSRC}/Documentation.html ${DESTDIR}${PMDIR}
+	${INSTALL_DATA} ${WRKSRC}/translators.html ${DESTDIR}${PMDIR}
+	${INSTALL_DATA}	${WRKSRC}/ChangeLog ${DESTDIR}${PMDIR}
 
 	for dir in ${INSTALL_DIRS}; do					\
 		for file in ${WRKSRC}/$$dir/*; do			\
@@ -84,21 +86,22 @@ do-install:
 			*)						\
 				if [ -f "$$file" ]; then		\
 					${INSTALL_DATA} "$$file"	\
-					  ${PMDIR}/$$dir;		\
+					  ${DESTDIR}${PMDIR}/$$dir;	\
 				fi					\
 				;;					\
 			esac;						\
 		done							\
 	done
 
-	${INSTALL_DATA} ${WRKSRC}/scripts/*.sql ${PMDIR}/scripts
-	${INSTALL_SCRIPT} ${WRKSRC}/scripts/convertcfg.pl ${PMDIR}/scripts
+	${INSTALL_DATA} ${WRKSRC}/scripts/*.sql ${DESTDIR}${PMDIR}/scripts
+	${INSTALL_SCRIPT} ${WRKSRC}/scripts/convertcfg.pl \
+	  ${DESTDIR}${PMDIR}/scripts
 
 	cd ${WRKSRC} && \
-	${INSTALL_DATA} ${DOC_FILES} ${PREFIX}/share/doc/phpmyadmin
-	${INSTALL_DATA} ${WRKDIR}/phpmyadmin.conf ${EXDIR}/apache.conf
+	${INSTALL_DATA} ${DOC_FILES} ${DESTDIR}${PREFIX}/share/doc/phpmyadmin
+	${INSTALL_DATA} ${WRKDIR}/phpmyadmin.conf ${DESTDIR}${EXDIR}/apache.conf
 
-	${RM} -f ${PREFIX}/share/phpmyadmin/libraries/footer.inc.php.orig
+	${RM} -f ${DESTDIR}${PREFIX}/share/phpmyadmin/libraries/footer.inc.php.orig
 
 .include "../../lang/php/phpversion.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/sqlitemanager/Makefile b/databases/sqlitemanager/Makefile
index 476bfa4ef57..bbef44bd63a 100644
--- a/databases/sqlitemanager/Makefile
+++ b/databases/sqlitemanager/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2007/07/04 20:54:37 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2008/03/03 15:21:07 jlam Exp $
 #
 
 DISTNAME=		SQLiteManager-1.0.4
@@ -12,16 +12,18 @@ COMMENT=		Web frontend for managing SQLite databases
 
 DEPENDS+=		php>=5.0.3nb1:../../lang/php5
 
+PKG_DESTDIR_SUPPORT=	destdir
+
 NO_BUILD=		yes
 
 PKG_USERS_VARS+=	APACHE_USER
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share
-	${INSTALL_DATA_DIR} ${PREFIX}/share/sqlitemanager
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/sqlitemanager
 	cd ${WRKSRC} && \
 	${PAX} -rw include index.php lang left.php main.php test.sqlite theme \
-	    ${PREFIX}/share/sqlitemanager
-	${CHOWN} -R ${APACHE_USER} ${PREFIX}/share/sqlitemanager
+	    ${DESTDIR}${PREFIX}/share/sqlitemanager
+	${CHOWN} -R ${APACHE_USER} ${DESTDIR}${PREFIX}/share/sqlitemanager
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/tcl-fbsql/Makefile b/databases/tcl-fbsql/Makefile
index ff6781f6132..c95c905f7b1 100644
--- a/databases/tcl-fbsql/Makefile
+++ b/databases/tcl-fbsql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2007/02/22 19:26:19 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2008/03/03 15:21:07 jlam Exp $
 
 DISTNAME=		fbsql.c
 PKGNAME=		tcl-fbsql-1.06
@@ -11,6 +11,8 @@ MAINTAINER=		bouyer@NetBSD.org
 HOMEPAGE=		http://www.fastbase.co.nz/fbsql/index.html
 COMMENT=		Tcl interface to MySQL
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}/src
 USE_LIBTOOL=		YES
 DIST_SUBDIR=		${PKGNAME_NOREV}
@@ -22,7 +24,7 @@ do-extract:
 	${CP} ${_DISTDIR}/fbsql.c ${WRKSRC}/
 
 do-install:
-	${INSTALL_LIB} ${WRKSRC}/fbsql.so ${PREFIX}/lib/tcl
+	${INSTALL_LIB} ${WRKSRC}/fbsql.so ${DESTDIR}${PREFIX}/lib/tcl
 
 .include "../../mk/mysql.buildlink3.mk"
 .include "../../lang/tcl/buildlink3.mk"
diff --git a/databases/unixodbc-DataManager/Makefile b/databases/unixodbc-DataManager/Makefile
index 51bbdf1e7d4..18f5d86095e 100644
--- a/databases/unixodbc-DataManager/Makefile
+++ b/databases/unixodbc-DataManager/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.21 2006/09/09 02:41:56 obache Exp $
+# $NetBSD: Makefile,v 1.22 2008/03/03 15:21:07 jlam Exp $
 
 PKGNAME=		unixodbc-DataManager-${ODBC_BASE_VERS}
 PKGREVISION=		3
 COMMENT=		GUI tool for unixODBC data source management
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../databases/unixodbc/Makefile.common"
 
 CONFIGURE_ARGS+=	--enable-gui
@@ -37,7 +39,8 @@ do-build:
 		${MAKE_FLAGS} -f ${MAKE_FILE} ${BUILD_TARGET}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/DataManager/DataManager ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/DataManager/DataManager \
+		${DESTDIR}${PREFIX}/bin
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../databases/unixodbc/buildlink3.mk"
diff --git a/databases/unixodbc-ODBCConfig/Makefile b/databases/unixodbc-ODBCConfig/Makefile
index 3c75dcf3cb4..1d156d95609 100644
--- a/databases/unixodbc-ODBCConfig/Makefile
+++ b/databases/unixodbc-ODBCConfig/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.20 2006/09/09 02:41:56 obache Exp $
+# $NetBSD: Makefile,v 1.21 2008/03/03 15:21:07 jlam Exp $
 
 PKGNAME=		unixodbc-ODBCConfig-${ODBC_BASE_VERS}
 PKGREVISION=		3
 COMMENT=		GUI tool for unixODBC driver configuration
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../databases/unixodbc/Makefile.common"
 
 CONFIGURE_ARGS+=	--enable-gui
@@ -37,7 +39,8 @@ do-build:
 		${MAKE_FLAGS} -f ${MAKE_FILE} ${BUILD_TARGET}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/ODBCConfig/ODBCConfig ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/ODBCConfig/ODBCConfig \
+		${DESTDIR}${PREFIX}/bin
 
 .include "../../databases/unixodbc/buildlink3.mk"
 .include "../../x11/qt2-libs/buildlink3.mk"
diff --git a/databases/xsqlmenu/Makefile b/databases/xsqlmenu/Makefile
index a71027db33e..f8fe4007618 100644
--- a/databases/xsqlmenu/Makefile
+++ b/databases/xsqlmenu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/12/15 20:32:53 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2008/03/03 15:21:07 jlam Exp $
 #
 
 DISTNAME=	xsqlmenu-2.10
@@ -10,17 +10,22 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.jlab.org/~saw/xsqlmenu/
 COMMENT=	X based GUI for MySQL
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=	gmake
 MAKE_ENV+=	MAKE=${MAKE_PROGRAM:Q}
 
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/xsqlmenu ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xsqlmenu
-	${INSTALL_DATA} ${WRKSRC}/xsqlmenu.README ${PREFIX}/share/doc/xsqlmenu
-	${INSTALL_DATA} ${WRKSRC}/xsqlmenu.lsm ${PREFIX}/share/doc/xsqlmenu
-	${INSTALL_DATA} ${WRKSRC}/[A-Z][A-Z]* ${PREFIX}/share/doc/xsqlmenu
+	${INSTALL_PROGRAM} ${WRKSRC}/xsqlmenu ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/xsqlmenu
+	${INSTALL_DATA} ${WRKSRC}/xsqlmenu.README \
+		${DESTDIR}${PREFIX}/share/doc/xsqlmenu
+	${INSTALL_DATA} ${WRKSRC}/xsqlmenu.lsm \
+		${DESTDIR}${PREFIX}/share/doc/xsqlmenu
+	${INSTALL_DATA} ${WRKSRC}/[A-Z][A-Z]* \
+		${DESTDIR}${PREFIX}/share/doc/xsqlmenu
 
 .include "../../mk/mysql.buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
diff --git a/databases/yap2lc/Makefile b/databases/yap2lc/Makefile
index 0a9149f08cf..b803becf7f0 100644
--- a/databases/yap2lc/Makefile
+++ b/databases/yap2lc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/01/12 11:36:31 adam Exp $
+# $NetBSD: Makefile,v 1.3 2008/03/03 15:21:07 jlam Exp $
 
 DISTNAME=	yap2lc-0.5.9
 PKGREVISION=	1
@@ -9,17 +9,19 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://sourceforge.net/projects/yap2lc/
 COMMENT=	Yet Another Passwd 2 LDIF Converter
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=		YES
 
 INSTALLATION_DIRS=	bin share/doc/yap2lc share/examples/yap2lc
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/yap2lc ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/yap2lc
+	${INSTALL_PROGRAM} ${WRKSRC}/yap2lc ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/yap2lc
 	${INSTALL_DATA} ${WRKSRC}/samples/ldif.template \
-	  ${PREFIX}/share/examples/yap2lc
+	  ${DESTDIR}${PREFIX}/share/examples/yap2lc
 	${INSTALL_DATA} ${WRKSRC}/samples/yap2lc.conf \
-	  ${PREFIX}/share/examples/yap2lc
+	  ${DESTDIR}${PREFIX}/share/examples/yap2lc
 
 .include "../../databases/db4/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/yasql/Makefile b/databases/yasql/Makefile
index 309b222e4bc..b0a28f92b00 100644
--- a/databases/yasql/Makefile
+++ b/databases/yasql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/07/07 22:10:07 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2008/03/03 15:21:07 jlam Exp $
 
 DISTNAME=	yasql-1.81
 PKGREVISION=	1
@@ -13,6 +13,8 @@ DEPENDS+=	p5-DBD-Oracle-[0-9]*:../../databases/p5-DBD-Oracle
 DEPENDS+=	p5-Term-ReadLine-[0-9]*:../../devel/p5-Term-ReadLine
 DEPENDS+=	p5-Term-ReadKey-[0-9]*:../../devel/p5-Term-ReadKey
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=	perl:run
 GNU_CONFIGURE=	yes
 NO_BUILD=	yes
@@ -28,10 +30,11 @@ post-configure:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} default
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/yasql ${PREFIX}/bin/yasql
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/yasql
+	${INSTALL_SCRIPT} ${WRKSRC}/yasql ${DESTDIR}${PREFIX}/bin/yasql
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/yasql
 	${INSTALL_DATA} ${WRKSRC}/yasql.conf \
-		${PREFIX}/share/examples/yasql/yasql.conf
-	${INSTALL_MAN} ${WRKSRC}/yasql.1 ${PREFIX}/${PKGMANDIR}/man1/yasql.1
+		${DESTDIR}${PREFIX}/share/examples/yasql/yasql.conf
+	${INSTALL_MAN} ${WRKSRC}/yasql.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/yasql.1
 
 .include "../../mk/bsd.pkg.mk"