svn commit: r408774 - in head: mail mail/antivirus-milter mail/archivesmtp mail/batv-milter mail/dk-milter mail/enma mail/libmilter mail/libmilter/files mail/milter-greylist mail/milter-greylist-de...
Dirk Meyer
dinoex at FreeBSD.org
Sat Feb 13 09:03:20 UTC 2016
Author: dinoex
Date: Sat Feb 13 09:03:15 2016
New Revision: 408774
URL: https://svnweb.freebsd.org/changeset/ports/408774
Log:
- split libmilter from sendmail into a seperate port
- bump PORTREVISION
Submitted by: matthew (Matthew Seaman)
Added:
head/mail/libmilter/
head/mail/libmilter/Makefile
- copied, changed from r407045, head/mail/sendmail/Makefile
head/mail/libmilter/distinfo
- copied unchanged from r407045, head/mail/sendmail/distinfo
head/mail/libmilter/files/
head/mail/libmilter/files/patch-FreeBSD
- copied unchanged from r407045, head/mail/sendmail/files/patch-FreeBSD
head/mail/libmilter/files/sharedlibrary.m4
- copied unchanged from r408773, head/mail/sendmail/files/sharedlibrary.m4
head/mail/libmilter/files/site.config.m4 (contents, props changed)
head/mail/libmilter/files/site.config.m4.ipv6 (contents, props changed)
head/mail/libmilter/files/site.config.m4.pool (contents, props changed)
head/mail/libmilter/pkg-descr (contents, props changed)
head/mail/libmilter/pkg-plist
- copied, changed from r408773, head/mail/sendmail/files/pkg-milter
Deleted:
head/mail/sendmail/files/pkg-milter
head/mail/sendmail/files/sharedlibrary.m4
Modified:
head/mail/Makefile
head/mail/antivirus-milter/Makefile
head/mail/archivesmtp/Makefile
head/mail/batv-milter/Makefile
head/mail/dk-milter/Makefile
head/mail/enma/Makefile
head/mail/milter-greylist-devel/Makefile
head/mail/milter-greylist/Makefile
head/mail/milter-regex/Makefile
head/mail/noattach/Makefile
head/mail/opendkim/Makefile
head/mail/raysfilter/Makefile
head/mail/rbl-milter/Makefile
head/mail/rmilter/Makefile
head/mail/scam-backscatter/Makefile
head/mail/sendmail/Makefile
head/mail/sentinel/Makefile
head/mail/sid-milter/Makefile
head/mail/spamass-milter/Makefile
head/mail/spamilter/Makefile
head/mail/vbsfilter/Makefile
head/security/amavisd-milter/Makefile
Modified: head/mail/Makefile
==============================================================================
--- head/mail/Makefile Sat Feb 13 01:26:10 2016 (r408773)
+++ head/mail/Makefile Sat Feb 13 09:03:15 2016 (r408774)
@@ -200,6 +200,7 @@
SUBDIR += libesmtp
SUBDIR += libetpan
SUBDIR += libmapi
+ SUBDIR += libmilter
SUBDIR += libpst
SUBDIR += librfc822
SUBDIR += libsieve
Modified: head/mail/antivirus-milter/Makefile
==============================================================================
--- head/mail/antivirus-milter/Makefile Sat Feb 13 01:26:10 2016 (r408773)
+++ head/mail/antivirus-milter/Makefile Sat Feb 13 09:03:15 2016 (r408774)
@@ -2,7 +2,7 @@
PORTNAME= antivirus
PORTVERSION= 3.30
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= mail
MASTER_SITES= LOCAL/dinoex
@@ -28,6 +28,7 @@ ANTIVIRUS_DIR?= /var/spool/antivirus
.if defined(WITH_SENDMAIL_PORT)
LIBS+= ${LDFLAGS}
.endif
+
MAKE_ENV+= SENDMAILBASE="${MILTERBASE}" \
SENDMAILOBJ="${MILTERBASE}" \
LIBS="${LIBS}"
Modified: head/mail/archivesmtp/Makefile
==============================================================================
--- head/mail/archivesmtp/Makefile Sat Feb 13 01:26:10 2016 (r408773)
+++ head/mail/archivesmtp/Makefile Sat Feb 13 09:03:15 2016 (r408774)
@@ -3,6 +3,7 @@
PORTNAME= archivesmtp
PORTVERSION= 1.2
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://www.dancingfortune.com/projects/archivesmtp/files/
Modified: head/mail/batv-milter/Makefile
==============================================================================
--- head/mail/batv-milter/Makefile Sat Feb 13 01:26:10 2016 (r408773)
+++ head/mail/batv-milter/Makefile Sat Feb 13 09:03:15 2016 (r408774)
@@ -3,6 +3,7 @@
PORTNAME= batv-milter
PORTVERSION= 0.5.0
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= SF
Modified: head/mail/dk-milter/Makefile
==============================================================================
--- head/mail/dk-milter/Makefile Sat Feb 13 01:26:10 2016 (r408773)
+++ head/mail/dk-milter/Makefile Sat Feb 13 09:03:15 2016 (r408774)
@@ -3,7 +3,7 @@
PORTNAME= dk-milter
PORTVERSION= 1.0.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= mail
MASTER_SITES= SF/${PORTNAME}/DomainKeys%20Milter/${PORTVERSION}
Modified: head/mail/enma/Makefile
==============================================================================
--- head/mail/enma/Makefile Sat Feb 13 01:26:10 2016 (r408773)
+++ head/mail/enma/Makefile Sat Feb 13 09:03:15 2016 (r408774)
@@ -3,7 +3,7 @@
PORTNAME= enma
PORTVERSION= 1.2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail
MASTER_SITES= SF/${PORTNAME}/ENMA/${PORTVERSION}
Copied and modified: head/mail/libmilter/Makefile (from r407045, head/mail/sendmail/Makefile)
==============================================================================
--- head/mail/sendmail/Makefile Sat Jan 23 17:35:17 2016 (r407045, copy source)
+++ head/mail/libmilter/Makefile Sat Feb 13 09:03:15 2016 (r408774)
@@ -1,147 +1,51 @@
# $FreeBSD$
-PORTNAME= sendmail
+PORTNAME= libmilter
PORTVERSION= 8.15.2
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/
-PKGNAMESUFFIX?= ${TLS_SUFFIX}${SASL_SUFFIX}${LDAP_SUFFIX}${BDB_SUFFIX}${PKGNAMESUFFIX2}
-DISTNAME= ${PORTNAME}.${PORTVERSION}
+DISTNAME= sendmail.${PORTVERSION}
MAINTAINER= dinoex at FreeBSD.org
-COMMENT= Reliable, highly configurable mail transfer agent with utilities
+COMMENT= Library providing Sendmail Mail Filter API
-CONFLICTS?= courier-0.* postfix-1.* postfix-2.* smail-3.* zmailer-2.* opensmtpd-*
+LICENSE= Sendmail
+LICENSE_NAME= Sendmail License
+LICENSE_FILE= ${WRKSRC}/LICENSE
+LICENSE_PERMS= ${_LICENSE_PERMS_DEFAULT}
-USERS= smmsp
-GROUPS= smmsp
-
-USES= cpe uidfix
-MAKE_ARGS= UBINOWN=${UID} UBINGRP=${GID} \
- SBINOWN=${UID} SBINGRP=${GID} \
- GBINOWN=${UID} GBINGRP=${GID} \
- MANOWN=${UID} MANGRP=${GID} \
- LIBMODE=0644 UBINMODE=0755 GBINMODE=2755
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-DOCS= KNOWNBUGS LICENSE PGPKEYS README RELEASE_NOTES \
- sendmail/TRACEFLAGS sendmail/SECURITY sendmail/TUNING
-PLIST_SUB+= PREFIX=${PREFIX:S=${PREFIX}/==} MANPREFIX=${MANPREFIX:S=$=/=:S=${PREFIX}==:S=^/==}
-PKGMESSAGE= ${WRKSRC}/pkg-message
-
-WCONF= ${WRKSRC}/devtools/Site
-SITE= ${FILESDIR}/site.config.m4.pre4
-PLIST= ${WRKDIR}/.PLIST.more
-LMAN1= mailq.1 newaliases.1 vacation.1
-LMAN5= aliases.5
-LMAN8= sendmail.8 mailstats.8 makemap.8 praliases.8 smrsh.8 \
- mail.local.8 rmail.8 editmap.8
-SENDMAIL= ${PREFIX}/sbin/sendmail
-BASEMAIL= /usr/libexec/sendmail/sendmail
MILTER_SOVER?= 6
-OPTIONS_DEFINE?= SHMEM SEM LA NIS IPV6 TLS SASL SASLAUTHD LDAP BDB SOCKETMAP CYRUSLOOKUP PICKY_HELO_CHECK MILTER MILTER_SHARED MILTER_POOL DOCS
-OPTIONS_DEFAULT?= SHMEM SEM LA NIS IPV6 TLS SASL SASLAUTHD PICKY_HELO_CHECK MILTER MILTER_SHARED MILTER_POOL
+OPTIONS_DEFINE?= IPV6 MILTER_SHARED MILTER_POOL DOCS
+OPTIONS_DEFAULT?= IPV6 MILTER_SHARED MILTER_POOL
NO_OPTIONS_SORT=yes
-SHMEM_DESC= System V shared memory support
-LA_DESC= load averages support
-TLS_DESC= SMTP-TLS and SMTPS support
-SASLAUTHD_DESC= SASLAUTHD support
-BDB_DESC= Berkeley DB version 4 support
-SOCKETMAP_DESC= Enable socketmap feature
-CYRUSLOOKUP_DESC= Enable cyruslookup feature
-PICKY_HELO_CHECK_DESC= Enable picky HELO check
-MILTER_DESC= Build libmilter
MILTER_SHARED_DESC= Build shared libmilter
MILTER_POOL_DESC= Enable milter thread pools
-BDB_USE= BDB=yes
-LDAP_USE= OPENLDAP=yes
-SASL_LIB_DEPENDS= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
-SASLAUTHD_RUN_DEPENDS= ${LOCALBASE}/sbin/saslauthd:${PORTSDIR}/security/cyrus-sasl2-saslauthd
+WRKSRC= ${WRKDIR}/sendmail-${PORTVERSION}
+WCONF= ${WRKSRC}/devtools/Site
+SITE= ${FILESDIR}/site.config.m4
.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MSHMEM} && !defined(BUILDING_INDEX)
-IPCCHECK!= ipcrm -q 0 2>&1 || true
-.if ${IPCCHECK:Mimplemented}
-IGNORE= your system does not support sysvipc
-.endif
-.endif
-
-.if ${PORT_OPTIONS:MBDB}
-BDB_SUFFIX= +${BDB_INCLUDE_DIR:S,^${LOCALBASE}/include/,,}
-CONFLICTS+= sendmail-ldap-8.* sendmail-sasl-8.* sendmail-sasl2-8.* sendmail-tls-8.*
-.endif
-.if ${PORT_OPTIONS:MLDAP}
-LDAP_SUFFIX?= +ldap
-CONFLICTS+= sendmail-sasl-8.* sendmail-sasl2-8.* sendmail-tls-8.*
-.endif
-.if ${PORT_OPTIONS:MSASL}
-SASL_SUFFIX?= +sasl2
-CONFLICTS+= sendmail-ldap-8.* sendmail-sasl-8.* sendmail-tls-8.*
-.endif
-.if ${PORT_OPTIONS:MCYRUSLOOKUP}
-.if ! ${PORT_OPTIONS:MSOCKETMAP}
-IGNORE= option CYRUSLOOKUP requires option SOCKETMAP
-.else
-EXTRA_PATCHES+= ${FILESDIR}/cyruslookup.patch
-.endif
-.endif
-.if ${PORT_OPTIONS:MTLS}
-TLS_SUFFIX?= +tls
-CONFLICTS+= sendmail-ldap-8.* sendmail-sasl-8.* sendmail-sasl2-8.*
-.endif
-
-MAKE_PKGNAMES= for i in "" +tls; do \
- for j in "" +sasl +sasl1 +sasl2; do \
- for k in "" +ldap; do \
- for l in "" +db2 +db3 +db4 +db41 +db42 +db43 +db44 +db45 +db46 +db47 +db48 +db49; do \
- echo "sendmail$${i}$${j}$${k}$${l}-8.*" ;\
- done done done done
-
-ALL_PKGNAMES!= ${MAKE_PKGNAMES}
-CONFLICTS2!= ${MAKE_PKGNAMES} | ${GREP} -v "${PORTNAME}${PKGNAMESUFFIX:S|${PKGNAMESUFFIX2}||}-8."
-CONFLICTS+= ${CONFLICTS2}
-# Build site.config.m4
-SITE+= ${FILESDIR}/site.config.m4
.if ${PORT_OPTIONS:MIPV6}
-SITE+= ${FILESDIR}/site.config.m4.ipv6
-.endif
-.if ${PORT_OPTIONS:MSASL}
-SITE+= ${FILESDIR}/site.config.m4.sasl2
-.endif
-.if ${PORT_OPTIONS:MLDAP}
-SITE+= ${FILESDIR}/site.config.m4.ldap
+SITE+= ${FILESDIR}/site.config.m4.ipv6
.endif
-.if ${PORT_OPTIONS:MMILTER}
-SITE+= ${FILESDIR}/site.config.m4.milter
-.endif
-.if ${PORT_OPTIONS:MTLS}
-USE_OPENSSL= yes
+.if ${PORT_OPTIONS:MMILTER_POOL}
+SITE+= ${FILESDIR}/site.config.m4.pool
.endif
-.if ${PORT_OPTIONS:MMILTER}
.if ${PORT_OPTIONS:MMILTER_SHARED}
PLIST_SUB+= MILTER_SHARED=""
PLIST_SUB+= MILTER_SOVER=${MILTER_SOVER}
MAKE_ENV+= MILTER_SOVER=${MILTER_SOVER}
+USE_LDCONFIG= yes
.else
PLIST_SUB+= MILTER_SHARED="@comment "
.endif
-.endif
-
-SED_SCRIPT= -e "s|\`-O\'|\`${CFLAGS}\'|" \
- -e 's|%%CC%%|${CC}|' -e 's|%%LD%%|${LD}|'
-
-.if ! ${PORT_OPTIONS:MNIS}
-SED_SCRIPT+= -e "s;-DNIS ;;"
-.endif
+.if ${PORT_OPTIONS:MMILTER_SHARED}
post-patch:
- @${SED} -e "s=%%PREFIX%%=${PREFIX}=g" \
- -e "s=%%LOCALBASE%%=${LOCALBASE}=g" \
- -e "s=%%PORTSDIR%%=${PORTSDIR}=g" \
- ${PKGDIR}/pkg-message > ${WRKSRC}/pkg-message
-.if ${PORT_OPTIONS:MMILTER} && ${PORT_OPTIONS:MMILTER_SHARED}
@${CP} -pR ${WRKSRC}/libmilter ${WRKSRC}/libsharedmilter
${CP} ${FILESDIR}/sharedlibrary.m4 \
${WRKSRC}/devtools/M4/UNIX/sharedlibrary.m4
@@ -150,239 +54,40 @@ post-patch:
.endif
do-configure:
- ${REINPLACE_CMD} ${SED_SCRIPT} ${WRKSRC}/devtools/OS/FreeBSD
+ ${REINPLACE_CMD} -e "s|\`-O\'|\`${CFLAGS}\'|" \
+ -e 's|%%CC%%|${CC}|' -e 's|%%LD%%|${LD}|' \
+ ${WRKSRC}/devtools/OS/FreeBSD
${SED} -e "s=%%PREFIX%%=${PREFIX}=g" \
-e "s=%%LOCALBASE%%=${LOCALBASE}=g" \
${SITE} > ${WCONF}/site.config.m4
-.if ${PORT_OPTIONS:MBDB}
- ${ECHO_CMD} \
- 'APPENDDEF(`confENVDEF'\'', `-I${BDB_INCLUDE_DIR}'\'')' \
- >> ${WCONF}/site.config.m4
- ${ECHO_CMD} \
- 'APPENDDEF(`confLIBDIRS'\'', `-L${LOCALBASE}/lib'\'')' \
- >> ${WCONF}/site.config.m4
-.for i in sendmail editmap makemap praliases vacation
- ${ECHO_CMD} \
- 'APPENDDEF(`conf_${i}_LIBS'\'', `-l${BDB_LIB_NAME}'\'')' \
- >> ${WCONF}/site.config.m4
-.endfor
-.endif
-.if ${PORT_OPTIONS:MSOCKETMAP}
- ${ECHO_CMD} \
- 'APPENDDEF(`conf_sendmail_ENVDEF'\'', `-DSOCKETMAP'\'')' \
- >> ${WCONF}/site.config.m4
-.endif
-.if ${PORT_OPTIONS:MPICKY_HELO_CHECK}
- ${ECHO_CMD} \
- 'APPENDDEF(`conf_sendmail_ENVDEF'\'', `-DPICKY_HELO_CHECK'\'')' \
- >> ${WCONF}/site.config.m4
-.endif
-.if ! ${PORT_OPTIONS:MSHMEM}
- ${ECHO_CMD} \
- 'APPENDDEF(`confENVDEF'\'', `-DSM_CONF_SHM=0'\'')' \
- >> ${WCONF}/site.config.m4
-.endif
-.if ! ${PORT_OPTIONS:MSEM}
- ${ECHO_CMD} \
- 'APPENDDEF(`confENVDEF'\'', `-DSM_CONF_SEM=0'\'')' \
- >> ${WCONF}/site.config.m4
-.endif
-.if ! ${PORT_OPTIONS:MLA}
- ${ECHO_CMD} \
- 'APPENDDEF(`confENVDEF'\'', `-DLA_TYPE=LA_ZERO'\'')' \
- >> ${WCONF}/site.config.m4
-.endif
-.if ${PORT_OPTIONS:MMILTER} && ${PORT_OPTIONS:MMILTER_POOL}
- ${ECHO_CMD} \
- 'APPENDDEF(`conf_libmilter_ENVDEF'\'', `-DSM_CONF_POLL=1'\'')' \
- >> ${WCONF}/site.config.m4
- ${ECHO_CMD} \
- 'APPENDDEF(`conf_libmilter_ENVDEF'\'', `-D_FFR_WORKERS_POOL=1'\'')' \
- >> ${WCONF}/site.config.m4
-.endif
-post-build:
- (cd ${WRKSRC}/doc/op && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} op.txt)
-.if ${PORT_OPTIONS:MMILTER}
- (cd ${BUILD_WRKSRC}/libmilter; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
-.if ${PORT_OPTIONS:MMILTER_SHARED}
- (cd ${BUILD_WRKSRC}/libsharedmilter; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
-.endif
-.endif
-
-pre-install:
- ${MKDIR} ${STAGEDIR}/etc/mail
- @${CAT} ${PKGDIR}/pkg-plist >${PLIST}
-.if ${PORT_OPTIONS:MMILTER}
- @${CAT} ${FILESDIR}/pkg-milter >>${PLIST}
-.endif
- @cd ${WRKSRC} && ${FIND} cf -type f | \
- ${AWK} '{print "share/sendmail/" $$1}' >>${PLIST}
-.if ${PORT_OPTIONS:MDOCS}
-.for i in ${DOCS}
- @${ECHO_CMD} `${BASENAME} ${i}` | \
- ${AWK} '{print "%%DOCSDIR%%/" $$1}' >>${PLIST}
-.endfor
-.if ${PORT_OPTIONS:MCYRUSLOOKUP}
- @${ECHO_CMD} "share/doc/sendmail/CYRUS_LOOKUP" >>${PLIST}
-.endif
-.endif
+do-build:
+ (cd ${BUILD_WRKSRC}/libmilter; ${SETENV} ${MAKE_ENV} ${MAKE} \
+ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
+
+do-build-MILTER_SHARED-on:
+ (cd ${BUILD_WRKSRC}/libsharedmilter; ${SETENV} ${MAKE_ENV} \
+ ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
-# We want mail.local and rmail for our system.
-# the build install catmans only, we have to fix this.
-post-install:
- (cd ${WRKSRC}/mail.local && \
- ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} force-install)
- (cd ${WRKSRC}/rmail && \
- ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} force-install)
-.if ${PORT_OPTIONS:MMILTER}
+do-install:
${MKDIR} ${STAGEDIR}${PREFIX}/include/libmilter
${INSTALL_DATA} ${WRKSRC}/include/libmilter/mfapi.h \
${WRKSRC}/include/libmilter/mfdef.h \
${STAGEDIR}${PREFIX}/include/libmilter/
${INSTALL_DATA} \
- ${WRKSRC}/obj.`${WRKSRC}/devtools/bin/Build -A`/libmilter/libmilter.a \
- ${STAGEDIR}${PREFIX}/lib/
-.if ${PORT_OPTIONS:MMILTER_SHARED}
+ ${WRKSRC}/obj.`${WRKSRC}/devtools/bin/Build -A`/libmilter/libmilter.a \
+ ${STAGEDIR}${PREFIX}/lib/
+
+post-install-MILTER_SHARED-on:
${INSTALL_LIB} \
- ${WRKSRC}/obj.`${WRKSRC}/devtools/bin/Build -A`/libsharedmilter/libmilter.so \
- ${STAGEDIR}${PREFIX}/lib/libmilter.so.${MILTER_SOVER}
+ ${WRKSRC}/obj.`${WRKSRC}/devtools/bin/Build -A`/libsharedmilter/libmilter.so \
+ ${STAGEDIR}${PREFIX}/lib/libmilter.so.${MILTER_SOVER}
${LN} -sf libmilter.so.${MILTER_SOVER} \
${STAGEDIR}${PREFIX}/lib/libmilter.so
-.endif
-.endif
-.for i in ${LMAN8}
- ${INSTALL_MAN} ${WRKSRC}/*/${i} ${STAGEDIR}${MANPREFIX}/man/man8/
-.endfor
-.for i in ${LMAN5}
- ${INSTALL_MAN} ${WRKSRC}/*/${i} ${STAGEDIR}${MANPREFIX}/man/man5/
-.endfor
-.for i in ${LMAN1}
- ${INSTALL_MAN} ${WRKSRC}/*/${i} ${STAGEDIR}${MANPREFIX}/man/man1/
-.endfor
- ${MKDIR} ${STAGEDIR}${PREFIX}/share/sendmail
- ${TAR} -C ${WRKSRC} -cf - cf | \
- ${TAR} -C ${STAGEDIR}${PREFIX}/share/sendmail -xf -
-.if ${PORT_OPTIONS:MDOCS}
- ${MKDIR} ${STAGEDIR}${DOCSDIR}
- cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}/
- ${INSTALL_DATA} ${WRKSRC}/doc/op/op.ps ${STAGEDIR}${DOCSDIR}/op.ps
- ${INSTALL_DATA} ${WRKSRC}/doc/op/op.txt ${STAGEDIR}${DOCSDIR}/op.txt
- ${INSTALL_DATA} ${WRKSRC}/devtools/README ${STAGEDIR}${DOCSDIR}/DEVTOOLS
- ${INSTALL_DATA} ${WRKSRC}/sendmail/README ${STAGEDIR}${DOCSDIR}/SENDMAIL
- ${INSTALL_DATA} ${WRKSRC}/mail.local/README ${STAGEDIR}${DOCSDIR}/MAIL.LOCAL
- ${INSTALL_DATA} ${WRKSRC}/smrsh/README ${STAGEDIR}${DOCSDIR}/SMRSH
-.if ${PORT_OPTIONS:MMILTER}
- ${INSTALL_DATA} ${WRKSRC}/libmilter/README ${STAGEDIR}${DOCSDIR}/MILTER
- ${MKDIR} ${STAGEDIR}${DOCSDIR}/libmilter
- ${TAR} -C ${WRKSRC}/libmilter/docs -cf - . | \
- ${TAR} -C ${STAGEDIR}${DOCSDIR}/libmilter -xf -
-.endif
-.if ${PORT_OPTIONS:MCYRUSLOOKUP}
- ${INSTALL_DATA} ${FILESDIR}/CYRUS_LOOKUP ${STAGEDIR}${DOCSDIR}/CYRUS_LOOKUP
-.endif
-.endif
- ${RM} ${STAGEDIR}${PREFIX}/man/cat*/*
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/vacation
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/rmail
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/*
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/*
-
-mailer.base:
- @${SED} \
- -e "s=^sendmail[ ]*/.*$$=sendmail ${BASEMAIL}=" \
- -e "s=^send-mail[ ]*/.*$$=send-mail ${BASEMAIL}=" \
- -e "s=^mailq[ ]*/.*$$=mailq ${BASEMAIL}=" \
- -e "s=^newaliases[ ]*/.*$$=newaliases ${BASEMAIL}=" \
- -e "s=^hoststat[ ]*/.*$$=hoststat ${BASEMAIL}=" \
- -e "s=^purgestat[ ]*/.*$$=purgestat ${BASEMAIL}=" \
- ${DESTDIR}/etc/mail/mailer.conf > ${DESTDIR}/etc/mail/mailer.conf.new
- ${MV} ${DESTDIR}/etc/mail/mailer.conf.new \
- ${DESTDIR}/etc/mail/mailer.conf
-
-mailer.conf:
- @${SED} \
- -e "s=^sendmail[ ]*/.*$$=sendmail ${SENDMAIL}=" \
- -e "s=^send-mail[ ]*/.*$$=send-mail ${SENDMAIL}=" \
- -e "s=^mailq[ ]*/.*$$=mailq ${SENDMAIL}=" \
- -e "s=^newaliases[ ]*/.*$$=newaliases ${SENDMAIL}=" \
- -e "s=^hoststat[ ]*/.*$$=hoststat ${SENDMAIL}=" \
- -e "s=^purgestat[ ]*/.*$$=purgestat ${SENDMAIL}=" \
- ${DESTDIR}/etc/mail/mailer.conf > ${DESTDIR}/etc/mail/mailer.conf.new
- ${MV} ${DESTDIR}/etc/mail/mailer.conf.new \
- ${DESTDIR}/etc/mail/mailer.conf
-
-# create sumbit.cf on older systems
-#
-submit.cf: ${DESTDIR}/etc/mail/submit.cf
-
-${DESTDIR}/etc/mail/submit.mc:
- ${INSTALL_DATA} ${PREFIX}/share/sendmail/cf/cf/submit.mc \
- ${DESTDIR}/etc/mail/submit.mc
-
-${DESTDIR}/etc/mail/submit.cf: ${DESTDIR}/etc/mail/submit.mc
- @( cd ${DESTDIR}/etc/mail && ${MAKE} \
- SENDMAIL_CF_DIR=${PREFIX}/share/sendmail/cf \
- SENDMAIL_MC=submit )
-
-# create basics for smtp-auth
-#
-howto-sasldb:
- @${ECHO_CMD} "# Links:"
- @${ECHO_CMD} "#"
- @${ECHO_CMD} "# http://www.sendmail.org/~gshapiro/"
- @${ECHO_CMD} "# http://www.sendmail.org/~ca/email/auth.html"
- @${ECHO_CMD} "# http://www.bme.ogi.edu/~pchytil/linux/sendmail/"
- @${ECHO_CMD} "# http://blue-labs.org/software/sm-pgsql/"
- @${ECHO_CMD} "# http://www.falkotimme.com/howtos/sendmail_smtp_auth_tls/"
- @${ECHO_CMD} "#"
-
-# create certificates for TLS/SSL
-#
-tls-install:
- ${SETENV} DESTDIR=${DESTDIR} FILESDIR=${FILESDIR} \
- ${SH} ${FILESDIR}/tls-install.sh
-
-help:
- @${ECHO_CMD} "# additional targets:"
- @${ECHO_CMD} "#"
- @${ECHO_CMD} "# configure ${DESTDIR}/etc/mail/mailer.conf"
- @${ECHO_CMD} "# for sendmail from ports"
- @${ECHO_CMD} "make mailer.conf"
- @${ECHO_CMD} "# for sendmail in the base"
- @${ECHO_CMD} "make mailer.base"
- @${ECHO_CMD} "#"
- @${ECHO_CMD} "# show howto for configuring sasldb"
- @${ECHO_CMD} "make howto-sasldb"
- @${ECHO_CMD} "#"
- @${ECHO_CMD} "# create a self-signed certificate"
- @${ECHO_CMD} "make tls-install"
- @${ECHO_CMD} "#"
-
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MTLS}
-.if !defined(WITH_OPENSSL_BASE)
-SITE+= ${FILESDIR}/site.config.m4.ssl
-.endif
-SITE+= ${FILESDIR}/site.config.m4.tls
-.endif
-
-.if exists(${FILESDIR}/site.config.m4.local)
-SITE+= ${FILESDIR}/site.config.m4.local
-.endif
-.if ${PREFIX} == "/usr"
-pre-everything::
- @${ECHO_CMD} "#"
- @${ECHO_CMD} "# You can't override the base sendmail this way."
- @${ECHO_CMD} "# your version FreeBSD use mailwrapper."
- @${ECHO_CMD} "#"
- @${ECHO_CMD} "# Please install with normal PREFIX"
- @${ECHO_CMD} "# and activate the port version with"
- @${ECHO_CMD} "# cd ${PORTSDIR}/mail/sendmail && make mailer.conf"
- @${ECHO_CMD} "#"
- @${FALSE}
-.endif
+post-install-DOCS-on:
+ ${MKDIR} ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/libmilter/README ${STAGEDIR}${DOCSDIR}/
+ cd ${WRKSRC}/libmilter/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Copied: head/mail/libmilter/distinfo (from r407045, head/mail/sendmail/distinfo)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/mail/libmilter/distinfo Sat Feb 13 09:03:15 2016 (r408774, copy of r407045, head/mail/sendmail/distinfo)
@@ -0,0 +1,2 @@
+SHA256 (sendmail.8.15.2.tar.gz) = 24f94b5fd76705f15897a78932a5f2439a32b1a2fdc35769bb1a5f5d9b4db439
+SIZE (sendmail.8.15.2.tar.gz) = 2207417
Copied: head/mail/libmilter/files/patch-FreeBSD (from r407045, head/mail/sendmail/files/patch-FreeBSD)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/mail/libmilter/files/patch-FreeBSD Sat Feb 13 09:03:15 2016 (r408774, copy of r407045, head/mail/sendmail/files/patch-FreeBSD)
@@ -0,0 +1,11 @@
+--- devtools/OS/FreeBSD.orig 2003-07-03 03:07:45.000000000 +0200
++++ devtools/OS/FreeBSD 2013-11-16 07:06:27.000000000 +0100
+@@ -6,7 +6,7 @@
+ define(`confMAPDEF', `-DNEWDB -DNIS -DMAP_REGEX')
+ define(`confLIBS', `-lutil')
+
+-define(`confLD', `cc')
++define(`confCC', `%%CC%%')
+ define(`confMTLDOPTS', `-pthread')
+ define(`confMTCCOPTS', `-D_THREAD_SAFE')
+ define(`confLDOPTS_SO', `-shared')
Copied: head/mail/libmilter/files/sharedlibrary.m4 (from r408773, head/mail/sendmail/files/sharedlibrary.m4)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/mail/libmilter/files/sharedlibrary.m4 Sat Feb 13 09:03:15 2016 (r408774, copy of r408773, head/mail/sendmail/files/sharedlibrary.m4)
@@ -0,0 +1,35 @@
+divert(-1)
+#
+# Copyright (c) 1999-2001, 2006 Sendmail, Inc. and its suppliers.
+# All rights reserved.
+#
+# By using this file, you agree to the terms and conditions set
+# forth in the LICENSE file which can be found at the top level of
+# the sendmail distribution.
+#
+#
+# Definitions for Makefile construction for sendmail
+#
+# $Id: library.m4,v 8.11 2006/09/05 22:56:53 ca Exp $
+#
+divert(0)dnl
+include(confBUILDTOOLSDIR`/M4/'bldM4_TYPE_DIR`/links.m4')dnl
+bldLIST_PUSH_ITEM(`bldC_PRODUCTS', bldCURRENT_PRODUCT)dnl
+bldPUSH_TARGET(bldCURRENT_PRODUCT.so)dnl
+bldPUSH_INSTALL_TARGET(`install-'bldCURRENT_PRODUCT)dnl
+bldPUSH_CLEAN_TARGET(bldCURRENT_PRODUCT`-clean')dnl
+
+include(confBUILDTOOLSDIR`/M4/'bldM4_TYPE_DIR`/defines.m4')
+divert(bldTARGETS_SECTION)
+bldCURRENT_PRODUCT.so: ${BEFORE} ${bldCURRENT_PRODUCT`OBJS'}
+ ${LD} ${LDOPTS_SO} -o bldCURRENT_PRODUCT.so -Wl,confSONAME -Wl,bldCURRENT_PRODUCT.so.${MILTER_SOVER} ${bldCURRENT_PRODUCT`OBJS'}
+ifdef(`bldLINK_SOURCES', `bldMAKE_SOURCE_LINKS(bldLINK_SOURCES)')
+
+install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT.so
+ifdef(`bldINSTALLABLE', ` ${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} bldCURRENT_PRODUCT.so ${DESTDIR}${LIBDIR}/bldCURRENT_PRODUCT.so.${MILTER_SOVER}')
+
+bldCURRENT_PRODUCT-clean:
+ rm -f ${OBJS} bldCURRENT_PRODUCT.so ${MANPAGES}
+
+divert(0)
+COPTS+= confCCOPTS_SO
Added: head/mail/libmilter/files/site.config.m4
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/mail/libmilter/files/site.config.m4 Sat Feb 13 09:03:15 2016 (r408774)
@@ -0,0 +1 @@
+APPENDDEF(`conf_libmilter_ENVDEF', `-DMILTER')
Added: head/mail/libmilter/files/site.config.m4.ipv6
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/mail/libmilter/files/site.config.m4.ipv6 Sat Feb 13 09:03:15 2016 (r408774)
@@ -0,0 +1 @@
+APPENDDEF(`conf_libmilter_ENVDEF', `-DNETINET6')
Added: head/mail/libmilter/files/site.config.m4.pool
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/mail/libmilter/files/site.config.m4.pool Sat Feb 13 09:03:15 2016 (r408774)
@@ -0,0 +1,2 @@
+APPENDDEF(`conf_libmilter_ENVDEF', `-DSM_CONF_POLL=1')
+APPENDDEF(`conf_libmilter_ENVDEF', `-D_FFR_WORKERS_POOL=1')
Added: head/mail/libmilter/pkg-descr
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/mail/libmilter/pkg-descr Sat Feb 13 09:03:15 2016 (r408774)
@@ -0,0 +1,5 @@
+The sendmail Mail Filter API (Milter) is designed to allow third-party
+programs access to mail messages as they are being processed in order to
+filter meta-information and content.
+
+WWW: http://www.sendmail.com/sm/open_source/milter/
Copied and modified: head/mail/libmilter/pkg-plist (from r408773, head/mail/sendmail/files/pkg-milter)
==============================================================================
--- head/mail/sendmail/files/pkg-milter Sat Feb 13 01:26:10 2016 (r408773, copy source)
+++ head/mail/libmilter/pkg-plist Sat Feb 13 09:03:15 2016 (r408774)
@@ -3,55 +3,55 @@ include/libmilter/mfdef.h
lib/libmilter.a
%%MILTER_SHARED%%lib/libmilter.so.%%MILTER_SOVER%%
%%MILTER_SHARED%%lib/libmilter.so
-%%PORTDOCS%%share/doc/sendmail/MILTER
-%%PORTDOCS%%share/doc/sendmail/libmilter/api.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/design.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/figure1.fig
-%%PORTDOCS%%share/doc/sendmail/libmilter/figure1.jpg
-%%PORTDOCS%%share/doc/sendmail/libmilter/figure1.ps
-%%PORTDOCS%%share/doc/sendmail/libmilter/figure2.fig
-%%PORTDOCS%%share/doc/sendmail/libmilter/figure2.jpg
-%%PORTDOCS%%share/doc/sendmail/libmilter/figure2.ps
-%%PORTDOCS%%share/doc/sendmail/libmilter/index.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/installation.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/other.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/overview.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/sample.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_addheader.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_addrcpt.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_addrcpt_par.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_chgfrom.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_chgheader.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_delrcpt.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_getpriv.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_getsymval.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_insheader.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_main.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_opensocket.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_progress.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_quarantine.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_register.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_replacebody.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_setbacklog.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_setconn.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_setdbg.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_setmlreply.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_setpriv.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_setreply.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_setsymlist.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_settimeout.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_stop.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_version.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_abort.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_body.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_close.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_connect.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_data.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_envfrom.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_envrcpt.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_eoh.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_eom.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_header.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_helo.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_negotiate.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_unknown.html
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/api.html
+%%PORTDOCS%%%%DOCSDIR%%/design.html
+%%PORTDOCS%%%%DOCSDIR%%/figure1.fig
+%%PORTDOCS%%%%DOCSDIR%%/figure1.jpg
+%%PORTDOCS%%%%DOCSDIR%%/figure1.ps
+%%PORTDOCS%%%%DOCSDIR%%/figure2.fig
+%%PORTDOCS%%%%DOCSDIR%%/figure2.jpg
+%%PORTDOCS%%%%DOCSDIR%%/figure2.ps
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/installation.html
+%%PORTDOCS%%%%DOCSDIR%%/other.html
+%%PORTDOCS%%%%DOCSDIR%%/overview.html
+%%PORTDOCS%%%%DOCSDIR%%/sample.html
+%%PORTDOCS%%%%DOCSDIR%%/smfi_addheader.html
+%%PORTDOCS%%%%DOCSDIR%%/smfi_addrcpt.html
+%%PORTDOCS%%%%DOCSDIR%%/smfi_addrcpt_par.html
+%%PORTDOCS%%%%DOCSDIR%%/smfi_chgfrom.html
+%%PORTDOCS%%%%DOCSDIR%%/smfi_chgheader.html
+%%PORTDOCS%%%%DOCSDIR%%/smfi_delrcpt.html
+%%PORTDOCS%%%%DOCSDIR%%/smfi_getpriv.html
+%%PORTDOCS%%%%DOCSDIR%%/smfi_getsymval.html
+%%PORTDOCS%%%%DOCSDIR%%/smfi_insheader.html
+%%PORTDOCS%%%%DOCSDIR%%/smfi_main.html
+%%PORTDOCS%%%%DOCSDIR%%/smfi_opensocket.html
+%%PORTDOCS%%%%DOCSDIR%%/smfi_progress.html
+%%PORTDOCS%%%%DOCSDIR%%/smfi_quarantine.html
+%%PORTDOCS%%%%DOCSDIR%%/smfi_register.html
+%%PORTDOCS%%%%DOCSDIR%%/smfi_replacebody.html
+%%PORTDOCS%%%%DOCSDIR%%/smfi_setbacklog.html
+%%PORTDOCS%%%%DOCSDIR%%/smfi_setconn.html
+%%PORTDOCS%%%%DOCSDIR%%/smfi_setdbg.html
+%%PORTDOCS%%%%DOCSDIR%%/smfi_setmlreply.html
+%%PORTDOCS%%%%DOCSDIR%%/smfi_setpriv.html
+%%PORTDOCS%%%%DOCSDIR%%/smfi_setreply.html
+%%PORTDOCS%%%%DOCSDIR%%/smfi_setsymlist.html
+%%PORTDOCS%%%%DOCSDIR%%/smfi_settimeout.html
+%%PORTDOCS%%%%DOCSDIR%%/smfi_stop.html
+%%PORTDOCS%%%%DOCSDIR%%/smfi_version.html
+%%PORTDOCS%%%%DOCSDIR%%/xxfi_abort.html
+%%PORTDOCS%%%%DOCSDIR%%/xxfi_body.html
+%%PORTDOCS%%%%DOCSDIR%%/xxfi_close.html
+%%PORTDOCS%%%%DOCSDIR%%/xxfi_connect.html
+%%PORTDOCS%%%%DOCSDIR%%/xxfi_data.html
+%%PORTDOCS%%%%DOCSDIR%%/xxfi_envfrom.html
+%%PORTDOCS%%%%DOCSDIR%%/xxfi_envrcpt.html
+%%PORTDOCS%%%%DOCSDIR%%/xxfi_eoh.html
+%%PORTDOCS%%%%DOCSDIR%%/xxfi_eom.html
+%%PORTDOCS%%%%DOCSDIR%%/xxfi_header.html
+%%PORTDOCS%%%%DOCSDIR%%/xxfi_helo.html
+%%PORTDOCS%%%%DOCSDIR%%/xxfi_negotiate.html
+%%PORTDOCS%%%%DOCSDIR%%/xxfi_unknown.html
Modified: head/mail/milter-greylist-devel/Makefile
==============================================================================
--- head/mail/milter-greylist-devel/Makefile Sat Feb 13 01:26:10 2016 (r408773)
+++ head/mail/milter-greylist-devel/Makefile Sat Feb 13 09:03:15 2016 (r408774)
@@ -3,6 +3,7 @@
PORTNAME= milter-greylist
PORTVERSION= 4.6.a1
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= ftp://ftp.espci.fr/pub/milter-greylist/ \
http://fossies.org/unix/privat/ \
Modified: head/mail/milter-greylist/Makefile
==============================================================================
--- head/mail/milter-greylist/Makefile Sat Feb 13 01:26:10 2016 (r408773)
+++ head/mail/milter-greylist/Makefile Sat Feb 13 09:03:15 2016 (r408774)
@@ -3,7 +3,7 @@
PORTNAME= milter-greylist
PORTVERSION= 4.4.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= mail
MASTER_SITES= ftp://ftp.espci.fr/pub/milter-greylist/ \
http://fossies.org/unix/privat/
Modified: head/mail/milter-regex/Makefile
==============================================================================
--- head/mail/milter-regex/Makefile Sat Feb 13 01:26:10 2016 (r408773)
+++ head/mail/milter-regex/Makefile Sat Feb 13 09:03:15 2016 (r408774)
@@ -3,7 +3,7 @@
PORTNAME= milter-regex
PORTVERSION= 2.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= mail
MASTER_SITES= http://www.benzedrine.cx/
Modified: head/mail/noattach/Makefile
==============================================================================
--- head/mail/noattach/Makefile Sat Feb 13 01:26:10 2016 (r408773)
+++ head/mail/noattach/Makefile Sat Feb 13 09:03:15 2016 (r408774)
@@ -2,7 +2,7 @@
PORTNAME= noattach
PORTVERSION= 1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail
MASTER_SITES= ftp://ftp.rhnet.is/pub/noattach/
Modified: head/mail/opendkim/Makefile
==============================================================================
--- head/mail/opendkim/Makefile Sat Feb 13 01:26:10 2016 (r408773)
+++ head/mail/opendkim/Makefile Sat Feb 13 09:03:15 2016 (r408774)
@@ -3,7 +3,7 @@
PORTNAME= opendkim
PORTVERSION= 2.10.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= mail security
MASTER_SITES= SF/${PORTNAME} \
SF/${PORTNAME}/Previous%20Releases \
Modified: head/mail/raysfilter/Makefile
==============================================================================
--- head/mail/raysfilter/Makefile Sat Feb 13 01:26:10 2016 (r408773)
+++ head/mail/raysfilter/Makefile Sat Feb 13 09:03:15 2016 (r408774)
@@ -2,6 +2,7 @@
PORTNAME= raysfilter
PORTVERSION= 1.14
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= LOCAL/dinoex
DISTNAME= rays-filter-${PORTVERSION}
@@ -15,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/GNU-public-licen
USES= shebangfix
CTARGETS+= rays-filter
CFLAGS+= -Wall
-LIBS+= -lpthread
+LIBS+= -lpthread -lmilter
SHEBANG_FILES= mf-analyze
ETCFILES= header-list.conf mail-filter.conf string-list.conf
BINFILES= mf-reset mf-start mf-stop mf-archive mf-analyze mf-memory
@@ -28,17 +29,6 @@ OPTIONS_DEFINE= DOCS
.include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
-.if exists(${LOCALBASE}/include/libmilter/mfdef.h) \
-|| defined(WITH_SENDMAIL_BASE)
-LIBS+= -lmilter
-.else
-LIBS+= -lmilter -lsmutil
-.endif
-
-.if defined(SENDMAIL_WITH_SFIO)
-LIBS+= -lsfio
-.endif
-
.for i in ${CTARGETS}
${i}:
cd ${WRKSRC} && \
Modified: head/mail/rbl-milter/Makefile
==============================================================================
--- head/mail/rbl-milter/Makefile Sat Feb 13 01:26:10 2016 (r408773)
+++ head/mail/rbl-milter/Makefile Sat Feb 13 09:03:15 2016 (r408774)
@@ -3,7 +3,7 @@
PORTNAME= rbl-milter
PORTVERSION= 0.30
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= mail
MASTER_SITES= http://opensource.confusticate.com/rbl-milter/
@@ -20,4 +20,5 @@ CONFIGURE_ARGS+= --with-sendmail=${MILTE
--with-sendmail-obj=${MILTERBASE}/lib
.include "${.CURDIR}/../sendmail/bsd.milter.mk"
+
.include <bsd.port.mk>
Modified: head/mail/rmilter/Makefile
==============================================================================
--- head/mail/rmilter/Makefile Sat Feb 13 01:26:10 2016 (r408773)
+++ head/mail/rmilter/Makefile Sat Feb 13 09:03:15 2016 (r408774)
@@ -2,6 +2,7 @@
PORTNAME= rmilter
PORTVERSION= 1.7.3
+PORTREVISION= 1
CATEGORIES= mail
MAINTAINER= vsevolod at FreeBSD.org
Modified: head/mail/scam-backscatter/Makefile
==============================================================================
--- head/mail/scam-backscatter/Makefile Sat Feb 13 01:26:10 2016 (r408773)
+++ head/mail/scam-backscatter/Makefile Sat Feb 13 09:03:15 2016 (r408774)
@@ -3,6 +3,7 @@
PORTNAME= scam-backscatter
PORTVERSION= 1.5.1
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://www.elandsys.com/scam/scam-backscatter/ \
http://dist.epipe.com/mirrors/scam-backscatter/
Modified: head/mail/sendmail/Makefile
==============================================================================
--- head/mail/sendmail/Makefile Sat Feb 13 01:26:10 2016 (r408773)
+++ head/mail/sendmail/Makefile Sat Feb 13 09:03:15 2016 (r408774)
@@ -2,6 +2,7 @@
PORTNAME= sendmail
PORTVERSION= 8.15.2
+PORTREVISION= 1
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/
PKGNAMESUFFIX?= ${TLS_SUFFIX}${SASL_SUFFIX}${LDAP_SUFFIX}${BDB_SUFFIX}${PKGNAMESUFFIX2}
@@ -10,6 +11,11 @@ DISTNAME= ${PORTNAME}.${PORTVERSION}
MAINTAINER= dinoex at FreeBSD.org
COMMENT= Reliable, highly configurable mail transfer agent with utilities
+LICENSE= Sendmail
+LICENSE_NAME= Sendmail License
+LICENSE_FILE= ${WRKSRC}/LICENSE
+LICENSE_PERMS= ${_LICENSE_PERMS_DEFAULT}
+
CONFLICTS?= courier-0.* postfix-1.* postfix-2.* smail-3.* zmailer-2.* opensmtpd-*
USERS= smmsp
@@ -38,8 +44,8 @@ SENDMAIL= ${PREFIX}/sbin/sendmail
BASEMAIL= /usr/libexec/sendmail/sendmail
MILTER_SOVER?= 6
-OPTIONS_DEFINE?= SHMEM SEM LA NIS IPV6 TLS SASL SASLAUTHD LDAP BDB SOCKETMAP CYRUSLOOKUP PICKY_HELO_CHECK MILTER MILTER_SHARED MILTER_POOL DOCS
-OPTIONS_DEFAULT?= SHMEM SEM LA NIS IPV6 TLS SASL SASLAUTHD PICKY_HELO_CHECK MILTER MILTER_SHARED MILTER_POOL
+OPTIONS_DEFINE?= SHMEM SEM LA NIS IPV6 TLS SASL SASLAUTHD LDAP BDB SOCKETMAP CYRUSLOOKUP PICKY_HELO_CHECK MILTER DOCS
+OPTIONS_DEFAULT?= SHMEM SEM LA NIS IPV6 TLS SASL SASLAUTHD PICKY_HELO_CHECK MILTER
NO_OPTIONS_SORT=yes
SHMEM_DESC= System V shared memory support
LA_DESC= load averages support
@@ -49,9 +55,7 @@ BDB_DESC= Berkeley DB version 4 support
SOCKETMAP_DESC= Enable socketmap feature
CYRUSLOOKUP_DESC= Enable cyruslookup feature
PICKY_HELO_CHECK_DESC= Enable picky HELO check
-MILTER_DESC= Build libmilter
-MILTER_SHARED_DESC= Build shared libmilter
-MILTER_POOL_DESC= Enable milter thread pools
+MILTER_DESC= Enable milter support
BDB_USE= BDB=yes
LDAP_USE= OPENLDAP=yes
@@ -119,16 +123,6 @@ SITE+= ${FILESDIR}/site.config.m4.milter
USE_OPENSSL= yes
.endif
-.if ${PORT_OPTIONS:MMILTER}
-.if ${PORT_OPTIONS:MMILTER_SHARED}
-PLIST_SUB+= MILTER_SHARED=""
-PLIST_SUB+= MILTER_SOVER=${MILTER_SOVER}
-MAKE_ENV+= MILTER_SOVER=${MILTER_SOVER}
-.else
-PLIST_SUB+= MILTER_SHARED="@comment "
-.endif
-.endif
-
SED_SCRIPT= -e "s|\`-O\'|\`${CFLAGS}\'|" \
-e 's|%%CC%%|${CC}|' -e 's|%%LD%%|${LD}|'
@@ -141,13 +135,6 @@ post-patch:
-e "s=%%LOCALBASE%%=${LOCALBASE}=g" \
-e "s=%%PORTSDIR%%=${PORTSDIR}=g" \
${PKGDIR}/pkg-message > ${WRKSRC}/pkg-message
-.if ${PORT_OPTIONS:MMILTER} && ${PORT_OPTIONS:MMILTER_SHARED}
- @${CP} -pR ${WRKSRC}/libmilter ${WRKSRC}/libsharedmilter
- ${CP} ${FILESDIR}/sharedlibrary.m4 \
- ${WRKSRC}/devtools/M4/UNIX/sharedlibrary.m4
- ${REINPLACE_CMD} -e 's=`library=`sharedlibrary=' \
- ${WRKSRC}/libsharedmilter/Makefile.m4
-.endif
do-configure:
${REINPLACE_CMD} ${SED_SCRIPT} ${WRKSRC}/devtools/OS/FreeBSD
@@ -192,30 +179,13 @@ do-configure:
'APPENDDEF(`confENVDEF'\'', `-DLA_TYPE=LA_ZERO'\'')' \
>> ${WCONF}/site.config.m4
.endif
-.if ${PORT_OPTIONS:MMILTER} && ${PORT_OPTIONS:MMILTER_POOL}
- ${ECHO_CMD} \
- 'APPENDDEF(`conf_libmilter_ENVDEF'\'', `-DSM_CONF_POLL=1'\'')' \
- >> ${WCONF}/site.config.m4
- ${ECHO_CMD} \
- 'APPENDDEF(`conf_libmilter_ENVDEF'\'', `-D_FFR_WORKERS_POOL=1'\'')' \
- >> ${WCONF}/site.config.m4
-.endif
post-build:
(cd ${WRKSRC}/doc/op && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} op.txt)
-.if ${PORT_OPTIONS:MMILTER}
- (cd ${BUILD_WRKSRC}/libmilter; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
-.if ${PORT_OPTIONS:MMILTER_SHARED}
- (cd ${BUILD_WRKSRC}/libsharedmilter; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
-.endif
-.endif
pre-install:
${MKDIR} ${STAGEDIR}/etc/mail
@${CAT} ${PKGDIR}/pkg-plist >${PLIST}
-.if ${PORT_OPTIONS:MMILTER}
- @${CAT} ${FILESDIR}/pkg-milter >>${PLIST}
-.endif
@cd ${WRKSRC} && ${FIND} cf -type f | \
${AWK} '{print "share/sendmail/" $$1}' >>${PLIST}
.if ${PORT_OPTIONS:MDOCS}
@@ -235,22 +205,6 @@ post-install:
${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} force-install)
(cd ${WRKSRC}/rmail && \
${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} force-install)
-.if ${PORT_OPTIONS:MMILTER}
- ${MKDIR} ${STAGEDIR}${PREFIX}/include/libmilter
- ${INSTALL_DATA} ${WRKSRC}/include/libmilter/mfapi.h \
- ${WRKSRC}/include/libmilter/mfdef.h \
- ${STAGEDIR}${PREFIX}/include/libmilter/
- ${INSTALL_DATA} \
- ${WRKSRC}/obj.`${WRKSRC}/devtools/bin/Build -A`/libmilter/libmilter.a \
- ${STAGEDIR}${PREFIX}/lib/
-.if ${PORT_OPTIONS:MMILTER_SHARED}
- ${INSTALL_LIB} \
- ${WRKSRC}/obj.`${WRKSRC}/devtools/bin/Build -A`/libsharedmilter/libmilter.so \
- ${STAGEDIR}${PREFIX}/lib/libmilter.so.${MILTER_SOVER}
- ${LN} -sf libmilter.so.${MILTER_SOVER} \
- ${STAGEDIR}${PREFIX}/lib/libmilter.so
-.endif
-.endif
.for i in ${LMAN8}
${INSTALL_MAN} ${WRKSRC}/*/${i} ${STAGEDIR}${MANPREFIX}/man/man8/
.endfor
@@ -263,7 +217,13 @@ post-install:
${MKDIR} ${STAGEDIR}${PREFIX}/share/sendmail
${TAR} -C ${WRKSRC} -cf - cf | \
${TAR} -C ${STAGEDIR}${PREFIX}/share/sendmail -xf -
-.if ${PORT_OPTIONS:MDOCS}
+ ${RM} ${STAGEDIR}${PREFIX}/man/cat*/*
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/vacation
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/rmail
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/*
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/*
+
+post-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}/
${INSTALL_DATA} ${WRKSRC}/doc/op/op.ps ${STAGEDIR}${DOCSDIR}/op.ps
@@ -272,21 +232,9 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/sendmail/README ${STAGEDIR}${DOCSDIR}/SENDMAIL
${INSTALL_DATA} ${WRKSRC}/mail.local/README ${STAGEDIR}${DOCSDIR}/MAIL.LOCAL
${INSTALL_DATA} ${WRKSRC}/smrsh/README ${STAGEDIR}${DOCSDIR}/SMRSH
-.if ${PORT_OPTIONS:MMILTER}
- ${INSTALL_DATA} ${WRKSRC}/libmilter/README ${STAGEDIR}${DOCSDIR}/MILTER
- ${MKDIR} ${STAGEDIR}${DOCSDIR}/libmilter
- ${TAR} -C ${WRKSRC}/libmilter/docs -cf - . | \
- ${TAR} -C ${STAGEDIR}${DOCSDIR}/libmilter -xf -
-.endif
.if ${PORT_OPTIONS:MCYRUSLOOKUP}
${INSTALL_DATA} ${FILESDIR}/CYRUS_LOOKUP ${STAGEDIR}${DOCSDIR}/CYRUS_LOOKUP
.endif
-.endif
- ${RM} ${STAGEDIR}${PREFIX}/man/cat*/*
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/vacation
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/rmail
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/*
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/*
mailer.base:
@${SED} \
Modified: head/mail/sentinel/Makefile
==============================================================================
--- head/mail/sentinel/Makefile Sat Feb 13 01:26:10 2016 (r408773)
+++ head/mail/sentinel/Makefile Sat Feb 13 09:03:15 2016 (r408774)
@@ -3,7 +3,7 @@
PORTNAME= sentinel
PORTVERSION= 1.7b
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= mail
MASTER_SITES= SF/smfilter/${PORTNAME}/Sentinel%20${PORTVERSION}
@@ -15,16 +15,15 @@ LIB_DEPENDS= libpcre.so:${PORTSDIR}/deve
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-OPTIONS_DEFINE= DOCS
+OPTIONS_DEFINE= NOSUBJECT DOCS
+
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list