Date: Sun, 17 Aug 2014 11:08:05 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r365171 - in head/mail/milter-greylist-devel: . files Message-ID: <201408171108.s7HB85H5045003@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Sun Aug 17 11:08:05 2014 New Revision: 365171 URL: http://svnweb.freebsd.org/changeset/ports/365171 QAT: https://qat.redports.org/buildarchive/r365171/ Log: Stage mail/milter-greylist-devel and upgrade version 4.5.7 => 4.5.11 Also assign maintainership to submitter PR: 192714 Submitted by: Daniel Austin Add'l work by: marino Deleted: head/mail/milter-greylist-devel/files/patch-configure Modified: head/mail/milter-greylist-devel/Makefile head/mail/milter-greylist-devel/distinfo head/mail/milter-greylist-devel/pkg-plist Modified: head/mail/milter-greylist-devel/Makefile ============================================================================== --- head/mail/milter-greylist-devel/Makefile Sun Aug 17 10:36:08 2014 (r365170) +++ head/mail/milter-greylist-devel/Makefile Sun Aug 17 11:08:05 2014 (r365171) @@ -2,30 +2,40 @@ # $FreeBSD$ PORTNAME= milter-greylist -PORTVERSION= 4.5.7 -PORTREVISION= 2 +PORTVERSION= 4.5.11 CATEGORIES= mail MASTER_SITES= ftp://ftp.espci.fr/pub/milter-greylist/ \ - http://fossies.org/unix/privat/ + http://fossies.org/unix/privat/ \ + ftp://ftpmirror.uk/freebsd-ports/milter-greylist/ PKGNAMESUFFIX= -devel -EXTRACT_SUFX= .tgz -MAINTAINER= ports@FreeBSD.org -COMMENT= Easy-to-use greylist milter for sendmail and postfix (development) +MAINTAINER= freebsd-ports@dan.me.uk +COMMENT= Unstable (dev) greylist milter for sendmail and postfix -LICENSE= BSD +LICENSE= BSD3CLAUSE -CONFLICTS= milter-greylist-4.2.* milter-greylist-4.4.* +CONFLICTS= milter-greylist-[0-9]*.* PKGMESSAGE= ${WRKDIR}/pkg-message +USES= tar:tgz + MAKE_JOBS_UNSAFE= yes -OPTIONS_DEFINE= LIBSPF2 GEOIP CURL LDAP POSTFIX -LIBSPF2_DESC= Include SPF support +OPTIONS_DEFINE= SPF GEOIP CURL LDAP P0F POSTFIX DOCS EXAMPLES +SPF_DESC= Include SPF support +CURL_DESC= curl support +P0F_DESC= P0F support POSTFIX_DESC= Use Postfix instead of Sendmail -NO_STAGE= yes -.include <bsd.port.pre.mk> +P0F_RUN_DEPENDS+= p0f:${PORTSDIR}/net-mgmt/p0f +SPF_BUILD_DEPENDS= libspf2>=1.2.5:${PORTSDIR}/mail/libspf2 +CURL_BUILD_DEPENDS+= curl>=7.18:${PORTSDIR}/ftp/curl +GEOIP_BUILD_DEPENDS= GeoIP>=1.4.4:${PORTSDIR}/net/GeoIP + +POSTFIX_CONFIGURE_ENABLE= postfix +P0F_CONFIGURE_ENABLE= p0f306 + +.include <bsd.port.options.mk> ## # Use the following quirks to choose which sendmail to use (ports or system): @@ -38,83 +48,67 @@ NO_STAGE= yes # installed port preference over it. ## -MAN5= greylist.conf.5 -MAN8= milter-greylist.8 - ## # If you have a reentrant resolver (starting with RELENG_5_2) you can use SPF ## -.if ${PORT_OPTIONS:MLIBSPF2} -BUILD_DEPENDS+= libspf2>=1.2.5:${PORTSDIR}/mail/libspf2 + +.if ${PORT_OPTIONS:MSPF} CONFIGURE_ARGS+= --with-libspf2=${LOCALBASE} .endif + .if ${PORT_OPTIONS:MGEOIP} -BUILD_DEPENDS+= GeoIP>=1.4.4:${PORTSDIR}/net/GeoIP CONFIGURE_ARGS+= --with-libGeoIP=${LOCALBASE} .endif + .if ${PORT_OPTIONS:MCURL} -BUILD_DEPENDS+= curl>=7.18:${PORTSDIR}/ftp/curl CONFIGURE_ARGS+= --with-libcurl=${LOCALBASE} .endif + .if ${PORT_OPTIONS:MLDAP} -USE_OPENLDAP=yes +# We can't use LDAP_CONFIGURE_WITH because configure script is buggy CONFIGURE_ARGS+= --with-openldap +USE_OPENLDAP= yes .endif -.if ${PORT_OPTIONS:MPOSTFIX} -CONFIGURE_ARGS+= --enable-postfix -.else + +.if ! ${PORT_OPTIONS:MPOSTFIX} LDFLAGS+= ${SENDMAIL_LDFLAGS} LIBS+= ${SENDMAIL_LDADD} .endif -RUN_DEPENDS+= ${BUILD_DEPENDS} CFLAGS+= ${PTHREAD_CFLAGS} LIBS+= ${PTHREAD_LIBS} GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-user=mailnull --with-libmilter=${MILTERBASE} \ - --enable-dnsrbl --with-thread-safe-resolver +CONFIGURE_ARGS+=--with-user=mailnull \ + --with-libmilter=${MILTERBASE} \ + --enable-dnsrbl \ + --with-thread-safe-resolver \ + --with-dumpfile=/var/milter-greylist/greylist.db ALL_TARGET= milter-greylist SUB_FILES+= pkg-message - USE_RC_SUBR= milter-greylist +PORTDOCS= README +PORTEXAMPLES= greylist.conf do-install: - @${MKDIR} ${PREFIX}/etc/mail - @${INSTALL_MAN} ${WRKSRC}/greylist.conf.5 ${PREFIX}/man/man5 - @${INSTALL_MAN} ${WRKSRC}/milter-greylist.8 ${PREFIX}/man/man8 - @${INSTALL_PROGRAM} ${WRKSRC}/milter-greylist ${PREFIX}/libexec - @${INSTALL_DATA} ${WRKSRC}/greylist.conf \ - ${PREFIX}/etc/mail/greylist.conf.sample - -post-install: - @${MKDIR} /var/milter-greylist - @${CHOWN} -R mailnull /var/milter-greylist + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/mail + ${INSTALL_MAN} ${WRKSRC}/greylist.conf.5 \ + ${STAGEDIR}${PREFIX}/man/man5 + ${INSTALL_MAN} ${WRKSRC}/milter-greylist.8 \ + ${STAGEDIR}${PREFIX}/man/man8 + ${INSTALL_PROGRAM} ${WRKSRC}/milter-greylist \ + ${STAGEDIR}${PREFIX}/libexec/ + ${INSTALL_DATA} ${WRKSRC}/greylist.conf \ + ${STAGEDIR}${PREFIX}/etc/mail/greylist.conf.sample .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} .endif .if ${PORT_OPTIONS:MEXAMPLES} - @${MKDIR} ${EXAMPLESDIR} - @${INSTALL_DATA} ${WRKSRC}/greylist.conf ${EXAMPLESDIR} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/greylist.conf ${STAGEDIR}${EXAMPLESDIR} .endif - @${TEST} -f /var/db/milter-greylist/greylist.db && ( \ - ${ECHO} "************************************************************"; \ - ${ECHO} "************************************************************"; \ - ${ECHO} "** **"; \ - ${ECHO} "** WARNING **"; \ - ${ECHO} "** **"; \ - ${ECHO} "** The default dump file location has changed. **"; \ - ${ECHO} "** Please move greylist.db from /var/db/milter-greylist/ **"; \ - ${ECHO} "** to /var/milter-greylist/ and update your greylist.conf **"; \ - ${ECHO} "** accordingly. **"; \ - ${ECHO} "** **"; \ - ${ECHO} "************************************************************"; \ - ${ECHO} "************************************************************"; \ - ) || ${TRUE} - @${CAT} ${PKGMESSAGE} - -.include "${PORTSDIR}/mail/sendmail/bsd.milter.mk" -.include <bsd.port.post.mk> +.include "${.CURDIR}/../sendmail/bsd.milter.mk" +.include <bsd.port.mk> Modified: head/mail/milter-greylist-devel/distinfo ============================================================================== --- head/mail/milter-greylist-devel/distinfo Sun Aug 17 10:36:08 2014 (r365170) +++ head/mail/milter-greylist-devel/distinfo Sun Aug 17 11:08:05 2014 (r365171) @@ -1,2 +1,2 @@ -SHA256 (milter-greylist-4.5.7.tgz) = b3e57d5d01f773c12081b28e671f82ed89c558ed2194de145619bc74b9420f3b -SIZE (milter-greylist-4.5.7.tgz) = 249853 +SHA256 (milter-greylist-4.5.11.tgz) = e412d189e936924ea6b4b8b24262f027a7c9c73cff3fe6ed7c0c09dfcfac1595 +SIZE (milter-greylist-4.5.11.tgz) = 254586 Modified: head/mail/milter-greylist-devel/pkg-plist ============================================================================== --- head/mail/milter-greylist-devel/pkg-plist Sun Aug 17 10:36:08 2014 (r365170) +++ head/mail/milter-greylist-devel/pkg-plist Sun Aug 17 11:08:05 2014 (r365171) @@ -1,11 +1,8 @@ libexec/milter-greylist +man/man5/greylist.conf.5.gz +man/man8/milter-greylist.8.gz etc/mail/greylist.conf.sample -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/greylist.conf @exec /bin/mkdir -p /var/milter-greylist -@exec /usr/sbin/chown -R mailnull /var/milter-greylist -@exec [ -f /var/db/milter-greylist/greylist.db ] && printf '\n\n************************************************************\n************************************************************\n** **\n** WARNING **\n** **\n** The default dump file location has changed. **\n** Please move greylist.db from /var/db/milter-greylist/ **\n** to /var/milter-greylist/ and update your greylist.conf **\n** accordingly. **\n** **\n************************************************************\n************************************************************\n' ||true -%%PORTDOCS%%@dirrm %%DOCSDIR%% -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% +@exec /usr/sbin/chown -R mailnull:mailnull /var/milter-greylist @dirrmtry etc/mail @unexec [ -f /var/milter-greylist/greylist.db ] || rmdir /var/milter-greylist || true
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408171108.s7HB85H5045003>