- update to 1.0.0

- new option WITH_NH_MFROM
PR:		124380
Submitted by:	Hirohisa Yamaguchi

5 files changed, 11 insertions, 48 deletions

diff --git a/mail/sid-milter/Makefile b/mail/sid-milter/Makefile
index 816fc4d01403..5622842199f1 100644
--- a/mail/sid-milter/Makefile
+++ b/mail/sid-milter/Makefile
@@ -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 @@ RESTRICTED=	may incorporate intellectual property, possible patent issues
 
 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}
@@ -61,6 +61,11 @@ pre-configure:
 	${SED} -e "s|%%PREFIX%%|${PREFIX}|g" \
 		-e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
 		${SITE} > ${WCONF}/site.config.m4
+.if defined(WITH_NH_MFROM)
+	${ECHO_CMD} \
+		'APPENDDEF(`confENVDEF'\'', `-D_FFR_NH_MFROM'\'')' \
+		>> ${WCONF}/site.config.m4
+.endif
 
 post-install:
 .if defined(WITHOUT_RC_NG)
diff --git a/mail/sid-milter/distinfo b/mail/sid-milter/distinfo
index 3bcb843cfee5..09e059ba74ed 100644
--- a/mail/sid-milter/distinfo
+++ b/mail/sid-milter/distinfo
@@ -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
diff --git a/mail/sid-milter/files/patch-sid-filter.c b/mail/sid-milter/files/patch-sid-filter.c
deleted file mode 100644
index 3dee589c9ad6..000000000000
--- a/mail/sid-milter/files/patch-sid-filter.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- sid-filter/sid-filter.c.orig	Tue Apr 18 09:36:23 2006
-+++ sid-filter/sid-filter.c	Sun Apr 23 16:48:06 2006
-@@ -1893,7 +1893,7 @@
- 		else
- 		{
- 			sid_msgcleanup(ctx);
--			return SMFIS_TEMPFAIL;
-+			return (testmode ? SMFIS_ACCEPT : SMFIS_TEMPFAIL);
- 		}
- 	}
- 
-@@ -1934,7 +1934,7 @@
- 			else
- 			{
- 				sid_msgcleanup(ctx);
--				return SMFIS_TEMPFAIL;
-+				return (testmode ? SMFIS_ACCEPT : SMFIS_TEMPFAIL);
- 			}
- 		}
- 
-@@ -1985,7 +1985,7 @@
- 		}
- 
- 		sid_msgcleanup(ctx);
--		return SMFIS_TEMPFAIL;
-+		return (testmode ? SMFIS_ACCEPT : SMFIS_TEMPFAIL);
- 	}
- 
- 
diff --git a/mail/sid-milter/files/patch-sm-marid.c b/mail/sid-milter/files/patch-sm-marid.c
deleted file mode 100644
index db44f7896fb3..000000000000
--- a/mail/sid-milter/files/patch-sm-marid.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- libmarid/sm-marid.c.bak	Tue Aug 17 04:50:54 2004
-+++ libmarid/sm-marid.c	Sun Dec 17 17:37:36 2006
-@@ -22,7 +22,8 @@
- char const * const
- sm_marid_version_patterns_01[] = { "spf2.%d/pra%,%v", 	NULL };
- char const * const
--sm_marid_version_patterns_any[] = { "v=spf1", "spf2.%d/pra%,%v", NULL };
-+sm_marid_version_patterns_any[] = { "v=spf1", "spf2.%d/pra%,%v", \
-+				    "spf2.%d/mfrom,pra%,%v", NULL };
- 
- /*
- **  MARID_DEFAULT_FREE -- default free callback if application passes NULL. 
diff --git a/mail/sid-milter/files/site.config.m4 b/mail/sid-milter/files/site.config.m4
index 9d86772e69e6..27e89c0c22a6 100644
--- a/mail/sid-milter/files/site.config.m4
+++ b/mail/sid-milter/files/site.config.m4
@@ -4,4 +4,3 @@ define(`confMANROOTMAN',`%%PREFIX%%/man/man')
 define(`confUBINDIR',`%%PREFIX%%/libexec')
 define(`confLIBDIR',`%%PREFIX%%/lib')
 define(`confDONT_INSTALL_CATMAN',`True')
-APPENDDEF(`confENVDEF', `-DNONSTANDARD_RES_STRUCTURE')