Moved afpd, atalkd, and papd into sbin. From PR 10768 by Takahiro Kambe

Update to netatalk-asun-2.1.3nb3

37 files changed, 816 insertions, 809 deletions

diff --git a/net/netatalk-asun/Makefile b/net/netatalk-asun/Makefile
index 700c9454aa7..8cad934d1c3 100644
--- a/net/netatalk-asun/Makefile
+++ b/net/netatalk-asun/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2000/08/02 11:43:00 abs Exp $
+# $NetBSD: Makefile,v 1.4 2000/08/15 14:48:22 abs Exp $
 
 DISTNAME=	netatalk-1.4b2+asun2.1.3
-PKGNAME=	netatalk-asun-2.1.3nb2
+PKGNAME=	netatalk-asun-2.1.3nb3
 CATEGORIES=	net print
 MASTER_SITES=   ftp://ftp.cobaltnet.com/pub/users/asun/release/ \
 		ftp://ftp.hanse.de/sites/transit/mirror/ftp.u.washington.edu/public/asun/
diff --git a/net/netatalk-asun/files/patch-sum b/net/netatalk-asun/files/patch-sum
index 279f93af31a..8c73bf7261d 100644
--- a/net/netatalk-asun/files/patch-sum
+++ b/net/netatalk-asun/files/patch-sum
@@ -1,37 +1,36 @@
-$NetBSD: patch-sum,v 1.4 2000/08/11 00:08:32 fredb Exp $
+$NetBSD: patch-sum,v 1.5 2000/08/15 14:48:22 abs Exp $
 
-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) = 156599cacc530189ce5007f7271dd71c
-MD5 (patch-bg) = af74797ca603e79bf664ccc934f79a8c
-MD5 (patch-bh) = 8681cb51926a945aa1d3128fa9ca2c27
-MD5 (patch-bi) = 6a75ac8b64a7bf655e41ce6eb6f4dbec
+MD5 (patch-aa) = b01f99db357aae4fdc2cd6e20879efc1
+MD5 (patch-ab) = c8320acad0a11821edad3f4d0d926441
+MD5 (patch-ac) = b7fa664027aa2648310ebd5c3b48371b
+MD5 (patch-ad) = 3c7422d8eb1fe29d9e489003c382ef20
+MD5 (patch-ae) = a27235338eaabd8a4a4b4c5c3a89998f
+MD5 (patch-af) = f7103efd5b6e271799e49e4150f3886c
+MD5 (patch-ag) = 5b6e37d540483fe070320f7ea8b4102e
+MD5 (patch-ah) = 229e5d168ae1ed6bfc677cb4b34bca19
+MD5 (patch-ai) = 4dbefcb9e6c987fdf37140f9a3d417c3
+MD5 (patch-aj) = e0a7ce345c976fa4ae7e1e4c82e3e6c8
+MD5 (patch-ak) = b26ad3d9270d1417d81f152e6a5d7937
+MD5 (patch-al) = 090478fa05440e5fd02c5ee2a802d506
+MD5 (patch-am) = cff00745ac6a2da3f7da6021f39aee4f
+MD5 (patch-an) = 61989917afae98db7085cb5e0c7b1c92
+MD5 (patch-ao) = 7ad2b8c690c2a0344c0fb620d991165c
+MD5 (patch-ap) = 2fe6cb9099cd48383c4a11e59bcc2051
+MD5 (patch-aq) = 67955118e7698f27260dd47f4c9e719c
+MD5 (patch-ar) = 4fe94c7a8f46a3de8515a6a5ca3528b7
+MD5 (patch-as) = 4117748df94cc17afd61c66df1a66d5f
+MD5 (patch-at) = 56ff3d16a3f4b3200ffd11caea5ed3ae
+MD5 (patch-au) = 11fa0e623cb561edce6eb0610cff34b7
+MD5 (patch-av) = 4f993f786d12f1c17dda24c531b1ef31
+MD5 (patch-aw) = 27b05fdf1da625197f1512949c820584
+MD5 (patch-ax) = e4a5d7d6477b91c20ad2f3594a8474a8
+MD5 (patch-ay) = edca06d141938cf342fedb909ad030d7
+MD5 (patch-az) = bcb6904622b91814a0c04a9542cab0b4
+MD5 (patch-ba) = ea7b5c513aa2c7a1d60049adab81d0fb
+MD5 (patch-bb) = a2b37955994ce8d701d51528d8cad78d
+MD5 (patch-bc) = 25d722ee5b6c5c4d34f63554ab02130e
+MD5 (patch-bd) = 7a0d72c04e4349d5e55a85f82ad04c5c
+MD5 (patch-be) = 29ccc7e5d265a3448596f55528a04131
+MD5 (patch-bf) = 660abf089a9b6de182a5e2f6caa88ade
+MD5 (patch-bg) = 27548334cfd47590de166137cee27960
+MD5 (patch-bh) = cb33252bae65a59f65fd7bb71b642020
diff --git a/net/netatalk-asun/patches/patch-aa b/net/netatalk-asun/patches/patch-aa
index 4dc9f917b1e..e086b1dc25e 100644
--- a/net/netatalk-asun/patches/patch-aa
+++ b/net/netatalk-asun/patches/patch-aa
@@ -1,13 +1,66 @@
-$NetBSD: patch-aa,v 1.2 2000/07/31 18:33:48 abs Exp $
+$NetBSD: patch-aa,v 1.3 2000/08/15 14:48:23 abs Exp $
 
---- 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 @@
- 
- 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 */
+--- Makefile.orig	Sun Feb  7 11:15:46 1999
++++ Makefile
+@@ -1,22 +1,27 @@
+ # Root of installation. Subdirectories will be ${DESTDIR}/etc,
+ # ${DESTDIR}/bin, and ${DESTDIR}/lib.
+-DESTDIR=/usr/local/atalk
++DESTDIR=${PREFIX}
+ 
+ # for system-level binaries
+-SBINDIR=$(DESTDIR)/etc
++SBINDIR=$(DESTDIR)/sbin
++LIBEXECDIR=$(DESTDIR)/libexec
+ # for user-level binaries
+ BINDIR=$(DESTDIR)/bin
+ # for program libraries (*.a)
+ LIBDIR=$(DESTDIR)/lib
+ # for machine-independent resources (pagecount.ps, etc.)
+-RESDIR=$(DESTDIR)/etc
++RESDIR=$(DESTDIR)/share
+ # for configuration files (AppleVolumes.system, etc.)
+-ETCDIR=$(DESTDIR)/etc
++ETCDIR=/etc/netatalk
++# for startup script
++RCDIR=$(DESTDIR)/etc/rc.d
+ # for include files
+ INCDIR=$(DESTDIR)/include
+ # Root of man pages.  Subdirectories will be
+ # ${MANDIR}/man1, ${MANDIR}/man4, and ${MANDIR}/man8.
+ MANDIR=$(DESTDIR)/man
++# for example config files
++EXAMPLEDIR=$(DESTDIR)/share/examples/netatalk
+ 
+ #SBINDIR=/usr/sbin
+ #BINDIR=/usr/bin
+@@ -32,7 +37,7 @@
+ # Location of the DES library and include files. Comment this out if you
+ # don't want Randnum Exchange and 2-Way Randnum Exchange as allowable UAMs 
+ # for afpd. We expect libdes.a in $DESDIR/lib and des.h in $DESDIR/include.
+-DESDIR=/usr/local
++#DESDIR=/usr/local
+ 
+ # Location of the tcp wrapper library and include files. Comment this out
+ # if you don't want tcp wrapper support. having tcp wrapper support is
+@@ -41,7 +46,7 @@
+ 
+ # Location of PAM support library and include files. Comment this out
+ # if you don't want to enable PAM support
+-PAMDIR=/usr
++#PAMDIR=/usr
+ 
+  
+ # Location of the AFS and Kerberos libraries and include files.  Uncomment
+@@ -73,9 +78,10 @@
+ 	esac; \
+ 	echo "Making $@ for $$ARCH..."; \
+ 	cd sys/$$ARCH && ${MAKE} ${MFLAGS} \
++	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}"\
+ 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+-	    DESTDIR="${DESTDIR}" MANDIR="${MANDIR}" \
++	    RCDIR="${RCDIR}" DESTDIR="${DESTDIR}" MANDIR="${MANDIR}" \
+ 	    TCPWRAPDIR="${TCPWRAPDIR}" PAMDIR="${PAMDIR}" DB2DIR="${DB2DIR}" \
+ 	    AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" DESDIR="${DESDIR}" $@
+ 
diff --git a/net/netatalk-asun/patches/patch-ab b/net/netatalk-asun/patches/patch-ab
index 0ec42e682d0..86d78aac599 100644
--- a/net/netatalk-asun/patches/patch-ab
+++ b/net/netatalk-asun/patches/patch-ab
@@ -1,13 +1,20 @@
-$NetBSD: patch-ab,v 1.2 2000/07/31 18:33:48 abs Exp $
+$NetBSD: patch-ab,v 1.3 2000/08/15 14:48:23 abs Exp $
 
---- 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 @@
- 
- install: 
- 	-mkdir ${RESDIR}/nls
--	${INSTALL} -m 644 maccode.* ${RESDIR}/nls
-+	${INSTALL} -c -m 644 maccode.* ${RESDIR}/nls
- 
- clean:
- 	rm -f *.o
+--- bin/Makefile.orig	Wed Dec 30 07:30:33 1998
++++ bin/Makefile
+@@ -7,6 +7,7 @@
+ ${ALL}: FRC
+ 	cd $@; ${MAKE} ${MFLAGS} CC="${CC}" \
+ 	    ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
++	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}"\
+ 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+ 	    DESTDIR="${DESTDIR}"
+@@ -24,6 +25,7 @@
+ 	for i in ${ALL}; \
+ 	    do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \
+ 		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
++		LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 	        SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+ 	        ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+ 		DESTDIR="${DESTDIR}" INSTALL="${INSTALL}" install); \
diff --git a/net/netatalk-asun/patches/patch-ac b/net/netatalk-asun/patches/patch-ac
index 827efd675ea..e846500d93d 100644
--- a/net/netatalk-asun/patches/patch-ac
+++ b/net/netatalk-asun/patches/patch-ac
@@ -1,41 +1,13 @@
-$NetBSD: patch-ac,v 1.2 2000/07/31 18:33:48 abs Exp $
+$NetBSD: patch-ac,v 1.3 2000/08/15 14:48:23 abs Exp $
 
---- 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}"
+--- config/AppleVolumes.system.orig	Thu Feb  4 07:49:04 1999
++++ config/AppleVolumes.system
+@@ -26,7 +26,7 @@
+ .html	TEXT	MOS!
+ .rtf	TEXT	MSWD
+ .doc	WDBN	MSWD
+-.pdf	CARO	PDF
++.pdf	PDF	CARO
  
-@@ -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}" \
+ # compressed archives
+ .bin	BINA	MB2P
diff --git a/net/netatalk-asun/patches/patch-ad b/net/netatalk-asun/patches/patch-ad
index 81cb21acb01..112cc16d2bc 100644
--- a/net/netatalk-asun/patches/patch-ad
+++ b/net/netatalk-asun/patches/patch-ad
@@ -1,14 +1,24 @@
-$NetBSD: patch-ad,v 1.2 2000/07/31 18:33:48 abs Exp $
+$NetBSD: patch-ad,v 1.3 2000/08/15 14:48:23 abs Exp $
 
---- 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;
- 
-     status = (struct afp_status *) data;
+--- etc/Makefile.orig	Mon Dec  7 21:52:29 1998
++++ etc/Makefile
+@@ -8,6 +8,7 @@
+ ${ALL}: FRC
+ 	cd $@; ${MAKE} ${MFLAGS} CC="${CC}" \
+ 	    ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
++	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+ 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+ 	    DESTDIR="${DESTDIR}" AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" \
+@@ -25,9 +26,11 @@
+ install:
+ 	-mkdir ${ETCDIR}
+ 	-mkdir ${SBINDIR}
++	-mkdir ${LIBEXECDIR}
+ 	for i in ${ALL}; \
+ 	    do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \
+ 		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
++		LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 	        SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+ 	        ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+ 		DESTDIR="${DESTDIR}" AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" \
diff --git a/net/netatalk-asun/patches/patch-ae b/net/netatalk-asun/patches/patch-ae
index 44f1728e5de..37863653f19 100644
--- a/net/netatalk-asun/patches/patch-ae
+++ b/net/netatalk-asun/patches/patch-ae
@@ -1,34 +1,36 @@
-$NetBSD: patch-ae,v 1.2 2000/07/31 18:33:48 abs Exp $
+$NetBSD: patch-ae,v 1.3 2000/08/15 14:48:23 abs Exp $
 
---- 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
+--- etc/afpd/Makefile.orig	Sat Feb  6 20:02:31 1999
++++ etc/afpd/Makefile
+@@ -72,6 +72,7 @@
+ 	fi; \
+ 	${MAKE} ${MFLAGS} CC="${CC}" ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" \
+ 	    OPTOPTS="${OPTOPTS}" DESTDIR="${DESTDIR}" DESDIR="${DESDIR}" \
++	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+ 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+ 	    PAMDIR="${PAMDIR}" TCPWRAPDIR="${TCPWRAPDIR}" \
+@@ -92,6 +93,7 @@
+ ${SUBDIRS}: FRC
+ 	cd $@; ${MAKE} ${MFLAGS} CC="${CC}" DEFS="${DEFS}" \
+ 	    OPTOPTS="${OPTOPTS}" DESTDIR="${DESTDIR}" DESDIR="${DESDIR}" \
++	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+ 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}"
  
- install : all
- 	-mkdir ${RESDIR}
--	-mkdir ${RESDIR}/filters
--	${INSTALL} -c psa ${SBINDIR}
--	${INSTALL} -c etc2ps.sh ${SBINDIR}/etc2ps
-+	-mkdir ${LIBEXECDIR}/psffilters
-+	${INSTALL} -c psa ${LIBEXECDIR}
-+	${INSTALL} -c etc2ps.sh ${LIBEXECDIR}/etc2ps
- 	${INSTALL} -c pagecount.ps ${RESDIR}
--	${INSTALL} -c psf ${SBINDIR}
-+	${INSTALL} -c psf ${LIBEXECDIR}
- 	for i in ${LINKS} ; do \
--	    rm -f ${RESDIR}/filters/$$i; \
--	    ln -s ${SBINDIR}/psf ${RESDIR}/filters/$$i; \
-+	    rm -f ${LIBEXECDIR}/psffilters/$$i; \
-+	    ln -s ../psf ${LIBEXECDIR}/psffilters/$$i; \
- 	done
- 
- clean :
+@@ -119,6 +121,7 @@
+ 	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}" \
+@@ -130,6 +133,7 @@
+ 	for i in ${SUBDIRS}; \
+ 	do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \
+ 		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
++		LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 	        SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+ 	        ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+ 		DESTDIR="${DESTDIR}" INSTALL="${INSTALL}" \
diff --git a/net/netatalk-asun/patches/patch-af b/net/netatalk-asun/patches/patch-af
index 769200ce73a..3a0ca365752 100644
--- a/net/netatalk-asun/patches/patch-af
+++ b/net/netatalk-asun/patches/patch-af
@@ -1,13 +1,13 @@
-$NetBSD: patch-af,v 1.2 2000/07/31 18:33:49 abs Exp $
+$NetBSD: patch-af,v 1.3 2000/08/15 14:48:23 abs Exp $
 
---- 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
+--- etc/afpd/nls/Makefile.orig	Sat Dec 12 11:01:06 1998
++++ etc/afpd/nls/Makefile
+@@ -14,7 +14,7 @@
  
- install : all
--	${INSTALL} -c atalkd ${SBINDIR}
-+	${INSTALL} -c atalkd ${LIBEXECDIR}
+ install: 
+ 	-mkdir ${RESDIR}/nls
+-	${INSTALL} -m 644 maccode.* ${RESDIR}/nls
++	${INSTALL} -c -m 644 maccode.* ${RESDIR}/nls
  
- clean :
- 	rm -f a.out core* *.o *.bak *[Ee]rrs tags
+ clean:
+ 	rm -f *.o
diff --git a/net/netatalk-asun/patches/patch-ag b/net/netatalk-asun/patches/patch-ag
index f9e17a045ea..3aa4e13533e 100644
--- a/net/netatalk-asun/patches/patch-ag
+++ b/net/netatalk-asun/patches/patch-ag
@@ -1,31 +1,14 @@
-$NetBSD: patch-ag,v 1.2 2000/07/31 18:33:49 abs Exp $
+$NetBSD: patch-ag,v 1.3 2000/08/15 14:48:23 abs Exp $
 
---- 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;
+--- etc/afpd/status.c.orig	Wed Dec 16 18:38:38 1998
++++ etc/afpd/status.c
+@@ -52,7 +52,8 @@
+ static int status_server(char *data, const char *server)
+ {
+     struct afp_status	*status;
+-    char                *Obj, *Type, *Zone;
++    const char          *Obj;
++    char                *Type, *Zone;
+     int			len;
  
-     /* 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;
-     }
+     status = (struct afp_status *) data;
diff --git a/net/netatalk-asun/patches/patch-ah b/net/netatalk-asun/patches/patch-ah
index 22354fa1e0c..2cae5858af6 100644
--- a/net/netatalk-asun/patches/patch-ah
+++ b/net/netatalk-asun/patches/patch-ah
@@ -1,7 +1,7 @@
-$NetBSD: patch-ah,v 1.2 2000/07/31 18:33:49 abs Exp $
+$NetBSD: patch-ah,v 1.3 2000/08/15 14:48:23 abs Exp $
 
 --- etc/atalkd/main.c.orig	Mon Jan 25 09:21:13 1999
-+++ etc/atalkd/main.c	Mon Jul 31 18:54:42 2000
++++ etc/atalkd/main.c
 @@ -245,12 +245,12 @@
  		    syslog( LOG_INFO, "config for no router" );
  		      
diff --git a/net/netatalk-asun/patches/patch-ai b/net/netatalk-asun/patches/patch-ai
index 29ab8051348..eead3bc8218 100644
--- a/net/netatalk-asun/patches/patch-ai
+++ b/net/netatalk-asun/patches/patch-ai
@@ -1,21 +1,31 @@
-$NetBSD: patch-ai,v 1.2 2000/07/31 18:33:49 abs Exp $
+$NetBSD: patch-ai,v 1.3 2000/08/15 14:48:23 abs Exp $
 
---- 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}" \
- 	    KRBLIBS="$${KRBLIBS}" KRBLIBDIRS="$${KRBLIBDIRS}" \
-@@ -56,7 +57,7 @@
- 	    ${CPPFLAGS} -c main.c
+--- etc/atalkd/nbp.c.orig	Sun Dec 13 05:22:42 1998
++++ etc/atalkd/nbp.c
+@@ -110,7 +110,7 @@
+     nn.nn_sat.sat_port = nt.nt_port;
  
- install : all
--	${INSTALL} -c papd ${SBINDIR}
-+	${INSTALL} -c papd ${LIBEXECDIR}
+     /* 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;
  
- clean :
- 	rm -f a.out core* *.o *.bak *[Ee]rrs tags
+     /* 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-aj b/net/netatalk-asun/patches/patch-aj
index 2ae3aa4cb2f..7adc9ab847c 100644
--- a/net/netatalk-asun/patches/patch-aj
+++ b/net/netatalk-asun/patches/patch-aj
@@ -1,61 +1,12 @@
-$NetBSD: patch-aj,v 1.2 2000/07/31 18:33:49 abs Exp $
+$NetBSD: patch-aj,v 1.3 2000/08/15 14:48:23 abs Exp $
 
---- 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));
- 		}
- 	}
- }
+--- etc/papd/Makefile.orig	Tue May 20 18:35:42 1997
++++ etc/papd/Makefile
+@@ -20,6 +20,7 @@
+ 	fi; \
+         ${MAKE} ${MFLAGS} CC="${CC}" ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" \
+ 	    OPTOPTS="${OPTOPTS}" DESTDIR="${DESTDIR}" \
++	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+ 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+ 	    KRBLIBS="$${KRBLIBS}" KRBLIBDIRS="$${KRBLIBDIRS}" \
diff --git a/net/netatalk-asun/patches/patch-ak b/net/netatalk-asun/patches/patch-ak
index 92bfc4523ec..d3a01e6abf2 100644
--- a/net/netatalk-asun/patches/patch-ak
+++ b/net/netatalk-asun/patches/patch-ak
@@ -1,24 +1,61 @@
-$NetBSD: patch-ak,v 1.2 2000/07/31 18:33:49 abs Exp $
+$NetBSD: patch-ak,v 1.3 2000/08/15 14:48:23 abs Exp $
 
---- 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}" \
-@@ -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/papd/printcap.c.orig	Fri May 30 01:27:35 1997
++++ etc/papd/printcap.c
+@@ -158,6 +158,7 @@
+ 	register int i = 0, cnt = 0;
+ 	char ibuf[BUFSIZ];
+ 	int tf;
++	int skip;
+ 
+ 	hopcount = 0;
+ 	tbuf = bp;
+@@ -176,7 +177,7 @@
+ 			cp2 = getenv("TERM");
+ 			if (cp2==(char *) 0 || strcmp(name,cp2)==0) {
+ 				strcpy(bp,cp);
+-				return(tnchktc());
++				return(tnchktc(cap));
+ 			} else {
+ 				tf = open(cap, 0);
+ 			}
+@@ -190,6 +191,7 @@
+ #endif
+ 	if (tf < 0)
+ 		return (-1);
++	skip = 0;
+ 	for (;;) {
+ 		cp = bp;
+ 		for (;;) {
+@@ -203,12 +205,20 @@
+ 			}
+ 			c = ibuf[i++];
+ 			if (c == '\n') {
+-				if (cp > bp && cp[-1] == '\\'){
++				if (!skip && cp > bp && cp[-1] == '\\'){
+ 					cp--;
+ 					continue;
+ 				}
+-				break;
++				skip = 0;
++				if (cp == bp)
++					continue;
++				else
++					break;
+ 			}
++			if (c == '#' && cp == bp)
++				skip++;
++			if (skip)
++				continue;
+ 			if (cp >= bp+BUFSIZ) {
+ 				write(2,"Termcap entry too long\n", 23);
+ 				break;
+@@ -222,7 +232,7 @@
+ 		 */
+ 		if (tnamatch(name)) {
+ 			close(tf);
+-			return(tnchktc());
++			return(tnchktc(cap));
+ 		}
+ 	}
+ }
diff --git a/net/netatalk-asun/patches/patch-al b/net/netatalk-asun/patches/patch-al
index 03bb3fe05a2..4f79802e1c4 100644
--- a/net/netatalk-asun/patches/patch-al
+++ b/net/netatalk-asun/patches/patch-al
@@ -1,29 +1,34 @@
-$NetBSD: patch-al,v 1.2 2000/07/31 18:33:50 abs Exp $
+$NetBSD: patch-al,v 1.3 2000/08/15 14:48:23 abs Exp $
 
---- 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}" \
- 	    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/psf/Makefile.orig	Thu Feb  4 06:57:52 1999
++++ etc/psf/Makefile
+@@ -25,21 +25,21 @@
+ psf.o : psf.c
+ 	${CC} ${CFLAGS} -D_PATH_PAP=\"${BINDIR}/pap\" \
+ 	    -D_PATH_PSORDER=\"${BINDIR}/psorder\" \
+-	    -D_PATH_PSA=\"${SBINDIR}/psa\" \
+-	    -D_PATH_PSFILTER=\"${SBINDIR}/etc2ps\" \
++	    -D_PATH_PSA=\"${LIBEXECDIR}/psa\" \
++	    -D_PATH_PSFILTER=\"${LIBEXECDIR}/etc2ps\" \
+ 	    -D_PATH_PAGECOUNT=\"${RESDIR}/pagecount.ps\" \
+ 	    ${CPPFLAGS} -c psf.c
+ 
+ install : all
+ 	-mkdir ${RESDIR}
+-	-mkdir ${RESDIR}/filters
+-	${INSTALL} -c psa ${SBINDIR}
+-	${INSTALL} -c etc2ps.sh ${SBINDIR}/etc2ps
++	-mkdir ${LIBEXECDIR}/psffilters
++	${INSTALL} -c psa ${LIBEXECDIR}
++	${INSTALL} -c etc2ps.sh ${LIBEXECDIR}/etc2ps
+ 	${INSTALL} -c pagecount.ps ${RESDIR}
+-	${INSTALL} -c psf ${SBINDIR}
++	${INSTALL} -c psf ${LIBEXECDIR}
+ 	for i in ${LINKS} ; do \
+-	    rm -f ${RESDIR}/filters/$$i; \
+-	    ln -s ${SBINDIR}/psf ${RESDIR}/filters/$$i; \
++	    rm -f ${LIBEXECDIR}/psffilters/$$i; \
++	    ln -s ../psf ${LIBEXECDIR}/psffilters/$$i; \
+ 	done
+ 
+ clean :
diff --git a/net/netatalk-asun/patches/patch-am b/net/netatalk-asun/patches/patch-am
index df4b019e863..4c57e6db2d9 100644
--- a/net/netatalk-asun/patches/patch-am
+++ b/net/netatalk-asun/patches/patch-am
@@ -1,37 +1,13 @@
-$NetBSD: patch-am,v 1.2 2000/07/31 18:33:50 abs Exp $
+$NetBSD: patch-am,v 1.3 2000/08/15 14:48:23 abs Exp $
 
---- 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}" \
- 	    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
+--- include/atalk/atp.h.orig	Wed May 28 16:22:52 1997
++++ include/atalk/atp.h
+@@ -84,7 +84,7 @@
  
- 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}" \
+ 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-an b/net/netatalk-asun/patches/patch-an
index f2da49d8bd8..db4eb219b84 100644
--- a/net/netatalk-asun/patches/patch-an
+++ b/net/netatalk-asun/patches/patch-an
@@ -1,34 +1,13 @@
-$NetBSD: patch-an,v 1.2 2000/07/31 18:33:50 abs Exp $
+$NetBSD: patch-an,v 1.3 2000/08/15 14:48:23 abs Exp $
 
---- 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}" \
-+	    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"
+--- libatalk/asp/asp_getsess.c.orig	Thu Jan 21 20:10:25 1999
++++ libatalk/asp/asp_getsess.c
+@@ -7,7 +7,7 @@
+ #include <stdlib.h>
+ #include <syslog.h>
+ #include <errno.h>
+-#include <sys/signal.h>
++#include <signal.h>
+ #include <sys/time.h>
+ #include <sys/types.h>
+ #include <sys/uio.h>
diff --git a/net/netatalk-asun/patches/patch-ao b/net/netatalk-asun/patches/patch-ao
index d86c79b7a2e..5f795eaa4f0 100644
--- a/net/netatalk-asun/patches/patch-ao
+++ b/net/netatalk-asun/patches/patch-ao
@@ -1,43 +1,12 @@
-$NetBSD: patch-ao,v 1.2 2000/07/31 18:33:50 abs Exp $
+$NetBSD: patch-ao,v 1.3 2000/08/15 14:48:23 abs Exp $
 
---- 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 @@
+--- libatalk/atp/atp_rsel.c.orig	Thu Feb  4 07:36:30 1999
++++ libatalk/atp/atp_rsel.c
+@@ -10,6 +10,7 @@
+ #include <sys/errno.h>
+ #include <sys/uio.h>
+ #include <signal.h>
++#include <string.h>
  
- 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}" \
+ #include <netatalk/endian.h>
+ #include <netatalk/at.h>
diff --git a/net/netatalk-asun/patches/patch-ap b/net/netatalk-asun/patches/patch-ap
index a2b0872ac74..f6584b7547a 100644
--- a/net/netatalk-asun/patches/patch-ap
+++ b/net/netatalk-asun/patches/patch-ap
@@ -1,33 +1,16 @@
-$NetBSD: patch-ap,v 1.2 2000/07/31 18:33:50 abs Exp $
+$NetBSD: patch-ap,v 1.3 2000/08/15 14:48:23 abs Exp $
 
---- 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}@ \
- 	    < ../../rc.atalk.bsd > ${ETCDIR}/rc.atalk
- 	@echo
- 	@echo "Install is done.  Don't forget to add lines from"
+--- libatalk/dsi/dsi_tcp.c.orig	Wed Nov 18 07:59:25 1998
++++ libatalk/dsi/dsi_tcp.c
+@@ -108,6 +108,11 @@
+       exit(1);
+     }
+     newact.sa_handler = timeout_handler;
++    sigemptyset(&newact.sa_mask);
++    newact.sa_flags = 0;
++    oldact.sa_handler = NULL;
++    sigemptyset(&oldact.sa_mask);
++    oldact.sa_flags = 0;
+     if (sigaction(SIGALRM, &newact, &oldact) < 0) {
+ 	syslog(LOG_ERR, "dsi_tcp_open: sigaction: %m");
+ 	exit(1);
diff --git a/net/netatalk-asun/patches/patch-aq b/net/netatalk-asun/patches/patch-aq
index 4cc6face440..a0a8fffcfe3 100644
--- a/net/netatalk-asun/patches/patch-aq
+++ b/net/netatalk-asun/patches/patch-aq
@@ -1,71 +1,13 @@
-$NetBSD: patch-aq,v 1.2 2000/07/31 18:33:51 abs Exp $
+$NetBSD: patch-aq,v 1.3 2000/08/15 14:48:23 abs Exp $
 
---- 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); \
+--- libatalk/nbp/nbp_lkup.c.orig	Thu Feb  4 07:36:14 1999
++++ libatalk/nbp/nbp_lkup.c
+@@ -7,7 +7,7 @@
+ #include <sys/types.h>
+ #include <sys/param.h>
+ #include <sys/socket.h>
+-#include <sys/signal.h>
++#include <signal.h>
+ #include <sys/time.h>
+ #include <netatalk/endian.h>
+ #include <netatalk/at.h>
diff --git a/net/netatalk-asun/patches/patch-ar b/net/netatalk-asun/patches/patch-ar
index 7b0ba51f208..5f88984eec0 100644
--- a/net/netatalk-asun/patches/patch-ar
+++ b/net/netatalk-asun/patches/patch-ar
@@ -1,33 +1,13 @@
-$NetBSD: patch-ar,v 1.2 2000/07/31 18:33:51 abs Exp $
+$NetBSD: patch-ar,v 1.3 2000/08/15 14:48:24 abs Exp $
 
---- 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}@ \
- 	    < ../../rc.atalk.bsd > ${ETCDIR}/rc.atalk
- 	@echo
- 	@echo "Install is done.  Don't forget to add lines from"
+--- libatalk/nbp/nbp_rgstr.c.orig	Thu Aug 14 22:27:23 1997
++++ libatalk/nbp/nbp_rgstr.c
+@@ -7,7 +7,7 @@
+ #include <sys/types.h>
+ #include <sys/param.h>
+ #include <sys/socket.h>
+-#include <sys/signal.h>
++#include <signal.h>
+ #include <sys/time.h>
+ #include <errno.h>
+ #include <netatalk/at.h>
diff --git a/net/netatalk-asun/patches/patch-as b/net/netatalk-asun/patches/patch-as
index 22e2957ea18..28cd8b5d588 100644
--- a/net/netatalk-asun/patches/patch-as
+++ b/net/netatalk-asun/patches/patch-as
@@ -1,13 +1,13 @@
-$NetBSD: patch-as,v 1.2 2000/07/31 18:33:51 abs Exp $
+$NetBSD: patch-as,v 1.3 2000/08/15 14:48:24 abs Exp $
 
---- 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
- 
+--- libatalk/nbp/nbp_unrgstr.c.orig	Thu Feb  4 07:26:41 1999
++++ libatalk/nbp/nbp_unrgstr.c
+@@ -7,7 +7,7 @@
+ #include <sys/types.h>
+ #include <sys/param.h>
+ #include <sys/socket.h>
+-#include <sys/signal.h>
++#include <signal.h>
+ #include <sys/time.h>
+ #include <errno.h>
+ #include <netatalk/endian.h>
diff --git a/net/netatalk-asun/patches/patch-at b/net/netatalk-asun/patches/patch-at
index 58580660db1..ccea13192da 100644
--- a/net/netatalk-asun/patches/patch-at
+++ b/net/netatalk-asun/patches/patch-at
@@ -1,13 +1,13 @@
-$NetBSD: patch-at,v 1.2 2000/07/31 18:33:51 abs Exp $
+$NetBSD: patch-at,v 1.3 2000/08/15 14:48:24 abs Exp $
 
---- 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
- 
+--- libatalk/nbp/nbp_util.c.orig	Thu Feb  4 07:27:02 1999
++++ libatalk/nbp/nbp_util.c
+@@ -6,7 +6,7 @@
+ #include <sys/types.h>
+ #include <sys/param.h>
+ #include <sys/socket.h>
+-#include <sys/signal.h>
++#include <signal.h>
+ #include <sys/time.h>
+ #include <netatalk/endian.h>
+ #include <netatalk/at.h>
diff --git a/net/netatalk-asun/patches/patch-au b/net/netatalk-asun/patches/patch-au
index 867414c6e36..4eb55a960e2 100644
--- a/net/netatalk-asun/patches/patch-au
+++ b/net/netatalk-asun/patches/patch-au
@@ -1,19 +1,20 @@
-$NetBSD: patch-au,v 1.2 2000/07/31 18:33:51 abs Exp $
+$NetBSD: patch-au,v 1.3 2000/08/15 14:48:24 abs Exp $
 
---- 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
+--- man/Makefile.orig	Tue May 20 18:35:43 1997
++++ man/Makefile
+@@ -8,6 +8,7 @@
+ ${ALL}: FRC
+ 	cd $@; ${MAKE} ${MFLAGS} CC="${CC}" DEFS="${DEFS}" \
+ 	    OPTOPTS="${OPTOPTS}" DESTDIR="${DESTDIR}" MANDIR="${MANDIR}" \
++	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+ 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}"
+ 
+@@ -25,6 +26,7 @@
+ 	for i in ${ALL}; \
+ 	    do (cd $$i; ${MAKE} ${MFLAGS} \
+ 		DESTDIR="${DESTDIR}"  MANDIR="${MANDIR}" \
++		LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 		SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+ 	        ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+ 		INSTALL="${INSTALL}" install); \
diff --git a/net/netatalk-asun/patches/patch-av b/net/netatalk-asun/patches/patch-av
index 851a56f9407..32bfbce53c7 100644
--- a/net/netatalk-asun/patches/patch-av
+++ b/net/netatalk-asun/patches/patch-av
@@ -1,7 +1,7 @@
-$NetBSD: patch-av,v 1.2 2000/07/31 18:33:51 abs Exp $
+$NetBSD: patch-av,v 1.3 2000/08/15 14:48:24 abs Exp $
 
 --- man/man1/Makefile.orig	Tue May 20 18:35:43 1997
-+++ man/man1/Makefile	Mon Jul 31 18:46:20 2000
++++ man/man1/Makefile
 @@ -20,6 +20,8 @@
  		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
  		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
diff --git a/net/netatalk-asun/patches/patch-aw b/net/netatalk-asun/patches/patch-aw
index 58229da33a3..f911cd0ba23 100644
--- a/net/netatalk-asun/patches/patch-aw
+++ b/net/netatalk-asun/patches/patch-aw
@@ -1,7 +1,7 @@
-$NetBSD: patch-aw,v 1.2 2000/07/31 18:33:52 abs Exp $
+$NetBSD: patch-aw,v 1.3 2000/08/15 14:48:24 abs Exp $
 
 --- man/man3/Makefile.orig	Tue May 20 18:35:43 1997
-+++ man/man3/Makefile	Mon Jul 31 18:46:20 2000
++++ man/man3/Makefile
 @@ -18,6 +18,8 @@
  		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
  		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
diff --git a/net/netatalk-asun/patches/patch-ax b/net/netatalk-asun/patches/patch-ax
index 0e89e5c35de..bd18c8fe64f 100644
--- a/net/netatalk-asun/patches/patch-ax
+++ b/net/netatalk-asun/patches/patch-ax
@@ -1,20 +1,13 @@
-$NetBSD: patch-ax,v 1.1 2000/07/31 18:33:52 abs Exp $
+$NetBSD: patch-ax,v 1.2 2000/08/15 14:48:24 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}"
+--- man/man4/Makefile.orig	Tue May 20 18:35:43 1997
++++ man/man4/Makefile
+@@ -17,6 +17,8 @@
+ 		    -e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
+ 		    -e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
+ 		    -e s@:INCDIR:@${INCDIR}@ \
++		    -e s@:LIBEXECDIR:@${LIBEXECDIR}@ \
++		    -e s@:EXAMPLEDIR:@${EXAMPLEDIR}@ \
+ 		    < $$i > ${MANDIR}/man4/$$i; \
+ 	done
  
-@@ -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
index 28c0e5f17e5..8f359cf58d3 100644
--- a/net/netatalk-asun/patches/patch-ay
+++ b/net/netatalk-asun/patches/patch-ay
@@ -1,20 +1,13 @@
-$NetBSD: patch-ay,v 1.1 2000/07/31 18:33:52 abs Exp $
+$NetBSD: patch-ay,v 1.2 2000/08/15 14:48:24 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); \
+--- man/man8/Makefile.orig	Tue May 20 18:35:43 1997
++++ man/man8/Makefile
+@@ -18,6 +18,8 @@
+ 		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
+ 		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
+ 		-e s@:INCDIR:@${INCDIR}@ \
++		-e s@:LIBEXECDIR:@${LIBEXECDIR}@ \
++		-e s@:EXAMPLEDIR:@${EXAMPLEDIR}@ \
+ 		< $$i > ${MANDIR}/man8/$$i; \
+ 	done
+ 
diff --git a/net/netatalk-asun/patches/patch-az b/net/netatalk-asun/patches/patch-az
index 4773cb97d94..e1729e52602 100644
--- a/net/netatalk-asun/patches/patch-az
+++ b/net/netatalk-asun/patches/patch-az
@@ -1,12 +1,19 @@
-$NetBSD: patch-az,v 1.1 2000/07/31 18:33:53 abs Exp $
+$NetBSD: patch-az,v 1.2 2000/08/15 14:48:24 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>
+--- man/man8/psf.8.orig	Tue May 20 18:35:43 1997
++++ man/man8/psf.8
+@@ -93,10 +93,10 @@
+     :sd=/usr/spool/lpd/laser:\\
+     :lp=/usr/spool/lpd/laser/null:\\
+     :lf=/var/adm/lpd-errs:pw#80:hl:\\
+-    :of=:LIBDIR:/filters/ofpap:\\
+-    :if=:LIBDIR:/filters/ifpaprev:\\
+-    :tf=:LIBDIR:/filters/tfpaprev:\\
+-    :df=:LIBDIR:/filters/dfpaprev:
++    :of=:LIBEXECDIR:/psffilters/ofpap:\\
++    :if=:LIBEXECDIR:/psffilters/ifpaprev:\\
++    :tf=:LIBEXECDIR:/psffilters/tfpaprev:\\
++    :df=:LIBEXECDIR:/psffilters/dfpaprev:
+ .fi
+ .RE
+ .sp
diff --git a/net/netatalk-asun/patches/patch-ba b/net/netatalk-asun/patches/patch-ba
index 5b53e8c641f..71747624675 100644
--- a/net/netatalk-asun/patches/patch-ba
+++ b/net/netatalk-asun/patches/patch-ba
@@ -1,13 +1,35 @@
-$NetBSD: patch-ba,v 1.1 2000/07/31 18:33:53 abs Exp $
+$NetBSD: patch-ba,v 1.2 2000/08/15 14:48:24 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>
+--- rc.atalk.bsd.orig	Mon Aug 25 23:00:54 1997
++++ rc.atalk.bsd
+@@ -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
+@@ -19,21 +20,17 @@
+ 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
++if [ -x :SBINDIR:/papd -a :ETCDIR:/papd.conf ]; then
+ 	:SBINDIR:/papd;		echo -n ' papd'
+ fi
+ 
+-if [ -x :SBINDIR:/afpd ]; then
++if [ -x :SBINDIR:/afpd -a :ETCDIR:/AppleVolumes.system ]; then
+ 	:SBINDIR:/afpd;		echo -n ' afpd'
+-fi
+-
+-if [ -x :SBINDIR:/timelord ]; then
+-	:SBINDIR:/timelord;		echo -n ' timelord'
+ fi
+ 
+ 					echo '.'
diff --git a/net/netatalk-asun/patches/patch-bb b/net/netatalk-asun/patches/patch-bb
index a39e877d36d..7b0b96d6c25 100644
--- a/net/netatalk-asun/patches/patch-bb
+++ b/net/netatalk-asun/patches/patch-bb
@@ -1,13 +1,33 @@
-$NetBSD: patch-bb,v 1.1 2000/07/31 18:33:54 abs Exp $
+$NetBSD: patch-bb,v 1.2 2000/08/15 14:48:24 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>
+--- sys/freebsd/Makefile.orig	Thu Feb  4 07:38:12 1999
++++ sys/freebsd/Makefile
+@@ -20,6 +20,7 @@
+ ${ALL}:	FRC
+ 	cd $@; ${MAKE} ${MFLAGS} CC="${CC}" \
+ 	    ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
++	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+ 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+ 	    DESTDIR="${DESTDIR}" AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" \
+@@ -29,9 +30,11 @@
+ 
+ install :
+ 	-mkdir ${DESTDIR} ${SBINDIR} ${BINDIR} ${ETCDIR} ${LIBDIR}
++	-mkdir ${LIBEXECDIR} ${EXAMPLEDIR}
+ 	for i in ${ALL}; \
+ 	    do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \
+ 		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
++		LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 	        SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+ 	        ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+ 		AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" AFPLIBS="${AFPLIBS}" \
+@@ -42,6 +45,8 @@
+ 		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
+ 		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
+ 		-e s@:INCDIR:@${INCDIR}@ \
++		-e s@:LIBEXECDIR:@${LIBEXECDIR}@ \
++		-e s@:EXAMPLEDIR:@${EXAMPLEDIR}@ \
+ 	    < ../../rc.atalk.bsd > ${ETCDIR}/rc.atalk
+ 	@echo
+ 	@echo "Install is done.  Don't forget to add lines from"
diff --git a/net/netatalk-asun/patches/patch-bc b/net/netatalk-asun/patches/patch-bc
index 16a52a8f381..b2c6cf3b7d1 100644
--- a/net/netatalk-asun/patches/patch-bc
+++ b/net/netatalk-asun/patches/patch-bc
@@ -1,13 +1,37 @@
-$NetBSD: patch-bc,v 1.1 2000/07/31 18:33:54 abs Exp $
+$NetBSD: patch-bc,v 1.2 2000/08/15 14:48:24 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>
+--- sys/linux/Makefile.orig	Sat Feb 27 21:10:59 1999
++++ sys/linux/Makefile
+@@ -23,6 +23,7 @@
+ ${ALL}:	FRC
+ 	cd $@; ${MAKE} ${MFLAGS} CC="${CC}" \
+ 	    ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
++	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+ 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+ 	    DESTDIR="${DESTDIR}" AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" \
+@@ -40,6 +41,8 @@
+ 	sed -e s@:DESTDIR:@${DESTDIR}@ -e s@:SBINDIR:@${SBINDIR}@ \
+ 		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
+ 		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
++		-e s@:LIBEXECDIR:@${LIBEXECDIR}@ \
++		-e s@:EXAMPLEDIR:@${EXAMPLEDIR}@ \
+ 		-e s@:INCDIR:@${INCDIR}@ \
+ 		< ../../rc.atalk.redhat > /etc/rc.d/init.d/atalk.init; \
+ 	sed -e s@:RCDIR:@/etc/rc.d/init.d@ \
+@@ -62,12 +65,15 @@
+ 		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
+ 		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
+ 		-e s@:INCDIR:@${INCDIR}@ \
++		-e s@:LIBEXECDIR:@${LIBEXECDIR}@ \
++		-e s@:EXAMPLEDIR:@${EXAMPLEDIR}@ \
+ 		< ../../rc.atalk.bsd > ${ETCDIR}/rc.atalk; \
+ 	fi \
+ 	fi
+ 
+ install : ${ETCDIR} install-sysv install-bsd
+ 	-mkdir ${DESTDIR} ${SBINDIR} ${BINDIR} ${LIBDIR}
++	-mkdir ${LIBEXECDIR} ${EXAMPLEDIR}
+ 	for i in ${ALL}; \
+ 	    do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \
+ 		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
diff --git a/net/netatalk-asun/patches/patch-bd b/net/netatalk-asun/patches/patch-bd
index dca981728ff..b4f7a91d114 100644
--- a/net/netatalk-asun/patches/patch-bd
+++ b/net/netatalk-asun/patches/patch-bd
@@ -1,13 +1,71 @@
-$NetBSD: patch-bd,v 1.1 2000/07/31 18:33:55 abs Exp $
+$NetBSD: patch-bd,v 1.2 2000/08/15 14:48:24 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>
+--- sys/netbsd/Makefile.orig	Thu Feb  4 07:30:30 1999
++++ sys/netbsd/Makefile
+@@ -1,10 +1,10 @@
+ # NetBSD specific defines, passed to subdirectories.
+ DEFS=	-DBSD4_4
+-OPTOPTS=	-O2
+-CC=	gcc -I../../sys/netbsd/ -I/usr/include/kerberosIV
++OPTOPTS=	-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-be b/net/netatalk-asun/patches/patch-be
index 62b7769ca4c..9ed8a94e6d2 100644
--- a/net/netatalk-asun/patches/patch-be
+++ b/net/netatalk-asun/patches/patch-be
@@ -1,13 +1,33 @@
-$NetBSD: patch-be,v 1.1 2000/07/31 18:33:55 abs Exp $
+$NetBSD: patch-be,v 1.2 2000/08/15 14:48:24 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>
+--- sys/openbsd/Makefile.orig	Mon Feb 22 23:02:31 1999
++++ sys/openbsd/Makefile
+@@ -19,6 +19,7 @@
+ ${ALL}:	FRC
+ 	cd $@; ${MAKE} ${MFLAGS} CC="${CC}" \
+ 	    ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
++	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+ 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+ 	    AFPLIBS="${AFPLIBS}" \
+@@ -28,9 +29,11 @@
+ 
+ install :
+ 	-mkdir ${DESTDIR} ${SBINDIR} ${BINDIR} ${ETCDIR} ${LIBDIR}
++	-mkdir ${LIBEXECDIR} ${EXAMPLEDIR}
+ 	for i in ${ALL}; \
+ 	    do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \
+ 		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
++		LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 	        SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+ 	        ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+ 		AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" AFPLIBS="${AFPLIBS}" \
+@@ -41,6 +44,8 @@
+ 		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
+ 		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
+ 		-e s@:INCDIR:@${INCDIR}@ \
++		-e s@:LIBEXECDIR:@${LIBEXECDIR}@ \
++		-e s@:EXAMPLEDIR:@${EXAMPLEDIR}@ \
+ 	    < ../../rc.atalk.bsd > ${ETCDIR}/rc.atalk
+ 	@echo
+ 	@echo "Install is done.  Don't forget to add lines from"
diff --git a/net/netatalk-asun/patches/patch-bf b/net/netatalk-asun/patches/patch-bf
index 034dc086bd7..c9bf23f9798 100644
--- a/net/netatalk-asun/patches/patch-bf
+++ b/net/netatalk-asun/patches/patch-bf
@@ -1,16 +1,43 @@
-$NetBSD: patch-bf,v 1.2 2000/08/02 11:43:03 abs Exp $
+$NetBSD: patch-bf,v 1.3 2000/08/15 14:48:24 abs Exp $
 
---- libatalk/dsi/dsi_tcp.c.orig	Wed Aug  2 10:16:25 2000
-+++ libatalk/dsi/dsi_tcp.c	Wed Aug  2 10:17:02 2000
-@@ -108,6 +108,11 @@
-       exit(1);
-     }
-     newact.sa_handler = timeout_handler;
-+    sigemptyset(&newact.sa_mask);
-+    newact.sa_flags = 0;
-+    oldact.sa_handler = NULL;
-+    sigemptyset(&oldact.sa_mask);
-+    oldact.sa_flags = 0;
-     if (sigaction(SIGALRM, &newact, &oldact) < 0) {
- 	syslog(LOG_ERR, "dsi_tcp_open: sigaction: %m");
- 	exit(1);
+--- sys/solaris/Makefile.orig	Wed Feb  3 19:52:10 1999
++++ sys/solaris/Makefile
+@@ -48,6 +48,7 @@
+ 	esac; \
+ 	echo "Making $@ for $$PROCESSOR..."; \
+ 	${MAKE} ${MFLAGS} \
++	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}"\
+ 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+ 	    MANDIR="${MANDIR}" DESTDIR="${DESTDIR}" AFSDIR="${AFSDIR}" \
+@@ -67,6 +68,7 @@
+ ${ALL}:	FRC
+ 	cd $@; ${MAKE} ${MFLAGS} CC="${CC}" \
+ 	    ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
++	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+ 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+ 	    DESTDIR="${DESTDIR}" AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" \
+@@ -91,6 +93,8 @@
+ 		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
+ 		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
+ 		-e s@:INCDIR:@${INCDIR}@ \
++		-e s@:LIBEXECDIR:@${LIBEXECDIR}@ \
++		-e s@:EXAMPLEDIR:@${EXAMPLEDIR}@ \
+ 	    < ../../rc.atalk.sysv > /etc/init.d/atalk
+ 	chmod 744 /etc/init.d/atalk
+ 	-ln -s ../init.d/atalk /etc/rc2.d/S79atalk
+@@ -98,11 +102,13 @@
+ 
+ install :
+ 	-mkdir ${DESTDIR} ${SBINDIR} ${BINDIR} ${ETCDIR} ${LIBDIR}
++	-mkdir ${LIBEXECDIR} ${EXAMPLEDIR}
+ 	sed -e s@:BINDIR:@${BINDIR}@ < ../../lp2pap.sh > ${RESDIR}/lp2pap.sh
+ 	chmod 744 ${RESDIR}/lp2pap.sh
+ 	for i in ${ALL}; \
+ 	    do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \
+ 		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
++		LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 	        SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+ 	        ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+ 		AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" \
diff --git a/net/netatalk-asun/patches/patch-bg b/net/netatalk-asun/patches/patch-bg
index 2c4ad036b67..8ebf2c39e75 100644
--- a/net/netatalk-asun/patches/patch-bg
+++ b/net/netatalk-asun/patches/patch-bg
@@ -1,13 +1,34 @@
-$NetBSD: patch-bg,v 1.2 2000/08/02 11:43:03 abs Exp $
+$NetBSD: patch-bg,v 1.3 2000/08/15 14:48:24 abs Exp $
 
---- config/AppleVolumes.system.orig	Thu Feb  4 07:49:04 1999
-+++ config/AppleVolumes.system	Wed Aug  2 10:15:45 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
+--- sys/sunos/Makefile.orig	Fri Sep 18 04:20:15 1998
++++ sys/sunos/Makefile
+@@ -51,6 +51,7 @@
+ ${ALL}:	FRC
+ 	cd $@; ${MAKE} ${MFLAGS} CC="${CC}" \
+ 	    ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
++	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+ 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+ 	    AFPLIBS="${AFPLIBS}" \
+@@ -69,9 +70,12 @@
+ 	-mkdir ${BINDIR}
+ 	-mkdir ${ETCDIR}
+ 	-mkdir ${LIBDIR}
++	-mkdir ${LIBEXECDIR}
++	-mkdir ${EXAMPLEDIR}
+ 	for i in ${ALL}; \
+ 	    do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \
+ 		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
++		LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 	        SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+ 	        ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+ 		DESTDIR="${DESTDIR}" MANDIR="${MANDIR}" AFPLIBS="${AFPLIBS}" \
+@@ -83,6 +87,8 @@
+ 		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
+ 		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
+ 		-e s@:INCDIR:@${INCDIR}@ -e 's@^##@@' \
++		-e s@:LIBEXECDIR:@${LIBEXECDIR}@ \
++		-e s@:EXAMPLEDIR:@${EXAMPLEDIR}@ \
+ 	    < ../../rc.atalk.bsd > ${ETCDIR}/rc.atalk
+ 	@echo
+ 	@echo "Install is done.  Don't forget to add lines from"
diff --git a/net/netatalk-asun/patches/patch-bh b/net/netatalk-asun/patches/patch-bh
index 765e416d168..9439db51f71 100644
--- a/net/netatalk-asun/patches/patch-bh
+++ b/net/netatalk-asun/patches/patch-bh
@@ -1,66 +1,29 @@
-$NetBSD: patch-bh,v 1.2 2000/08/02 11:43:03 abs Exp $
+$NetBSD: patch-bh,v 1.3 2000/08/15 14:48:24 abs Exp $
 
---- Makefile.orig	Sun Feb  7 11:15:46 1999
-+++ Makefile	Wed Aug  2 10:15:45 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} \
+--- sys/ultrix/Makefile.orig	Thu Feb  4 07:30:55 1999
++++ sys/ultrix/Makefile
+@@ -24,6 +24,7 @@
+ ${ALL}:	FRC
+ 	cd $@; ${MAKE} ${MFLAGS} CC="${CC}" \
+ 	    ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
 +	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
- 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}"\
+ 	    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}" $@
- 
+ 	    AFPLIBS="${AFPLIBS}" \
+@@ -36,6 +37,7 @@
+ 	for i in ${ALL}; \
+ 	    do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \
+ 		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
++		LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 	        SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+ 	        ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+ 		DESTDIR="${DESTDIR}" MANDIR="${MANDIR}" \
+@@ -46,6 +48,8 @@
+ 	sed -e s@:DESTDIR:@${DESTDIR}@ -e s@:SBINDIR:@${SBINDIR}@ \
+ 		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
+ 		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
++		-e s@:LIBEXECDIR:@${LIBEXECDIR}@ \
++		-e s@:EXAMPLEDIR:@${EXAMPLEDIR}@ \
+ 		-e s@:INCDIR:@${INCDIR}@ \
+ 	    < ../../rc.atalk.bsd > ${ETCDIR}/rc.atalk
+ 	@echo
diff --git a/net/netatalk-asun/pkg/PLIST b/net/netatalk-asun/pkg/PLIST
index 5cc8dc2dc88..3614b879f42 100644
--- a/net/netatalk-asun/pkg/PLIST
+++ b/net/netatalk-asun/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2000/07/31 18:33:58 abs Exp $
+@comment $NetBSD: PLIST,v 1.3 2000/08/15 14:48:24 abs Exp $
 bin/adv1tov2
 bin/aecho
 bin/getzones
@@ -41,9 +41,9 @@ include/netatalk/endian.h
 include/netatalk/phase2.h
 lib/libatalk.a
 lib/libatalk_p.a
-libexec/afpd
-libexec/atalkd
 libexec/etc2ps
+libexec/psa
+libexec/psf
 libexec/psffilters/ifmpap
 libexec/psffilters/ifmpaprev
 libexec/psffilters/ifpap
@@ -64,9 +64,6 @@ libexec/psffilters/tfwmpap
 libexec/psffilters/tfwmpaprev
 libexec/psffilters/tfwpap
 libexec/psffilters/tfwpaprev
-libexec/papd
-libexec/psa
-libexec/psf
 man/man1/aecho.1
 man/man1/getzones.1
 man/man1/hqx2bin.1
@@ -89,6 +86,9 @@ man/man8/afpd.8
 man/man8/atalkd.8
 man/man8/papd.8
 man/man8/psf.8
+sbin/afpd
+sbin/atalkd
+sbin/papd
 share/examples/netatalk/AppleVolumes.default
 share/examples/netatalk/AppleVolumes.system
 share/examples/netatalk/afpd.conf