- Update to 1.0.0-p5

- Reorganize Makefile
- Correct detection of WITH/WITHOUT OPTIONS

4 files changed, 51 insertions, 12 deletions

diff --git a/mail/libspf/Makefile b/mail/libspf/Makefile
index aa78594cec0f..a62c6d22bfb5 100644
--- a/mail/libspf/Makefile
+++ b/mail/libspf/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libspf
-DISTVERSION=	1.0.0-p3
-PORTREVISION=	2
+DISTVERSION=	1.0.0-p5
 CATEGORIES=	mail
 MASTER_SITES=	http://www.libspf.org/files/src/
 
@@ -15,30 +14,34 @@ MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	Sender Policy Framework (SPF) library and client
 
 USE_BZIP2=	yes
+USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	yes
+
 INSTALLS_SHLIB=	yes
 
+PORTDOCS=	*
+
 OPTIONS=	RFC_RECURSION	"Change SPF recursion to 20 (as per RFC)"	off \
 		LOGFILE_STATS	"Enables logfile stats"				off \
 		DEBUG		"Enables debug option"				off
 
 .include <bsd.port.pre.mk>
 
-.if !defined(WITHOUT_RFC_RECURSION)
+.if defined(WITH_RFC_RECURSION)
 CONFIGURE_ARGS+=	--enable-rfc-recursion
 .endif
 
-.if !defined(WITHOUT_LOGFILE_STATS)
+.if defined(WITH_LOGFILE_STATS)
 CONFIGURE_ARGS+=	--enable-logfile-stats
 .endif
 
-.if !defined(WITHOUT_DEBUG)
+.if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-debug
 .endif
 
-.if !defined(NOPORTDOCS)
-PORTDOCS=	*
-.endif
+post-patch:
+	@${REINPLACE_CMD} -e "s|CFLAGS =|CFLAGS +=|" \
+		${WRKSRC}/src/libspf/Makefile.in ${WRKSRC}/src/spfqtool/Makefile.in
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/mail/libspf/distinfo b/mail/libspf/distinfo
index 8e3c637da585..6f8a4afc87ba 100644
--- a/mail/libspf/distinfo
+++ b/mail/libspf/distinfo
@@ -1,3 +1,3 @@
-MD5 (libspf-1.0.0-p3.tar.bz2) = 8cc31c6f3e79e350b941b04ca7bfb145
-SHA256 (libspf-1.0.0-p3.tar.bz2) = a3234ad4187c4c443172afe6be7e0dae96beb31a6ea2b194f3bb23d893f8e18c
-SIZE (libspf-1.0.0-p3.tar.bz2) = 1038651
+MD5 (libspf-1.0.0-p5.tar.bz2) = 0f1b9bee7c50f093761d0ec48c543f25
+SHA256 (libspf-1.0.0-p5.tar.bz2) = 0a2f2dea74a8ee78133b05efcfc2ad8ca1df664598fbbbc09aefe9ba7154df95
+SIZE (libspf-1.0.0-p5.tar.bz2) = 961254
diff --git a/mail/libspf/files/patch-respect_cflags_and_dont_create_spfmilter_Makefile b/mail/libspf/files/patch-respect_cflags_and_dont_create_spfmilter_Makefile
new file mode 100644
index 000000000000..438fc882daf7
--- /dev/null
+++ b/mail/libspf/files/patch-respect_cflags_and_dont_create_spfmilter_Makefile
@@ -0,0 +1,36 @@
+--- configure.orig	Mon May  8 19:08:57 2006
++++ configure	Mon May  8 22:45:47 2006
+@@ -23183,7 +23183,7 @@
+ else
+   echo "$as_me:$LINENO: result: Enabling GCC optimisations" >&5
+ echo "${ECHO_T}Enabling GCC optimisations" >&6
+-  CFLAGS="$CFLAGS -O3 -ffast-math -fomit-frame-pointer"
++  CFLAGS="$CFLAGS"
+ 
+   if [ "x$GCC_VERSION" = "x3" ]; then
+     echo "$as_me:$LINENO: result: Enabling GCC v3 optimizations" >&5
+@@ -24317,7 +24317,7 @@
+ # Generate Makefiles
+ #-------------------------------------------------------------------------------
+ 
+-                                                                      ac_config_files="$ac_config_files Makefile src/Makefile src/libspf/Makefile src/spfqtool/Makefile src/libspf/spf.h src/libspf/util.c src/spfmilter/Makefile"
++                                                                      ac_config_files="$ac_config_files Makefile src/Makefile src/libspf/Makefile src/spfqtool/Makefile src/libspf/spf.h src/libspf/util.c"
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+ # tests run on this system so they can be shared between configure
+@@ -24873,7 +24873,6 @@
+   "src/spfqtool/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/spfqtool/Makefile" ;;
+   "src/libspf/spf.h" ) CONFIG_FILES="$CONFIG_FILES src/libspf/spf.h" ;;
+   "src/libspf/util.c" ) CONFIG_FILES="$CONFIG_FILES src/libspf/util.c" ;;
+-  "src/spfmilter/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/spfmilter/Makefile" ;;
+   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+   "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+@@ -25754,7 +25753,6 @@
+ #AC_OUTPUT(src/spfqtool/Makefile)
+ #AC_OUTPUT(src/libspf/spf.h)
+ #AC_OUTPUT(src/libspf/util.c)
+-#AC_OUTPUT(src/spfmilter/Makefile)
+ 
+ echo ""
+ echo ""
diff --git a/mail/libspf/pkg-plist b/mail/libspf/pkg-plist
index 064ffdfcb7eb..a9cd2e8ce100 100644
--- a/mail/libspf/pkg-plist
+++ b/mail/libspf/pkg-plist
@@ -2,11 +2,11 @@ bin/spfqtool
 bin/spfqtool_static
 include/_stdint.h
 include/spf.h
+lib/libspf.so
 lib/libspf-1.0.so
 lib/libspf-1.0.so.0
 lib/libspf.a
 lib/libspf.la
-lib/libspf.so
 %%EXAMPLESDIR%%/examples/Sendmail/sendmail.cf
 %%EXAMPLESDIR%%/examples/Sendmail/sendmail.mc.example
 %%EXAMPLESDIR%%/examples/Sendmail/spf.m4