Index: head/mail/opensmtpd-extras/Makefile =================================================================== --- head/mail/opensmtpd-extras/Makefile (revision 415542) +++ head/mail/opensmtpd-extras/Makefile (revision 415543) @@ -1,80 +1,78 @@ # Created by: gahr # $FreeBSD$ PORTNAME= opensmtpd-extras -PORTVERSION= 201602042118 -PORTREVISION?= 4 +PORTVERSION= 201605182041 +PORTREVISION?= 0 CATEGORIES+= mail MASTER_SITES= http://www.opensmtpd.org/archives/ MAINTAINER?= gahr@FreeBSD.org COMMENT?= Addons for OpenSMTPD LICENSE?= ISCL LIB_DEPENDS+= libevent.so:devel/libevent2 RUN_DEPENDS+= ${LOCALBASE}/sbin/smtpctl:mail/opensmtpd USES+= autoreconf libtool pkgconfig USE_OPENSSL= yes WITH_OPENSSL_PORT= yes GNU_CONFIGURE= yes # NB: Please *DO NOT* add the following; they are NOT for end-users: # filter-monkey, filter-stub, filter-trace, filter-void # queue-null, queue-stub # scheduler-stub # table-stub .if empty(SLAVE_PORT) OPTIONS_GROUP= FILTER TABLE OPTIONS_GROUP_FILTER= CLAMAV DKIM DNSBL PAUSE REGEX SPAMASSASSIN OPTIONS_GROUP_TABLE= LDAP MYSQL PASSWD PGSQL PYTHON REDIS SMAP SQLITE OPTIONS_DEFAULT= ${OPTIONS_GROUP_FILTER} ${OPTIONS_GROUP_TABLE} # Filters CLAMAV_DESC= Check messages with ClamAV DKIM_DESC= Sign messages with DKIM DNSBL_DESC= Check messages against DNSBLs PAUSE_DESC= Pause incoming messages to reduce spam SPAMASSASSIN_DESC= Check messages with SpamAssassin # Tables PASSWD_DESC= passwd(5) table support SMAP_DESC= Socketmap protocol support - -OPTIONS_SUB= yes PLIST_FILES= man/man3/filter_api.3.gz INSTALL_DIR= ${LOCALBASE}/libexec/opensmtpd NO_ARCH= yes # # Filters # CLAMAV_RUN_DEPENDS= ${INSTALL_DIR}/filter-clamav:mail/opensmtpd-extras-filter-clamav DKIM_RUN_DEPENDS= ${INSTALL_DIR}/filter-dkim-signer:mail/opensmtpd-extras-filter-dkim DNSBL_RUN_DEPENDS= ${INSTALL_DIR}/filter-dnsbl:mail/opensmtpd-extras-filter-dnsbl PAUSE_RUN_DEPENDS= ${INSTALL_DIR}/filter-pause:mail/opensmtpd-extras-filter-pause REGEX_RUN_DEPENDS= ${INSTALL_DIR}/filter-regex:mail/opensmtpd-extras-filter-regex SPAMASSASSIN_RUN_DEPENDS= ${INSTALL_DIR}/filter-spamassassin:mail/opensmtpd-extras-filter-spamassassin # # Tables # MYSQL_RUN_DEPENDS= ${INSTALL_DIR}/table-mysql:mail/opensmtpd-extras-table-mysql PASSWD_RUN_DEPENDS= ${INSTALL_DIR}/table-passwd:mail/opensmtpd-extras-table-passwd PGSQL_RUN_DEPENDS= ${INSTALL_DIR}/table-postgres:mail/opensmtpd-extras-table-postgresql PYTHON_RUN_DEPENDS= ${INSTALL_DIR}/table-python:mail/opensmtpd-extras-table-python REDIS_RUN_DEPENDS= ${INSTALL_DIR}/table-redis:mail/opensmtpd-extras-table-redis SMAP_RUN_DEPENDS= ${INSTALL_DIR}/table-socketmap:mail/opensmtpd-extras-table-socketmap SQLITE_RUN_DEPENDS= ${INSTALL_DIR}/table-sqlite:mail/opensmtpd-extras-table-sqlite .else # Only install this for the opensmtpd-extras master port pre-patch: @${REINPLACE_CMD} -e '/man_MANS.*filter_api.3/s/^/#/' \ ${WRKSRC}/extras/wip/filters/Makefile.am .endif .include Index: head/mail/opensmtpd-extras/distinfo =================================================================== --- head/mail/opensmtpd-extras/distinfo (revision 415542) +++ head/mail/opensmtpd-extras/distinfo (revision 415543) @@ -1,2 +1,3 @@ -SHA256 (opensmtpd-extras-201602042118.tar.gz) = 59480e4bc0c75ca554a0a833b51764e4b7de6acf9f1ebcd2e7f176c144da3b32 -SIZE (opensmtpd-extras-201602042118.tar.gz) = 142226 +TIMESTAMP = 1463682954 +SHA256 (opensmtpd-extras-201605182041.tar.gz) = 6186f6da6b102bdcac9c6c0d6eca69cbc08b7a3fdb841d9325f6af994e9ae01b +SIZE (opensmtpd-extras-201605182041.tar.gz) = 630333 Index: head/mail/opensmtpd-extras-filter-clamav/Makefile =================================================================== --- head/mail/opensmtpd-extras-filter-clamav/Makefile (revision 415542) +++ head/mail/opensmtpd-extras-filter-clamav/Makefile (revision 415543) @@ -1,34 +1,17 @@ # Created by: Adam Weinberger # $FreeBSD$ PKGNAMESUFFIX= -filter-clamav COMMENT= Check messages with ClamAV in OpenSMTPD MAINTAINER= adamw@FreeBSD.org -RUN_DEPENDS= clamscan:security/clamav - PLIST_FILES= libexec/opensmtpd/filter-clamav \ man/man8/filter-clamav.8.gz CONFIGURE_ARGS+= --with-filter-clamav MASTERDIR= ${.CURDIR}/../opensmtpd-extras SLAVE_PORT= yes - -# These have to be set at compile-time. These are the -# defaults for ClamAV. -FILTER_CLAMAV_HOST?= 127.0.0.1 -FILTER_CLAMAV_PORT?= 3310 - -post-patch: - @${REINPLACE_CMD} \ - -e '/^#define CLAMAV_HOST/s/127.0.0.1/${FILTER_CLAMAV_HOST}/' \ - -e '/^#define CLAMAV_PORT/s/783/${FILTER_CLAMAV_PORT}/' \ - ${WRKSRC}/extras/wip/filters/filter-clamav/filter_clamav.c - @${REINPLACE_CMD} \ - -e 's/127.0.0.1/${FILTER_CLAMAV_HOST}/' \ - -e 's/783/${FILTER_CLAMAV_PORT}/' \ - ${WRKSRC}/extras/wip/filters/filter-clamav/filter-clamav.8 .include "${MASTERDIR}/Makefile" Index: head/mail/opensmtpd-extras-filter-regex/Makefile =================================================================== --- head/mail/opensmtpd-extras-filter-regex/Makefile (revision 415542) +++ head/mail/opensmtpd-extras-filter-regex/Makefile (revision 415543) @@ -1,26 +1,20 @@ # Created by: Adam Weinberger # $FreeBSD$ PKGNAMESUFFIX= -filter-regex COMMENT= Regular expression filter for OpenSMTPD MAINTAINER= adamw@FreeBSD.org CONFIGURE_ARGS+= --with-filter-regex PLIST= ${.CURDIR}/pkg-plist MASTERDIR= ${.CURDIR}/../opensmtpd-extras SLAVE_PORT= yes -post-patch: - @${REINPLACE_CMD} -e \ - 's|/etc/mail/filter-regex.conf|${PREFIX}&|' \ - ${WRKSRC}/extras/wip/filters/filter-regex/filter_regex.c \ - ${WRKSRC}/extras/wip/filters/filter-regex/filter-regex.8 - post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/mail ${INSTALL_DATA} ${WRKSRC}/extras/wip/filters/filter-regex/filter-regex.conf \ ${STAGEDIR}${PREFIX}/etc/mail/filter-regex.conf.sample .include "${MASTERDIR}/Makefile" Index: head/mail/opensmtpd-extras-filter-spamassassin/Makefile =================================================================== --- head/mail/opensmtpd-extras-filter-spamassassin/Makefile (revision 415542) +++ head/mail/opensmtpd-extras-filter-spamassassin/Makefile (revision 415543) @@ -1,32 +1,17 @@ # Created by: Adam Weinberger # $FreeBSD$ PKGNAMESUFFIX= -filter-spamassassin COMMENT= Spamassassin filter addon for OpenSMTPD MAINTAINER= adamw@FreeBSD.org PLIST_FILES= libexec/opensmtpd/filter-spamassassin \ man/man8/filter-spamassassin.8.gz CONFIGURE_ARGS+= --with-filter-spamassassin MASTERDIR= ${.CURDIR}/../opensmtpd-extras SLAVE_PORT= yes -# These have to be set at compile-time. These are the -# defaults for spamassassin. -FILTER_SPAMASSASSIN_HOST?= 127.0.0.1 -FILTER_SPAMASSASSIN_PORT?= 783 - -post-patch: - @${REINPLACE_CMD} \ - -e '/^#define SPAMASSASSIN_HOST/s/127.0.0.1/${FILTER_SPAMASSASSIN_HOST}/' \ - -e '/^#define SPAMASSASSIN_PORT/s/783/${FILTER_SPAMASSASSIN_PORT}/' \ - ${WRKSRC}/extras/wip/filters/filter-spamassassin/filter_spamassassin.c - @${REINPLACE_CMD} \ - -e 's/127.0.0.1/${FILTER_SPAMASSASSIN_HOST}/' \ - -e 's/783/${FILTER_SPAMASSASSIN_PORT}/' \ - ${WRKSRC}/extras/wip/filters/filter-spamassassin/filter-spamassassin.8 - .include "${MASTERDIR}/Makefile" Index: head/mail/opensmtpd-extras-table-mysql/Makefile =================================================================== --- head/mail/opensmtpd-extras-table-mysql/Makefile (revision 415542) +++ head/mail/opensmtpd-extras-table-mysql/Makefile (revision 415543) @@ -1,18 +1,18 @@ # Created by: gahr # $FreeBSD$ PKGNAMESUFFIX= -table-mysql COMMENT= MySQL table support for opensmtpd PLIST_FILES= libexec/opensmtpd/table-mysql CONFIGURE_ARGS= --with-table-mysql LDFLAGS+= -L${LOCALBASE}/lib/mysql -USE_MYSQL= client +USES= mysql MASTERDIR= ${.CURDIR}/../opensmtpd-extras SLAVE_PORT= yes .include "${MASTERDIR}/Makefile"