[pkgsrc/trunk]: pkgsrc/mail/postfix Rename SHAREDIR to EXAMPLEDIR to more acc...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/mail/postfix Rename SHAREDIR to EXAMPLEDIR to more acc...
From: jlam <jlam%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 00:20:57 +0000

details:   https://anonhg.NetBSD.org/pkgsrc/rev/de9401abf7b5
branches:  trunk
changeset: 478172:de9401abf7b5
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Jul 19 02:33:31 2004 +0000

description:
Rename SHAREDIR to EXAMPLEDIR to more accurately reflect the contents and
location of that directory.

diffstat:

 mail/postfix/INSTALL      |   6 +++---
 mail/postfix/MESSAGE      |   6 +++---
 mail/postfix/MESSAGE.sasl |   4 ++--
 mail/postfix/MESSAGE.tls  |   4 ++--
 mail/postfix/Makefile     |  40 ++++++++++++++++++++--------------------
 5 files changed, 30 insertions(+), 30 deletions(-)

diffs (153 lines):

diff -r 61592f305765 -r de9401abf7b5 mail/postfix/INSTALL
--- a/mail/postfix/INSTALL      Mon Jul 19 02:21:57 2004 +0000
+++ b/mail/postfix/INSTALL      Mon Jul 19 02:33:31 2004 +0000
@@ -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 -r 61592f305765 -r de9401abf7b5 mail/postfix/MESSAGE
--- a/mail/postfix/MESSAGE      Mon Jul 19 02:21:57 2004 +0000
+++ b/mail/postfix/MESSAGE      Mon Jul 19 02:33:31 2004 +0000
@@ -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 -r 61592f305765 -r de9401abf7b5 mail/postfix/MESSAGE.sasl
--- a/mail/postfix/MESSAGE.sasl Mon Jul 19 02:21:57 2004 +0000
+++ b/mail/postfix/MESSAGE.sasl Mon Jul 19 02:33:31 2004 +0000
@@ -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 -r 61592f305765 -r de9401abf7b5 mail/postfix/MESSAGE.tls
--- a/mail/postfix/MESSAGE.tls  Mon Jul 19 02:21:57 2004 +0000
+++ b/mail/postfix/MESSAGE.tls  Mon Jul 19 02:33:31 2004 +0000
@@ -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 -r 61592f305765 -r de9401abf7b5 mail/postfix/Makefile
--- a/mail/postfix/Makefile     Mon Jul 19 02:21:57 2004 +0000
+++ b/mail/postfix/Makefile     Mon Jul 19 02:33:31 2004 +0000
@@ -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 @@
 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_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 @@
 
 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 @@
 .  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"

Prev by Date: [pkgsrc/trunk]: pkgsrc/www/ap-auth-mysql Fix a case of invalid use of preproc...
Next by Date: [pkgsrc/trunk]: pkgsrc/mail/postfix Make the messages for using both SASL and...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/www/ap-auth-mysql Fix a case of invalid use of preproc...
Next by Thread: [pkgsrc/trunk]: pkgsrc/mail/postfix Make the messages for using both SASL and...
Indexes:

Home | Main Index | Thread Index | Old Index