Remove obsolete packages, per discussion on tech-pkg.

110 files changed, 2 insertions, 2655 deletions

diff --git a/misc/Makefile b/misc/Makefile
index 90611c1db99..d52b48ceb42 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.200 2004/05/13 08:33:30 mjl Exp $
+# $NetBSD: Makefile,v 1.201 2004/06/01 21:46:36 kristerw Exp $
 #
 
 COMMENT=	Miscellaneous utilities
@@ -39,8 +39,6 @@ SUBDIR+=	dialog
 SUBDIR+=	dirdiff
 SUBDIR+=	dnetc
 SUBDIR+=	dotfile
-SUBDIR+=	drwright
-SUBDIR+=	dsbr100
 SUBDIR+=	dt
 SUBDIR+=	dvorakng
 SUBDIR+=	dync
diff --git a/misc/drwright/DESCR b/misc/drwright/DESCR
deleted file mode 100644
index bb7e1b8481e..00000000000
--- a/misc/drwright/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-DrWright is a program that reminds you to take regular breaks from your
-computer.  Its main focus is being usable and to simply work.
-
-DrWright monitors keyboard and mouse activity and displays a small meter
-in the notification area on your panel.  When it starts blinking, you know
-it's time to take a break.  If you don't, it will lock your screen to
-force a break.
diff --git a/misc/drwright/Makefile b/misc/drwright/Makefile
deleted file mode 100644
index 735d322945c..00000000000
--- a/misc/drwright/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2004/04/14 16:15:25 jmmv Exp $
-#
-
-DISTNAME=		drwright-0.17
-PKGREVISION=		2
-CATEGORIES=		misc gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/drwright/0.17/}
-EXTRACT_SUFX=		.tar.bz2
-
-MAINTAINER=		benedikt.meurer@unix-ag.uni-siegen.de
-HOMEPAGE=		http://www.imendio.com/projects/drwright/
-COMMENT=		Computer break reminder
-
-BUILD_USES_MSGFMT=	yes
-
-GNU_CONFIGURE=		yes
-USE_BUILDLINK3=		yes
-USE_DIRS+=		gnome2-1.5
-USE_GNU_TOOLS+=		make
-USE_LIBTOOL=		yes
-USE_PERL5=		yes
-USE_PKGLOCALEDIR=	yes
-
-GCONF2_SCHEMAS=		drwright.schemas
-
-.include "../../devel/GConf2/schemas.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkgconfig/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/misc/drwright/PLIST b/misc/drwright/PLIST
deleted file mode 100644
index d56d828d6f6..00000000000
--- a/misc/drwright/PLIST
+++ /dev/null
@@ -1,34 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/02/24 17:05:33 jmmv Exp $
-bin/drwright
-share/applications/drwright.desktop
-share/drwright/bar-disabled.png
-share/drwright/bar-green.png
-share/drwright/bar-red.png
-share/drwright/bar.png
-share/drwright/drw-preferences.glade
-share/drwright/ocean-stripes.png
-share/drwright/stop.png
-share/gconf/schemas/drwright.schemas
-${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/drwright.mo
-${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/drwright.mo
-${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/drwright.mo
-${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/drwright.mo
-${PKGLOCALEDIR}/locale/da/LC_MESSAGES/drwright.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/drwright.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/drwright.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/drwright.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/drwright.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/drwright.mo
-${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/drwright.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/drwright.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/drwright.mo
-${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/drwright.mo
-${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/drwright.mo
-${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/drwright.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/drwright.mo
-${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/drwright.mo
-${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/drwright.mo
-${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/drwright.mo
-@comment in GConf2: @dirrm share/gconf/schemas
-@dirrm share/drwright
-@comment in gnome2-dirs: @dirrm share/applications
diff --git a/misc/drwright/distinfo b/misc/drwright/distinfo
deleted file mode 100644
index f377beace75..00000000000
--- a/misc/drwright/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/02/24 17:05:33 jmmv Exp $
-
-SHA1 (drwright-0.17.tar.bz2) = dbf75a2adc97fe1ae615a2889420d20ffe4ec2ff
-Size (drwright-0.17.tar.bz2) = 261762 bytes
-SHA1 (patch-aa) = ea2c1ed9bd0d8d6a9c9cd8cfde1d53e16e70a7b3
-SHA1 (patch-ab) = 85bbd95a12528910f9c02f7fa99193e778c8bee0
diff --git a/misc/drwright/patches/patch-aa b/misc/drwright/patches/patch-aa
deleted file mode 100644
index 73a6d3a2f47..00000000000
--- a/misc/drwright/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/02/24 17:05:33 jmmv Exp $
-
-http://bugzilla.gnome.org/show_bug.cgi?id=135300
-
---- src/drw-monitor.c.orig	Fri Jun 13 19:32:51 2003
-+++ src/drw-monitor.c
-@@ -26,7 +26,6 @@
- #include <math.h>
- #include <unistd.h>
- #include <sys/ioctl.h>
--#include <sys/vt.h>
- #include <fcntl.h>
- #include <stdio.h>
- #include <sys/types.h>
diff --git a/misc/drwright/patches/patch-ab b/misc/drwright/patches/patch-ab
deleted file mode 100644
index 9f8ff1f9c70..00000000000
--- a/misc/drwright/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/02/24 17:05:33 jmmv Exp $
-
---- src/Makefile.in.orig	2003-06-24 01:11:33.000000000 +0200
-+++ src/Makefile.in
-@@ -133,7 +133,7 @@ STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
- 
--INCLUDES =  	@DRWRIGHT_CFLAGS@				-DGLADEDIR=\"$(datadir)/drwright\"		-DIMAGEDIR=\"$(datadir)/drwright\"		-Werror -Wall
-+INCLUDES =  	@DRWRIGHT_CFLAGS@				-DGLADEDIR=\"$(datadir)/drwright\"		-DIMAGEDIR=\"$(datadir)/drwright\"		-Wall
- 
- 
- bin_PROGRAMS = drwright
diff --git a/misc/dsbr100/DESCR b/misc/dsbr100/DESCR
deleted file mode 100644
index b9752a8d070..00000000000
--- a/misc/dsbr100/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Control the D-Link DSB-R100 USB radio.
diff --git a/misc/dsbr100/Makefile b/misc/dsbr100/Makefile
deleted file mode 100644
index 89ee71e7969..00000000000
--- a/misc/dsbr100/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2002/06/06 06:59:31 cjep Exp $
-#
-
-DISTNAME=       dsbr100-0.1
-CATEGORIES=	misc
-MASTER_SITES=   ftp://ftp.augustsson.net/pub/netbsd/
-
-MAINTAINER=	lennart@augustsson.net
-COMMENT=	Control the D-Link DSB-R100 USB radio
-
-ONLY_FOR_PLATFORM=	NetBSD-1.4*-* NetBSD-1.5-* NetBSD-1.5.[1-3]*-* \
-			NetBSD-1.5_*-*
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/misc/dsbr100/PLIST b/misc/dsbr100/PLIST
deleted file mode 100644
index b9158166445..00000000000
--- a/misc/dsbr100/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/11/29 15:20:42 augustss Exp $
-bin/dsbr100
-man/man1/dsbr100.1
-man/cat1/dsbr100.0
diff --git a/misc/dsbr100/distinfo b/misc/dsbr100/distinfo
deleted file mode 100644
index 10d01db4d49..00000000000
--- a/misc/dsbr100/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/11/29 15:20:42 augustss Exp $
-
-SHA1 (dsbr100-0.1.tar.gz) = 029e33aa921a22ce0edd7c2b5c49c80ce75452dc
-Size (dsbr100-0.1.tar.gz) = 3255 bytes
diff --git a/net/Makefile b/net/Makefile
index 39acd3537f5..7473189e8e4 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.472 2004/05/15 21:02:35 itojun Exp $
+# $NetBSD: Makefile,v 1.473 2004/06/01 21:49:08 kristerw Exp $
 #
 
 COMMENT=	Networking tools
@@ -16,7 +16,6 @@ SUBDIR+=	airport2basestationconfig
 SUBDIR+=	airportbasestationconfig
 SUBDIR+=	airportmodemutility
 SUBDIR+=	amule
-SUBDIR+=	archie
 SUBDIR+=	arla
 SUBDIR+=	arpd
 SUBDIR+=	arpwatch
@@ -177,8 +176,6 @@ SUBDIR+=	neat
 SUBDIR+=	nemesis
 SUBDIR+=	net-snmp
 SUBDIR+=	netatalk
-SUBDIR+=	netatalk-asun
-SUBDIR+=	netatalk-umich
 SUBDIR+=	netcat
 SUBDIR+=	netname
 SUBDIR+=	netperf
@@ -375,7 +372,6 @@ SUBDIR+=	wmpload
 SUBDIR+=	wol
 SUBDIR+=	wu-ftpd
 SUBDIR+=	x2vnc
-SUBDIR+=	xarchie
 SUBDIR+=	xipdump
 SUBDIR+=	xmftp
 SUBDIR+=	xnap
diff --git a/net/archie/DESCR b/net/archie/DESCR
deleted file mode 100644
index 2039d7a853d..00000000000
--- a/net/archie/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Archie - a system that will let you check a database containing
-thousands of entries for the files that're available at FTP sites around
-the world.
diff --git a/net/archie/Makefile b/net/archie/Makefile
deleted file mode 100644
index 24f61cf469f..00000000000
--- a/net/archie/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2004/01/20 12:22:18 agc Exp $
-# FreeBSD Id: Makefile,v 1.7 1997/07/21 00:04:13 fenner Exp
-#
-
-DISTNAME=	c-archie-1.4.1-FIXED
-PKGNAME=	archie-1.4.1
-CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.uni-stuttgart.de/pub/unix/comm/infosystems/archie/
-EXTRACT_SUFX=	.tar.Z
-
-MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://www.bunyip.com/products/archie/
-COMMENT=	Prospero client for the archie service
-
-WRKSRC=		${WRKDIR}/archie-1.4.1-FIX
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS:M*BSD}
-LDFLAGS+=	-lcompat
-.elif ${OPSYS} == "SunOS"
-LDFLAGS+=	-lsocket -lnsl
-.endif
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/net/archie/PLIST b/net/archie/PLIST
deleted file mode 100644
index 8af96ddaf3e..00000000000
--- a/net/archie/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:54:48 zuntum Exp $
-bin/archie
-man/man1/archie.1.gz
diff --git a/net/archie/distinfo b/net/archie/distinfo
deleted file mode 100644
index 2ca74cb5f59..00000000000
--- a/net/archie/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.4 2003/09/22 16:27:10 wiz Exp $
-
-SHA1 (c-archie-1.4.1-FIXED.tar.Z) = 9ed8a0f6b7faf561128224bcebc554b50a811dcc
-Size (c-archie-1.4.1-FIXED.tar.Z) = 166623 bytes
-SHA1 (patch-aa) = 1f92eaf7ec418f67a21bfacc1472d4f139226576
-SHA1 (patch-ab) = d64f4b4e67f4544ed42e00c2715cd6a165d4d71b
diff --git a/net/archie/patches/patch-aa b/net/archie/patches/patch-aa
deleted file mode 100644
index 8209785b1ef..00000000000
--- a/net/archie/patches/patch-aa
+++ /dev/null
@@ -1,59 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2003/09/22 16:24:28 wiz Exp $
-
---- Makefile.orig	1992-10-26 23:11:04.000000000 +0000
-+++ Makefile	2003-09-22 16:05:37.399992470 +0100
-@@ -9,7 +9,7 @@
- #	* 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=
- # 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'`
-@@ -85,6 +85,10 @@
- 
- all: archie
- 
-+install:
-+	${BSD_INSTALL_PROGRAM} archie  ${PREFIX}/bin/archie
-+	${BSD_INSTALL_MAN} 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
deleted file mode 100644
index d935f7b481e..00000000000
--- a/net/archie/patches/patch-ab
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2003/09/22 16:27:11 wiz Exp $
-
---- archie.h.orig	Mon Oct 26 23:36:04 1992
-+++ archie.h
-@@ -8,8 +8,28 @@
- 
- /* You can't touch this.  */
- #ifndef XARCHIE
--# define ARCHIES	"archie.ans.net (USA [NY])","archie.rutgers.edu (USA [NJ])","archie.sura.net (USA [MD])","archie.unl.edu (USA [NE])","archie.mcgill.ca (Canada)","archie.funet.fi (Finland/Mainland Europe)","archie.au (Australia)","archie.doc.ic.ac.uk (Great Britain/Ireland)","archie.wide.ad.jp (Japan)","archie.ncu.edu.tw (Taiwan)"
--# define NARCHIES	10
-+/* Dated: March 13th, 1996 */
-+# 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
- 
- /*
diff --git a/net/netatalk-asun/DESCR b/net/netatalk-asun/DESCR
deleted file mode 100644
index f9fb056ca3c..00000000000
--- a/net/netatalk-asun/DESCR
+++ /dev/null
@@ -1,18 +0,0 @@
-netatalk is an implementation of the AppleTalk Protocol Suite for
-Unix systems. The current release contains support for EtherTalk
-Phase I and II, DDP, RTMP, NBP, ZIP, AEP, ATP, PAP, ASP, and AFP.
-
-DDP is in the kernel. atalkd implements RTMP, NBP, ZIP, and AEP.
-It is the AppleTalk equivalent of Unix routed and ifconfig. There
-is also a client-stub library for NBP. ATP and ASP are implemented
-as libraries. papd allows Macs to spool to lpd or a pipe, and pap
-allows Unix machines to print to AppleTalk connected printers. psf
-is a PostScript printer filter for lpd, designed to use pap. psorder
-is a PostScript reverser, called by psf to reverse pages printed
-to face-up stacking printers. afpd provides Macs with an interface
-to the Unix file system. Refer to the appropriate man pages for
-operational information.
-
-This version has been enhanced by Adrian Sun.
-
-This version is out-dated.  See pkgsrc/net/netatalk.
diff --git a/net/netatalk-asun/Makefile b/net/netatalk-asun/Makefile
deleted file mode 100644
index b605bc71379..00000000000
--- a/net/netatalk-asun/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2004/04/25 08:39:50 snj Exp $
-#
-# XXX do not use -- see ../netatalk instead
-
-DISTNAME=	netatalk-1.4b2+asun2.1.3
-PKGNAME=	netatalk-asun-2.1.3
-PKGREVISION=	6
-CATEGORIES=	net print
-MASTER_SITES=	ftp://ftp.cobaltnet.com/pub/users/asun/release/ \
-		ftp://ftp.hanse.de/sites/transit/mirror/ftp.u.washington.edu/public/asun/
-
-MAINTAINER=	abs@NetBSD.org
-HOMEPAGE=	http://sourceforge.net/projects/netatalk/
-COMMENT=	Netatalk appletalk file and print services, enhanced by Adrian Sun
-
-CONFLICTS=	netatalk-[0-9]*
-CONFLICTS+=	netatalk-umich-[0-9]*
-
-USE_BUILDLINK3=		YES
-USE_PKGINSTALL=		YES
-
-MAKE_ENV+=		ETCDIR="${PKG_SYSCONFDIR}"
-MAKE_ENV+=		RCDIR="${PREFIX}/etc/rc.d"
-
-PKG_SYSCONFSUBDIR=	netatalk
-
-RCD_SCRIPTS=		netatalk
-
-post-extract:
-		@${MV} ${WRKSRC}/man/man8/papd.8 ${WRKSRC}/man/man8/papd.tbl
-
-post-build:
-		tbl ${WRKSRC}/man/man8/papd.tbl > ${WRKSRC}/man/man8/papd.8
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/net/netatalk-asun/PLIST b/net/netatalk-asun/PLIST
deleted file mode 100644
index 5926e6d8f37..00000000000
--- a/net/netatalk-asun/PLIST
+++ /dev/null
@@ -1,101 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/04/23 22:07:56 reed Exp $
-bin/adv1tov2
-bin/aecho
-bin/getzones
-bin/hqx2bin
-bin/macbinary
-bin/megatron
-bin/nbplkup
-bin/nbprgstr
-bin/nbpunrgstr
-bin/pap
-bin/papstatus
-bin/psorder
-bin/single2bin
-bin/unbin
-bin/unhex
-bin/unsingle
-include/atalk/adouble.h
-include/atalk/aep.h
-include/atalk/afp.h
-include/atalk/asp.h
-include/atalk/atp.h
-include/atalk/cnid.h
-include/atalk/compat.h
-include/atalk/ddp.h
-include/atalk/dsi.h
-include/atalk/nbp.h
-include/atalk/pap.h
-include/atalk/paths.h
-include/atalk/rtmp.h
-include/atalk/server_child.h
-include/atalk/util.h
-include/atalk/zip.h
-include/netatalk/aarp.h
-include/netatalk/at.h
-include/netatalk/at_var.h
-include/netatalk/ddp.h
-include/netatalk/ddp_var.h
-include/netatalk/endian.h
-include/netatalk/phase2.h
-lib/libatalk.a
-lib/libatalk_p.a
-libexec/afpd
-libexec/atalkd
-libexec/etc2ps
-libexec/papd
-libexec/psa
-libexec/psf
-libexec/psffilters/ifmpap
-libexec/psffilters/ifmpaprev
-libexec/psffilters/ifpap
-libexec/psffilters/ifpaprev
-libexec/psffilters/ifwmpap
-libexec/psffilters/ifwmpaprev
-libexec/psffilters/ifwpap
-libexec/psffilters/ifwpaprev
-libexec/psffilters/ofmpap
-libexec/psffilters/ofpap
-libexec/psffilters/ofwmpap
-libexec/psffilters/ofwpap
-libexec/psffilters/tfmpap
-libexec/psffilters/tfmpaprev
-libexec/psffilters/tfpap
-libexec/psffilters/tfpaprev
-libexec/psffilters/tfwmpap
-libexec/psffilters/tfwmpaprev
-libexec/psffilters/tfwpap
-libexec/psffilters/tfwpaprev
-man/man1/aecho.1
-man/man1/getzones.1
-man/man1/hqx2bin.1
-man/man1/macbinary.1
-man/man1/megatron.1
-man/man1/nbp.1
-man/man1/nbplkup.1
-man/man1/nbprgstr.1
-man/man1/nbpunrgstr.1
-man/man1/pap.1
-man/man1/papstatus.1
-man/man1/psorder.1
-man/man1/single2bin.1
-man/man1/unbin.1
-man/man1/unhex.1
-man/man1/unsingle.1
-man/man3/atalk_aton.3
-man/man3/nbp_name.3
-man/man4/atalk.4
-man/man8/afpd.8
-man/man8/atalkd.8
-man/man8/papd.8
-man/man8/psf.8
-share/examples/netatalk/AppleVolumes.default
-share/examples/netatalk/AppleVolumes.system
-share/examples/netatalk/afpd.conf
-share/examples/netatalk/atalkd.conf
-share/examples/netatalk/netatalk.pamd
-share/examples/netatalk/papd.conf
-share/nls/maccode.437
-share/nls/maccode.850
-share/nls/maccode.iso8859-1
-share/pagecount.ps
diff --git a/net/netatalk-asun/distinfo b/net/netatalk-asun/distinfo
deleted file mode 100644
index 19fa5f246e1..00000000000
--- a/net/netatalk-asun/distinfo
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: distinfo,v 1.7 2004/01/08 12:17:30 agc Exp $
-
-SHA1 (netatalk-1.4b2+asun2.1.3.tar.gz) = 2b6d73125515867eb042bd30cb792ed41aea2013
-Size (netatalk-1.4b2+asun2.1.3.tar.gz) = 338362 bytes
-SHA1 (patch-aa) = 942c380e37f088629436b9d4c1bcc86ffb81a941
-SHA1 (patch-ab) = a4bb99200a77163e32997762d6a1637baca9ab24
-SHA1 (patch-ac) = 9a50b21ebdfce35d8442865523ec02a617c478f8
-SHA1 (patch-ad) = 5327c5ebd3d9c9ba0b6133478d52ca80d174ac8e
-SHA1 (patch-ae) = 14daa628bd90f15f692ec30edb89add1b0c250b3
-SHA1 (patch-af) = 61d24ff3ca4efa628642c0e9e34b2739fd8ada7c
-SHA1 (patch-ag) = e733819d101d288fdca2d8da4aecdf3ae7e8c886
-SHA1 (patch-ah) = 2e3216e7365ac705acabf4bfc11902642311737a
-SHA1 (patch-ai) = 390b336544f1b89d47182d3d6c43c29f4c661f58
-SHA1 (patch-aj) = 96692f5137542e33336e10efe1850df3503a8442
-SHA1 (patch-ak) = 89596ad1d6db1ac46b38126272a2fc233d3499c5
-SHA1 (patch-al) = b5833ce70be3fc9e623891298bb76715718c48e4
-SHA1 (patch-am) = 15b4d7f50b5a67984c5085358f9f7cff22d32857
-SHA1 (patch-an) = 1faa276b9a04dfd145b95f544e25a31817653b4c
-SHA1 (patch-ao) = dcbd8ab03fc931785cfa484061b3d9396f5dabc3
-SHA1 (patch-ap) = 51fa599bfee6f00e7fbd364f16c8994d5200090b
-SHA1 (patch-aq) = dafc32968c5f63902ef7b8199b9f2222de3da199
-SHA1 (patch-ar) = 776b3beb6f9bff1c93696d77a9beccd3fb8af7ab
-SHA1 (patch-as) = 6f2d37115c6b5ee9286c981b41ddcfd08fa474f9
-SHA1 (patch-at) = d49048b9ed984f6fac0cb6de5e87244ccc8f0acb
-SHA1 (patch-au) = 96595d60e3e0cc32c7a5186fb3a26a506652f41b
-SHA1 (patch-av) = 8f2cb57995e1cdcfc1ec53ea71a6d662316c4292
-SHA1 (patch-aw) = 9ea37ae642861f4621e4f382bd0d0f84c577d0d1
-SHA1 (patch-ax) = 30a6b25dd4a089a95a028413d8b3168bd83fc373
-SHA1 (patch-ay) = a454942622e230680592765df5bd25a4c12a80a3
-SHA1 (patch-az) = 6711faf4a67cf1363f0212bbf96850d6eae98ba5
-SHA1 (patch-ba) = c2592ea2149a6aceacc11fdeb941a91d764e9ccf
-SHA1 (patch-bb) = e61121f13f014313485e662a00d3d5f52ab2e82d
-SHA1 (patch-bc) = 4bb0b862193aee287a56075ac3e4904a52dbf940
-SHA1 (patch-bd) = 2ea9141bd31fb0132ae8523b35138c59286ca12d
-SHA1 (patch-be) = 2440763a8c5645e46d14ee7cc106f79297640b0e
-SHA1 (patch-bf) = 80cf807ca119b68fd0870533ccac125c5052a144
-SHA1 (patch-bg) = 199fa7524d8cfab1723ad8faf091f8f5be2b3185
-SHA1 (patch-bh) = 4bec94b6996dfbe2eac3caf0623c5726b342fb0c
-SHA1 (patch-bi) = cb3054b0c92b5bb3efc148f98456af2adfdf0b09
-SHA1 (patch-bj) = 55b9f7e9403685711c92de7643d053b45ae571d5
-SHA1 (patch-bk) = f74a19dda06750042318c4dacaf539c28aab9982
-SHA1 (patch-bl) = 3a3871343a8c9a6734671c4469465cb45a1fc38f
-SHA1 (patch-bm) = 315ef875b2e260a486d400455aa57b167e29e183
-SHA1 (patch-bn) = 450e378e582d8055c244562b3475fc8c067fbea8
-SHA1 (patch-bo) = 5415b61083e5c1ddc1f6d6c4dc2f24c0723d4280
diff --git a/net/netatalk-asun/patches/patch-aa b/net/netatalk-asun/patches/patch-aa
deleted file mode 100644
index e21feaf2988..00000000000
--- a/net/netatalk-asun/patches/patch-aa
+++ /dev/null
@@ -1,66 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2003/07/30 16:32:10 jmmv Exp $
-
---- Makefile.orig	Sun Feb  7 11:15:46 1999
-+++ Makefile
-@@ -1,22 +1,27 @@
- # Root of installation. Subdirectories will be ${DESTDIR}/etc,
- # ${DESTDIR}/bin, and ${DESTDIR}/lib.
--DESTDIR=/usr/local/atalk
-+DESTDIR=${PREFIX}
- 
- # for system-level binaries
--SBINDIR=$(DESTDIR)/etc
-+SBINDIR=$(DESTDIR)/sbin
-+LIBEXECDIR=$(DESTDIR)/libexec
- # for user-level binaries
- BINDIR=$(DESTDIR)/bin
- # for program libraries (*.a)
- LIBDIR=$(DESTDIR)/lib
- # for machine-independent resources (pagecount.ps, etc.)
--RESDIR=$(DESTDIR)/etc
-+RESDIR=$(DESTDIR)/share
- # for configuration files (AppleVolumes.system, etc.)
--ETCDIR=$(DESTDIR)/etc
-+ETCDIR?=/etc/netatalk
-+# for startup script
-+RCDIR?=$(DESTDIR)/etc/rc.d
- # for include files
- INCDIR=$(DESTDIR)/include
- # Root of man pages.  Subdirectories will be
- # ${MANDIR}/man1, ${MANDIR}/man4, and ${MANDIR}/man8.
- MANDIR=$(DESTDIR)/man
-+# for example config files
-+EXAMPLEDIR=$(DESTDIR)/share/examples/netatalk
- 
- #SBINDIR=/usr/sbin
- #BINDIR=/usr/bin
-@@ -32,7 +37,7 @@
- # Location of the DES library and include files. Comment this out if you
- # don't want Randnum Exchange and 2-Way Randnum Exchange as allowable UAMs 
- # for afpd. We expect libdes.a in $DESDIR/lib and des.h in $DESDIR/include.
--DESDIR=/usr/local
-+#DESDIR=/usr/local
- 
- # Location of the tcp wrapper library and include files. Comment this out
- # if you don't want tcp wrapper support. having tcp wrapper support is
-@@ -41,7 +46,7 @@
- 
- # Location of PAM support library and include files. Comment this out
- # if you don't want to enable PAM support
--PAMDIR=/usr
-+#PAMDIR=/usr
- 
-  
- # Location of the AFS and Kerberos libraries and include files.  Uncomment
-@@ -73,9 +78,10 @@
- 	esac; \
- 	echo "Making $@ for $$ARCH..."; \
- 	cd sys/$$ARCH && ${MAKE} ${MFLAGS} \
-+	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
- 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}"\
- 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
--	    DESTDIR="${DESTDIR}" MANDIR="${MANDIR}" \
-+	    RCDIR="${RCDIR}" DESTDIR="${DESTDIR}" MANDIR="${MANDIR}" \
- 	    TCPWRAPDIR="${TCPWRAPDIR}" PAMDIR="${PAMDIR}" DB2DIR="${DB2DIR}" \
- 	    AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" DESDIR="${DESDIR}" $@
- 
diff --git a/net/netatalk-asun/patches/patch-ab b/net/netatalk-asun/patches/patch-ab
deleted file mode 100644
index 42228b40a62..00000000000
--- a/net/netatalk-asun/patches/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2001/05/24 17:00:57 abs Exp $
-
---- bin/Makefile.orig	Wed Dec 30 07:30:33 1998
-+++ bin/Makefile
-@@ -7,6 +7,7 @@
- ${ALL}: FRC
- 	cd $@; ${MAKE} ${MFLAGS} CC="${CC}" \
- 	    ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
-+	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
- 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}"\
- 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
- 	    DESTDIR="${DESTDIR}"
-@@ -24,6 +25,7 @@
- 	for i in ${ALL}; \
- 	    do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \
- 		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
-+		LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
- 	        SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
- 	        ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
- 		DESTDIR="${DESTDIR}" INSTALL="${INSTALL}" install); \
diff --git a/net/netatalk-asun/patches/patch-ac b/net/netatalk-asun/patches/patch-ac
deleted file mode 100644
index d07cd7fb24a..00000000000
--- a/net/netatalk-asun/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2001/05/24 17:00:57 abs Exp $
-
---- config/AppleVolumes.system.orig	Thu Feb  4 07:49:04 1999
-+++ config/AppleVolumes.system
-@@ -26,7 +26,7 @@
- .html	TEXT	MOS!
- .rtf	TEXT	MSWD
- .doc	WDBN	MSWD
--.pdf	CARO	PDF
-+.pdf	PDF	CARO
- 
- # compressed archives
- .bin	BINA	MB2P
diff --git a/net/netatalk-asun/patches/patch-ad b/net/netatalk-asun/patches/patch-ad
deleted file mode 100644
index 005fb8e7539..00000000000
--- a/net/netatalk-asun/patches/patch-ad
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2001/05/24 17:00:57 abs Exp $
-
---- etc/Makefile.orig	Mon Dec  7 21:52:29 1998
-+++ etc/Makefile
-@@ -8,6 +8,7 @@
- ${ALL}: FRC
- 	cd $@; ${MAKE} ${MFLAGS} CC="${CC}" \
- 	    ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
-+	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
- 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
- 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
- 	    DESTDIR="${DESTDIR}" AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" \
-@@ -25,9 +26,11 @@
- install:
- 	-mkdir ${ETCDIR}
- 	-mkdir ${SBINDIR}
-+	-mkdir ${LIBEXECDIR}
- 	for i in ${ALL}; \
- 	    do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \
- 		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
-+		LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
- 	        SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
- 	        ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
- 		DESTDIR="${DESTDIR}" AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" \
diff --git a/net/netatalk-asun/patches/patch-ae b/net/netatalk-asun/patches/patch-ae
deleted file mode 100644
index b43ff215c52..00000000000
--- a/net/netatalk-asun/patches/patch-ae
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-ae,v 1.6 2001/05/24 17:00:57 abs Exp $
-
---- etc/afpd/Makefile.orig	Sat Feb  6 20:02:31 1999
-+++ etc/afpd/Makefile
-@@ -72,6 +72,7 @@
- 	fi; \
- 	${MAKE} ${MFLAGS} CC="${CC}" ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" \
- 	    OPTOPTS="${OPTOPTS}" DESTDIR="${DESTDIR}" DESDIR="${DESDIR}" \
-+	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
- 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
- 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
- 	    PAMDIR="${PAMDIR}" TCPWRAPDIR="${TCPWRAPDIR}" \
-@@ -92,6 +93,7 @@
- ${SUBDIRS}: FRC
- 	cd $@; ${MAKE} ${MFLAGS} CC="${CC}" DEFS="${DEFS}" \
- 	    OPTOPTS="${OPTOPTS}" DESTDIR="${DESTDIR}" DESDIR="${DESDIR}" \
-+	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
- 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
- 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}"
- 
-@@ -119,17 +121,19 @@
- 	for i in ${SUBDIRS}; \
- 	do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \
- 		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
-+		LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
- 	        SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
- 	        ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
- 		DESTDIR="${DESTDIR}" INSTALL="${INSTALL}" \
- 		install); \
- 	done
--	${INSTALL} -c afpd ${SBINDIR}
-+	${INSTALL} -c afpd ${LIBEXECDIR}
- 
- clean :
- 	for i in ${SUBDIRS}; \
- 	do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \
- 		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
-+		LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
- 	        SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
- 	        ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
- 		DESTDIR="${DESTDIR}" INSTALL="${INSTALL}" \
diff --git a/net/netatalk-asun/patches/patch-af b/net/netatalk-asun/patches/patch-af
deleted file mode 100644
index 6657192cce0..00000000000
--- a/net/netatalk-asun/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.5 2001/05/24 17:00:58 abs Exp $
-
---- etc/afpd/nls/Makefile.orig	Sat Dec 12 11:01:06 1998
-+++ etc/afpd/nls/Makefile
-@@ -14,7 +14,7 @@
- 
- install: 
- 	-mkdir ${RESDIR}/nls
--	${INSTALL} -m 644 maccode.* ${RESDIR}/nls
-+	${INSTALL} -c -m 644 maccode.* ${RESDIR}/nls
- 
- clean:
- 	rm -f *.o
diff --git a/net/netatalk-asun/patches/patch-ag b/net/netatalk-asun/patches/patch-ag
deleted file mode 100644
index 33f4ebea7e0..00000000000
--- a/net/netatalk-asun/patches/patch-ag
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ag,v 1.5 2001/05/24 17:00:58 abs Exp $
-
---- etc/afpd/status.c.orig	Wed Dec 16 18:38:38 1998
-+++ etc/afpd/status.c
-@@ -52,7 +52,8 @@
- static int status_server(char *data, const char *server)
- {
-     struct afp_status	*status;
--    char                *Obj, *Type, *Zone;
-+    const char          *Obj;
-+    char                *Type, *Zone;
-     int			len;
- 
-     status = (struct afp_status *) data;
diff --git a/net/netatalk-asun/patches/patch-ah b/net/netatalk-asun/patches/patch-ah
deleted file mode 100644
index 21067173989..00000000000
--- a/net/netatalk-asun/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.5 2001/05/24 17:00:58 abs Exp $
-
---- etc/atalkd/Makefile.orig	Wed Jul  9 20:51:55 1997
-+++ etc/atalkd/Makefile
-@@ -23,7 +23,7 @@
- 	    ${CPPFLAGS} -c config.c
- 
- install : all
--	${INSTALL} -c atalkd ${SBINDIR}
-+	${INSTALL} -c atalkd ${LIBEXECDIR}
- 
- clean :
- 	rm -f a.out core* *.o *.bak *[Ee]rrs tags
diff --git a/net/netatalk-asun/patches/patch-ai b/net/netatalk-asun/patches/patch-ai
deleted file mode 100644
index 9d09fe90239..00000000000
--- a/net/netatalk-asun/patches/patch-ai
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ai,v 1.5 2001/05/24 17:00:58 abs Exp $
-
---- etc/atalkd/main.c.orig	Mon Jan 25 09:21:13 1999
-+++ etc/atalkd/main.c
-@@ -245,12 +245,12 @@
- 		    syslog( LOG_INFO, "config for no router" );
- 		      
- 		    if ( iface->i_flags & IFACE_PHASE2 ) {
--			iface->i_rt->rt_firstnet = 0;
-+			iface->i_rt->rt_firstnet = htons( 1 );
- 			iface->i_rt->rt_lastnet = htons( STARTUP_LASTNET );
- 			setaddr( iface, IFACE_PHASE2,
- 				iface->i_addr.sat_addr.s_net,
- 				iface->i_addr.sat_addr.s_node,
--				0, htons( STARTUP_LASTNET ));
-+				htons( 1 ), htons( STARTUP_LASTNET ));
- 		    }
- 		    if ( looproute( iface, RTMP_ADD ) ) { /* -1 or 1 */
- 			syslog( LOG_ERR,
diff --git a/net/netatalk-asun/patches/patch-aj b/net/netatalk-asun/patches/patch-aj
deleted file mode 100644
index 344878a1dee..00000000000
--- a/net/netatalk-asun/patches/patch-aj
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-aj,v 1.6 2001/05/24 17:00:58 abs Exp $
-
---- etc/atalkd/nbp.c.orig	Sun Dec 13 05:22:42 1998
-+++ etc/atalkd/nbp.c
-@@ -110,7 +110,7 @@
-     nn.nn_sat.sat_port = nt.nt_port;
- 
-     /* object */
--    if ( data >= end || ( *data < 0 || *data > 32 ) || data + *data > end ) {
-+    if ( data >= end || (*(unsigned char *)data > 32 ) || data + *data > end ) {
- 	syslog( LOG_INFO, "nbp_packet: malformed packet" );
- 	return 1;
-     }
-@@ -119,7 +119,7 @@
-     data += nn.nn_objlen;
- 
-     /* type */
--    if ( data >= end || ( *data < 0 || *data > 32 ) || data + *data > end ) {
-+    if ( data >= end || (*(unsigned char *)data > 32 ) || data + *data > end ) {
- 	syslog( LOG_INFO, "nbp_packet: malformed packet" );
- 	return 1;
-     }
-@@ -128,7 +128,7 @@
-     data += nn.nn_typelen;
- 
-     /* zone */
--    if ( data >= end || ( *data < 0 || *data > 32 ) || data + *data > end ) {
-+    if ( data >= end || (*(unsigned char *)data > 32 ) || data + *data > end ) {
- 	syslog( LOG_INFO, "nbp_packet: malformed packet" );
- 	return 1;
-     }
diff --git a/net/netatalk-asun/patches/patch-ak b/net/netatalk-asun/patches/patch-ak
deleted file mode 100644
index 1b4df9dac5a..00000000000
--- a/net/netatalk-asun/patches/patch-ak
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ak,v 1.5 2001/05/24 17:00:58 abs Exp $
-
---- etc/atalkd/route.c.orig	Tue May 20 18:35:42 1997
-+++ etc/atalkd/route.c
-@@ -34,7 +34,8 @@
-     u_char	sam_family;
-     u_short	sam_pad;
-     u_short	sam_mask;
--} mask = { sizeof( struct sockaddr_m ), 0, 0, 0xffff };
-+    u_short	sam_pad2;
-+} mask = { sizeof( struct sockaddr_m ), 0, 0, 0xffff, 0 };
- 
- struct rt_msg_at {
-     struct rt_msghdr	rtma_rtm;
diff --git a/net/netatalk-asun/patches/patch-al b/net/netatalk-asun/patches/patch-al
deleted file mode 100644
index 2d000bf76b1..00000000000
--- a/net/netatalk-asun/patches/patch-al
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-al,v 1.5 2001/05/24 17:00:58 abs Exp $
-
---- etc/papd/Makefile.orig	Tue May 20 18:35:42 1997
-+++ etc/papd/Makefile
-@@ -20,6 +20,7 @@
- 	fi; \
-         ${MAKE} ${MFLAGS} CC="${CC}" ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" \
- 	    OPTOPTS="${OPTOPTS}" DESTDIR="${DESTDIR}" \
-+	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
- 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
- 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
- 	    KRBLIBS="$${KRBLIBS}" KRBLIBDIRS="$${KRBLIBDIRS}" \
-@@ -56,7 +57,7 @@
- 	    ${CPPFLAGS} -c main.c
- 
- install : all
--	${INSTALL} -c papd ${SBINDIR}
-+	${INSTALL} -c papd ${LIBEXECDIR}
- 
- clean :
- 	rm -f a.out core* *.o *.bak *[Ee]rrs tags
diff --git a/net/netatalk-asun/patches/patch-am b/net/netatalk-asun/patches/patch-am
deleted file mode 100644
index 2fab7960c3c..00000000000
--- a/net/netatalk-asun/patches/patch-am
+++ /dev/null
@@ -1,61 +0,0 @@
-$NetBSD: patch-am,v 1.5 2001/05/24 17:00:58 abs Exp $
-
---- etc/papd/printcap.c.orig	Fri May 30 01:27:35 1997
-+++ etc/papd/printcap.c
-@@ -158,6 +158,7 @@
- 	register int i = 0, cnt = 0;
- 	char ibuf[BUFSIZ];
- 	int tf;
-+	int skip;
- 
- 	hopcount = 0;
- 	tbuf = bp;
-@@ -176,7 +177,7 @@
- 			cp2 = getenv("TERM");
- 			if (cp2==(char *) 0 || strcmp(name,cp2)==0) {
- 				strcpy(bp,cp);
--				return(tnchktc());
-+				return(tnchktc(cap));
- 			} else {
- 				tf = open(cap, 0);
- 			}
-@@ -190,6 +191,7 @@
- #endif
- 	if (tf < 0)
- 		return (-1);
-+	skip = 0;
- 	for (;;) {
- 		cp = bp;
- 		for (;;) {
-@@ -203,12 +205,20 @@
- 			}
- 			c = ibuf[i++];
- 			if (c == '\n') {
--				if (cp > bp && cp[-1] == '\\'){
-+				if (!skip && cp > bp && cp[-1] == '\\'){
- 					cp--;
- 					continue;
- 				}
--				break;
-+				skip = 0;
-+				if (cp == bp)
-+					continue;
-+				else
-+					break;
- 			}
-+			if (c == '#' && cp == bp)
-+				skip++;
-+			if (skip)
-+				continue;
- 			if (cp >= bp+BUFSIZ) {
- 				write(2,"Termcap entry too long\n", 23);
- 				break;
-@@ -222,7 +232,7 @@
- 		 */
- 		if (tnamatch(name)) {
- 			close(tf);
--			return(tnchktc());
-+			return(tnchktc(cap));
- 		}
- 	}
- }
diff --git a/net/netatalk-asun/patches/patch-an b/net/netatalk-asun/patches/patch-an
deleted file mode 100644
index f351d5bdeb4..00000000000
--- a/net/netatalk-asun/patches/patch-an
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-an,v 1.5 2001/05/24 17:00:58 abs Exp $
-
---- etc/psf/Makefile.orig	Thu Feb  4 06:57:52 1999
-+++ etc/psf/Makefile
-@@ -25,21 +25,21 @@
- psf.o : psf.c
- 	${CC} ${CFLAGS} -D_PATH_PAP=\"${BINDIR}/pap\" \
- 	    -D_PATH_PSORDER=\"${BINDIR}/psorder\" \
--	    -D_PATH_PSA=\"${SBINDIR}/psa\" \
--	    -D_PATH_PSFILTER=\"${SBINDIR}/etc2ps\" \
-+	    -D_PATH_PSA=\"${LIBEXECDIR}/psa\" \
-+	    -D_PATH_PSFILTER=\"${LIBEXECDIR}/etc2ps\" \
- 	    -D_PATH_PAGECOUNT=\"${RESDIR}/pagecount.ps\" \
- 	    ${CPPFLAGS} -c psf.c
- 
- install : all
- 	-mkdir ${RESDIR}
--	-mkdir ${RESDIR}/filters
--	${INSTALL} -c psa ${SBINDIR}
--	${INSTALL} -c etc2ps.sh ${SBINDIR}/etc2ps
-+	-mkdir ${LIBEXECDIR}/psffilters
-+	${INSTALL} -c psa ${LIBEXECDIR}
-+	${INSTALL} -c etc2ps.sh ${LIBEXECDIR}/etc2ps
- 	${INSTALL} -c pagecount.ps ${RESDIR}
--	${INSTALL} -c psf ${SBINDIR}
-+	${INSTALL} -c psf ${LIBEXECDIR}
- 	for i in ${LINKS} ; do \
--	    rm -f ${RESDIR}/filters/$$i; \
--	    ln -s ${SBINDIR}/psf ${RESDIR}/filters/$$i; \
-+	    rm -f ${LIBEXECDIR}/psffilters/$$i; \
-+	    ln -s ../psf ${LIBEXECDIR}/psffilters/$$i; \
- 	done
- 
- clean :
diff --git a/net/netatalk-asun/patches/patch-ao b/net/netatalk-asun/patches/patch-ao
deleted file mode 100644
index 66be4ae2999..00000000000
--- a/net/netatalk-asun/patches/patch-ao
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ao,v 1.5 2001/05/24 17:00:58 abs Exp $
-
---- include/atalk/atp.h.orig	Wed May 28 16:22:52 1997
-+++ include/atalk/atp.h
-@@ -84,7 +84,7 @@
- 
- struct atpbuf {
-     struct atpbuf	*atpbuf_next;		/* next buffer in chain */
--    short		atpbuf_dlen;		/* data length <= ATP_BUFSIZ */
-+    unsigned short	atpbuf_dlen;		/* data length <= ATP_BUFSIZ */
-     struct sockaddr_at	atpbuf_addr;		/* net address sent/recvd */
-     union {
- 	char		atpbuf_data[ ATP_BUFSIZ ];	/* the data */
diff --git a/net/netatalk-asun/patches/patch-ap b/net/netatalk-asun/patches/patch-ap
deleted file mode 100644
index 4da162d25c6..00000000000
--- a/net/netatalk-asun/patches/patch-ap
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ap,v 1.6 2004/01/08 12:17:30 agc Exp $
-
---- include/atalk/paths.h.orig	Fri Aug 15 06:25:58 1997
-+++ include/atalk/paths.h
-@@ -12,7 +12,7 @@
- /* lock file path. this should be re-organized a bit. */
- #ifndef _PATH_LOCKDIR
- #ifdef BSD4_4
--#define _PATH_LOCKDIR           "/var/spool/lock/"
-+#define _PATH_LOCKDIR           "/var/run/"
- #else
- #ifdef linux
- #define _PATH_LOCKDIR           "/var/lock/"
-@@ -42,18 +42,18 @@
-  */
- #define _PATH_ATALKDEBUG	"/tmp/atalkd.debug"
- #define _PATH_ATALKDTMP		"atalkd.tmp"
--#define _PATH_ATALKDLOCK	ATALKPATHCAT(_PATH_LOCKDIR,"atalkd")
-+#define _PATH_ATALKDLOCK	_PATH_LOCKDIR "atalkd.pid"
- 
- /*
-  * psorder paths
-  */
- #define _PATH_TMPPAGEORDER	"/tmp/psorderXXXXXX"
--#define _PATH_PAPDLOCK		ATALKPATHCAT(_PATH_LOCKDIR,"papd")
-+#define _PATH_PAPDLOCK		_PATH_LOCKDIR "papd.pid"
- 
- /*
-  * afpd paths
-  */
- #define _PATH_AFPTKT		"/tmp/AFPtktXXXXXX"
--#define _PATH_AFPDLOCK		ATALKPATHCAT(_PATH_LOCKDIR,"afpd")
-+#define _PATH_AFPDLOCK		_PATH_LOCKDIR "afpd.pid"
- 
- #endif /* atalk/paths.h */
diff --git a/net/netatalk-asun/patches/patch-aq b/net/netatalk-asun/patches/patch-aq
deleted file mode 100644
index 67fa5365c1b..00000000000
--- a/net/netatalk-asun/patches/patch-aq
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aq,v 1.5 2001/05/24 17:00:58 abs Exp $
-
---- libatalk/asp/asp_getsess.c.orig	Thu Jan 21 20:10:25 1999
-+++ libatalk/asp/asp_getsess.c
-@@ -7,7 +7,7 @@
- #include <stdlib.h>
- #include <syslog.h>
- #include <errno.h>
--#include <sys/signal.h>
-+#include <signal.h>
- #include <sys/time.h>
- #include <sys/types.h>
- #include <sys/uio.h>
diff --git a/net/netatalk-asun/patches/patch-ar b/net/netatalk-asun/patches/patch-ar
deleted file mode 100644
index eaf06fad06a..00000000000
--- a/net/netatalk-asun/patches/patch-ar
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ar,v 1.5 2001/05/24 17:00:58 abs Exp $
-
---- libatalk/atp/atp_rsel.c.orig	Thu Feb  4 07:36:30 1999
-+++ libatalk/atp/atp_rsel.c
-@@ -10,6 +10,7 @@
- #include <sys/errno.h>
- #include <sys/uio.h>
- #include <signal.h>
-+#include <string.h>
- 
- #include <netatalk/endian.h>
- #include <netatalk/at.h>
diff --git a/net/netatalk-asun/patches/patch-as b/net/netatalk-asun/patches/patch-as
deleted file mode 100644
index 5332134c58b..00000000000
--- a/net/netatalk-asun/patches/patch-as
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-as,v 1.5 2001/05/24 17:00:58 abs Exp $
-
---- libatalk/dsi/dsi_tcp.c.orig	Wed Nov 18 07:59:25 1998
-+++ libatalk/dsi/dsi_tcp.c
-@@ -108,6 +108,11 @@
-       exit(1);
-     }
-     newact.sa_handler = timeout_handler;
-+    sigemptyset(&newact.sa_mask);
-+    newact.sa_flags = 0;
-+    oldact.sa_handler = NULL;
-+    sigemptyset(&oldact.sa_mask);
-+    oldact.sa_flags = 0;
-     if (sigaction(SIGALRM, &newact, &oldact) < 0) {
- 	syslog(LOG_ERR, "dsi_tcp_open: sigaction: %m");
- 	exit(1);
diff --git a/net/netatalk-asun/patches/patch-at b/net/netatalk-asun/patches/patch-at
deleted file mode 100644
index 62344117c05..00000000000
--- a/net/netatalk-asun/patches/patch-at
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-at,v 1.5 2001/05/24 17:00:58 abs Exp $
-
---- libatalk/nbp/nbp_lkup.c.orig	Thu Feb  4 07:36:14 1999
-+++ libatalk/nbp/nbp_lkup.c
-@@ -7,7 +7,7 @@
- #include <sys/types.h>
- #include <sys/param.h>
- #include <sys/socket.h>
--#include <sys/signal.h>
-+#include <signal.h>
- #include <sys/time.h>
- #include <netatalk/endian.h>
- #include <netatalk/at.h>
diff --git a/net/netatalk-asun/patches/patch-au b/net/netatalk-asun/patches/patch-au
deleted file mode 100644
index 2d22920ec0f..00000000000
--- a/net/netatalk-asun/patches/patch-au
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-au,v 1.5 2001/05/24 17:00:58 abs Exp $
-
---- libatalk/nbp/nbp_rgstr.c.orig	Thu Aug 14 22:27:23 1997
-+++ libatalk/nbp/nbp_rgstr.c
-@@ -7,7 +7,7 @@
- #include <sys/types.h>
- #include <sys/param.h>
- #include <sys/socket.h>
--#include <sys/signal.h>
-+#include <signal.h>
- #include <sys/time.h>
- #include <errno.h>
- #include <netatalk/at.h>
diff --git a/net/netatalk-asun/patches/patch-av b/net/netatalk-asun/patches/patch-av
deleted file mode 100644
index 70f398a5133..00000000000
--- a/net/netatalk-asun/patches/patch-av
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-av,v 1.6 2001/05/24 17:00:58 abs Exp $
-
---- libatalk/nbp/nbp_unrgstr.c.orig	Thu Feb  4 07:26:41 1999
-+++ libatalk/nbp/nbp_unrgstr.c
-@@ -7,7 +7,7 @@
- #include <sys/types.h>
- #include <sys/param.h>
- #include <sys/socket.h>
--#include <sys/signal.h>
-+#include <signal.h>
- #include <sys/time.h>
- #include <errno.h>
- #include <netatalk/endian.h>
diff --git a/net/netatalk-asun/patches/patch-aw b/net/netatalk-asun/patches/patch-aw
deleted file mode 100644
index 2f424d9ea86..00000000000
--- a/net/netatalk-asun/patches/patch-aw
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aw,v 1.5 2001/05/24 17:00:58 abs Exp $
-
---- libatalk/nbp/nbp_util.c.orig	Thu Feb  4 07:27:02 1999
-+++ libatalk/nbp/nbp_util.c
-@@ -6,7 +6,7 @@
- #include <sys/types.h>
- #include <sys/param.h>
- #include <sys/socket.h>
--#include <sys/signal.h>
-+#include <signal.h>
- #include <sys/time.h>
- #include <netatalk/endian.h>
- #include <netatalk/at.h>
diff --git a/net/netatalk-asun/patches/patch-ax b/net/netatalk-asun/patches/patch-ax
deleted file mode 100644
index ec031f93096..00000000000
--- a/net/netatalk-asun/patches/patch-ax
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ax,v 1.4 2001/05/24 17:00:58 abs Exp $
-
---- man/Makefile.orig	Tue May 20 18:35:43 1997
-+++ man/Makefile
-@@ -8,6 +8,7 @@
- ${ALL}: FRC
- 	cd $@; ${MAKE} ${MFLAGS} CC="${CC}" DEFS="${DEFS}" \
- 	    OPTOPTS="${OPTOPTS}" DESTDIR="${DESTDIR}" MANDIR="${MANDIR}" \
-+	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
- 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
- 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}"
- 
-@@ -25,6 +26,7 @@
- 	for i in ${ALL}; \
- 	    do (cd $$i; ${MAKE} ${MFLAGS} \
- 		DESTDIR="${DESTDIR}"  MANDIR="${MANDIR}" \
-+		LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
- 		SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
- 	        ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
- 		INSTALL="${INSTALL}" install); \
diff --git a/net/netatalk-asun/patches/patch-ay b/net/netatalk-asun/patches/patch-ay
deleted file mode 100644
index 74217fb60f6..00000000000
--- a/net/netatalk-asun/patches/patch-ay
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ay,v 1.4 2001/05/24 17:00:58 abs Exp $
-
---- man/man1/Makefile.orig	Tue May 20 18:35:43 1997
-+++ man/man1/Makefile
-@@ -1,4 +1,4 @@
--SRC=	aecho.1 getzones.1 nbp.1 nbplkup.1 nbprgstr.1 nbplkup.1 \
-+SRC=	aecho.1 getzones.1 nbp.1 nbplkup.1 nbprgstr.1 nbpunrgstr.1 nbplkup.1 \
- 	pap.1 papstatus.1 psorder.1 megatron.1 unhex.1 unbin.1 \
- 	unsingle.1 macbinary.1 hqx2bin.1 single2bin.1
- 
-@@ -20,6 +20,8 @@
- 		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
- 		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
- 		-e s@:INCDIR:@${INCDIR}@ \
-+		-e s@:LIBEXECDIR:@${LIBEXECDIR}@ \
-+		-e s@:EXAMPLEDIR:@${EXAMPLEDIR}@ \
- 		< $$i > ${MANDIR}/man1/$$i; \
- 	done
- 
diff --git a/net/netatalk-asun/patches/patch-az b/net/netatalk-asun/patches/patch-az
deleted file mode 100644
index 1f55d3e8493..00000000000
--- a/net/netatalk-asun/patches/patch-az
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-az,v 1.4 2001/05/24 17:00:58 abs Exp $
-
---- man/man3/Makefile.orig	Tue May 20 18:35:43 1997
-+++ man/man3/Makefile
-@@ -18,6 +18,8 @@
- 		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
- 		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
- 		-e s@:INCDIR:@${INCDIR}@ \
-+		-e s@:LIBEXECDIR:@${LIBEXECDIR}@ \
-+		-e s@:EXAMPLEDIR:@${EXAMPLEDIR}@ \
- 		< $$i > ${MANDIR}/man3/$$i; \
- 	done
- 
diff --git a/net/netatalk-asun/patches/patch-ba b/net/netatalk-asun/patches/patch-ba
deleted file mode 100644
index e138aac211d..00000000000
--- a/net/netatalk-asun/patches/patch-ba
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ba,v 1.5 2001/05/24 17:00:58 abs Exp $
-
---- man/man4/Makefile.orig	Tue May 20 18:35:43 1997
-+++ man/man4/Makefile
-@@ -17,6 +17,8 @@
- 		    -e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
- 		    -e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
- 		    -e s@:INCDIR:@${INCDIR}@ \
-+		    -e s@:LIBEXECDIR:@${LIBEXECDIR}@ \
-+		    -e s@:EXAMPLEDIR:@${EXAMPLEDIR}@ \
- 		    < $$i > ${MANDIR}/man4/$$i; \
- 	done
- 
diff --git a/net/netatalk-asun/patches/patch-bb b/net/netatalk-asun/patches/patch-bb
deleted file mode 100644
index 1ea86c3e3db..00000000000
--- a/net/netatalk-asun/patches/patch-bb
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bb,v 1.4 2001/05/24 17:00:58 abs Exp $
-
---- man/man8/Makefile.orig	Tue May 20 18:35:43 1997
-+++ man/man8/Makefile
-@@ -18,6 +18,8 @@
- 		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
- 		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
- 		-e s@:INCDIR:@${INCDIR}@ \
-+		-e s@:LIBEXECDIR:@${LIBEXECDIR}@ \
-+		-e s@:EXAMPLEDIR:@${EXAMPLEDIR}@ \
- 		< $$i > ${MANDIR}/man8/$$i; \
- 	done
- 
diff --git a/net/netatalk-asun/patches/patch-bc b/net/netatalk-asun/patches/patch-bc
deleted file mode 100644
index 7391fd79fda..00000000000
--- a/net/netatalk-asun/patches/patch-bc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bc,v 1.4 2001/05/24 17:00:58 abs Exp $
-
---- man/man8/afpd.8.orig	Tue May 20 18:35:43 1997
-+++ man/man8/afpd.8
-@@ -2,7 +2,7 @@
- .SH NAME
- afpd \- AppleTalk Filing Protocol daemon
- .SH SYNOPSIS
--.B :SBINDIR:/afpd
-+.B :LIBEXECDIR:/afpd
- [
- .B -d
- ]
diff --git a/net/netatalk-asun/patches/patch-bd b/net/netatalk-asun/patches/patch-bd
deleted file mode 100644
index 382f8437dab..00000000000
--- a/net/netatalk-asun/patches/patch-bd
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bd,v 1.5 2001/05/24 17:00:58 abs Exp $
-
---- man/man8/atalkd.8.orig	Thu Feb  4 07:28:28 1999
-+++ man/man8/atalkd.8
-@@ -2,7 +2,7 @@
- .SH NAME
- atalkd \- AppleTalk RTMP, NBP, ZIP, and AEP manager
- .SH SYNOPSIS
--.B :SBINDIR:/atalkd
-+.B :LIBEXECDIR:/atalkd
- [
- .B -f
- .I configfile
diff --git a/net/netatalk-asun/patches/patch-be b/net/netatalk-asun/patches/patch-be
deleted file mode 100644
index 2b8667331b1..00000000000
--- a/net/netatalk-asun/patches/patch-be
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-be,v 1.4 2001/05/24 17:00:58 abs Exp $
-
---- man/man8/papd.tbl.orig	Tue May 20 18:35:43 1997
-+++ man/man8/papd.tbl
-@@ -3,7 +3,7 @@
- .SH NAME
- papd \- AppleTalk print server daemon
- .SH SYNOPSIS
--.B :SBINDIR:/papd
-+.B :LIBEXECDIR:/papd
- [
- .B -d
- ] [
diff --git a/net/netatalk-asun/patches/patch-bf b/net/netatalk-asun/patches/patch-bf
deleted file mode 100644
index 72bfd67dfb6..00000000000
--- a/net/netatalk-asun/patches/patch-bf
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-bf,v 1.5 2001/05/24 17:00:58 abs Exp $
-
---- man/man8/psf.8.orig	Tue May 20 18:35:43 1997
-+++ man/man8/psf.8
-@@ -93,10 +93,10 @@
-     :sd=/usr/spool/lpd/laser:\\
-     :lp=/usr/spool/lpd/laser/null:\\
-     :lf=/var/adm/lpd-errs:pw#80:hl:\\
--    :of=:LIBDIR:/filters/ofpap:\\
--    :if=:LIBDIR:/filters/ifpaprev:\\
--    :tf=:LIBDIR:/filters/tfpaprev:\\
--    :df=:LIBDIR:/filters/dfpaprev:
-+    :of=:LIBEXECDIR:/psffilters/ofpap:\\
-+    :if=:LIBEXECDIR:/psffilters/ifpaprev:\\
-+    :tf=:LIBEXECDIR:/psffilters/tfpaprev:\\
-+    :df=:LIBEXECDIR:/psffilters/dfpaprev:
- .fi
- .RE
- .sp
diff --git a/net/netatalk-asun/patches/patch-bg b/net/netatalk-asun/patches/patch-bg
deleted file mode 100644
index fe7089387dd..00000000000
--- a/net/netatalk-asun/patches/patch-bg
+++ /dev/null
@@ -1,107 +0,0 @@
-$NetBSD: patch-bg,v 1.5 2001/05/24 17:00:58 abs Exp $
-
---- rc.atalk.bsd.orig	Mon Aug 25 23:00:54 1997
-+++ rc.atalk.bsd
-@@ -1,39 +1,69 @@
-+#!/bin/sh
-+#
-+# PROVIDE: atalkd
-+# REQUIRE: DAEMON
- #
- # AppleTalk daemons. Make sure not to start atalkd in the background:
- # its data structures must have time to stablize before running the
- # other processes.
- #
- 
--#
--# SUNOS: UNCOMMENT THESE LINES TO LOAD THE KERNEL MODULE.  Note that
--# modunload-ing netatalk may cause your machine to panic or hang.
--#
--##echo -n 'loading netatalk: '
--##if [ -f :ETCDIR:/netatalk.o ]; then
--##	/usr/etc/modload -sym :ETCDIR:/netatalk.o;
--##fi
--
--echo -n 'starting appletalk daemons:'
--if [ -x :SBINDIR:/atalkd ]; then
--	:SBINDIR:/atalkd;		echo -n ' atalkd'
--fi
--
--if [ -x :BINDIR:/nbprgstr ]; then
--	:BINDIR:/nbprgstr -p 4 `hostname|sed 's/\..*$//'`:Workstation
--	:BINDIR:/nbprgstr -p 4 `hostname|sed 's/\..*$//'`:netatalk
--					echo -n ' nbprgstr'
--fi
--
--if [ -x :SBINDIR:/papd ]; then
--	:SBINDIR:/papd;		echo -n ' papd'
--fi
--
--if [ -x :SBINDIR:/afpd ]; then
--	:SBINDIR:/afpd;		echo -n ' afpd'
--fi
--
--if [ -x :SBINDIR:/timelord ]; then
--	:SBINDIR:/timelord;		echo -n ' timelord'
--fi
--
--					echo '.'
-+papd=:LIBEXECDIR:/papd
-+afpd=:LIBEXECDIR:/afpd
-+atalkd=:LIBEXECDIR:/atalkd
-+register=:BINDIR:/nbprgstr
-+
-+piddir=/var/run/
-+machine_name=`hostname -s |sed 's/\..*$//'`
-+afpd_args=
-+papd_args=
-+atalkd_args=
-+
-+cmd=${1:-start}
-+
-+case ${cmd} in
-+start)
-+	if [ -x ${atalkd} ]; then
-+		echo  'Starting atalkd.'
-+		${atalkd} ${atalkd_args}
-+	fi
-+
-+	if [ -x ${register} ]; then
-+		${register} -p 4 ${machine_name}:Workstation
-+		${register} -p 4 ${machine_name}:netatalk
-+	fi
-+
-+	if [ -x ${papd} -a -e :ETCDIR:/papd.conf ]; then
-+		echo  'Starting papd.'
-+		${papd} ${papd_args}
-+	fi
-+
-+	if [ -x ${afpd} -a -e :ETCDIR:/AppleVolumes.system ]; then
-+		echo  'Starting afpd.'
-+		${afpd} ${afpd_args}
-+	fi
-+	;;
-+stop)
-+	if [ -f ${piddir}afpd.pid ]; then
-+		echo "Stopping afpd."
-+		kill `cat ${piddir}afpd.pid`
-+	fi
-+	if [ -f ${piddir}papd.pid ]; then
-+		echo "Stopping papd."
-+		kill `cat ${piddir}papd.pid`
-+	fi
-+	if [ -f ${piddir}atalkd.pid ]; then
-+		echo "Stopping atalkd."
-+		kill `cat ${piddir}atalkd.pid`
-+	fi
-+	;;
-+restart)
-+	( $0 stop )
-+	sleep 5
-+	$0 start
-+	;;
-+*)
-+	echo "Unexpected argument: ${cmd}"
-+	;;
-+esac
-+exit 0
diff --git a/net/netatalk-asun/patches/patch-bh b/net/netatalk-asun/patches/patch-bh
deleted file mode 100644
index 25fabb4a69d..00000000000
--- a/net/netatalk-asun/patches/patch-bh
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-bh,v 1.5 2001/05/24 17:00:58 abs Exp $
-
---- sys/freebsd/Makefile.orig	Thu Feb  4 07:38:12 1999
-+++ sys/freebsd/Makefile
-@@ -20,6 +20,7 @@
- ${ALL}:	FRC
- 	cd $@; ${MAKE} ${MFLAGS} CC="${CC}" \
- 	    ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
-+	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
- 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
- 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
- 	    DESTDIR="${DESTDIR}" AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" \
-@@ -29,9 +30,11 @@
- 
- install :
- 	-mkdir ${DESTDIR} ${SBINDIR} ${BINDIR} ${ETCDIR} ${LIBDIR}
-+	-mkdir ${LIBEXECDIR} ${EXAMPLEDIR}
- 	for i in ${ALL}; \
- 	    do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \
- 		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
-+		LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
- 	        SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
- 	        ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
- 		AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" AFPLIBS="${AFPLIBS}" \
-@@ -42,6 +45,8 @@
- 		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
- 		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
- 		-e s@:INCDIR:@${INCDIR}@ \
-+		-e s@:LIBEXECDIR:@${LIBEXECDIR}@ \
-+		-e s@:EXAMPLEDIR:@${EXAMPLEDIR}@ \
- 	    < ../../rc.atalk.bsd > ${ETCDIR}/rc.atalk
- 	@echo
- 	@echo "Install is done.  Don't forget to add lines from"
diff --git a/net/netatalk-asun/patches/patch-bi b/net/netatalk-asun/patches/patch-bi
deleted file mode 100644
index 696df12efb8..00000000000
--- a/net/netatalk-asun/patches/patch-bi
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-bi,v 1.5 2001/05/24 17:00:58 abs Exp $
-
---- sys/linux/Makefile.orig	Sat Feb 27 21:10:59 1999
-+++ sys/linux/Makefile
-@@ -23,6 +23,7 @@
- ${ALL}:	FRC
- 	cd $@; ${MAKE} ${MFLAGS} CC="${CC}" \
- 	    ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
-+	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
- 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
- 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
- 	    DESTDIR="${DESTDIR}" AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" \
-@@ -40,6 +41,8 @@
- 	sed -e s@:DESTDIR:@${DESTDIR}@ -e s@:SBINDIR:@${SBINDIR}@ \
- 		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
- 		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
-+		-e s@:LIBEXECDIR:@${LIBEXECDIR}@ \
-+		-e s@:EXAMPLEDIR:@${EXAMPLEDIR}@ \
- 		-e s@:INCDIR:@${INCDIR}@ \
- 		< ../../rc.atalk.redhat > /etc/rc.d/init.d/atalk.init; \
- 	sed -e s@:RCDIR:@/etc/rc.d/init.d@ \
-@@ -62,12 +65,15 @@
- 		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
- 		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
- 		-e s@:INCDIR:@${INCDIR}@ \
-+		-e s@:LIBEXECDIR:@${LIBEXECDIR}@ \
-+		-e s@:EXAMPLEDIR:@${EXAMPLEDIR}@ \
- 		< ../../rc.atalk.bsd > ${ETCDIR}/rc.atalk; \
- 	fi \
- 	fi
- 
- install : ${ETCDIR} install-sysv install-bsd
- 	-mkdir ${DESTDIR} ${SBINDIR} ${BINDIR} ${LIBDIR}
-+	-mkdir ${LIBEXECDIR} ${EXAMPLEDIR}
- 	for i in ${ALL}; \
- 	    do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \
- 		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
diff --git a/net/netatalk-asun/patches/patch-bj b/net/netatalk-asun/patches/patch-bj
deleted file mode 100644
index 6b35b59ff52..00000000000
--- a/net/netatalk-asun/patches/patch-bj
+++ /dev/null
@@ -1,71 +0,0 @@
-$NetBSD: patch-bj,v 1.4 2004/01/08 12:17:30 agc Exp $
-
---- sys/netbsd/Makefile.orig	Thu Feb  4 07:30:30 1999
-+++ sys/netbsd/Makefile
-@@ -1,10 +1,10 @@
- # NetBSD specific defines, passed to subdirectories.
- DEFS=	-DBSD4_4
--OPTOPTS=	-O2
--CC=	gcc -I../../sys/netbsd/ -I/usr/include/kerberosIV
-+OPTOPTS=	-I../../sys/netbsd/
-+#CC=	gcc -I../../sys/netbsd/ -I/usr/include/kerberosIV
- INSTALL=	install
- AFPLIBS = 	-lcrypt -lrpcsvc
--ADDLIBS =
-+ADDLIBS=	-Wl,-R${LIBDIR}
- 
- ALL=	../../libatalk ../../include ../../bin ../../etc ../../man
- 
-@@ -19,6 +19,7 @@
- ${ALL}:	FRC
- 	cd $@; ${MAKE} ${MFLAGS} CC="${CC}" \
- 	    ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
-+	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
- 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
- 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
- 	    AFPLIBS="${AFPLIBS}" \
-@@ -28,30 +29,34 @@
- 
- install :
- 	-mkdir ${DESTDIR} ${SBINDIR} ${BINDIR} ${ETCDIR} ${LIBDIR}
-+	-mkdir ${LIBEXECDIR} ${EXAMPLEDIR} ${RCDIR}
- 	for i in ${ALL}; \
- 	    do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \
- 		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
-+		LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
- 	        SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
- 	        ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
- 		AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" AFPLIBS="${AFPLIBS}" \
- 		INSTALL="${INSTALL}" $@); \
- 	done
--	rm -f ${ETCDIR}/rc.atalk
-+	for i in `ls ../../config`; \
-+		do ${INSTALL} -c ../../config/$$i ${EXAMPLEDIR}; \
-+	done
-+	rm -f ${RCDIR}/netatalk
- 	sed -e s@:DESTDIR:@${DESTDIR}@ -e s@:SBINDIR:@${SBINDIR}@ \
- 		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
- 		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
- 		-e s@:INCDIR:@${INCDIR}@ \
--	    < ../../rc.atalk.bsd > ${ETCDIR}/rc.atalk
-+		-e s@:LIBEXECDIR:@${LIBEXECDIR}@ \
-+		-e s@:EXAMPLEDIR:@${EXAMPLEDIR}@ \
-+	    < ../../rc.atalk.bsd > ${RCDIR}/netatalk
-+	chmod 755 ${RCDIR}/netatalk
-+	@echo "Install is done."
- 	@echo
--	@echo "Install is done.  You might need to add services from"
--	@echo "services.atalk to /etc/services. The ddp services need to be"
--	@echo "added for NetBSD versions earlier than 1.3, and the AFP over"
--	@echo "TCP services need to be added for NetBSD 1.3.X, and for"
--	@echo "1.3-current dated June 27, 1998 and earlier."
-+	@echo "Example configuration files are in ${EXAMPLEDIR}."
- 	@echo
--	@echo "Don't forget to call rc.atalk in /etc/rc.local.  See README"
--	@echo "and README.NETBSD for more information."
--
-+	@echo "Don't forget to call ${RCDIR}/netatalk in /etc/rc.local."
-+	@echo "See README.NETBSD for kernel configuration information."
- clean :
- 	for i in ${ALL}; \
- 	    do (cd $$i; ${MAKE} ${MFLAGS} clean); \
diff --git a/net/netatalk-asun/patches/patch-bk b/net/netatalk-asun/patches/patch-bk
deleted file mode 100644
index 080d281c2ff..00000000000
--- a/net/netatalk-asun/patches/patch-bk
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-bk,v 1.3 2001/05/24 17:00:58 abs Exp $
-
---- sys/openbsd/Makefile.orig	Mon Feb 22 23:02:31 1999
-+++ sys/openbsd/Makefile
-@@ -19,6 +19,7 @@
- ${ALL}:	FRC
- 	cd $@; ${MAKE} ${MFLAGS} CC="${CC}" \
- 	    ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
-+	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
- 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
- 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
- 	    AFPLIBS="${AFPLIBS}" \
-@@ -28,9 +29,11 @@
- 
- install :
- 	-mkdir ${DESTDIR} ${SBINDIR} ${BINDIR} ${ETCDIR} ${LIBDIR}
-+	-mkdir ${LIBEXECDIR} ${EXAMPLEDIR}
- 	for i in ${ALL}; \
- 	    do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \
- 		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
-+		LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
- 	        SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
- 	        ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
- 		AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" AFPLIBS="${AFPLIBS}" \
-@@ -41,6 +44,8 @@
- 		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
- 		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
- 		-e s@:INCDIR:@${INCDIR}@ \
-+		-e s@:LIBEXECDIR:@${LIBEXECDIR}@ \
-+		-e s@:EXAMPLEDIR:@${EXAMPLEDIR}@ \
- 	    < ../../rc.atalk.bsd > ${ETCDIR}/rc.atalk
- 	@echo
- 	@echo "Install is done.  Don't forget to add lines from"
diff --git a/net/netatalk-asun/patches/patch-bl b/net/netatalk-asun/patches/patch-bl
deleted file mode 100644
index 21faa51cd59..00000000000
--- a/net/netatalk-asun/patches/patch-bl
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-bl,v 1.3 2001/05/24 17:00:58 abs Exp $
-
---- sys/solaris/Makefile.orig	Wed Feb  3 19:52:10 1999
-+++ sys/solaris/Makefile
-@@ -48,6 +48,7 @@
- 	esac; \
- 	echo "Making $@ for $$PROCESSOR..."; \
- 	${MAKE} ${MFLAGS} \
-+	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
- 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}"\
- 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
- 	    MANDIR="${MANDIR}" DESTDIR="${DESTDIR}" AFSDIR="${AFSDIR}" \
-@@ -67,6 +68,7 @@
- ${ALL}:	FRC
- 	cd $@; ${MAKE} ${MFLAGS} CC="${CC}" \
- 	    ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
-+	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
- 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
- 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
- 	    DESTDIR="${DESTDIR}" AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" \
-@@ -91,6 +93,8 @@
- 		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
- 		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
- 		-e s@:INCDIR:@${INCDIR}@ \
-+		-e s@:LIBEXECDIR:@${LIBEXECDIR}@ \
-+		-e s@:EXAMPLEDIR:@${EXAMPLEDIR}@ \
- 	    < ../../rc.atalk.sysv > /etc/init.d/atalk
- 	chmod 744 /etc/init.d/atalk
- 	-ln -s ../init.d/atalk /etc/rc2.d/S79atalk
-@@ -98,11 +102,13 @@
- 
- install :
- 	-mkdir ${DESTDIR} ${SBINDIR} ${BINDIR} ${ETCDIR} ${LIBDIR}
-+	-mkdir ${LIBEXECDIR} ${EXAMPLEDIR}
- 	sed -e s@:BINDIR:@${BINDIR}@ < ../../lp2pap.sh > ${RESDIR}/lp2pap.sh
- 	chmod 744 ${RESDIR}/lp2pap.sh
- 	for i in ${ALL}; \
- 	    do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \
- 		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
-+		LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
- 	        SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
- 	        ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
- 		AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" \
diff --git a/net/netatalk-asun/patches/patch-bm b/net/netatalk-asun/patches/patch-bm
deleted file mode 100644
index 8dc20869b31..00000000000
--- a/net/netatalk-asun/patches/patch-bm
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-bm,v 1.3 2001/05/24 17:00:58 abs Exp $
-
---- sys/sunos/Makefile.orig	Fri Sep 18 04:20:15 1998
-+++ sys/sunos/Makefile
-@@ -51,6 +51,7 @@
- ${ALL}:	FRC
- 	cd $@; ${MAKE} ${MFLAGS} CC="${CC}" \
- 	    ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
-+	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
- 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
- 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
- 	    AFPLIBS="${AFPLIBS}" \
-@@ -69,9 +70,12 @@
- 	-mkdir ${BINDIR}
- 	-mkdir ${ETCDIR}
- 	-mkdir ${LIBDIR}
-+	-mkdir ${LIBEXECDIR}
-+	-mkdir ${EXAMPLEDIR}
- 	for i in ${ALL}; \
- 	    do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \
- 		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
-+		LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
- 	        SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
- 	        ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
- 		DESTDIR="${DESTDIR}" MANDIR="${MANDIR}" AFPLIBS="${AFPLIBS}" \
-@@ -83,6 +87,8 @@
- 		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
- 		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
- 		-e s@:INCDIR:@${INCDIR}@ -e 's@^##@@' \
-+		-e s@:LIBEXECDIR:@${LIBEXECDIR}@ \
-+		-e s@:EXAMPLEDIR:@${EXAMPLEDIR}@ \
- 	    < ../../rc.atalk.bsd > ${ETCDIR}/rc.atalk
- 	@echo
- 	@echo "Install is done.  Don't forget to add lines from"
diff --git a/net/netatalk-asun/patches/patch-bn b/net/netatalk-asun/patches/patch-bn
deleted file mode 100644
index 89504e21d24..00000000000
--- a/net/netatalk-asun/patches/patch-bn
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-bn,v 1.3 2001/05/24 17:00:58 abs Exp $
-
---- sys/ultrix/Makefile.orig	Thu Feb  4 07:30:55 1999
-+++ sys/ultrix/Makefile
-@@ -24,6 +24,7 @@
- ${ALL}:	FRC
- 	cd $@; ${MAKE} ${MFLAGS} CC="${CC}" \
- 	    ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
-+	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
- 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
- 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
- 	    AFPLIBS="${AFPLIBS}" \
-@@ -36,6 +37,7 @@
- 	for i in ${ALL}; \
- 	    do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \
- 		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
-+		LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
- 	        SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
- 	        ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
- 		DESTDIR="${DESTDIR}" MANDIR="${MANDIR}" \
-@@ -46,6 +48,8 @@
- 	sed -e s@:DESTDIR:@${DESTDIR}@ -e s@:SBINDIR:@${SBINDIR}@ \
- 		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
- 		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
-+		-e s@:LIBEXECDIR:@${LIBEXECDIR}@ \
-+		-e s@:EXAMPLEDIR:@${EXAMPLEDIR}@ \
- 		-e s@:INCDIR:@${INCDIR}@ \
- 	    < ../../rc.atalk.bsd > ${ETCDIR}/rc.atalk
- 	@echo
diff --git a/net/netatalk-asun/patches/patch-bo b/net/netatalk-asun/patches/patch-bo
deleted file mode 100644
index 661614044b5..00000000000
--- a/net/netatalk-asun/patches/patch-bo
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-bo,v 1.1 2003/01/14 02:02:01 markd Exp $
-
---- libatalk/Makefile.orig	Mon Feb  8 00:15:24 1999
-+++ libatalk/Makefile
-@@ -1,5 +1,5 @@
- ALL=	asp dsi atp nbp adouble util compat # cnid
--LIBS=	asp/asplib atp/atplib nbp/nbplib adouble/adoublelib \
-+XLIBS=	asp/asplib atp/atplib nbp/nbplib adouble/adoublelib \
- 	dsi/dsilib util/utillib compat/compatlib # cnid/cnidlib
- PLIBS=	asp/asplib_p atp/atplib_p nbp/nbplib_p adouble/adoublelib_p \
- 	dsi/dsilib_p util/utillib_p compat/compatlib_p # cnid/cnidlib_p
-@@ -9,7 +9,7 @@
- 
- all:	libatalk.a
- 
--libatalk.a: ${LIBS}
-+libatalk.a: ${XLIBS}
- 	rm -rf tmp
- 	-mkdir tmp
- 	for i in ${ALL}; do (cd tmp; ar x ../$$i/$${i}lib); done
diff --git a/net/netatalk-umich/DEINSTALL b/net/netatalk-umich/DEINSTALL
deleted file mode 100644
index e60c53dd5c0..00000000000
--- a/net/netatalk-umich/DEINSTALL
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: DEINSTALL,v 1.2 2003/08/30 20:22:59 jlam Exp $
-
-PKGNAME=$1
-STAGE=$2
-
-case ${STAGE} in
-POST-DEINSTALL)
-	ETCDIR=/etc/netatalk
-
-	cat << EOF
-===========================================================================
-If you won't be using ${PKGNAME} any longer, you may want to
-remove the netatalk configuration file directory:
-
-	${ETCDIR}
-===========================================================================
-EOF
-	;;
-esac
-exit 0
diff --git a/net/netatalk-umich/DESCR b/net/netatalk-umich/DESCR
deleted file mode 100644
index 042803a7094..00000000000
--- a/net/netatalk-umich/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-University of Michigan's netatalk userland tools and utilities, for
-AppleTalk interworking.  Lacks AppleshareIP support.
-
-This version is out-dated.  See pkgsrc/net/netatalk.
diff --git a/net/netatalk-umich/INSTALL b/net/netatalk-umich/INSTALL
deleted file mode 100644
index 17c3458a394..00000000000
--- a/net/netatalk-umich/INSTALL
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: INSTALL,v 1.4 2003/08/30 20:22:59 jlam Exp $
-
-PKGNAME=$1
-STAGE=$2
-
-case ${STAGE} in
-POST-INSTALL)
-	ETCDIR=/etc/netatalk
-
-	mkdir -p ${ETCDIR}
-
-	# The idea is to copy old config files over to the new location if
-	# they exist.  Otherwise, copy the default config from the examples
-	# directory.
-	#
-	if [ -f ${PKG_PREFIX}/etc/atalkd.conf ]
-	then
-		for file in \
-			AppleVolumes.default \
-			AppleVolumes.system \
-			atalkd.conf \
-			papd.conf
-		do
-			if [ ! -f ${ETCDIR}/${file} -a -f ${PKG_PREFIX}/etc/${file} ]
-			then
-				echo "  ${ETCDIR}/${file}"
-				cp ${PKG_PREFIX}/etc/${file} ${ETCDIR}/${file}
-				chmod 644 ${ETCDIR}/${file}
-			fi
-		done
-		echo "done."
-		cat << EOF
-===========================================================================
-Old configuration files were copied from ${PKG_PREFIX}/etc to
-${ETCDIR}.  You may want to remove the old files as they are no
-longer necessary.
-===========================================================================
-EOF
-	else
-		echo "Installing configuration files:"
-		for file in \
-			AppleVolumes.default \
-			AppleVolumes.system \
-			atalkd.conf \
-			papd.conf
-		do
-			if [ -f ${ETCDIR}/${file} ]
-			then
-				echo "  ${ETCDIR}/${file} already exists"
-			else
-				echo "  ${ETCDIR}/${file}"
-				cp ${PKG_PREFIX}/share/examples/netatalk/${file} \
-					${ETCDIR}/${file}
-				chmod 644 ${ETCDIR}/${file}
-			fi
-		done
-		echo "done."
-	fi
-	;;
-esac
-exit 0
diff --git a/net/netatalk-umich/Makefile b/net/netatalk-umich/Makefile
deleted file mode 100644
index fab4610860d..00000000000
--- a/net/netatalk-umich/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2004/01/20 12:22:20 agc Exp $
-#
-# XXX do not use -- see ../netatalk instead
-
-DISTNAME=		netatalk-990130
-PKGNAME=		netatalk-umich-19990130
-PKGREVISION=		2
-CATEGORIES=		net
-MASTER_SITES=		ftp://terminator.rs.itd.umich.edu/unix/netatalk/
-
-MAINTAINER=		wrstuden@NetBSD.org
-HOMEPAGE=		http://www.umich.edu/~rsug/netatalk/
-COMMENT=		University of Michigan's netatalk; AppleTalk interworking
-
-CONFLICTS=		netatalk-asun-[0-9]*
-CONFLICTS+=		netatalk-[0-9]*
-
-WRKSRC=			${WRKDIR}/netatalk-990130
-MAKE_ENV+=		MKLINT=no NOGCCERROR=true
-
-do-configure:
-	${CP} ${FILESDIR}/shlib_version ${WRKSRC}/libatalk
-
-post-install:
-	${RM} ${PREFIX}/share/examples/netatalk/AppleVolumes.system.orig
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/net/netatalk-umich/PLIST b/net/netatalk-umich/PLIST
deleted file mode 100644
index 6409775f193..00000000000
--- a/net/netatalk-umich/PLIST
+++ /dev/null
@@ -1,97 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/25 12:25:51 markd Exp $
-bin/aecho
-bin/getzones
-bin/hqx2bin
-bin/macbinary
-bin/megatron
-bin/nbplkup
-bin/nbprgstr
-bin/nbpunrgstr
-bin/pap
-bin/papstatus
-bin/psorder
-bin/single2bin
-bin/unbin
-bin/unhex
-bin/unsingle
-include/atalk/adouble.h
-include/atalk/aep.h
-include/atalk/afp.h
-include/atalk/asp.h
-include/atalk/atp.h
-include/atalk/compat.h
-include/atalk/ddp.h
-include/atalk/nbp.h
-include/atalk/pap.h
-include/atalk/paths.h
-include/atalk/rtmp.h
-include/atalk/zip.h
-lib/libatalk.a
-lib/libatalk.so
-lib/libatalk.so.1
-lib/libatalk.so.1.0
-lib/libatalk_pic.a
-libexec/psa
-libexec/psf
-man/man1/aecho.1
-man/man1/getzones.1
-man/man1/hqx2bin.1
-man/man1/macbinary.1
-man/man1/megatron.1
-man/man1/nbp.1
-man/man1/nbplkup.1
-man/man1/nbprgstr.1
-man/man1/pap.1
-man/man1/papstatus.1
-man/man1/psorder.1
-man/man1/single2bin.1
-man/man1/unbin.1
-man/man1/unhex.1
-man/man1/unsingle.1
-man/man3/atalk_aton.3
-man/man3/nbp_name.3
-man/man4/atalk.4
-man/man8/afpd.8
-man/man8/atalkd.8
-man/man8/papd.8
-man/man8/psf.8
-sbin/afpd
-sbin/atalkd
-sbin/etc2ps
-sbin/papd
-share/examples/netatalk/AppleVolumes.default
-share/examples/netatalk/AppleVolumes.system
-share/examples/netatalk/atalkd.conf
-share/examples/netatalk/papd.conf
-share/pagecount.ps
-share/psffilters/dfmpap
-share/psffilters/dfmpaprev
-share/psffilters/dfpap
-share/psffilters/dfpaprev
-share/psffilters/dfwmpap
-share/psffilters/dfwmpaprev
-share/psffilters/dfwpap
-share/psffilters/dfwpaprev
-share/psffilters/ifmpap
-share/psffilters/ifmpaprev
-share/psffilters/ifpap
-share/psffilters/ifpaprev
-share/psffilters/ifwmpap
-share/psffilters/ifwmpaprev
-share/psffilters/ifwpap
-share/psffilters/ifwpaprev
-share/psffilters/ofmpap
-share/psffilters/ofpap
-share/psffilters/ofwmpap
-share/psffilters/ofwpap
-share/psffilters/tfmpap
-share/psffilters/tfmpaprev
-share/psffilters/tfpap
-share/psffilters/tfpaprev
-share/psffilters/tfwmpap
-share/psffilters/tfwmpaprev
-share/psffilters/tfwpap
-share/psffilters/tfwpaprev
-@dirrm share/psffilters
-@dirrm share/examples/netatalk
-@dirrm include/atalk
diff --git a/net/netatalk-umich/distinfo b/net/netatalk-umich/distinfo
deleted file mode 100644
index 9e6c0612dc5..00000000000
--- a/net/netatalk-umich/distinfo
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: distinfo,v 1.2 2004/01/08 12:06:37 agc Exp $
-
-SHA1 (netatalk-990130.tar.gz) = 30f16274edc756bd68b0dc00946d5978b7102b3c
-Size (netatalk-990130.tar.gz) = 244708 bytes
-SHA1 (patch-aa) = 18980f712f55c07b82b17489a2a0218d5ee1d76b
-SHA1 (patch-ab) = 7ea187513b53a9e3b57db7e7584a45e948aceb32
-SHA1 (patch-ac) = 92a3f18cc48723eed347f7c8c28f866488312126
-SHA1 (patch-ad) = bc4e04ad7291ec461ac8b68da992038ed00e0099
-SHA1 (patch-ae) = c4f9321035dcae73659a4e4b56a977c5fbde8a8b
-SHA1 (patch-af) = 7f008b824d3e76eaae5bfb0bf2824eeb65d456a1
-SHA1 (patch-ag) = 6d6fb16733f3840c13c12bace13718b8ba54c2a4
-SHA1 (patch-ah) = 6fea50bb8aace1e49496438042895a3c6ad89338
-SHA1 (patch-ai) = d0b84cf1fdb861ae858cbd3a10edf331f9251769
-SHA1 (patch-aj) = b5ab5bcbea8cfd97287877b2b809bc5c0a81ad99
-SHA1 (patch-ak) = 0ddd4cce800dfe2ee73c140b72cb9a73a216516b
-SHA1 (patch-al) = 36ce394b80ce817369e4f63c3b6094628bb3d3df
-SHA1 (patch-am) = 7767655ffbda36bfd4c1c8297f04e2a7d043917b
-SHA1 (patch-an) = a6cae51dc134c95b23475009d5bc6255856c2f95
-SHA1 (patch-ao) = 965699c06fd9c207af7974435385da2a0ec056f7
-SHA1 (patch-ap) = 14519adcb9238d20d63897cf433b3754a8a0415b
-SHA1 (patch-aq) = 953d79debaa4a4892be4d8d74fbd8dbf20d9fbde
-SHA1 (patch-ar) = b75e7d0d2528cc1c84ffa53fbf2c29adbcfe5fe9
-SHA1 (patch-as) = 0dce5dbc8153ff96ff03d0283bded53891201b9c
-SHA1 (patch-at) = cd67216be1671f300125c31c49bb36f84eaf5719
-SHA1 (patch-au) = e3411307be207059ac10ebe145c75a20da5ac18c
-SHA1 (patch-av) = f795c36e277d94f50d4eb20f6b56a7e4764748d7
-SHA1 (patch-aw) = 5e5a7c2c1c568a337aee56e1539e3954f9c49307
-SHA1 (patch-ax) = d4a7999f466b560717164da3b2bd4e842e66239d
-SHA1 (patch-ay) = 8b81cf679732e6dbc16365e4fa88076f0c95088f
-SHA1 (patch-az) = ec81040364a16f5484d64773dd3a0944adb9bc06
-SHA1 (patch-ba) = 4d110e1ad93a9f202013e24c260d1826e676edc8
-SHA1 (patch-bb) = 22acce3ae0e7e5b91365d9690bfda1016fdb9e0a
-SHA1 (patch-bc) = 93a0802d65f0c632cb8d4aad0545a6b09b4e5a65
-SHA1 (patch-bd) = 18769aeabf7a4c5091648f50a2a605524f0efe51
-SHA1 (patch-be) = 171df73ca215ee4c09ecab4330573e6d6ca5dce3
-SHA1 (patch-bf) = ba3fd24f72e8e8b3ec42f970586cf46c3d067cd7
-SHA1 (patch-bg) = ed9f8a18fdcd109d7e7cb65bb507abf29429843d
-SHA1 (patch-bh) = d2188c4cfc40a74d8bfcad7b0a81ae537fa4f273
-SHA1 (patch-bi) = 3829d2a1a7c811863e7e2d72c24e9f9a501af1d8
diff --git a/net/netatalk-umich/files/shlib_version b/net/netatalk-umich/files/shlib_version
deleted file mode 100644
index b920b18e8e5..00000000000
--- a/net/netatalk-umich/files/shlib_version
+++ /dev/null
@@ -1,4 +0,0 @@
-#	$NetBSD: shlib_version,v 1.1.1.1 2002/05/25 12:25:51 markd Exp $
-#
-major=1
-minor=0
diff --git a/net/netatalk-umich/patches/patch-aa b/net/netatalk-umich/patches/patch-aa
deleted file mode 100644
index 97676dd58c8..00000000000
--- a/net/netatalk-umich/patches/patch-aa
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/05/25 12:25:51 markd Exp $
-
---- Makefile	Wed Dec 17 09:25:39 1997
-+++ Makefile	Tue Aug 31 02:06:35 1999
-@@ -1,22 +1,26 @@
--# Root of installation. Subdirectories will be ${DESTDIR}/etc,
--# ${DESTDIR}/bin, and ${DESTDIR}/lib.
--DESTDIR=/usr/local/atalk
-+# Root of installation. Subdirectories will be ${ATALK_DESTDIR}/etc,
-+# ${ATALK_DESTDIR}/bin, and ${ATALK_DESTDIR}/lib.
-+ATALK_DESTDIR=${PREFIX}
- 
- # for system-level binaries
--SBINDIR=$(DESTDIR)/etc
-+SBINDIR=$(ATALK_DESTDIR)/sbin
-+# for system-level daemons
-+LIBEXECDIR=$(ATALK_DESTDIR)/libexec
- # for user-level binaries
--BINDIR=$(DESTDIR)/bin
-+BINDIR=$(ATALK_DESTDIR)/bin
- # for program libraries (*.a)
--LIBDIR=$(DESTDIR)/lib
-+LIBDIR=$(ATALK_DESTDIR)/lib
- # for machine-independent resources (pagecount.ps, etc.)
--RESDIR=$(DESTDIR)/etc
-+RESDIR=$(ATALK_DESTDIR)/share
- # for configuration files (AppleVolumes.system, etc.)
--ETCDIR=$(DESTDIR)/etc
-+ETCDIR=/etc/netatalk
- # for include files
--INCDIR=$(DESTDIR)/include
-+INCDIR=$(ATALK_DESTDIR)/include
- # Root of man pages.  Subdirectories will be
- # ${MANDIR}/man1, ${MANDIR}/man4, and ${MANDIR}/man8.
--MANDIR=$(DESTDIR)/man
-+MANDIR=$(ATALK_DESTDIR)/man
-+# for example config files
-+EXAMPLEDIR=$(ATALK_DESTDIR)/share/examples/netatalk
- 
- #SBINDIR=/usr/sbin
- #BINDIR=/usr/bin
-@@ -57,8 +61,9 @@
- 	cd sys/$$ARCH && ${MAKE} ${MFLAGS} \
- 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}"\
- 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
--	    DESTDIR="${DESTDIR}" MANDIR="${MANDIR}" \
--	    AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" $@
-+	    ATALK_DESTDIR="${ATALK_DESTDIR}" MANDIR="${MANDIR}" \
-+	    AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" LIBEXECDIR="${LIBEXECDIR}" \
-+	    OPTOPTS="${OPTOPTS}" EXAMPLEDIR="${EXAMPLEDIR}" $@
- 
- FRC:
- 
diff --git a/net/netatalk-umich/patches/patch-ab b/net/netatalk-umich/patches/patch-ab
deleted file mode 100644
index 6826750b367..00000000000
--- a/net/netatalk-umich/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/05/25 12:25:51 markd Exp $
-
---- bin/Makefile	Tue Feb 20 08:36:51 1996
-+++ bin/Makefile	Mon Aug 30 06:47:41 1999
-@@ -9,7 +9,7 @@
- 	    ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
- 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}"\
- 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
--	    DESTDIR="${DESTDIR}"
-+	    ATALK_DESTDIR="${ATALK_DESTDIR}"
- 
- FRC:
- 
-@@ -26,7 +26,7 @@
- 		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
- 	        SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
- 	        ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
--		DESTDIR="${DESTDIR}" INSTALL="${INSTALL}" install); \
-+		ATALK_DESTDIR="${ATALK_DESTDIR}" INSTALL="${INSTALL}" install); \
- 	done
- 
- clean:
diff --git a/net/netatalk-umich/patches/patch-ac b/net/netatalk-umich/patches/patch-ac
deleted file mode 100644
index 94f6986be85..00000000000
--- a/net/netatalk-umich/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/05/25 12:25:51 markd Exp $
-
---- etc/Makefile	Tue Feb 20 08:37:56 1996
-+++ etc/Makefile	Mon Aug 30 06:47:41 1999
-@@ -10,7 +10,7 @@
- 	    ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
- 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
- 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
--	    DESTDIR="${DESTDIR}" AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}"
-+	    ATALK_DESTDIR="${ATALK_DESTDIR}" AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}"
- 
- FRC:
- 
-@@ -27,7 +27,7 @@
- 		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
- 	        SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
- 	        ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
--		DESTDIR="${DESTDIR}" AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" \
-+		ATALK_DESTDIR="${ATALK_DESTDIR}" AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" \
- 		INSTALL="${INSTALL}" install); \
- 	done
- 
diff --git a/net/netatalk-umich/patches/patch-ad b/net/netatalk-umich/patches/patch-ad
deleted file mode 100644
index edcf209a5a6..00000000000
--- a/net/netatalk-umich/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/05/25 12:25:51 markd Exp $
-
---- etc/afpd/Makefile	Thu Jun 25 07:07:32 1998
-+++ etc/afpd/Makefile	Mon Aug 30 06:47:41 1999
-@@ -32,7 +32,7 @@
- 	    AFSDEFS="-DAFS"; \
- 	fi; \
- 	${MAKE} ${MFLAGS} CC="${CC}" ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" \
--	    OPTOPTS="${OPTOPTS}" DESTDIR="${DESTDIR}" \
-+	    OPTOPTS="${OPTOPTS}" ATALK_DESTDIR="${ATALK_DESTDIR}" \
- 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
- 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
- 	    KRBLIBS="$${KRBLIBS}" KRBLIBDIRS="$${KRBLIBDIRS}" \
diff --git a/net/netatalk-umich/patches/patch-ae b/net/netatalk-umich/patches/patch-ae
deleted file mode 100644
index ce6bada8907..00000000000
--- a/net/netatalk-umich/patches/patch-ae
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2002/05/25 12:25:51 markd Exp $
-
---- etc/atalkd/nbp.c	Mon Oct 27 14:28:43 1997
-+++ etc/atalkd/nbp.c	Mon Aug 30 06:52:31 1999
-@@ -86,7 +86,7 @@
-     nn.nn_sat.sat_port = nt.nt_port;
- 
-     /* object */
--    if ( data >= end || ( *data < 0 || *data > 32 ) || data + *data > end ) {
-+    if ( data >= end || (*(unsigned char *)data > 32 ) || data + *data > end ) {
- 	syslog( LOG_INFO, "nbp_packet: malformed packet" );
- 	return;
-     }
-@@ -95,7 +95,7 @@
-     data += nn.nn_objlen;
- 
-     /* type */
--    if ( data >= end || ( *data < 0 || *data > 32 ) || data + *data > end ) {
-+    if ( data >= end || (*(unsigned char *)data > 32 ) || data + *data > end ) {
- 	syslog( LOG_INFO, "nbp_packet: malformed packet" );
- 	return;
-     }
-@@ -104,7 +104,7 @@
-     data += nn.nn_typelen;
- 
-     /* zone */
--    if ( data >= end || ( *data < 0 || *data > 32 ) || data + *data > end ) {
-+    if ( data >= end || (*(unsigned char *)data > 32 ) || data + *data > end ) {
- 	syslog( LOG_INFO, "nbp_packet: malformed packet" );
- 	return;
-     }
diff --git a/net/netatalk-umich/patches/patch-af b/net/netatalk-umich/patches/patch-af
deleted file mode 100644
index 3c8999b58e9..00000000000
--- a/net/netatalk-umich/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2002/05/25 12:25:51 markd Exp $
-
---- etc/papd/Makefile	Tue Oct 22 14:22:20 1996
-+++ etc/papd/Makefile	Mon Aug 30 06:47:42 1999
-@@ -19,7 +19,7 @@
- 	    KRBDEFS="-DKRB"; \
- 	fi; \
-         ${MAKE} ${MFLAGS} CC="${CC}" ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" \
--	    OPTOPTS="${OPTOPTS}" DESTDIR="${DESTDIR}" \
-+	    OPTOPTS="${OPTOPTS}" ATALK_DESTDIR="${ATALK_DESTDIR}" \
- 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
- 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
- 	    KRBLIBS="$${KRBLIBS}" KRBLIBDIRS="$${KRBLIBDIRS}" \
diff --git a/net/netatalk-umich/patches/patch-ag b/net/netatalk-umich/patches/patch-ag
deleted file mode 100644
index bc1b1aecb8e..00000000000
--- a/net/netatalk-umich/patches/patch-ag
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2002/05/25 12:25:51 markd Exp $
-
---- etc/papd/session.c	Wed Sep 23 07:15:11 1998
-+++ etc/papd/session.c	Mon Aug 30 06:47:42 1999
-@@ -3,6 +3,7 @@
-  * All Rights Reserved.  See COPYRIGHT.
-  */
- 
-+#include <string.h>
- #include <sys/types.h>
- #include <sys/syslog.h>
- #include <sys/time.h>
-@@ -53,7 +54,7 @@
-     fd_set		fds;
-     char		cbuf[ 578 ];
-     int			i, cc, timeout = 0, readpending = 0;
--    u_short		seq = 1, rseq = 1, netseq;
-+    u_short		seq = 0, rseq = 1, netseq;
-     u_char		readport;
- 
-     infile.pf_state = PF_BOT;
diff --git a/net/netatalk-umich/patches/patch-ah b/net/netatalk-umich/patches/patch-ah
deleted file mode 100644
index 52955b45e3d..00000000000
--- a/net/netatalk-umich/patches/patch-ah
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 2002/05/25 12:25:51 markd Exp $
-
---- etc/psf/Makefile	Thu Oct  2 19:35:26 1997
-+++ etc/psf/Makefile	Mon Aug 30 06:47:42 1999
-@@ -9,10 +9,10 @@
- INSTALL=	install
- LIBDIRS=
- 
--LINKS=	ofpap ifpap tfpap ifpaprev tfpaprev \
--	ofwpap ifwpap tfwpap ifwpaprev tfwpaprev \
--	ofmpap ifmpap tfmpap ifmpaprev tfmpaprev \
--	ofwmpap ifwmpap tfwmpap ifwmpaprev tfwmpaprev
-+LINKS=	ofpap ifpap tfpap dfpap ifpaprev tfpaprev dfpaprev \
-+	ofwpap ifwpap tfwpap dfwpap ifwpaprev tfwpaprev dfwpaprev \
-+	ofmpap ifmpap tfmpap dfmpap ifmpaprev tfmpaprev dfmpaprev \
-+	ofwmpap ifwmpap tfwmpap dfwmpap ifwmpaprev tfwmpaprev dfwmpaprev
- 
- all : ${TARGETS}
- 
-@@ -32,14 +32,14 @@
- 
- install : all
- 	-mkdir ${RESDIR}
--	-mkdir ${RESDIR}/filters
--	${INSTALL} -c psa ${SBINDIR}
-+	-mkdir ${RESDIR}/psffilters
-+	${INSTALL} -c psa ${LIBEXECDIR}
- 	${INSTALL} -c etc2ps.sh ${SBINDIR}/etc2ps
- 	${INSTALL} -c pagecount.ps ${RESDIR}
--	${INSTALL} -c psf ${SBINDIR}
-+	${INSTALL} -c psf ${LIBEXECDIR}
- 	for i in ${LINKS} ; do \
--	    rm -f ${RESDIR}/filters/$$i; \
--	    ln -s ${SBINDIR}/psf ${RESDIR}/filters/$$i; \
-+	    rm -f ${RESDIR}/psffilters/$$i; \
-+	    ln -s ${LIBEXECDIR}/psf ${RESDIR}/psffilters/$$i; \
- 	done
- 
- clean :
diff --git a/net/netatalk-umich/patches/patch-ai b/net/netatalk-umich/patches/patch-ai
deleted file mode 100644
index c5150fd9881..00000000000
--- a/net/netatalk-umich/patches/patch-ai
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ai,v 1.1.1.1 2002/05/25 12:25:51 markd Exp $
-
---- include/Makefile	Tue Feb 20 08:38:02 1996
-+++ include/Makefile	Mon Aug 30 06:47:42 1999
-@@ -1,11 +1,11 @@
--TARGETS=	atalk netatalk
-+TARGETS=	atalk
- 
- INSTALL=	install
- 
- all :
- 
- install : all
--	-mkdir ${DESTDIR}
-+	-mkdir ${ATALK_DESTDIR}
- 	-mkdir ${INCDIR}
- 	for i in ${TARGETS}; do \
- 	    rm -rf ${INCDIR}/$$i ; \
diff --git a/net/netatalk-umich/patches/patch-aj b/net/netatalk-umich/patches/patch-aj
deleted file mode 100644
index 3dd5abe3204..00000000000
--- a/net/netatalk-umich/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.1.1.1 2002/05/25 12:25:51 markd Exp $
-
---- include/atalk/atp.h	Thu Oct 21 10:52:54 1993
-+++ include/atalk/atp.h	Mon Aug 30 06:53:38 1999
-@@ -78,7 +78,7 @@
- 
- struct atpbuf {
-     struct atpbuf	*atpbuf_next;		/* next buffer in chain */
--    short		atpbuf_dlen;		/* data length <= ATP_BUFSIZ */
-+    unsigned short	atpbuf_dlen;		/* data length <= ATP_BUFSIZ */
-     struct sockaddr_at	atpbuf_addr;		/* net address sent/recvd */
-     union {
- 	char		atpbuf_data[ ATP_BUFSIZ ];	/* the data */
diff --git a/net/netatalk-umich/patches/patch-ak b/net/netatalk-umich/patches/patch-ak
deleted file mode 100644
index 70c7f3e15cd..00000000000
--- a/net/netatalk-umich/patches/patch-ak
+++ /dev/null
@@ -1,80 +0,0 @@
-$NetBSD: patch-ak,v 1.1.1.1 2002/05/25 12:25:51 markd Exp $
-
---- libatalk/Makefile	Tue Feb 20 08:38:05 1996
-+++ libatalk/Makefile	Tue Aug 31 02:28:01 1999
-@@ -1,63 +1,17 @@
--ALL=	asp atp nbp adouble util compat
--LIBS=	asp/asplib atp/atplib nbp/nbplib adouble/adoublelib \
--	util/utillib compat/compatlib
--PLIBS=	asp/asplib_p atp/atplib_p nbp/nbplib_p adouble/adoublelib_p \
--	util/utillib_p compat/compatlib_p
--TAGSFILE=tags
--CC=cc
--INSTALL=install
-+LIB=	atalk
- 
--all:	libatalk.a
-+MKPROFILE=	no
- 
--libatalk.a: ${LIBS}
--	rm -rf tmp
--	-mkdir tmp
--	for i in ${ALL}; do (cd tmp; ar x ../$$i/$${i}lib); done
--	(cd tmp; ar cr libatalk.a  *.o; ranlib libatalk.a)
--	mv tmp/libatalk.a libatalk.a
--	ranlib libatalk.a
--	rm -rf tmp tmp_p
--	-mkdir tmp_p
--	for i in ${ALL}; do (cd tmp_p; ar x ../$$i/$${i}lib_p); done
--	(cd tmp_p; ar cr libatalk_p.a  *.o; ranlib libatalk_p.a)
--	mv tmp_p/libatalk_p.a libatalk_p.a
--	ranlib libatalk_p.a
--	rm -rf tmp_p
-+.include "${.CURDIR}/asp/Makefile.inc"
-+.include "${.CURDIR}/atp/Makefile.inc"
-+.include "${.CURDIR}/nbp/Makefile.inc"
-+.include "${.CURDIR}/adouble/Makefile.inc"
-+.include "${.CURDIR}/util/Makefile.inc"
-+.include "${.CURDIR}/compat/Makefile.inc"
- 
--${ALL}: FRC
--	cd $@; ${MAKE} ${MFLAGS} CC="${CC}" DEFS="${DEFS}" \
--	    OPTOPTS="${OPTOPTS}"
-+CPPFLAGS=	${DEFS} ${OPTOPTS} -I${.CURDIR}/../include
- 
--asp/asplib:	asp
--atp/atplib:	atp
--nbp/nbplib:	nbp
--adouble/adoublelib:	adouble
--util/utillib:	util
--compat/compatlib:	compat
-+SHLIB_MAJOR=	1
-+SHLIB_MINOR=	0
- 
--FRC:
--
--tags:
--	for i in ${ALL}; do \
--	    (cd $$i; ${MAKE} ${MFLAGS} DEFS="${DEFS}" \
--		TAGSFILE=../${TAGSFILE} tags); \
--	done
--
--install: all
--	-mkdir ${LIBDIR}
--	${INSTALL} -c libatalk.a ${LIBDIR}/libatalk.a
--	(cd ${LIBDIR}; ranlib ${LIBDIR}/libatalk.a)
--	${INSTALL} -c libatalk_p.a ${LIBDIR}/libatalk_p.a
--	(cd ${LIBDIR}; ranlib ${LIBDIR}/libatalk_p.a)
--
--clean:
--	for i in ${ALL}; \
--	    do (cd $$i; ${MAKE} ${MFLAGS} clean); \
--	done
--	rm -f *[Ee]rrs libatalk.a libatalk_p.a
--	rm -rf tmp tmp_p
--
--depend:
--	for i in ${ALL}; \
--	    do (cd $$i; ${MAKE} ${MFLAGS} DEFS=${DEFS} depend); \
--	done
-+.include <bsd.lib.mk>
diff --git a/net/netatalk-umich/patches/patch-al b/net/netatalk-umich/patches/patch-al
deleted file mode 100644
index 6efa51d0dd1..00000000000
--- a/net/netatalk-umich/patches/patch-al
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: patch-al,v 1.1.1.1 2002/05/25 12:25:51 markd Exp $
-
---- libatalk/adouble/Makefile.inc	Wed Dec 31 16:00:00 1969
-+++ libatalk/adouble/Makefile.inc	Mon Aug 30 06:47:42 1999
-@@ -0,0 +1,3 @@
-+.PATH: ${.CURDIR}/adouble
-+
-+SRCS+= ad_open.c ad_flush.c ad_read.c ad_write.c
diff --git a/net/netatalk-umich/patches/patch-am b/net/netatalk-umich/patches/patch-am
deleted file mode 100644
index 45441bfd55f..00000000000
--- a/net/netatalk-umich/patches/patch-am
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-am,v 1.1.1.1 2002/05/25 12:25:51 markd Exp $
-
---- libatalk/asp/Makefile.inc	Wed Dec 31 16:00:00 1969
-+++ libatalk/asp/Makefile.inc	Mon Aug 30 06:47:42 1999
-@@ -0,0 +1,4 @@
-+.PATH: ${.CURDIR}/asp
-+
-+SRCS+= asp_close.c asp_cmdreply.c asp_getreq.c
-+SRCS+= asp_getsess.c asp_init.c asp_write.c asp_shutdown.c
diff --git a/net/netatalk-umich/patches/patch-an b/net/netatalk-umich/patches/patch-an
deleted file mode 100644
index 4f161301fef..00000000000
--- a/net/netatalk-umich/patches/patch-an
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-an,v 1.1.1.1 2002/05/25 12:25:51 markd Exp $
-
---- libatalk/asp/asp_getsess.c	Sat Aug 16 16:20:31 1997
-+++ libatalk/asp/asp_getsess.c	Mon Aug 30 06:47:42 1999
-@@ -6,7 +6,7 @@
- #include <sys/errno.h>
- #include <sys/time.h>
- #include <sys/types.h>
--#include <sys/signal.h>
-+#include <signal.h>
- #include <sys/uio.h>
- #include <sys/wait.h>
- #include <sys/syslog.h>
diff --git a/net/netatalk-umich/patches/patch-ao b/net/netatalk-umich/patches/patch-ao
deleted file mode 100644
index 7faf0b176dc..00000000000
--- a/net/netatalk-umich/patches/patch-ao
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-ao,v 1.1.1.1 2002/05/25 12:25:51 markd Exp $
-
---- libatalk/atp/Makefile.inc	Wed Dec 31 16:00:00 1969
-+++ libatalk/atp/Makefile.inc	Mon Aug 30 06:47:42 1999
-@@ -0,0 +1,4 @@
-+.PATH: ${.CURDIR}/atp
-+
-+SRCS+= atp_bprint.c atp_bufs.c atp_close.c atp_open.c atp_packet.c
-+SRCS+= atp_rreq.c atp_rresp.c atp_rsel.c atp_sreq.c atp_sresp.c
diff --git a/net/netatalk-umich/patches/patch-ap b/net/netatalk-umich/patches/patch-ap
deleted file mode 100644
index f6d82ab7175..00000000000
--- a/net/netatalk-umich/patches/patch-ap
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ap,v 1.1.1.1 2002/05/25 12:25:52 markd Exp $
-
---- libatalk/atp/atp_rsel.c	Thu Oct  2 00:32:56 1997
-+++ libatalk/atp/atp_rsel.c	Mon Aug 30 06:47:42 1999
-@@ -9,6 +9,7 @@
- #include <sys/errno.h>
- #include <sys/uio.h>
- #include <signal.h>
-+#include <string.h>
- 
- #include <netatalk/endian.h>
- #include <netatalk/at.h>
diff --git a/net/netatalk-umich/patches/patch-aq b/net/netatalk-umich/patches/patch-aq
deleted file mode 100644
index 994e9683c5f..00000000000
--- a/net/netatalk-umich/patches/patch-aq
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: patch-aq,v 1.1.1.1 2002/05/25 12:25:52 markd Exp $
-
---- libatalk/compat/Makefile.inc	Wed Dec 31 16:00:00 1969
-+++ libatalk/compat/Makefile.inc	Mon Aug 30 06:47:43 1999
-@@ -0,0 +1,3 @@
-+.PATH: ${.CURDIR}/compat
-+
-+SRCS+=	mktemp.c getusershell.c strcasecmp.c strstr.c flock.c sigvec.c
diff --git a/net/netatalk-umich/patches/patch-ar b/net/netatalk-umich/patches/patch-ar
deleted file mode 100644
index 893747bf750..00000000000
--- a/net/netatalk-umich/patches/patch-ar
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: patch-ar,v 1.1.1.1 2002/05/25 12:25:52 markd Exp $
-
---- libatalk/nbp/Makefile.inc	Wed Dec 31 16:00:00 1969
-+++ libatalk/nbp/Makefile.inc	Mon Aug 30 06:47:43 1999
-@@ -0,0 +1,3 @@
-+.PATH: ${.CURDIR}/nbp
-+
-+SRCS+= nbp_util.c nbp_lkup.c nbp_rgstr.c nbp_unrgstr.c
diff --git a/net/netatalk-umich/patches/patch-as b/net/netatalk-umich/patches/patch-as
deleted file mode 100644
index 0c5d4c37450..00000000000
--- a/net/netatalk-umich/patches/patch-as
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-as,v 1.1.1.1 2002/05/25 12:25:52 markd Exp $
-
---- libatalk/nbp/nbp_lkup.c	Tue Oct  7 14:21:57 1997
-+++ libatalk/nbp/nbp_lkup.c	Mon Aug 30 06:47:43 1999
-@@ -6,7 +6,7 @@
- #include <sys/types.h>
- #include <sys/param.h>
- #include <sys/socket.h>
--#include <sys/signal.h>
-+#include <signal.h>
- #include <sys/time.h>
- #include <strings.h>
- #include <netdb.h>
diff --git a/net/netatalk-umich/patches/patch-at b/net/netatalk-umich/patches/patch-at
deleted file mode 100644
index 4019be1b034..00000000000
--- a/net/netatalk-umich/patches/patch-at
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-at,v 1.1.1.1 2002/05/25 12:25:52 markd Exp $
-
---- libatalk/nbp/nbp_rgstr.c	Tue Oct  7 14:22:14 1997
-+++ libatalk/nbp/nbp_rgstr.c	Mon Aug 30 06:47:43 1999
-@@ -6,7 +6,7 @@
- #include <sys/types.h>
- #include <sys/param.h>
- #include <sys/socket.h>
--#include <sys/signal.h>
-+#include <signal.h>
- #include <sys/time.h>
- #include <sys/errno.h>
- #include <strings.h>
diff --git a/net/netatalk-umich/patches/patch-au b/net/netatalk-umich/patches/patch-au
deleted file mode 100644
index 742f42d7e86..00000000000
--- a/net/netatalk-umich/patches/patch-au
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-au,v 1.1.1.1 2002/05/25 12:25:52 markd Exp $
-
---- libatalk/nbp/nbp_unrgstr.c	Tue Oct  7 14:22:39 1997
-+++ libatalk/nbp/nbp_unrgstr.c	Mon Aug 30 06:47:43 1999
-@@ -6,7 +6,7 @@
- #include <sys/types.h>
- #include <sys/param.h>
- #include <sys/socket.h>
--#include <sys/signal.h>
-+#include <signal.h>
- #include <sys/time.h>
- #include <sys/errno.h>
- #include <strings.h>
diff --git a/net/netatalk-umich/patches/patch-av b/net/netatalk-umich/patches/patch-av
deleted file mode 100644
index ca916e4639c..00000000000
--- a/net/netatalk-umich/patches/patch-av
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-av,v 1.1.1.1 2002/05/25 12:25:52 markd Exp $
-
---- libatalk/nbp/nbp_util.c	Tue Oct  7 14:21:38 1997
-+++ libatalk/nbp/nbp_util.c	Mon Aug 30 06:47:43 1999
-@@ -6,7 +6,7 @@
- #include <sys/types.h>
- #include <sys/param.h>
- #include <sys/socket.h>
--#include <sys/signal.h>
-+#include <signal.h>
- #include <sys/time.h>
- #include <sys/syslog.h>
- #include <netdb.h>
diff --git a/net/netatalk-umich/patches/patch-aw b/net/netatalk-umich/patches/patch-aw
deleted file mode 100644
index 1321b61ffe7..00000000000
--- a/net/netatalk-umich/patches/patch-aw
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: patch-aw,v 1.1.1.1 2002/05/25 12:25:52 markd Exp $
-
---- libatalk/util/Makefile.inc	Wed Dec 31 16:00:00 1969
-+++ libatalk/util/Makefile.inc	Mon Aug 30 06:47:43 1999
-@@ -0,0 +1,3 @@
-+.PATH: ${.CURDIR}/util
-+
-+SRCS+=	atalk_addr.c strdicasecmp.c
diff --git a/net/netatalk-umich/patches/patch-ax b/net/netatalk-umich/patches/patch-ax
deleted file mode 100644
index 7f4925e0d08..00000000000
--- a/net/netatalk-umich/patches/patch-ax
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ax,v 1.1.1.1 2002/05/25 12:25:52 markd Exp $
-
---- man/Makefile	Tue Feb 20 08:38:07 1996
-+++ man/Makefile	Mon Aug 30 06:47:43 1999
-@@ -7,7 +7,7 @@
- 
- ${ALL}: FRC
- 	cd $@; ${MAKE} ${MFLAGS} CC="${CC}" DEFS="${DEFS}" \
--	    OPTOPTS="${OPTOPTS}" DESTDIR="${DESTDIR}" MANDIR="${MANDIR}" \
-+	    OPTOPTS="${OPTOPTS}" ATALK_DESTDIR="${ATALK_DESTDIR}" MANDIR="${MANDIR}" \
- 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
- 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}"
- 
-@@ -24,7 +24,7 @@
- 	-mkdir ${MANDIR}
- 	for i in ${ALL}; \
- 	    do (cd $$i; ${MAKE} ${MFLAGS} \
--		DESTDIR="${DESTDIR}"  MANDIR="${MANDIR}" \
-+		ATALK_DESTDIR="${ATALK_DESTDIR}"  MANDIR="${MANDIR}" \
- 		SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
- 	        ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
- 		INSTALL="${INSTALL}" install); \
diff --git a/net/netatalk-umich/patches/patch-ay b/net/netatalk-umich/patches/patch-ay
deleted file mode 100644
index 8bf7cc13024..00000000000
--- a/net/netatalk-umich/patches/patch-ay
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ay,v 1.1.1.1 2002/05/25 12:25:52 markd Exp $
-
---- man/man1/Makefile	Tue Feb 20 09:16:24 1996
-+++ man/man1/Makefile	Mon Aug 30 06:47:43 1999
-@@ -16,7 +16,7 @@
- 	-mkdir ${MANDIR}/man1
- 	for i in ${SRC} ; do \
- 	    rm -f ${MANDIR}/man1/$$i; \
--	    sed -e s@:DESTDIR:@${DESTDIR}@ -e s@:SBINDIR:@${SBINDIR}@ \
-+	    sed -e s@:DESTDIR:@${ATALK_DESTDIR}@ -e s@:SBINDIR:@${SBINDIR}@ \
- 		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
- 		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
- 		-e s@:INCDIR:@${INCDIR}@ \
diff --git a/net/netatalk-umich/patches/patch-az b/net/netatalk-umich/patches/patch-az
deleted file mode 100644
index b1d057ffe39..00000000000
--- a/net/netatalk-umich/patches/patch-az
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-az,v 1.1.1.1 2002/05/25 12:25:52 markd Exp $
-
---- man/man3/Makefile	Tue Feb 20 09:16:49 1996
-+++ man/man3/Makefile	Mon Aug 30 06:47:44 1999
-@@ -14,7 +14,7 @@
- 	-mkdir ${MANDIR}/man3
- 	for i in ${SRC} ; do \
- 	    rm -f ${MANDIR}/man3/$$i; \
--	    sed -e s@:DESTDIR:@${DESTDIR}@ -e s@:SBINDIR:@${SBINDIR}@ \
-+	    sed -e s@:DESTDIR:@${ATALK_DESTDIR}@ -e s@:SBINDIR:@${SBINDIR}@ \
- 		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
- 		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
- 		-e s@:INCDIR:@${INCDIR}@ \
diff --git a/net/netatalk-umich/patches/patch-ba b/net/netatalk-umich/patches/patch-ba
deleted file mode 100644
index 4f29a5ddf3e..00000000000
--- a/net/netatalk-umich/patches/patch-ba
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ba,v 1.1.1.1 2002/05/25 12:25:52 markd Exp $
-
---- man/man4/Makefile	Tue Feb 20 09:02:27 1996
-+++ man/man4/Makefile	Mon Aug 30 06:47:44 1999
-@@ -13,7 +13,7 @@
- 	-mkdir ${MANDIR}/man4
- 	for i in ${SRC} ; do \
- 	    rm -f ${MANDIR}/man4/$$i; \
--	    sed -e s@:DESTDIR:@${DESTDIR}@ -e s@:SBINDIR:@${SBINDIR}@ \
-+	    sed -e s@:DESTDIR:@${ATALK_DESTDIR}@ -e s@:SBINDIR:@${SBINDIR}@ \
- 		    -e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
- 		    -e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
- 		    -e s@:INCDIR:@${INCDIR}@ \
diff --git a/net/netatalk-umich/patches/patch-bb b/net/netatalk-umich/patches/patch-bb
deleted file mode 100644
index 98d8f8485e4..00000000000
--- a/net/netatalk-umich/patches/patch-bb
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bb,v 1.1.1.1 2002/05/25 12:25:52 markd Exp $
-
---- man/man8/Makefile	Tue Feb 20 09:16:10 1996
-+++ man/man8/Makefile	Mon Aug 30 06:47:44 1999
-@@ -14,7 +14,7 @@
- 	-mkdir ${MANDIR}/man8
- 	for i in ${SRC} ; do \
- 	    rm -f ${MANDIR}/man8/$$i; \
--	    sed -e s@:DESTDIR:@${DESTDIR}@ -e s@:SBINDIR:@${SBINDIR}@ \
-+	    sed -e s@:DESTDIR:@${ATALK_DESTDIR}@ -e s@:SBINDIR:@${SBINDIR}@ \
- 		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
- 		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
- 		-e s@:INCDIR:@${INCDIR}@ \
diff --git a/net/netatalk-umich/patches/patch-bc b/net/netatalk-umich/patches/patch-bc
deleted file mode 100644
index 141c13d5326..00000000000
--- a/net/netatalk-umich/patches/patch-bc
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-bc,v 1.1.1.1 2002/05/25 12:25:52 markd Exp $
-
---- man/man8/psf.8	Tue Feb 20 08:38:20 1996
-+++ man/man8/psf.8	Mon Aug 30 06:47:44 1999
-@@ -90,13 +90,13 @@
- .RS
- .nf
- laser|lp|LaserWriter Plus on AppleTalk:\\
--    :sd=/usr/spool/lpd/laser:\\
--    :lp=/usr/spool/lpd/laser/null:\\
--    :lf=/var/adm/lpd-errs:pw#80:hl:\\
--    :of=:LIBDIR:/filters/ofpap:\\
--    :if=:LIBDIR:/filters/ifpaprev:\\
--    :tf=:LIBDIR:/filters/tfpaprev:\\
--    :df=:LIBDIR:/filters/dfpaprev:
-+    :sd=/usr/spool/output/laser:\\
-+    :lp=/usr/spool/output/laser/null:\\
-+    :lf=/var/log/lpd-errs:pw#80:hl:\\
-+    :of=:RESDIR:/psffilters/ofpap:\\
-+    :if=:RESDIR:/psffilters/ifpaprev:\\
-+    :tf=:RESDIR:/psffilters/tfpaprev:\\
-+    :df=:RESDIR:/psffilters/dfpaprev:
- .fi
- .RE
- .sp
-@@ -110,7 +110,7 @@
- for each printer, as has been done above.
- .LP
- Finally, there is a file in the spool directory,
--.BR /var/spool/lpd/laser ,
-+.BR /var/spool/output/laser ,
- called
- .BR .paprc ,
- which
diff --git a/net/netatalk-umich/patches/patch-bd b/net/netatalk-umich/patches/patch-bd
deleted file mode 100644
index 90bc77c536d..00000000000
--- a/net/netatalk-umich/patches/patch-bd
+++ /dev/null
@@ -1,63 +0,0 @@
-$NetBSD: patch-bd,v 1.1.1.1 2002/05/25 12:25:52 markd Exp $
-
---- sys/netbsd/Makefile	Sat Sep 26 08:15:09 1998
-+++ sys/netbsd/Makefile	Wed Jun 28 19:36:36 2000
-@@ -1,9 +1,9 @@
- # NetBSD specific defines, passed to subdirectories.
- DEFS=	-DBSD4_4
--OPTOPTS=	-O2
--CC=	gcc -Werror -I../../sys/netbsd/
-+#CC=	gcc -Werror -I../../sys/netbsd/
-+OPTOPTS= -Werror -I../../sys/netbsd/
- INSTALL=	install
--ADDLIBS=	-lcrypt
-+ADDLIBS=	-Wl,-R${LIBDIR} -lcrypt
- 
- ALL=	../../libatalk ../../include ../../bin ../../etc ../../man
- 
-@@ -16,12 +16,14 @@
- 	    ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
- 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
- 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
--	    DESTDIR="${DESTDIR}" AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" all
-+	    ATALK_DESTDIR="${ATALK_DESTDIR}" AFSDIR="${AFSDIR}" \
-+	    KRBDIR="${KRBDIR}" EXAMPLEDIR="${EXAMPLEDIR}" all
- 
- FRC:
- 
- install :
--	-mkdir ${DESTDIR} ${SBINDIR} ${BINDIR} ${ETCDIR} ${LIBDIR}
-+	-mkdir ${ATALK_DESTDIR} ${SBINDIR} ${BINDIR} ${ETCDIR}
-+	-mkdir ${LIBDIR} ${LIBEXECDIR} ${RESDIR} ${EXAMPLEDIR}
- 	for i in ${ALL}; \
- 	    do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \
- 		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
-@@ -30,19 +32,22 @@
- 		AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" \
- 		INSTALL="${INSTALL}" $@); \
- 	done
-+	for i in `ls ../../config`; \
-+		do ${INSTALL} -c ../../config/$$i ${EXAMPLEDIR}; \
-+	done
- 	rm -f ${ETCDIR}/rc.atalk
--	sed -e s@:DESTDIR:@${DESTDIR}@ -e s@:SBINDIR:@${SBINDIR}@ \
-+	sed -e s@:DESTDIR:@${ATALK_DESTDIR}@ -e s@:SBINDIR:@${SBINDIR}@ \
- 		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
- 		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
- 		-e s@:INCDIR:@${INCDIR}@ \
- 	    < ../../rc.atalk.bsd > ${ETCDIR}/rc.atalk
- 	@echo
--	@echo "Install is done.  If you're using a version of NetBSD"
--	@echo "earlier than 1.3, don't forget to add lines from"
--	@echo "services.atalk to /etc/services"
-+	@echo "Install is done."
-+	@echo
-+	@echo "Example configuration files are in ${EXAMPLEDIR}."
- 	@echo
--	@echo "Don't forget to call rc.atalk in /etc/rc.local.  See README"
--	@echo "and README.NETBSD for more information."
-+	@echo "Don't forget to call rc.atalk in /etc/rc.local.  See"
-+	@echo "README.NETBSD for kernel configuration information."
- 
- clean :
- 	for i in ${ALL}; \
diff --git a/net/netatalk-umich/patches/patch-be b/net/netatalk-umich/patches/patch-be
deleted file mode 100644
index c09132d270c..00000000000
--- a/net/netatalk-umich/patches/patch-be
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-be,v 1.1.1.1 2002/05/25 12:25:52 markd Exp $
-
---- etc/atalkd/main.c.orig	Sun Oct  5 17:50:47 1997
-+++ etc/atalkd/main.c	Tue Aug 31 15:58:11 1999
-@@ -191,10 +191,10 @@
- 		    syslog( LOG_INFO, "config for no router" );
- 		    if ( iface->i_flags & IFACE_PHASE2 ) {
--			iface->i_rt->rt_firstnet = 0;
-+			iface->i_rt->rt_firstnet = htons( 1 );
- 			iface->i_rt->rt_lastnet = htons( STARTUP_LASTNET );
- 			setaddr( iface, IFACE_PHASE2,
- 				iface->i_addr.sat_addr.s_net,
- 				iface->i_addr.sat_addr.s_node,
--				0, htons( STARTUP_LASTNET ));
-+				htons( 1 ), htons( STARTUP_LASTNET ));
- 		    }
- 		    if ( looproute( iface, RTMP_ADD ) < 0 ) {
-
diff --git a/net/netatalk-umich/patches/patch-bf b/net/netatalk-umich/patches/patch-bf
deleted file mode 100644
index dc4ddcdf81c..00000000000
--- a/net/netatalk-umich/patches/patch-bf
+++ /dev/null
@@ -1,61 +0,0 @@
-$NetBSD: patch-bf,v 1.1.1.1 2002/05/25 12:25:52 markd Exp $
-
---- etc/papd/printcap.c.orig	Sat Aug 16 19:20:28 1997
-+++ etc/papd/printcap.c	Mon Jan 17 19:40:24 2000
-@@ -159,6 +159,7 @@
- 	char ibuf[BUFSIZ];
- 	char *cp2;
- 	int tf;
-+	int skip;
- 
- 	hopcount = 0;
- 	tbuf = bp;
-@@ -177,7 +178,7 @@
- 			cp2 = getenv("TERM");
- 			if (cp2==(char *) 0 || strcmp(name,cp2)==0) {
- 				strcpy(bp,cp);
--				return(tnchktc());
-+				return(tnchktc(cap));
- 			} else {
- 				tf = open(cap, 0);
- 			}
-@@ -191,6 +192,7 @@
- #endif
- 	if (tf < 0)
- 		return (-1);
-+	skip = 0;
- 	for (;;) {
- 		cp = bp;
- 		for (;;) {
-@@ -204,12 +206,20 @@
- 			}
- 			c = ibuf[i++];
- 			if (c == '\n') {
--				if (cp > bp && cp[-1] == '\\'){
-+				if (!skip && cp > bp && cp[-1] == '\\'){
- 					cp--;
- 					continue;
- 				}
--				break;
-+				skip = 0;
-+				if (cp == bp)
-+					continue;
-+				else
-+					break;
- 			}
-+			if (c == '#' && cp == bp)
-+				skip++;
-+			if (skip)
-+				continue;
- 			if (cp >= bp+BUFSIZ) {
- 				write(2,"Termcap entry too long\n", 23);
- 				break;
-@@ -223,7 +233,7 @@
- 		 */
- 		if (tnamatch(name)) {
- 			close(tf);
--			return(tnchktc());
-+			return(tnchktc(cap));
- 		}
- 	}
- }
diff --git a/net/netatalk-umich/patches/patch-bg b/net/netatalk-umich/patches/patch-bg
deleted file mode 100644
index e9cd0e33730..00000000000
--- a/net/netatalk-umich/patches/patch-bg
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bg,v 1.1.1.1 2002/05/25 12:25:52 markd Exp $
---- config/AppleVolumes.system.orig	Fri Jul 28 00:53:30 2000
-+++ config/AppleVolumes.system	Fri Jul 28 00:53:08 2000
-@@ -26,7 +26,7 @@
- .html	TEXT	MOS!
- .rtf	TEXT	MSWD
- .doc	WDBN	MSWD
--.pdf	CARO	PDF 
-+.pdf	PDF 	CARO
- 
- # compressed archives
- .bin	BINA	MB2P
diff --git a/net/netatalk-umich/patches/patch-bh b/net/netatalk-umich/patches/patch-bh
deleted file mode 100644
index 5cc1474928f..00000000000
--- a/net/netatalk-umich/patches/patch-bh
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bh,v 1.1.1.1 2002/05/25 12:25:52 markd Exp $
---- etc/atalkd/route.c.orig	Tue Oct 17 23:29:04 2000
-+++ etc/atalkd/route.c	Tue Oct 17 23:30:19 2000
-@@ -34,7 +34,8 @@
-     u_char	sam_family;
-     u_short	sam_pad;
-     u_short	sam_mask;
--} mask = { sizeof( struct sockaddr_m ), 0, 0, 0xffff };
-+    u_short	sam_pad2;
-+} mask = { sizeof( struct sockaddr_m ), 0, 0, 0xffff, 0 };
- 
- struct rt_msg_at {
-     struct rt_msghdr	rtma_rtm;
diff --git a/net/netatalk-umich/patches/patch-bi b/net/netatalk-umich/patches/patch-bi
deleted file mode 100644
index 4f1960c712b..00000000000
--- a/net/netatalk-umich/patches/patch-bi
+++ /dev/null
@@ -1,83 +0,0 @@
-$NetBSD: patch-bi,v 1.1 2004/01/08 12:06:37 agc Exp $
-
---- include/netatalk/endian.h	2004/01/08 11:45:27	1.1
-+++ include/netatalk/endian.h	2004/01/08 11:56:33
-@@ -8,17 +8,25 @@
- 
- #ifdef _IBMR2
- #include <sys/machine.h>
--#endif _IBMR2
-+#endif /* _IBMR2 */
- 
- #ifdef linux
- #include <bytesex.h>
- #define BYTE_ORDER	__BYTE_ORDER
- #include <asm/byteorder.h>
--#endif linux
-+#endif /* linux */
- 
- #ifdef __svr4__
- #include <sys/byteorder.h>
--#endif __svr4__
-+#endif /* __svr4__ */
-+
-+#include <sys/param.h>
-+
-+/* All Net2-derived systems should have <machine/endian.h> */
-+
-+#if (defined(BSD) && BSD >= 199306)
-+#include <machine/endian.h>
-+#endif
- 
- # ifndef BYTE_ORDER
- #define LITTLE_ENDIAN	1234
-@@ -28,9 +36,9 @@
- #ifdef sun
- #ifdef i386
- #define BYTE_ORDER	LITTLE_ENDIAN
--#else i386
-+#else /* i386 */
- #define BYTE_ORDER	BIG_ENDIAN
--#endif i386
-+#endif /* i386 */
- #else
- #ifdef MIPSEB
- #define BYTE_ORDER	BIG_ENDIAN
-@@ -39,10 +47,10 @@
- #define BYTE_ORDER	LITTLE_ENDIAN
- #else
- Like, what is your byte order, man?
--#endif MIPSEL
--#endif MIPSEB
--#endif sun
--# endif BYTE_ORDER
-+#endif /* MIPSEL */
-+#endif /* MIPSEB */
-+#endif /* sun */
-+# endif /* BYTE_ORDER */
- 
- # ifndef ntohl
- # if defined( sun ) || defined( ultrix ) || defined( _IBMR2 )
-@@ -59,15 +67,15 @@
- #define	htonl(x)	nuxi_l(x)
- #define	htons(x)	nuxi_s(x)
- 
--#else mips KERNEL
-+#else /* mips KERNEL */
- 
- #if !( defined( sun ) && defined( i386 ))
- unsigned short	ntohs(), htons();
- unsigned long	ntohl(), htonl();
--#endif sun i386
-+#endif /* sun i386 */
- 
--#endif mips KERNEL
--#endif BYTE_ORDER
--# endif sun ultrix _IBMR2
--# endif ntohl
--#  endif _ATALK_ENDIAN_H_
-+#endif /* mips KERNEL */
-+#endif /* BYTE_ORDER */
-+# endif /* sun ultrix _IBMR2 */
-+# endif /* ntohl */
-+#  endif /* _ATALK_ENDIAN_H_ */
diff --git a/net/xarchie/DESCR b/net/xarchie/DESCR
deleted file mode 100644
index 6b55bb53f42..00000000000
--- a/net/xarchie/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-		George Ferguson, ferguson@cs.rochester.edu
-			 Last Change: 24 Aug 1993
-
-     This is release 2.0 of xarchie -- an X browser interface to
-     the Archie Internet information system.  See README for original
-     unabridged text of description.
diff --git a/net/xarchie/Makefile b/net/xarchie/Makefile
deleted file mode 100644
index 0abc8953086..00000000000
--- a/net/xarchie/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2003/07/17 22:52:04 grant Exp $
-# FreeBSD Id: Makefile,v 1.12 1996/12/01 01:23:22 obrien Exp
-#
-
-DISTNAME=		xarchie-2.0.10
-PKGREVISION=		1
-CATEGORIES=		net
-MASTER_SITES=		${MASTER_SITE_XCONTRIB:=applications/}
-
-MAINTAINER=		tech-pkg@NetBSD.org
-COMMENT=		X11 front-end program for the archie network search service
-
-USE_IMAKE=		yes
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/net/xarchie/PLIST b/net/xarchie/PLIST
deleted file mode 100644
index 790dee0ca25..00000000000
--- a/net/xarchie/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2003/03/03 02:56:01 jschauma Exp $
-bin/xarchie
-lib/X11/app-defaults/Xarchie
-${IMAKE_MAN_DIR}/xarchie.${IMAKE_MANNEWSUFFIX}
diff --git a/net/xarchie/distinfo b/net/xarchie/distinfo
deleted file mode 100644
index 731a0893ad7..00000000000
--- a/net/xarchie/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 11:23:41 wiz Exp $
-
-SHA1 (xarchie-2.0.10.tar.gz) = e791f32dbdcad1514fac2c6c7bf49843362ac5e8
-Size (xarchie-2.0.10.tar.gz) = 274360 bytes
-SHA1 (patch-aa) = 855419e702d717b11aebea335a53ddef5f95669a
diff --git a/net/xarchie/patches/patch-aa b/net/xarchie/patches/patch-aa
deleted file mode 100644
index 3c17c65aea7..00000000000
--- a/net/xarchie/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 11:11:06 agc Exp $
-
-*** FWF/Dir/Imakefile.orig	Sat Sep 24 04:28:46 1994
---- FWF/Dir/Imakefile	Sat Sep 24 04:29:05 1994
-***************
-*** 28,34 ****
-  	    else echo "";					\
-  	    fi; exit 0)
-  	@rm -f regexp.h
-! 	@(if [ ! -f /usr/include/regexp.h ];			\
-  	    then echo "Patching because no regexp.h";		\
-  	         echo "#ifndef _BRIREGEXP_H_" > regexp.h;	\
-  	         echo "#define _BRIREGEXP_H_" >> regexp.h;	\
---- 28,34 ----
-  	    else echo "";					\
-  	    fi; exit 0)
-  	@rm -f regexp.h
-! 	@(if [ ! -f /usr/include/__regexp.h ];			\
-  	    then echo "Patching because no regexp.h";		\
-  	         echo "#ifndef _BRIREGEXP_H_" > regexp.h;	\
-  	         echo "#define _BRIREGEXP_H_" >> regexp.h;	\