2 files changed, 81 insertions, 9 deletions

diff --git a/mail/libspamtest/Makefile b/mail/libspamtest/Makefile
index d71844c1a982..e76c611f00d0 100644
--- a/mail/libspamtest/Makefile
+++ b/mail/libspamtest/Makefile
@@ -17,16 +17,12 @@ LIBS=		libspamtest.a \
 INCLUDES=	spamtest.h \
 		msgstore.h
 
-NO_STAGE=	yes
-
-post-patch-script:
-	@${REINPLACE_CMD} -e 's|gcc|${CC}|g' \
-		${WRKSRC}/${MAKEFILE}
-
 do-install:
-	${MKDIR} ${PREFIX}/ap-mailfilter3/lib ${PREFIX}/ap-mailfilter3/include
-	${INSTALL_DATA} ${LIBS:S,^,${WRKSRC}/,} ${PREFIX}/ap-mailfilter3/lib
+	${MKDIR} ${STAGEDIR}${PREFIX}/ap-mailfilter3/lib \
+		${STAGEDIR}${PREFIX}/ap-mailfilter3/include
+	${INSTALL_DATA} ${LIBS:S,^,${WRKSRC}/,} \
+		${STAGEDIR}${PREFIX}/ap-mailfilter3/lib
 	${INSTALL_DATA} ${INCLUDES:S,^,${WRKSRC}/,} \
-		${PREFIX}/ap-mailfilter3/include
+		${STAGEDIR}${PREFIX}/ap-mailfilter3/include
 
 .include <bsd.port.mk>
diff --git a/mail/libspamtest/files/patch-Makefile.FreeBSD b/mail/libspamtest/files/patch-Makefile.FreeBSD
new file mode 100644
index 000000000000..728e34a88061
--- /dev/null
+++ b/mail/libspamtest/files/patch-Makefile.FreeBSD
@@ -0,0 +1,76 @@
+--- ./Makefile.FreeBSD.orig	2014-02-21 09:48:45.899084755 +0100
++++ ./Makefile.FreeBSD	2014-02-21 09:49:41.805080872 +0100
+@@ -9,7 +9,7 @@
+ all: ${LIBS} ${APPS}
+ 
+ PICFLAGS=-fpic -DPIC
+-CFLAGS=-O3 -g -Wall -DHEAP_ALLOC_ALIGN=4 -DDEFAULT_ALLOC=32768
++CFLAGS+=-Wall -DHEAP_ALLOC_ALIGN=4 -DDEFAULT_ALLOC=32768
+ LOBJ=msgstore.o spamtest_util.o heap.o spamtest.o bufio.o record2.o mess822.o addrlist.o
+ LTOBJ=msgstore.or spamtest_util.or heap.or spamtest.or bufio.or record2.or mess822.or addrlist.or
+ LSOBJ=msgstore.So spamtest_util.So heap.So spamtest.So bufio.So record2.So mess822.So addrlist.So
+@@ -22,16 +22,16 @@
+ 	rm -f ${LOBJ} ${LTOBJ} ${LSOBJ} ${LTSOBJ}
+ 
+ .c.o:	$< spamtest.h  Makefile.FreeBSD
+-	gcc ${CFLAGS} -c  $<
++	$(CC) ${CFLAGS} -c  $<
+ 
+ .c.or:	$< spamtest.h  Makefile.FreeBSD
+-	gcc ${CFLAGS} -D_REENTRANT -DXP_MT -D_THREAD_SAFE -pthread -c  $< -o $@
++	$(CC) ${CFLAGS} -D_REENTRANT -DXP_MT -D_THREAD_SAFE -pthread -c  $< -o $@
+ 
+ .c.So:	$< spamtest.h  Makefile.FreeBSD
+-	gcc ${CFLAGS} ${PICFLAGS} -c  $< -o $@
++	$(CC) ${CFLAGS} ${PICFLAGS} -c  $< -o $@
+ 
+ .c.Sr:	$< spamtest.h  Makefile.FreeBSD
+-	gcc ${CFLAGS} ${PICFLAGS}  -DXP_MT -D_REENTRANT -D_THREAD_SAFE -pthread -c  $<  -o $@
++	$(CC) ${CFLAGS} ${PICFLAGS}  -DXP_MT -D_REENTRANT -D_THREAD_SAFE -pthread -c  $<  -o $@
+ 
+ 
+ libspamtest.a: ${LOBJ}
+@@ -46,33 +46,33 @@
+ 
+ libspamtest.so.${LIB_MAJOR}: ${LSOBJ}
+ 	rm -f ${.TARGET}
+-	gcc -shared -Wl,-x -o ${.TARGET} -Wl,-soname,${.TARGET} `lorder ${LSOBJ} | tsort -q`
++	$(CC) -shared -Wl,-x -o ${.TARGET} -Wl,-soname,${.TARGET} `lorder ${LSOBJ} | tsort -q`
+ 			     
+ libspamtest_r.so.${LIB_MAJOR}: ${LTSOBJ}
+ 	rm -f ${.TARGET}
+-	gcc -pthread -shared -Wl,-x -o ${.TARGET} `lorder ${LTSOBJ} | tsort -q`
++	$(CC) -pthread -shared -Wl,-x -o ${.TARGET} `lorder ${LTSOBJ} | tsort -q`
+ 			     
+ ap-sample-threads.o: ap-sample-threads.c Makefile.FreeBSD
+-	gcc ${CFLAGS} -pthread -D_REENTRANT -c ap-sample-threads.c -o $@
++	$(CC) ${CFLAGS} -pthread -D_REENTRANT -c ap-sample-threads.c -o $@
+ 
+ ap-sample: ap-sample.o ${LIBS}
+-	gcc ${CFLAGS} -DBUFIO_USE_INLINE -Wall -o $@ ap-sample.o -L. -L/usr/local/lib -lspamtest ${LDFLAGS}
++	$(CC) ${CFLAGS} -DBUFIO_USE_INLINE -Wall -o $@ ap-sample.o -L. -L/usr/local/lib -lspamtest ${LDFLAGS}
+ 
+ ap-sample3: ap-sample3.o ${LIBS}
+-	gcc ${CFLAGS} -DBUFIO_USE_INLINE -Wall -o $@ ap-sample3.o -L. -L/usr/local/lib -lspamtest ${LDFLAGS}
++	$(CC) ${CFLAGS} -DBUFIO_USE_INLINE -Wall -o $@ ap-sample3.o -L. -L/usr/local/lib -lspamtest ${LDFLAGS}
+ 
+ ap-sample2: ap-sample2.o ${LIBS}
+-	gcc ${CFLAGS} -DBUFIO_USE_INLINE -Wall -o $@ ap-sample2.o -L. -L/usr/local/lib -lspamtest ${LDFLAGS}
++	$(CC) ${CFLAGS} -DBUFIO_USE_INLINE -Wall -o $@ ap-sample2.o -L. -L/usr/local/lib -lspamtest ${LDFLAGS}
+ 
+ dump-actions: dump-actions.o ${LIBS}
+-	gcc ${CFLAGS} -DBUFIO_USE_INLINE -Wall -o $@ dump-actions.o -L. -lspamtest ${LDFLAGS}
++	$(CC) ${CFLAGS} -DBUFIO_USE_INLINE -Wall -o $@ dump-actions.o -L. -lspamtest ${LDFLAGS}
+ 
+ ap-sample-threads: ap-sample-threads.o ${LIBS}
+-	gcc ${CFLAGS} -pthread -DBUFIO_USE_INLINE -Wall -o $@ ap-sample-threads.o -L. -lspamtest_r ${LDFLAGS}
++	$(CC) ${CFLAGS} -pthread -DBUFIO_USE_INLINE -Wall -o $@ ap-sample-threads.o -L. -lspamtest_r ${LDFLAGS}
+ 
+ msgstore: msgstore.c heap.c
+-	gcc ${CFLAGS} ${LDFLAGS} -DMSGTEST2 -DBUFIO_USE_INLINE -Wall -g  -o $@ msgstore.c heap.c
++	$(CC) ${CFLAGS} ${LDFLAGS} -DMSGTEST2 -DBUFIO_USE_INLINE -Wall -g  -o $@ msgstore.c heap.c
+ 
+ addrlist: addrlist.c msgstore.c msgstore.h mess822.c mess822.h heap.o
+-	gcc ${CFLAGS} ${LDFLAGS} -g -DTEST -Wall -o addrlist addrlist.c msgstore.c mess822.c heap.o
++	$(CC) ${CFLAGS} ${LDFLAGS} -g -DTEST -Wall -o addrlist addrlist.c msgstore.c mess822.c heap.o
+