svn commit: r314743 - in head/mail/milter-greylist: . files

[Hajimu UMEMOTO]

Author: ume
Date: Wed Mar 20 16:12:04 2013
New Revision: 314743
URL: http://svnweb.freebsd.org/changeset/ports/314743

Log:
  - Update to 4.4.3
  - Add a site specified in milter-greylist-devel to MASTER_SITE.
  - Add LICENSE.
  - Appropriate configure option for the version of net-mgmt/p0f.
  - Fix to be able to specify IPv6 address to syncsrcaddr.
  
  PR:		ports/176950
  Submitted by:	ume
  Reviewed by:	Mikhail Tsatsenko <m.tsatsenko__at__gmail.com> (maintainer)
  Approved by:	Mikhail Tsatsenko <m.tsatsenko__at__gmail.com> (maintainer)

Added:
  head/mail/milter-greylist/files/patch-sync.c   (contents, props changed)
Modified:
  head/mail/milter-greylist/Makefile
  head/mail/milter-greylist/distinfo
  head/mail/milter-greylist/files/patch-configure

Modified: head/mail/milter-greylist/Makefile
==============================================================================
--- head/mail/milter-greylist/Makefile	Wed Mar 20 16:09:29 2013	(r314742)
+++ head/mail/milter-greylist/Makefile	Wed Mar 20 16:12:04 2013	(r314743)
@@ -1,16 +1,18 @@
 # Created by: Cyril Guibourg
 # $FreeBSD$
-#
 
 PORTNAME=	milter-greylist
-PORTVERSION=	4.4.1
+PORTVERSION=	4.4.3
 CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.espci.fr/pub/milter-greylist/
+MASTER_SITES=	ftp://ftp.espci.fr/pub/milter-greylist/ \
+		http://fossies.org/unix/privat/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	m.tsatsenko at gmail.com
 COMMENT=	Easy-to-use greylist milter for sendmail and postfix
 
+LICENSE=	BSD
+
 CONFLICTS=	milter-greylist-devel-[1-9]*.*
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
@@ -27,16 +29,14 @@ MAKE_JOBS_UNSAFE=	yes
 # installed port preference over it.
 ##
 
-OPTIONS_DEFINE=	SPF GEOIP CURL OPENLDAP P0F POSTFIX
+OPTIONS_DEFINE=		MANPAGES SPF GEOIP CURL LDAP P0F POSTFIX
 OPTIONS_DEFAULT=	MANPAGES
-MANPAGES_DESC=	Install manpages
-SPF_DESC=	Include SPF support
-GEOIP_DESC=	Include GeoIP support
-OPENLDAP_DESC=	Include OpenLDAP support
-P0F_DESC=	Include P0F support
-POSTFIX_DESC=	Use Postfix instead of Sendmail
+SPF_DESC=		SPF support
+CURL_DESC=		curl support
+P0F_DESC=		P0F support
+POSTFIX_DESC=		Use Postfix instead of Sendmail
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMANPAGES}
 MAN5=		greylist.conf.5
@@ -54,13 +54,13 @@ CONFIGURE_ARGS+=	--with-libGeoIP=${LOCAL
 BUILD_DEPENDS+=	curl>=7.18:${PORTSDIR}/ftp/curl
 CONFIGURE_ARGS+=	--with-libcurl=${LOCALBASE}
 .endif
-.if ${PORT_OPTIONS:MOPENLDAP}
+.if ${PORT_OPTIONS:MLDAP}
 USE_OPENLDAP=yes
 CONFIGURE_ARGS+=	--with-openldap
 .endif
 .if ${PORT_OPTIONS:MP0F}
 RUN_DEPENDS+=	p0f:${PORTSDIR}/net-mgmt/p0f
-CONFIGURE_ARGS+=	--enable-p0f
+CONFIGURE_ARGS+=	--enable-p0f306
 .endif
 .if ${PORT_OPTIONS:MPOSTFIX}
 CONFIGURE_ARGS+=	--enable-postfix
@@ -86,7 +86,7 @@ USE_RC_SUBR=	milter-greylist
 
 do-install:
 	@${MKDIR} ${PREFIX}/etc/mail
-.if defined (WITH_MANPAGES)
+.if ${PORT_OPTIONS:MMANPAGES}
 	@${INSTALL_MAN} ${WRKSRC}/greylist.conf.5 ${PREFIX}/man/man5
 	@${INSTALL_MAN} ${WRKSRC}/milter-greylist.8 ${PREFIX}/man/man8
 .endif
@@ -97,11 +97,11 @@ do-install:
 post-install:
 	@${MKDIR} /var/milter-greylist
 	@${CHOWN} -R mailnull:mailnull /var/milter-greylist
-.if !${PORT_OPTIONS:MDOCS}
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
-.if !defined (NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR}
 	@${INSTALL_DATA} ${WRKSRC}/greylist.conf ${EXAMPLESDIR}
 .endif
@@ -123,4 +123,4 @@ post-install:
 
 .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/mail/milter-greylist/distinfo
==============================================================================
--- head/mail/milter-greylist/distinfo	Wed Mar 20 16:09:29 2013	(r314742)
+++ head/mail/milter-greylist/distinfo	Wed Mar 20 16:12:04 2013	(r314743)
@@ -1,2 +1,2 @@
-SHA256 (milter-greylist-4.4.1.tgz) = 5400a71e0b01d3f6915638dcd96c57c6fa3bbbc2fb16fcc8eda715ae83a4ad8c
-SIZE (milter-greylist-4.4.1.tgz) = 229401
+SHA256 (milter-greylist-4.4.3.tgz) = fdf7e37c5dd370473ff2cdec7e4b6ca9e60fc2b5c716612d2d449de98d0054a9
+SIZE (milter-greylist-4.4.3.tgz) = 236277

Modified: head/mail/milter-greylist/files/patch-configure
==============================================================================
--- head/mail/milter-greylist/files/patch-configure	Wed Mar 20 16:09:29 2013	(r314742)
+++ head/mail/milter-greylist/files/patch-configure	Wed Mar 20 16:12:04 2013	(r314743)
@@ -1,9 +1,11 @@
---- configure.orig	2010-07-12 08:27:51.000000000 +0400
-+++ configure	2010-08-05 05:18:10.000000000 +0400
-@@ -4978,7 +4978,7 @@
+Index: configure
+diff -u configure.orig configure
+--- configure.orig	2013-03-07 22:26:11.000000000 +0900
++++ configure	2013-03-14 15:35:15.476674058 +0900
+@@ -5899,7 +5899,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 :
+ if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :
 -  LIBS="$LIBS -lpthread"
 +  true; #LIBS="$LIBS -lpthread"
  else

Added: head/mail/milter-greylist/files/patch-sync.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/milter-greylist/files/patch-sync.c	Wed Mar 20 16:12:04 2013	(r314743)
@@ -0,0 +1,17 @@
+Index: sync.c
+diff -u -p sync.c.orig sync.c
+--- sync.c.orig	2010-04-17 12:19:02.000000000 +0900
++++ sync.c	2013-03-14 14:57:39.284674283 +0900
+@@ -478,7 +478,11 @@ peer_connect(peer)	/* peer list is read-
+ #ifdef AF_INET6
+ 		case AF_INET6:
+ 			SA6(res->ai_addr)->sin6_port = service;
+-			laddrstr = "::";
++			if (conf.c_syncsrcaddr != NULL) {
++				laddrstr = conf.c_syncsrcaddr;
++			} else {
++				laddrstr = "::";
++			}
+ 			break;
+ #endif
+ 		default: