summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mail/dovecot/Makefile10
-rw-r--r--pkgtools/pkglint/Makefile24
2 files changed, 16 insertions, 18 deletions
diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index 10b276e3cd2..64f3967ee30 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2006/11/19 10:36:34 ghen Exp $
+# $NetBSD: Makefile,v 1.76 2006/12/15 17:35:20 joerg Exp $
DISTNAME= dovecot-1.0.rc15
PKGNAME= ${DISTNAME:S/.rc/rc/}
@@ -10,6 +10,7 @@ HOMEPAGE= http://www.dovecot.org/
COMMENT= Secure IMAP and POP3 server
PKG_INSTALLATION_TYPES= overwrite pkgviews
+PKG_DESTDIR_SUPPORT= user-destdir
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
@@ -49,11 +50,10 @@ post-build:
> ${WRKDIR}/mkcert.sh
post-install:
- ${INSTALL_DATA_DIR} ${EGDIR}
${INSTALL_DATA} ${WRKDIR}/dovecot-example.conf \
- ${EGDIR}/dovecot.conf.default
- ${INSTALL_DATA} ${WRKSRC}/doc/dovecot-* ${EGDIR}
- ${INSTALL_SCRIPT} ${WRKDIR}/mkcert.sh ${EGDIR}
+ ${DESTDIR}${EGDIR}/dovecot.conf.default
+ ${INSTALL_DATA} ${WRKSRC}/doc/dovecot-* ${DESTDIR}${EGDIR}
+ ${INSTALL_SCRIPT} ${WRKDIR}/mkcert.sh ${DESTDIR}${EGDIR}
.include "../../devel/zlib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile
index 11302c808f9..be04ee52a61 100644
--- a/pkgtools/pkglint/Makefile
+++ b/pkgtools/pkglint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.353 2006/11/01 09:14:45 joerg Exp $
+# $NetBSD: Makefile,v 1.354 2006/12/15 17:38:40 joerg Exp $
#
DISTNAME= pkglint-4.73
@@ -15,6 +15,7 @@ DEPENDS+= p5-Digest-SHA1-[0-9]*:../../security/p5-Digest-SHA1
DEPENDS+= p5-pkgsrc-Dewey>=1.0:../../pkgtools/p5-pkgsrc-Dewey
PKG_INSTALLATION_TYPES= overwrite pkgviews
+PKG_DESTDIR_SUPPORT= user-destdir
USE_TOOLS+= perl:run
@@ -54,19 +55,16 @@ do-extract:
cd ${FILESDIR} && ${CP} lintpkgsrc.0 lintpkgsrc.1 lintpkgsrc.pl pkglint.0 pkglint.1 pkglint.pl plist-clash.pl ${WRKSRC}
do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/pkglint.pl ${PREFIX}/bin/pkglint
- ${INSTALL_SCRIPT} ${WRKSRC}/lintpkgsrc.pl ${PREFIX}/bin/lintpkgsrc
- ${INSTALL_SCRIPT} ${WRKSRC}/plist-clash.pl ${PREFIX}/bin/plist-clash
- ${INSTALL_MAN} ${WRKSRC}/lintpkgsrc.0 ${PREFIX}/${PKGMANDIR}/cat1
+ ${INSTALL_SCRIPT} ${WRKSRC}/pkglint.pl ${DESTDIR}${PREFIX}/bin/pkglint
+ ${INSTALL_SCRIPT} ${WRKSRC}/lintpkgsrc.pl ${DESTDIR}${PREFIX}/bin/lintpkgsrc
+ ${INSTALL_SCRIPT} ${WRKSRC}/plist-clash.pl ${DESTDIR}${PREFIX}/bin/plist-clash
+ ${INSTALL_MAN} ${WRKSRC}/lintpkgsrc.0 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1
.if !empty(MANINSTALL:Mmaninstall)
- ${INSTALL_MAN} ${WRKSRC}/lintpkgsrc.1 ${PREFIX}/${PKGMANDIR}/man1
- ${INSTALL_MAN} ${WRKSRC}/pkglint.1 ${PREFIX}/${PKGMANDIR}/man1
+ ${INSTALL_MAN} ${WRKSRC}/lintpkgsrc.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+ ${INSTALL_MAN} ${WRKSRC}/pkglint.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
.endif
- ${INSTALL_MAN} ${WRKSRC}/pkglint.0 ${PREFIX}/${PKGMANDIR}/cat1
- ${INSTALL_DATA} ${FILESDIR}/makevars.map ${PREFIX}/share/pkglint/
- ${INSTALL_DATA} ${FILESDIR}/deprecated.map ${PREFIX}/share/pkglint/
-
-post-install:
- ${PREFIX}/bin/pkglint -q 1>&2
+ ${INSTALL_MAN} ${WRKSRC}/pkglint.0 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1
+ ${INSTALL_DATA} ${FILESDIR}/makevars.map ${DESTDIR}${PREFIX}/share/pkglint/
+ ${INSTALL_DATA} ${FILESDIR}/deprecated.map ${DESTDIR}${PREFIX}/share/pkglint/
.include "../../mk/bsd.pkg.mk"