Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 8 Sep 2014 21:01:47 +0000 (UTC)
From:      Tijl Coosemans <tijl@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r367702 - in head/mail/libspf: . files
Message-ID:  <201409082101.s88L1lUx095099@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tijl
Date: Mon Sep  8 21:01:46 2014
New Revision: 367702
URL: http://svnweb.freebsd.org/changeset/ports/367702
QAT: https://qat.redports.org/buildarchive/r367702/

Log:
  - Convert to USES=libtool and add INSTALL_TARGET=install-strip
  - Add USE_AUTOTOOLS=libtoolize (and others) because configure has been
    generated with a different version of libtool than ltmain.sh

Added:
  head/mail/libspf/files/patch-configure.in   (contents, props changed)
Deleted:
  head/mail/libspf/files/patch-respect_cflags_and_dont_create_spfmilter_Makefile
Modified:
  head/mail/libspf/Makefile
  head/mail/libspf/pkg-plist

Modified: head/mail/libspf/Makefile
==============================================================================
--- head/mail/libspf/Makefile	Mon Sep  8 20:50:23 2014	(r367701)
+++ head/mail/libspf/Makefile	Mon Sep  8 21:01:46 2014	(r367702)
@@ -3,6 +3,7 @@
 
 PORTNAME=	libspf
 DISTVERSION=	1.0.0-p5
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.libspf.org/files/src/ \
 		${MASTER_SITE_LOCAL}
@@ -13,10 +14,11 @@ COMMENT=	Sender Policy Framework (SPF) l
 
 MAKE_JOBS_UNSAFE=yes
 
-USES=	tar:bzip2
-USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
-
+INSTALL_TARGET=	install-strip
+USES=		libtool tar:bzip2
+USE_AUTOTOOLS=	libtoolize aclocal autoconf autoheader automake
+AUTOMAKE_ARGS=	-a -c -f
 USE_LDCONFIG=	yes
 
 PORTDOCS=	*
@@ -39,10 +41,6 @@ CONFIGURE_ARGS+=	--enable-logfile-stats
 CONFIGURE_ARGS+=	--enable-debug
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e "s|CFLAGS =|CFLAGS +=|" \
-		${WRKSRC}/src/libspf/Makefile.in ${WRKSRC}/src/spfqtool/Makefile.in
-
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}

Added: head/mail/libspf/files/patch-configure.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/libspf/files/patch-configure.in	Mon Sep  8 21:01:46 2014	(r367702)
@@ -0,0 +1,117 @@
+--- configure.in.orig	2006-05-08 22:06:01 UTC
++++ configure.in
+@@ -839,7 +839,7 @@
+     AC_MSG_ERROR(bad value ${enableval} for --enable-libbind)
+     ;;
+ esac],
+-[libbind=false] AC_MSG_RESULT(no))
++[libbind=false]; AC_MSG_RESULT(no))
+ 
+ if test "$libbind" = "true"; then
+   LIBSPF_RESOLV_LIB="-lbind"
+@@ -927,14 +927,12 @@
+     AC_MSG_ERROR(bad value ${enableval} for --enable-debug)
+     ;;
+ esac],
+-[debug=false] AC_MSG_RESULT(no))
++[debug=false]; AC_MSG_RESULT(no))
+ 
+-CFLAGS=""
+ if test "$debug" = "true"; then
+-  CFLAGS="-ggdb -O -D_SPF_DEBUG"
++  CFLAGS="$CFLAGS -D_SPF_DEBUG"
+ else
+   AC_MSG_RESULT(Enabling GCC optimisations)
+-  CFLAGS="$CFLAGS -O3 -ffast-math -fomit-frame-pointer"
+ 
+   if [[ "x$GCC_VERSION" = "x3" ]]; then
+     AC_MSG_RESULT(Enabling GCC v3 optimizations)
+@@ -976,7 +974,7 @@
+       AC_MSG_ERROR(bad value ${enableval} for --enable-debug-logfile)
+       ;;
+   esac],
+-  [debug_logfile=true] AC_MSG_RESULT(no))
++  [debug_logfile=true]; AC_MSG_RESULT(no))
+ 
+   if test "$debug_logfile" = "true"; then
+     CFLAGS="-D_SPF_DEBUG_LOGFILE $CFLAGS"
+@@ -1005,7 +1003,7 @@
+     AC_MSG_ERROR(bad value ${enableval} for --enable-logfile-stats)
+     ;;
+ esac],
+-[logfile_stats=false] AC_MSG_RESULT(no))
++[logfile_stats=false]; AC_MSG_RESULT(no))
+ 
+ if test "$logfile_stats" = "true"; then
+   CFLAGS="-D_SPF_LOGFILE_STATS $CFLAGS"
+@@ -1033,7 +1031,7 @@
+     AC_MSG_ERROR(bad value ${enableval} for --enable-rfc-recursion)
+     ;;
+ esac],
+-[rfc_recursion=false] AC_MSG_RESULT(no))
++[rfc_recursion=false]; AC_MSG_RESULT(no))
+ 
+ if test "$rfc_recursion" = "true"; then
+   CFLAGS="-D_RFC_RECURSION $CFLAGS"
+@@ -1079,7 +1077,7 @@
+     AC_MSG_ERROR(bad value ${enableval} for --enable-paranoid-malloc)
+     ;;
+ esac],
+-[paranoid_malloc=true] AC_MSG_RESULT(yes))
++[paranoid_malloc=true]; AC_MSG_RESULT(yes))
+ 
+ if test "$paranoid_malloc" = "true"; then
+   CFLAGS="-D_WITH_PARANOID_MALLOC $CFLAGS"
+@@ -1109,7 +1107,7 @@
+     AC_MSG_ERROR(bad value ${enableval} for --enable-res_search)
+     ;;
+ esac],
+-[res_search=falsee] AC_MSG_RESULT(no))
++[res_search=falsee]; AC_MSG_RESULT(no))
+ 
+ if test "$res_search" = "true"; then 
+   CFLAGS="-D_WITH_RES_SEARCH $CFLAGS"
+@@ -1136,7 +1134,7 @@
+     AC_MSG_ERROR(bad value ${enableval} for --disable-spfqtool)
+     ;;
+ esac],
+-[spfqtool=false] AC_MSG_RESULT(no))
++[spfqtool=false]; AC_MSG_RESULT(no))
+ 
+ if test "$spfqtool" = "true"; then
+   LIBSPF_BUILD_DIRS="libspf"
+@@ -1168,7 +1166,7 @@
+     AC_MSG_ERROR(bad value ${enableval} for --enable-pthreads)
+     ;;
+ esac],
+-[pthreads=false] AC_MSG_RESULT(no))
++[pthreads=false]; AC_MSG_RESULT(no))
+ 
+ if test "$pthreads" = "true"; then
+ 
+@@ -1226,7 +1224,7 @@
+     AC_MSG_ERROR(bad value ${enableval} for --enable-spfmilter)
+     ;;
+ esac],
+-[spfmilter=false] AC_MSG_RESULT(no))
++[spfmilter=false]; AC_MSG_RESULT(no))
+ 
+ if test "$pthreads" = "false"; then
+   if test "$spfmilter" = "true"; then
+@@ -1314,7 +1312,7 @@
+       AC_MSG_ERROR(bad value ${enableval} for --enable-full-optimizations)
+       ;;
+   esac],
+-  [full_optimizations=false] AC_MSG_RESULT(no))
++  [full_optimizations=false]; AC_MSG_RESULT(no))
+ 
+   if test "$full_optimizations" = "true"; then
+     if [[ "x$GCCVER" != "xno" ]]; then
+@@ -1337,7 +1335,6 @@
+   src/spfqtool/Makefile \
+   src/libspf/spf.h \
+   src/libspf/util.c \
+-  src/spfmilter/Makefile \
+ )
+ #AC_OUTPUT(src/Makefile)
+ #AC_OUTPUT(src/libspf/Makefile)

Modified: head/mail/libspf/pkg-plist
==============================================================================
--- head/mail/libspf/pkg-plist	Mon Sep  8 20:50:23 2014	(r367701)
+++ head/mail/libspf/pkg-plist	Mon Sep  8 21:01:46 2014	(r367702)
@@ -2,11 +2,10 @@ 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-1.0.so.0.0.26
 lib/libspf.a
-lib/libspf.la
+lib/libspf.so
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/Sendmail/sendmail.cf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/Sendmail/sendmail.mc.example
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/Sendmail/spf.m4



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409082101.s88L1lUx095099>