Date: Fri, 20 May 2016 08:49:57 +0000 (UTC) From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r415543 - in head/mail: opensmtpd-extras opensmtpd-extras-filter-clamav opensmtpd-extras-filter-regex opensmtpd-extras-filter-spamassassin opensmtpd-extras-table-mysql Message-ID: <201605200849.u4K8nvHr025007@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brnrd Date: Fri May 20 08:49:57 2016 New Revision: 415543 URL: https://svnweb.freebsd.org/changeset/ports/415543 Log: mail/opensmtpd-extras: Update to 2016-05-18 snapshot - Update to version 201605182041 - Remove post-patch for -clamav -spamassassin (is now configurable) - Remove post-patch for -regex (fixed upstream) - USE_MYSQL to USES= mysql Reviewed by: gahr (maintainer), adamw Approved by: gahr (maintainer), adamw Differential Revision: D6462 Modified: head/mail/opensmtpd-extras-filter-clamav/Makefile head/mail/opensmtpd-extras-filter-regex/Makefile head/mail/opensmtpd-extras-filter-spamassassin/Makefile head/mail/opensmtpd-extras-table-mysql/Makefile head/mail/opensmtpd-extras/Makefile head/mail/opensmtpd-extras/distinfo Modified: head/mail/opensmtpd-extras-filter-clamav/Makefile ============================================================================== --- head/mail/opensmtpd-extras-filter-clamav/Makefile Fri May 20 06:04:46 2016 (r415542) +++ head/mail/opensmtpd-extras-filter-clamav/Makefile Fri May 20 08:49:57 2016 (r415543) @@ -6,8 +6,6 @@ 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 @@ -16,19 +14,4 @@ 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" Modified: head/mail/opensmtpd-extras-filter-regex/Makefile ============================================================================== --- head/mail/opensmtpd-extras-filter-regex/Makefile Fri May 20 06:04:46 2016 (r415542) +++ head/mail/opensmtpd-extras-filter-regex/Makefile Fri May 20 08:49:57 2016 (r415543) @@ -12,12 +12,6 @@ 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 \ Modified: head/mail/opensmtpd-extras-filter-spamassassin/Makefile ============================================================================== --- head/mail/opensmtpd-extras-filter-spamassassin/Makefile Fri May 20 06:04:46 2016 (r415542) +++ head/mail/opensmtpd-extras-filter-spamassassin/Makefile Fri May 20 08:49:57 2016 (r415543) @@ -14,19 +14,4 @@ CONFIGURE_ARGS+= --with-filter-spamassas 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" Modified: head/mail/opensmtpd-extras-table-mysql/Makefile ============================================================================== --- head/mail/opensmtpd-extras-table-mysql/Makefile Fri May 20 06:04:46 2016 (r415542) +++ head/mail/opensmtpd-extras-table-mysql/Makefile Fri May 20 08:49:57 2016 (r415543) @@ -10,7 +10,7 @@ PLIST_FILES= libexec/opensmtpd/table-mys CONFIGURE_ARGS= --with-table-mysql LDFLAGS+= -L${LOCALBASE}/lib/mysql -USE_MYSQL= client +USES= mysql MASTERDIR= ${.CURDIR}/../opensmtpd-extras SLAVE_PORT= yes Modified: head/mail/opensmtpd-extras/Makefile ============================================================================== --- head/mail/opensmtpd-extras/Makefile Fri May 20 06:04:46 2016 (r415542) +++ head/mail/opensmtpd-extras/Makefile Fri May 20 08:49:57 2016 (r415543) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= opensmtpd-extras -PORTVERSION= 201602042118 -PORTREVISION?= 4 +PORTVERSION= 201605182041 +PORTREVISION?= 0 CATEGORIES+= mail MASTER_SITES= http://www.opensmtpd.org/archives/ @@ -41,8 +41,6 @@ SPAMASSASSIN_DESC= Check messages with S 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 Modified: head/mail/opensmtpd-extras/distinfo ============================================================================== --- head/mail/opensmtpd-extras/distinfo Fri May 20 06:04:46 2016 (r415542) +++ head/mail/opensmtpd-extras/distinfo Fri May 20 08:49:57 2016 (r415543) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605200849.u4K8nvHr025007>