DESTDIR support

4 files changed, 29 insertions, 26 deletions

diff --git a/print/tex-ucs/Makefile b/print/tex-ucs/Makefile
index 9840e5a025b..196dc93345c 100644
--- a/print/tex-ucs/Makefile
+++ b/print/tex-ucs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2009/07/22 09:01:45 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2010/01/27 16:41:59 joerg Exp $
 #
 
 DISTNAME=	unicode
@@ -12,6 +12,8 @@ MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://www.unruh.de/DniQ/latex/unicode/
 COMMENT=	LaTeX UTF-8 support
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/ucs
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
@@ -21,14 +23,13 @@ UCSDIR=		${PKG_LOCALTEXMFPREFIX}/tex/latex/ucs
 
 .include "../../print/teTeX/module.mk"
 
+INSTALLATION_DIRS+=	${UCSDIR}/data ${UCSDIR}/contrib
+
 do-install:
-	${INSTALL_DATA_DIR} ${UCSDIR}
 .for f in ${UCSFILES}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${UCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${UCSDIR}
 .endfor
-	${INSTALL_DATA_DIR} ${UCSDIR}/data
-	${INSTALL_DATA} ${WRKSRC}/data/* ${UCSDIR}/data/
-	${INSTALL_DATA_DIR} ${UCSDIR}/contrib
-	${INSTALL_DATA} ${WRKSRC}/contrib/* ${UCSDIR}/contrib/
+	${INSTALL_DATA} ${WRKSRC}/data/* ${DESTDIR}${UCSDIR}/data/
+	${INSTALL_DATA} ${WRKSRC}/contrib/* ${DESTDIR}${UCSDIR}/contrib/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/xpp/Makefile b/print/xpp/Makefile
index 80541184b53..69671637e96 100644
--- a/print/xpp/Makefile
+++ b/print/xpp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2010/01/18 09:59:24 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2010/01/27 16:47:08 joerg Exp $
 
 DISTNAME=	xpp-1.5
 PKGREVISION=	4
@@ -9,17 +9,19 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://cups.sourceforge.net/xpp/index.html
 COMMENT=	X Printing Panel
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=	gmake
 GNU_CONFIGURE=	yes
 USE_LANGUAGES=	c c++
 
 DOCDIR=		${PREFIX}/share/doc/xpp
 
-.include "../../print/cups/buildlink3.mk"
-.include "../../x11/fltk/buildlink3.mk"
+INSTALLATION_DIRS+=	${DOCDIR}
 
 post-install:
-	${INSTALL_DATA_DIR} ${DOCDIR}
-	cd ${WRKSRC}; ${INSTALL_DATA} LICENSE README ${DOCDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} LICENSE README ${DESTDIR}${DOCDIR}
 
+.include "../../print/cups/buildlink3.mk"
+.include "../../x11/fltk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/yup/Makefile b/print/yup/Makefile
index 43445ab4c39..58997e8588e 100644
--- a/print/yup/Makefile
+++ b/print/yup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2007/01/07 09:14:09 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2010/01/27 16:47:41 joerg Exp $
 #
 
 DISTNAME=		yup-r1-rel
@@ -11,6 +11,7 @@ MAINTAINER=		grant@NetBSD.org
 COMMENT=		Print multiple PostScript/ASCII pages per sheet
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_TOOLS+=		perl:run
 
@@ -21,7 +22,7 @@ NO_BUILD=		yes
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/yup ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/yup.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_SCRIPT} ${WRKSRC}/yup ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/yup.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/smtpd/Makefile b/security/smtpd/Makefile
index c760b7c57c2..21ab8ca372e 100644
--- a/security/smtpd/Makefile
+++ b/security/smtpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2007/07/22 22:26:04 adrianp Exp $
+# $NetBSD: Makefile,v 1.22 2010/01/27 16:51:14 joerg Exp $
 #
 
 DISTNAME=	smtpd-2.0
@@ -15,6 +15,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.obtuse.com/smtpd.html
 COMMENT=	Store and forward SMTP proxy
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 SPOOL=		/var/spool/smtpd
 
 RCD_SCRIPTS=	smtpfwdd
@@ -30,20 +32,17 @@ OPSYSVARS+=	LD_LIBS
 LD_LIBS.SunOS+=	-lnsl -lsocket -lresolv
 MAKE_ENV+=	LD_LIBS=${LD_LIBS:Q}
 
-INSTALLATION_DIRS=	sbin
-OWN_DIRS=		${SPOOL}
+INSTALLATION_DIRS=	sbin share/doc/smtpd share/examples/smtpd
+OWN_DIRS=		${SPOOL}/etc
 
 do-install:
-	${INSTALL_DATA_DIR} ${SPOOL}/etc
-	${INSTALL} -m 500 ${WRKSRC}/smtpd ${PREFIX}/sbin/smtpd
-	${INSTALL} -m 500 ${WRKSRC}/smtpfwdd ${PREFIX}/sbin/smtpfwdd
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/smtpd
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/smtpd
-	${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/smtpd
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/smtpd
+	${INSTALL_PROGRAM} -m 500 ${WRKSRC}/smtpd ${DESTDIR}${PREFIX}/sbin/smtpd
+	${INSTALL_PROGRAM} -m 500 ${WRKSRC}/smtpfwdd ${DESTDIR}${PREFIX}/sbin/smtpfwdd
+	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/INSTALL \
+	    ${DESTDIR}${PREFIX}/share/doc/smtpd
 .for f in antirelay_check_rules_example antispam_check_rules.example \
 	    smtpd_check_rules.example
-		${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/examples/smtpd
+		${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/share/examples/smtpd
 .endfor
 
 .include "../../devel/sysexits/buildlink3.mk"