Update netatalk to version 1.5.3.1.

Update supplied by David Rankin (to version 1.5.2) in pkg/15642
further updated to 1.5.3.1 by me.

Changes since the old umich version (and netatalk-asun) are numerous
bug fixes, cleanups and new features and its actively being maintained.

34 files changed, 109 insertions, 719 deletions

diff --git a/net/netatalk/patches/patch-aa b/net/netatalk/patches/patch-aa
index 2a8c82da0d0..df1b15e9642 100644
--- a/net/netatalk/patches/patch-aa
+++ b/net/netatalk/patches/patch-aa
@@ -1,53 +1,19 @@
-$NetBSD: patch-aa,v 1.3 2000/07/26 19:03:20 jlam Exp $
+$NetBSD: patch-aa,v 1.4 2002/05/25 12:55:25 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:
- 
+--- distrib/initscripts/Makefile.in.orig	Sat Feb 16 06:52:26 2002
++++ distrib/initscripts/Makefile.in	Sat Feb 16 06:57:46 2002
+@@ -149,12 +149,12 @@
+ # checking for NetBSD init scripts
+ #
+ @USE_COBALT_TRUE@sysvdir = /etc/rc.d/init.d
+-@USE_NETBSD_TRUE@sysvdir = /etc/rc.d
++@USE_NETBSD_TRUE@sysvdir = ${prefix}/etc/rc.d
+ @USE_REDHAT_TRUE@sysvdir = /etc/rc.d/init.d
+ @USE_SUSE_TRUE@sysvdir = /etc/rc.d
+ @USE_TRU64_TRUE@sysvdir = /sbin/init.d
+ @USE_COBALT_TRUE@sysv_SCRIPTS = atalk
+-@USE_NETBSD_TRUE@sysv_SCRIPTS = afp atalk pap timelord
++@USE_NETBSD_TRUE@sysv_SCRIPTS = afpd atalkd papd timelord
+ @USE_REDHAT_TRUE@sysv_SCRIPTS = atalk
+ @USE_SUSE_TRUE@sysv_SCRIPTS = atalk
+ @USE_TRU64_TRUE@sysv_SCRIPTS = atalk
diff --git a/net/netatalk/patches/patch-ab b/net/netatalk/patches/patch-ab
index d62ca8d8e50..3c41fb2341f 100644
--- a/net/netatalk/patches/patch-ab
+++ b/net/netatalk/patches/patch-ab
@@ -1,22 +1,13 @@
-$NetBSD: patch-ab,v 1.2 1999/08/31 22:09:42 wrstuden Exp $
+$NetBSD: patch-ab,v 1.3 2002/05/25 12:55:25 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}"
+--- configure.orig	Thu Mar 28 10:20:55 2002
++++ configure	Wed May 22 00:04:08 2002
+@@ -8267,7 +8267,7 @@
+ fi
  
- 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
+-	NLSDIR="${PKGCONFDIR}/nls"
++	NLSDIR="${prefix}/share/netatalk/nls"
  
- clean:
+ 	# Check whether --with-nls-dir or --without-nls-dir was given.
+ if test "${with_nls_dir+set}" = set; then
diff --git a/net/netatalk/patches/patch-ac b/net/netatalk/patches/patch-ac
index 98218d3798a..0226d09b17e 100644
--- a/net/netatalk/patches/patch-ac
+++ b/net/netatalk/patches/patch-ac
@@ -1,22 +1,19 @@
-$NetBSD: patch-ac,v 1.2 1999/08/31 22:09:42 wrstuden Exp $
+$NetBSD: patch-ac,v 1.3 2002/05/25 12:55:25 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
- 
+--- etc/atalkd/main.c.orig	Mon Dec 31 15:05:20 2001
++++ etc/atalkd/main.c	Mon Jan 14 21:59:05 2002
+@@ -276,12 +276,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/patches/patch-ad b/net/netatalk/patches/patch-ad
index 6cb63f815c6..8a11009d4e7 100644
--- a/net/netatalk/patches/patch-ad
+++ b/net/netatalk/patches/patch-ad
@@ -1,13 +1,47 @@
-$NetBSD: patch-ad,v 1.2 1999/08/31 22:09:42 wrstuden Exp $
+$NetBSD: patch-ad,v 1.3 2002/05/25 12:55:25 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}" \
+--- include/atalk/paths.h.orig	Thu Dec 20 06:43:20 2001
++++ include/atalk/paths.h	Thu Dec 20 06:44:02 2001
+@@ -19,11 +19,7 @@
+ #  if defined (FHS_COMPATIBILITY)
+ #    define _PATH_LOCKDIR	"/var/run/"
+ #  elif defined (BSD4_4)
+-#    ifdef MACOSX_SERVER
+ #      define _PATH_LOCKDIR	"/var/run/"
+-#    else
+-#      define _PATH_LOCKDIR	"/var/spool/lock/"
+-#    endif
+ #  elif defined (linux)
+ #    define _PATH_LOCKDIR	"/var/lock/"
+ #  else
+@@ -51,30 +47,18 @@
+  */
+ #define _PATH_ATALKDEBUG	"/tmp/atalkd.debug"
+ #define _PATH_ATALKDTMP		"atalkd.tmp"
+-#ifdef FHS_COMPATIBILITY
+ #  define _PATH_ATALKDLOCK	ATALKPATHCAT(_PATH_LOCKDIR,"atalkd.pid")
+-#else
+-#  define _PATH_ATALKDLOCK	ATALKPATHCAT(_PATH_LOCKDIR,"atalkd")
+-#endif
+ 
+ /*
+  * psorder paths
+  */
+ #define _PATH_TMPPAGEORDER	"/tmp/psorderXXXXXX"
+-#ifdef FHS_COMPATIBILITY
+ #  define _PATH_PAPDLOCK	ATALKPATHCAT(_PATH_LOCKDIR,"papd.pid")
+-#else
+-#  define _PATH_PAPDLOCK	ATALKPATHCAT(_PATH_LOCKDIR,"papd")
+-#endif
+ 
+ /*
+  * afpd paths
+  */
+ #define _PATH_AFPTKT		"/tmp/AFPtktXXXXXX"
+-#ifdef FHS_COMPATIBILITY
+ #  define _PATH_AFPDLOCK	ATALKPATHCAT(_PATH_LOCKDIR,"afpd.pid")
+-#else
+-#  define _PATH_AFPDLOCK	ATALKPATHCAT(_PATH_LOCKDIR,"afpd")
+-#endif
+ 
+ #endif /* atalk/paths.h */
diff --git a/net/netatalk/patches/patch-ae b/net/netatalk/patches/patch-ae
index a824bf23677..6939d129f1d 100644
--- a/net/netatalk/patches/patch-ae
+++ b/net/netatalk/patches/patch-ae
@@ -1,31 +1,19 @@
-$NetBSD: patch-ae,v 1.2 1999/08/31 22:09:42 wrstuden Exp $
+$NetBSD: patch-ae,v 1.3 2002/05/25 12:55:25 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;
-     }
+--- man/man8/psf.8.tmpl.orig	Wed Dec 19 15:19:21 2001
++++ man/man8/psf.8.tmpl	Wed Dec 19 15:21:29 2001
+@@ -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=:SBINDIR:/filters/ofpap:\\
++    :if=:SBINDIR:/filters/ifpaprev:\\
++    :tf=:SBINDIR:/filters/tfpaprev:\\
++    :df=:SBINDIR:/filters/dfpaprev:
+ .fi
+ .RE
+ .sp
diff --git a/net/netatalk/patches/patch-af b/net/netatalk/patches/patch-af
deleted file mode 100644
index a490f081dcc..00000000000
--- a/net/netatalk/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.2 1999/08/31 22:09:42 wrstuden 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/patches/patch-ag b/net/netatalk/patches/patch-ag
deleted file mode 100644
index 391c830888a..00000000000
--- a/net/netatalk/patches/patch-ag
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ag,v 1.2 1999/08/31 22:09:43 wrstuden 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/patches/patch-ah b/net/netatalk/patches/patch-ah
deleted file mode 100644
index cc83966e3f4..00000000000
--- a/net/netatalk/patches/patch-ah
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-ah,v 1.2 1999/08/31 22:09:43 wrstuden 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/patches/patch-ai b/net/netatalk/patches/patch-ai
deleted file mode 100644
index c0f324a004b..00000000000
--- a/net/netatalk/patches/patch-ai
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ai,v 1.2 1999/08/31 22:09:43 wrstuden 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/patches/patch-aj b/net/netatalk/patches/patch-aj
deleted file mode 100644
index cacad8fe0f5..00000000000
--- a/net/netatalk/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.2 1999/08/31 22:09:43 wrstuden 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/patches/patch-ak b/net/netatalk/patches/patch-ak
deleted file mode 100644
index 3ab2097fcfa..00000000000
--- a/net/netatalk/patches/patch-ak
+++ /dev/null
@@ -1,80 +0,0 @@
-$NetBSD: patch-ak,v 1.2 1999/08/31 22:09:43 wrstuden 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/patches/patch-al b/net/netatalk/patches/patch-al
deleted file mode 100644
index 92ed98205ae..00000000000
--- a/net/netatalk/patches/patch-al
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: patch-al,v 1.2 1999/08/31 22:09:43 wrstuden 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/patches/patch-am b/net/netatalk/patches/patch-am
deleted file mode 100644
index 2dd9cbde640..00000000000
--- a/net/netatalk/patches/patch-am
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-am,v 1.2 1999/08/31 22:09:43 wrstuden 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/patches/patch-an b/net/netatalk/patches/patch-an
deleted file mode 100644
index 3427bbb30ff..00000000000
--- a/net/netatalk/patches/patch-an
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-an,v 1.2 1999/08/31 22:09:43 wrstuden 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/patches/patch-ao b/net/netatalk/patches/patch-ao
deleted file mode 100644
index 16ba55b795d..00000000000
--- a/net/netatalk/patches/patch-ao
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-ao,v 1.2 1999/08/31 22:09:43 wrstuden 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/patches/patch-ap b/net/netatalk/patches/patch-ap
deleted file mode 100644
index e478e9bc641..00000000000
--- a/net/netatalk/patches/patch-ap
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ap,v 1.2 1999/08/31 22:09:43 wrstuden 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/patches/patch-aq b/net/netatalk/patches/patch-aq
deleted file mode 100644
index be716f31ce1..00000000000
--- a/net/netatalk/patches/patch-aq
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: patch-aq,v 1.2 1999/08/31 22:09:43 wrstuden 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/patches/patch-ar b/net/netatalk/patches/patch-ar
deleted file mode 100644
index 84b95d97e7c..00000000000
--- a/net/netatalk/patches/patch-ar
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: patch-ar,v 1.2 1999/08/31 22:09:43 wrstuden 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/patches/patch-as b/net/netatalk/patches/patch-as
deleted file mode 100644
index b6a0615660e..00000000000
--- a/net/netatalk/patches/patch-as
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-as,v 1.2 1999/08/31 22:09:43 wrstuden 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/patches/patch-at b/net/netatalk/patches/patch-at
deleted file mode 100644
index d9c6dfaa088..00000000000
--- a/net/netatalk/patches/patch-at
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-at,v 1.2 1999/08/31 22:09:43 wrstuden 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/patches/patch-au b/net/netatalk/patches/patch-au
deleted file mode 100644
index f1fbb54b015..00000000000
--- a/net/netatalk/patches/patch-au
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-au,v 1.2 1999/08/31 22:09:43 wrstuden 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/patches/patch-av b/net/netatalk/patches/patch-av
deleted file mode 100644
index f782738cc9b..00000000000
--- a/net/netatalk/patches/patch-av
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-av,v 1.2 1999/08/31 22:09:43 wrstuden 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/patches/patch-aw b/net/netatalk/patches/patch-aw
deleted file mode 100644
index a6c0057b650..00000000000
--- a/net/netatalk/patches/patch-aw
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: patch-aw,v 1.4 1999/08/31 22:09:43 wrstuden 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/patches/patch-ax b/net/netatalk/patches/patch-ax
deleted file mode 100644
index a8c20ec08cb..00000000000
--- a/net/netatalk/patches/patch-ax
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ax,v 1.2 1999/08/31 22:09:43 wrstuden 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/patches/patch-ay b/net/netatalk/patches/patch-ay
deleted file mode 100644
index 4d8ff693ff4..00000000000
--- a/net/netatalk/patches/patch-ay
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ay,v 1.2 1999/08/31 22:09:43 wrstuden 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/patches/patch-az b/net/netatalk/patches/patch-az
deleted file mode 100644
index 729ee9957e6..00000000000
--- a/net/netatalk/patches/patch-az
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-az,v 1.2 1999/08/31 22:09:43 wrstuden 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/patches/patch-ba b/net/netatalk/patches/patch-ba
deleted file mode 100644
index 71f4450ba6b..00000000000
--- a/net/netatalk/patches/patch-ba
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ba,v 1.2 1999/08/31 22:09:43 wrstuden 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/patches/patch-bb b/net/netatalk/patches/patch-bb
deleted file mode 100644
index 7d31ea7be71..00000000000
--- a/net/netatalk/patches/patch-bb
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bb,v 1.2 1999/08/31 22:09:43 wrstuden 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/patches/patch-bc b/net/netatalk/patches/patch-bc
deleted file mode 100644
index 6a46db8f641..00000000000
--- a/net/netatalk/patches/patch-bc
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-bc,v 1.1 1999/08/31 22:09:43 wrstuden 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/patches/patch-bd b/net/netatalk/patches/patch-bd
deleted file mode 100644
index 5b0825b8183..00000000000
--- a/net/netatalk/patches/patch-bd
+++ /dev/null
@@ -1,63 +0,0 @@
-$NetBSD: patch-bd,v 1.2 2000/06/29 03:01:36 wrstuden 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/patches/patch-be b/net/netatalk/patches/patch-be
deleted file mode 100644
index 674e9dc72e1..00000000000
--- a/net/netatalk/patches/patch-be
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-be,v 1.1 1999/09/17 17:30:30 bouyer 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/patches/patch-bf b/net/netatalk/patches/patch-bf
deleted file mode 100644
index 99adf75d6cf..00000000000
--- a/net/netatalk/patches/patch-bf
+++ /dev/null
@@ -1,61 +0,0 @@
-$NetBSD: patch-bf,v 1.1 2000/01/18 01:09:25 christos 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/patches/patch-bg b/net/netatalk/patches/patch-bg
deleted file mode 100644
index d3149aee105..00000000000
--- a/net/netatalk/patches/patch-bg
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bg,v 1.1 2000/07/28 05:08:56 jwise 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/patches/patch-bh b/net/netatalk/patches/patch-bh
deleted file mode 100644
index 240218b7242..00000000000
--- a/net/netatalk/patches/patch-bh
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bh,v 1.1 2000/10/18 03:59:33 briggs 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;