Pull in the relevant patches from the stock NetBSD netatalk package

37 files changed, 813 insertions, 588 deletions

diff --git a/net/netatalk-asun/Makefile b/net/netatalk-asun/Makefile
index f7a248653bf..971486a8bdd 100644
--- a/net/netatalk-asun/Makefile
+++ b/net/netatalk-asun/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/07/31 17:36:01 abs Exp $
+# $NetBSD: Makefile,v 1.2 2000/07/31 18:33:46 abs Exp $
 
 DISTNAME=	netatalk-1.4b2+asun2.1.3
-PKGNAME=	netatalk-asun-2.1.3
+PKGNAME=	netatalk-asun-2.1.3nb1
 CATEGORIES=	net print
 MASTER_SITES=   ftp://ftp.hanse.de/sites/transit/mirror/ftp.u.washington.edu/public/asun/
 
diff --git a/net/netatalk-asun/files/patch-sum b/net/netatalk-asun/files/patch-sum
index 3c774e2543a..5cfaec77d8a 100644
--- a/net/netatalk-asun/files/patch-sum
+++ b/net/netatalk-asun/files/patch-sum
@@ -1,25 +1,36 @@
-$NetBSD: patch-sum,v 1.1.1.1 2000/07/31 17:36:01 abs Exp $
+$NetBSD: patch-sum,v 1.2 2000/07/31 18:33:47 abs Exp $
 
-MD5 (patch-aa) = 52e496b64abbfbcd5e96a95e70bfd879
-MD5 (patch-ab) = 22df30d11cc80241a993ba1c8a0b045c
-MD5 (patch-ac) = a5d188aba1e25b0440a60548196906c8
-MD5 (patch-ad) = b08be45bffc5760760c467c64b28d2c3
-MD5 (patch-ae) = 478f09192ea8f2e752f3c134dd6914a7
-MD5 (patch-af) = 2a42ee6fb9bde4b3f3c6424ff58f6f5d
-MD5 (patch-ag) = 81032d4c56b37351da95d3bd09b3f667
-MD5 (patch-ah) = 7bcf0a8005a0c8b02a317dc22cad8470
-MD5 (patch-ai) = 31db7b2ab384e79c29e0f43deefb1979
-MD5 (patch-aj) = 8d908e872f726426342d27f57fcb1866
-MD5 (patch-ak) = b57cd527de222fae5c6298b4a568aecd
-MD5 (patch-al) = 54616bb4ae2664da3d12509ea0958245
-MD5 (patch-am) = 13aec52cd5657a8621a1414636816384
-MD5 (patch-an) = 1ae6c5744fbcc4709e56629159e32886
-MD5 (patch-ao) = 864504dd1cc1450f4fbffeddb58fa431
-MD5 (patch-ap) = de0ec8b9e22071bf3e226d2df40b3a1b
-MD5 (patch-aq) = 70c7d135a87d2374de842e99ea68a2c7
-MD5 (patch-ar) = 09432735c4961c0c1a045945a646e9ea
-MD5 (patch-as) = c460b86d1df69f044a0242d38599f0f3
-MD5 (patch-at) = 75245bf0f135051a15091ed1286d127d
-MD5 (patch-au) = 833fd3281c3642905f3e38c100b1e668
-MD5 (patch-av) = cfbf28c38a83293d34f94b549a71f073
-MD5 (patch-aw) = fafa4fd874a331e4daa0bbed6dba253b
+MD5 (patch-aa) = 46ed82d6697d21ce0b04c2e3b8243c8b
+MD5 (patch-ab) = 137583031766e6d75eec89285f2d6500
+MD5 (patch-ac) = e888021ff0555b331123a87e1e7b5a86
+MD5 (patch-ad) = 4e90ff17cc5539bf875cba65457ca420
+MD5 (patch-ae) = 314bc3225e044a2bce2cc2b63f5041e8
+MD5 (patch-af) = aa07bf2ea12eb045b7c368e943047ece
+MD5 (patch-ag) = bfc3d7a4172df44279e8e2d4d7aa5942
+MD5 (patch-ah) = 3cfaed4385f92144cfc9d7ae5124e04d
+MD5 (patch-ai) = 1a7d022d59ee666aeef8cdca68dfbac3
+MD5 (patch-aj) = ef01b8f7d165e69ad5898c26ff6c9725
+MD5 (patch-ak) = 98e0db823a1f6f1980275c55c2fc939b
+MD5 (patch-al) = f4ee952e33ad06c050c71f5c594510ae
+MD5 (patch-am) = 3f9a0d638e6af71d97686814d7542885
+MD5 (patch-an) = 267df68174aaddd2c54998379b824741
+MD5 (patch-ao) = e835a46e077dc1487e480ab3d4f83b62
+MD5 (patch-ap) = d81dcbfac5814e74b0228009ba291d25
+MD5 (patch-aq) = cec22414061fe786bcbdb77bd7ea5e66
+MD5 (patch-ar) = 05c825b8f3add209094fc5b8c693de90
+MD5 (patch-as) = 3e6593c74501dc7bc07f0b9b3398e79e
+MD5 (patch-at) = d89b6250c7da67fe7b69f004cd8f70d2
+MD5 (patch-au) = 6515ded3fd66ba9d3a2c16e0778e023d
+MD5 (patch-av) = 259ce58b98b08eeb543cc0c8939e14db
+MD5 (patch-aw) = bbc6fcbff220a23a8c4bbae228078fdc
+MD5 (patch-ax) = 976b6c7fd8994a56b9b8c268f12ebf81
+MD5 (patch-ay) = 3f05e3acc1322bcab978b22c01641215
+MD5 (patch-az) = 82149a7c9938ba9358fb85ddf7f373db
+MD5 (patch-ba) = e7c9d9ade3ea85ebf27c76e0faeac707
+MD5 (patch-bb) = 7cc061c4498c09f876b20dc8e94b3d4c
+MD5 (patch-bc) = 162897bc0d8d4c09646160656e49c8f5
+MD5 (patch-bd) = 0af514d83ef275a2b21b46dec0e9d80d
+MD5 (patch-be) = 5d55c347f1a88b7c3ee3e4e2d3ad3b2c
+MD5 (patch-bf) = 63201f981ef49ba997c0063606a9ef47
+MD5 (patch-bg) = 465f2f963d62462362b12888937886a4
+MD5 (patch-bh) = 94ba6a45abdb7ffbb58429816dfa6034
diff --git a/net/netatalk-asun/patches/patch-aa b/net/netatalk-asun/patches/patch-aa
index 0071b71fdcd..4dc9f917b1e 100644
--- a/net/netatalk-asun/patches/patch-aa
+++ b/net/netatalk-asun/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/07/31 17:36:01 abs Exp $
+$NetBSD: patch-aa,v 1.2 2000/07/31 18:33:48 abs Exp $
 
---- etc/afpd/nls/Makefile.orig	Sat Dec 12 11:01:06 1998
-+++ etc/afpd/nls/Makefile	Mon Jul 31 14:07:25 2000
-@@ -14,7 +14,7 @@
+--- include/atalk/atp.h.orig	Wed May 28 16:22:52 1997
++++ include/atalk/atp.h	Mon Jul 31 18:53:04 2000
+@@ -84,7 +84,7 @@
  
- install: 
- 	-mkdir ${RESDIR}/nls
--	${INSTALL} -m 644 maccode.* ${RESDIR}/nls
-+	${INSTALL} -c -m 644 maccode.* ${RESDIR}/nls
- 
- clean:
- 	rm -f *.o
+ 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-ab b/net/netatalk-asun/patches/patch-ab
index 37300381442..0ec42e682d0 100644
--- a/net/netatalk-asun/patches/patch-ab
+++ b/net/netatalk-asun/patches/patch-ab
@@ -1,41 +1,13 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/07/31 17:36:01 abs Exp $
+$NetBSD: patch-ab,v 1.2 2000/07/31 18:33:48 abs Exp $
 
---- etc/afpd/Makefile.orig	Sat Feb  6 20:02:31 1999
-+++ etc/afpd/Makefile	Mon Jul 31 14:07:25 2000
-@@ -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}"
+--- etc/afpd/nls/Makefile.orig	Sat Dec 12 11:01:06 1998
++++ etc/afpd/nls/Makefile	Mon Jul 31 18:46:19 2000
+@@ -14,7 +14,7 @@
  
-@@ -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}
+ install: 
+ 	-mkdir ${RESDIR}/nls
+-	${INSTALL} -m 644 maccode.* ${RESDIR}/nls
++	${INSTALL} -c -m 644 maccode.* ${RESDIR}/nls
  
- 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}" \
+ clean:
+ 	rm -f *.o
diff --git a/net/netatalk-asun/patches/patch-ac b/net/netatalk-asun/patches/patch-ac
index 0f688913ec7..827efd675ea 100644
--- a/net/netatalk-asun/patches/patch-ac
+++ b/net/netatalk-asun/patches/patch-ac
@@ -1,14 +1,41 @@
-$NetBSD: patch-ac,v 1.1.1.1 2000/07/31 17:36:01 abs Exp $
+$NetBSD: patch-ac,v 1.2 2000/07/31 18:33:48 abs Exp $
 
---- etc/afpd/status.c.orig	Wed Dec 16 18:38:38 1998
-+++ etc/afpd/status.c	Mon Jul 31 14:07:25 2000
-@@ -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;
+--- etc/afpd/Makefile.orig	Sat Feb  6 20:02:31 1999
++++ etc/afpd/Makefile	Mon Jul 31 18:46:19 2000
+@@ -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}"
  
-     status = (struct afp_status *) data;
+@@ -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-ad b/net/netatalk-asun/patches/patch-ad
index 1f2f706ac2d..81cb21acb01 100644
--- a/net/netatalk-asun/patches/patch-ad
+++ b/net/netatalk-asun/patches/patch-ad
@@ -1,34 +1,14 @@
-$NetBSD: patch-ad,v 1.1.1.1 2000/07/31 17:36:01 abs Exp $
+$NetBSD: patch-ad,v 1.2 2000/07/31 18:33:48 abs Exp $
 
---- etc/psf/Makefile.orig	Thu Feb  4 06:57:52 1999
-+++ etc/psf/Makefile	Mon Jul 31 14:07:25 2000
-@@ -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
+--- etc/afpd/status.c.orig	Wed Dec 16 18:38:38 1998
++++ etc/afpd/status.c	Mon Jul 31 18:46:19 2000
+@@ -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;
  
- install : all
- 	-mkdir ${RESDIR}
--	-mkdir ${RESDIR}/filters
--	${INSTALL} -c psa ${SBINDIR}
--	${INSTALL} -c etc2ps.sh ${SBINDIR}/etc2ps
-+	-mkdir ${LIBEXECDIR}/filters
-+	${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}/filters/$$i; \
-+	    ln -s ../psf ${LIBEXECDIR}/filters/$$i; \
- 	done
- 
- clean :
+     status = (struct afp_status *) data;
diff --git a/net/netatalk-asun/patches/patch-ae b/net/netatalk-asun/patches/patch-ae
index 3f02ba0d780..44f1728e5de 100644
--- a/net/netatalk-asun/patches/patch-ae
+++ b/net/netatalk-asun/patches/patch-ae
@@ -1,13 +1,34 @@
-$NetBSD: patch-ae,v 1.1.1.1 2000/07/31 17:36:01 abs Exp $
+$NetBSD: patch-ae,v 1.2 2000/07/31 18:33:48 abs Exp $
 
---- etc/atalkd/Makefile.orig	Wed Jul  9 20:51:55 1997
-+++ etc/atalkd/Makefile	Mon Jul 31 14:07:25 2000
-@@ -23,7 +23,7 @@
- 	    ${CPPFLAGS} -c config.c
+--- etc/psf/Makefile.orig	Thu Feb  4 06:57:52 1999
++++ etc/psf/Makefile	Mon Jul 31 18:56:35 2000
+@@ -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
--	${INSTALL} -c atalkd ${SBINDIR}
-+	${INSTALL} -c atalkd ${LIBEXECDIR}
+ 	-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 :
- 	rm -f a.out core* *.o *.bak *[Ee]rrs tags
diff --git a/net/netatalk-asun/patches/patch-af b/net/netatalk-asun/patches/patch-af
index 84c1ea7911e..769200ce73a 100644
--- a/net/netatalk-asun/patches/patch-af
+++ b/net/netatalk-asun/patches/patch-af
@@ -1,21 +1,13 @@
-$NetBSD: patch-af,v 1.1.1.1 2000/07/31 17:36:01 abs Exp $
+$NetBSD: patch-af,v 1.2 2000/07/31 18:33:49 abs Exp $
 
---- etc/papd/Makefile.orig	Tue May 20 18:35:42 1997
-+++ etc/papd/Makefile	Mon Jul 31 14:07:25 2000
-@@ -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
+--- etc/atalkd/Makefile.orig	Wed Jul  9 20:51:55 1997
++++ etc/atalkd/Makefile	Mon Jul 31 18:46:19 2000
+@@ -23,7 +23,7 @@
+ 	    ${CPPFLAGS} -c config.c
  
  install : all
--	${INSTALL} -c papd ${SBINDIR}
-+	${INSTALL} -c papd ${LIBEXECDIR}
+-	${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-ag b/net/netatalk-asun/patches/patch-ag
index 92d35c8ab24..f9e17a045ea 100644
--- a/net/netatalk-asun/patches/patch-ag
+++ b/net/netatalk-asun/patches/patch-ag
@@ -1,24 +1,31 @@
-$NetBSD: patch-ag,v 1.1.1.1 2000/07/31 17:36:02 abs Exp $
+$NetBSD: patch-ag,v 1.2 2000/07/31 18:33:49 abs Exp $
 
---- etc/Makefile.orig	Mon Dec  7 21:52:29 1998
-+++ etc/Makefile	Mon Jul 31 14:07:25 2000
-@@ -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}" \
+--- etc/atalkd/nbp.c.orig	Sun Dec 13 05:22:42 1998
++++ etc/atalkd/nbp.c	Mon Jul 31 18:52:23 2000
+@@ -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-ah b/net/netatalk-asun/patches/patch-ah
index 826a2aa1bcd..22354fa1e0c 100644
--- a/net/netatalk-asun/patches/patch-ah
+++ b/net/netatalk-asun/patches/patch-ah
@@ -1,29 +1,19 @@
-$NetBSD: patch-ah,v 1.1.1.1 2000/07/31 17:36:02 abs Exp $
+$NetBSD: patch-ah,v 1.2 2000/07/31 18:33:49 abs Exp $
 
---- sys/ultrix/Makefile.orig	Thu Feb  4 07:30:55 1999
-+++ sys/ultrix/Makefile	Mon Jul 31 14:07:25 2000
-@@ -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
+--- etc/atalkd/main.c.orig	Mon Jan 25 09:21:13 1999
++++ etc/atalkd/main.c	Mon Jul 31 18:54:42 2000
+@@ -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-ai b/net/netatalk-asun/patches/patch-ai
index 6b5be75053e..29ab8051348 100644
--- a/net/netatalk-asun/patches/patch-ai
+++ b/net/netatalk-asun/patches/patch-ai
@@ -1,37 +1,21 @@
-$NetBSD: patch-ai,v 1.1.1.1 2000/07/31 17:36:02 abs Exp $
+$NetBSD: patch-ai,v 1.2 2000/07/31 18:33:49 abs Exp $
 
---- sys/linux/Makefile.orig	Sat Feb 27 21:10:59 1999
-+++ sys/linux/Makefile	Mon Jul 31 14:07:25 2000
-@@ -23,6 +23,7 @@
- ${ALL}:	FRC
- 	cd $@; ${MAKE} ${MFLAGS} CC="${CC}" \
- 	    ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
+--- etc/papd/Makefile.orig	Tue May 20 18:35:42 1997
++++ etc/papd/Makefile	Mon Jul 31 18:46:19 2000
+@@ -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}" \
- 	    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
+ 	    KRBLIBS="$${KRBLIBS}" KRBLIBDIRS="$${KRBLIBDIRS}" \
+@@ -56,7 +57,7 @@
+ 	    ${CPPFLAGS} -c main.c
  
- 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}" \
+ 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-aj b/net/netatalk-asun/patches/patch-aj
index c0b7d649144..2ae3aa4cb2f 100644
--- a/net/netatalk-asun/patches/patch-aj
+++ b/net/netatalk-asun/patches/patch-aj
@@ -1,34 +1,61 @@
-$NetBSD: patch-aj,v 1.1.1.1 2000/07/31 17:36:02 abs Exp $
+$NetBSD: patch-aj,v 1.2 2000/07/31 18:33:49 abs Exp $
 
---- sys/sunos/Makefile.orig	Fri Sep 18 04:20:15 1998
-+++ sys/sunos/Makefile	Mon Jul 31 14:07:25 2000
-@@ -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"
+--- etc/papd/printcap.c.orig	Fri May 30 01:27:35 1997
++++ etc/papd/printcap.c	Mon Jul 31 18:55:05 2000
+@@ -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-ak b/net/netatalk-asun/patches/patch-ak
index fc5b1ea22b0..92bfc4523ec 100644
--- a/net/netatalk-asun/patches/patch-ak
+++ b/net/netatalk-asun/patches/patch-ak
@@ -1,43 +1,24 @@
-$NetBSD: patch-ak,v 1.1.1.1 2000/07/31 17:36:02 abs Exp $
+$NetBSD: patch-ak,v 1.2 2000/07/31 18:33:49 abs Exp $
 
---- sys/solaris/Makefile.orig	Wed Feb  3 19:52:10 1999
-+++ sys/solaris/Makefile	Mon Jul 31 14:07:25 2000
-@@ -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
+--- etc/Makefile.orig	Mon Dec  7 21:52:29 1998
++++ etc/Makefile	Mon Jul 31 18:46:19 2000
+@@ -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}" \
-@@ -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
+@@ -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}" \
- 		AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" \
+ 		DESTDIR="${DESTDIR}" AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" \
diff --git a/net/netatalk-asun/patches/patch-al b/net/netatalk-asun/patches/patch-al
index 61ff870578d..03bb3fe05a2 100644
--- a/net/netatalk-asun/patches/patch-al
+++ b/net/netatalk-asun/patches/patch-al
@@ -1,33 +1,29 @@
-$NetBSD: patch-al,v 1.1.1.1 2000/07/31 17:36:02 abs Exp $
+$NetBSD: patch-al,v 1.2 2000/07/31 18:33:50 abs Exp $
 
---- sys/freebsd/Makefile.orig	Thu Feb  4 07:38:12 1999
-+++ sys/freebsd/Makefile	Mon Jul 31 14:07:25 2000
-@@ -20,6 +20,7 @@
+--- sys/ultrix/Makefile.orig	Thu Feb  4 07:30:55 1999
++++ sys/ultrix/Makefile	Mon Jul 31 18:46:19 2000
+@@ -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}" \
- 	    DESTDIR="${DESTDIR}" AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" \
-@@ -29,9 +30,11 @@
- 
- install :
- 	-mkdir ${DESTDIR} ${SBINDIR} ${BINDIR} ${ETCDIR} ${LIBDIR}
-+	-mkdir ${LIBEXECDIR} ${EXAMPLEDIR}
+ 	    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}" \
- 		AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" AFPLIBS="${AFPLIBS}" \
-@@ -42,6 +45,8 @@
+ 		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@:INCDIR:@${INCDIR}@ \
 +		-e s@:LIBEXECDIR:@${LIBEXECDIR}@ \
 +		-e s@:EXAMPLEDIR:@${EXAMPLEDIR}@ \
+ 		-e s@:INCDIR:@${INCDIR}@ \
  	    < ../../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-am b/net/netatalk-asun/patches/patch-am
index aacb9fa7089..df4b019e863 100644
--- a/net/netatalk-asun/patches/patch-am
+++ b/net/netatalk-asun/patches/patch-am
@@ -1,71 +1,37 @@
-$NetBSD: patch-am,v 1.1.1.1 2000/07/31 17:36:02 abs Exp $
+$NetBSD: patch-am,v 1.2 2000/07/31 18:33:50 abs Exp $
 
---- sys/netbsd/Makefile.orig	Thu Feb  4 07:30:30 1999
-+++ sys/netbsd/Makefile	Mon Jul 31 14:07:25 2000
-@@ -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=	-Werror -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 @@
+--- sys/linux/Makefile.orig	Sat Feb 27 21:10:59 1999
++++ sys/linux/Makefile	Mon Jul 31 18:46:19 2000
+@@ -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}" \
- 	    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.sh
+ 	    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}@ \
--	    < ../../rc.atalk.bsd > ${ETCDIR}/rc.atalk
 +		-e s@:LIBEXECDIR:@${LIBEXECDIR}@ \
 +		-e s@:EXAMPLEDIR:@${EXAMPLEDIR}@ \
-+	    < ../../rc.atalk.bsd > ${RCDIR}/netatalk.sh
-+	chmod 755 ${RCDIR}/netatalk.sh
-+	@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.sh in /etc/rc.local."
-+	@echo "See README.NETBSD for kernel configuration information."
- clean :
+ 		< ../../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} clean); \
+ 	    do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \
+ 		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
diff --git a/net/netatalk-asun/patches/patch-an b/net/netatalk-asun/patches/patch-an
index 9845041add1..f2da49d8bd8 100644
--- a/net/netatalk-asun/patches/patch-an
+++ b/net/netatalk-asun/patches/patch-an
@@ -1,8 +1,8 @@
-$NetBSD: patch-an,v 1.1.1.1 2000/07/31 17:36:02 abs Exp $
+$NetBSD: patch-an,v 1.2 2000/07/31 18:33:50 abs Exp $
 
---- sys/openbsd/Makefile.orig	Mon Feb 22 23:02:31 1999
-+++ sys/openbsd/Makefile	Mon Jul 31 14:07:25 2000
-@@ -19,6 +19,7 @@
+--- sys/sunos/Makefile.orig	Fri Sep 18 04:20:15 1998
++++ sys/sunos/Makefile	Mon Jul 31 18:46:19 2000
+@@ -51,6 +51,7 @@
  ${ALL}:	FRC
  	cd $@; ${MAKE} ${MFLAGS} CC="${CC}" \
  	    ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
@@ -10,22 +10,23 @@ $NetBSD: patch-an,v 1.1.1.1 2000/07/31 17:36:02 abs Exp $
  	    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}
+@@ -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}" \
- 		AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" AFPLIBS="${AFPLIBS}" \
-@@ -41,6 +44,8 @@
+ 		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@:INCDIR:@${INCDIR}@ -e 's@^##@@' \
 +		-e s@:LIBEXECDIR:@${LIBEXECDIR}@ \
 +		-e s@:EXAMPLEDIR:@${EXAMPLEDIR}@ \
  	    < ../../rc.atalk.bsd > ${ETCDIR}/rc.atalk
diff --git a/net/netatalk-asun/patches/patch-ao b/net/netatalk-asun/patches/patch-ao
index 023882a9c34..d86c79b7a2e 100644
--- a/net/netatalk-asun/patches/patch-ao
+++ b/net/netatalk-asun/patches/patch-ao
@@ -1,13 +1,43 @@
-$NetBSD: patch-ao,v 1.1.1.1 2000/07/31 17:36:02 abs Exp $
+$NetBSD: patch-ao,v 1.2 2000/07/31 18:33:50 abs Exp $
 
---- man/man4/Makefile.orig	Tue May 20 18:35:43 1997
-+++ man/man4/Makefile	Mon Jul 31 14:07:25 2000
-@@ -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
+--- sys/solaris/Makefile.orig	Wed Feb  3 19:52:10 1999
++++ sys/solaris/Makefile	Mon Jul 31 18:46:20 2000
+@@ -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-ap b/net/netatalk-asun/patches/patch-ap
index 50faa9d4a3a..a2b0872ac74 100644
--- a/net/netatalk-asun/patches/patch-ap
+++ b/net/netatalk-asun/patches/patch-ap
@@ -1,13 +1,33 @@
-$NetBSD: patch-ap,v 1.1.1.1 2000/07/31 17:36:02 abs Exp $
+$NetBSD: patch-ap,v 1.2 2000/07/31 18:33:50 abs Exp $
 
---- man/man8/Makefile.orig	Tue May 20 18:35:43 1997
-+++ man/man8/Makefile	Mon Jul 31 14:07:25 2000
-@@ -18,6 +18,8 @@
+--- sys/freebsd/Makefile.orig	Thu Feb  4 07:38:12 1999
++++ sys/freebsd/Makefile	Mon Jul 31 18:46:20 2000
+@@ -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}@ \
- 		< $$i > ${MANDIR}/man8/$$i; \
- 	done
- 
+ 	    < ../../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-aq b/net/netatalk-asun/patches/patch-aq
index 6704eef79f7..4cc6face440 100644
--- a/net/netatalk-asun/patches/patch-aq
+++ b/net/netatalk-asun/patches/patch-aq
@@ -1,19 +1,71 @@
-$NetBSD: patch-aq,v 1.1.1.1 2000/07/31 17:36:02 abs Exp $
+$NetBSD: patch-aq,v 1.2 2000/07/31 18:33:51 abs Exp $
 
---- man/man8/psf.8.orig	Tue May 20 18:35:43 1997
-+++ man/man8/psf.8	Mon Jul 31 14:07:25 2000
-@@ -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:/filters/ofpap:\\
-+    :if=:LIBEXECDIR:/filters/ifpaprev:\\
-+    :tf=:LIBEXECDIR:/filters/tfpaprev:\\
-+    :df=:LIBEXECDIR:/filters/dfpaprev:
- .fi
- .RE
- .sp
+--- sys/netbsd/Makefile.orig	Thu Feb  4 07:30:30 1999
++++ sys/netbsd/Makefile	Mon Jul 31 18:46:20 2000
+@@ -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=	-Werror -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.sh
+ 	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.sh
++	chmod 755 ${RCDIR}/netatalk.sh
++	@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.sh 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-ar b/net/netatalk-asun/patches/patch-ar
index e18bca4de25..7b0ba51f208 100644
--- a/net/netatalk-asun/patches/patch-ar
+++ b/net/netatalk-asun/patches/patch-ar
@@ -1,13 +1,33 @@
-$NetBSD: patch-ar,v 1.1.1.1 2000/07/31 17:36:02 abs Exp $
+$NetBSD: patch-ar,v 1.2 2000/07/31 18:33:51 abs Exp $
 
---- man/man1/Makefile.orig	Tue May 20 18:35:43 1997
-+++ man/man1/Makefile	Mon Jul 31 14:07:25 2000
-@@ -20,6 +20,8 @@
+--- sys/openbsd/Makefile.orig	Mon Feb 22 23:02:31 1999
++++ sys/openbsd/Makefile	Mon Jul 31 18:46:20 2000
+@@ -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}@ \
- 		< $$i > ${MANDIR}/man1/$$i; \
- 	done
- 
+ 	    < ../../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-as b/net/netatalk-asun/patches/patch-as
index 11c296cb146..22e2957ea18 100644
--- a/net/netatalk-asun/patches/patch-as
+++ b/net/netatalk-asun/patches/patch-as
@@ -1,13 +1,13 @@
-$NetBSD: patch-as,v 1.1.1.1 2000/07/31 17:36:02 abs Exp $
+$NetBSD: patch-as,v 1.2 2000/07/31 18:33:51 abs Exp $
 
---- man/man3/Makefile.orig	Tue May 20 18:35:43 1997
-+++ man/man3/Makefile	Mon Jul 31 14:07:25 2000
-@@ -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; \
+--- man/man4/Makefile.orig	Tue May 20 18:35:43 1997
++++ man/man4/Makefile	Mon Jul 31 18:46:20 2000
+@@ -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-at b/net/netatalk-asun/patches/patch-at
index 298fc45ac5a..58580660db1 100644
--- a/net/netatalk-asun/patches/patch-at
+++ b/net/netatalk-asun/patches/patch-at
@@ -1,20 +1,13 @@
-$NetBSD: patch-at,v 1.1.1.1 2000/07/31 17:36:02 abs Exp $
+$NetBSD: patch-at,v 1.2 2000/07/31 18:33:51 abs Exp $
 
---- man/Makefile.orig	Tue May 20 18:35:43 1997
-+++ man/Makefile	Mon Jul 31 14:07:25 2000
-@@ -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}"
+--- man/man8/Makefile.orig	Tue May 20 18:35:43 1997
++++ man/man8/Makefile	Mon Jul 31 18:46:20 2000
+@@ -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
  
-@@ -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-au b/net/netatalk-asun/patches/patch-au
index 83e879b7fa0..867414c6e36 100644
--- a/net/netatalk-asun/patches/patch-au
+++ b/net/netatalk-asun/patches/patch-au
@@ -1,20 +1,19 @@
-$NetBSD: patch-au,v 1.1.1.1 2000/07/31 17:36:02 abs Exp $
+$NetBSD: patch-au,v 1.2 2000/07/31 18:33:51 abs Exp $
 
---- bin/Makefile.orig	Wed Dec 30 07:30:33 1998
-+++ bin/Makefile	Mon Jul 31 14:07:25 2000
-@@ -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); \
+--- man/man8/psf.8.orig	Tue May 20 18:35:43 1997
++++ man/man8/psf.8	Mon Jul 31 18:57:02 2000
+@@ -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-av b/net/netatalk-asun/patches/patch-av
index 417e9facf14..851a56f9407 100644
--- a/net/netatalk-asun/patches/patch-av
+++ b/net/netatalk-asun/patches/patch-av
@@ -1,66 +1,13 @@
-$NetBSD: patch-av,v 1.1.1.1 2000/07/31 17:36:02 abs Exp $
+$NetBSD: patch-av,v 1.2 2000/07/31 18:33:51 abs Exp $
 
---- Makefile.orig	Sun Feb  7 11:15:46 1999
-+++ Makefile	Mon Jul 31 14:07:25 2000
-@@ -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}" $@
+--- man/man1/Makefile.orig	Tue May 20 18:35:43 1997
++++ man/man1/Makefile	Mon Jul 31 18:46:20 2000
+@@ -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-aw b/net/netatalk-asun/patches/patch-aw
index 3671d43e2d6..58229da33a3 100644
--- a/net/netatalk-asun/patches/patch-aw
+++ b/net/netatalk-asun/patches/patch-aw
@@ -1,44 +1,13 @@
-$NetBSD: patch-aw,v 1.1.1.1 2000/07/31 17:36:02 abs Exp $
+$NetBSD: patch-aw,v 1.2 2000/07/31 18:33:52 abs Exp $
 
---- rc.atalk.bsd.orig	Mon Aug 25 23:00:54 1997
-+++ rc.atalk.bsd	Mon Jul 31 14:10:24 2000
-@@ -1,3 +1,4 @@
-+#!/bin/sh
- #
- # AppleTalk daemons. Make sure not to start atalkd in the background:
- # its data structures must have time to stablize before running the
-@@ -14,26 +15,22 @@
- ##fi
+--- man/man3/Makefile.orig	Tue May 20 18:35:43 1997
++++ man/man3/Makefile	Mon Jul 31 18:46:20 2000
+@@ -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
  
- echo -n 'starting appletalk daemons:'
--if [ -x :SBINDIR:/atalkd ]; then
--	:SBINDIR:/atalkd;		echo -n ' atalkd'
-+if [ -x :LIBEXECDIR:/atalkd ]; then
-+	:LIBEXECDIR:/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
-+	:BINDIR:/nbprgstr -p 4 `hostname -s |sed 's/\..*$//'`:Workstation
-+	:BINDIR:/nbprgstr -p 4 `hostname -s |sed 's/\..*$//'`:netatalk
- 					echo -n ' nbprgstr'
- fi
- 
--if [ -x :SBINDIR:/papd ]; then
--	:SBINDIR:/papd;		echo -n ' papd'
-+if [ -x :LIBEXECDIR:/papd -a :ETCDIR:/papd.conf ]; then
-+	:LIBEXECDIR:/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'
-+if [ -x :LIBEXECDIR:/afpd -a :ETCDIR:/AppleVolumes.system ]; then
-+	:LIBEXECDIR:/afpd;		echo -n ' afpd'
- fi
- 
- 					echo '.'
diff --git a/net/netatalk-asun/patches/patch-ax b/net/netatalk-asun/patches/patch-ax
new file mode 100644
index 00000000000..0e89e5c35de
--- /dev/null
+++ b/net/netatalk-asun/patches/patch-ax
@@ -0,0 +1,20 @@
+$NetBSD: patch-ax,v 1.1 2000/07/31 18:33:52 abs Exp $
+
+--- man/Makefile.orig	Tue May 20 18:35:43 1997
++++ man/Makefile	Mon Jul 31 18:46:20 2000
+@@ -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
new file mode 100644
index 00000000000..28c0e5f17e5
--- /dev/null
+++ b/net/netatalk-asun/patches/patch-ay
@@ -0,0 +1,20 @@
+$NetBSD: patch-ay,v 1.1 2000/07/31 18:33:52 abs Exp $
+
+--- bin/Makefile.orig	Wed Dec 30 07:30:33 1998
++++ bin/Makefile	Mon Jul 31 18:46:20 2000
+@@ -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-az b/net/netatalk-asun/patches/patch-az
new file mode 100644
index 00000000000..4773cb97d94
--- /dev/null
+++ b/net/netatalk-asun/patches/patch-az
@@ -0,0 +1,12 @@
+$NetBSD: patch-az,v 1.1 2000/07/31 18:33:53 abs Exp $
+
+--- libatalk/atp/atp_rsel.c.orig	Thu Feb  4 07:36:30 1999
++++ libatalk/atp/atp_rsel.c	Mon Jul 31 18:53:38 2000
+@@ -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-ba b/net/netatalk-asun/patches/patch-ba
new file mode 100644
index 00000000000..5b53e8c641f
--- /dev/null
+++ b/net/netatalk-asun/patches/patch-ba
@@ -0,0 +1,13 @@
+$NetBSD: patch-ba,v 1.1 2000/07/31 18:33:53 abs Exp $
+
+--- libatalk/asp/asp_getsess.c.orig	Thu Jan 21 20:10:25 1999
++++ libatalk/asp/asp_getsess.c	Mon Jul 31 18:53:31 2000
+@@ -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-bb b/net/netatalk-asun/patches/patch-bb
new file mode 100644
index 00000000000..a39e877d36d
--- /dev/null
+++ b/net/netatalk-asun/patches/patch-bb
@@ -0,0 +1,13 @@
+$NetBSD: patch-bb,v 1.1 2000/07/31 18:33:54 abs Exp $
+
+--- libatalk/nbp/nbp_lkup.c.orig	Thu Feb  4 07:36:14 1999
++++ libatalk/nbp/nbp_lkup.c	Mon Jul 31 18:53:44 2000
+@@ -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-bc b/net/netatalk-asun/patches/patch-bc
new file mode 100644
index 00000000000..16a52a8f381
--- /dev/null
+++ b/net/netatalk-asun/patches/patch-bc
@@ -0,0 +1,13 @@
+$NetBSD: patch-bc,v 1.1 2000/07/31 18:33:54 abs Exp $
+
+--- libatalk/nbp/nbp_rgstr.c.orig	Thu Aug 14 22:27:23 1997
++++ libatalk/nbp/nbp_rgstr.c	Mon Jul 31 18:53:50 2000
+@@ -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-bd b/net/netatalk-asun/patches/patch-bd
new file mode 100644
index 00000000000..dca981728ff
--- /dev/null
+++ b/net/netatalk-asun/patches/patch-bd
@@ -0,0 +1,13 @@
+$NetBSD: patch-bd,v 1.1 2000/07/31 18:33:55 abs Exp $
+
+--- libatalk/nbp/nbp_unrgstr.c.orig	Thu Feb  4 07:26:41 1999
++++ libatalk/nbp/nbp_unrgstr.c	Mon Jul 31 18:53:56 2000
+@@ -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-be b/net/netatalk-asun/patches/patch-be
new file mode 100644
index 00000000000..62b7769ca4c
--- /dev/null
+++ b/net/netatalk-asun/patches/patch-be
@@ -0,0 +1,13 @@
+$NetBSD: patch-be,v 1.1 2000/07/31 18:33:55 abs Exp $
+
+--- libatalk/nbp/nbp_util.c.orig	Thu Feb  4 07:27:02 1999
++++ libatalk/nbp/nbp_util.c	Mon Jul 31 18:54:00 2000
+@@ -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-bf b/net/netatalk-asun/patches/patch-bf
new file mode 100644
index 00000000000..4a6528b042c
--- /dev/null
+++ b/net/netatalk-asun/patches/patch-bf
@@ -0,0 +1,13 @@
+$NetBSD: patch-bf,v 1.1 2000/07/31 18:33:56 abs Exp $
+
+--- config/AppleVolumes.system.orig	Thu Feb  4 07:49:04 1999
++++ config/AppleVolumes.system	Mon Jul 31 18:55:46 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-asun/patches/patch-bg b/net/netatalk-asun/patches/patch-bg
new file mode 100644
index 00000000000..31dbf31e2b2
--- /dev/null
+++ b/net/netatalk-asun/patches/patch-bg
@@ -0,0 +1,66 @@
+$NetBSD: patch-bg,v 1.1 2000/07/31 18:33:56 abs Exp $
+
+--- Makefile.orig	Sun Feb  7 11:15:46 1999
++++ Makefile	Mon Jul 31 18:46:20 2000
+@@ -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-bh b/net/netatalk-asun/patches/patch-bh
new file mode 100644
index 00000000000..6aeda3c2b63
--- /dev/null
+++ b/net/netatalk-asun/patches/patch-bh
@@ -0,0 +1,44 @@
+$NetBSD: patch-bh,v 1.1 2000/07/31 18:33:57 abs Exp $
+
+--- rc.atalk.bsd.orig	Mon Aug 25 23:00:54 1997
++++ rc.atalk.bsd	Mon Jul 31 18:46:20 2000
+@@ -1,3 +1,4 @@
++#!/bin/sh
+ #
+ # AppleTalk daemons. Make sure not to start atalkd in the background:
+ # its data structures must have time to stablize before running the
+@@ -14,26 +15,22 @@
+ ##fi
+ 
+ echo -n 'starting appletalk daemons:'
+-if [ -x :SBINDIR:/atalkd ]; then
+-	:SBINDIR:/atalkd;		echo -n ' atalkd'
++if [ -x :LIBEXECDIR:/atalkd ]; then
++	:LIBEXECDIR:/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
++	:BINDIR:/nbprgstr -p 4 `hostname -s |sed 's/\..*$//'`:Workstation
++	:BINDIR:/nbprgstr -p 4 `hostname -s |sed 's/\..*$//'`:netatalk
+ 					echo -n ' nbprgstr'
+ fi
+ 
+-if [ -x :SBINDIR:/papd ]; then
+-	:SBINDIR:/papd;		echo -n ' papd'
++if [ -x :LIBEXECDIR:/papd -a :ETCDIR:/papd.conf ]; then
++	:LIBEXECDIR:/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'
++if [ -x :LIBEXECDIR:/afpd -a :ETCDIR:/AppleVolumes.system ]; then
++	:LIBEXECDIR:/afpd;		echo -n ' afpd'
+ fi
+ 
+ 					echo '.'
diff --git a/net/netatalk-asun/pkg/PLIST b/net/netatalk-asun/pkg/PLIST
index 8d73ae084c9..5cc8dc2dc88 100644
--- a/net/netatalk-asun/pkg/PLIST
+++ b/net/netatalk-asun/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/07/31 17:36:02 abs Exp $
+@comment $NetBSD: PLIST,v 1.2 2000/07/31 18:33:58 abs Exp $
 bin/adv1tov2
 bin/aecho
 bin/getzones
@@ -44,26 +44,26 @@ lib/libatalk_p.a
 libexec/afpd
 libexec/atalkd
 libexec/etc2ps
-libexec/filters/ifmpap
-libexec/filters/ifmpaprev
-libexec/filters/ifpap
-libexec/filters/ifpaprev
-libexec/filters/ifwmpap
-libexec/filters/ifwmpaprev
-libexec/filters/ifwpap
-libexec/filters/ifwpaprev
-libexec/filters/ofmpap
-libexec/filters/ofpap
-libexec/filters/ofwmpap
-libexec/filters/ofwpap
-libexec/filters/tfmpap
-libexec/filters/tfmpaprev
-libexec/filters/tfpap
-libexec/filters/tfpaprev
-libexec/filters/tfwmpap
-libexec/filters/tfwmpaprev
-libexec/filters/tfwpap
-libexec/filters/tfwpaprev
+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
 libexec/papd
 libexec/psa
 libexec/psf