diff -ruN mail/milter-greylist-devel.orig/Makefile mail/milter-greylist-devel/Makefile --- mail/milter-greylist-devel.orig/Makefile 2014-08-11 18:05:50.000000000 +0100 +++ mail/milter-greylist-devel/Makefile 2014-08-16 21:42:35.081827561 +0100 @@ -2,30 +2,32 @@ # $FreeBSD: head/mail/milter-greylist-devel/Makefile 364628 2014-08-11 17:05:50Z adamw $ 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 +MAINTAINER= freebsd-ports@dan.me.uk COMMENT= Easy-to-use greylist milter for sendmail and postfix (development) -LICENSE= BSD +LICENSE= BSD3CLAUSE -CONFLICTS= milter-greylist-4.2.* milter-greylist-4.4.* +CONFLICTS= milter-greylist-[0-9]*.* PKGMESSAGE= ${WRKDIR}/pkg-message MAKE_JOBS_UNSAFE= yes -OPTIONS_DEFINE= LIBSPF2 GEOIP CURL LDAP POSTFIX -LIBSPF2_DESC= Include SPF support +OPTIONS_DEFINE= MANPAGES SPF GEOIP CURL LDAP P0F POSTFIX DOCS EXAMPLES +OPTIONS_DEFAULT= MANPAGES +SPF_DESC= Include SPF support +CURL_DESC= curl support +P0F_DESC= P0F support POSTFIX_DESC= Use Postfix instead of Sendmail -NO_STAGE= yes -.include +.include ## # Use the following quirks to choose which sendmail to use (ports or system): @@ -38,13 +40,14 @@ # installed port preference over it. ## -MAN5= greylist.conf.5 -MAN8= milter-greylist.8 - +.if ${PORT_OPTIONS:MMANPAGES} +PLIST_FILES+= man/man5/greylist.conf.5.gz \ + man/man8/milter-greylist.8.gz +.endif ## # If you have a reentrant resolver (starting with RELENG_5_2) you can use SPF ## -.if ${PORT_OPTIONS:MLIBSPF2} +.if ${PORT_OPTIONS:MSPF} BUILD_DEPENDS+= libspf2>=1.2.5:${PORTSDIR}/mail/libspf2 CONFIGURE_ARGS+= --with-libspf2=${LOCALBASE} .endif @@ -60,6 +63,10 @@ USE_OPENLDAP=yes CONFIGURE_ARGS+= --with-openldap .endif +.if ${PORT_OPTIONS:MP0F} +RUN_DEPENDS+= p0f:${PORTSDIR}/net-mgmt/p0f +CONFIGURE_ARGS+= --enable-p0f306 +.endif .if ${PORT_OPTIONS:MPOSTFIX} CONFIGURE_ARGS+= --enable-postfix .else @@ -73,7 +80,8 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-user=mailnull --with-libmilter=${MILTERBASE} \ - --enable-dnsrbl --with-thread-safe-resolver + --enable-dnsrbl --with-thread-safe-resolver \ + --with-dumpfile=/var/milter-greylist/greylist.db ALL_TARGET= milter-greylist SUB_FILES+= pkg-message @@ -81,23 +89,23 @@ USE_RC_SUBR= milter-greylist 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 + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/mail +.if ${PORT_OPTIONS:MMANPAGES} + @${INSTALL_MAN} ${WRKSRC}/greylist.conf.5 ${STAGEDIR}${PREFIX}/man/man5 + @${INSTALL_MAN} ${WRKSRC}/milter-greylist.8 ${STAGEDIR}${PREFIX}/man/man8 +.endif + @${INSTALL_PROGRAM} ${WRKSRC}/milter-greylist ${STAGEDIR}${PREFIX}/libexec/ @${INSTALL_DATA} ${WRKSRC}/greylist.conf \ - ${PREFIX}/etc/mail/greylist.conf.sample + ${STAGEDIR}${PREFIX}/etc/mail/greylist.conf.sample post-install: - @${MKDIR} /var/milter-greylist - @${CHOWN} -R mailnull /var/milter-greylist .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} "************************************************************"; \ @@ -117,4 +125,4 @@ .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk" -.include +.include diff -ruN mail/milter-greylist-devel.orig/distinfo mail/milter-greylist-devel/distinfo --- mail/milter-greylist-devel.orig/distinfo 2013-12-17 16:25:53.000000000 +0000 +++ mail/milter-greylist-devel/distinfo 2014-08-16 21:22:13.370861388 +0100 @@ -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 diff -ruN mail/milter-greylist-devel.orig/files/patch-configure mail/milter-greylist-devel/files/patch-configure --- mail/milter-greylist-devel.orig/files/patch-configure 2013-12-17 16:25:53.000000000 +0000 +++ mail/milter-greylist-devel/files/patch-configure 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- configure.orig 2013-09-16 07:09:00.000000000 +0400 -+++ configure 2013-11-14 15:10:56.406013703 +0400 -@@ -6094,7 +6094,7 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5 - $as_echo "$ac_cv_lib_pthread_pthread_create" >&6; } - if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then : -- LIBS="$LIBS -lpthread" -+ true; #LIBS="$LIBS -lpthread" - else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lc_r" >&5 - $as_echo_n "checking for pthread_create in -lc_r... " >&6; } diff -ruN mail/milter-greylist-devel.orig/pkg-plist mail/milter-greylist-devel/pkg-plist --- mail/milter-greylist-devel.orig/pkg-plist 2014-04-24 17:42:32.000000000 +0100 +++ mail/milter-greylist-devel/pkg-plist 2014-08-16 21:37:06.080749871 +0100 @@ -3,7 +3,7 @@ %%PORTDOCS%%%%DOCSDIR%%/README %%PORTEXAMPLES%%%%EXAMPLESDIR%%/greylist.conf @exec /bin/mkdir -p /var/milter-greylist -@exec /usr/sbin/chown -R mailnull /var/milter-greylist +@exec /usr/sbin/chown -R mailnull: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%%