6 files changed, 118 insertions, 10 deletions

diff --git a/mail/crm114-devel/Makefile b/mail/crm114-devel/Makefile
index c60e69706550..c21bea5b35be 100644
--- a/mail/crm114-devel/Makefile
+++ b/mail/crm114-devel/Makefile
@@ -6,17 +6,26 @@
 #
 
 PORTNAME=	crm114
-PORTVERSION=	20040212
+PORTVERSION=	20040221
+# 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.
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	crm114
-DISTNAME=	${PORTNAME}-${PORTVERSION}-BlameJetlag.src
+# Oliver Eikemeier recommended the following construction
+# to avoid the reduncany of the CRM114RELEASENAME and .src and
+# .css extention.
+DISTNAME=	${PORTNAME}-${PORTVERSION}-${CRM114RELEASENAME}.src
+DISTFILES=	${DISTNAME}.tar.gz ${DISTNAME:R}.css.tar.gz
 
 MAINTAINER=	Meno.Abels@Adviser.com
 COMMENT=	An Markov based SpamFilter
 
 LIB_DEPENDS=	tre.4:${PORTSDIR}/textproc/libtre
 
+CRM114RELEASENAME=BlameYokohama
+
 USE_GETTEXT=	yes
 USE_ICONV=	yes
 
@@ -28,12 +37,34 @@ 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
+
+post-build:
+	${MKDIR} ${WRKSRC}/fbsdinstall
+.for i in ${CRM_FILES}
+	${SED} "1s|/usr/bin/crm|${PREFIX}/bin/crm|g" ${WRKSRC}/${i} > ${WRKSRC}/fbsdinstall/${i}
+.endfor
+
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-.for i in CRM114_Mailfilter_HOWTO.txt FAQ.txt INTRO.txt QUICKREF.txt README
+.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 mailfilter.cf whitelist.mfp priolist.mfp
+	${INSTALL_DATA} ${WRKSRC}/${i} ${EXAMPLESDIR}
+.endfor
+.for i in ${CRM_FILES}
+	${INSTALL_DATA} ${WRKSRC}/fbsdinstall/${i} ${EXAMPLESDIR}
+.endfor
+.for i in nonspam.css spam.css
+	${INSTALL_DATA} ${WRKSRC}/../${PORTNAME}-${PORTVERSION}-${CRM114RELEASENAME}.css/${i} ${EXAMPLESDIR}
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/mail/crm114-devel/distinfo b/mail/crm114-devel/distinfo
index c4760f0e7451..61d88c0e1b93 100644
--- a/mail/crm114-devel/distinfo
+++ b/mail/crm114-devel/distinfo
@@ -1,2 +1,4 @@
-MD5 (crm114-20040212-BlameJetlag.src.tar.gz) = 1124fb9c18161bf4306a162e6b9fd974
-SIZE (crm114-20040212-BlameJetlag.src.tar.gz) = 760719
+MD5 (crm114-20040221-BlameYokohama.src.tar.gz) = c969c5857e6c9a423a9d1f2b31a3e072
+SIZE (crm114-20040221-BlameYokohama.src.tar.gz) = 762449
+MD5 (crm114-20040221-BlameYokohama.css.tar.gz) = e0020dbcb7fd34ac2cbe5ac6c31644f7
+SIZE (crm114-20040221-BlameYokohama.css.tar.gz) = 11772285
diff --git a/mail/crm114-devel/pkg-plist b/mail/crm114-devel/pkg-plist
index 0b46939bd4d5..330213185046 100644
--- a/mail/crm114-devel/pkg-plist
+++ b/mail/crm114-devel/pkg-plist
@@ -8,4 +8,25 @@ bin/cssutil
 %%PORTDOCS%%%%DOCSDIR%%/INTRO.txt
 %%PORTDOCS%%%%DOCSDIR%%/QUICKREF.txt
 %%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/classify_details.txt
+%%PORTDOCS%%%%DOCSDIR%%/COLOPHON.txt
+%%PORTDOCS%%%%DOCSDIR%%/knownbugs.txt
+%%PORTDOCS%%%%DOCSDIR%%/things_to_do.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%EXAMPLESDIR%%/procmailrc.recipe
+%%EXAMPLESDIR%%/classifytest.crm
+%%EXAMPLESDIR%%/exectest.crm
+%%EXAMPLESDIR%%/inserttest_a.crm
+%%EXAMPLESDIR%%/inserttest_b.crm
+%%EXAMPLESDIR%%/learntest.crm
+%%EXAMPLESDIR%%/mailfilter.crm
+%%EXAMPLESDIR%%/matchtest.crm
+%%EXAMPLESDIR%%/overalterisolatedtest.crm
+%%EXAMPLESDIR%%/windowtest.crm
+%%EXAMPLESDIR%%/mailfilter.cf
+%%EXAMPLESDIR%%/blacklist.mfp
+%%EXAMPLESDIR%%/priolist.mfp
+%%EXAMPLESDIR%%/whitelist.mfp
+%%EXAMPLESDIR%%/spam.css
+%%EXAMPLESDIR%%/nonspam.css
+@dirrm %%EXAMPLESDIR%%
diff --git a/mail/crm114/Makefile b/mail/crm114/Makefile
index c60e69706550..c21bea5b35be 100644
--- a/mail/crm114/Makefile
+++ b/mail/crm114/Makefile
@@ -6,17 +6,26 @@
 #
 
 PORTNAME=	crm114
-PORTVERSION=	20040212
+PORTVERSION=	20040221
+# 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.
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	crm114
-DISTNAME=	${PORTNAME}-${PORTVERSION}-BlameJetlag.src
+# Oliver Eikemeier recommended the following construction
+# to avoid the reduncany of the CRM114RELEASENAME and .src and
+# .css extention.
+DISTNAME=	${PORTNAME}-${PORTVERSION}-${CRM114RELEASENAME}.src
+DISTFILES=	${DISTNAME}.tar.gz ${DISTNAME:R}.css.tar.gz
 
 MAINTAINER=	Meno.Abels@Adviser.com
 COMMENT=	An Markov based SpamFilter
 
 LIB_DEPENDS=	tre.4:${PORTSDIR}/textproc/libtre
 
+CRM114RELEASENAME=BlameYokohama
+
 USE_GETTEXT=	yes
 USE_ICONV=	yes
 
@@ -28,12 +37,34 @@ 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
+
+post-build:
+	${MKDIR} ${WRKSRC}/fbsdinstall
+.for i in ${CRM_FILES}
+	${SED} "1s|/usr/bin/crm|${PREFIX}/bin/crm|g" ${WRKSRC}/${i} > ${WRKSRC}/fbsdinstall/${i}
+.endfor
+
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-.for i in CRM114_Mailfilter_HOWTO.txt FAQ.txt INTRO.txt QUICKREF.txt README
+.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 mailfilter.cf whitelist.mfp priolist.mfp
+	${INSTALL_DATA} ${WRKSRC}/${i} ${EXAMPLESDIR}
+.endfor
+.for i in ${CRM_FILES}
+	${INSTALL_DATA} ${WRKSRC}/fbsdinstall/${i} ${EXAMPLESDIR}
+.endfor
+.for i in nonspam.css spam.css
+	${INSTALL_DATA} ${WRKSRC}/../${PORTNAME}-${PORTVERSION}-${CRM114RELEASENAME}.css/${i} ${EXAMPLESDIR}
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/mail/crm114/distinfo b/mail/crm114/distinfo
index c4760f0e7451..61d88c0e1b93 100644
--- a/mail/crm114/distinfo
+++ b/mail/crm114/distinfo
@@ -1,2 +1,4 @@
-MD5 (crm114-20040212-BlameJetlag.src.tar.gz) = 1124fb9c18161bf4306a162e6b9fd974
-SIZE (crm114-20040212-BlameJetlag.src.tar.gz) = 760719
+MD5 (crm114-20040221-BlameYokohama.src.tar.gz) = c969c5857e6c9a423a9d1f2b31a3e072
+SIZE (crm114-20040221-BlameYokohama.src.tar.gz) = 762449
+MD5 (crm114-20040221-BlameYokohama.css.tar.gz) = e0020dbcb7fd34ac2cbe5ac6c31644f7
+SIZE (crm114-20040221-BlameYokohama.css.tar.gz) = 11772285
diff --git a/mail/crm114/pkg-plist b/mail/crm114/pkg-plist
index 0b46939bd4d5..330213185046 100644
--- a/mail/crm114/pkg-plist
+++ b/mail/crm114/pkg-plist
@@ -8,4 +8,25 @@ bin/cssutil
 %%PORTDOCS%%%%DOCSDIR%%/INTRO.txt
 %%PORTDOCS%%%%DOCSDIR%%/QUICKREF.txt
 %%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/classify_details.txt
+%%PORTDOCS%%%%DOCSDIR%%/COLOPHON.txt
+%%PORTDOCS%%%%DOCSDIR%%/knownbugs.txt
+%%PORTDOCS%%%%DOCSDIR%%/things_to_do.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%EXAMPLESDIR%%/procmailrc.recipe
+%%EXAMPLESDIR%%/classifytest.crm
+%%EXAMPLESDIR%%/exectest.crm
+%%EXAMPLESDIR%%/inserttest_a.crm
+%%EXAMPLESDIR%%/inserttest_b.crm
+%%EXAMPLESDIR%%/learntest.crm
+%%EXAMPLESDIR%%/mailfilter.crm
+%%EXAMPLESDIR%%/matchtest.crm
+%%EXAMPLESDIR%%/overalterisolatedtest.crm
+%%EXAMPLESDIR%%/windowtest.crm
+%%EXAMPLESDIR%%/mailfilter.cf
+%%EXAMPLESDIR%%/blacklist.mfp
+%%EXAMPLESDIR%%/priolist.mfp
+%%EXAMPLESDIR%%/whitelist.mfp
+%%EXAMPLESDIR%%/spam.css
+%%EXAMPLESDIR%%/nonspam.css
+@dirrm %%EXAMPLESDIR%%