diff options
Diffstat (limited to 'mail')
-rw-r--r-- | mail/libspf2/Makefile | 4 | ||||
-rw-r--r-- | mail/libspf2/distinfo | 8 | ||||
-rw-r--r-- | mail/libspf2/patches/patch-configure | 16 | ||||
-rw-r--r-- | mail/libspf2/patches/patch-src_Makefile.in | 15 | ||||
-rw-r--r-- | mail/libspf2/patches/patch-src_libreplace_Makefile.in | 22 | ||||
-rw-r--r-- | mail/libspf2/patches/patch-src_libreplace_ensure__libreplace__symbol.c | 8 | ||||
-rw-r--r-- | mail/libspf2/patches/patch-src_libspf2_Makefile.in | 25 |
7 files changed, 44 insertions, 54 deletions
diff --git a/mail/libspf2/Makefile b/mail/libspf2/Makefile index ab6cdeef0bc..3f91dc10b94 100644 --- a/mail/libspf2/Makefile +++ b/mail/libspf2/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.9 2012/10/08 12:19:15 asau Exp $ +# $NetBSD: Makefile,v 1.10 2013/03/04 17:31:55 jperkin Exp $ DISTNAME= libspf2-1.2.9 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= mail MASTER_SITES= http://www.libspf2.org/spf/ diff --git a/mail/libspf2/distinfo b/mail/libspf2/distinfo index ba158d044a1..603936fcded 100644 --- a/mail/libspf2/distinfo +++ b/mail/libspf2/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.6 2013/02/22 11:48:16 jperkin Exp $ +$NetBSD: distinfo,v 1.7 2013/03/04 17:31:55 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-configure) = 27cf3752d9e90cf957e477deace11ec5fe50648d SHA1 (patch-src_include_spf__log.h) = 87b534d338b7fa36168cf8b745a285e38598cfed -SHA1 (patch-src_libspf2_Makefile.in) = df35e2885d04236e53442215577ea0b0768045a4 +SHA1 (patch-src_libreplace_Makefile.in) = 404bc029100df4e43c3dacfd3016b2f521453b69 +SHA1 (patch-src_libreplace_ensure__libreplace__symbol.c) = 1b2ccf11fe7cade3c7769e7388cdd79ee250b26e diff --git a/mail/libspf2/patches/patch-configure b/mail/libspf2/patches/patch-configure index b571096bd26..ee7d0c8ec59 100644 --- a/mail/libspf2/patches/patch-configure +++ b/mail/libspf2/patches/patch-configure @@ -1,15 +1,15 @@ -$NetBSD: patch-configure,v 1.1 2013/02/22 11:48:16 jperkin Exp $ +$NetBSD: patch-configure,v 1.2 2013/03/04 17:31:56 jperkin Exp $ -Don't decend into libreplace, it is an empty library. +Ensure that libreplace contains at least one symbol. --- configure.orig 2008-11-04 15:32:56.000000000 +0000 +++ configure -@@ -25855,7 +25855,7 @@ done +@@ -25648,7 +25648,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 +-for ac_func in getopt_long_only strncasecmp ++for ac_func in ensure_libreplace_symbol getopt_long_only strncasecmp + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` + { echo "$as_me:$LINENO: checking for $ac_func" >&5 diff --git a/mail/libspf2/patches/patch-src_Makefile.in b/mail/libspf2/patches/patch-src_Makefile.in deleted file mode 100644 index 2458991fc6c..00000000000 --- a/mail/libspf2/patches/patch-src_Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ -$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_libreplace_Makefile.in b/mail/libspf2/patches/patch-src_libreplace_Makefile.in new file mode 100644 index 00000000000..3cf9cb37637 --- /dev/null +++ b/mail/libspf2/patches/patch-src_libreplace_Makefile.in @@ -0,0 +1,22 @@ +$NetBSD: patch-src_libreplace_Makefile.in,v 1.1 2013/03/04 17:31:56 jperkin Exp $ + +Ensure libreplace contains at least one symbol. + +--- src/libreplace/Makefile.in.orig 2008-11-04 15:33:01.000000000 +0000 ++++ src/libreplace/Makefile.in +@@ -60,6 +60,7 @@ am__depfiles_maybe = depfiles + @AMDEP_TRUE@ $(DEPDIR)/__ns_initparse.Plo \ + @AMDEP_TRUE@ $(DEPDIR)/__ns_msg_getflag.Plo \ + @AMDEP_TRUE@ $(DEPDIR)/__ns_name_uncompress.Plo \ ++@AMDEP_TRUE@ $(DEPDIR)/ensure_libreplace_symbol.Plo \ + @AMDEP_TRUE@ $(DEPDIR)/getopt_long_only.Plo \ + @AMDEP_TRUE@ $(DEPDIR)/malloc.Plo $(DEPDIR)/memcmp.Plo \ + @AMDEP_TRUE@ $(DEPDIR)/realloc.Plo $(DEPDIR)/strncasecmp.Plo +@@ -255,6 +256,7 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/__ns_initparse.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/__ns_msg_getflag.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/__ns_name_uncompress.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ensure_libreplace_symbol.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getopt_long_only.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/malloc.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/memcmp.Plo@am__quote@ diff --git a/mail/libspf2/patches/patch-src_libreplace_ensure__libreplace__symbol.c b/mail/libspf2/patches/patch-src_libreplace_ensure__libreplace__symbol.c new file mode 100644 index 00000000000..4ea3bd8ecf8 --- /dev/null +++ b/mail/libspf2/patches/patch-src_libreplace_ensure__libreplace__symbol.c @@ -0,0 +1,8 @@ +$NetBSD: patch-src_libreplace_ensure__libreplace__symbol.c,v 1.1 2013/03/04 17:31:56 jperkin Exp $ + +Ensure that libreplace contains at least one symbol. + +--- /dev/null 2013-03-04 16:59:31.000000000 +0000 ++++ src/libreplace/ensure_libreplace_symbol.c 2013-03-04 16:59:04.796611792 +0000 +@@ -0,0 +1 @@ ++int ensure_libreplace_symbol = 0; diff --git a/mail/libspf2/patches/patch-src_libspf2_Makefile.in b/mail/libspf2/patches/patch-src_libspf2_Makefile.in deleted file mode 100644 index 3c18ff44e6b..00000000000 --- a/mail/libspf2/patches/patch-src_libspf2_Makefile.in +++ /dev/null @@ -1,25 +0,0 @@ -$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 - |