4 files changed, 18 insertions, 17 deletions

diff --git a/mail/milter-regex/Makefile b/mail/milter-regex/Makefile
index 5cd8d10f1015..d361805d380c 100644
--- a/mail/milter-regex/Makefile
+++ b/mail/milter-regex/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	milter-regex
-PORTVERSION=	1.9
+PORTVERSION=	2.0
 CATEGORIES=	mail
 MASTER_SITES=	http://www.benzedrine.cx/
 
@@ -15,7 +15,6 @@ LICENSE_FILE=	${FILESDIR}/COPYRIGHT
 USE_RC_SUBR=	milterregex
 SUB_LIST=	SPOOLDIR=${SPOOLDIR}
 PLIST_SUB=	SPOOLDIR=${SPOOLDIR}
-PLIST_FILES=	libexec/milter-regex man/man8/milter-regex.8.gz
 
 MAILUSER?=	mailnull
 SPOOLDIR?=	/var/run/milter-regex
@@ -25,15 +24,15 @@ SPOOLDIR?=	/var/run/milter-regex
 .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
 
 post-patch:
-	@${REINPLACE_CMD} -e \
+	${REINPLACE_CMD} -e \
 	    "s:/etc/milter-regex.conf:${PREFIX}/etc/milter-regex.conf:g; \
 	    s:/var/spool/milter-regex:${SPOOLDIR}:g; \
 	    s:_milter-regex:${MAILUSER}:g;" ${WRKSRC}/milter-regex.c
-	@${REINPLACE_CMD} -e \
+	${REINPLACE_CMD} -e \
 	    "s:/etc/milter-regex.conf:${PREFIX}/etc/milter-regex.conf:g; \
 	    s:/var/spool/milter-regex:${SPOOLDIR}:g; \
 	    s:mailstats 1:mailstats 8:;" ${WRKSRC}/milter-regex.8
-	@${REINPLACE_CMD} -e "s:-lpthread:${PTHREAD_LIBS}:g; \
+	${REINPLACE_CMD} -e "s:-lpthread:${PTHREAD_LIBS}:g; \
 	    s:-I/usr/src/gnu/usr.sbin/sendmail/include:${PTHREAD_CFLAGS}:g; \
 	    s:-L/usr/local/lib:-L${LOCALBASE}/lib:g; \
 	    s/-Werror//g"  ${WRKSRC}/Makefile
diff --git a/mail/milter-regex/distinfo b/mail/milter-regex/distinfo
index 656c7e5f68da..5c87c3fb1889 100644
--- a/mail/milter-regex/distinfo
+++ b/mail/milter-regex/distinfo
@@ -1,2 +1,2 @@
-SHA256 (milter-regex-1.9.tar.gz) = 6a708b0ff31d9f6db0e5b96915354c15f65ca09a730c599970b37e30699b18e4
-SIZE (milter-regex-1.9.tar.gz) = 19880
+SHA256 (milter-regex-2.0.tar.gz) = ac0388766e5780c42d39e72b694986524e312ea17e5da4823749c7c5b7a55a70
+SIZE (milter-regex-2.0.tar.gz) = 19891
diff --git a/mail/milter-regex/files/patch-milter-regex.c b/mail/milter-regex/files/patch-milter-regex.c
index 9ba49740074d..1c7cde49ce56 100644
--- a/mail/milter-regex/files/patch-milter-regex.c
+++ b/mail/milter-regex/files/patch-milter-regex.c
@@ -1,14 +1,14 @@
---- milter-regex.c.orig	2011-11-21 13:13:33.000000000 +0100
-+++ milter-regex.c	2011-12-10 08:02:10.000000000 +0100
+--- milter-regex.c.orig	2013-11-25 09:41:55.000000000 +0100
++++ milter-regex.c	2013-11-27 05:25:43.000000000 +0100
 @@ -60,6 +60,7 @@
  
  static const char	*rule_file_name = "/etc/milter-regex.conf";
  static int		 debug = 0;
 +static int		 quiet = 0;
+ static unsigned		 maxlines = 0;
  static pthread_mutex_t	 mutex;
  
- struct context {
-@@ -95,6 +96,7 @@
+@@ -97,6 +98,7 @@
  
  #define USER		"_milter-regex"
  #define OCONN		"unix:/var/spool/milter-regex/sock"
@@ -16,7 +16,7 @@
  #define RCODE_REJECT	"554"
  #define RCODE_TEMPFAIL	"451"
  #define XCODE_REJECT	"5.7.1"
-@@ -630,6 +632,9 @@
+@@ -645,6 +647,9 @@
  	va_list ap;
  	char msg[8192];
  
@@ -26,7 +26,7 @@
  	va_start(ap, fmt);
  	if (context != NULL)
  		snprintf(msg, sizeof(msg), "%s [%s]: ", context->host_name,
-@@ -667,15 +672,19 @@
+@@ -682,15 +687,19 @@
  {
  	int ch;
  	const char *oconn = OCONN;
@@ -42,12 +42,12 @@
  	tzset();
  	openlog("milter-regex", LOG_PID | LOG_NDELAY, LOG_DAEMON);
  
--	while ((ch = getopt(argc, argv, "c:dj:p:u:")) != -1) {
-+	while ((ch = getopt(argc, argv, "c:dj:p:qr:u:")) != -1) {
+-	while ((ch = getopt(argc, argv, "c:dj:l:m:p:u:")) != -1) {
++	while ((ch = getopt(argc, argv, "c:dj:l:m:p:qr:u:")) != -1) {
  		switch (ch) {
  		case 'c':
  			rule_file_name = optarg;
-@@ -689,6 +698,12 @@
+@@ -710,6 +719,12 @@
  		case 'p':
  			oconn = optarg;
  			break;
@@ -60,7 +60,7 @@
  		case 'u':
  			user = optarg;
  			break;
-@@ -761,9 +776,22 @@
+@@ -782,9 +797,22 @@
  		perror("daemon");
  		goto done;
  	}
diff --git a/mail/milter-regex/pkg-plist b/mail/milter-regex/pkg-plist
index bafa3fb46c92..c189d2b63ced 100644
--- a/mail/milter-regex/pkg-plist
+++ b/mail/milter-regex/pkg-plist
@@ -1,3 +1,5 @@
+libexec/milter-regex
+man/man8/milter-regex.8.gz
 @cwd /
 @dirrmtry %%SPOOLDIR%%
 @cwd