8 files changed, 17 insertions, 192 deletions
diff --git a/mail/milter-sender/Makefile b/mail/milter-sender/Makefile
index 8ad84b8d2a04..e5a479a370d3 100644
--- a/mail/milter-sender/Makefile
+++ b/mail/milter-sender/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=       milter-sender
-PORTVERSION=    0.41
-PORTREVISION=   1
+PORTVERSION=    0.42
 CATEGORIES=     mail
 MASTER_SITES=   http://www.snert.com/Software/download/
-DISTFILES=      libsnert-1.23.tgz milter-sender-${PORTVERSION}.tgz
+DISTFILES=      libsnert-1.24.tgz milter-sender-${PORTVERSION}.tgz
 
 MAINTAINER=     ache@FreeBSD.org
 COMMENT=        Real-time sender address verification, based on Milter API
@@ -38,12 +37,9 @@ DOCS= CHANGES.TXT index.shtml style.css mailto.js \
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CFLAGS+= ${PTHREAD_CFLAGS}
 CONFIGURE_ENV+=  LDFLAGS="${LDFLAGS}" LIBS="${PTHREAD_LIBS}"
-CONFIGURE_ARGS+= --with-db
+CONFIGURE_ARGS+= --with-db --localstatedir=/var
 MAKE_ENV+=       PREFIX="${PREFIX}"
 
-post-patch:
-	@${CP} ${FILESDIR}/version.h.in ${WRKSRC}/../lib/
-
 pre-configure:
 	@cd ${WRKSRC}/../lib && \
 	${SETENV} CC="${CC}" CXX="${CXX}" \
diff --git a/mail/milter-sender/distinfo b/mail/milter-sender/distinfo
index 35e0c3d945ee..f3e105c8705a 100644
--- a/mail/milter-sender/distinfo
+++ b/mail/milter-sender/distinfo
@@ -1,2 +1,2 @@
-MD5 (libsnert-1.23.tgz) = 096afd55c85bbc4203b4baca015f43bd
-MD5 (milter-sender-0.41.tgz) = 3b55b06e1f2dc384d3cd9b01860a346b
+MD5 (libsnert-1.24.tgz) = 6023118b67aeecba8b49c86ad189e52b
+MD5 (milter-sender-0.42.tgz) = d8756ccb2bec6e67ab9720d5389bff6e
diff --git a/mail/milter-sender/files/patch-aa b/mail/milter-sender/files/patch-aa
index e07d2b6f9858..9b1e997cf1d7 100644
--- a/mail/milter-sender/files/patch-aa
+++ b/mail/milter-sender/files/patch-aa
@@ -1,11 +1,11 @@
---- 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 $<'
+--- configure.orig	Wed Nov  5 23:30:58 2003
++++ configure	Sat Nov 15 05:23:57 2003
+@@ -1466,7 +1466,7 @@
  	STARTUP_SCRIPT='/usr/local/etc/rc.d'
  
--	CFLAGS="$CFLAGS -pthread"
-+#       CFLAGS="$CFLAGS -pthread"
+ 	# Assume GCC.
+-	CFLAGS="$CFLAGS -pthread -Wall"
++	CFLAGS="$CFLAGS -Wall"
  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-ad b/mail/milter-sender/files/patch-ad
index ee6419d74f59..defbc0cf2111 100644
--- a/mail/milter-sender/files/patch-ad
+++ b/mail/milter-sender/files/patch-ad
@@ -1,11 +1,11 @@
---- ../lib/configure.bak	Sun Oct  5 13:07:02 2003
-+++ ../lib/configure	Sun Oct  5 21:36:53 2003
-@@ -1501,7 +1501,7 @@
- 		ARCHIVE='ar rc $(LIB) {}'
+--- ../lib/configure.orig	Wed Nov  5 23:55:38 2003
++++ ../lib/configure	Sat Nov 15 05:25:33 2003
+@@ -1508,7 +1508,7 @@
  		COMPILE='$(CC) $(CFLAGS) $(CC_O)$*$O -c $<'
  
--		CFLAGS="$CFLAGS -pthread"
-+#                CFLAGS="$CFLAGS -pthread"
+ 		# Assume GCC.
+-		CFLAGS="$CFLAGS -pthread -Wall"
++		CFLAGS="$CFLAGS -Wall"
  	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-ae b/mail/milter-sender/files/patch-ae
deleted file mode 100644
index 59c7618e49aa..000000000000
--- a/mail/milter-sender/files/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- makefile.in.bak	Tue Sep 23 17:00:31 2003
-+++ makefile.in	Sun Oct 12 05:38:35 2003
-@@ -27,7 +27,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- BINDIR		= @sbindir@
--STATEDIR	= @localstatedir@/lib/$(MILTER)
-+STATEDIR        = @localstatedir@/$(MILTER)
- STARTUP_SCRIPT	= @STARTUP_SCRIPT@/$(MILTER)
- 
- ########################################################################
diff --git a/mail/milter-sender/files/patch-af b/mail/milter-sender/files/patch-af
deleted file mode 100644
index 148f8289a1cb..000000000000
--- a/mail/milter-sender/files/patch-af
+++ /dev/null
@@ -1,16 +0,0 @@
---- configure.bak	Tue Oct 21 21:04:13 2003
-+++ configure	Tue Oct 21 21:10:29 2003
-@@ -1349,11 +1349,11 @@
- 	localstatedir='/var'
- fi
- 
--statedir="$localstatedir/lib/$PACKAGE_NAME"
-+statedir="$localstatedir/$PACKAGE_NAME"
- statedir=$statedir
- 
- cat >>confdefs.h <<_ACEOF
--#define STATEDIR "$localstatedir/lib/$PACKAGE_NAME"
-+#define STATEDIR "$localstatedir/$PACKAGE_NAME"
- _ACEOF
- 
- 
diff --git a/mail/milter-sender/files/patch-ag b/mail/milter-sender/files/patch-ag
deleted file mode 100644
index 0f04a7114af8..000000000000
--- a/mail/milter-sender/files/patch-ag
+++ /dev/null
@@ -1,20 +0,0 @@
---- milter-sender.c.bak	Wed Oct 15 19:03:42 2003
-+++ milter-sender.c	Tue Oct 21 21:13:24 2003
-@@ -15,6 +15,8 @@
-  *	)dnl
-  */
- 
-+#include "milter-sender.h"
-+
- #undef NDEBUG
- 
- #ifndef RUN_AS_USER
-@@ -157,8 +159,6 @@
- /***********************************************************************
-  *** No configuration below this point.
-  ***********************************************************************/
--
--#include "milter-sender.h"
- 
- /* Re-assert this macro just in case. May cause a compiler warning. */
- #define _REENTRANT	1
diff --git a/mail/milter-sender/files/version.h.in b/mail/milter-sender/files/version.h.in
deleted file mode 100644
index aeefca7b9302..000000000000
--- a/mail/milter-sender/files/version.h.in
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * version.h
- *
- * Copyright 2002, 2003 by Anthony Howe. All rights reserved.
- */
-
-#ifndef __com_snert_lib_version_h__
-#define __com_snert_lib_version_h__	1
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define __LIBSNERT__		1
-
-#undef LIBSNERT_MAJOR
-#undef LIBSNERT_MINOR
-#undef LIBSNERT_BUILD
-#undef LIBSNERT_VERSION
-#undef LIBSNERT_AUTHOR
-#undef LIBSNERT_COPYRIGHT
-
-typedef struct {
-	int major;
-	int minor;
-	int build;
-	const char *author;
-	const char *version;
-	const char *copyright;
-} VersionInfo;
-
-extern VersionInfo LibSnert;
-
-/*
- * Fine resolution clock:
- *
- * POSIX_API	nanoseconds 	10^-9
- * BSD_API		microseconds 	10^-6
- * ANSI_API		seconds			10^1
- */
-#undef TIME_API
-
-/*
- * SYSTEMV_API
- * POSIX_API
- * WIN32_API
- * FCNTL_API
- * FLOCK_API
- */
-#undef SERIALIZATION_API
-
-/*
- * SYSTEMV_API
- * POSIX_API
- * WIN32_API
- * MMAP_ANON
- */
-#undef SHARED_MEMORY_API
-
-/*
- * Headers & Functions
- */
-#undef HAVE_ACCEPT
-#undef HAVE_CONNECT
-#undef HAVE_FCNTL_H
-#undef HAVE_GETPAGESIZE
-#undef HAVE_GETSOCKOPT
-#undef HAVE_GETTIMEOFDAY
-#undef HAVE_INET_ADDR
-#undef HAVE_INET_ATON
-#undef HAVE_INET_NTOA
-#undef HAVE_INET_NTOP
-#undef HAVE_IO_H
-#undef HAVE_LIMITS_H
-#undef HAVE_MEMORY_H
-#undef HAVE_MKDIR
-#undef HAVE_MMAP
-#undef HAVE_MUNMAP
-#undef HAVE_RECVFROM
-#undef HAVE_SELECT
-#undef HAVE_SEMAPHORE_H
-#undef HAVE_SEM_DESTROY
-#undef HAVE_SEM_INIT
-#undef HAVE_SEM_POST
-#undef HAVE_SEM_WAIT
-#undef HAVE_SENDTO
-#undef HAVE_SETSOCKOPT
-#undef HAVE_SHUTDOWN
-#undef HAVE_SOCKET
-#undef HAVE_STDLIB_H
-#undef HAVE_STRCSPN
-#undef HAVE_STRDUP
-#undef HAVE_STRERROR
-#undef HAVE_STRFTIME
-#undef HAVE_STRINGS_H
-#undef HAVE_STRING_H
-#undef HAVE_STRSPN
-#undef HAVE_STRTOL
-#undef HAVE_SYSLOG_H
-#undef HAVE_SYS_FILE_H
-#undef HAVE_SYS_MMAN_H
-#undef HAVE_SYS_STAT_H
-#undef HAVE_SYS_TIME_H
-#undef HAVE_SYS_TYPES_H
-#undef HAVE_UNISTD_H
-#undef HAVE_VPRINTF
-#undef HAVE_WINDOWS_H
-#undef HAVE_WINSOCK2_H
-#undef PROTOTYPES
-#undef STDC_HEADERS
-#undef TIME_WITH_SYS_TIME
-
-#undef _
-#ifdef __STDC__
-# define _(x)			x
-#else
-# define _(x)			()
-#endif
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif /* __com_snert_lib_version_h__ */