ports/92812: [update] mail/crm114 to BlameTheReavers (20060118)
hideo
hideo at lastamericanempire.com
Sat Feb 4 17:10:10 UTC 2006
>Number: 92812
>Category: ports
>Synopsis: [update] mail/crm114 to BlameTheReavers (20060118)
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sat Feb 04 17:10:07 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: hideo
>Release: FreeBSD 7.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD darwin.lastamericanempire.com 7.0-CURRENT FreeBSD 7.0-CURRENT #0: Mon Jan 30 18:59:36 MST 2006 hideo at darwin.lastamericanempire.com:/usr/obj/usr/src/sys/darwin amd64
>Description:
Update mail/crm114 from BlameMercury (20050518) to BlameTheReavers
(20060118):
* FILE REMOVED * files/patch-crm_expandvar.c
* Add option to run with mail/normalizemime as the mimedecoder
* new mailtrainer.crm file added to examples
* copy the non-empty priolist.mfp and whitelist.mfp files to EXAMPLESDIR
>How-To-Repeat:
>Fix:
--- crm114-BlameTheReavers begins here ---
diff -ruN /usr/ports/mail/crm114/Makefile crm114/Makefile
--- /usr/ports/mail/crm114/Makefile Mon Jul 18 11:56:03 2005
+++ crm114/Makefile Sat Feb 4 09:57:37 2006
@@ -6,18 +6,11 @@
#
PORTNAME= crm114
-PORTVERSION= 20050518
-PORTREVISION= 0
-# 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.
+PORTVERSION= 20060118
CATEGORIES= mail
MASTER_SITES= http://crm114.sourceforge.net/
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}-BlameTheReavers.src
MAINTAINER= Meno.Abels at Adviser.com
COMMENT= An Markov based SpamFilter
@@ -26,54 +19,61 @@
# there is no other then formail on this planet
RUN_DEPENDS= procmail:${PORTSDIR}/mail/procmail
-CRM114RELEASENAME=BlameMercury
-
USE_GETTEXT= yes
USE_ICONV= yes
-USE_REINPLACE= yes
+CFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
+LIBS+= -L${LOCALBASE}/lib -liconv -lintl
MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" prefix="${PREFIX}" \
LDFLAGS="${LDFLAGS}" LIBS="${LIBS}" \
INSTALL_PROGRAM="${INSTALL_PROGRAM}"
+INSTALL_TARGET= install_binary_only
-CFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-LIBS+= -L${LOCALBASE}/lib -liconv -lintl
+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
-CRM_FILES= classifytest.crm exectest.crm inserttest_a.crm \
- inserttest_b.crm learntest.crm mailfilter.crm \
- matchtest.crm overalterisolatedtest.crm \
- windowtest.crm
-
-post-patch:
- @${REINPLACE_CMD} -Ee 's,^((LD|C)FLAGS.*),#\1,;;s,^(prefix=.*),#\1,' \
- ${WRKSRC}/Makefile
+.include <bsd.port.pre.mk>
-# 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
+.ifndef(NOPORTDOCS)
+PORTDOCS= *
+.endif
+
+.ifdef(WITH_NORMALIZEMIME)
+RUN_DEPENDS+= normalizemime:${PORTSDIR}/mail/normalizemime
+.endif
+post-extract:
+ @${REINPLACE_CMD} -Ee 's,^((LD|C)FLAGS),#\1,' \
+ -Ee 's,^(prefix=),#\1,' \
+ -Ee 's,^(.*-install),#\1,' ${WRKSRC}/Makefile
+
+# Peter Jeremy recommended the use of b64decode and md5 20040302
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>
+.include <bsd.port.post.mk>
diff -ruN /usr/ports/mail/crm114/distinfo crm114/distinfo
--- /usr/ports/mail/crm114/distinfo Sun Jan 22 05:50:16 2006
+++ crm114/distinfo Fri Feb 3 11:21:20 2006
@@ -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 -ruN /usr/ports/mail/crm114/files/patch-crm_expandvar.c crm114/files/patch-crm_expandvar.c
--- /usr/ports/mail/crm114/files/patch-crm_expandvar.c Mon Jul 18 11:56:03 2005
+++ crm114/files/patch-crm_expandvar.c Wed Dec 31 17:00:00 1969
@@ -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 -ruN /usr/ports/mail/crm114/pkg-plist crm114/pkg-plist
--- /usr/ports/mail/crm114/pkg-plist Fri Jun 10 02:04:37 2005
+++ crm114/pkg-plist Sat Feb 4 09:25:51 2006
@@ -4,16 +4,6 @@
bin/cssmerge
bin/cssutil
bin/osbf-util
-%%PORTDOCS%%%%DOCSDIR%%/CRM114_Mailfilter_HOWTO.txt
-%%PORTDOCS%%%%DOCSDIR%%/FAQ.txt
-%%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
@@ -21,6 +11,7 @@
%%EXAMPLESDIR%%/inserttest_b.crm
%%EXAMPLESDIR%%/learntest.crm
%%EXAMPLESDIR%%/mailfilter.crm
+%%EXAMPLESDIR%%/mailtrainer.crm
%%EXAMPLESDIR%%/matchtest.crm
%%EXAMPLESDIR%%/overalterisolatedtest.crm
%%EXAMPLESDIR%%/windowtest.crm
--- crm114-BlameTheReavers ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list