Upgrade to 0.38

7 files changed, 85 insertions, 144 deletions

diff --git a/mail/milter-sender/Makefile b/mail/milter-sender/Makefile
index b318680daf6f..f942c83f37cf 100644
--- a/mail/milter-sender/Makefile
+++ b/mail/milter-sender/Makefile
@@ -6,50 +6,50 @@
 #
 
 PORTNAME=       milter-sender
-PORTVERSION=    0.36
+PORTVERSION=    0.38
 CATEGORIES=     mail
 MASTER_SITES=   http://www.snert.com/Software/download/
-DISTFILES=      libsnert-1.18.tgz milter-sender-0.36.tgz
+DISTFILES=      libsnert-1.20.tgz milter-sender-0.38.tgz
 RESTRICTED=     see LICENSE.TXT
 
 MAINTAINER=     ache@FreeBSD.org
 COMMENT=        Real-time sender address verification, based on Milter API
 
 DOCDIR=         ${PREFIX}/share/doc/milter-sender
-WRKSRC=         ${WRKDIR}/com/snert/src
+WRKSRC=         ${WRKDIR}/com/snert/src/milter-sender
 MAKEFILE=       makefile
-ALL_TARGET=     build
+GNU_CONFIGURE=  yes
 
 .if !exists(/usr/lib/libmilter.a)
 IGNORE=		requires Sendmail 8.12; upgrade the base system
 .endif
 
-do-build:
-	@cd ${WRKSRC}/lib && \
-	${SETENV} ${MAKE_ENV} ${MAKE} -f ../mk/FreeBSD.mk \
-	${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}
-	@cd ${WRKSRC}/milter-sender && \
-	${SETENV} ${MAKE_ENV} ${MAKE} -f ../mk/FreeBSD.mk \
+CFLAGS+= ${PTHREAD_CFLAGS}
+CONFIGURE_ENV=  LIBS="${PTHREAD_LIBS}"
+CONFIGURE_ARGS= --localstatedir=${PREFIX} --with-db
+MAKE_ENV=       PREFIX="${PREFIX}"
+
+pre-configure:
+	@cd ${WRKSRC}/../lib && \
+	${SETENV} CC="${CC}" CXX="${CXX}" \
+	CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
+	INSTALL="/usr/bin/install -c ${_BINOWNGRP}" \
+	INSTALL_DATA="${INSTALL_DATA}" \
+	INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
+	INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
+	${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}
+	@cd ${WRKSRC}/../lib && \
+	${SETENV} ${MAKE_ENV} ${MAKE} \
 	${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}
 
-do-install:
-	@cd ${WRKSRC}/milter-sender && \
-	${SETENV} ${MAKE_ENV} ${MAKE} -f ../mk/FreeBSD.mk \
-	${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}
+post-install:
 	@${INSTALL} -d ${DOCDIR}/Img
-	@cd ${WRKSRC}/milter-sender && \
+	@cd ${WRKSRC} && \
 	${INSTALL_DATA} CHANGES.TXT index.shtml style.css mailto.js \
-	license-body.html LICENSE.TXT milter-sender.mc ${DOCDIR}
-	@cd ${WRKSRC}/milter-sender/Img && \
+	license-body.html LICENSE.TXT milter-sender.mc responses.txt \
+	${DOCDIR}
+	@cd ${WRKSRC}/Img && \
 	${INSTALL_DATA} *.gif *.png ${DOCDIR}/Img
-
-EXTRA_CFLAGS=   ${PTHREAD_CFLAGS}
-LDFLAGS=	${PTHREAD_LIBS}
-MAKE_ENV=       EXTRA_CFLAGS="${EXTRA_CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		WRKDIR="${WRKDIR}"
-
-post-install:
 	@${CAT} ${PKGMESSAGE}
 
 post-deinstall:
diff --git a/mail/milter-sender/distinfo b/mail/milter-sender/distinfo
index 6305cb47cba1..bc41bc4b5e7d 100644
--- a/mail/milter-sender/distinfo
+++ b/mail/milter-sender/distinfo
@@ -1,2 +1,2 @@
-MD5 (libsnert-1.18.tgz) = de303fcfc770dd16aff4a696cd1fb44a
-MD5 (milter-sender-0.36.tgz) = 0f62a25ce7fb546348fd6e239c0fcab9
+MD5 (libsnert-1.20.tgz) = 3bc3ad590da250bcadda2bb3f2bdf47d
+MD5 (milter-sender-0.38.tgz) = ef3d4e3036bab0e1c29f96c6eab681b9
diff --git a/mail/milter-sender/files/patch-aa b/mail/milter-sender/files/patch-aa
index 1de9b341bade..e07d2b6f9858 100644
--- a/mail/milter-sender/files/patch-aa
+++ b/mail/milter-sender/files/patch-aa
@@ -1,31 +1,11 @@
---- mk/FreeBSD.mk.bak	Wed Aug  6 23:36:55 2003
-+++ mk/FreeBSD.mk	Sun Sep  7 11:40:21 2003
-@@ -17,8 +17,7 @@
- #
- # Absolute paths to supporting headers and libraries.
- #
--PREFIX = /usr/local/src
--SNERT  = $(PREFIX)/com/snert
-+SNERT  = $(WRKDIR)/com/snert
- INCDIR = $(SNERT)/include/
- LIBDIR = $(SNERT)/lib/
- SRCDIR = $(SNERT)/src/lib/
-@@ -43,14 +42,14 @@
- #       WIN32_API
- #
- 
--CC      = gcc
--CFLAGS  = -g $(DEBUG) -I$(INCDIR) $(EXTRA_CFLAGS) -D_REENTRANT -D_THREAD_SAFE\
-+#CC      = gcc
-+CFLAGS  += $(DEBUG) -I$(INCDIR) $(EXTRA_CFLAGS) -D_REENTRANT\
-         -DSERIALIZATION_API=SYSTEMV_API \
-         -DSHARED_MEMORY_API=SYSTEMV_API
- #O_NAME  = -o$*$O
- 
--LD      = gcc
--LDFLAGS = -L$(LIBDIR)
-+#LD      = gcc
-+LDFLAGS += -L$(LIBDIR)
- E_FLAG	= -o
- E_NAME	= $(E_FLAG)$@
+--- milter-sender/configure.bak	Fri Sep 19 20:40:23 2003
++++ configure	Mon Sep 22 02:08:38 2003
+@@ -1447,7 +1447,7 @@
+ 	COMPILE='$(CC) $(CFLAGS) $(CC_O)$*$O -c $<'
+ 	STARTUP_SCRIPT='/usr/local/etc/rc.d'
  
+-	CFLAGS="$CFLAGS -pthread"
++#       CFLAGS="$CFLAGS -pthread"
+ elif test "$OS" = 'SunOS'; then
+ 	# This used to be -I{}, but I've seen two different SunOS 5.8
+ 	# systems in two different parts of the world with man pages
diff --git a/mail/milter-sender/files/patch-ab b/mail/milter-sender/files/patch-ab
index caf0e25447d4..a7e3fad452ac 100644
--- a/mail/milter-sender/files/patch-ab
+++ b/mail/milter-sender/files/patch-ab
@@ -1,44 +1,27 @@
---- milter-sender/makefile.bak	Sun Aug 31 13:00:43 2003
-+++ milter-sender/makefile	Sun Sep  7 11:43:19 2003
-@@ -24,23 +24,25 @@
- #
- MAILDIR		= /etc/mail
+--- install.sh.orig	Wed Sep 17 01:38:25 2003
++++ install.sh	Mon Sep 22 03:59:39 2003
+@@ -17,20 +17,18 @@
+ chown ${USER} ${STATEDIR}
+ chgrp ${GROUP} ${STATEDIR}
  
--BINDIR		= /usr/local/sbin
--STATEDIR	= /var/lib/$(MILTER)
-+BINDIR          = ${PREFIX}/sbin
-+STATEDIR        = ${PREFIX}/lib/$(MILTER)
+-cp -f ${MILTER} ${BINDIR}
+-chown ${USER} ${BINDIR}/${MILTER}
+-chgrp ${GROUP} ${BINDIR}/${MILTER}
++install -s ${MILTER} ${BINDIR}
++#chown ${USER} ${BINDIR}/${MILTER}
++#chgrp ${GROUP} ${BINDIR}/${MILTER}
  
- #
- # These assume that Berkley DB4 was configured with --prefix=/usr/local.
- # Some systems supply older version of Berkley DB in /usr and so these
- # options make sure the DB4 version is included first.
- #
--INC = -I/usr/local/BerkeleyDB.4.1/include -I/usr/local/include
--LIB = -L/usr/local/BerkeleyDB.4.1/lib -L/usr/local/lib
-+#INC = -I/usr/local/BerkeleyDB.4.1/include -I/usr/local/include
-+#LIB = -L/usr/local/BerkeleyDB.4.1/lib -L/usr/local/lib
-+INC=
-+LIB=
+ chgrp ${GROUP} ${MAILDIR} ${MAILDIR}/access.* ${MAILDIR}/aliases.*
  
- #
- # Linux
- #
--STARTUP_SCRIPT	= /etc/rc.d/init.d/$(MILTER)
--POSIX_LIB = -lpthread
--DB_LIB = -ldb
-+#STARTUP_SCRIPT  = /etc/rc.d/init.d/$(MILTER)
-+#POSIX_LIB = -lpthread
-+#DB_LIB = -ldb
- 
- #
- # Cobalt Qube 1 (old RedHat 5.1)
-@@ -60,7 +62,7 @@
- #
- # FreeBSD 4.8
- #
--#STARTUP_SCRIPT	= /etc/rc.d/$(MILTER)
-+STARTUP_SCRIPT = ${PREFIX}/etc/rc.d/$(MILTER).sh
- #POSIX_LIB = -pthread
- #DB_LIB = -ldb
  
+ case `uname -s` in
+ *BSD*)
+-	RC="/usr/local/etc/rc.d/${MILTER}.sh"
+-	if [ ! -f $RC ]; then
++	RC="${PREFIX}/etc/rc.d/${MILTER}.sh-dist"
+ 		cp ${MILTER}.sh $RC
+ 		chmod 640 $RC
+-	fi
+ 	;;
+ Linux*)
+ 	if [ -d '/etc/rc.d/init.d' ]; then
diff --git a/mail/milter-sender/files/patch-ac b/mail/milter-sender/files/patch-ac
index c84e4d3e1548..d2d0b4d521be 100644
--- a/mail/milter-sender/files/patch-ac
+++ b/mail/milter-sender/files/patch-ac
@@ -1,5 +1,5 @@
---- milter-sender/milter-sender.sh.orig	Tue Sep  2 21:12:30 2003
-+++ milter-sender/milter-sender.sh	Sun Sep  7 14:28:41 2003
+--- milter-sender.sh.orig	Wed Sep 17 01:38:25 2003
++++ milter-sender.sh	Wed Sep 24 02:45:00 2003
 @@ -10,15 +10,14 @@
  # BEFORE:  mail
  # KEYWORD: FreeBSD NetBSD
@@ -24,7 +24,7 @@
  
  ##########################################################################
  #	Nothing to be configured below this point.
-@@ -64,31 +63,29 @@
+@@ -64,34 +63,24 @@
  start()
  {
  	NAME=`basename "$PROGRAM"`
@@ -36,18 +36,20 @@
 +		echo " milter-sender:FAILED"
  		return
  	fi
--
-+	rm -f ${PREFIX}/lib/milter-sender/socket
- 	# Start the program in the background from a sub-shell
- 	# so that process will appear in the ps output immediately.
- 	sh -c "$PROGRAM $OPTIONS &"
  
- 	pid=`getpid "$PROGRAM"`
- 	if [ X"$pid" = X ]; then
+ 	# Make sure the old socket has been removed, especially for FreeBSD.
+ 	rm -f ${REQUIRED_DIR}/socket
+ 	
+-	# Start the program in the background from a sub-shell
+-	# so that process will appear in the ps output immediately.
+-	sh -c "$PROGRAM $OPTIONS &"
+-
+-	pid=`getpid "$PROGRAM"`
+-	if [ X"$pid" = X ]; then
 -		printf '\r\033[71C['${FG_RED}'FAILED'${FG_NORMAL}']\n'
-+		echo " milter-sender:FAILED"
- 		return
- 	fi
+-		return
+-	fi
++	$PROGRAM $OPTIONS &
  
 -	printf '\r\033[71C['${FG_GREEN}'  OK  '${FG_NORMAL}']\n'
 +	echo -n " milter-sender"
@@ -60,7 +62,7 @@
  
  	pid=`getpid "$PROGRAM"`
  	if [ X"$pid" != X ]; then
-@@ -102,12 +99,12 @@
+@@ -105,12 +94,12 @@
  		sleep 2
  		pid=`getpid "$PROGRAM"`
  		if [ X"$pid" != X ]; then
@@ -75,7 +77,7 @@
  }
  
  case "$1" in
-@@ -124,9 +121,9 @@
+@@ -127,9 +116,9 @@
  status)
  	pid=`getpid "$PROGRAM"`
  	if [ X"$pid" != X ]; then
diff --git a/mail/milter-sender/files/patch-ad b/mail/milter-sender/files/patch-ad
deleted file mode 100644
index a69138a289f8..000000000000
--- a/mail/milter-sender/files/patch-ad
+++ /dev/null
@@ -1,26 +0,0 @@
---- milter-sender/install.sh.orig	Mon Aug 25 14:36:47 2003
-+++ milter-sender/install.sh	Sun Sep  7 14:35:00 2003
-@@ -18,19 +18,17 @@
- chgrp ${GROUP} ${STATEDIR}
- 
- cp -f ${MILTER} ${BINDIR}
--chown ${USER} ${BINDIR}/${MILTER}
--chgrp ${GROUP} ${BINDIR}/${MILTER}
-+#chown ${USER} ${BINDIR}/${MILTER}
-+#chgrp ${GROUP} ${BINDIR}/${MILTER}
- 
- chgrp ${GROUP} ${MAILDIR} ${MAILDIR}/access.* ${MAILDIR}/aliases.*
- 
- 
- case `uname -s` in
- *BSD*)
--	RC="/usr/local/etc/rc.d/${MILTER}.sh"
--	if [ ! -f $RC ]; then
-+	RC="/usr/local/etc/rc.d/${MILTER}.sh-dist"
- 		cp ${MILTER}.sh $RC
--		chmod 540 $RC
--	fi
-+		chmod 640 $RC
- 	;;
- Linux*)
- 	if [ -d '/etc/rc.d/init.d' ]; then
diff --git a/mail/milter-sender/pkg-plist b/mail/milter-sender/pkg-plist
index 5b2ca8343cfd..e68377527054 100644
--- a/mail/milter-sender/pkg-plist
+++ b/mail/milter-sender/pkg-plist
@@ -1,20 +1,22 @@
 etc/rc.d/milter-sender.sh-dist
 sbin/milter-sender
 @exec install -d -o smmsp -g smmsp -m 755 lib/milter-sender
-share/doc/milter-sender/index.shtml
-share/doc/milter-sender/license-body.html
-share/doc/milter-sender/milter-sender.mc
-share/doc/milter-sender/mailto.js
-share/doc/milter-sender/style.css
 share/doc/milter-sender/CHANGES.TXT
-share/doc/milter-sender/LICENSE.TXT
 share/doc/milter-sender/Img/bg.gif
 share/doc/milter-sender/Img/dilbert2003071742312.gif
 share/doc/milter-sender/Img/dilbert2003228690821.gif
 share/doc/milter-sender/Img/mrpixel.gif
+share/doc/milter-sender/Img/overview.png
 share/doc/milter-sender/Img/sendmail-bat-left-142x38.png
 share/doc/milter-sender/Img/sendmail-bat-right-142x38.png
 share/doc/milter-sender/Img/sun.gif
+share/doc/milter-sender/LICENSE.TXT
+share/doc/milter-sender/index.shtml
+share/doc/milter-sender/license-body.html
+share/doc/milter-sender/mailto.js
+share/doc/milter-sender/milter-sender.mc
+share/doc/milter-sender/responses.txt
+share/doc/milter-sender/style.css
 @dirrm share/doc/milter-sender/Img
 @dirrm share/doc/milter-sender
 @dirrm lib/milter-sender