Update to 20041231 ("well-tested" version)

PR:		ports/79345
Submitted by:	Garrett Wollman <wollman@freebsd.org>
Approved by:	maintainer (timeout 2 months)

5 files changed, 8 insertions, 115 deletions

diff --git a/mail/crm114/Makefile b/mail/crm114/Makefile
index 533d87e9520f..f0a579d5b153 100644
--- a/mail/crm114/Makefile
+++ b/mail/crm114/Makefile
@@ -6,19 +6,18 @@
 #
 
 PORTNAME=	crm114
-PORTVERSION=	20040221
-PORTREVISION=	2
+PORTVERSION=	20041231
 # 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_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
-DISTFILES=	${DISTNAME}.tar.gz ${DISTNAME:R}.css.tar.gz
+DISTNAME=	${PORTNAME}-${PORTVERSION}.${CRM114RELEASENAME}.src
+DISTFILES=	${DISTNAME}.tar.gz
 
 MAINTAINER=	Meno.Abels@Adviser.com
 COMMENT=	An Markov based SpamFilter
@@ -27,7 +26,7 @@ LIB_DEPENDS=	tre.6:${PORTSDIR}/textproc/libtre
 # there is no other then formail on this planet
 RUN_DEPENDS=	procmail:${PORTSDIR}/mail/procmail
 
-CRM114RELEASENAME=BlameYokohama
+CRM114RELEASENAME=BlameSanAndreas
 
 USE_GETTEXT=	yes
 USE_ICONV=	yes
@@ -70,9 +69,6 @@ post-install:
 .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 61d88c0e1b93..11e8166d1ab7 100644
--- a/mail/crm114/distinfo
+++ b/mail/crm114/distinfo
@@ -1,4 +1,2 @@
-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
+MD5 (crm114-20041231.BlameSanAndreas.src.tar.gz) = 51ad227f8e7d356d25ce12b6dbee0399
+SIZE (crm114-20041231.BlameSanAndreas.src.tar.gz) = 856318
diff --git a/mail/crm114/files/patch-Makefile b/mail/crm114/files/patch-Makefile
deleted file mode 100644
index ce1035bb8e0f..000000000000
--- a/mail/crm114/files/patch-Makefile
+++ /dev/null
@@ -1,90 +0,0 @@
---- Makefile.orig	Thu Feb 12 03:42:43 2004
-+++ Makefile	Thu Feb 26 12:02:12 2004
-@@ -4,7 +4,7 @@
- #   If you want to install the executables somewhere else, change
- #    BINDIR here.  Default is /usr/bin 
- #
--prefix=/usr
-+#prefix=/usr/local
- BINDIR=${prefix}/bin
- 
- # VER_SUFFIX defines a version suffix for our installed executables, 
-@@ -56,24 +56,14 @@
- experimental: crm114_tre
- 	install -m 755 crm114_tre $(BINDIR)/crma
- 
--crm114: crm114.c crm114.h crm114_structs.h crm114_config.h crm114_sysincludes.h
--	$(MAKE) crm114_tre
--	#  ./crm114 is used locally; make sure it's there too.
-+crm114: crm114_tre
- 	ln -f -s crm114_tre crm114
- 
- crm114_gnu: crm114.o crmregex_gnu.o crm_mathexec.o
- 	$(CC) $(LDFLAGS) crm114.o crmregex_gnu.o crm_mathexec.o -lm -o crm114_gnu $(LIBS)
- 
- crm114_tre: crm114.o crmregex_tre.o crm_mathexec.o
--	#
--	#   Note: if you haven't installed TRElib, the next step 
--	#   will get an error.
--	#       For TRElib, look in the TRE sub-directory of this kit.
--	#   You will also need to add /usr/local/lib to /etc/ld.so.conf,
--	#   and then run ldconfig (as root) to set the library up and make
--	#   the library known to the static and runtime linkers.
--	#
--	$(CC) $(LDFLAGS) crm114.o crmregex_tre.o crm_mathexec.o -static -lm -ltre -o crm114_tre $(LIBS)
-+	$(CC) $(LDFLAGS) crm114.o crmregex_tre.o crm_mathexec.o -lm -ltre -o crm114_tre $(LIBS)
- 
- crm114.o: crm114.c crm114.h crm114_structs.h crm114_config.h crm114_sysincludes.h
- 	$(CC)  $(CFLAGS) -DVERSION='"$(VERSION)"' -c crm114.c -o crm114.o
-@@ -89,14 +79,14 @@
- 
- cssutil: cssutil.c crm114.h crm114_structs.h crm114_config.h crm114_sysincludes.h
- 	$(CC)  $(CFLAGS) -c cssutil.c -o cssutil.o  
--	$(CC)  $(CFLAGS) cssutil.o -static -lm -ltre -o cssutil  
-+	$(CC)  $(LDFLAGS) $(CFLAGS) cssutil.o -lm -ltre -o cssutil $(LIBS)
- 
- cssdiff: cssdiff.c crm114.h crm114_structs.h crm114_config.h crm114_sysincludes.h
- 	$(CC)  $(CFLAGS) -c cssdiff.c -o cssdiff.o
--	$(CC)  $(CFLAGS) -static -ltre cssdiff.o -o cssdiff
-+	$(CC)  $(LDFLAGS) $(CFLAGS) -ltre cssdiff.o -o cssdiff $(LIBS)
- 
- cssmerge: cssmerge.c crm114.h crm114_structs.h crm114_config.h crm114_sysincludes.h
--	$(CC)  $(CFLAGS) -static -ltre cssmerge.c -o cssmerge
-+	$(CC)  $(LDFLAGS) $(CFLAGS) -ltre cssmerge.c -o cssmerge $(LIBS)
- 
- clean:
- 	-rm -f crm114
-@@ -108,22 +98,14 @@
- 	-rm -f crm114_tre
- 	-rm -f *.o
- 
--install_crm114: crm114
--	#
--	#   NOTE - the default CRM114 now uses the TRE regex lib, not GNU
--	#          If you want the GNU one (not recommended) you should
--	#          use 'install_gnu' as the make target.
--	#    
--	$(MAKE) install_tre
-+install_crm114: crm114 install_tre
- 
--install_utils:
--	$(MAKE) cssmerge cssutil cssdiff
-+install_utils: cssmerge cssutil cssdiff
- 	install -m 755 -s cssdiff $(BINDIR)/cssdiff$(VER_SUFFIX)
- 	install -m 755 -s cssmerge $(BINDIR)/cssmerge$(VER_SUFFIX)
- 	install -m 755 -s cssutil $(BINDIR)/cssutil$(VER_SUFFIX)
- 
--install: FORCE
--	$(MAKE) install_crm114 install_utils
-+install: install_crm114 install_utils
- 
- install_tre: crm114_tre
- 	install -m 755 -s crm114_tre $(BINDIR)/crm$(VER_SUFFIX)
-@@ -254,4 +236,5 @@
- distribution: install src_gzip i386_gzip css_gzip
- 	md5sum crm114-$(VERSION).*.tar.gz
- 
--FORCE:
-\ No newline at end of file
-+FORCE:
-+
diff --git a/mail/crm114/files/patch-crm114.c b/mail/crm114/files/patch-crm114.c
deleted file mode 100644
index bf4377735e2c..000000000000
--- a/mail/crm114/files/patch-crm114.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- crm114.c.orig	Tue Aug 17 23:06:17 2004
-+++ crm114.c	Tue Aug 17 23:07:43 2004
-@@ -4265,6 +4265,7 @@
- 	   newlen);  
-   
-  bailout:
-+  {}
- };
- 
- 
diff --git a/mail/crm114/pkg-plist b/mail/crm114/pkg-plist
index 330213185046..f19260e6922b 100644
--- a/mail/crm114/pkg-plist
+++ b/mail/crm114/pkg-plist
@@ -3,6 +3,7 @@ bin/crm
 bin/cssdiff
 bin/cssmerge
 bin/cssutil
+bin/osbf-util
 %%PORTDOCS%%%%DOCSDIR%%/CRM114_Mailfilter_HOWTO.txt
 %%PORTDOCS%%%%DOCSDIR%%/FAQ.txt
 %%PORTDOCS%%%%DOCSDIR%%/INTRO.txt
@@ -27,6 +28,4 @@ bin/cssutil
 %%EXAMPLESDIR%%/blacklist.mfp
 %%EXAMPLESDIR%%/priolist.mfp
 %%EXAMPLESDIR%%/whitelist.mfp
-%%EXAMPLESDIR%%/spam.css
-%%EXAMPLESDIR%%/nonspam.css
 @dirrm %%EXAMPLESDIR%%