pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mail/postfix-current Minimize diffs with pkgsrc/mail/p...
details: https://anonhg.NetBSD.org/pkgsrc/rev/d255ee9b601a
branches: trunk
changeset: 478855:d255ee9b601a
user: jlam <jlam%pkgsrc.org@localhost>
date: Sat Jul 31 05:53:44 2004 +0000
description:
Minimize diffs with pkgsrc/mail/postfix to simplify maintenance of this
package.
diffstat:
mail/postfix-current/INSTALL | 11 -
mail/postfix-current/MESSAGE | 18 +-
mail/postfix-current/MESSAGE.NetBSD | 3 +-
mail/postfix-current/MESSAGE.sasl | 21 ++-
mail/postfix-current/MESSAGE.tls | 19 +-
mail/postfix-current/Makefile | 270 ++++++++++----------------------
mail/postfix-current/Makefile.options | 175 +++++++++++++++++++++
mail/postfix-current/PLIST | 27 ++-
mail/postfix-current/distinfo | 8 +-
mail/postfix-current/files/mailer.conf | 14 +-
mail/postfix-current/files/postfix.sh | 41 ++++-
mail/postfix-current/patches/patch-aa | 18 +-
mail/postfix-current/patches/patch-ae | 6 +-
mail/postfix-current/patches/patch-af | 18 +-
14 files changed, 386 insertions(+), 263 deletions(-)
diffs (truncated from 869 to 300 lines):
diff -r 01a965980730 -r d255ee9b601a mail/postfix-current/INSTALL
--- a/mail/postfix-current/INSTALL Sat Jul 31 05:39:17 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-# $NetBSD: INSTALL,v 1.2 2004/07/02 08:03:04 martti Exp $
-#
-
-SHAREDIR=@SHAREDIR@
-
-case $STAGE in
-POST-INSTALL)
- echo "===> Running postfix's post-install script"
- @SHAREDIR@/post-install command_directory=@PREFIX@/sbin first-install
- ;;
-esac
diff -r 01a965980730 -r d255ee9b601a mail/postfix-current/MESSAGE
--- a/mail/postfix-current/MESSAGE Sat Jul 31 05:39:17 2004 +0000
+++ b/mail/postfix-current/MESSAGE Sat Jul 31 05:53:44 2004 +0000
@@ -1,11 +1,17 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2004/03/06 15:04:12 grant Exp $
+$NetBSD: MESSAGE,v 1.2 2004/07/31 05:53:44 jlam Exp $
-To activate postfix:
+Please run the following command to update main.cf and master.cf with
+the latest Postfix services and configuration directives:
+
+ ${PREFIX}/sbin/postfix upgrade-configuration
-- Check the configuration files in ${PKG_SYSCONFDIR}
- (see ${SHAREDIR})
-- Modify /etc/mailer.conf (see ${SHAREDIR}/mailer.conf)
-- Set postfix=YES in /etc/rc.conf
+If you are upgrading from a previous Postfix installation, you may want
+to back up any existing configuration files before running the above
+command.
+
+Postfix may be activated by executing:
+
+ ${PREFIX}/sbin/postfix start
===========================================================================
diff -r 01a965980730 -r d255ee9b601a mail/postfix-current/MESSAGE.NetBSD
--- a/mail/postfix-current/MESSAGE.NetBSD Sat Jul 31 05:39:17 2004 +0000
+++ b/mail/postfix-current/MESSAGE.NetBSD Sat Jul 31 05:53:44 2004 +0000
@@ -1,9 +1,10 @@
===========================================================================
-$NetBSD: MESSAGE.NetBSD,v 1.1.1.1 2004/03/06 15:04:12 grant Exp $
+$NetBSD: MESSAGE.NetBSD,v 1.2 2004/07/31 05:53:44 jlam Exp $
If you are running NetBSD 1.5 (or newer), the existing /etc/rc.d/postfix
can be forced to start ${PREFIX}/sbin/postfix instead of /usr/sbin/postfix,
by adding the following lines to /etc/rc.conf.d/postfix:
+
required_files='${PKG_SYSCONFDIR}/main.cf'
start_cmd='${PREFIX}/sbin/postfix start'
stop_cmd='${PREFIX}/sbin/postfix stop'
diff -r 01a965980730 -r d255ee9b601a mail/postfix-current/MESSAGE.sasl
--- a/mail/postfix-current/MESSAGE.sasl Sat Jul 31 05:39:17 2004 +0000
+++ b/mail/postfix-current/MESSAGE.sasl Sat Jul 31 05:53:44 2004 +0000
@@ -1,7 +1,20 @@
===========================================================================
-$NetBSD: MESSAGE.sasl,v 1.1.1.1 2004/03/06 15:04:11 grant Exp $
+$NetBSD: MESSAGE.sasl,v 1.2 2004/07/31 05:53:44 jlam Exp $
+
+To enable SASL authentication, you may want to edit
+
+ ${SASLLIBDIR}/smtpd.conf
+
+and change the method used to check plaintext passwords. To use
+security/cyrus-saslauthd, you should change the contents of smtpd.conf to:
-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.)
+ pwcheck_method: saslauthd
+
+Please consult:
+
+ ${DOCDIR}/SASL_README
+
+and the SASL documentation for more information on setting up SASL
+authentication.
+
===========================================================================
diff -r 01a965980730 -r d255ee9b601a mail/postfix-current/MESSAGE.tls
--- a/mail/postfix-current/MESSAGE.tls Sat Jul 31 05:39:17 2004 +0000
+++ b/mail/postfix-current/MESSAGE.tls Sat Jul 31 05:53:44 2004 +0000
@@ -1,13 +1,20 @@
===========================================================================
-$NetBSD: MESSAGE.tls,v 1.1.1.1 2004/03/06 15:04:11 grant Exp $
+$NetBSD: MESSAGE.tls,v 1.2 2004/07/31 05:53:44 jlam Exp $
-To enable TLS, you might need to reconfigure /etc/postfix/main.cf and
-${PKG_SYSCONFDIR}/master.cf (See ${SHAREDIR}/sample-tls.cf.)
+To enable TLS, you might need to reconfigure the following files:
+
+ ${PKG_SYSCONFDIR}/main.cf
+ ${PKG_SYSCONFDIR}/master.cf
master.cf:
----------
- tlsmgr fifo - - y 300 1 tlsmgr
- smtps inet n - y - - smtpd -o smtpd_tls_wrappermode=yes -o smtpd_sasl_auth_enable=yes
- submission inet n - y - - smtpd -o smtpd_enforce_tls=yes -o smtpd_sasl_auth_enable=yes
+# ==========================================================================
+# service type private unpriv chroot wakeup maxproc command + args
+# ==========================================================================
+tlsmgr fifo - - y 300 1 tlsmgr
+smtps inet n - y - - smtpd
+ -o smtpd_tls_wrappermode=yes -o smtpd_sasl_auth_enable=yes
+submission inet n - y - - smtpd
+ -o smtpd_enforce_tls=yes -o smtpd_sasl_auth_enable=yes
===========================================================================
diff -r 01a965980730 -r d255ee9b601a mail/postfix-current/Makefile
--- a/mail/postfix-current/Makefile Sat Jul 31 05:39:17 2004 +0000
+++ b/mail/postfix-current/Makefile Sat Jul 31 05:53:44 2004 +0000
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.35 2004/07/24 22:45:15 recht Exp $
+# $NetBSD: Makefile,v 1.36 2004/07/31 05:53:44 jlam Exp $
DISTNAME= postfix-2.2-20040628
CATEGORIES= mail
MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \
http://public.planetmirror.com.au/pub/postfix/experimental/
+DIST_SUBDIR= postfix
MAINTAINER= tech-pkg%NetBSD.org@localhost
HOMEPAGE= http://www.postfix.org/
@@ -11,174 +12,86 @@
CONFLICTS+= sendmail-[0-9]* fastforward>=0.51nb2
-DIST_SUBDIR= postfix
-
PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-USE_BUILDLINK3= yes
-USE_PKGINSTALL= yes
-
-PKG_SYSCONFSUBDIR= postfix
-POSTFIX_SPOOL= /var/spool/postfix
-
-OWN_DIRS= ${POSTFIX_SPOOL}
-
-CCARGS+= -DDEF_CONFIG_DIR=\"${PKG_SYSCONFDIR}\"
-CCARGS+= -DDEF_SENDMAIL_PATH=\"${PREFIX}/sbin/sendmail\"
-CCARGS+= -DDEF_MAILQ_PATH=\"${PREFIX}/bin/mailq\"
-CCARGS+= -DDEF_NEWALIAS_PATH=\"${PREFIX}/bin/newaliases\"
-CCARGS+= -DDEF_COMMAND_DIR=\"${PREFIX}/sbin\"
-CCARGS+= -DDEF_DAEMON_DIR=\"${LIBEXECDIR}\"
+USE_BUILDLINK3= yes
.include "../../mk/bsd.prefs.mk"
-# NetBSD 1.5 and above has /etc/rc.d/postfix already which is
-# suitable.
-.if empty(MACHINE_PLATFORM:MNetBSD-1.[5-9]*-*)
-RCD_SCRIPTS= postfix
-.endif
+# POSTFIX_QUEUE_DIR is the default queue directory for Postfix. This is
+# merely a default, and may be changed by setting "queue_directory" in
+# ${PKG_SYSCONFDIR}/main.cf.
+#
+POSTFIX_QUEUE_DIR?= ${VARBASE}/spool/postfix
+# CCARGS is a list of options to pass to the preprocessor/compiler.
+# AUXLIBS is a list of options to pass to the linker.
+#
+CCARGS= # empty
+AUXLIBS= # empty
FIX_RPATH+= AUXLIBS
-BUILD_DEFS+= POSTFIX_USE_INET6
-BUILD_DEFS+= POSTFIX_USE_TLS
-BUILD_DEFS+= POSTFIX_USE_PCRE
-BUILD_DEFS+= POSTFIX_USE_MYSQL
-BUILD_DEFS+= POSTFIX_USE_PGSQL
-BUILD_DEFS+= USE_OPENLDAP
-BUILD_DEFS+= USE_SASL
-BUILD_DEFS+= USE_SASL2
+CCARGS+= -DDEF_CONFIG_DIR=\"${PKG_SYSCONFDIR}\"
+CCARGS+= -DDEF_QUEUE_DIR=\"${POSTFIX_QUEUE_DIR}\"
+CCARGS+= -DDEF_COMMAND_DIR=\"${PREFIX}/sbin\"
+CCARGS+= -DDEF_DAEMON_DIR=\"${LIBEXECDIR}\"
+CCARGS+= -DDEF_SENDMAIL_PATH=\"${PREFIX}/sbin/sendmail\"
+CCARGS+= -DDEF_MAILQ_PATH=\"${PREFIX}/bin/mailq\"
+CCARGS+= -DDEF_NEWALIAS_PATH=\"${PREFIX}/bin/newaliases\"
-# .if defined(POSTFIX_USE_INET6) && ${POSTFIX_USE_INET6} == "YES"
-# . include "../../security/openssl/buildlink3.mk"
-# PATCHFILES+= tls+ipv6-1.25-pf-2.2-20040616.patch.gz
-# PATCH_SITES+= ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.25/
-# PATCH_DIST_STRIP= -p1
-#
-# CCARGS+= -DHAS_SSL
-# AUXLIBS+= -L${BUILDLINK_PREFIX.openssl}/lib \
-# -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib \
-# -lssl -lcrypto
-#
-# PLIST_SRC+= ${PKGDIR}/PLIST.tls
-# MESSAGE_SRC+= ${PKGDIR}/MESSAGE.tls
-# .endif
+# Makefile.options appends to CCARGS and AUXLIBS the options needed to
+# build Postfix with support for various add-on modules.
+#
+.include "Makefile.options"
+
+PKG_SYSCONFSUBDIR= postfix
+LIBEXECDIR= ${PREFIX}/libexec/postfix
+DOCDIR= ${PREFIX}/share/doc/postfix
+EXAMPLEDIR= ${PREFIX}/share/examples/postfix
+
+FILES_SUBST+= EXAMPLEDIR=${EXAMPLEDIR}
+MESSAGE_SUBST+= EXAMPLEDIR=${EXAMPLEDIR}
+MESSAGE_SUBST+= DOCDIR=${DOCDIR}
-.if defined(POSTFIX_USE_PCRE) && ${POSTFIX_USE_PCRE} == "YES"
-. include "../../devel/pcre/buildlink3.mk"
-CCARGS+= -DHAS_PCRE
-AUXLIBS+= -L${BUILDLINK_PREFIX.pcre}/lib \
- -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.pcre}/lib \
- -lpcre
-.else
-CCARGS+= -DNO_PCRE
+MESSAGE_SRC+= ${PKGDIR}/MESSAGE
+.if exists(${PKGDIR}/MESSAGE.${OPSYS})
+MESSAGE_SRC+= ${PKGDIR}/MESSAGE.${OPSYS}
.endif
+PLIST_SRC+= ${PKGDIR}/PLIST
+
+ALL_TARGET= # empty
+MAKE_ENV= CC="${CC}" OPT="${CFLAGS}"
+MAKE_ENV+= AUXLIBS="${AUXLIBS}" CCARGS="${CCARGS}"
+
+USE_PKGINSTALL= yes
+RCD_SCRIPTS= postfix
+OWN_DIRS+= ${POSTFIX_QUEUE_DIR}
+MAKE_DIRS+= ${PKG_SYSCONFDIR}
-.if defined(USE_OPENLDAP) && ${USE_OPENLDAP} == "YES"
-. include "../../databases/openldap/buildlink3.mk"
-CCARGS+= -DHAS_LDAP
-AUXLIBS+= -L${BUILDLINK_PREFIX.openldap}/lib \
- -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.openldap}/lib \
- -lldap -llber
-. if ${OPSYS} != "Linux"
-. include "../../databases/db4/buildlink3.mk"
-CCARGS+= -I${BUILDLINK_PREFIX.db4}/include/db4
-AUXLIBS+= -L${BUILDLINK_PREFIX.db4}/lib \
- -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.db4}/lib \
- -ldb4
-. endif
-.endif
+PKG_GROUPS?= postfix maildrop
+PKG_USERS?= postfix:postfix::Postfix\\ User:${POSTFIX_QUEUE_DIR}
-.if defined(POSTFIX_USE_MYSQL) && ${POSTFIX_USE_MYSQL} == "YES"
-. include "../../databases/mysql-client/buildlink3.mk"
-CCARGS+= -DHAS_MYSQL -I${BUILDLINK_PREFIX.mysql-client}/include/mysql
-AUXLIBS+= -L${BUILDLINK_PREFIX.mysql-client}/lib/mysql \
- -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.mysql-client}/lib/mysql \
- -lmysqlclient -lz -lm
+CONF_FILES= # empty
+.for _file_ in main.cf master.cf postfix-files
+CONF_FILES+= ${EXAMPLEDIR}/${_file_} ${PKG_SYSCONFDIR}/${_file_}
+.endfor
+CONF_FILES_PERMS= # empty
+.for _file_ in post-install postfix-script
+CONF_FILES_PERMS+= ${EXAMPLEDIR}/${_file_} ${PKG_SYSCONFDIR}/${_file_} \
+ ${ROOT_USER} ${ROOT_GROUP} 755
+.endfor
+.undef _file_
+.if !empty(PKG_OPTIONS:Msasl)
+MAKE_DIRS+= ${SASLLIBDIR}
+CONF_FILES+= ${EXAMPLEDIR}/smtpd.conf ${SASLLIBDIR}/smtpd.conf
.endif
-## .if defined(POSTFIX_USE_PGSQL) && ${POSTFIX_USE_PGSQL} == "YES"
-## . include "../../mk/pgsql.buildlink3.mk"
-## . include "../../security/openssl/buildlink3.mk"
-## PATCHFILES+= postfix-pg.postfix-2.0.0.2.patch
-## PATCH_SITES+= http://www.mat.cc/postfix/
-## PATCH_DIST_STRIP= -p1
-##
-## CCARGS+= -DHAS_PGSQL -I${PGSQL_PREFIX}/include/pgsql
-## AUXLIBS+= -L${PGSQL_PREFIX}/lib -lpq \
-## -L${BUILDLINK_PREFIX.openssl}/lib -lcrypt
-## .endif
-
-.if defined(USE_SASL2) && ${USE_SASL2} == "YES"
-USING_SASL= YES
-. include "../../security/cyrus-sasl2/buildlink3.mk"
-CCARGS+= -DUSE_SASL2_AUTH
-AUXLIBS+= -L${BUILDLINK_PREFIX.cyrus-sasl}/lib \
- -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \
- -lsasl2
-.elif defined(USE_SASL) && ${USE_SASL} == "YES"
-USING_SASL=YES
Home |
Main Index |
Thread Index |
Old Index