5 files changed, 107 insertions, 102 deletions

diff --git a/mail/libspf/Makefile b/mail/libspf/Makefile
index a7e0b653a1cc..ad370a59e5bc 100644
--- a/mail/libspf/Makefile
+++ b/mail/libspf/Makefile
@@ -6,101 +6,70 @@
 #
 
 PORTNAME=	libspf
-PORTVERSION=	0.25.b
+DISTVERSION=	1.0.0-p3
 CATEGORIES=	mail
-MASTER_SITES=	http://www.libspf.org/files/
-DISTNAME=	${PORTNAME}.${PORTVERSION}eta
+MASTER_SITES=	http://www.libspf.org/files/src/
 
-DEPRECATED=	"stale, try mail/libspf2"
-EXPIRATION_DATE=2005-07-31
-
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	marcus@corp.grupos.com.br
 COMMENT=	Sender Policy Framework (SPF) library and client
 
-NOT_FOR_ARCHS=	amd64 alpha
-
-USE_GETOPT_LONG=yes
 USE_BZIP2=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}.25
-USE_GMAKE=	yes
-USE_REINPLACE=	yes
+USE_LIBTOOL_VER=	15
 INSTALLS_SHLIB=	yes
-LIBSPF_REV=	1
-PLIST_SUB=	PORTNAME=${PORTNAME} LIBSPF_REV=${LIBSPF_REV}
-LDFLAGS+=	-L${WRKSRC}
 
-# Supported tunables:
-#
-# WITH_SPF_LOG_FILE=/foo/bar	enable transaction logfile (if unset: no log)
-# WITH_SPF_DEBUG=yes		enable debugging
-# WITH_SPF_DEBUG_FILE=/foo/baz	enable debug logfile (if unset: stdout/stderr)
+OPTIONS=	RFC_RECURSION	"Change SPF recursion to 20 (as per RFC)"	off \
+		LOGFILE_STATS	"Enables logfile stats"				off \
+		DEBUG		"Enables debug option"				off
 
-.if defined(WITH_SPF_LOG_FILE)
-SPF_LOG_FILE=	${WITH_SPF_LOG_FILE}
-.else
-SPF_LOG_FILE=	/dev/null
-.endif
+.include <bsd.port.pre.mk>
 
-.if defined(WITH_SPF_DEBUG)
-SPF_CFLAGS=	-ggdb -DDEBUG -D_SPF_DEBUG
-.if defined(WITH_SPF_DEBUG_FILE)
-SPF_CFLAGS+=	-D_SPF_DEBUG_LOGFILE
-.endif
+.if !defined(WITHOUT_RFC_RECURSION)
+CONFIGURE_ARGS+=	--enable-rfc-recursion
 .endif
 
-.if defined(WITH_SPF_DEBUG_FILE)
-SPF_DEBUG_FILE=	${WITH_SPF_DEBUG_FILE}
-.else
-SPF_DEBUG_FILE=	/dev/null
+.if !defined(WITHOUT_LOGFILE_STATS)
+CONFIGURE_ARGS+=	--enable-logfile-stats
 .endif
 
-SPF_CFLAGS+=	-DDEBUG_LOG_FILE=\\\"${SPF_DEBUG_FILE}\\\" \
-		-DOUTPUT_LOG_FILE=\\\"${SPF_LOG_FILE}\\\"
-
-# This is all a bit messy, but given the inconvenient original Makefile,
-# this seems to be the best way to make this port work in this version.
-# The author of libspf is working on autotools support, so this ugliness
-# should have an end soon.
-post-patch:
-	@${REINPLACE_CMD} \
-	    -e 's,^CFLAGS:=.*,CFLAGS+=-Wall -D_BSD_SOURCE ${SPF_CFLAGS},' \
-	    -e 's/^CPPFLAGS:=/#CPPFLAGS:=/' \
-	    -e 's/^LDFLAGS:=/#LDFLAGS:=/' \
-	    -e 's/make /${GMAKE} /g' \
-	    -e 's/-lresolv//g' \
-	    -e 's/libspf.a : -lc/libspf.a :/g' \
-	    -e 's/libspf\.so\.1\.0\.1/libspf.so.${LIBSPF_REV}/g' \
-	    -e 's/-soname,libspf\.so\.1/-soname,libspf.so.${LIBSPF_REV}/g' \
-	    ${WRKSRC}/Makefile
-	@${REINPLACE_CMD} \
-	    -e 's,^CFLAGS:=,CFLAGS:=${CFLAGS} ${CPPFLAGS},' \
-	    -e 's,^CPPFLAGS:=,CPPFLAGS:=${CPPFLAGS},' \
-	    -e 's,^LDFLAGS:=.*,LDFLAGS=${LDFLAGS},' \
-	    -e 's/make /${GMAKE} /g' \
-	    -e 's/-o spfquery/-o spfquery-${PORTNAME}/g' \
-	    ${WRKSRC}/tools/Makefile
-	@${REINPLACE_CMD} \
-	    -e 's/#include "error.h"//' \
-	    ${WRKSRC}/main.c ${WRKSRC}/dns.c
-	@${REINPLACE_CMD} \
-	    -e 's,\(#define DEBUG_LOG_FILE.*\),/* \1 */,' \
-	    -e 's,\(#define OUTPUT_LOG_FILE.*\),/* \1 */,' \
-	    ${WRKSRC}/util.h
-	@${REINPLACE_CMD} \
-	    -e 's/spfquery /spfquery-${PORTNAME} /' \
-	    -e 's/getopt_long_only/getopt_long/g' \
-	    -E -e '/stderr/s/ -([a-z]{2,})/ --\1/g' \
-	    ${WRKSRC}/tools/spfquery.c
+.if !defined(WITHOUT_DEBUG)
+CONFIGURE_ARGS+=	--enable-debug
+.endif
 
-post-build:
-	@(cd ${WRKSRC}/tools; ${SETENV} ${MAKE_ENV} ${GMAKE} shared )
+.if !defined(NOPORTDOCS)
+PORTDOCS=	*
+.endif
 
-do-install:
-	${INSTALL_DATA} ${WRKSRC}/spf.h ${PREFIX}/include
-	${INSTALL_DATA} ${WRKSRC}/libspf.a ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/libspf.so.${LIBSPF_REV} ${PREFIX}/lib
-	(cd ${PREFIX}/lib ; ${LN} -sf libspf.so.${LIBSPF_REV} libspf.so)
-	${INSTALL_PROGRAM} ${WRKSRC}/tools/spfquery-${PORTNAME} ${PREFIX}/bin
-	@${CAT} ${PKGMESSAGE}
+post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	@${FIND} ${WRKSRC}/docs -type d -name CVS | ${XARGS} ${RM} -rf
+.for i in docs docs/API docs/API/doxygen docs/API/doxygen/html docs/RFC docs/qmail \
+	docs/qmail/1.03 docs/qmail/1.04 docs/qmail/1.05 docs/spfqtool docs/Postfix \
+	docs/Postfix/2.1.x docs/Sendmail docs/Sendmail/8.12.x docs/Sendmail/8.13.x \
+	docs/Courier-MTA docs/history
+	@${MKDIR} ${DOCSDIR}/${i}
+	@for f in `${FIND} ${WRKSRC}/${i} ! -type d -maxdepth 1`; do \
+		${INSTALL_DATA} $${f} ${DOCSDIR}/${i}; \
+	done
+.endfor
+.endif
+	@${MKDIR} ${EXAMPLESDIR}
+	@${FIND} ${WRKSRC}/examples -type d -name CVS | ${XARGS} ${RM} -rf
+.for i in examples/qmail examples/qmail/control examples/Sendmail
+	@${MKDIR} ${EXAMPLESDIR}/${i}
+	@for f in `${FIND} ${WRKSRC}/${i} ! -type d -maxdepth 1`; do \
+		${INSTALL_DATA} $${f} ${EXAMPLESDIR}/${i}; \
+	done
+.endfor
+	@${MKDIR} ${DATADIR}
+	@${FIND} ${WRKSRC}/patches -type d -name CVS | ${XARGS} ${RM} -rf
+.for i in patches patches/qmail patches/qmail/1.03 patches/qmail/1.05 patches/Postfix \
+	patches/Postfix/2.1.x patches/Sendmail patches/Sendmail/8.12.x patches/Sendmail/8.13.x \
+	patches/Courier-MTA
+	@${MKDIR} ${DATADIR}/${i}
+	@for f in `${FIND} ${WRKSRC}/${i} ! -type d -maxdepth 1`; do \
+		${INSTALL_DATA} $${f} ${DATADIR}/${i}; \
+	done
+.endfor
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/mail/libspf/distinfo b/mail/libspf/distinfo
index c2ac8f32314f..fa70c2ff489e 100644
--- a/mail/libspf/distinfo
+++ b/mail/libspf/distinfo
@@ -1,2 +1,2 @@
-MD5 (libspf.0.25.beta.tar.bz2) = 79b3a37888082428ed86dfa0f612a6f2
-SIZE (libspf.0.25.beta.tar.bz2) = 61406
+MD5 (libspf-1.0.0-p3.tar.bz2) = 8cc31c6f3e79e350b941b04ca7bfb145
+SIZE (libspf-1.0.0-p3.tar.bz2) = 1038651
diff --git a/mail/libspf/files/patch-spf.h b/mail/libspf/files/patch-spf.h
deleted file mode 100644
index 1e2e1cf1c874..000000000000
--- a/mail/libspf/files/patch-spf.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- spf.h.orig	Fri May 14 18:49:30 2004
-+++ spf.h	Fri May 21 17:13:30 2004
-@@ -47,6 +47,7 @@
- #define	_SPF_H 1
- 
- #include <sys/types.h>    /* typedefs */
-+#include <netinet/in.h>
- #include <arpa/inet.h>    /* in_addr struct */
- 
- __BEGIN_DECLS
diff --git a/mail/libspf/pkg-message b/mail/libspf/pkg-message
deleted file mode 100644
index b416d4fcc601..000000000000
--- a/mail/libspf/pkg-message
+++ /dev/null
@@ -1,6 +0,0 @@
------------------------------------------------------------------------
-Note: This port installs the SPF userspace tools with a filename suffix
-      of -libspf in order to avoid conflicts with other SPF ports
-      providing tools of the same name.
-      Please create convenience symlinks manually, if desired.
------------------------------------------------------------------------
diff --git a/mail/libspf/pkg-plist b/mail/libspf/pkg-plist
index 00abd71a5108..1d41d0256486 100644
--- a/mail/libspf/pkg-plist
+++ b/mail/libspf/pkg-plist
@@ -1,5 +1,57 @@
+bin/spfqtool
+bin/spfqtool_static
+include/_stdint.h
 include/spf.h
+lib/libspf-1.0.so
+lib/libspf-1.0.so.0
 lib/libspf.a
 lib/libspf.so
-lib/libspf.so.%%LIBSPF_REV%%
-bin/spfquery-%%PORTNAME%%
+%%EXAMPLESDIR%%/examples/Sendmail/sendmail.cf
+%%EXAMPLESDIR%%/examples/Sendmail/sendmail.mc.example
+%%EXAMPLESDIR%%/examples/Sendmail/spf.m4
+%%EXAMPLESDIR%%/examples/qmail/control/spfaction
+%%EXAMPLESDIR%%/examples/qmail/control/spfbestguess
+%%EXAMPLESDIR%%/examples/qmail/control/spfdebugstate
+%%EXAMPLESDIR%%/examples/qmail/control/spfexplainstate
+%%EXAMPLESDIR%%/examples/qmail/control/spfexplanation
+%%EXAMPLESDIR%%/examples/qmail/control/spfguessstate
+%%EXAMPLESDIR%%/examples/qmail/control/spfheaderstate
+%%EXAMPLESDIR%%/examples/qmail/control/spftarpit
+%%EXAMPLESDIR%%/examples/qmail/control/spftarpittime
+%%EXAMPLESDIR%%/examples/qmail/control/spftrustedforwarder
+%%EXAMPLESDIR%%/examples/qmail/control/spftrustedstate
+%%DATADIR%%/patches/Courier-MTA/courier-0.45.4-spf.diff
+%%DATADIR%%/patches/Postfix/2.1.x/postfix-2.1.4-libspf-1.0-RC6.diff
+%%DATADIR%%/patches/Postfix/README
+%%DATADIR%%/patches/README
+%%DATADIR%%/patches/Sendmail/8.12.x/sendmail-8.12.10-libspf.0.24.diff
+%%DATADIR%%/patches/Sendmail/8.12.x/sendmail-8.12.11-libspf.0.25.diff
+%%DATADIR%%/patches/Sendmail/8.12.x/sendmail-8.12.11-libspf.0.25.fixed.diff
+%%DATADIR%%/patches/Sendmail/8.13.x/sendmail-8.13.0-libspf-1.0-RC3.diff
+%%DATADIR%%/patches/Sendmail/8.13.x/sendmail-8.13.1-libspf-1.0-RC5.diff
+%%DATADIR%%/patches/Sendmail/8.13.x/sendmail-8.13.1-libspf-1.0-RC6.diff
+%%DATADIR%%/patches/Sendmail/8.13.x/sendmail-8.13.4-libspf-1.0.diff
+%%DATADIR%%/patches/Sendmail/README
+%%DATADIR%%/patches/qmail/1.03/qmail-1.03.solaris.patch
+%%DATADIR%%/patches/qmail/1.05/Makefile-dynamic-1.05.diff
+%%DATADIR%%/patches/qmail/1.05/Makefile-static-1.05.diff
+%%DATADIR%%/patches/qmail/1.05/netqmail-1.05-libspf-0.25.diff
+%%DATADIR%%/patches/qmail/1.05/netqmail-1.05-libspf-1.0.0-RC5.diff
+%%DATADIR%%/patches/qmail/1.05/netqmail-1.05-libspf-1.0.0-RC6.diff
+%%DATADIR%%/patches/qmail/README
+@dirrm %%DATADIR%%/patches/qmail/1.05
+@dirrm %%DATADIR%%/patches/qmail/1.03
+@dirrm %%DATADIR%%/patches/qmail
+@dirrm %%DATADIR%%/patches/Sendmail/8.13.x
+@dirrm %%DATADIR%%/patches/Sendmail/8.12.x
+@dirrm %%DATADIR%%/patches/Sendmail
+@dirrm %%DATADIR%%/patches/Postfix/2.1.x
+@dirrm %%DATADIR%%/patches/Postfix
+@dirrm %%DATADIR%%/patches/Courier-MTA
+@dirrm %%DATADIR%%/patches
+@dirrm %%DATADIR%%
+@dirrm %%EXAMPLESDIR%%/examples/qmail/control
+@dirrm %%EXAMPLESDIR%%/examples/qmail
+@dirrm %%EXAMPLESDIR%%/examples/Sendmail
+@dirrm %%EXAMPLESDIR%%/examples
+@dirrm %%EXAMPLESDIR%%