- Update homepage.

- Update built-in sites from Bunyip's canononical list.
- Build with libcompat instead of custom regex.
Patches supplied by Frederick Bruckman in PR pkg/7856.

3 files changed, 90 insertions, 82 deletions

diff --git a/net/archie/Makefile b/net/archie/Makefile
index 3bf05fb385c..f6f5ade6faa 100644
--- a/net/archie/Makefile
+++ b/net/archie/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1998/06/22 12:58:33 agc Exp $
+# $NetBSD: Makefile,v 1.5 1999/07/08 00:38:25 tron Exp $
 # FreeBSD Id: Makefile,v 1.7 1997/07/21 00:04:13 fenner Exp
 #
 
@@ -9,6 +9,7 @@ MASTER_SITES=	ftp://ftp.uni-stuttgart.de/pub/unix/comm/infosystems/archie/
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	packages@netbsd.org
+HOMEPAGE=	http://www.bunyip.com/products/archie/
 
 WRKSRC=		${WRKDIR}/archie-1.4.1-FIX
 
diff --git a/net/archie/patches/patch-aa b/net/archie/patches/patch-aa
index b2b261065e8..c8a3c7655c1 100644
--- a/net/archie/patches/patch-aa
+++ b/net/archie/patches/patch-aa
@@ -1,65 +1,67 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 11:10:35 agc Exp $
+$NetBSD: patch-aa,v 1.3 1999/07/08 00:38:25 tron Exp $
 
-*** Makefile.orig	Fri Oct 21 00:25:31 1994
---- Makefile	Fri Oct 21 00:26:55 1994
-***************
-*** 2,15 ****
-  # Makefile for the minimal build for an archie Prospero client.
-  #
-  # Your C compiler:
-! #CC=cc
-  
-  # For most systems, these OPTIONS will suffice.  Exceptions:
-  #
-  #	* If you're on a Stardent, add  -43
-  #	* If you're running EP/IX, you may need to add  -systype bsd43
-  #	  but try it without it first.
-! OPTIONS= -O -I. -I/usr/netinclude -I/usr/ucbinclude
-  
-  # For this, DEFINES is usually ok as-is.  Try it without any of these
-  # first; if some stuff fails or shows up undefined, then come back and
---- 2,15 ----
-  # Makefile for the minimal build for an archie Prospero client.
-  #
-  # Your C compiler:
-! CC=cc
-  
-  # For most systems, these OPTIONS will suffice.  Exceptions:
-  #
-  #	* If you're on a Stardent, add  -43
-  #	* If you're running EP/IX, you may need to add  -systype bsd43
-  #	  but try it without it first.
-! OPTIONS= -O -I.
-  
-  # For this, DEFINES is usually ok as-is.  Try it without any of these
-  # first; if some stuff fails or shows up undefined, then come back and
-***************
-*** 30,36 ****
-  #     * if your system is lacking strspn(), add               -DSTRSPN
-  #     * if you're using the unbundled SparcCompiler on a
-  #	Solaris 2 system, add				      -DSOLARIS2
-! DEFINES= -DDEBUG
-  
-  # The default Archie server; choose one of:
-  #    archie.ans.net		(USA [NY])
---- 30,36 ----
-  #     * if your system is lacking strspn(), add               -DSTRSPN
-  #     * if you're using the unbundled SparcCompiler on a
-  #	Solaris 2 system, add				      -DSOLARIS2
-! DEFINES= -DDEBUG -DNOREGEX
-  
-  # The default Archie server; choose one of:
-  #    archie.ans.net		(USA [NY])
-***************
-*** 84,89 ****
---- 84,93 ----
-  	vlalloc.o vl_comp.o
-  
-  all: archie
-+ 
-+ install:
-+ 	install -c -s archie  ${PREFIX}/bin/archie
-+ 	install -c archie.man ${PREFIX}/man/man1/archie.1
-  
-  archie: $(OBJS)
-  	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS)
+--- Makefile.orig	Tue Oct 27 00:11:04 1992
++++ Makefile	Thu Jul  8 02:35:35 1999
+@@ -2,14 +2,14 @@
+ # Makefile for the minimal build for an archie Prospero client.
+ #
+ # Your C compiler:
+-#CC=cc
++CC=cc
+ 
+ # For most systems, these OPTIONS will suffice.  Exceptions:
+ #
+ #	* If you're on a Stardent, add  -43
+ #	* If you're running EP/IX, you may need to add  -systype bsd43
+ #	  but try it without it first.
+-OPTIONS= -O -I. -I/usr/netinclude -I/usr/ucbinclude
++OPTIONS= -I.
+ 
+ # For this, DEFINES is usually ok as-is.  Try it without any of these
+ # first; if some stuff fails or shows up undefined, then come back and
+@@ -30,7 +30,7 @@
+ #     * if your system is lacking strspn(), add               -DSTRSPN
+ #     * if you're using the unbundled SparcCompiler on a
+ #	Solaris 2 system, add				      -DSOLARIS2
+-DEFINES= -DDEBUG
++DEFINES= # -DDEBUG -DNOREGEX
+ 
+ # The default Archie server; choose one of:
+ #    archie.ans.net		(USA [NY])
+@@ -46,14 +46,14 @@
+ #
+ # Note this only applies to the command-line client; to change the
+ # default for the Emacs lisp version, set the archie-server variable.
+-ARCHIE= archie.sura.net
++ARCHIE= archie.rutgers.edu
+ 
+ #	Usually LDFLAGS is empty; if, after you build this, archie
+ #	 complains that it can't resolve ARCHIE.ANS.NET (or whatever
+ #	 you defined ARCHIE_HOST as), you need to add `-lresolv'.
+ #
+ #	* If you need the PW library (e.g. A/UX), add -lPW
+-LDFLAGS=
++LDFLAGS= -lcompat
+ # If you're using ISC, use:
+ #LDFLAGS= -linet
+ # If you're using Wallongong TCP/IP on an AT&T box, use:
+@@ -73,7 +73,7 @@
+ # Yer' done....make archie.
+ # =========================
+ #
+-CFLAGS=$(OPTIONS) $(DEFINES) -DARCHIE_HOST=\"$(ARCHIE)\"
++CFLAGS+=$(OPTIONS) $(DEFINES) -DARCHIE_HOST=\"$(ARCHIE)\"
+ 
+ VERSION=1.4.1
+ VMS_VERSION=`echo $(VERSION) | sed -e 's,\\.,_,g'`
+@@ -84,6 +84,10 @@
+ 	vlalloc.o vl_comp.o
+ 
+ all: archie
++
++install:
++	install -c -s archie  ${PREFIX}/bin/archie
++	install -c archie.man ${PREFIX}/man/man1/archie.1
+ 
+ archie: $(OBJS)
+ 	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS)
diff --git a/net/archie/patches/patch-ab b/net/archie/patches/patch-ab
index b11bc7c51b2..4fb97cda2c7 100644
--- a/net/archie/patches/patch-ab
+++ b/net/archie/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 1998/08/07 11:10:35 agc Exp $
+$NetBSD: patch-ab,v 1.3 1999/07/08 00:38:25 tron Exp $
 
 *** archie.h.orig	Fri Oct 21 00:25:42 1994
 --- archie.h	Fri Oct 21 00:26:59 1994
@@ -12,26 +12,31 @@ $NetBSD: patch-ab,v 1.2 1998/08/07 11:10:35 agc Exp $
   #endif
   
   /*
---- 8,30 ----
+--- 8,35 ----
   
   /* You can't touch this.  */
   #ifndef XARCHIE
 ! /* Dated: March 13th, 1996 */
-! # define ARCHIES	"archie.au (Australia)","archie.uni-linz.ac.at (Austria)", \
-! 	"archie.univie.ac.at (Austria)","archie.cs.mcgill.ca (Canada)", \
-! 	"archie.uqam.ca (Canada)","archie.funet.fi (Finland)", \
-! 	"archie.univ-rennes1.fr (France","archie.th-darmstadt.de (Germany)", \
-! 	"archie.ac.il (Israel)","archie.unipi.it (Italy)", \
-! 	"archie.wide.ad.jp (Japan)","archie.hana.nm.kr (Korea)", \
-! 	"archie.sogang.ac.kr (Korea)","archie.uninett.no (Norway)", \
-!	"archie.uct.ac.za (South Africa [CT])", \
-! 	"archie.rediris.es (Spain)","archie.luth.se (Sweden)", \
-! 	"archie.switch.ch (Switzerland)","archie.twnic.net (Taiwan)", \
-! 	"archie.ncu.edu.tw (Taiwan)","archie.doc.ic.ac.uk (United Kingdom)", \
-! 	"archie.hensa.ac.uk (United Kingdom)","archie.unl.edu (USA [NE])", \
-! 	"archie.internic.net (USA [NJ])","archie.rutgers.edu (USA [NJ])", \
-! 	"archie.ans.net (USA [NY])","archie.sura.net (USA [MD])"
-! # define NARCHIES	27
+! # define ARCHIES	"archie.au (Australia)", \
+! 			"archie.univie.ac.at (Austria)", \
+! 			"archie.belnet.be", \
+! 			"archie.bunyip.com", \
+! 			"archie.cs.mcgill.ca (Canada)", \
+! 			"archie.funet.fi (Finland)", \
+! 			"archie.th-darmstadt.de (Germany)", \
+! 			"archie.ac.il (Israel)", \
+! 			"archie.unipi.it (Italy)", \
+! 			"archie.wide.ad.jp (Japan)", \
+! 			"archie.kornet.ac.kr (Korea)", \
+! 			"archie.sogang.ac.kr (Korea)", \
+! 			"archie.icm.edu.pl (Poland)", \
+! 			"archie.rediris.es (Spain)", \
+! 			"archie.switch.ch (Switzerland)", \
+! 			"archie.ncu.edu.tw (Taiwan)", \
+! 			"archie.doc.ic.ac.uk (United Kingdom)", \
+! 			"archie.hensa.ac.uk (United Kingdom)", \
+! 			"archie.rutgers.edu (USA [NJ])"
+! # define NARCHIES	19
 ! 
   #endif