Added PKG_DESTDIR_SUPPORT=user-destdir

4 files changed, 21 insertions, 13 deletions

diff --git a/mail/clamsmtp/Makefile b/mail/clamsmtp/Makefile
index 50d976b8d3a..f807c221cba 100644
--- a/mail/clamsmtp/Makefile
+++ b/mail/clamsmtp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2009/03/22 11:21:04 martti Exp $
+# $NetBSD: Makefile,v 1.40 2009/05/12 11:09:26 martti Exp $
 
 DISTNAME=		clamsmtp-1.10
 #PKGREVISION=		1
@@ -11,11 +11,12 @@ COMMENT=		SMTP filter that allows you to check for viruses
 #LICENSE=		modified-bsd
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		yes
 RCD_SCRIPTS=		clamsmtpd
 
-MESSAGE_SUBST+=		HOMEPAGE=${HOMEPAGE}
+MESSAGE_SUBST+=		HOMEPAGE=${HOMEPAGE:Q}
 FILES_SUBST+=		CLAMAV_USER=${CLAMAV_USER}
 
 # Doesn't work with GNU pth (missing required mutex features)
@@ -30,8 +31,8 @@ INSTALLATION_DIRS=	share/examples/${PKGBASE}
 PKG_USERS_VARS=		CLAMAV_USER
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/doc/clamsmtpd.conf ${EGDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/scripts/virus_action.sh ${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/clamsmtpd.conf ${DESTDIR}${EGDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/scripts/virus_action.sh ${DESTDIR}${EGDIR}
 
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/corkscrew/Makefile b/net/corkscrew/Makefile
index 7e3ff806a07..57d3a5f30a9 100644
--- a/net/corkscrew/Makefile
+++ b/net/corkscrew/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2007/10/30 19:31:41 martti Exp $
+# $NetBSD: Makefile,v 1.6 2009/05/12 11:09:26 martti Exp $
 
 DISTNAME=	corkscrew-2.0
 CATEGORIES=	net
@@ -9,10 +9,12 @@ HOMEPAGE=	http://www.agroman.net/corkscrew/
 COMMENT=	Tool for tunneling SSH through HTTP proxies
 #LICENSE=	gnu-gpl-v2
 
+INSTALLATION_DIRS=	share/doc/corkscrew
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=	YES
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX:Q}/share/doc/corkscrew
-	${INSTALL_DATA} ${WRKSRC:Q}/README ${PREFIX:Q}/share/doc/corkscrew
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/corkscrew
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/keychain/Makefile b/security/keychain/Makefile
index f6890103164..46aa75aae1c 100644
--- a/security/keychain/Makefile
+++ b/security/keychain/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2007/10/30 19:31:42 martti Exp $
+# $NetBSD: Makefile,v 1.25 2009/05/12 11:09:26 martti Exp $
 
 DISTNAME=	keychain-2.6.8
 CATEGORIES=	security
@@ -15,14 +15,17 @@ DEPENDS+=	openssh-[0-9]*:../../security/openssh
 .endif
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 NO_BUILD=		yes
 
-INSTALLATION_DIRS=	bin ${PKGMANDIR:Q}/man1 share/doc/${PKGBASE:Q}
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/doc/${PKGBASE}
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC:Q}/keychain ${PREFIX:Q}/bin
-	${INSTALL_MAN} ${WRKSRC:Q}/keychain.1 ${PREFIX:Q}/${PKGMANDIR:Q}/man1
-	${INSTALL_DATA} ${WRKSRC:Q}/README ${PREFIX:Q}/share/doc/${PKGBASE:Q}
+	${INSTALL_SCRIPT} ${WRKSRC}/keychain ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/keychain.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_DATA} ${WRKSRC}/README \
+		${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-URI-Escape-XS/Makefile b/www/p5-URI-Escape-XS/Makefile
index 4c0dfeefabd..b28f0165be8 100644
--- a/www/p5-URI-Escape-XS/Makefile
+++ b/www/p5-URI-Escape-XS/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/04/29 22:47:35 sno Exp $
+# $NetBSD: Makefile,v 1.4 2009/05/12 11:09:26 martti Exp $
 
 DISTNAME=	URI-Escape-XS-0.05
 PKGNAME=	p5-${DISTNAME}
@@ -12,6 +12,8 @@ LICENSE=	gnu-gpl-v2 # OR artistic
 
 DEPENDS+=	p5-URI>=1.35:../../www/p5-URI
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 PERL5_PACKLIST=	auto/URI/Escape/XS/.packlist
 
 .include "../../lang/perl5/module.mk"