ports/124380: [patch] mail/sid-milter update to 1.0.0

[Hirohisa Yamaguchi]

>Number:         124380
>Category:       ports
>Synopsis:       [patch] mail/sid-milter update to 1.0.0
>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:   Sat Jun 07 23:50:00 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Hirohisa Yamaguchi
>Release:        FreeBSD 8.0-CURRENT amd64
>Organization:
<organization of PR author (multiple lines)>
>Environment:
System: FreeBSD calliope.****.org 8.0-CURRENT FreeBSD 8.0-CURRENT #15: Fri Jan 18 14:38:27 JST 2008 root at calliope.****.org:/usr/obj/usr/src/sys/CALLIOPE64 amd64

>Description:
	The new version of mail/sid-milter 1.0.0 has been released.
	Release notes: https://sourceforge.net/project/shownotes.php?release_id=605247
>How-To-Repeat:
	N/A
>Fix:

	Ther patch follows:
	Deleted:
	  files/patch-sid-filter.c
	  files/patch-sm-marid.c


cvs server: Diffing .
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/sid-milter/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- Makefile	21 Oct 2007 08:39:58 -0000	1.19
+++ Makefile	7 Jun 2008 23:20:33 -0000
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	sid-milter
-PORTVERSION=	0.2.14
-PORTREVISION=	2
+PORTVERSION=	1.0.0
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sid-milter
@@ -19,7 +18,8 @@
 
 WCONF=		${WRKSRC}/devtools/Site
 MAN8=		sid-filter.8
-DOCSFILES=	INSTALL KNOWNBUGS LICENSE README README-SenderID RELEASE_NOTES
+DOCSFILES=	FEATURES INSTALL KNOWNBUGS LICENSE README README-SenderID \
+		RELEASE_NOTES rfc4406.txt rfc4407.txt rfc4408.txt
 INSTALL_WRKSRC=	${WRKSRC}/sid-filter
 PLIST_FILES=	libexec/sid-filter
 PORTDOCS=	${DOCSFILES}
@@ -48,6 +48,12 @@
 SITE+=		${FILESDIR}/site.config.m4.milter
 .endif
 
+.if defined(WITH_NH_MFROM)
+SITE_SUB+=	-e 's|%%NH_MFROM%%||g'
+.else
+SITE_SUB+=	-e 's|%%NH_MFROM%%|dnl |g'
+.endif
+
 pre-configure:
 .if defined(WITHOUT_RC_NG)
 	@${SED} -e "s=%%PREFIX%%=${PREFIX}=" ${FILESDIR}/milter-sid.sh \
@@ -58,8 +64,9 @@
 		-e "s|\`-O'|\`${CFLAGS}'|g" \
 		-e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/devtools/OS/FreeBSD
-	${SED} -e "s|%%PREFIX%%|${PREFIX}|g" \
+	${SED} ${SITE_SUB} -e "s|%%PREFIX%%|${PREFIX}|g" \
 		-e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
+		-e '/^dnl /d' -e '/^dnl$$/d' \
 		${SITE} > ${WCONF}/site.config.m4
 
 post-install:
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/mail/sid-milter/distinfo,v
retrieving revision 1.9
diff -u -r1.9 distinfo
--- distinfo	2 Aug 2006 06:37:16 -0000	1.9
+++ distinfo	7 Jun 2008 23:20:33 -0000
@@ -1,3 +1,3 @@
-MD5 (sid-milter-0.2.14.tar.gz) = 7586ae52b10f0ed2a0e994eb7c655310
-SHA256 (sid-milter-0.2.14.tar.gz) = 018ccf8276245e1311f91d305c563cec6c40430430376b8151bb6a473d8cd90e
-SIZE (sid-milter-0.2.14.tar.gz) = 341800
+MD5 (sid-milter-1.0.0.tar.gz) = 1fe0651bc27938ebd0d7c91d58d4ad5a
+SHA256 (sid-milter-1.0.0.tar.gz) = b303bf0c43afd0cb0c814b8c862b8d22563d1203339ac130036873e79f696376
+SIZE (sid-milter-1.0.0.tar.gz) = 351161
cvs server: Diffing files
cvs server: cannot find files/patch-sid-filter.c
cvs server: cannot find files/patch-sm-marid.c
Index: files/site.config.m4
===================================================================
RCS file: /home/ncvs/ports/mail/sid-milter/files/site.config.m4,v
retrieving revision 1.2
diff -u -r1.2 site.config.m4
--- files/site.config.m4	27 Jul 2005 17:30:36 -0000	1.2
+++ files/site.config.m4	7 Jun 2008 23:20:33 -0000
@@ -4,4 +4,4 @@
 define(`confUBINDIR',`%%PREFIX%%/libexec')
 define(`confLIBDIR',`%%PREFIX%%/lib')
 define(`confDONT_INSTALL_CATMAN',`True')
-APPENDDEF(`confENVDEF', `-DNONSTANDARD_RES_STRUCTURE')
+%%NH_MFROM%%APPENDDEF(`confENVDEF', `-D_FFR_NH_MFROM')
>Release-Note:
>Audit-Trail:
>Unformatted: