View | Details | Raw Unified | Return to bug 79345
Collapse All | Expand All

(-)Makefile (-8 / +4 lines)
Lines 6-13 Link Here
6
#
6
#
7
7
8
PORTNAME=	crm114
8
PORTNAME=	crm114
9
PORTVERSION=	20040221
9
PORTVERSION=	20041231
10
PORTREVISION=	2
11
# WARNING change versionname in CRM114RELEASENAME too.
10
# WARNING change versionname in CRM114RELEASENAME too.
12
# portlint didn't like this variable at this place.
11
# portlint didn't like this variable at this place.
13
# So I have to put it down in this file.
12
# So I have to put it down in this file.
Lines 17-24 Link Here
17
# Oliver Eikemeier recommended the following construction
16
# Oliver Eikemeier recommended the following construction
18
# to avoid the reduncany of the CRM114RELEASENAME and .src and
17
# to avoid the reduncany of the CRM114RELEASENAME and .src and
19
# .css extention.
18
# .css extention.
20
DISTNAME=	${PORTNAME}-${PORTVERSION}-${CRM114RELEASENAME}.src
19
DISTNAME=	${PORTNAME}-${PORTVERSION}.${CRM114RELEASENAME}.src
21
DISTFILES=	${DISTNAME}.tar.gz ${DISTNAME:R}.css.tar.gz
20
DISTFILES=	${DISTNAME}.tar.gz
22
21
23
MAINTAINER=	Meno.Abels@Adviser.com
22
MAINTAINER=	Meno.Abels@Adviser.com
24
COMMENT=	An Markov based SpamFilter
23
COMMENT=	An Markov based SpamFilter
Lines 27-33 Link Here
27
# there is no other then formail on this planet
26
# there is no other then formail on this planet
28
RUN_DEPENDS=	procmail:${PORTSDIR}/mail/procmail
27
RUN_DEPENDS=	procmail:${PORTSDIR}/mail/procmail
29
28
30
CRM114RELEASENAME=BlameYokohama
29
CRM114RELEASENAME=BlameSanAndreas
31
30
32
USE_GETTEXT=	yes
31
USE_GETTEXT=	yes
33
USE_ICONV=	yes
32
USE_ICONV=	yes
Lines 70-78 Link Here
70
.for i in ${CRM_FILES}
69
.for i in ${CRM_FILES}
71
	${INSTALL_DATA} ${WRKSRC}/fbsdinstall/${i} ${EXAMPLESDIR}
70
	${INSTALL_DATA} ${WRKSRC}/fbsdinstall/${i} ${EXAMPLESDIR}
72
.endfor
71
.endfor
73
.for i in nonspam.css spam.css
74
	${INSTALL_DATA} ${WRKSRC}/../${PORTNAME}-${PORTVERSION}-${CRM114RELEASENAME}.css/${i} ${EXAMPLESDIR}
75
.endfor
76
.endif
72
.endif
77
73
78
.include <bsd.port.mk>
74
.include <bsd.port.mk>
(-)distinfo (-4 / +2 lines)
Lines 1-4 Link Here
1
MD5 (crm114-20040221-BlameYokohama.src.tar.gz) = c969c5857e6c9a423a9d1f2b31a3e072
1
MD5 (crm114-20041231.BlameSanAndreas.src.tar.gz) = 51ad227f8e7d356d25ce12b6dbee0399
2
SIZE (crm114-20040221-BlameYokohama.src.tar.gz) = 762449
2
SIZE (crm114-20041231.BlameSanAndreas.src.tar.gz) = 856318
3
MD5 (crm114-20040221-BlameYokohama.css.tar.gz) = e0020dbcb7fd34ac2cbe5ac6c31644f7
4
SIZE (crm114-20040221-BlameYokohama.css.tar.gz) = 11772285
(-)files/patch-Makefile (-90 lines)
Removed Link Here
1
--- Makefile.orig	Thu Feb 12 03:42:43 2004
2
+++ Makefile	Thu Feb 26 12:02:12 2004
3
@@ -4,7 +4,7 @@
4
 #   If you want to install the executables somewhere else, change
5
 #    BINDIR here.  Default is /usr/bin 
6
 #
7
-prefix=/usr
8
+#prefix=/usr/local
9
 BINDIR=${prefix}/bin
10
 
11
 # VER_SUFFIX defines a version suffix for our installed executables, 
12
@@ -56,24 +56,14 @@
13
 experimental: crm114_tre
14
 	install -m 755 crm114_tre $(BINDIR)/crma
15
 
16
-crm114: crm114.c crm114.h crm114_structs.h crm114_config.h crm114_sysincludes.h
17
-	$(MAKE) crm114_tre
18
-	#  ./crm114 is used locally; make sure it's there too.
19
+crm114: crm114_tre
20
 	ln -f -s crm114_tre crm114
21
 
22
 crm114_gnu: crm114.o crmregex_gnu.o crm_mathexec.o
23
 	$(CC) $(LDFLAGS) crm114.o crmregex_gnu.o crm_mathexec.o -lm -o crm114_gnu $(LIBS)
24
 
25
 crm114_tre: crm114.o crmregex_tre.o crm_mathexec.o
26
-	#
27
-	#   Note: if you haven't installed TRElib, the next step 
28
-	#   will get an error.
29
-	#       For TRElib, look in the TRE sub-directory of this kit.
30
-	#   You will also need to add /usr/local/lib to /etc/ld.so.conf,
31
-	#   and then run ldconfig (as root) to set the library up and make
32
-	#   the library known to the static and runtime linkers.
33
-	#
34
-	$(CC) $(LDFLAGS) crm114.o crmregex_tre.o crm_mathexec.o -static -lm -ltre -o crm114_tre $(LIBS)
35
+	$(CC) $(LDFLAGS) crm114.o crmregex_tre.o crm_mathexec.o -lm -ltre -o crm114_tre $(LIBS)
36
 
37
 crm114.o: crm114.c crm114.h crm114_structs.h crm114_config.h crm114_sysincludes.h
38
 	$(CC)  $(CFLAGS) -DVERSION='"$(VERSION)"' -c crm114.c -o crm114.o
39
@@ -89,14 +79,14 @@
40
 
41
 cssutil: cssutil.c crm114.h crm114_structs.h crm114_config.h crm114_sysincludes.h
42
 	$(CC)  $(CFLAGS) -c cssutil.c -o cssutil.o  
43
-	$(CC)  $(CFLAGS) cssutil.o -static -lm -ltre -o cssutil  
44
+	$(CC)  $(LDFLAGS) $(CFLAGS) cssutil.o -lm -ltre -o cssutil $(LIBS)
45
 
46
 cssdiff: cssdiff.c crm114.h crm114_structs.h crm114_config.h crm114_sysincludes.h
47
 	$(CC)  $(CFLAGS) -c cssdiff.c -o cssdiff.o
48
-	$(CC)  $(CFLAGS) -static -ltre cssdiff.o -o cssdiff
49
+	$(CC)  $(LDFLAGS) $(CFLAGS) -ltre cssdiff.o -o cssdiff $(LIBS)
50
 
51
 cssmerge: cssmerge.c crm114.h crm114_structs.h crm114_config.h crm114_sysincludes.h
52
-	$(CC)  $(CFLAGS) -static -ltre cssmerge.c -o cssmerge
53
+	$(CC)  $(LDFLAGS) $(CFLAGS) -ltre cssmerge.c -o cssmerge $(LIBS)
54
 
55
 clean:
56
 	-rm -f crm114
57
@@ -108,22 +98,14 @@
58
 	-rm -f crm114_tre
59
 	-rm -f *.o
60
 
61
-install_crm114: crm114
62
-	#
63
-	#   NOTE - the default CRM114 now uses the TRE regex lib, not GNU
64
-	#          If you want the GNU one (not recommended) you should
65
-	#          use 'install_gnu' as the make target.
66
-	#    
67
-	$(MAKE) install_tre
68
+install_crm114: crm114 install_tre
69
 
70
-install_utils:
71
-	$(MAKE) cssmerge cssutil cssdiff
72
+install_utils: cssmerge cssutil cssdiff
73
 	install -m 755 -s cssdiff $(BINDIR)/cssdiff$(VER_SUFFIX)
74
 	install -m 755 -s cssmerge $(BINDIR)/cssmerge$(VER_SUFFIX)
75
 	install -m 755 -s cssutil $(BINDIR)/cssutil$(VER_SUFFIX)
76
 
77
-install: FORCE
78
-	$(MAKE) install_crm114 install_utils
79
+install: install_crm114 install_utils
80
 
81
 install_tre: crm114_tre
82
 	install -m 755 -s crm114_tre $(BINDIR)/crm$(VER_SUFFIX)
83
@@ -254,4 +236,5 @@
84
 distribution: install src_gzip i386_gzip css_gzip
85
 	md5sum crm114-$(VERSION).*.tar.gz
86
 
87
-FORCE:
88
\ No newline at end of file
89
+FORCE:
90
+
(-)files/patch-crm114.c (-10 lines)
Removed Link Here
1
--- crm114.c.orig	Tue Aug 17 23:06:17 2004
2
+++ crm114.c	Tue Aug 17 23:07:43 2004
3
@@ -4265,6 +4265,7 @@
4
 	   newlen);  
5
   
6
  bailout:
7
+  {}
8
 };
9
 
10

Return to bug 79345