diff options
author | jlam <jlam> | 2001-12-02 06:56:38 +0000 |
---|---|---|
committer | jlam <jlam> | 2001-12-02 06:56:38 +0000 |
commit | f99697d915e447ed9abcf7aca31b0c873ea53734 (patch) | |
tree | cae588008c2ebc64dfaaf967400630b03c968bdf /mail | |
parent | 77f7fc5d39245d400e8ec79fa531f29c951fa641 (diff) | |
download | pkgsrc-f99697d915e447ed9abcf7aca31b0c873ea53734.tar.gz |
bsd.pkg.install.mk calls the INSTALL script at the right times
automatically, so no need to do it ourselves.
Diffstat (limited to 'mail')
-rw-r--r-- | mail/cyrus-imapd/Makefile | 3 | ||||
-rw-r--r-- | mail/imp/Makefile | 6 | ||||
-rw-r--r-- | mail/popa3d/Makefile | 8 | ||||
-rw-r--r-- | mail/qmail-users/Makefile | 10 | ||||
-rw-r--r-- | mail/sq-squirrelspell/Makefile | 8 | ||||
-rw-r--r-- | mail/squirrelmail/Makefile | 6 | ||||
-rw-r--r-- | mail/teapop/Makefile | 6 |
7 files changed, 8 insertions, 39 deletions
diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile index c9fc8d2d267..6ad4501ad3f 100644 --- a/mail/cyrus-imapd/Makefile +++ b/mail/cyrus-imapd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2001/11/25 18:59:46 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2001/12/02 06:56:40 jlam Exp $ DISTNAME= cyrus-imapd-2.0.16 SVR4_PKGNAME= cimap @@ -99,7 +99,6 @@ post-install: cd ${WRKSRC}/master/conf; ${INSTALL_DATA} *.conf ${EGDIR} ${INSTALL_DATA_DIR} ${HTMLDIR} cd ${WRKSRC}/doc; ${INSTALL_DATA} *.html cyrusv2.mc ${HTMLDIR} - PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL .include "../../databases/db3/buildlink.mk" .include "../../lang/perl5/buildlink.mk" diff --git a/mail/imp/Makefile b/mail/imp/Makefile index 24870ee6905..de1619452fc 100644 --- a/mail/imp/Makefile +++ b/mail/imp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2001/11/25 18:59:46 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2001/12/02 06:56:41 jlam Exp $ DISTNAME= imp-2.2.7 CATEGORIES= mail www @@ -88,7 +88,6 @@ do-build: pre-install: ${SED} -e "s|@IMPDIR@|${IMPDIR}|g" \ ${FILESDIR}/imp.conf.dist > ${WRKDIR}/imp.conf.dist - PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL do-install: ${INSTALL_DATA_DIR} ${DOCDIR} ${EGDIR} ${IMPDIR} @@ -101,8 +100,5 @@ do-install: ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${IMPDIR} ${CHMOD} -R a-w ${IMPDIR} -post-install: - PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL - .include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/popa3d/Makefile b/mail/popa3d/Makefile index 987da23e0fd..8c1c2d4da54 100644 --- a/mail/popa3d/Makefile +++ b/mail/popa3d/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2001/11/29 01:12:40 hubertf Exp $ +# $NetBSD: Makefile,v 1.17 2001/12/02 06:56:41 jlam Exp $ # DISTNAME= popa3d-0.4.9.4 @@ -31,11 +31,5 @@ do-install: ${PREFIX}/share/doc/popa3d ${INSTALL_DATA_DIR} ${PREFIX}/share/empty -pre-install: - PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL - -post-install: - PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL - .include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/qmail-users/Makefile b/mail/qmail-users/Makefile index 18a8e0a1cf2..708795c1d31 100644 --- a/mail/qmail-users/Makefile +++ b/mail/qmail-users/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/11/26 22:20:32 zuntum Exp $ +# $NetBSD: Makefile,v 1.2 2001/12/02 06:56:41 jlam Exp $ # DISTNAME= qmail-users-1.0 @@ -26,13 +26,7 @@ NO_BUILD= YES WRKSRC= ${WRKDIR} -do-install: - -pre-install: - PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL - -post-install: - PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL +do-install: # empty .include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/sq-squirrelspell/Makefile b/mail/sq-squirrelspell/Makefile index c5e6a5d2e75..dfdb5f77be2 100644 --- a/mail/sq-squirrelspell/Makefile +++ b/mail/sq-squirrelspell/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/11/19 16:23:11 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2001/12/02 06:56:42 jlam Exp $ DISTNAME= squirrelspell.0.3.5-1.0.6 PKGNAME= sq-squirrelspell-0.3.5 @@ -23,14 +23,8 @@ CONF_FILES= ${SMDIR}/plugins/squirrelspell/sqspell_config.dist \ ${SMDIR}/plugins/squirrelspell/sqspell_config.php OWN_DIRS= ${SMDIR}/plugins/squirrelspell -pre-install: - PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL - do-install: ${CP} -R ${WRKSRC} ${SMDIR}/plugins -post-install: - PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL - .include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile index eb5f264baeb..1a0d2b780ae 100644 --- a/mail/squirrelmail/Makefile +++ b/mail/squirrelmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2001/11/25 18:59:46 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2001/12/02 06:56:42 jlam Exp $ DISTNAME= squirrelmail-1.0.6 CATEGORIES= mail www @@ -51,7 +51,6 @@ pre-install: ${SED} ${FILES_SUBST_SED} \ ${FILESDIR}/squirrelmail.conf.dist \ > ${WRKDIR}/squirrelmail.conf.dist - PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL do-install: ${INSTALL_DATA_DIR} ${EGDIR} ${SMDIR} @@ -61,8 +60,5 @@ do-install: ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${SMDIR} ${CHMOD} -R a-w ${SMDIR} -post-install: - PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL - .include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/teapop/Makefile b/mail/teapop/Makefile index e92e1256527..8768c0fab88 100644 --- a/mail/teapop/Makefile +++ b/mail/teapop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/11/25 22:55:04 zuntum Exp $ +# $NetBSD: Makefile,v 1.6 2001/12/02 06:56:42 jlam Exp $ DISTNAME= teapop-0.3.2 CATEGORIES= mail @@ -28,13 +28,9 @@ CONFIGURE_ARGS+=--disable-apop CONFIGURE_ARGS+=--disable-vpop .endif -pre-install: - PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL - post-install: ${INSTALL_DATA_DIR} ${EGDIR} ${INSTALL_DATA} ${WRKSRC}/etc/teapop.passwd ${EGDIR} - PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL .include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" |