diff options
author | jlam <jlam> | 2002-09-18 21:15:07 +0000 |
---|---|---|
committer | jlam <jlam> | 2002-09-18 21:15:07 +0000 |
commit | 3fb27a228abe50c93734f749e2ac7b577dd70ec3 (patch) | |
tree | e0bb35773ef4b40f455703fa2781a51565bf1981 /mail | |
parent | 472a29049e9e3e6fb5964bb5f1cde871b19fcf5f (diff) | |
download | pkgsrc-3fb27a228abe50c93734f749e2ac7b577dd70ec3.tar.gz |
When using bsd.pkg.install.mk, if a DEINSTALL or INSTALL file already
exists, then use it as the default value of DEINSTALL_EXTRA_TMPL or
INSTALL_EXTRA_TMPL.
Diffstat (limited to 'mail')
-rw-r--r-- | mail/courier-auth/Makefile | 4 | ||||
-rw-r--r-- | mail/courier-imap/Makefile | 3 | ||||
-rw-r--r-- | mail/courier-maildirmake/Makefile | 4 | ||||
-rw-r--r-- | mail/cyrus-imapd/Makefile | 5 | ||||
-rw-r--r-- | mail/popa3d/Makefile | 3 | ||||
-rw-r--r-- | mail/qmail/Makefile | 4 | ||||
-rw-r--r-- | mail/sqwebmail/Makefile | 4 |
7 files changed, 7 insertions, 20 deletions
diff --git a/mail/courier-auth/Makefile b/mail/courier-auth/Makefile index 0920c2cd14a..428cc8d8bb9 100644 --- a/mail/courier-auth/Makefile +++ b/mail/courier-auth/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2002/04/27 11:20:52 yyamano Exp $ +# $NetBSD: Makefile,v 1.6 2002/09/18 21:15:10 jlam Exp $ PKGNAME= courier-auth-${BASE_VERS} PKGREVISION?= 1 @@ -28,8 +28,6 @@ CONF_FILES_PERMS+= ${EGDIR}/${FILE}.dist ${PKG_SYSCONFDIR}/${FILE} \ .endfor RCD_SCRIPTS= authdaemond -DEINSTALL_EXTRA_TMPL= ${.CURDIR}/DEINSTALL -INSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL FILES_SUBST+= GEN_FILES=${GEN_FILES:Q} do-install: diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile index 05b2fa962e3..3c92c35d555 100644 --- a/mail/courier-imap/Makefile +++ b/mail/courier-imap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2002/05/28 15:07:03 yyamano Exp $ +# $NetBSD: Makefile,v 1.13 2002/09/18 21:15:10 jlam Exp $ DISTNAME= courier-imap-1.4.2 PKGREVISION= 1 @@ -35,7 +35,6 @@ CONF_FILES_PERMS+= ${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE} \ ${ROOT_USER} ${ROOT_GROUP} 0600 .endfor -DEINSTALL_EXTRA_TMPL= ${.CURDIR}/DEINSTALL INSTALL_EXTRA_TMPL= ${.CURDIR}/../../mail/courier-auth/INSTALL FILES_SUBST+= SYSCONFTOOL=${SYSCONFTOOL:Q} FILES_SUBST+= SSLCERTS=${SSLCERTS} diff --git a/mail/courier-maildirmake/Makefile b/mail/courier-maildirmake/Makefile index 016cdbda8a4..4df51971c10 100644 --- a/mail/courier-maildirmake/Makefile +++ b/mail/courier-maildirmake/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2002/07/24 19:45:24 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2002/09/18 21:15:11 jlam Exp $ PKGNAME= courier-maildirmake-${BASE_VERS} PKGREVISION?= 1 @@ -27,8 +27,6 @@ INSTALL_TARGET= install-strip CONF_FILES= ${EGDIR}/quotawarnmsg ${PKG_SYSCONFDIR}/quotawarnmsg -DEINSTALL_EXTRA_TMPL= ${.CURDIR}/DEINSTALL - pre-configure: configure-init do-build: diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile index 9ee4a973c29..205ee09befb 100644 --- a/mail/cyrus-imapd/Makefile +++ b/mail/cyrus-imapd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2002/07/31 15:48:31 jlam Exp $ +# $NetBSD: Makefile,v 1.30 2002/09/18 21:15:11 jlam Exp $ DISTNAME= cyrus-imapd-2.0.16 PKGREVISION= 1 @@ -70,9 +70,6 @@ CONF_FILES+= ${EGDIR}/normal.conf ${PKG_SYSCONFDIR}/cyrus.conf RCD_SCRIPTS= cyrus FILES_SUBST+= IMAPDCONF=${PKG_SYSCONFDIR}/imapd.conf -DEINSTALL_EXTRA_TMPL= ${PKGDIR}/DEINSTALL -INSTALL_EXTRA_TMPL= ${PKGDIR}/INSTALL - PERL5_PACKLIST= \ ${PERL5_SITEARCH}/auto/Cyrus/IMAP/.packlist \ ${PERL5_SITEARCH}/auto/Cyrus/SIEVE/acap/.packlist \ diff --git a/mail/popa3d/Makefile b/mail/popa3d/Makefile index ac8964a93f5..10d5ea294be 100644 --- a/mail/popa3d/Makefile +++ b/mail/popa3d/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2002/04/23 14:03:43 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2002/09/18 21:15:12 jlam Exp $ # DISTNAME= popa3d-0.5.1 @@ -17,7 +17,6 @@ POPA3D_GROUP?= popa3d PKG_GROUPS= ${POPA3D_GROUP} PKG_USERS= ${POPA3D_USER}:${POPA3D_GROUP} -DEINSTALL_EXTRA_TMPL= ${PKGDIR}/DEINSTALL USE_BUILDLINK_ONLY= # defined FILES_SUBST+= POPA3D_USER=${POPA3D_USER} diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile index ac8481f4ae9..5fc1abafdc2 100644 --- a/mail/qmail/Makefile +++ b/mail/qmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2002/07/28 01:54:37 schmonz Exp $ +# $NetBSD: Makefile,v 1.15 2002/09/18 21:15:12 jlam Exp $ # DISTNAME= qmail-1.03 @@ -37,8 +37,6 @@ RCD_SCRIPTS_EXAMPLEDIR= ${QMAILDIR}/etc/rc.d NO_MTREE= YES LOCALBASE= / -DEINSTALL_EXTRA_TMPL= ${PKGDIR}/DEINSTALL - do-configure: ${ECHO} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc ${ECHO} ${CC} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile index 576c762343e..c9a738719e8 100644 --- a/mail/sqwebmail/Makefile +++ b/mail/sqwebmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2002/05/28 15:07:05 yyamano Exp $ +# $NetBSD: Makefile,v 1.10 2002/09/18 21:15:13 jlam Exp $ DISTNAME= sqwebmail-3.3.1 CATEGORIES= www @@ -62,8 +62,6 @@ CONF_FILES_PERMS+= ${DATADIR}/sqwebmail/${FILE} \ ${ROOT_USER} ${ROOT_GROUP} 0755 .endfor -DEINSTALL_EXTRA_TMPL= ${.CURDIR}/DEINSTALL -INSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL FILES_SUBST+= SYSCONFTOOL=${SYSCONFTOOL:Q} FILES_SUBST+= GEN_FILES=${GEN_FILES:Q} MESSAGE_SUBST+= IMAGEDIR=${IMAGEDIR} |