4 files changed, 37 insertions, 57 deletions

diff --git a/mail/crm114/Makefile b/mail/crm114/Makefile
index 2231ecb4e2be..4fc7b6cbd928 100644
--- a/mail/crm114/Makefile
+++ b/mail/crm114/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	crm114
-PORTVERSION=	20050518
-PORTREVISION=	0
+PORTVERSION=	20060118
 # WARNING change versionname in CRM114RELEASENAME too.
 # portlint didn't like this variable at this place.
 # So I have to put it down in this file.
@@ -17,7 +16,7 @@ MASTER_SITE_SUBDIR=	crm114
 # Oliver Eikemeier recommended the following construction
 # to avoid the reduncany of the CRM114RELEASENAME and .src and
 # .css extention.
-DISTNAME=	${PORTNAME}-${PORTVERSION}.${CRM114RELEASENAME}.src
+DISTNAME=	${PORTNAME}-${PORTVERSION}-${CRM114RELEASENAME}.src
 
 MAINTAINER=	Meno.Abels@Adviser.com
 COMMENT=	An Markov based SpamFilter
@@ -26,11 +25,10 @@ LIB_DEPENDS=	tre.6:${PORTSDIR}/textproc/libtre
 # there is no other then formail on this planet
 RUN_DEPENDS=	procmail:${PORTSDIR}/mail/procmail
 
-CRM114RELEASENAME=BlameMercury
+CRM114RELEASENAME=BlameTheReavers
 
 USE_GETTEXT=	yes
 USE_ICONV=	yes
-USE_REINPLACE=	yes
 
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" prefix="${PREFIX}" \
 		LDFLAGS="${LDFLAGS}" LIBS="${LIBS}" \
@@ -40,40 +38,41 @@ CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 LIBS+=		-L${LOCALBASE}/lib -liconv -lintl
 
-CRM_FILES=	classifytest.crm exectest.crm inserttest_a.crm \
-		inserttest_b.crm learntest.crm mailfilter.crm \
-		matchtest.crm overalterisolatedtest.crm \
-		windowtest.crm
+INSTALL_TARGET=	install_binary_only
+
+CRM_FILES=	mailfilter.crm mailtrainer.crm procmailrc.recipe mailfilter.cf \
+		priolist.mfp whitelist.mfp blacklist.mfp classifytest.crm \
+		exectest.crm inserttest_a.crm inserttest_b.crm learntest.crm \
+		matchtest.crm overalterisolatedtest.crm windowtest.crm
 
 post-patch:
-	@${REINPLACE_CMD} -Ee 's,^((LD|C)FLAGS.*),#\1,;;s,^(prefix=.*),#\1,' \
+	@${REINPLACE_CMD} -Ee 's,^((LD|C)FLAGS),#\1,;;s,^(prefix=),#\1,;;s,^(.*-install),#\1,' \
 		${WRKSRC}/Makefile
 
 # Peter Jeremy recommended the use of b64decode and md5 20040302
-post-build:
-	${MKDIR} ${WRKSRC}/fbsdinstall
-	${SED} 's|:mime_decoder: /mewdecode/|:mime_decoder: /b64decode -pr/|' \
-		 ${WRKSRC}/mailfilter.cf > ${WRKSRC}/fbsdinstall/mailfilter.cf
-.for i in ${CRM_FILES}
-	${SED} "1s|/usr/bin/crm|${PREFIX}/bin/crm|g" ${WRKSRC}/${i} > ${WRKSRC}/fbsdinstall/${i}
-.endfor
-	${SED} 's|/md5sum/|/md5 -r/|' ${WRKSRC}/mailfilter.crm > ${WRKSRC}/fbsdinstall/mailfilter.crm.md5
-	${MV} ${WRKSRC}/fbsdinstall/mailfilter.crm.md5 ${WRKSRC}/fbsdinstall/mailfilter.crm
-
 post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-.for i in CRM114_Mailfilter_HOWTO.txt FAQ.txt INTRO.txt QUICKREF.txt README \
-	classify_details.txt COLOPHON.txt knownbugs.txt things_to_do.txt
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
-.endfor
-	${MKDIR} ${EXAMPLESDIR}
-.for i in procmailrc.recipe blacklist.mfp fbsdinstall/mailfilter.cf whitelist.mfp priolist.mfp
-	${INSTALL_DATA} ${WRKSRC}/${i} ${EXAMPLESDIR}
-.endfor
-.for i in ${CRM_FILES}
-	${INSTALL_DATA} ${WRKSRC}/fbsdinstall/${i} ${EXAMPLESDIR}
-.endfor
+	@${REINPLACE_CMD} -Ee 's|^(.*/openssl base64 -d/)|#\1|' \
+		-e 's|/mewdecode/|/b64decode -pr/|' ${WRKSRC}/mailfilter.cf
+	@${REINPLACE_CMD} -e 's|/md5sum/|/md5 -r/|' \
+		-e 's|#! /usr/bin/crm.*|#!${PREFIX}/bin/crm|' \
+			${WRKSRC}/mailfilter.crm ${WRKSRC}/mailtrainer.crm
+	@for i in priolist.mfp whitelist.mfp; do \
+		${CP} ${WRKSRC}/$${i}.example ${WRKSRC}/$${i}; \
+	done
+.ifdef(WITH_NORMALIZEMIME)
+	@${REINPLACE_CMD} -Ee 's|^#(.*/normalizemime/)|\1|' ${WRKSRC}/mailfilter.cf
+.else
+	@${REINPLACE_CMD} -Ee 's|^#(.*/b64decode -pr/)|\1|' ${WRKSRC}/mailfilter.cf
+.endif
+	@${MKDIR} ${EXAMPLESDIR}
+	@for i in ${CRM_FILES}; do \
+		${INSTALL_DATA} ${WRKSRC}/$${i} ${EXAMPLESDIR}; \
+	done
+.ifndef(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	@for i in ${WRKSRC}/[^G]*.txt ${WRKSRC}/README; do \
+		${INSTALL_DATA} $${i} ${DOCSDIR}; \
+	done
 .endif
 
 .include <bsd.port.mk>
diff --git a/mail/crm114/distinfo b/mail/crm114/distinfo
index a6cbdc1a4acd..3e4769dccc6d 100644
--- a/mail/crm114/distinfo
+++ b/mail/crm114/distinfo
@@ -1,3 +1,3 @@
-MD5 (crm114-20050518.BlameMercury.src.tar.gz) = e703817e7f6276c6baf5830ce9334405
-SHA256 (crm114-20050518.BlameMercury.src.tar.gz) = 3e2cf7f3eb670e278b5d67bcc4c9c3fdf0934d2068b7fb43ec849f0d831aa75c
-SIZE (crm114-20050518.BlameMercury.src.tar.gz) = 909636
+MD5 (crm114-20060118-BlameTheReavers.src.tar.gz) = aeff75ba0dc9bd7d9464005240eb86e8
+SHA256 (crm114-20060118-BlameTheReavers.src.tar.gz) = f5e4d3b8887d825a12102b39833332a13002498f3c3dd2bb83446fff11cdd0cb
+SIZE (crm114-20060118-BlameTheReavers.src.tar.gz) = 935769
diff --git a/mail/crm114/files/patch-crm_expandvar.c b/mail/crm114/files/patch-crm_expandvar.c
deleted file mode 100644
index b5c5105cf3d1..000000000000
--- a/mail/crm114/files/patch-crm_expandvar.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- crm_expandvar.c.orig	Mon Jul 18 14:12:35 2005
-+++ crm_expandvar.c	Mon Jul 18 14:12:54 2005
-@@ -961,8 +961,6 @@
-   long scanbuflen;
-   
-   long nw_start, nw_len;
--  nw_start = 0;
--  nw_len = 0;
- 
-   char *mdw;               //  the data window that this var is stored in.
-   char *start_ptr;
-@@ -971,6 +969,9 @@
-   long in_subscript;
- 
-   long i, j;
-+
-+  nw_start = 0;
-+  nw_len = 0;
- 
-   if (user_trace)
-     fprintf (stderr, "Performing variable restriction.\n");
diff --git a/mail/crm114/pkg-plist b/mail/crm114/pkg-plist
index f19260e6922b..700f72745836 100644
--- a/mail/crm114/pkg-plist
+++ b/mail/crm114/pkg-plist
@@ -10,6 +10,7 @@ bin/osbf-util
 %%PORTDOCS%%%%DOCSDIR%%/QUICKREF.txt
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/classify_details.txt
+%%PORTDOCS%%%%DOCSDIR%%/inoc_passwd.txt
 %%PORTDOCS%%%%DOCSDIR%%/COLOPHON.txt
 %%PORTDOCS%%%%DOCSDIR%%/knownbugs.txt
 %%PORTDOCS%%%%DOCSDIR%%/things_to_do.txt
@@ -21,6 +22,7 @@ bin/osbf-util
 %%EXAMPLESDIR%%/inserttest_b.crm
 %%EXAMPLESDIR%%/learntest.crm
 %%EXAMPLESDIR%%/mailfilter.crm
+%%EXAMPLESDIR%%/mailtrainer.crm
 %%EXAMPLESDIR%%/matchtest.crm
 %%EXAMPLESDIR%%/overalterisolatedtest.crm
 %%EXAMPLESDIR%%/windowtest.crm