Date: Mon, 28 Apr 2014 21:21:47 -0400 From: Sahil Tandon <sahil+freebsd-ports@tandon.net> To: freebsd-ports@freebsd.org Subject: Re: A child Postfix port with TLS enabled by default Message-ID: <20140429012147.GA71794@jubz> In-Reply-To: <20140330215228.GB93840@jubz> References: <20140330192011.GA92763@jubz> <533876D8.8020505@gmx.de> <20140330215228.GB93840@jubz>
next in thread | previous in thread | raw e-mail | index | archive | help
--SLDf9lqlvOQaIe6s
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Thanks to Olli and Matthias, I amended the original patch; revised
version attached.
PS: I could not think of a less hack-ish way to accomplish the warning
suppression aside from adding those flags to CCARGS.
--
Sahil Tandon
--SLDf9lqlvOQaIe6s
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="postfix.diff"
Index: Makefile
===================================================================
--- Makefile (revision 352558)
+++ Makefile (working copy)
@@ -508,6 +508,7 @@
SUBDIR += postfix-policyd-spf-python
SUBDIR += postfix-policyd-weight
SUBDIR += postfix-postfwd
+ SUBDIR += postfix-tls
SUBDIR += postfix210
SUBDIR += postfix27
SUBDIR += postfix28
Index: postfix/Makefile
===================================================================
--- postfix/Makefile (revision 352558)
+++ postfix/Makefile (working copy)
@@ -22,19 +22,28 @@
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
VDAVERSION= 2.10.0
-CONFLICTS= courier-0.* postfix-1.* postfix2?-* postfix21?-* \
+CONFLICTS_INSTALL?= courier-0.* postfix-1.* postfix2?-* postfix21?-* \
postfix-current-2.* postfix-current-base-2.* sendmail-8.* \
sendmail+*-8.* smail-3.* zmailer-2.* opensmtpd-[0-9]*
USERS= postfix
GROUPS= mail maildrop postfix
-USES= perl5
+USES= perl5 shebangfix
+SHEBANG_LANG= perl
+SHEBANG_FILES= auxiliary/qshape/qshape.pl
+
USE_SUBMAKE= yes
USE_PERL5= build
SCRIPTS_ENV+= POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}"
OPTIONS_DEFINE= PCRE SASL2 TLS BDB MYSQL PGSQL SQLITE OPENLDAP LDAP_SASL \
- CDB NIS VDA TEST SPF INST_BASE LMDB
+ CDB NIS VDA TEST SPF INST_BASE LMDB DOCS
+
+OPTIONS_RADIO= RG1 RG2
+OPTIONS_RADIO_RG1= DOVECOT DOVECOT2
+OPTIONS_RADIO_RG2= SASLKRB5 SASLKMIT
+OPTIONS_DEFAULT= PCRE
+
PCRE_DESC= Perl Compatible Regular Expressions
SASL2_DESC= Cyrus SASLv2 (Simple Auth. and Sec. Layer)
DOVECOT_DESC= Dovecot 1.x SASL authentication method
@@ -55,42 +64,18 @@
SPF_DESC= SPF support (via libspf2 1.2.x)
INST_BASE_DESC= Install into /usr and /etc/postfix
LMDB_DESC= LMDB maps
-
-OPTIONS_RADIO= RG1 RG2
-OPTIONS_RADIO_RG1= DOVECOT DOVECOT2
-OPTIONS_RADIO_RG2= SASLKRB5 SASLKMIT
RG1_DESC= Dovecot SASL authentication methods
RG2_DESC= Kerberos network authentication protocol type
-OPTIONS_DEFAULT= PCRE
-
-NO_STAGE= yes
.include <bsd.port.options.mk>
-MAN1= postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 postkick.1 \
- postlock.1 postlog.1 postmap.1 postmulti.1 postqueue.1 postsuper.1 \
- sendmail.1 qshape.1
-
-MAN5= access.5 aliases.5 bounce.5 canonical.5 cidr_table.5 generic.5 \
- header_checks.5 ldap_table.5 lmdb_table.5 master.5 memcache_table.5 \
- mysql_table.5 nisplus_table.5 pcre_table.5 pgsql_table.5 postconf.5 \
- postfix-wrapper.5 regexp_table.5 relocated.5 socketmap_table.5 \
- sqlite_table.5 tcp_table.5 transport.5 virtual.5
-
-MAN8= anvil.8 bounce.8 cleanup.8 discard.8 dnsblog.8 error.8 flush.8 local.8 master.8 \
- oqmgr.8 pickup.8 pipe.8 postscreen.8 proxymap.8 qmgr.8 qmqpd.8 scache.8 showq.8 \
- smtp.8 smtpd.8 spawn.8 tlsmgr.8 tlsproxy.8 trivial-rewrite.8 verify.8 virtual.8
-
-MLINKS= sendmail.1 mailq.1 \
- sendmail.1 newaliases.1 \
- header_checks.5 body_checks.5 \
- bounce.8 defer.8 \
- bounce.8 trace.8 \
- smtp.8 lmtp.8
-
HTML1= body_checks.5.html bounce.5.html postfix-power.png \
scache.8.html tlsmgr.8.html
+STRIP_LIBEXEC= anvil bounce cleanup discard dnsblog error flush lmtp local master \
+ nqmgr oqmgr pickup pipe postscreen proxymap qmgr qmqpd scache showq \
+ smtp smtpd spawn tlsmgr tlsproxy trivial-rewrite verify virtual
+
.if !defined(BATCH) && !defined(PACKAGE_BUILDING) && exists(/etc/mail/mailer.conf)
OLD_MAILER!= ${GREP} -m 1 '^purgestat' /etc/mail/mailer.conf || ${ECHO_CMD}
.if !empty(OLD_MAILER)
@@ -108,8 +93,31 @@
MAKEFILEFLAGS+= CC="${CC}" OPT="${CFLAGS}"
-POSTFIX_CCARGS+= \$$(WARN) \
- -DDEF_CONFIG_DIR=\\\"${ETCDIR}\\\" \
+.if ${PORT_OPTIONS:MINST_BASE}
+PKGNAMESUFFIX= -base
+PREFIX= /usr
+ETCDIR= /etc/postfix
+USE_RCORDER= postfix
+PLIST_SUB+= BASE="" BMAN="share/"
+.else
+USE_RC_SUBR= postfix
+PLIST_SUB+= BASE="@comment " BMAN=""
+.endif
+
+PLIST_SUB+= PFETC=${ETCDIR} RESETPREFIX=${PREFIX}
+
+.if ${PORT_OPTIONS:MDOCS}
+READMEDIR= ${DOCSDIR}
+.else
+READMEDIR= no
+.endif
+
+DAEMONDIR= ${PREFIX}/libexec/postfix
+
+SUB_LIST+= REQUIRE="${_REQUIRE}" READMEDIR="${READMEDIR}" DAEMONDIR="${DAEMONDIR}"
+SUB_FILES+= pkg-install pkg-message
+
+POSTFIX_CCARGS+= -DDEF_CONFIG_DIR=\\\"${ETCDIR}\\\" \
-DDEF_DAEMON_DIR=\\\"${DAEMONDIR}\\\" \
-DDEF_COMMAND_DIR=\\\"${PREFIX}/sbin\\\" \
-DDEF_SENDMAIL_PATH=\\\"${PREFIX}/sbin/sendmail\\\" \
@@ -122,6 +130,7 @@
-DDEF_DATA_DIR=\\\"/var/db/postfix\\\" \
-DDEF_MAIL_OWNER=\\\"postfix\\\" \
-DDEF_SGID_GROUP=\\\"maildrop\\\" \
+ -Wmissing-prototypes -Wformat -Wno-comment
# Default requirement for postfix rc script
_REQUIRE= LOGIN cleanvar
@@ -244,23 +253,11 @@
.if ${PORT_OPTIONS:MTEST}
BINTEST= qmqp-sink qmqp-source smtp-sink smtp-source
MANTEST= qmqp-sink.1 qmqp-source.1 smtp-sink.1 smtp-source.1
-MAN1+= ${MANTEST}
PLIST_SUB+= TEST=""
.else
PLIST_SUB+= TEST="@comment "
.endif
-.if ${PORT_OPTIONS:MINST_BASE}
-PKGNAMESUFFIX= -base
-PREFIX= /usr
-ETCDIR= /etc/postfix
-USE_RCORDER= postfix
-PLIST_SUB+= BASE=""
-.else
-USE_RC_SUBR= postfix
-PLIST_SUB+= BASE="@comment "
-.endif
-
.if ${PORT_OPTIONS:MLMDB}
LIB_DEPENDS+= liblmdb.so:${PORTSDIR}/databases/lmdb
POSTFIX_CCARGS+= -DHAS_LMDB -I${LOCALBASE}/include
@@ -267,19 +264,6 @@
POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -llmdb
.endif
-PLIST_SUB+= PFETC=${ETCDIR}
-
-.if ${PORT_OPTIONS:MDOCS}
-READMEDIR= ${DOCSDIR}
-.else
-READMEDIR= no
-.endif
-
-DAEMONDIR= ${PREFIX}/libexec/postfix
-
-SUB_LIST+= REQUIRE="${_REQUIRE}" READMEDIR="${READMEDIR}" DAEMONDIR="${DAEMONDIR}"
-SUB_FILES+= pkg-install pkg-message
-
# sed script for files in ${WRKSRC}/README_FILES ${WRKSRC}/conf ${WRKSRC}/man
REINPLACE= s!^PATH=.*!PATH=/bin:/sbin:/usr/bin:/usr/sbin:${PREFIX}/bin:${PREFIX}/sbin!;\
s!(_directory = )/usr/!\1${PREFIX}/!g;\
@@ -343,8 +327,13 @@
CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
${ECHO} "all: default" >> Makefile)
+pre-install:
+.if ${PORT_OPTIONS:MINST_BASE}
+ ${MKDIR} ${STAGEDIR}/etc/rc.d
+.endif
+
do-install:
- @cd ${WRKSRC} && ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \
+ @(cd ${WRKSRC} && ${SH} postfix-install -non-interactive install_root=${STAGEDIR} tempdir=/tmp \
config_directory=${ETCDIR} \
command_directory=${PREFIX}/sbin \
daemon_directory=${DAEMONDIR} \
@@ -353,21 +342,22 @@
manpage_directory=${MANPREFIX}/man \
newaliases_path=${PREFIX}/bin/newaliases \
readme_directory=${READMEDIR} \
- sendmail_path=${PREFIX}/sbin/sendmail
- ${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/rmail/rmail ${PREFIX}/bin/rmail
- ${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/qshape/qshape.pl ${PREFIX}/bin/qshape
- ${INSTALL_MAN} ${WRKSRC}/man/man1/qshape.1 ${MAN1PREFIX}/man/man1
-.for f in ${BINTEST}
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/${f} ${PREFIX}/bin
-.endfor
-.for f in ${MANTEST}
- ${INSTALL_MAN} ${WRKSRC}/man/man1/${f} ${MAN1PREFIX}/man/man1
-.endfor
+ sendmail_path=${PREFIX}/sbin/sendmail )
+# == do not overwrite existing config
+ ${RM} ${STAGEDIR}${ETCDIR}/main.cf ${STAGEDIR}${ETCDIR}/master.cf
+ ${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/rmail/rmail ${STAGEDIR}${PREFIX}/bin/rmail
+ ${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/qshape/qshape.pl ${STAGEDIR}${PREFIX}/bin/qshape
+ ${INSTALL_MAN} ${WRKSRC}/man/man1/qshape.1 ${STAGEDIR}${MANPREFIX}/man/man1
+.if ${PORT_OPTIONS:MTEST}
+ ${INSTALL_PROGRAM} ${BINTEST:S|^|${WRKSRC}/bin/|} ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_MAN} ${MANTEST:S|^|${WRKSRC}/man/man1/|} ${STAGEDIR}${MANPREFIX}/man/man1
+.endif
+
post-install:
- @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
- # Fix compressed man pages
- @${REINPLACE_CMD} -i '' -E -e "s|(man[158]/.*.[158]):|\1.gz:|g" ${DAEMONDIR}/postfix-files
- @${CAT} ${PKGMESSAGE}
+# Fix compressed man pages and strip executables
+ ${REINPLACE_CMD} -i '' -E -e "s|(man[158]/.*.[158]):|\1.gz:|g" ${STAGEDIR}${DAEMONDIR}/postfix-files
+ -@${STRIP_CMD} ${STRIP_LIBEXEC:S|^|${STAGEDIR}${PREFIX}/libexec/postfix/|}
+ -@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/*
.include <bsd.port.mk>
Index: postfix/pkg-plist
===================================================================
--- postfix/pkg-plist (revision 352558)
+++ postfix/pkg-plist (working copy)
@@ -1,5 +1,20 @@
@unexec if cmp -s %D/libexec/postfix/main.cf %%PFETC%%/main.cf; then rm -f %%PFETC%%/main.cf; fi
@unexec if cmp -s %D/libexec/postfix/master.cf %%PFETC%%/master.cf; then rm -f %%PFETC%%/master.cf; fi
+bin/mailq
+bin/newaliases
+%%TEST%%bin/qmqp-sink
+%%TEST%%bin/qmqp-source
+bin/qshape
+bin/rmail
+%%TEST%%bin/smtp-sink
+%%TEST%%bin/smtp-source
+%%BASE%%@cwd /
+etc/postfix/LICENSE
+etc/postfix/TLS_LICENSE
+etc/postfix/bounce.cf.default
+etc/postfix/main.cf.default
+etc/postfix/makedefs.out
+@cwd %%RESETPREFIX%%
libexec/postfix/anvil
libexec/postfix/bounce
libexec/postfix/cleanup
@@ -30,20 +45,85 @@
libexec/postfix/smtp
libexec/postfix/smtpd
libexec/postfix/spawn
+libexec/postfix/tlsmgr
libexec/postfix/tlsproxy
libexec/postfix/trivial-rewrite
libexec/postfix/verify
libexec/postfix/virtual
-libexec/postfix/tlsmgr
-@dirrm libexec/postfix
-bin/mailq
-bin/newaliases
-bin/qshape
-bin/rmail
-%%TEST%%bin/qmqp-sink
-%%TEST%%bin/qmqp-source
-%%TEST%%bin/smtp-sink
-%%TEST%%bin/smtp-source
+%%BMAN%%man/man1/mailq.1.gz
+%%BMAN%%man/man1/newaliases.1.gz
+%%BMAN%%man/man1/postalias.1.gz
+%%BMAN%%man/man1/postcat.1.gz
+%%BMAN%%man/man1/postconf.1.gz
+%%BMAN%%man/man1/postdrop.1.gz
+%%BMAN%%man/man1/postfix.1.gz
+%%BMAN%%man/man1/postkick.1.gz
+%%BMAN%%man/man1/postlock.1.gz
+%%BMAN%%man/man1/postlog.1.gz
+%%BMAN%%man/man1/postmap.1.gz
+%%BMAN%%man/man1/postmulti.1.gz
+%%BMAN%%man/man1/postqueue.1.gz
+%%BMAN%%man/man1/postsuper.1.gz
+%%TEST%%%%BMAN%%man/man1/qmqp-sink.1.gz
+%%TEST%%%%BMAN%%man/man1/qmqp-source.1.gz
+%%BMAN%%man/man1/qshape.1.gz
+%%BMAN%%man/man1/sendmail.1.gz
+%%TEST%%%%BMAN%%man/man1/smtp-sink.1.gz
+%%TEST%%%%BMAN%%man/man1/smtp-source.1.gz
+%%BMAN%%man/man5/access.5.gz
+%%BMAN%%man/man5/aliases.5.gz
+%%BMAN%%man/man5/body_checks.5.gz
+%%BMAN%%man/man5/bounce.5.gz
+%%BMAN%%man/man5/canonical.5.gz
+%%BMAN%%man/man5/cidr_table.5.gz
+%%BMAN%%man/man5/generic.5.gz
+%%BMAN%%man/man5/header_checks.5.gz
+%%BMAN%%man/man5/ldap_table.5.gz
+%%BMAN%%man/man5/lmdb_table.5.gz
+%%BMAN%%man/man5/master.5.gz
+%%BMAN%%man/man5/memcache_table.5.gz
+%%BMAN%%man/man5/mysql_table.5.gz
+%%BMAN%%man/man5/nisplus_table.5.gz
+%%BMAN%%man/man5/pcre_table.5.gz
+%%BMAN%%man/man5/pgsql_table.5.gz
+%%BMAN%%man/man5/postconf.5.gz
+%%BMAN%%man/man5/postfix-wrapper.5.gz
+%%BMAN%%man/man5/regexp_table.5.gz
+%%BMAN%%man/man5/relocated.5.gz
+%%BMAN%%man/man5/socketmap_table.5.gz
+%%BMAN%%man/man5/sqlite_table.5.gz
+%%BMAN%%man/man5/tcp_table.5.gz
+%%BMAN%%man/man5/transport.5.gz
+%%BMAN%%man/man5/virtual.5.gz
+%%BMAN%%man/man8/anvil.8.gz
+%%BMAN%%man/man8/bounce.8.gz
+%%BMAN%%man/man8/cleanup.8.gz
+%%BMAN%%man/man8/defer.8.gz
+%%BMAN%%man/man8/discard.8.gz
+%%BMAN%%man/man8/dnsblog.8.gz
+%%BMAN%%man/man8/error.8.gz
+%%BMAN%%man/man8/flush.8.gz
+%%BMAN%%man/man8/lmtp.8.gz
+%%BMAN%%man/man8/local.8.gz
+%%BMAN%%man/man8/master.8.gz
+%%BMAN%%man/man8/oqmgr.8.gz
+%%BMAN%%man/man8/pickup.8.gz
+%%BMAN%%man/man8/pipe.8.gz
+%%BMAN%%man/man8/postscreen.8.gz
+%%BMAN%%man/man8/proxymap.8.gz
+%%BMAN%%man/man8/qmgr.8.gz
+%%BMAN%%man/man8/qmqpd.8.gz
+%%BMAN%%man/man8/scache.8.gz
+%%BMAN%%man/man8/showq.8.gz
+%%BMAN%%man/man8/smtp.8.gz
+%%BMAN%%man/man8/smtpd.8.gz
+%%BMAN%%man/man8/spawn.8.gz
+%%BMAN%%man/man8/tlsmgr.8.gz
+%%BMAN%%man/man8/tlsproxy.8.gz
+%%BMAN%%man/man8/trace.8.gz
+%%BMAN%%man/man8/trivial-rewrite.8.gz
+%%BMAN%%man/man8/verify.8.gz
+%%BMAN%%man/man8/virtual.8.gz
sbin/postalias
sbin/postcat
sbin/postconf
@@ -94,8 +174,6 @@
%%PORTDOCS%%%%DOCSDIR%%/INSTALL.html
%%PORTDOCS%%%%DOCSDIR%%/IPV6_README
%%PORTDOCS%%%%DOCSDIR%%/IPV6_README.html
-%%PORTDOCS%%%%DOCSDIR%%/TLS_README
-%%PORTDOCS%%%%DOCSDIR%%/TLS_README.html
%%PORTDOCS%%%%DOCSDIR%%/LDAP_README
%%PORTDOCS%%%%DOCSDIR%%/LDAP_README.html
%%PORTDOCS%%%%DOCSDIR%%/LINUX_README
@@ -151,6 +229,8 @@
%%PORTDOCS%%%%DOCSDIR%%/STRESS_README.html
%%PORTDOCS%%%%DOCSDIR%%/TLS_LEGACY_README
%%PORTDOCS%%%%DOCSDIR%%/TLS_LEGACY_README.html
+%%PORTDOCS%%%%DOCSDIR%%/TLS_README
+%%PORTDOCS%%%%DOCSDIR%%/TLS_README.html
%%PORTDOCS%%%%DOCSDIR%%/TUNING_README
%%PORTDOCS%%%%DOCSDIR%%/TUNING_README.html
%%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README
@@ -179,6 +259,7 @@
%%PORTDOCS%%%%DOCSDIR%%/dnsblog.8.html
%%PORTDOCS%%%%DOCSDIR%%/error.8.html
%%PORTDOCS%%%%DOCSDIR%%/flush.8.html
+%%PORTDOCS%%%%DOCSDIR%%/generic.5.html
%%PORTDOCS%%%%DOCSDIR%%/header_checks.5.html
%%PORTDOCS%%%%DOCSDIR%%/index.html
%%PORTDOCS%%%%DOCSDIR%%/ldap_table.5.html
@@ -189,8 +270,8 @@
%%PORTDOCS%%%%DOCSDIR%%/master.8.html
%%PORTDOCS%%%%DOCSDIR%%/memcache_table.5.html
%%PORTDOCS%%%%DOCSDIR%%/mysql_table.5.html
+%%PORTDOCS%%%%DOCSDIR%%/newaliases.1.html
%%PORTDOCS%%%%DOCSDIR%%/nisplus_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/newaliases.1.html
%%PORTDOCS%%%%DOCSDIR%%/oqmgr.8.html
%%PORTDOCS%%%%DOCSDIR%%/pcre_table.5.html
%%PORTDOCS%%%%DOCSDIR%%/pgsql_table.5.html
@@ -222,8 +303,8 @@
%%PORTDOCS%%%%DOCSDIR%%/qshape.1.html
%%PORTDOCS%%%%DOCSDIR%%/regexp_table.5.html
%%PORTDOCS%%%%DOCSDIR%%/relocated.5.html
+%%PORTDOCS%%%%DOCSDIR%%/scache.8.html
%%PORTDOCS%%%%DOCSDIR%%/sendmail.1.html
-%%PORTDOCS%%%%DOCSDIR%%/scache.8.html
%%PORTDOCS%%%%DOCSDIR%%/showq.8.html
%%PORTDOCS%%%%DOCSDIR%%/smtp-sink.1.html
%%PORTDOCS%%%%DOCSDIR%%/smtp-source.1.html
@@ -232,6 +313,7 @@
%%PORTDOCS%%%%DOCSDIR%%/spawn.8.html
%%PORTDOCS%%%%DOCSDIR%%/sqlite_table.5.html
%%PORTDOCS%%%%DOCSDIR%%/tcp_table.5.html
+%%PORTDOCS%%%%DOCSDIR%%/tlsmgr.8.html
%%PORTDOCS%%%%DOCSDIR%%/tlsproxy.8.html
%%PORTDOCS%%%%DOCSDIR%%/trace.8.html
%%PORTDOCS%%%%DOCSDIR%%/transport.5.html
@@ -239,13 +321,24 @@
%%PORTDOCS%%%%DOCSDIR%%/verify.8.html
%%PORTDOCS%%%%DOCSDIR%%/virtual.5.html
%%PORTDOCS%%%%DOCSDIR%%/virtual.8.html
-%%PORTDOCS%%%%DOCSDIR%%/tlsmgr.8.html
-%%PORTDOCS%%%%DOCSDIR%%/generic.5.html
+@dirrm libexec/postfix
%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@unexec rmdir "/var/db/postfix" >/dev/null 2>&1 || :
+@unexec rmdir "/var/spool/postfix/active" >/dev/null 2>&1 || :
+@unexec rmdir "/var/spool/postfix/bounce" >/dev/null 2>&1 || :
+@unexec rmdir "/var/spool/postfix/corrupt" >/dev/null 2>&1 || :
+@unexec rmdir "/var/spool/postfix/defer" >/dev/null 2>&1 || :
+@unexec rmdir "/var/spool/postfix/deferred" >/dev/null 2>&1 || :
+@unexec rmdir "/var/spool/postfix/flush" >/dev/null 2>&1 || :
+@unexec rmdir "/var/spool/postfix/hold" >/dev/null 2>&1 || :
+@unexec rmdir "/var/spool/postfix/incoming" >/dev/null 2>&1 || :
+@unexec rmdir "/var/spool/postfix/maildrop" >/dev/null 2>&1 || :
+@unexec rmdir "/var/spool/postfix/pid" >/dev/null 2>&1 || :
+@unexec rmdir "/var/spool/postfix/private" >/dev/null 2>&1 || :
+@unexec rmdir "/var/spool/postfix/public" >/dev/null 2>&1 || :
+@unexec rmdir "/var/spool/postfix/saved" >/dev/null 2>&1 || :
+@unexec rmdir "/var/spool/postfix/trace" >/dev/null 2>&1 || :
+@unexec rmdir "/var/spool/postfix" >/dev/null 2>&1 || :
%%BASE%%@cwd /
-etc/postfix/LICENSE
-etc/postfix/TLS_LICENSE
-etc/postfix/bounce.cf.default
-etc/postfix/main.cf.default
-etc/postfix/makedefs.out
@dirrmtry etc/postfix
+@cwd %%RESETPREFIX%%
Index: postfix-current/Makefile
===================================================================
--- postfix-current/Makefile (revision 352558)
+++ postfix-current/Makefile (working copy)
@@ -24,7 +24,7 @@
CONFLICTS= courier-0.* postfix-1.* postfix-2.* postfix-base-2.* postfix2[789]-* \
postfix21?-* sendmail-8.* sendmail+*-8.* smail-3.* zmailer-2.* \
- opensmtpd-[0-9]*
+ opensmtpd-[0-9]* postfix-tls-*
USERS= postfix
GROUPS= mail maildrop postfix
Index: postfix-tls/Makefile
===================================================================
--- postfix-tls/Makefile (revision 0)
+++ postfix-tls/Makefile (working copy)
@@ -0,0 +1,16 @@
+# Created by: Bjoern A. Zeeb <bz@FreeBSD.org>
+# $FreeBSD$
+
+PKGNAMESUFFIX= -tls
+
+CONFLICTS_INSTALL= courier-0.* postfix-1.* postfix2?-* postfix21?-* \
+ postfix-current-2.* postfix-current-base-2.* sendmail-8.* \
+ sendmail+*-8.* smail-3.* zmailer-2.* opensmtpd-[0-9]* \
+ postfix-2.*
+
+OPTIONS_SLAVE= TLS
+
+MASTERDIR= ${.CURDIR}/../postfix
+LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX}
+
+.include "${MASTERDIR}/Makefile"
Property changes on: postfix-tls/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Index: postfix210/Makefile
===================================================================
--- postfix210/Makefile (revision 352558)
+++ postfix210/Makefile (working copy)
@@ -26,7 +26,7 @@
CONFLICTS= courier-0.* postfix-1.* postfix2[789]-* \
postfix-2.11.* postfix-base-2.11.* postfix-current-2.* \
postfix-current-base-2.* sendmail-8.* sendmail+*-8.* \
- smail-3.* zmailer-2.* opensmtpd-[0-9]*
+ smail-3.* zmailer-2.* opensmtpd-[0-9]* postfix-tls-*
USERS= postfix
GROUPS= mail maildrop postfix
Index: postfix27/Makefile
===================================================================
--- postfix27/Makefile (revision 352558)
+++ postfix27/Makefile (working copy)
@@ -29,7 +29,7 @@
CONFLICTS= courier-0.* postfix-1.* postfix2[89]-* postfix21?-* \
postfix-2.* postfix-base-2.* postfix-current-2.* \
postfix-current-base-2.* sendmail-8.* sendmail+*-8.* \
- smail-3.* zmailer-2.* opensmtpd-[0-9]*
+ smail-3.* zmailer-2.* opensmtpd-[0-9]* postfix-tls-*
USERS= postfix
GROUPS= mail maildrop postfix
Index: postfix28/Makefile
===================================================================
--- postfix28/Makefile (revision 352558)
+++ postfix28/Makefile (working copy)
@@ -26,7 +26,7 @@
CONFLICTS= courier-0.* postfix-1.* postfix2[79]-* postfix21?-* \
postfix-2.* postfix-base-2.* postfix-current-2.* \
postfix-current-base-2.* sendmail-8.* sendmail+*-8.* \
- smail-3.* zmailer-2.* opensmtpd-[0-9]*
+ smail-3.* zmailer-2.* opensmtpd-[0-9]* postfix-tls-*
USERS= postfix
GROUPS= mail maildrop postfix
Index: postfix29/Makefile
===================================================================
--- postfix29/Makefile (revision 352558)
+++ postfix29/Makefile (working copy)
@@ -26,7 +26,7 @@
CONFLICTS= courier-0.* postfix-1.* postfix2[78]-* postfix21?-* \
postfix-2.* postfix-base-2.* postfix-current-2.* \
postfix-current-base-2.* sendmail-8.* sendmail+*-8.* \
- smail-3.* zmailer-2.* opensmtpd-[0-9]*
+ smail-3.* zmailer-2.* opensmtpd-[0-9]* postfix-tls-*
USERS= postfix
GROUPS= mail maildrop postfix
--SLDf9lqlvOQaIe6s--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140429012147.GA71794>