Don't build libreplace, it is an empty library.

Fixes build on SunOS.

4 files changed, 59 insertions, 1 deletions

diff --git a/mail/libspf2/distinfo b/mail/libspf2/distinfo
index 6e84bc52a6a..ba158d044a1 100644
--- a/mail/libspf2/distinfo
+++ b/mail/libspf2/distinfo
@@ -1,7 +1,10 @@
-$NetBSD: distinfo,v 1.5 2012/12/22 02:25:57 joerg Exp $
+$NetBSD: distinfo,v 1.6 2013/02/22 11:48:16 jperkin Exp $
 
 SHA1 (libspf2-1.2.9.tar.gz) = 15dfe3b9172180654f4de4dd85f3f01e3bc11503
 RMD160 (libspf2-1.2.9.tar.gz) = d0754d47e297a00038e4185e17704a24d38a4888
 Size (libspf2-1.2.9.tar.gz) = 518001 bytes
 SHA1 (patch-aa) = 81f60333222b510cb511b80aedbb679d2212ab0d
+SHA1 (patch-configure) = 99d5e8ed0199c01baf372f84b97d1b03e04896fd
+SHA1 (patch-src_Makefile.in) = 59d25fdad8b3be60dfde93b5c8ca836b6d2b73a0
 SHA1 (patch-src_include_spf__log.h) = 87b534d338b7fa36168cf8b745a285e38598cfed
+SHA1 (patch-src_libspf2_Makefile.in) = df35e2885d04236e53442215577ea0b0768045a4
diff --git a/mail/libspf2/patches/patch-configure b/mail/libspf2/patches/patch-configure
new file mode 100644
index 00000000000..b571096bd26
--- /dev/null
+++ b/mail/libspf2/patches/patch-configure
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2013/02/22 11:48:16 jperkin Exp $
+
+Don't decend into libreplace, it is an empty library.
+
+--- configure.orig	2008-11-04 15:32:56.000000000 +0000
++++ configure
+@@ -25855,7 +25855,7 @@ done
+ 
+ 
+ 
+-ac_config_files="$ac_config_files Makefile Doxyfile src/Makefile src/include/Makefile src/libreplace/Makefile src/libspf2/Makefile src/spfquery/Makefile src/spftest/Makefile src/spfd/Makefile src/spf_example/Makefile"
++ac_config_files="$ac_config_files Makefile Doxyfile src/Makefile src/include/Makefile src/libspf2/Makefile src/spfquery/Makefile src/spftest/Makefile src/spfd/Makefile src/spf_example/Makefile"
+ 
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
diff --git a/mail/libspf2/patches/patch-src_Makefile.in b/mail/libspf2/patches/patch-src_Makefile.in
new file mode 100644
index 00000000000..2458991fc6c
--- /dev/null
+++ b/mail/libspf2/patches/patch-src_Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_Makefile.in,v 1.1 2013/02/22 11:48:16 jperkin Exp $
+
+Don't decend into libreplace, it is an empty library.
+
+--- src/Makefile.in.orig	2008-11-04 15:33:01.000000000 +0000
++++ src/Makefile.in
+@@ -117,7 +117,7 @@ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+-SUBDIRS = include libreplace libspf2 spfquery spftest spfd spf_example
++SUBDIRS = include libspf2 spfquery spftest spfd spf_example
+ VERSION = @VERSION@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
diff --git a/mail/libspf2/patches/patch-src_libspf2_Makefile.in b/mail/libspf2/patches/patch-src_libspf2_Makefile.in
new file mode 100644
index 00000000000..3c18ff44e6b
--- /dev/null
+++ b/mail/libspf2/patches/patch-src_libspf2_Makefile.in
@@ -0,0 +1,25 @@
+$NetBSD: patch-src_libspf2_Makefile.in,v 1.1 2013/02/22 11:48:16 jperkin Exp $
+
+Don't link against libreplace, it is an empty library.
+
+--- src/libspf2/Makefile.in.orig	2008-11-04 15:33:02.000000000 +0000
++++ src/libspf2/Makefile.in
+@@ -51,8 +51,7 @@ CONFIG_CLEAN_FILES =
+ am__installdirs = "$(DESTDIR)$(libdir)"
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+-libspf2_la_DEPENDENCIES =  \
+-	$(top_builddir)/src/libreplace/libreplace.la
++libspf2_la_DEPENDENCIES = 
+ am_libspf2_la_OBJECTS = spf_compile.lo spf_dns.lo spf_dns_cache.lo \
+ 	spf_dns_null.lo spf_dns_resolv.lo spf_dns_rr.lo \
+ 	spf_dns_test.lo spf_dns_windns.lo spf_dns_zone.lo \
+@@ -251,7 +250,7 @@ libspf2_la_SOURCES = \
+ 	spf_utils.c \
+ 	spf_win32.c
+ 
+-libspf2_la_LIBADD = $(top_builddir)/src/libreplace/libreplace.la
++libspf2_la_LIBADD = 
+ libspf2_la_LDFLAGS = -version-info 3:0:1
+ all: all-recursive
+