diff options
| -rw-r--r-- | net/ldns/Makefile | 7 | ||||
| -rw-r--r-- | net/ldns/distinfo | 9 | ||||
| -rw-r--r-- | net/ldns/patches/patch-aa | 66 |
3 files changed, 7 insertions, 75 deletions
diff --git a/net/ldns/Makefile b/net/ldns/Makefile index 830b59b0a2c..55005f15ea6 100644 --- a/net/ldns/Makefile +++ b/net/ldns/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.7 2009/08/18 12:48:04 he Exp $ +# $NetBSD: Makefile,v 1.8 2009/12/06 15:29:36 wiz Exp $ -DISTNAME= ldns-1.6.1 +DISTNAME= ldns-1.6.3 CATEGORIES= net MASTER_SITES= http://www.nlnetlabs.nl/downloads/drill/ MASTER_SITES= http://www.nlnetlabs.nl/downloads/ldns/ @@ -19,7 +19,6 @@ CONFIGURE_ARGS+= --enable-sha2 REPLACE_PERL= doc/doxyparse.pl -BUILDLINK_ABI_DEPENDS.openssl+= openssl>=0.9.7 - +BUILDLINK_ABI_DEPENDS.openssl+= openssl>=0.9.8 .include "../../security/openssl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/ldns/distinfo b/net/ldns/distinfo index e7711a98d01..b22ab689319 100644 --- a/net/ldns/distinfo +++ b/net/ldns/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.4 2009/08/18 12:48:04 he Exp $ +$NetBSD: distinfo,v 1.5 2009/12/06 15:29:36 wiz Exp $ -SHA1 (ldns-1.6.1.tar.gz) = 625ad56970ebf91ae91af2fbb92b048164717df1 -RMD160 (ldns-1.6.1.tar.gz) = c477c76308b56bd18920ea0deeac286857c93e22 -Size (ldns-1.6.1.tar.gz) = 830714 bytes -SHA1 (patch-aa) = 3ab3597bf5d922e7727f5a35dc0e3baf1f55f00c +SHA1 (ldns-1.6.3.tar.gz) = 87ce9cc8e4bf82f6d8668c915a08dfba20dd1b7c +RMD160 (ldns-1.6.3.tar.gz) = 83c314455f286d698d2d8017dc9b1c841fad0823 +Size (ldns-1.6.3.tar.gz) = 832093 bytes diff --git a/net/ldns/patches/patch-aa b/net/ldns/patches/patch-aa deleted file mode 100644 index ee562e12dfc..00000000000 --- a/net/ldns/patches/patch-aa +++ /dev/null @@ -1,66 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2009/08/18 12:48:04 he Exp $ - -Install man-pages using ${INSTALL} specifying the correct mode -instead of cp -Rp. -...and do "install-sh -c" instead of "install-sh", which ends up -moving the include files instead of copying them... - ---- Makefile.in.orig 2009-08-06 14:44:16.000000000 +0200 -+++ Makefile.in -@@ -87,7 +87,7 @@ LINK_LIB = $(LIBTOOL) --mode=link $(CC) - .PHONY: install uninstall install-doc uninstall-doc - .PHONY: install-h uninstall-h install-lib uninstall-lib - --all: copy-headers lib linktest -+all: copy-headers lib linktest manpages - - linktest: $(srcdir)/linktest.c $(LIBDNS_HEADERS) ldns/util.h ldns/config.h libldns.la - $(LIBTOOL) --mode=link $(CC) $(srcdir)/linktest.c $(CPPFLAGS) $(CFLAGS) -lldns $(LIBS) -o linktest -@@ -107,7 +107,7 @@ libldns.la-export-all: $(LIBDNS_OBJECTS) - $(addprefix include/ldns/, $(notdir $(LIBDNS_HEADERS))): include/ldns/%.h: $(srcdir)/ldns/%.h - @if [ ! -d include ] ; then ($(INSTALL) -d include || echo "include exists") ; fi ; - @if [ ! -d include/ldns ] ; then (cd include; ln -s ../ldns ./ldns || echo "include/ldns exists") ; fi ; -- $(INSTALL) -m 644 $< ./include/ldns/ -+ $(INSTALL) -c -m 644 $< ./include/ldns/ - - copy-headers: $(addprefix include/ldns/, $(notdir $(LIBDNS_HEADERS))) - -@@ -119,7 +119,7 @@ doxygen: manpages - ifdef doxygen - # if we are not in base we need to copy some html files too - if [ ! -e doc/header.html ] ; then \ -- $(INSTALL) -m 644 $(srcdir)/doc/header.html doc/ ; \ -+ $(INSTALL) -c -m 644 $(srcdir)/doc/header.html doc/ ; \ - fi ; - $(doxygen) $(srcdir)/libdns.doxygen - endif -@@ -138,12 +138,14 @@ destclean: uninstall - install-config: - if [ $(INSTALL_LDNS_CONFIG) = "yes" ] ; then \ - $(INSTALL) -d $(DESTDIR)$(bindir); \ -- $(INSTALL) -m 755 packaging/ldns-config $(DESTDIR)$(bindir)/; \ -+ $(INSTALL) -c -m 755 packaging/ldns-config $(DESTDIR)$(bindir)/; \ - fi - - install-manpages: manpages - ${INSTALL} -d $(DESTDIR)$(mandir)/man3 -- cp -Rp doc/man/man3/* $(DESTDIR)$(mandir)/man3/ -+ for f in doc/man/man3/*; do \ -+ ${INSTALL} -c -m 444 $$f $(DESTDIR)$(mandir)/man3/; \ -+ done - - uninstall-manpages: - for i in `cat doc/ldns_manpages`; do \ -@@ -153,9 +155,9 @@ uninstall-manpages: - install-h: lib - $(INSTALL) -m 755 -d $(DESTDIR)$(includedir)/ldns - for i in $(LIBDNS_HEADERS); do \ -- $(INSTALL) -m 644 $$i $(DESTDIR)$(includedir)/ldns/; done -- $(INSTALL) -m 644 include/ldns/util.h $(DESTDIR)$(includedir)/ldns/ -- $(INSTALL) -m 644 include/ldns/net.h $(DESTDIR)$(includedir)/ldns/ -+ $(INSTALL) -c -m 644 $$i $(DESTDIR)$(includedir)/ldns/; done -+ $(INSTALL) -c -m 644 include/ldns/util.h $(DESTDIR)$(includedir)/ldns/ -+ $(INSTALL) -c -m 644 include/ldns/net.h $(DESTDIR)$(includedir)/ldns/ - - uninstall-h: - for i in $(LIBDNS_HEADERS); do \ |