user-destdir support

2 files changed, 26 insertions, 29 deletions

diff --git a/www/hiawatha/Makefile b/www/hiawatha/Makefile
index 8edf189bf99..f28a0da3d73 100644
--- a/www/hiawatha/Makefile
+++ b/www/hiawatha/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2009/05/13 07:53:49 hasso Exp $
+# $NetBSD: Makefile,v 1.23 2009/07/07 19:27:24 joerg Exp $
 #
 
 DISTNAME=	hiawatha
@@ -40,20 +40,18 @@ post-extract:
 		< ${FILESDIR}/hiawatha.cfg > ${WRKDIR}/hiawatha.cfg
 	${CHMOD} -R go-w ${WRKSRC}
 
+INSTALLATION_DIRS=	lib/java/hiawatha ${EGDIR}/WEBROOT/images
+
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/java/hiawatha
-	${INSTALL_DATA} ${WRKSRC}/hiawatha.jar ${PREFIX}/lib/java/hiawatha
-	${INSTALL_DATA} ${WRKSRC}/xsls.jar ${PREFIX}/lib/java/hiawatha
-	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/simple.cfg ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/SeeAlso/pault_com.cfg ${EGDIR}
-	${INSTALL_DATA} ${WRKDIR}/hiawatha.cfg ${EGDIR}
-	cd ${WRKSRC} && pax -s '/^WEBROOT/pault.com/' -rw WEBROOT ${EGDIR}
-	${INSTALL_DATA_DIR} ${EGDIR}/WEBROOT
-	${INSTALL_DATA} ${FILESDIR}/index.xml ${EGDIR}/WEBROOT
-	${INSTALL_DATA} ${FILESDIR}/index.xsl ${EGDIR}/WEBROOT
-	${INSTALL_DATA_DIR} ${EGDIR}/WEBROOT/images
-	${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif ${EGDIR}/WEBROOT/images
+	${INSTALL_DATA} ${WRKSRC}/hiawatha.jar ${DESTDIR}${PREFIX}/lib/java/hiawatha
+	${INSTALL_DATA} ${WRKSRC}/xsls.jar ${DESTDIR}${PREFIX}/lib/java/hiawatha
+	${INSTALL_DATA} ${WRKSRC}/simple.cfg ${DESTDIR}${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/SeeAlso/pault_com.cfg ${DESTDIR}${EGDIR}
+	${INSTALL_DATA} ${WRKDIR}/hiawatha.cfg ${DESTDIR}${EGDIR}
+	cd ${WRKSRC} && pax -s '/^WEBROOT/pault.com/' -rw WEBROOT ${DESTDIR}${EGDIR}
+	${INSTALL_DATA} ${FILESDIR}/index.xml ${DESTDIR}${EGDIR}/WEBROOT
+	${INSTALL_DATA} ${FILESDIR}/index.xsl ${DESTDIR}${EGDIR}/WEBROOT
+	${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif ${DESTDIR}${EGDIR}/WEBROOT/images
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/htmllint/Makefile b/www/htmllint/Makefile
index 7c5b64c226a..04db5215110 100644
--- a/www/htmllint/Makefile
+++ b/www/htmllint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2006/07/10 10:43:31 rillig Exp $
+# $NetBSD: Makefile,v 1.27 2009/07/07 19:26:27 joerg Exp $
 #
 
 DISTNAME=	htmllint
@@ -12,6 +12,8 @@ MAINTAINER=	kei@NetBSD.org
 HOMEPAGE=	http://openlab.ring.gr.jp/k16/htmllint/
 COMMENT=	Another HTML-Lint program
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	p5-Jcode>=0.68:../../converters/p5-Jcode
 DEPENDS+=	p5-libwww>=5.8:../../www/p5-libwww
 
@@ -26,7 +28,7 @@ CGIDIR=		${PREFIX}/libexec/cgi-bin
 HTMLDIR=	${PREFIX}/share/httpd/htdocs/htmllint
 IMGDIR=		${HTMLDIR}/images
 
-INSTALLATION_DIRS=	bin
+INSTALLATION_DIRS=	bin ${CGIDIR} ${HTMLDIR} ${IMGDIR}
 
 SUBST_CLASSES+=		hl
 SUBST_STAGE.hl=		pre-configure
@@ -35,19 +37,16 @@ SUBST_FILES.hl=		faq.html htmllintenv htmllint htmllint.caller
 SUBST_SED.hl=		-e 's!@PREFIX@!${PREFIX}!g'
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/htmllint.caller ${PREFIX}/bin/htmllint
-	${INSTALL_SCRIPT_DIR} ${CGIDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/*.cgi ${CGIDIR}
-	${INSTALL_DATA} ${WRKSRC}/htmllintrc ${CGIDIR}
-	${INSTALL_DATA} ${WRKSRC}/htmllintenv ${CGIDIR}/htmllint.env.default
-	${TEST} -f ${CGIDIR}/htmllint.env \
-	|| ${INSTALL_DATA} ${CGIDIR}/htmllint.env.default  ${CGIDIR}/htmllint.env
-	${INSTALL_SCRIPT_DIR} ${HTMLDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/htmllint ${HTMLDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/*.pl ${WRKSRC}/*.pm ${HTMLDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/htmllint.caller ${DESTDIR}${PREFIX}/bin/htmllint
+	${INSTALL_SCRIPT} ${WRKSRC}/*.cgi ${DESTDIR}${CGIDIR}
+	${INSTALL_DATA} ${WRKSRC}/htmllintrc ${DESTDIR}${CGIDIR}
+	${INSTALL_DATA} ${WRKSRC}/htmllintenv ${DESTDIR}${CGIDIR}/htmllint.env.default
+	${TEST} -f ${DESTDIR}${CGIDIR}/htmllint.env \
+	|| ${INSTALL_DATA} ${DESTDIR}${CGIDIR}/htmllint.env.default  ${DESTDIR}${CGIDIR}/htmllint.env
+	${INSTALL_SCRIPT} ${WRKSRC}/htmllint ${DESTDIR}${HTMLDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/*.pl ${WRKSRC}/*.pm ${DESTDIR}${HTMLDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} *.css *.dtd *.ent *.html *.rul	\
-		*.txt ${HTMLDIR}
-	${INSTALL_DATA_DIR} ${IMGDIR}
-	${INSTALL_DATA} ${WRKSRC}/*.gif ${IMGDIR}
+		*.txt ${DESTDIR}${HTMLDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.gif ${DESTDIR}${IMGDIR}
 
 .include "../../mk/bsd.pkg.mk"