7 files changed, 46 insertions, 29 deletions

diff --git a/dns/adns/Makefile b/dns/adns/Makefile
index 5dceb5753eca..da428dae8563 100644
--- a/dns/adns/Makefile
+++ b/dns/adns/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	adns
-PORTVERSION=	1.1
+PORTVERSION=	1.2
 CATEGORIES=	dns
-MASTER_SITES=	ftp://ftp.chiark.greenend.org.uk/users/ian/adns/
-MASTER_SITE_SUBDIR=	adns
+MASTER_SITES=	ftp://ftp.chiark.greenend.org.uk/users/ian/adns/ \
+		http://www.chiark.greenend.org.uk/~ian/adns/ftp/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Easy to use, asynchronous-capable DNS client library and utilities
@@ -18,11 +18,16 @@ GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
 
-LIBVERSION=	1
+LIBVERSION=	12
 PLIST_SUB+=	LIBVERSION="${LIBVERSION}"
 
+DOCS=		COPYING GPL-vs-LGPL INSTALL LICENCE.WAIVERS README README.html TODO changelog
+
 post-install:
-	@${LN} -sf libadns.so.${LIBVERSION} ${PREFIX}/lib/libadns.so
 	${STRIP_CMD} ${PREFIX}/bin/adnslogres ${PREFIX}/bin/adnshost
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>
diff --git a/dns/adns/distinfo b/dns/adns/distinfo
index db96b91fd5ec..ee9a64918cc8 100644
--- a/dns/adns/distinfo
+++ b/dns/adns/distinfo
@@ -1,3 +1,3 @@
-MD5 (adns-1.1.tar.gz) = 891956e305acf5fc83b099333bf3ffd9
-SHA256 (adns-1.1.tar.gz) = 7697ba4deeea454b896cc8dc2fe06f9e3e5518209f2051025e5b1f064a64f40a
-SIZE (adns-1.1.tar.gz) = 211455
+MD5 (adns-1.2.tar.gz) = 4d9ad052125ddd295ee75ea608b992b7
+SHA256 (adns-1.2.tar.gz) = 22423c608fbbfe0335883ae23e8e2b44f65ed1b024b1ce00e926136c3e1cc04a
+SIZE (adns-1.2.tar.gz) = 251919
diff --git a/dns/adns/files/patch-aa b/dns/adns/files/patch-configure
index 5dbb8a59cec4..2b4bfdac9c7f 100644
--- a/dns/adns/files/patch-aa
+++ b/dns/adns/files/patch-configure
@@ -1,11 +1,11 @@
---- configure.orig	Wed Nov 24 19:57:32 1999
-+++ configure	Mon Mar 20 18:35:47 2000
-@@ -1457,7 +1457,7 @@
+--- configure.orig	Thu Apr 20 13:27:46 2006
++++ configure	Thu Apr 20 13:27:51 2006
+@@ -1728,7 +1728,7 @@
  
  SHLIBFORLINK='libadns.so'
  SHLIBSONAME='$(SHLIBFORLINK).$(MAJOR)'
 -SHLIBFILE='$(SHLIBSONAME).$(MINOR)'
-+SHLIBFILE='$(SHLIBSONAME)'
++SHLIBFILE='$(SHLIBSONAME)$(MINOR)'
  
  SHLIBCC='$(CC) $(CFLAGS) -fpic'
  MKSHLIB_1='$(CC) $(LDFLAGS) -shared -Wl,-soname=$(SHLIBSONAME) -o'
diff --git a/dns/adns/files/patch-configure.in b/dns/adns/files/patch-configure.in
new file mode 100644
index 000000000000..9e0b4ab7d960
--- /dev/null
+++ b/dns/adns/files/patch-configure.in
@@ -0,0 +1,11 @@
+--- configure.in.orig	Thu Apr 20 12:46:10 2006
++++ configure.in	Thu Apr 20 12:56:21 2006
+@@ -140,7 +140,7 @@
+ 
+ SHLIBFORLINK='libadns.so'
+ SHLIBSONAME='$(SHLIBFORLINK).$(MAJOR)'
+-SHLIBFILE='$(SHLIBSONAME).$(MINOR)'
++SHLIBFILE='$(SHLIBSONAME)$(MINOR)'
+ 
+ SHLIBCC='$(CC) $(CFLAGS) -fpic'
+ MKSHLIB_1='$(CC) $(LDFLAGS) -shared -Wl,-soname=$(SHLIBSONAME) -o'
diff --git a/dns/adns/files/patch-ab b/dns/adns/files/patch-dynamic::Makefile.in
index fbda698f88cc..069373fb6bfb 100644
--- a/dns/adns/files/patch-ab
+++ b/dns/adns/files/patch-dynamic::Makefile.in
@@ -1,6 +1,6 @@
---- dynamic/Makefile.in.orig	Fri Oct 15 21:57:50 1999
-+++ dynamic/Makefile.in	Mon Mar 20 18:41:21 2000
-@@ -24,7 +24,7 @@
+--- dynamic/Makefile.in.orig	Thu Apr 20 13:15:27 2006
++++ dynamic/Makefile.in	Thu Apr 20 13:17:43 2006
+@@ -23,7 +23,7 @@
  srcdir=		@srcdir@
  VPATH=		@srcdir@
  
@@ -9,11 +9,13 @@
  include		$(srcdir)/../settings.make
  include		$(srcdir)/../src/adns.make
  
-@@ -32,16 +32,12 @@
- 
+@@ -32,17 +32,13 @@
  install:
+ 		mkdir -p $(lib_dir)
  		$(INSTALL_PROGRAM) $(SHLIBFILE) $(lib_dir)/$(SHLIBFILE)
 -		ln -sf $(SHLIBFILE) $(lib_dir)/$(SHLIBSONAME)
+-		ln -sf $(SHLIBSONAME) $(lib_dir)/$(SHLIBFORLINK)
++		ln -sf $(SHLIBFILE) $(lib_dir)/$(SHLIBFORLINK)
  
  uninstall:
 -		rm -f $(lib_dir)/$(SHLIBFILE) $(lib_dir)/$(SHLIBSONAME)
diff --git a/dns/adns/files/patch-src-parse.c b/dns/adns/files/patch-src-parse.c
deleted file mode 100644
index daa34c47b0d7..000000000000
--- a/dns/adns/files/patch-src-parse.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/parse.c.orig	Tue Jan 18 22:48:32 2005
-+++ src/parse.c	Tue Jan 18 22:48:56 2005
-@@ -113,7 +113,7 @@
- }
- 
- adns_status adns__parse_domain(adns_state ads, int serv, adns_query qu,
--			       vbuf *vb, adns_queryflags flags,
-+			       vbuf *vb, parsedomain_flags flags,
- 			       const byte *dgram, int dglen, int *cbyte_io,
- 			       int max) {
-   findlabel_state fls;
diff --git a/dns/adns/pkg-plist b/dns/adns/pkg-plist
index 8aae847ffe2c..3c100538098d 100644
--- a/dns/adns/pkg-plist
+++ b/dns/adns/pkg-plist
@@ -1,7 +1,17 @@
-bin/adnslogres
+bin/adnsheloex
 bin/adnshost
+bin/adnslogres
 bin/adnsresfilter
 include/adns.h
 lib/libadns.a
 lib/libadns.so
 lib/libadns.so.%%LIBVERSION%%
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/GPL-vs-LGPL
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/LICENCE.WAIVERS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.html
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/changelog
+%%PORTDOCS%%@dirrm %%DOCSDIR%%