Index: mail/Makefile =================================================================== --- mail/Makefile +++ mail/Makefile @@ -199,6 +199,7 @@ SUBDIR += libdomainkeys SUBDIR += libesmtp SUBDIR += libetpan + SUBDIR += libmilter SUBDIR += libmapi SUBDIR += libpst SUBDIR += librfc822 Index: mail/libmilter/Makefile =================================================================== --- /dev/null +++ mail/libmilter/Makefile @@ -0,0 +1,82 @@ +# $FreeBSD$ + +PORTNAME= libmilter +PORTVERSION= 8.15.2 +CATEGORIES= mail +MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/ +DISTNAME= sendmail.${PORTVERSION} + +MAINTAINER= matthew@FreeBSD.org +COMMENT= Library providing Sendmail Mail Filter API + +LICENSE= Sendmail +LICENSE_NAME= Sendmail License +LICENSE_FILE= ${WRKSRC}/LICENSE +LICENSE_PERMS= ${_LICENSE_PERMS_DEFAULT} + +MILTER_SOVER?= 6 + +OPTIONS_DEFINE?= MILTER_POOL IPV6 +OPTIONS_DEFAULT?= MILTER_POOL IPV6 + +MILTER_POOL_DESC= Enable milter thread pools + +WRKSRC= ${WRKDIR}/sendmail-${PORTVERSION} +WCONF= ${WRKSRC}/devtools/Site +SITE= ${FILESDIR}/site.config.m4 + +IPV6_VARS= SITE+=${FILESDIR}/site.config.m4.ipv6 + +PLIST_SUB+= MILTER_SOVER=${MILTER_SOVER} +MAKE_ENV+= MILTER_SOVER=${MILTER_SOVER} +USE_LDCONFIG= ${LOCALBASE}/lib/${PORTNAME} + +SED_SCRIPT= -e "s|\`-O\'|\`${CFLAGS}\'|" \ + -e 's|%%CC%%|${CC}|' -e 's|%%LD%%|${LD}|' + +post-patch: + @${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 + +do-configure: + ${REINPLACE_CMD} ${SED_SCRIPT} ${WRKSRC}/devtools/OS/FreeBSD + ${SED} -e "s=%%PREFIX%%=${PREFIX}=g" \ + -e "s=%%LOCALBASE%%=${LOCALBASE}=g" \ + ${SITE} > ${WCONF}/site.config.m4 + +do-configure-MILTER_POOL-on: + ${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 + +do-build: + (cd ${BUILD_WRKSRC}/libmilter; ${SETENV} ${MAKE_ENV} ${MAKE} \ + ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) + (cd ${BUILD_WRKSRC}/libsharedmilter; ${SETENV} ${MAKE_ENV} \ + ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) + +do-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/include/libmilter + ${INSTALL_DATA} ${WRKSRC}/include/libmilter/mfapi.h \ + ${WRKSRC}/include/libmilter/mfdef.h \ + ${STAGEDIR}${PREFIX}/include/libmilter/ + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME} + ${INSTALL_DATA} \ + ${WRKSRC}/obj.`${WRKSRC}/devtools/bin/Build -A`/libmilter/libmilter.a \ + ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/ + ${INSTALL_LIB} \ + ${WRKSRC}/obj.`${WRKSRC}/devtools/bin/Build -A`/libsharedmilter/libmilter.so \ + ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/libmilter.so.${MILTER_SOVER} + ${LN} -sf libmilter.so.${MILTER_SOVER} \ + ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/libmilter.so + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/libmilter/README ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC}/libmilter/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} + +.include Index: mail/libmilter/distinfo =================================================================== --- /dev/null +++ mail/libmilter/distinfo @@ -0,0 +1,2 @@ +SHA256 (sendmail.8.15.2.tar.gz) = 24f94b5fd76705f15897a78932a5f2439a32b1a2fdc35769bb1a5f5d9b4db439 +SIZE (sendmail.8.15.2.tar.gz) = 2207417 Index: mail/libmilter/files/patch-devtools_OS_FreeBSD =================================================================== --- mail/libmilter/files/patch-devtools_OS_FreeBSD +++ mail/libmilter/files/patch-devtools_OS_FreeBSD @@ -1,6 +1,6 @@ ---- 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 @@ +--- devtools/OS/FreeBSD.orig 2014-03-05 00:59:45 UTC ++++ devtools/OS/FreeBSD +@@ -6,7 +6,7 @@ dnl Place personal settings in devtools/ define(`confMAPDEF', `-DNEWDB -DNIS -DMAP_REGEX') define(`confLIBS', `-lutil') Index: mail/libmilter/files/site.config.m4 =================================================================== --- mail/libmilter/files/site.config.m4 +++ mail/libmilter/files/site.config.m4 @@ -6,5 +6,4 @@ define(`confUBINDIR',`%%PREFIX%%/bin') define(`confNO_STATISTICS_INSTALL',`True') define(`confHFDIR', `%%PREFIX%%/share/sendmail') -APPENDDEF(`conf_sendmail_ENVDEF', `-DTCPWRAPPERS') -APPENDDEF(`conf_sendmail_LIBS', `-lwrap')" +APPENDDEF(`conf_libmilter_ENVDEF', `-DMILTER') Index: mail/libmilter/files/site.config.m4.ipv6 =================================================================== --- mail/libmilter/files/site.config.m4.ipv6 +++ mail/libmilter/files/site.config.m4.ipv6 @@ -1,3 +1 @@ -APPENDDEF(`conf_sendmail_ENVDEF', `-DNETINET6') APPENDDEF(`conf_libmilter_ENVDEF', `-DNETINET6') -APPENDDEF(`conf_libsm_ENVDEF', `-DNETINET6') Index: mail/libmilter/pkg-descr =================================================================== --- /dev/null +++ mail/libmilter/pkg-descr @@ -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/ Index: mail/libmilter/pkg-plist =================================================================== --- mail/libmilter/pkg-plist +++ mail/libmilter/pkg-plist @@ -1,57 +1,57 @@ include/libmilter/mfapi.h 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 +lib/libmilter.so +lib/libmilter.so.%%MILTER_SOVER%% +%%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 Index: mail/opendmarc/Makefile =================================================================== --- mail/opendmarc/Makefile +++ mail/opendmarc/Makefile @@ -42,10 +42,10 @@ PORTDOCS= * -.if !exists( /usr/include/libmilter/mfapi.h ) -BUILD_DEPENDS+= ${LOCALBASE}/include/libmilter/mfapi.h:${PORTSDIR}/mail/sendmail -CFLAGS+= -I${LOCALBASE}/include -.endif +.include + +.include "${PORTSDIR}/mail/sendmail/bsd.milter.mk" +CONFIGURE_ARGS+= --with-milter=${MILTERBASE} post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/mail @@ -53,4 +53,4 @@ ${WRKSRC}/opendmarc/opendmarc.conf.sample ${STAGEDIR}${PREFIX}/etc/mail @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libopendmarc.so.2 -.include +.include Index: mail/sendmail/Makefile =================================================================== --- mail/sendmail/Makefile +++ mail/sendmail/Makefile @@ -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} @@ -38,8 +39,8 @@ 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 +50,7 @@ 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 interface BDB_USE= BDB=yes LDAP_USE= OPENLDAP=yes @@ -112,21 +111,11 @@ .if ${PORT_OPTIONS:MLDAP} SITE+= ${FILESDIR}/site.config.m4.ldap .endif -.if ${PORT_OPTIONS:MMILTER} -SITE+= ${FILESDIR}/site.config.m4.milter -.endif .if ${PORT_OPTIONS:MTLS} 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 +SITE+= ${FILESDIR}/site.config.m4.milter .endif SED_SCRIPT= -e "s|\`-O\'|\`${CFLAGS}\'|" \ @@ -141,13 +130,6 @@ -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 +174,13 @@ '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 +200,6 @@ ${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 @@ -272,12 +221,6 @@ ${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 Index: mail/sendmail/bsd.milter.mk =================================================================== --- mail/sendmail/bsd.milter.mk +++ mail/sendmail/bsd.milter.mk @@ -20,7 +20,7 @@ # # Overrideable defaults: # -# SENDMAIL_MILTER_PORT?= sendmail +# SENDMAIL_MILTER_PORT?= libmilter # # The makefile sets this variables: # MILTERBASE - "/usr" or ${LOCALBASE} @@ -60,7 +60,7 @@ RUN_DEPENDS+= ${LOCALBASE}/lib/libmilter.so.${MILTER_SOVER}:${PORTSDIR}/mail/${SENDMAIL_MILTER_PORT} .endif -SENDMAIL_MILTER_PORT?= sendmail +SENDMAIL_MILTER_PORT?= libmilter MILTER_SOVER?= 6 MILTERBASE?= ${LOCALBASE} MILTERINC= -I${MILTERBASE}/include Index: mail/sendmail/files/pkg-milter =================================================================== --- mail/sendmail/files/pkg-milter +++ mail/sendmail/files/pkg-milter @@ -1,57 +0,0 @@ -include/libmilter/mfapi.h -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 Index: mail/sendmail/files/sharedlibrary.m4 =================================================================== --- mail/sendmail/files/sharedlibrary.m4 +++ mail/sendmail/files/sharedlibrary.m4 @@ -1,35 +0,0 @@ -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