ports/65171: milter-regex port update request to version 1.5

[Stephane Lentz]

>Number:         65171
>Category:       ports
>Synopsis:       milter-regex port update request to version 1.5
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Apr 04 12:30:23 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Stephane Lentz
>Release:        FreeBSD 5.2.1-RELEASE i386
>Organization:
World 
>Environment:


System: FreeBSD 5.2.1-RELEASE #0: Tue Mar 30 22:34:28 CEST 2004
    root at ds9.gotdns.org:/usr/src/sys/i386/compile/CARDASSIA



>Description:


milter-regex version in ports is old : 0.8
Latest milter-regex version is 1.5 and brings many enhancements
(booleans, macros, examples).
Find attached some diff -u -r for some candidate port update to 1.5
which :
- uses USE_REINPLACE
- should work out of the box (creation of the pidfile spool directory)
- which introduces some variables (MAILUSER, SPOOLDIR) for 
customization

Potential additional change: the binary milter-regex is installed in 
/usr/local/libexec. Maybe /usr/local/sbin would be a better choice.


>How-To-Repeat:





>Fix:


--- milter-0.8-to-1.5.diff begins here ---
diff -u -r milter-regex/Makefile milter-regex-1.5/Makefile
--- milter-regex/Makefile	Sun Mar 28 18:16:36 2004
+++ milter-regex-1.5/Makefile	Tue Mar 30 21:28:09 2004
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	milter_regex
-PORTVERSION=	0.8
+PORTVERSION=	1.5
 CATEGORIES=	mail
 MASTER_SITES=	http://www.benzedrine.cx/
 DISTNAME=	milter-regex-${PORTVERSION}
@@ -15,6 +15,9 @@
 MAINTAINER=	trevor at FreeBSD.org
 COMMENT=	"Milter plugin to sendmail for regular expression filtering"
 
+USE_REINPLACE=  yes
+MAILUSER?=      mailnull
+SPOOLDIR?=      /var/spool/milter-regex
 MAN8=		milter-regex.8
 PLIST_FILES=	libexec/milter-regex
 
@@ -25,12 +28,19 @@
 .endif
 
 post-patch:
-	${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.orig
-	${SED} -e "s:-lpthread:${PTHREAD_LIBS}:g; \
-	s:-I/usr/src/gnu/usr.sbin/sendmail/include:${PTHREAD_CFLAGS}:g; \
-	s/-Werror//g" < ${WRKSRC}/Makefile.orig > ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e "s:/etc/milter-regex.conf:/usr/local/etc/milter-regex.conf:g; s:_milter-regex:${MAILUSER}:g;" \
+	${WRKSRC}/milter-regex.c
+	@${REINPLACE_CMD} -e "s:/etc/milter-regex.conf:/usr/local/etc/milter-regex.conf:g; s:mailstats 1:mailstats 8:;" \
+	${WRKSRC}/milter-regex.8
+	@${REINPLACE_CMD} -e "s:-lpthread:${PTHREAD_LIBS}:g; \
+ 	s:-I/usr/src/gnu/usr.sbin/sendmail/include:${PTHREAD_CFLAGS}:g; \
+	s/-Werror//g"  ${WRKSRC}/Makefile
 
 do-install:
+	@if  ! -d "${SPOOLDIR}" ; then \
+		${MKDIR} ${SPOOLDIR} ; \
+		${CHOWN} -R ${MAILUSER} ${SPOOLDIR} ; \
+	fi
 	${INSTALL_PROGRAM} ${WRKSRC}/milter-regex ${PREFIX}/libexec
 	${INSTALL_MAN} ${WRKSRC}/milter-regex.8 ${PREFIX}/man/man8
 	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
diff -u -r milter-regex/distinfo milter-regex-1.5/distinfo
--- milter-regex/distinfo	Sun Mar 28 18:16:36 2004
+++ milter-regex-1.5/distinfo	Tue Mar 30 21:13:03 2004
@@ -1,2 +1,2 @@
-MD5 (milter-regex-0.8.tar.gz) = 61f69271320e30765c88ca799a9a8751
-SIZE (milter-regex-0.8.tar.gz) = 9398
+MD5 (milter-regex-1.5.tar.gz) =  56f0a4648e46943e9f19256332211a17
+SIZE (milter-regex-1.5.tar.gz) = 15784
diff -u -r milter-regex/pkg-descr milter-regex-1.5/pkg-descr
--- milter-regex/pkg-descr	Thu Nov 13 11:21:03 2003
+++ milter-regex-1.5/pkg-descr	Tue Mar 30 21:30:16 2004
@@ -1,16 +1,14 @@
-from the OpenBSD port:
+Milter-regex is a sendmail milter plugin that allows to reject mail
+based on regular expressions matching SMTP envelope parameters and
+mail headers and body.
+It offers features similar to Postfix header_checks & body_checks.
 
-  milter-regex is a sendmail milter plugin that allows to reject mail
-  based on regular expressions matching SMTP envelope parameters and
-  mail headers and body.
+In order to build milter-regex, sendmail needs to be compiled with
+milter support, installing the libmilter library.
 
-  In order to build milter-regex, sendmail needs to be compiled with
-  milter support, installing the libmilter library.
+This is the default for the sendmail in the base system.  
+Some of the sendmail ports omit libmilter by default (SENDMAIL_WITHOUT_MILTER).
 
-This is the default for the sendmail in the base system.  Some of the sendmail
-ports omit libmilter by default.
-
-This port is in an experimental, untested state on FreeBSD.  Please tell the
-maintainer about your results, whether successful or unsuccessful.
+This program is developed on OpenBSD by pf's author.
 
 WWW:  http://www.benzedrine.cx/milter-regex.html
--- milter-0.8-to-1.5.diff ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted: