4 files changed, 21 insertions, 39 deletions

diff --git a/security/drweb-sendmail/Makefile b/security/drweb-sendmail/Makefile
index f4391e680d8f..3ccc8cd88aa2 100644
--- a/security/drweb-sendmail/Makefile
+++ b/security/drweb-sendmail/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	drweb_sendmail
 PORTVERSION=    4.27
-PORTREVISION=   1
+PORTREVISION=   2
 CATEGORIES=	security mail
 MASTER_SITES=	http://www.drweb.ru/ftp/web_pub/
 DISTNAME=	drwebd-${PORTVERSION}-freebsd4
@@ -23,7 +23,6 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/clients/drwebdc
 
 INST_PREFIX=	${PREFIX}/${PORTNAME}
 WITH_DRWEBSMF_SENDMAIL_DIR=     /usr/src/contrib/sendmail
-LIBSMUTIL_DIR=  /usr/src/lib/libsmutil
 DOC_DIR=	${PREFIX}/share/doc/drweb-sendmail
 
 .if !defined(WITH_DRWEBSMF_HOSTNAME)
@@ -57,11 +56,10 @@ post-extract:
 		clients/sendmail clients/drwebdc
 
 post-configure:
+.if defined(SENDMAIL_VERSION)
+.if ${SENDMAIL8_12} == "n" || ${SENDMAIL_VERSION} == "8.12.0"
 	${MKDIR} ${WRKSRC}/libmilter
-#        ${MKDIR} ${WRKSRC}/libsmutil
 	${CP} ${FILESDIR}/Makefile.libmilter ${WRKSRC}/libmilter/Makefile
-#        ${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
@@ -69,9 +67,9 @@ post-configure:
 	${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}
+.endif
+.endif
 	cd ${WRKSRC} && { \
 		${ECHO_CMD} y; \
 		${ECHO_CMD} n; \
diff --git a/security/drweb-sendmail/files/Makefile.libsmutil b/security/drweb-sendmail/files/Makefile.libsmutil
deleted file mode 100644
index 2e73a9a789a2..000000000000
--- a/security/drweb-sendmail/files/Makefile.libsmutil
+++ /dev/null
@@ -1,20 +0,0 @@
-# $FreeBSD$
-#
-SENDMAIL_DIR=/usr/src/contrib/sendmail
-.PATH:	${SENDMAIL_DIR}/libsmutil
-
-CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include
-CFLAGS+=-DNEWDB -DNIS -DMAP_REGEX -DNOT_SENDMAIL -D_FFR_MILTER=1
-
-# User customizations to the sendmail build environment
-CFLAGS+=${SENDMAIL_CFLAGS}
-
-LIB=	smutil
-
-SRCS+=	debug.c errstring.c lockfile.c safefile.c snprintf.c strl.c
-
-INTERNALLIB=		true
-NOPIC=			true
-INTERNALSTATICLIB=	true
-
-.include <bsd.lib.mk>
diff --git a/security/drweb-sendmail/files/patch-aa b/security/drweb-sendmail/files/patch-aa
index 40e8a74984bf..e2fe53f64570 100644
--- a/security/drweb-sendmail/files/patch-aa
+++ b/security/drweb-sendmail/files/patch-aa
@@ -1,16 +1,15 @@
 --- configure.orig	Tue Oct 16 19:28:21 2001
-+++ configure	Sun Oct 21 00:00:54 2001
-@@ -138,6 +138,9 @@
-     if [ $MILTER_VER = "STD" ] ; then
++++ configure	Wed Feb 20 23:50:34 2002
+@@ -135,7 +135,7 @@
+         MILTER_VER="FFR"
+     fi
+     
+-    if [ $MILTER_VER = "STD" ] ; then
++    if [ $MILTER_VER = "xSTD" ] ; then
          SM_LIB="libsm"
          SM_LIB_CMD="-lsm"
-+    elif [ $OS = "FreeBSD_DW" ] ; then
-+        SM_LIB="libsmutil"
-+        SM_LIB_CMD="-lsmutil"
      elif [ $OS = "Linux_DW" ] ; then
-         SM_LIB="libsmutil"
-         SM_LIB_CMD="-lsmutil"
-@@ -173,40 +176,13 @@
+@@ -173,40 +173,15 @@
      rm -f configure.cache
      echo $n "${SM_DIR}${c}" >> configure.cache
      
@@ -43,9 +42,12 @@
 -    fi
      rm -fr include/libmilter
      rm -f lib/libmilter.a           
-     ln -s "$SM_DIR/include/libmilter" include/libmilter
+-    ln -s "$SM_DIR/include/libmilter" include/libmilter
 -    ln -s "$SM_DIR/$OBJ_DIR/libmilter/libmilter.a" lib/libmilter.a           
-+    ln -s "../libmilter/libmilter.a" lib/libmilter.a
++    if [ ! -f /usr/lib/libmilter.a ] ; then
++	ln -s "$SM_DIR/include/libmilter" include/libmilter
++	ln -s "../libmilter/libmilter.a" lib/libmilter.a
++    fi
      if [  "x$SM_LIB" != "x" ] ; then
          rm -f "lib/$SM_LIB.a"
 -        ln -s "$SM_DIR/$OBJ_DIR/$SM_LIB/$SM_LIB.a" "lib/$SM_LIB.a"
diff --git a/security/drweb-sendmail/pkg-message b/security/drweb-sendmail/pkg-message
index 7d87e6c6e4b7..af110de739ce 100644
--- a/security/drweb-sendmail/pkg-message
+++ b/security/drweb-sendmail/pkg-message
@@ -1,5 +1,7 @@
 This software requires Sendmail compiled with mail filter support.
-So be sure you have the following in your /etc/make.conf:
+
+If you have Sendmail less then 8.12.2, be sure you have the following
+in your /etc/make.conf:
 
 SENDMAIL_CFLAGS+= -D_FFR_MILTER=1