diff options
author | jlam <jlam@pkgsrc.org> | 2004-07-19 02:33:31 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2004-07-19 02:33:31 +0000 |
commit | 434eb20f68439dcb5e913db0162b4bf20d67c19e (patch) | |
tree | 0c0f7f43760e5b05f7c3fa1636526aee660001d2 /mail/postfix | |
parent | aa43dcd1c1afd0068964adce31cfe15505dcc601 (diff) | |
download | pkgsrc-434eb20f68439dcb5e913db0162b4bf20d67c19e.tar.gz |
Rename SHAREDIR to EXAMPLEDIR to more accurately reflect the contents and
location of that directory.
Diffstat (limited to 'mail/postfix')
-rw-r--r-- | mail/postfix/INSTALL | 6 | ||||
-rw-r--r-- | mail/postfix/MESSAGE | 6 | ||||
-rw-r--r-- | mail/postfix/MESSAGE.sasl | 4 | ||||
-rw-r--r-- | mail/postfix/MESSAGE.tls | 4 | ||||
-rw-r--r-- | mail/postfix/Makefile | 40 |
5 files changed, 30 insertions, 30 deletions
diff --git a/mail/postfix/INSTALL b/mail/postfix/INSTALL index 3f7ade5404c..c67626ec28f 100644 --- a/mail/postfix/INSTALL +++ b/mail/postfix/INSTALL @@ -1,11 +1,11 @@ -# $NetBSD: INSTALL,v 1.2 2004/03/05 13:54:32 grant Exp $ +# $NetBSD: INSTALL,v 1.3 2004/07/19 02:33:31 jlam Exp $ # -SHAREDIR=@SHAREDIR@ +EXAMPLEDIR=@EXAMPLEDIR@ case $STAGE in POST-INSTALL) echo "===> Running postfix's post-install script" - @SHAREDIR@/post-install command_directory=@PREFIX@/sbin first-install + @EXAMPLEDIR@/post-install command_directory=@PREFIX@/sbin first-install ;; esac diff --git a/mail/postfix/MESSAGE b/mail/postfix/MESSAGE index 278d5990e1c..3a7f85d1e12 100644 --- a/mail/postfix/MESSAGE +++ b/mail/postfix/MESSAGE @@ -1,11 +1,11 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.5 2004/03/06 06:28:22 grant Exp $ +$NetBSD: MESSAGE,v 1.6 2004/07/19 02:33:31 jlam Exp $ To activate postfix: - Check the configuration files in ${PKG_SYSCONFDIR} - (see ${SHAREDIR}) -- Modify /etc/mailer.conf (see ${SHAREDIR}/mailer.conf) + (see ${EXAMPLEDIR}) +- Modify /etc/mailer.conf (see ${EXAMPLEDIR}/mailer.conf) - Set postfix=YES in /etc/rc.conf =========================================================================== diff --git a/mail/postfix/MESSAGE.sasl b/mail/postfix/MESSAGE.sasl index 827e7cc2b34..ac0c94c9051 100644 --- a/mail/postfix/MESSAGE.sasl +++ b/mail/postfix/MESSAGE.sasl @@ -1,7 +1,7 @@ =========================================================================== -$NetBSD: MESSAGE.sasl,v 1.2 2003/05/01 14:07:57 jmmv Exp $ +$NetBSD: MESSAGE.sasl,v 1.3 2004/07/19 02:33:31 jlam Exp $ To enable SASL authentication, you might need to change permission of ${PKG_SYSCONFDIR}/sasldb.db so that smtpd can read it, and configure -${PKG_SYSCONFDIR}/main.cf (See ${SHAREDIR}/sample-auth.cf.) +${PKG_SYSCONFDIR}/main.cf (See ${EXAMPLEDIR}/sample-auth.cf.) =========================================================================== diff --git a/mail/postfix/MESSAGE.tls b/mail/postfix/MESSAGE.tls index 90b33e438bd..edb13de1e34 100644 --- a/mail/postfix/MESSAGE.tls +++ b/mail/postfix/MESSAGE.tls @@ -1,8 +1,8 @@ =========================================================================== -$NetBSD: MESSAGE.tls,v 1.2 2003/05/01 14:07:57 jmmv Exp $ +$NetBSD: MESSAGE.tls,v 1.3 2004/07/19 02:33:31 jlam Exp $ To enable TLS, you might need to reconfigure /etc/postfix/main.cf and -${PKG_SYSCONFDIR}/master.cf (See ${SHAREDIR}/sample-tls.cf.) +${PKG_SYSCONFDIR}/master.cf (See ${EXAMPLEDIR}/sample-tls.cf.) master.cf: ---------- diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile index 6f39a10c67c..56e1c63c5fd 100644 --- a/mail/postfix/Makefile +++ b/mail/postfix/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.135 2004/07/18 23:42:48 jlam Exp $ +# $NetBSD: Makefile,v 1.136 2004/07/19 02:33:31 jlam Exp $ DISTNAME= postfix-2.1.3 CATEGORIES= mail @@ -146,8 +146,8 @@ MAKE_ENV+= AUXLIBS="${AUXLIBS}" CCARGS="${CCARGS}" POSTFIX_CONF_FILES= conf/main.cf src/util/sys_defs.h postfix-install POSTFIX_CONF_FILES+= src/global/mail_params.h -FILES_SUBST+= SHAREDIR=${SHAREDIR} -MESSAGE_SUBST+= SHAREDIR=${SHAREDIR} +FILES_SUBST+= EXAMPLEDIR=${EXAMPLEDIR} +MESSAGE_SUBST+= EXAMPLEDIR=${EXAMPLEDIR} PLIST_SUBST+= POSTFIX_SPOOL=${POSTFIX_SPOOL} FILES_SUBST+= POSTFIX_SPOOL=${POSTFIX_SPOOL} @@ -155,22 +155,22 @@ PKG_GROUPS?= postfix maildrop PKG_USERS?= postfix:postfix::Postfix\\ User:${POSTFIX_SPOOL} LIBEXECDIR= ${PREFIX}/libexec/${PKGBASE} -SHAREDIR= ${PREFIX}/share/examples/${PKGBASE} +EXAMPLEDIR= ${PREFIX}/share/examples/${PKGBASE} -CONF_FILES= ${SHAREDIR}/main.cf ${PKG_SYSCONFDIR}/main.cf -CONF_FILES+= ${SHAREDIR}/master.cf ${PKG_SYSCONFDIR}/master.cf +CONF_FILES= ${EXAMPLEDIR}/main.cf ${PKG_SYSCONFDIR}/main.cf +CONF_FILES+= ${EXAMPLEDIR}/master.cf ${PKG_SYSCONFDIR}/master.cf .if defined(USING_SASL) . if defined(USE_SASL2) MAKE_DIRS+= ${PREFIX}/lib/sasl2 -CONF_FILES+= ${SHAREDIR}/smtpd.conf ${PREFIX}/lib/sasl2/smtpd.conf +CONF_FILES+= ${EXAMPLEDIR}/smtpd.conf ${PREFIX}/lib/sasl2/smtpd.conf . else MAKE_DIRS+= ${PREFIX}/lib/sasl -CONF_FILES+= ${SHAREDIR}/smtpd.conf ${PREFIX}/lib/sasl/smtpd.conf +CONF_FILES+= ${EXAMPLEDIR}/smtpd.conf ${PREFIX}/lib/sasl/smtpd.conf . endif .endif CONF_FILES_PERMS= # empty .for confscr in post-install postfix-files postfix-script -CONF_FILES_PERMS+= ${SHAREDIR}/${confscr} ${PKG_SYSCONFDIR}/${confscr} \ +CONF_FILES_PERMS+= ${EXAMPLEDIR}/${confscr} ${PKG_SYSCONFDIR}/${confscr} \ ${ROOT_USER} ${ROOT_GROUP} 755 .endfor .undef confscr @@ -195,11 +195,11 @@ post-build: pre-install: ${INSTALL_DATA_DIR} ${PKG_SYSCONFDIR} - ${INSTALL_DATA_DIR} ${SHAREDIR} + ${INSTALL_DATA_DIR} ${EXAMPLEDIR} ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/postfix ${INSTALL_DATA_DIR} ${LIBEXECDIR} - ${CHOWN} ${ROOT_USER}:${ROOT_GROUP} ${SHAREDIR} ${LIBEXECDIR} - ${CHMOD} 755 ${SHAREDIR} ${LIBEXECDIR} + ${CHOWN} ${ROOT_USER}:${ROOT_GROUP} ${EXAMPLEDIR} ${LIBEXECDIR} + ${CHMOD} 755 ${EXAMPLEDIR} ${LIBEXECDIR} -${RM} -f ${WRKSRC}/conf/*.orig .if defined(USING_SASL) . if defined(USE_SASL2) @@ -207,17 +207,17 @@ pre-install: . else ${ECHO} "pwcheck_method: sasldb" > ${WRKDIR}/smtpd.conf . endif - ${INSTALL_DATA} ${WRKDIR}/smtpd.conf ${SHAREDIR} + ${INSTALL_DATA} ${WRKDIR}/smtpd.conf ${EXAMPLEDIR} .endif - ${INSTALL_SCRIPT} ${WRKSRC}/conf/post-install ${SHAREDIR} - ${INSTALL_SCRIPT} ${WRKSRC}/conf/postfix-files ${SHAREDIR} - ${INSTALL_SCRIPT} ${WRKSRC}/conf/postfix-script ${SHAREDIR} - ${INSTALL_DATA} ${WRKSRC}/conf/main.cf ${SHAREDIR} - ${INSTALL_DATA} ${WRKSRC}/conf/master.cf ${SHAREDIR} - ${INSTALL_DATA} ${WRKDIR}/mailer.conf.postfix ${SHAREDIR}/mailer.conf + ${INSTALL_SCRIPT} ${WRKSRC}/conf/post-install ${EXAMPLEDIR} + ${INSTALL_SCRIPT} ${WRKSRC}/conf/postfix-files ${EXAMPLEDIR} + ${INSTALL_SCRIPT} ${WRKSRC}/conf/postfix-script ${EXAMPLEDIR} + ${INSTALL_DATA} ${WRKSRC}/conf/main.cf ${EXAMPLEDIR} + ${INSTALL_DATA} ${WRKSRC}/conf/master.cf ${EXAMPLEDIR} + ${INSTALL_DATA} ${WRKDIR}/mailer.conf.postfix ${EXAMPLEDIR}/mailer.conf do-install: - cd ${WRKSRC} && ${SETENV} config_directory="${SHAREDIR}" \ + cd ${WRKSRC} && ${SETENV} config_directory="${EXAMPLEDIR}" \ ${SH} postfix-install -non-interactive .if ${OPSYS} == "Linux" |