Update to version 1.5.

PR:		12848
Submitted by:	maintainer

4 files changed, 27 insertions, 101 deletions

diff --git a/dns/dnsutl/Makefile b/dns/dnsutl/Makefile
index 47c2aadd6328..1b12bb0a4d46 100644
--- a/dns/dnsutl/Makefile
+++ b/dns/dnsutl/Makefile
@@ -1,29 +1,28 @@
 # Ports collection makefile for:  dnsutl
-# Version required:     	  1.3
+# Version required:     	  1.5
 # Date created:			  Nov 05, 1998
 # Whom:				  Karl Dietz (Karl.Dietz@triplan.com)
 #
-# $Id: Makefile,v 1.4 1998/08/20 22:06:00 obrien Exp $
+# $Id: Makefile,v 1.1.1.1 1998/12/01 11:59:36 obrien Exp $
 #
 
-DISTNAME=	dnsutl.1.3
-PKGNAME=	dnsutl-1.3
+DISTNAME=	dnsutl-1.5
 CATEGORIES=	net
-MASTER_SITES=	http://www.tip.net.au/~millerp/  \
-				http://gd.tuwien.ac.at/softeng/Aegis/
+MASTER_SITES=	http://www.canb.auug.org.au/~millerp/dnsutl/ \
+		http://www.tip.net.au/~millerp/dnsutl/  \
+		http://gd.tuwien.ac.at/softeng/Aegis/dnsutl/ \
+		ftp://ftp.agso.gov.au/pub/Aegis/dnsutl/
 
 MAINTAINER=	Karl.Dietz@triplan.com
 
-HAS_CONFIGURE=	yes
-CONFIGURE_PARAM=	--prefix=${PREFIX}
-CONFIGURE_ENV=	LIBS=-lcompat
+GNU_CONFIGURE=	yes
 ALL_TARGET=	all sure
 INSTALL_TARGET=	install-bin
 
-MAN1=		dns-bootp.1 dns-ethers.1 dns-hosts.1 dns-rev.1 \
-		dns-bootprms.1 dns-filter.1 dns-ng.1
-
-post-install:
-	cd ${WRKSRC}/man1 ; ${INSTALL_MAN} ${MAN1} ${PREFIX}/man/man1
+# the manpages do need a patched GNU groff 1.11a (use -I for include path)
+#INSTALL_TAGERT+= install-man
+#MAN1=		dns-bootp.1 dns-bootparams.1 dns-ethers-import.1 \
+#		dns-ethers.1 dns-filter.1 dns-hosts-import.1 \
+#		dns-hosts.1 dns-license.1 dns-ng.1 dns-rev.1
 
 .include <bsd.port.mk>
diff --git a/dns/dnsutl/distinfo b/dns/dnsutl/distinfo
index 277de39e576e..31eaf42e8cb8 100644
--- a/dns/dnsutl/distinfo
+++ b/dns/dnsutl/distinfo
@@ -1 +1 @@
-MD5 (dnsutl.1.3.tar.gz) = cb4f366221517a3fdfe7584f0c568d37
+MD5 (dnsutl-1.5.tar.gz) = 732e58e1737519c2581dc192bd31f118
diff --git a/dns/dnsutl/files/patch-aa b/dns/dnsutl/files/patch-aa
index 38471ee24ee7..125df082fe6a 100644
--- a/dns/dnsutl/files/patch-aa
+++ b/dns/dnsutl/files/patch-aa
@@ -1,91 +1,16 @@
-*** Makefile.in.orig	Thu Nov 12 10:57:05 1998
---- Makefile.in	Thu Nov 12 11:10:12 1998
+*** Makefile.in.orig	Mon Jul 26 03:49:50 1999
+--- Makefile.in	Mon Jul 26 03:50:20 1999
 ***************
-*** 99,105 ****
-  # You should not need to alter anything below this point.
-  #------------------------------------------------------------
+*** 124,129 ****
+--- 124,134 ----
+  LIBEXT = a
   
-! all: bin/dns-hosts bin/dns-ng bin/dns-rev
-  
-  common/ansi.o: common/ansi.c common/ac/stddef.h common/config.h \
-  		common/ac/stdlib.h common/ac/string.h common/main.h 
---- 99,106 ----
+  #
++ #
++ #
++ SOELIM = @SOELIM@
++ 
++ #
   # You should not need to alter anything below this point.
   #------------------------------------------------------------
   
-! all: bin/dns-bootp bin/dns-bootparams bin/dns-ethers bin/dns-filter \
-! 	bin/dns-hosts bin/dns-ng bin/dns-rev
-  
-  common/ansi.o: common/ansi.c common/ac/stddef.h common/config.h \
-  		common/ac/stdlib.h common/ac/string.h common/main.h 
-***************
-*** 584,589 ****
---- 585,622 ----
-  	-mkdir bin
-  	@touch .bin
-  
-+ dns_bootp_files = dns-bootp/main.o dns-bootp/filter.o
-+ 
-+ bin/dns-bootp: $(dns_bootp_files) common/lib.a .bin
-+ 	$(CC) $(LDFLAGS) -o bin/dns-bootp $(dns_bootp_files) common/lib.a $(LIBS)
-+ 
-+ $(bindir)/dns-bootp: bin/dns-bootp
-+ 	$(INSTALL_PROGRAM) bin/dns-bootp $(bindir)/dns-bootp
-+ 
-+ dns_bootparams_files = dns-bootparams/main.o dns-bootparams/filter.o
-+ 
-+ bin/dns-bootparams: $(dns_bootparams_files) common/lib.a .bin
-+ 	$(CC) $(LDFLAGS) -o bin/dns-bootparams $(dns_bootparams_files) common/lib.a $(LIBS)
-+ 
-+ $(bindir)/dns-bootparams: bin/dns-bootparams
-+ 	$(INSTALL_PROGRAM) bin/dns-bootparams $(bindir)/dns-bootparams
-+ 
-+ dns_ethers_files = dns-ethers/main.o dns-ethers/ethers.o
-+ 
-+ bin/dns-ethers: $(dns_ethers_files) common/lib.a .bin
-+ 	$(CC) $(LDFLAGS) -o bin/dns-ethers $(dns_ethers_files) common/lib.a $(LIBS)
-+ 
-+ $(bindir)/dns-ethers: bin/dns-ethers
-+ 	$(INSTALL_PROGRAM) bin/dns-ethers $(bindir)/dns-ethers
-+ 
-+ dns_filter_files = dns-filter/main.o dns-filter/filter.o
-+ 
-+ bin/dns-filter: $(dns_filter_files) common/lib.a .bin
-+ 	$(CC) $(LDFLAGS) -o bin/dns-filter $(dns_filter_files) common/lib.a $(LIBS)
-+ 
-+ $(bindir)/dns-filter: bin/dns-filter
-+ 	$(INSTALL_PROGRAM) bin/dns-filter $(bindir)/dns-filter
-+ 
-  dns_hosts_files = dns-hosts/hosts.o dns-hosts/main.o
-  
-  bin/dns-hosts: $(dns_hosts_files) common/lib.a .bin
-***************
-*** 609,614 ****
---- 642,649 ----
-  $(bindir)/dns-rev: bin/dns-rev
-  	$(INSTALL_PROGRAM) bin/dns-rev $(bindir)/dns-rev
-  
-+ 
-+ 
-  Txt2cObj = common/ansi.o common/arglex.o common/error.o common/mem.o \
-  		txt2c/main.o txt2c/txt2c.o 
-  
-***************
-*** 651,657 ****
-  distclean: clean
-  	rm -f Makefile common/config.h config.status
-  
-! install-bin: $(bindir)/dns-hosts $(bindir)/dns-ng $(bindir)/dns-rev
-  
-  install-man: $(mandir)/man1/dns-bootp.1 $(mandir)/man1/dns-bootprms.1 \
-  		$(mandir)/man1/dns-ethers.1 $(mandir)/man1/dns-filter.1 \
---- 686,694 ----
-  distclean: clean
-  	rm -f Makefile common/config.h config.status
-  
-! install-bin: $(bindir)/dns-hosts $(bindir)/dns-ng $(bindir)/dns-rev \
-! 		$(bindir)/dns-ethers $(bindir)/dns-bootp \
-! 		$(bindir)/dns-bootparams $(bindir)/dns-filter
-  
-  install-man: $(mandir)/man1/dns-bootp.1 $(mandir)/man1/dns-bootprms.1 \
-  		$(mandir)/man1/dns-ethers.1 $(mandir)/man1/dns-filter.1 \
diff --git a/dns/dnsutl/pkg-plist b/dns/dnsutl/pkg-plist
index 3b36231530ba..f29fb37b521d 100644
--- a/dns/dnsutl/pkg-plist
+++ b/dns/dnsutl/pkg-plist
@@ -1,7 +1,9 @@
 bin/dns-bootp
 bin/dns-bootparams
+bin/dns-ethers-import
 bin/dns-ethers
 bin/dns-filter
+bin/dns-hosts-import
 bin/dns-hosts
 bin/dns-ng
 bin/dns-rev