Add -D_THREAD_SAFE, remove libsmutil building

4 files changed, 36 insertions, 5 deletions

diff --git a/security/drweb-sendmail/Makefile b/security/drweb-sendmail/Makefile
index 548443dd32b7..f4391e680d8f 100644
--- a/security/drweb-sendmail/Makefile
+++ b/security/drweb-sendmail/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	drweb_sendmail
 PORTVERSION=    4.27
+PORTREVISION=   1
 CATEGORIES=	security mail
 MASTER_SITES=	http://www.drweb.ru/ftp/web_pub/
 DISTNAME=	drwebd-${PORTVERSION}-freebsd4
@@ -56,18 +57,21 @@ post-extract:
 		clients/sendmail clients/drwebdc
 
 post-configure:
-	${MKDIR} ${WRKSRC}/libmilter ${WRKSRC}/libsmutil
+	${MKDIR} ${WRKSRC}/libmilter
+#        ${MKDIR} ${WRKSRC}/libsmutil
 	${CP} ${FILESDIR}/Makefile.libmilter ${WRKSRC}/libmilter/Makefile
-	${CP} ${FILESDIR}/Makefile.libsmutil ${WRKSRC}/libsmutil/Makefile
-.if defined(SENDMAIL_VERSION) && ${SENDMAIL_VERSION} == "8.11.1"
+#        ${CP} ${FILESDIR}/Makefile.libsmutil ${WRKSRC}/libsmutil/Makefile
+.if defined(SENDMAIL_VERSION)
+.if ${SENDMAIL_VERSION} == "8.11.1"
 	${CP} ${WITH_DRWEBSMF_SENDMAIL_DIR}/libmilter/listener.c ${WRKSRC}/libmilter
 	cd ${WRKSRC}/libmilter && ${PATCH} < ${WRKSRC}/../sendmail/listener-8.11.1.patch
-.elif defined(SENDMAIL_VERSION) && ${SENDMAIL_VERSION} == "8.12.0"
+.elif ${SENDMAIL_VERSION} == "8.12.0"
 	${CP} ${WITH_DRWEBSMF_SENDMAIL_DIR}/libmilter/listener.c ${WRKSRC}/libmilter
 	cd ${WRKSRC}/libmilter && ${PATCH} < ${WRKSRC}/../sendmail/listener-8.12.0.patch
 .endif
+.endif
 	cd ${WRKSRC}/libmilter && ${MAKE} clean && ${MAKE} SENDMAIL_DIR=${WITH_DRWEBSMF_SENDMAIL_DIR}
-	cd ${WRKSRC}/libsmutil && ${MAKE} clean && ${MAKE} SENDMAIL_DIR=${WITH_DRWEBSMF_SENDMAIL_DIR}
+#        cd ${WRKSRC}/libsmutil && ${MAKE} clean && ${MAKE} SENDMAIL_DIR=${WITH_DRWEBSMF_SENDMAIL_DIR}
 	cd ${WRKSRC} && { \
 		${ECHO_CMD} y; \
 		${ECHO_CMD} n; \
diff --git a/security/drweb-sendmail/files/Makefile.libmilter b/security/drweb-sendmail/files/Makefile.libmilter
index b891e9bc2b9d..c992c904e431 100644
--- a/security/drweb-sendmail/files/Makefile.libmilter
+++ b/security/drweb-sendmail/files/Makefile.libmilter
@@ -5,6 +5,7 @@ SENDMAIL_DIR=/usr/src/contrib/sendmail
 
 CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include
 CFLAGS+=-DNEWDB -DNIS -DMAP_REGEX -DNOT_SENDMAIL -D_FFR_MILTER=1
+CFLAGS+=-D_THREAD_SAFE
 
 # User customizations to the sendmail build environment
 CFLAGS+=${SENDMAIL_CFLAGS}
diff --git a/security/drweb-sendmail/files/patch-ab b/security/drweb-sendmail/files/patch-ab
new file mode 100644
index 000000000000..e8a1187bc61f
--- /dev/null
+++ b/security/drweb-sendmail/files/patch-ab
@@ -0,0 +1,11 @@
+--- src/Makefile.bsd.orig	Tue Oct 16 19:03:59 2001
++++ src/Makefile.bsd	Tue Feb 12 01:07:07 2002
+@@ -63,7 +63,7 @@
+ 
+ .c.o: 
+ 	$(CC) -c $(ADD_CFLAGS) -D__SIGNAL_BASED_DW $<
+-	$(CC) -c $(ADD_CFLAGS) -D__THREAD_BASED_DW $< -o ${.PREFIX}_r.o
++	$(CC) -c $(ADD_CFLAGS) -D__THREAD_BASED_DW -D_THREAD_SAFE $< -o ${.PREFIX}_r.o
+ 
+ clean:
+ 	rm -f *.bak *~ *.err *.o ../lib/libdwclient*.a ../include/*.h
diff --git a/security/drweb-sendmail/files/patch-ad b/security/drweb-sendmail/files/patch-ad
new file mode 100644
index 000000000000..7245474bda7e
--- /dev/null
+++ b/security/drweb-sendmail/files/patch-ad
@@ -0,0 +1,15 @@
+--- Makefile.bsd.orig	Mon Oct 15 15:04:09 2001
++++ Makefile.bsd	Tue Feb 12 01:30:40 2002
+@@ -45,8 +45,11 @@
+ drweb_cgp.o: drweb_cgp.c $(LIBINCLUDES)
+ 	$(CC) -c $(ADD_CFLAGS) $< -I./src -D__THREAD_BASED_DW
+ 
++drwebdc.o: drwebdc.c $(LIBINCLUDES)
++	$(CC) -c $(ADD_CFLAGS) $< -I./src
++
+ .c.o: $(LIBINCLUDES)
+-	$(CC) -c $(ADD_CFLAGS) $<
++	$(CC) -c $(ADD_CFLAGS) -D_THREAD_SAFE $<
+ 
+ $(LIBINCLUDES):
+ 	@( cd src; make headers )