DESTDIR support.

4 files changed, 26 insertions, 18 deletions

diff --git a/devel/p5-subversion/Makefile b/devel/p5-subversion/Makefile
index 057baaaa2c4..e3ef264a9f9 100644
--- a/devel/p5-subversion/Makefile
+++ b/devel/p5-subversion/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.33 2006/07/07 15:49:31 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2006/11/03 19:34:11 joerg Exp $
 
 PKGNAME=	p5-subversion-${SVNVER}
 COMMENT=	Perl bindings for Subversion
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../devel/subversion/Makefile.common"
 
diff --git a/devel/py-subversion/Makefile b/devel/py-subversion/Makefile
index 1a7845e9810..22a596f2675 100644
--- a/devel/py-subversion/Makefile
+++ b/devel/py-subversion/Makefile
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.23 2006/07/07 15:49:32 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2006/11/03 19:34:11 joerg Exp $
 
 PKGNAME=	${PYPKGPREFIX}-subversion-${SVNVER}
 COMMENT=	Python bindings and tools for Subversion
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../devel/subversion/Makefile.common"
 
 SHLIBTOOL_OVERRIDE=	# empty
@@ -22,18 +24,19 @@ MAKE_FLAGS+=		swig_pydir=${LOCALBASE}/${PYSITELIB}/libsvn \
 
 TEST_TARGET=		all check check-swig-py
 
+INSTALLATION_DIRS=	${SVNEXAMPLES}/python ${SVNEXAMPLES}/hook-scripts
+
 post-patch:
 	${RM} ${WRKSRC}/build-outputs.mk
 	${CP} ${FILESDIR}/build-outputs.mk ${WRKSRC}/build-outputs.mk
 
 post-install:
-	${INSTALL_DATA_DIR} ${SVNEXAMPLES}/python
-	${INSTALL_DATA} ${WRKSRC}/tools/examples/*.py ${SVNEXAMPLES}/python
+	${INSTALL_DATA} ${WRKSRC}/tools/examples/*.py ${DESTDIR}${SVNEXAMPLES}/python
 	${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/mailer/mailer.py \
-		${SVNEXAMPLES}/hook-scripts
+		${DESTDIR}${SVNEXAMPLES}/hook-scripts
 	${INSTALL_DATA} \
 		${WRKSRC}/tools/hook-scripts/mailer/mailer.conf.example \
-		${SVNEXAMPLES}/hook-scripts
+		${DESTDIR}${SVNEXAMPLES}/hook-scripts
 
 .include "../../devel/subversion-base/buildlink3.mk"
 .include "../../lang/python/application.mk"
diff --git a/devel/subversion-base/Makefile b/devel/subversion-base/Makefile
index d74a848aba0..02585279827 100644
--- a/devel/subversion-base/Makefile
+++ b/devel/subversion-base/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.38 2006/10/13 12:25:45 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.39 2006/11/03 19:34:11 joerg Exp $
 
 PKGNAME=	subversion-base-${SVNVER}
 COMMENT=	Version control system, base programs and libraries
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../devel/subversion/Makefile.common"
 
@@ -37,19 +38,20 @@ SUBST_SED.paths=        -e "s|/usr/local/bin/|${PREFIX}/bin|g"
 SUBST_MESSAGE.paths=    Fixing hardcoded /usr/local/bin paths.
 
 post-install:
-	${INSTALL_DATA_DIR} ${SVNDOC}
-	cd ${WRKSRC} && ${INSTALL_DATA} INSTALL README ${SVNDOC}
-	cd ${WRKSRC}/doc/user && ${INSTALL_DATA} *.html *.txt ${SVNDOC}
-	${INSTALL_DATA_DIR} ${SVNEXAMPLES}/backup
-	${INSTALL_DATA_DIR} ${SVNEXAMPLES}/cgi
-	${INSTALL_DATA_DIR} ${SVNEXAMPLES}/hook-scripts
+	${INSTALL_DATA_DIR} ${DESTDIR}${SVNDOC}
+	cd ${WRKSRC} && ${INSTALL_DATA} INSTALL README ${DESTDIR}${SVNDOC}
+	cd ${WRKSRC}/doc/user && ${INSTALL_DATA} *.html *.txt ${DESTDIR}${SVNDOC}
+	${INSTALL_DATA_DIR} ${DESTDIR}${SVNEXAMPLES}/backup
+	${INSTALL_DATA_DIR} ${DESTDIR}${SVNEXAMPLES}/cgi
+	${INSTALL_DATA_DIR} ${DESTDIR}${SVNEXAMPLES}/hook-scripts
 	${INSTALL_DATA} ${WRKSRC}/tools/backup/hot-backup.py \
-		${SVNEXAMPLES}/backup
-	${INSTALL_DATA} ${WRKSRC}/contrib/cgi/tweak-log.cgi ${SVNEXAMPLES}/cgi
+		${DESTDIR}${SVNEXAMPLES}/backup
+	${INSTALL_DATA} ${WRKSRC}/contrib/cgi/tweak-log.cgi \
+		${DESTDIR}${SVNEXAMPLES}/cgi
 	${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/commit-email.pl \
-		${SVNEXAMPLES}/hook-scripts
+		${DESTDIR}${SVNEXAMPLES}/hook-scripts
 	${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/svnperms* \
-		${SVNEXAMPLES}/hook-scripts
+		${DESTDIR}${SVNEXAMPLES}/hook-scripts
 
 .PHONY: svn-build-outputs-hack
 # Use this target to update the build-outputs.mk hack for sub-packages.
diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index dfd8d2694db..6bbe5bf9a38 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.28 2006/04/05 01:42:00 epg Exp $
+# $NetBSD: Makefile,v 1.29 2006/11/03 19:34:11 joerg Exp $
 
 PKGNAME=	subversion-${SVNVER}
 COMMENT=	Version control system, meta-package
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	subversion-base-${SVNVER}{,nb[0-9]*}:../../devel/subversion-base
 DEPENDS+=	p5-subversion-${SVNVER}{,nb[0-9]*}:../../devel/p5-subversion
 DEPENDS+=	ap2-subversion-${SVNVER}{,nb[0-9]*}:../../www/ap2-subversion