Fix two PRs on this package, and make it compile on macppc.

Sample files are installed in pkg/share/examples/netatalk, addressing
PR 7920 by rnestor@metronet.com.

Now include elf support, addressing PR 8125 by Takahiro Kambe,
<taca@sky.yamashina.kyoto.jp> with slight changes by me.

Cleaned up some lint warnings and fixed an unsigned character comparison
problem with assistance from cgd@netbsd.org.

Disabled building of libatalk_p.a (profiling libatalk) as not all ports
support it which will generate plist errors.

32 files changed, 573 insertions, 499 deletions

diff --git a/net/netatalk/files/patch-sum b/net/netatalk/files/patch-sum
index a678e2a0c15..68ddb2cb634 100644
--- a/net/netatalk/files/patch-sum
+++ b/net/netatalk/files/patch-sum
@@ -1,30 +1,32 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:12:23 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/08/31 22:09:42 wrstuden Exp $
 
-MD5 (patch-aa) = 1e373f3e95d6a8d6583bc17f1fcd291d
-MD5 (patch-ab) = 35e8621a68f419b60f1415e3a113c4cb
-MD5 (patch-ac) = 3d3dbc24ad27ebef3f22eb320e8f3c4b
-MD5 (patch-ad) = 4c79d55a341c7fb6429ae2e704f4043c
-MD5 (patch-ae) = 5a9fd928dd7167ffba8a9da09a3b35a0
-MD5 (patch-af) = 0c40cfb04ea2a7f8ceb9a4bd4771d351
-MD5 (patch-ag) = 09e799600afc4d34e08b90bf7ae3d06b
-MD5 (patch-ah) = 0a7101210405724f0c7dca9fc4264586
-MD5 (patch-ai) = feb792b7c3ff98ad8d8b89a9e0570446
-MD5 (patch-aj) = ad4c2b02f2b4ea8f14b2f1b043dfd3ab
-MD5 (patch-ak) = 20e2abb7132a8e6758c1799ac38c97b8
-MD5 (patch-al) = add20aeec0e9f4588bac67bf0c4d4bac
-MD5 (patch-am) = a2a09cb8b459be861e1ab7ae2d3388c7
-MD5 (patch-an) = 7406bd596c2eff8d35eb045675d5d744
-MD5 (patch-ao) = 5eecc8ddb9171cebaa13134ec3f2aed6
-MD5 (patch-ap) = 243170e2df0868936dfd41e293641a33
-MD5 (patch-aq) = 6cf02da5dcca060776d7408e0e20503b
-MD5 (patch-ar) = d1218115f0cccb509753db6c4c94e3c8
-MD5 (patch-as) = b4b50b8afe9320ac9d4d929f9a33a4b9
-MD5 (patch-at) = 2d6027b0be0cedb03ac74483516b554d
-MD5 (patch-au) = d2b179acded2beb002a72aca287ec32d
-MD5 (patch-av) = cdb1ac85017597aadcc43ed236581da3
-MD5 (patch-aw) = b15bafa6d4ca44966586480c4ea9721f
-MD5 (patch-ax) = 0cab9c5d4d05220c42eb513ca7985fd2
-MD5 (patch-ay) = 35173bd2645526e3a431432724adc727
-MD5 (patch-az) = 4e23936f2cb15db7118ce74b01012eed
-MD5 (patch-ba) = 8671881399b1e66efc1c90c8ffe8d329
-MD5 (patch-bb) = 4ef5fec6c63968b7e801ff242c135c3a
+MD5 (patch-aa) = 0cae7e0efa5144d16ebb3319b65967d7
+MD5 (patch-ab) = c9013bae176432478a2b323bb5b42dd5
+MD5 (patch-ac) = dff113a1a22e9ade41ddb518dba9948c
+MD5 (patch-ad) = 5a929de9ae75477f36a4ae52ef7b8d8d
+MD5 (patch-ae) = 3fb89927e356035417126a1f37d8ef18
+MD5 (patch-af) = a82b5c6e8b0345235129dda0fbdbff50
+MD5 (patch-ag) = 254d80d42fb56a22e0d7b55a7b50c97a
+MD5 (patch-ah) = 4b63651ee4db57560fe8a1ec9d67bf89
+MD5 (patch-ai) = 7309489118b6bf947cc40e93cf0a1c91
+MD5 (patch-aj) = 96f0e266691b29254bf3cb252fa31f92
+MD5 (patch-ak) = 2d675bda0c0c05572422dfefa8a6eaef
+MD5 (patch-al) = 60cf308407d231b1b3cdc23801df5e4a
+MD5 (patch-am) = 06e3528755cac7a1c8d62c288bea803a
+MD5 (patch-an) = 5b9144804733bccc5419e89a1d66651c
+MD5 (patch-ao) = 7bece3160a94ff6b091b7c85f4ea40e7
+MD5 (patch-ap) = 5a50a786c0cde576117a38ec20fa8e06
+MD5 (patch-aq) = 9475b707237d334414752319ed6cb65a
+MD5 (patch-ar) = b98f8cb352e2ffbdad7ede2300823f8c
+MD5 (patch-as) = 19f8991dac5ca51ae5fd1ca868fa9695
+MD5 (patch-at) = db6abe175ddfc7bad262f535b3782239
+MD5 (patch-au) = d0c1c37293fa873f30cd4548c6b9f214
+MD5 (patch-av) = 0102fa9347160872c32033e5bf42453f
+MD5 (patch-aw) = d98dd0383598f2fdae0b1163472683d4
+MD5 (patch-ax) = d8a4cc4792ea2243385c220b96681b49
+MD5 (patch-ay) = f445557ea9ec2d65997ea193606f6fe0
+MD5 (patch-az) = 72bfc9fe977f02388feaf3a3f5feaaf1
+MD5 (patch-ba) = 9f96803ff397f3a6fb2014e40027a59b
+MD5 (patch-bb) = f39c3b74eae13447b56070ca4019a22b
+MD5 (patch-bc) = fe7e4a89267774c2c83bb929b0380487
+MD5 (patch-bd) = 4ffc0d7510662040fd1f0451478f9592
diff --git a/net/netatalk/patches/patch-aa b/net/netatalk/patches/patch-aa
index 186bae43934..252c35095c0 100644
--- a/net/netatalk/patches/patch-aa
+++ b/net/netatalk/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 1998/12/26 22:09:27 agc Exp $
+$NetBSD: patch-aa,v 1.2 1999/08/31 22:09:42 wrstuden Exp $
 
---- Makefile.orig	Thu Oct  1 18:45:05 1998
-+++ Makefile	Sat Sep 26 10:49:57 1998
-@@ -1,22 +1,24 @@
+--- Makefile	Wed Dec 17 09:25:39 1997
++++ Makefile	Tue Aug 31 02:06:35 1999
+@@ -1,22 +1,26 @@
 -# Root of installation. Subdirectories will be ${DESTDIR}/etc,
 -# ${DESTDIR}/bin, and ${DESTDIR}/lib.
 -DESTDIR=/usr/local/atalk
@@ -34,10 +34,12 @@ $NetBSD: patch-aa,v 1.1.1.1 1998/12/26 22:09:27 agc Exp $
  # ${MANDIR}/man1, ${MANDIR}/man4, and ${MANDIR}/man8.
 -MANDIR=$(DESTDIR)/man
 +MANDIR=$(ATALK_DESTDIR)/man
++# for example config files
++EXAMPLEDIR=$(ATALK_DESTDIR)/share/examples/netatalk
  
  #SBINDIR=/usr/sbin
  #BINDIR=/usr/bin
-@@ -57,8 +59,9 @@
+@@ -57,8 +61,9 @@
  	cd sys/$$ARCH && ${MAKE} ${MFLAGS} \
  	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}"\
  	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
@@ -45,7 +47,7 @@ $NetBSD: patch-aa,v 1.1.1.1 1998/12/26 22:09:27 agc Exp $
 -	    AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" $@
 +	    ATALK_DESTDIR="${ATALK_DESTDIR}" MANDIR="${MANDIR}" \
 +	    AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" LIBEXECDIR="${LIBEXECDIR}" \
-+	    OPTOPTS="${OPTOPTS}" $@
++	    OPTOPTS="${OPTOPTS}" EXAMPLEDIR="${EXAMPLEDIR}" $@
  
  FRC:
  
diff --git a/net/netatalk/patches/patch-ab b/net/netatalk/patches/patch-ab
index 139b3114367..d62ca8d8e50 100644
--- a/net/netatalk/patches/patch-ab
+++ b/net/netatalk/patches/patch-ab
@@ -1,18 +1,22 @@
-$NetBSD: patch-ab,v 1.1.1.1 1998/12/26 22:09:27 agc Exp $
+$NetBSD: patch-ab,v 1.2 1999/08/31 22:09:42 wrstuden Exp $
 
---- include/Makefile.orig	Thu Oct  1 18:46:15 1998
-+++ include/Makefile	Thu Sep 17 21:46:49 1998
-@@ -1,11 +1,11 @@
--TARGETS=	atalk netatalk
-+TARGETS=	atalk
+--- bin/Makefile	Tue Feb 20 08:36:51 1996
++++ bin/Makefile	Mon Aug 30 06:47:41 1999
+@@ -9,7 +9,7 @@
+ 	    ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
+ 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}"\
+ 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+-	    DESTDIR="${DESTDIR}"
++	    ATALK_DESTDIR="${ATALK_DESTDIR}"
  
- INSTALL=	install
+ FRC:
  
- all :
+@@ -26,7 +26,7 @@
+ 		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
+ 	        SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+ 	        ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+-		DESTDIR="${DESTDIR}" INSTALL="${INSTALL}" install); \
++		ATALK_DESTDIR="${ATALK_DESTDIR}" INSTALL="${INSTALL}" install); \
+ 	done
  
- install : all
--	-mkdir ${DESTDIR}
-+	-mkdir ${ATALK_DESTDIR}
- 	-mkdir ${INCDIR}
- 	for i in ${TARGETS}; do \
- 	    rm -rf ${INCDIR}/$$i ; \
+ clean:
diff --git a/net/netatalk/patches/patch-ac b/net/netatalk/patches/patch-ac
index 18e7023fa0c..98218d3798a 100644
--- a/net/netatalk/patches/patch-ac
+++ b/net/netatalk/patches/patch-ac
@@ -1,39 +1,22 @@
-$NetBSD: patch-ac,v 1.1.1.1 1998/12/26 22:09:27 agc Exp $
+$NetBSD: patch-ac,v 1.2 1999/08/31 22:09:42 wrstuden Exp $
 
-Pass ATALK_DESTDIR down, rather than DESTDIR, so we don't trigger DESTDIR
-rules in <bsd.sys.mk> governing nostdinc and idirafter
-
---- sys/netbsd/Makefile.orig	Thu Oct  1 18:46:49 1998
-+++ sys/netbsd/Makefile	Sat Sep 26 10:50:25 1998
-@@ -1,6 +1,5 @@
- # NetBSD specific defines, passed to subdirectories.
- DEFS=	-DBSD4_4
--OPTOPTS=	-O2
- CC=	gcc -Werror -I../../sys/netbsd/
- INSTALL=	install
- ADDLIBS=	-lcrypt
-@@ -16,12 +15,13 @@
+--- etc/Makefile	Tue Feb 20 08:37:56 1996
++++ etc/Makefile	Mon Aug 30 06:47:41 1999
+@@ -10,7 +10,7 @@
  	    ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
  	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
  	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
--	    DESTDIR="${DESTDIR}" AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" all
-+	    ATALK_DESTDIR="${ATALK_DESTDIR}" AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" all
+-	    DESTDIR="${DESTDIR}" AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}"
++	    ATALK_DESTDIR="${ATALK_DESTDIR}" AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}"
  
  FRC:
  
- install :
--	-mkdir ${DESTDIR} ${SBINDIR} ${BINDIR} ${ETCDIR} ${LIBDIR}
-+	-mkdir ${ATALK_DESTDIR} ${SBINDIR} ${BINDIR} ${ETCDIR}
-+	-mkdir ${LIBDIR} ${LIBEXECDIR} ${RESDIR}
- 	for i in ${ALL}; \
- 	    do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \
+@@ -27,7 +27,7 @@
  		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
-@@ -31,7 +31,7 @@
- 		INSTALL="${INSTALL}" $@); \
+ 	        SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+ 	        ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+-		DESTDIR="${DESTDIR}" AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" \
++		ATALK_DESTDIR="${ATALK_DESTDIR}" AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" \
+ 		INSTALL="${INSTALL}" install); \
  	done
- 	rm -f ${ETCDIR}/rc.atalk
--	sed -e s@:DESTDIR:@${DESTDIR}@ -e s@:SBINDIR:@${SBINDIR}@ \
-+	sed -e s@:DESTDIR:@${ATALK_DESTDIR}@ -e s@:SBINDIR:@${SBINDIR}@ \
- 		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
- 		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
- 		-e s@:INCDIR:@${INCDIR}@ \
+ 
diff --git a/net/netatalk/patches/patch-ad b/net/netatalk/patches/patch-ad
index d4407aea72c..6cb63f815c6 100644
--- a/net/netatalk/patches/patch-ad
+++ b/net/netatalk/patches/patch-ad
@@ -1,39 +1,13 @@
-$NetBSD: patch-ad,v 1.1.1.1 1998/12/26 22:09:27 agc Exp $
+$NetBSD: patch-ad,v 1.2 1999/08/31 22:09:42 wrstuden Exp $
 
---- etc/psf/Makefile.orig	Thu Oct  2 19:35:26 1997
-+++ etc/psf/Makefile	Fri Oct 30 11:34:08 1998
-@@ -9,10 +9,10 @@
- INSTALL=	install
- LIBDIRS=
- 
--LINKS=	ofpap ifpap tfpap ifpaprev tfpaprev \
--	ofwpap ifwpap tfwpap ifwpaprev tfwpaprev \
--	ofmpap ifmpap tfmpap ifmpaprev tfmpaprev \
--	ofwmpap ifwmpap tfwmpap ifwmpaprev tfwmpaprev
-+LINKS=	ofpap ifpap tfpap dfpap ifpaprev tfpaprev dfpaprev \
-+	ofwpap ifwpap tfwpap dfwpap ifwpaprev tfwpaprev dfwpaprev \
-+	ofmpap ifmpap tfmpap dfmpap ifmpaprev tfmpaprev dfmpaprev \
-+	ofwmpap ifwmpap tfwmpap dfwmpap ifwmpaprev tfwmpaprev dfwmpaprev
- 
- all : ${TARGETS}
- 
-@@ -32,14 +32,14 @@
- 
- install : all
- 	-mkdir ${RESDIR}
--	-mkdir ${RESDIR}/filters
--	${INSTALL} -c psa ${SBINDIR}
-+	-mkdir ${RESDIR}/psffilters
-+	${INSTALL} -c psa ${LIBEXECDIR}
- 	${INSTALL} -c etc2ps.sh ${SBINDIR}/etc2ps
- 	${INSTALL} -c pagecount.ps ${RESDIR}
--	${INSTALL} -c psf ${SBINDIR}
-+	${INSTALL} -c psf ${LIBEXECDIR}
- 	for i in ${LINKS} ; do \
--	    rm -f ${RESDIR}/filters/$$i; \
--	    ln -s ${SBINDIR}/psf ${RESDIR}/filters/$$i; \
-+	    rm -f ${RESDIR}/psffilters/$$i; \
-+	    ln -s ${LIBEXECDIR}/psf ${RESDIR}/psffilters/$$i; \
- 	done
- 
- clean :
+--- etc/afpd/Makefile	Thu Jun 25 07:07:32 1998
++++ etc/afpd/Makefile	Mon Aug 30 06:47:41 1999
+@@ -32,7 +32,7 @@
+ 	    AFSDEFS="-DAFS"; \
+ 	fi; \
+ 	${MAKE} ${MFLAGS} CC="${CC}" ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" \
+-	    OPTOPTS="${OPTOPTS}" DESTDIR="${DESTDIR}" \
++	    OPTOPTS="${OPTOPTS}" ATALK_DESTDIR="${ATALK_DESTDIR}" \
+ 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+ 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+ 	    KRBLIBS="$${KRBLIBS}" KRBLIBDIRS="$${KRBLIBDIRS}" \
diff --git a/net/netatalk/patches/patch-ae b/net/netatalk/patches/patch-ae
index a2207bc4014..a824bf23677 100644
--- a/net/netatalk/patches/patch-ae
+++ b/net/netatalk/patches/patch-ae
@@ -1,79 +1,31 @@
-$NetBSD: patch-ae,v 1.1.1.1 1998/12/26 22:09:27 agc Exp $
+$NetBSD: patch-ae,v 1.2 1999/08/31 22:09:42 wrstuden Exp $
 
---- libatalk/Makefile	1998/10/26 13:10:36	1.1
-+++ libatalk/Makefile	1998/10/26 13:14:24
-@@ -1,63 +1,15 @@
--ALL=	asp atp nbp adouble util compat
--LIBS=	asp/asplib atp/atplib nbp/nbplib adouble/adoublelib \
--	util/utillib compat/compatlib
--PLIBS=	asp/asplib_p atp/atplib_p nbp/nbplib_p adouble/adoublelib_p \
--	util/utillib_p compat/compatlib_p
--TAGSFILE=tags
--CC=cc
--INSTALL=install
-+LIB=	atalk
+--- etc/atalkd/nbp.c	Mon Oct 27 14:28:43 1997
++++ etc/atalkd/nbp.c	Mon Aug 30 06:52:31 1999
+@@ -86,7 +86,7 @@
+     nn.nn_sat.sat_port = nt.nt_port;
  
--all:	libatalk.a
-+.include "${.CURDIR}/asp/Makefile.inc"
-+.include "${.CURDIR}/atp/Makefile.inc"
-+.include "${.CURDIR}/nbp/Makefile.inc"
-+.include "${.CURDIR}/adouble/Makefile.inc"
-+.include "${.CURDIR}/util/Makefile.inc"
-+.include "${.CURDIR}/compat/Makefile.inc"
+     /* object */
+-    if ( data >= end || ( *data < 0 || *data > 32 ) || data + *data > end ) {
++    if ( data >= end || (*(unsigned char *)data > 32 ) || data + *data > end ) {
+ 	syslog( LOG_INFO, "nbp_packet: malformed packet" );
+ 	return;
+     }
+@@ -95,7 +95,7 @@
+     data += nn.nn_objlen;
  
--libatalk.a: ${LIBS}
--	rm -rf tmp
--	-mkdir tmp
--	for i in ${ALL}; do (cd tmp; ar x ../$$i/$${i}lib); done
--	(cd tmp; ar cr libatalk.a  *.o; ranlib libatalk.a)
--	mv tmp/libatalk.a libatalk.a
--	ranlib libatalk.a
--	rm -rf tmp tmp_p
--	-mkdir tmp_p
--	for i in ${ALL}; do (cd tmp_p; ar x ../$$i/$${i}lib_p); done
--	(cd tmp_p; ar cr libatalk_p.a  *.o; ranlib libatalk_p.a)
--	mv tmp_p/libatalk_p.a libatalk_p.a
--	ranlib libatalk_p.a
--	rm -rf tmp_p
-+CPPFLAGS=	${DEFS} ${OPTOPTS} -I${.CURDIR}/../include
+     /* type */
+-    if ( data >= end || ( *data < 0 || *data > 32 ) || data + *data > end ) {
++    if ( data >= end || (*(unsigned char *)data > 32 ) || data + *data > end ) {
+ 	syslog( LOG_INFO, "nbp_packet: malformed packet" );
+ 	return;
+     }
+@@ -104,7 +104,7 @@
+     data += nn.nn_typelen;
  
--${ALL}: FRC
--	cd $@; ${MAKE} ${MFLAGS} CC="${CC}" DEFS="${DEFS}" \
--	    OPTOPTS="${OPTOPTS}"
-+SHLIB_MAJOR=	1
-+SHLIB_MINOR=	0
- 
--asp/asplib:	asp
--atp/atplib:	atp
--nbp/nbplib:	nbp
--adouble/adoublelib:	adouble
--util/utillib:	util
--compat/compatlib:	compat
--
--FRC:
--
--tags:
--	for i in ${ALL}; do \
--	    (cd $$i; ${MAKE} ${MFLAGS} DEFS="${DEFS}" \
--		TAGSFILE=../${TAGSFILE} tags); \
--	done
--
--install: all
--	-mkdir ${LIBDIR}
--	${INSTALL} -c libatalk.a ${LIBDIR}/libatalk.a
--	(cd ${LIBDIR}; ranlib ${LIBDIR}/libatalk.a)
--	${INSTALL} -c libatalk_p.a ${LIBDIR}/libatalk_p.a
--	(cd ${LIBDIR}; ranlib ${LIBDIR}/libatalk_p.a)
--
--clean:
--	for i in ${ALL}; \
--	    do (cd $$i; ${MAKE} ${MFLAGS} clean); \
--	done
--	rm -f *[Ee]rrs libatalk.a libatalk_p.a
--	rm -rf tmp tmp_p
--
--depend:
--	for i in ${ALL}; \
--	    do (cd $$i; ${MAKE} ${MFLAGS} DEFS=${DEFS} depend); \
--	done
-+.include <bsd.lib.mk>
+     /* zone */
+-    if ( data >= end || ( *data < 0 || *data > 32 ) || data + *data > end ) {
++    if ( data >= end || (*(unsigned char *)data > 32 ) || data + *data > end ) {
+ 	syslog( LOG_INFO, "nbp_packet: malformed packet" );
+ 	return;
+     }
diff --git a/net/netatalk/patches/patch-af b/net/netatalk/patches/patch-af
index 6399c510cc4..a490f081dcc 100644
--- a/net/netatalk/patches/patch-af
+++ b/net/netatalk/patches/patch-af
@@ -1,8 +1,13 @@
-$NetBSD: patch-af,v 1.1.1.1 1998/12/26 22:09:27 agc Exp $
+$NetBSD: patch-af,v 1.2 1999/08/31 22:09:42 wrstuden Exp $
 
---- /dev/null	Mon Oct 26 13:12:53 1998
-+++ libatalk/adouble/Makefile.inc	Mon Oct 26 13:17:00 1998
-@@ -0,0 +1,3 @@
-+.PATH: ${.CURDIR}/adouble
-+
-+SRCS+= ad_open.c ad_flush.c ad_read.c ad_write.c
+--- etc/papd/Makefile	Tue Oct 22 14:22:20 1996
++++ etc/papd/Makefile	Mon Aug 30 06:47:42 1999
+@@ -19,7 +19,7 @@
+ 	    KRBDEFS="-DKRB"; \
+ 	fi; \
+         ${MAKE} ${MFLAGS} CC="${CC}" ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" \
+-	    OPTOPTS="${OPTOPTS}" DESTDIR="${DESTDIR}" \
++	    OPTOPTS="${OPTOPTS}" ATALK_DESTDIR="${ATALK_DESTDIR}" \
+ 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+ 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+ 	    KRBLIBS="$${KRBLIBS}" KRBLIBDIRS="$${KRBLIBDIRS}" \
diff --git a/net/netatalk/patches/patch-ag b/net/netatalk/patches/patch-ag
index ee41c53ec31..391c830888a 100644
--- a/net/netatalk/patches/patch-ag
+++ b/net/netatalk/patches/patch-ag
@@ -1,9 +1,21 @@
-$NetBSD: patch-ag,v 1.1.1.1 1998/12/26 22:09:27 agc Exp $
+$NetBSD: patch-ag,v 1.2 1999/08/31 22:09:43 wrstuden Exp $
 
---- /dev/null	Mon Oct 26 13:12:53 1998
-+++ libatalk/asp/Makefile.inc	Mon Oct 26 13:19:11 1998
-@@ -0,0 +1,4 @@
-+.PATH: ${.CURDIR}/asp
-+
-+SRCS+= asp_close.c asp_cmdreply.c asp_getreq.c
-+SRCS+= asp_getsess.c asp_init.c asp_write.c asp_shutdown.c
+--- etc/papd/session.c	Wed Sep 23 07:15:11 1998
++++ etc/papd/session.c	Mon Aug 30 06:47:42 1999
+@@ -3,6 +3,7 @@
+  * All Rights Reserved.  See COPYRIGHT.
+  */
+ 
++#include <string.h>
+ #include <sys/types.h>
+ #include <sys/syslog.h>
+ #include <sys/time.h>
+@@ -53,7 +54,7 @@
+     fd_set		fds;
+     char		cbuf[ 578 ];
+     int			i, cc, timeout = 0, readpending = 0;
+-    u_short		seq = 1, rseq = 1, netseq;
++    u_short		seq = 0, rseq = 1, netseq;
+     u_char		readport;
+ 
+     infile.pf_state = PF_BOT;
diff --git a/net/netatalk/patches/patch-ah b/net/netatalk/patches/patch-ah
index 61849eb55d1..cc83966e3f4 100644
--- a/net/netatalk/patches/patch-ah
+++ b/net/netatalk/patches/patch-ah
@@ -1,9 +1,39 @@
-$NetBSD: patch-ah,v 1.1.1.1 1998/12/26 22:09:27 agc Exp $
+$NetBSD: patch-ah,v 1.2 1999/08/31 22:09:43 wrstuden Exp $
 
---- /dev/null	Mon Oct 26 13:21:23 1998
-+++ libatalk/atp/Makefile.inc	Mon Oct 26 13:20:53 1998
-@@ -0,0 +1,4 @@
-+.PATH: ${.CURDIR}/atp
-+
-+SRCS+= atp_bprint.c atp_bufs.c atp_close.c atp_open.c atp_packet.c
-+SRCS+= atp_rreq.c atp_rresp.c atp_rsel.c atp_sreq.c atp_sresp.c
+--- etc/psf/Makefile	Thu Oct  2 19:35:26 1997
++++ etc/psf/Makefile	Mon Aug 30 06:47:42 1999
+@@ -9,10 +9,10 @@
+ INSTALL=	install
+ LIBDIRS=
+ 
+-LINKS=	ofpap ifpap tfpap ifpaprev tfpaprev \
+-	ofwpap ifwpap tfwpap ifwpaprev tfwpaprev \
+-	ofmpap ifmpap tfmpap ifmpaprev tfmpaprev \
+-	ofwmpap ifwmpap tfwmpap ifwmpaprev tfwmpaprev
++LINKS=	ofpap ifpap tfpap dfpap ifpaprev tfpaprev dfpaprev \
++	ofwpap ifwpap tfwpap dfwpap ifwpaprev tfwpaprev dfwpaprev \
++	ofmpap ifmpap tfmpap dfmpap ifmpaprev tfmpaprev dfmpaprev \
++	ofwmpap ifwmpap tfwmpap dfwmpap ifwmpaprev tfwmpaprev dfwmpaprev
+ 
+ all : ${TARGETS}
+ 
+@@ -32,14 +32,14 @@
+ 
+ install : all
+ 	-mkdir ${RESDIR}
+-	-mkdir ${RESDIR}/filters
+-	${INSTALL} -c psa ${SBINDIR}
++	-mkdir ${RESDIR}/psffilters
++	${INSTALL} -c psa ${LIBEXECDIR}
+ 	${INSTALL} -c etc2ps.sh ${SBINDIR}/etc2ps
+ 	${INSTALL} -c pagecount.ps ${RESDIR}
+-	${INSTALL} -c psf ${SBINDIR}
++	${INSTALL} -c psf ${LIBEXECDIR}
+ 	for i in ${LINKS} ; do \
+-	    rm -f ${RESDIR}/filters/$$i; \
+-	    ln -s ${SBINDIR}/psf ${RESDIR}/filters/$$i; \
++	    rm -f ${RESDIR}/psffilters/$$i; \
++	    ln -s ${LIBEXECDIR}/psf ${RESDIR}/psffilters/$$i; \
+ 	done
+ 
+ clean :
diff --git a/net/netatalk/patches/patch-ai b/net/netatalk/patches/patch-ai
index 565cd3f6076..c0f324a004b 100644
--- a/net/netatalk/patches/patch-ai
+++ b/net/netatalk/patches/patch-ai
@@ -1,10 +1,18 @@
-$NetBSD: patch-ai,v 1.1.1.1 1998/12/26 22:09:27 agc Exp $
+$NetBSD: patch-ai,v 1.2 1999/08/31 22:09:43 wrstuden Exp $
 
-New Makefile
-
---- /dev/null	Mon Oct 26 13:21:23 1998
-+++ libatalk/compat/Makefile.inc	Mon Oct 26 13:22:39 1998
-@@ -0,0 +1,3 @@
-+.PATH: ${.CURDIR}/compat
-+
-+SRCS+=	mktemp.c getusershell.c strcasecmp.c strstr.c flock.c sigvec.c
+--- include/Makefile	Tue Feb 20 08:38:02 1996
++++ include/Makefile	Mon Aug 30 06:47:42 1999
+@@ -1,11 +1,11 @@
+-TARGETS=	atalk netatalk
++TARGETS=	atalk
+ 
+ INSTALL=	install
+ 
+ all :
+ 
+ install : all
+-	-mkdir ${DESTDIR}
++	-mkdir ${ATALK_DESTDIR}
+ 	-mkdir ${INCDIR}
+ 	for i in ${TARGETS}; do \
+ 	    rm -rf ${INCDIR}/$$i ; \
diff --git a/net/netatalk/patches/patch-aj b/net/netatalk/patches/patch-aj
index c6cd7afac2e..cacad8fe0f5 100644
--- a/net/netatalk/patches/patch-aj
+++ b/net/netatalk/patches/patch-aj
@@ -1,8 +1,13 @@
-$NetBSD: patch-aj,v 1.1.1.1 1998/12/26 22:09:27 agc Exp $
+$NetBSD: patch-aj,v 1.2 1999/08/31 22:09:43 wrstuden Exp $
 
---- /dev/null	Mon Oct 26 13:21:23 1998
-+++ libatalk/nbp/Makefile.inc	Mon Oct 26 13:24:16 1998
-@@ -0,0 +1,3 @@
-+.PATH: ${.CURDIR}/nbp
-+
-+SRCS+= nbp_util.c nbp_lkup.c nbp_rgstr.c nbp_unrgstr.c
+--- include/atalk/atp.h	Thu Oct 21 10:52:54 1993
++++ include/atalk/atp.h	Mon Aug 30 06:53:38 1999
+@@ -78,7 +78,7 @@
+ 
+ struct atpbuf {
+     struct atpbuf	*atpbuf_next;		/* next buffer in chain */
+-    short		atpbuf_dlen;		/* data length <= ATP_BUFSIZ */
++    unsigned short	atpbuf_dlen;		/* data length <= ATP_BUFSIZ */
+     struct sockaddr_at	atpbuf_addr;		/* net address sent/recvd */
+     union {
+ 	char		atpbuf_data[ ATP_BUFSIZ ];	/* the data */
diff --git a/net/netatalk/patches/patch-ak b/net/netatalk/patches/patch-ak
index 1f03e39a208..3ab2097fcfa 100644
--- a/net/netatalk/patches/patch-ak
+++ b/net/netatalk/patches/patch-ak
@@ -1,8 +1,80 @@
-$NetBSD: patch-ak,v 1.1.1.1 1998/12/26 22:09:27 agc Exp $
+$NetBSD: patch-ak,v 1.2 1999/08/31 22:09:43 wrstuden Exp $
 
---- /dev/null	Mon Oct 26 13:21:23 1998
-+++ libatalk/util/Makefile.inc	Mon Oct 26 13:25:44 1998
-@@ -0,0 +1,3 @@
-+.PATH: ${.CURDIR}/util
-+
-+SRCS+=	atalk_addr.c strdicasecmp.c
+--- libatalk/Makefile	Tue Feb 20 08:38:05 1996
++++ libatalk/Makefile	Tue Aug 31 02:28:01 1999
+@@ -1,63 +1,17 @@
+-ALL=	asp atp nbp adouble util compat
+-LIBS=	asp/asplib atp/atplib nbp/nbplib adouble/adoublelib \
+-	util/utillib compat/compatlib
+-PLIBS=	asp/asplib_p atp/atplib_p nbp/nbplib_p adouble/adoublelib_p \
+-	util/utillib_p compat/compatlib_p
+-TAGSFILE=tags
+-CC=cc
+-INSTALL=install
++LIB=	atalk
+ 
+-all:	libatalk.a
++MKPROFILE=	no
+ 
+-libatalk.a: ${LIBS}
+-	rm -rf tmp
+-	-mkdir tmp
+-	for i in ${ALL}; do (cd tmp; ar x ../$$i/$${i}lib); done
+-	(cd tmp; ar cr libatalk.a  *.o; ranlib libatalk.a)
+-	mv tmp/libatalk.a libatalk.a
+-	ranlib libatalk.a
+-	rm -rf tmp tmp_p
+-	-mkdir tmp_p
+-	for i in ${ALL}; do (cd tmp_p; ar x ../$$i/$${i}lib_p); done
+-	(cd tmp_p; ar cr libatalk_p.a  *.o; ranlib libatalk_p.a)
+-	mv tmp_p/libatalk_p.a libatalk_p.a
+-	ranlib libatalk_p.a
+-	rm -rf tmp_p
++.include "${.CURDIR}/asp/Makefile.inc"
++.include "${.CURDIR}/atp/Makefile.inc"
++.include "${.CURDIR}/nbp/Makefile.inc"
++.include "${.CURDIR}/adouble/Makefile.inc"
++.include "${.CURDIR}/util/Makefile.inc"
++.include "${.CURDIR}/compat/Makefile.inc"
+ 
+-${ALL}: FRC
+-	cd $@; ${MAKE} ${MFLAGS} CC="${CC}" DEFS="${DEFS}" \
+-	    OPTOPTS="${OPTOPTS}"
++CPPFLAGS=	${DEFS} ${OPTOPTS} -I${.CURDIR}/../include
+ 
+-asp/asplib:	asp
+-atp/atplib:	atp
+-nbp/nbplib:	nbp
+-adouble/adoublelib:	adouble
+-util/utillib:	util
+-compat/compatlib:	compat
++SHLIB_MAJOR=	1
++SHLIB_MINOR=	0
+ 
+-FRC:
+-
+-tags:
+-	for i in ${ALL}; do \
+-	    (cd $$i; ${MAKE} ${MFLAGS} DEFS="${DEFS}" \
+-		TAGSFILE=../${TAGSFILE} tags); \
+-	done
+-
+-install: all
+-	-mkdir ${LIBDIR}
+-	${INSTALL} -c libatalk.a ${LIBDIR}/libatalk.a
+-	(cd ${LIBDIR}; ranlib ${LIBDIR}/libatalk.a)
+-	${INSTALL} -c libatalk_p.a ${LIBDIR}/libatalk_p.a
+-	(cd ${LIBDIR}; ranlib ${LIBDIR}/libatalk_p.a)
+-
+-clean:
+-	for i in ${ALL}; \
+-	    do (cd $$i; ${MAKE} ${MFLAGS} clean); \
+-	done
+-	rm -f *[Ee]rrs libatalk.a libatalk_p.a
+-	rm -rf tmp tmp_p
+-
+-depend:
+-	for i in ${ALL}; \
+-	    do (cd $$i; ${MAKE} ${MFLAGS} DEFS=${DEFS} depend); \
+-	done
++.include <bsd.lib.mk>
diff --git a/net/netatalk/patches/patch-al b/net/netatalk/patches/patch-al
index 79ce0ff8fc4..92ed98205ae 100644
--- a/net/netatalk/patches/patch-al
+++ b/net/netatalk/patches/patch-al
@@ -1,22 +1,8 @@
-$NetBSD: patch-al,v 1.1.1.1 1998/12/26 22:09:27 agc Exp $
+$NetBSD: patch-al,v 1.2 1999/08/31 22:09:43 wrstuden Exp $
 
---- etc/Makefile	1998/10/26 14:00:23	1.1
-+++ etc/Makefile	1998/10/26 14:00:45
-@@ -10,7 +10,7 @@
- 	    ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
- 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
- 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
--	    DESTDIR="${DESTDIR}" AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}"
-+	    ATALK_DESTDIR="${ATALK_DESTDIR}" AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}"
- 
- FRC:
- 
-@@ -27,7 +27,7 @@
- 		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
- 	        SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
- 	        ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
--		DESTDIR="${DESTDIR}" AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" \
-+		ATALK_DESTDIR="${ATALK_DESTDIR}" AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" \
- 		INSTALL="${INSTALL}" install); \
- 	done
- 
+--- libatalk/adouble/Makefile.inc	Wed Dec 31 16:00:00 1969
++++ libatalk/adouble/Makefile.inc	Mon Aug 30 06:47:42 1999
+@@ -0,0 +1,3 @@
++.PATH: ${.CURDIR}/adouble
++
++SRCS+= ad_open.c ad_flush.c ad_read.c ad_write.c
diff --git a/net/netatalk/patches/patch-am b/net/netatalk/patches/patch-am
index 29c47a5f6fd..2dd9cbde640 100644
--- a/net/netatalk/patches/patch-am
+++ b/net/netatalk/patches/patch-am
@@ -1,13 +1,9 @@
-$NetBSD: patch-am,v 1.1.1.1 1998/12/26 22:09:27 agc Exp $
+$NetBSD: patch-am,v 1.2 1999/08/31 22:09:43 wrstuden Exp $
 
---- etc/afpd/Makefile	1998/10/26 14:01:39	1.1
-+++ etc/afpd/Makefile	1998/10/26 14:01:59
-@@ -32,7 +32,7 @@
- 	    AFSDEFS="-DAFS"; \
- 	fi; \
- 	${MAKE} ${MFLAGS} CC="${CC}" ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" \
--	    OPTOPTS="${OPTOPTS}" DESTDIR="${DESTDIR}" \
-+	    OPTOPTS="${OPTOPTS}" ATALK_DESTDIR="${ATALK_DESTDIR}" \
- 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
- 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
- 	    KRBLIBS="$${KRBLIBS}" KRBLIBDIRS="$${KRBLIBDIRS}" \
+--- libatalk/asp/Makefile.inc	Wed Dec 31 16:00:00 1969
++++ libatalk/asp/Makefile.inc	Mon Aug 30 06:47:42 1999
+@@ -0,0 +1,4 @@
++.PATH: ${.CURDIR}/asp
++
++SRCS+= asp_close.c asp_cmdreply.c asp_getreq.c
++SRCS+= asp_getsess.c asp_init.c asp_write.c asp_shutdown.c
diff --git a/net/netatalk/patches/patch-an b/net/netatalk/patches/patch-an
index cc4a152b074..3427bbb30ff 100644
--- a/net/netatalk/patches/patch-an
+++ b/net/netatalk/patches/patch-an
@@ -1,13 +1,13 @@
-$NetBSD: patch-an,v 1.1.1.1 1998/12/26 22:09:27 agc Exp $
+$NetBSD: patch-an,v 1.2 1999/08/31 22:09:43 wrstuden Exp $
 
---- etc/papd/Makefile	1998/10/26 14:02:54	1.1
-+++ etc/papd/Makefile	1998/10/26 14:03:06
-@@ -19,7 +19,7 @@
- 	    KRBDEFS="-DKRB"; \
- 	fi; \
-         ${MAKE} ${MFLAGS} CC="${CC}" ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" \
--	    OPTOPTS="${OPTOPTS}" DESTDIR="${DESTDIR}" \
-+	    OPTOPTS="${OPTOPTS}" ATALK_DESTDIR="${ATALK_DESTDIR}" \
- 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
- 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
- 	    KRBLIBS="$${KRBLIBS}" KRBLIBDIRS="$${KRBLIBDIRS}" \
+--- libatalk/asp/asp_getsess.c	Sat Aug 16 16:20:31 1997
++++ libatalk/asp/asp_getsess.c	Mon Aug 30 06:47:42 1999
+@@ -6,7 +6,7 @@
+ #include <sys/errno.h>
+ #include <sys/time.h>
+ #include <sys/types.h>
+-#include <sys/signal.h>
++#include <signal.h>
+ #include <sys/uio.h>
+ #include <sys/wait.h>
+ #include <sys/syslog.h>
diff --git a/net/netatalk/patches/patch-ao b/net/netatalk/patches/patch-ao
index a6f2515ab09..16ba55b795d 100644
--- a/net/netatalk/patches/patch-ao
+++ b/net/netatalk/patches/patch-ao
@@ -1,22 +1,9 @@
-$NetBSD: patch-ao,v 1.1.1.1 1998/12/26 22:09:27 agc Exp $
+$NetBSD: patch-ao,v 1.2 1999/08/31 22:09:43 wrstuden Exp $
 
---- man/Makefile	1998/10/26 14:06:44	1.1
-+++ man/Makefile	1998/10/26 14:06:57
-@@ -7,7 +7,7 @@
- 
- ${ALL}: FRC
- 	cd $@; ${MAKE} ${MFLAGS} CC="${CC}" DEFS="${DEFS}" \
--	    OPTOPTS="${OPTOPTS}" DESTDIR="${DESTDIR}" MANDIR="${MANDIR}" \
-+	    OPTOPTS="${OPTOPTS}" ATALK_DESTDIR="${ATALK_DESTDIR}" MANDIR="${MANDIR}" \
- 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
- 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}"
- 
-@@ -24,7 +24,7 @@
- 	-mkdir ${MANDIR}
- 	for i in ${ALL}; \
- 	    do (cd $$i; ${MAKE} ${MFLAGS} \
--		DESTDIR="${DESTDIR}"  MANDIR="${MANDIR}" \
-+		ATALK_DESTDIR="${ATALK_DESTDIR}"  MANDIR="${MANDIR}" \
- 		SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
- 	        ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
- 		INSTALL="${INSTALL}" install); \
+--- libatalk/atp/Makefile.inc	Wed Dec 31 16:00:00 1969
++++ libatalk/atp/Makefile.inc	Mon Aug 30 06:47:42 1999
+@@ -0,0 +1,4 @@
++.PATH: ${.CURDIR}/atp
++
++SRCS+= atp_bprint.c atp_bufs.c atp_close.c atp_open.c atp_packet.c
++SRCS+= atp_rreq.c atp_rresp.c atp_rsel.c atp_sreq.c atp_sresp.c
diff --git a/net/netatalk/patches/patch-ap b/net/netatalk/patches/patch-ap
index 7f265778fd3..e478e9bc641 100644
--- a/net/netatalk/patches/patch-ap
+++ b/net/netatalk/patches/patch-ap
@@ -1,13 +1,12 @@
-$NetBSD: patch-ap,v 1.1.1.1 1998/12/26 22:09:27 agc Exp $
+$NetBSD: patch-ap,v 1.2 1999/08/31 22:09:43 wrstuden Exp $
 
---- man/man1/Makefile	1998/10/26 14:07:39	1.1
-+++ man/man1/Makefile	1998/10/26 14:07:56
-@@ -16,7 +16,7 @@
- 	-mkdir ${MANDIR}/man1
- 	for i in ${SRC} ; do \
- 	    rm -f ${MANDIR}/man1/$$i; \
--	    sed -e s@:DESTDIR:@${DESTDIR}@ -e s@:SBINDIR:@${SBINDIR}@ \
-+	    sed -e s@:DESTDIR:@${ATALK_DESTDIR}@ -e s@:SBINDIR:@${SBINDIR}@ \
- 		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
- 		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
- 		-e s@:INCDIR:@${INCDIR}@ \
+--- libatalk/atp/atp_rsel.c	Thu Oct  2 00:32:56 1997
++++ libatalk/atp/atp_rsel.c	Mon Aug 30 06:47:42 1999
+@@ -9,6 +9,7 @@
+ #include <sys/errno.h>
+ #include <sys/uio.h>
+ #include <signal.h>
++#include <string.h>
+ 
+ #include <netatalk/endian.h>
+ #include <netatalk/at.h>
diff --git a/net/netatalk/patches/patch-aq b/net/netatalk/patches/patch-aq
index f9e3d8b1317..be716f31ce1 100644
--- a/net/netatalk/patches/patch-aq
+++ b/net/netatalk/patches/patch-aq
@@ -1,13 +1,8 @@
-$NetBSD: patch-aq,v 1.1.1.1 1998/12/26 22:09:27 agc Exp $
+$NetBSD: patch-aq,v 1.2 1999/08/31 22:09:43 wrstuden Exp $
 
---- man/man3/Makefile	1998/10/26 14:08:49	1.1
-+++ man/man3/Makefile	1998/10/26 14:09:04
-@@ -14,7 +14,7 @@
- 	-mkdir ${MANDIR}/man3
- 	for i in ${SRC} ; do \
- 	    rm -f ${MANDIR}/man3/$$i; \
--	    sed -e s@:DESTDIR:@${DESTDIR}@ -e s@:SBINDIR:@${SBINDIR}@ \
-+	    sed -e s@:DESTDIR:@${ATALK_DESTDIR}@ -e s@:SBINDIR:@${SBINDIR}@ \
- 		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
- 		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
- 		-e s@:INCDIR:@${INCDIR}@ \
+--- libatalk/compat/Makefile.inc	Wed Dec 31 16:00:00 1969
++++ libatalk/compat/Makefile.inc	Mon Aug 30 06:47:43 1999
+@@ -0,0 +1,3 @@
++.PATH: ${.CURDIR}/compat
++
++SRCS+=	mktemp.c getusershell.c strcasecmp.c strstr.c flock.c sigvec.c
diff --git a/net/netatalk/patches/patch-ar b/net/netatalk/patches/patch-ar
index 8d2e9879f46..84b95d97e7c 100644
--- a/net/netatalk/patches/patch-ar
+++ b/net/netatalk/patches/patch-ar
@@ -1,13 +1,8 @@
-$NetBSD: patch-ar,v 1.1.1.1 1998/12/26 22:09:27 agc Exp $
+$NetBSD: patch-ar,v 1.2 1999/08/31 22:09:43 wrstuden Exp $
 
---- man/man4/Makefile	1998/10/26 14:09:47	1.1
-+++ man/man4/Makefile	1998/10/26 14:10:00
-@@ -13,7 +13,7 @@
- 	-mkdir ${MANDIR}/man4
- 	for i in ${SRC} ; do \
- 	    rm -f ${MANDIR}/man4/$$i; \
--	    sed -e s@:DESTDIR:@${DESTDIR}@ -e s@:SBINDIR:@${SBINDIR}@ \
-+	    sed -e s@:DESTDIR:@${ATALK_DESTDIR}@ -e s@:SBINDIR:@${SBINDIR}@ \
- 		    -e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
- 		    -e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
- 		    -e s@:INCDIR:@${INCDIR}@ \
+--- libatalk/nbp/Makefile.inc	Wed Dec 31 16:00:00 1969
++++ libatalk/nbp/Makefile.inc	Mon Aug 30 06:47:43 1999
+@@ -0,0 +1,3 @@
++.PATH: ${.CURDIR}/nbp
++
++SRCS+= nbp_util.c nbp_lkup.c nbp_rgstr.c nbp_unrgstr.c
diff --git a/net/netatalk/patches/patch-as b/net/netatalk/patches/patch-as
index cf4808ae02f..b6a0615660e 100644
--- a/net/netatalk/patches/patch-as
+++ b/net/netatalk/patches/patch-as
@@ -1,13 +1,13 @@
-$NetBSD: patch-as,v 1.1.1.1 1998/12/26 22:09:27 agc Exp $
+$NetBSD: patch-as,v 1.2 1999/08/31 22:09:43 wrstuden Exp $
 
---- man/man8/Makefile	1998/10/26 14:10:42	1.1
-+++ man/man8/Makefile	1998/10/26 14:10:55
-@@ -14,7 +14,7 @@
- 	-mkdir ${MANDIR}/man8
- 	for i in ${SRC} ; do \
- 	    rm -f ${MANDIR}/man8/$$i; \
--	    sed -e s@:DESTDIR:@${DESTDIR}@ -e s@:SBINDIR:@${SBINDIR}@ \
-+	    sed -e s@:DESTDIR:@${ATALK_DESTDIR}@ -e s@:SBINDIR:@${SBINDIR}@ \
- 		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
- 		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
- 		-e s@:INCDIR:@${INCDIR}@ \
+--- libatalk/nbp/nbp_lkup.c	Tue Oct  7 14:21:57 1997
++++ libatalk/nbp/nbp_lkup.c	Mon Aug 30 06:47:43 1999
+@@ -6,7 +6,7 @@
+ #include <sys/types.h>
+ #include <sys/param.h>
+ #include <sys/socket.h>
+-#include <sys/signal.h>
++#include <signal.h>
+ #include <sys/time.h>
+ #include <strings.h>
+ #include <netdb.h>
diff --git a/net/netatalk/patches/patch-at b/net/netatalk/patches/patch-at
index 6006a8aca70..d9c6dfaa088 100644
--- a/net/netatalk/patches/patch-at
+++ b/net/netatalk/patches/patch-at
@@ -1,22 +1,13 @@
-$NetBSD: patch-at,v 1.1.1.1 1998/12/26 22:09:27 agc Exp $
+$NetBSD: patch-at,v 1.2 1999/08/31 22:09:43 wrstuden Exp $
 
---- bin/Makefile	1998/10/26 14:11:36	1.1
-+++ bin/Makefile	1998/10/26 14:11:55
-@@ -9,7 +9,7 @@
- 	    ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
- 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}"\
- 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
--	    DESTDIR="${DESTDIR}"
-+	    ATALK_DESTDIR="${ATALK_DESTDIR}"
- 
- FRC:
- 
-@@ -26,7 +26,7 @@
- 		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
- 	        SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
- 	        ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
--		DESTDIR="${DESTDIR}" INSTALL="${INSTALL}" install); \
-+		ATALK_DESTDIR="${ATALK_DESTDIR}" INSTALL="${INSTALL}" install); \
- 	done
- 
- clean:
+--- libatalk/nbp/nbp_rgstr.c	Tue Oct  7 14:22:14 1997
++++ libatalk/nbp/nbp_rgstr.c	Mon Aug 30 06:47:43 1999
+@@ -6,7 +6,7 @@
+ #include <sys/types.h>
+ #include <sys/param.h>
+ #include <sys/socket.h>
+-#include <sys/signal.h>
++#include <signal.h>
+ #include <sys/time.h>
+ #include <sys/errno.h>
+ #include <strings.h>
diff --git a/net/netatalk/patches/patch-au b/net/netatalk/patches/patch-au
index ed794cf5c45..f1fbb54b015 100644
--- a/net/netatalk/patches/patch-au
+++ b/net/netatalk/patches/patch-au
@@ -1,34 +1,13 @@
-$NetBSD: patch-au,v 1.1.1.1 1998/12/26 22:09:27 agc Exp $
+$NetBSD: patch-au,v 1.2 1999/08/31 22:09:43 wrstuden Exp $
 
---- man/man8/psf.8.orig	Fri Oct 30 10:32:38 1998
-+++ man/man8/psf.8	Fri Oct 30 10:34:23 1998
-@@ -90,13 +90,13 @@
- .RS
- .nf
- laser|lp|LaserWriter Plus on AppleTalk:\\
--    :sd=/usr/spool/lpd/laser:\\
--    :lp=/usr/spool/lpd/laser/null:\\
--    :lf=/var/adm/lpd-errs:pw#80:hl:\\
--    :of=:LIBDIR:/filters/ofpap:\\
--    :if=:LIBDIR:/filters/ifpaprev:\\
--    :tf=:LIBDIR:/filters/tfpaprev:\\
--    :df=:LIBDIR:/filters/dfpaprev:
-+    :sd=/usr/spool/output/laser:\\
-+    :lp=/usr/spool/output/laser/null:\\
-+    :lf=/var/log/lpd-errs:pw#80:hl:\\
-+    :of=:RESDIR:/psffilters/ofpap:\\
-+    :if=:RESDIR:/psffilters/ifpaprev:\\
-+    :tf=:RESDIR:/psffilters/tfpaprev:\\
-+    :df=:RESDIR:/psffilters/dfpaprev:
- .fi
- .RE
- .sp
-@@ -110,7 +110,7 @@
- for each printer, as has been done above.
- .LP
- Finally, there is a file in the spool directory,
--.BR /var/spool/lpd/laser ,
-+.BR /var/spool/output/laser ,
- called
- .BR .paprc ,
- which
+--- libatalk/nbp/nbp_unrgstr.c	Tue Oct  7 14:22:39 1997
++++ libatalk/nbp/nbp_unrgstr.c	Mon Aug 30 06:47:43 1999
+@@ -6,7 +6,7 @@
+ #include <sys/types.h>
+ #include <sys/param.h>
+ #include <sys/socket.h>
+-#include <sys/signal.h>
++#include <signal.h>
+ #include <sys/time.h>
+ #include <sys/errno.h>
+ #include <strings.h>
diff --git a/net/netatalk/patches/patch-av b/net/netatalk/patches/patch-av
index 62ba6a5ddc3..f782738cc9b 100644
--- a/net/netatalk/patches/patch-av
+++ b/net/netatalk/patches/patch-av
@@ -1,11 +1,13 @@
-$NetBSD: patch-av,v 1.1 1999/01/01 22:08:26 garbled Exp $
---- libatalk/atp/atp_rsel.c.orig	Fri Jan  1 15:03:25 1999
-+++ libatalk/atp/atp_rsel.c	Fri Jan  1 15:03:39 1999
-@@ -9,6 +9,7 @@
- #include <sys/errno.h>
- #include <sys/uio.h>
- #include <signal.h>
-+#include <string.h>
- 
- #include <netatalk/endian.h>
- #include <netatalk/at.h>
+$NetBSD: patch-av,v 1.2 1999/08/31 22:09:43 wrstuden Exp $
+
+--- libatalk/nbp/nbp_util.c	Tue Oct  7 14:21:38 1997
++++ libatalk/nbp/nbp_util.c	Mon Aug 30 06:47:43 1999
+@@ -6,7 +6,7 @@
+ #include <sys/types.h>
+ #include <sys/param.h>
+ #include <sys/socket.h>
+-#include <sys/signal.h>
++#include <signal.h>
+ #include <sys/time.h>
+ #include <sys/syslog.h>
+ #include <netdb.h>
diff --git a/net/netatalk/patches/patch-aw b/net/netatalk/patches/patch-aw
index 110283137be..a6c0057b650 100644
--- a/net/netatalk/patches/patch-aw
+++ b/net/netatalk/patches/patch-aw
@@ -1,20 +1,8 @@
-$NetBSD: patch-aw,v 1.3 1999/02/23 22:33:20 wrstuden Exp $
---- etc/papd/session.c.orig	Fri Jan  1 15:05:42 1999
-+++ etc/papd/session.c	Tue Feb 23 14:28:50 1999
-@@ -3,6 +3,7 @@
-  * All Rights Reserved.  See COPYRIGHT.
-  */
- 
-+#include <string.h>
- #include <sys/types.h>
- #include <sys/syslog.h>
- #include <sys/time.h>
-@@ -53,7 +54,7 @@
-     fd_set		fds;
-     char		cbuf[ 578 ];
-     int			i, cc, timeout = 0, readpending = 0;
--    u_short		seq = 1, rseq = 1, netseq;
-+    u_short		seq = 0, rseq = 1, netseq;
-     u_char		readport;
- 
-     infile.pf_state = PF_BOT;
+$NetBSD: patch-aw,v 1.4 1999/08/31 22:09:43 wrstuden Exp $
+
+--- libatalk/util/Makefile.inc	Wed Dec 31 16:00:00 1969
++++ libatalk/util/Makefile.inc	Mon Aug 30 06:47:43 1999
+@@ -0,0 +1,3 @@
++.PATH: ${.CURDIR}/util
++
++SRCS+=	atalk_addr.c strdicasecmp.c
diff --git a/net/netatalk/patches/patch-ax b/net/netatalk/patches/patch-ax
index 8170a536ce1..a8c20ec08cb 100644
--- a/net/netatalk/patches/patch-ax
+++ b/net/netatalk/patches/patch-ax
@@ -1,13 +1,22 @@
-$NetBSD: patch-ax,v 1.1 1999/02/23 00:31:40 wrstuden Exp $
+$NetBSD: patch-ax,v 1.2 1999/08/31 22:09:43 wrstuden Exp $
 
---- libatalk/asp/asp_getsess.c.orig	Sat Aug 16 19:20:31 1997
-+++ libatalk/asp/asp_getsess.c	Thu Feb 18 20:19:39 1999
-@@ -6,7 +6,7 @@
- #include <sys/errno.h>
- #include <sys/time.h>
- #include <sys/types.h>
--#include <sys/signal.h>
-+#include <signal.h>
- #include <sys/uio.h>
- #include <sys/wait.h>
- #include <sys/syslog.h>
+--- man/Makefile	Tue Feb 20 08:38:07 1996
++++ man/Makefile	Mon Aug 30 06:47:43 1999
+@@ -7,7 +7,7 @@
+ 
+ ${ALL}: FRC
+ 	cd $@; ${MAKE} ${MFLAGS} CC="${CC}" DEFS="${DEFS}" \
+-	    OPTOPTS="${OPTOPTS}" DESTDIR="${DESTDIR}" MANDIR="${MANDIR}" \
++	    OPTOPTS="${OPTOPTS}" ATALK_DESTDIR="${ATALK_DESTDIR}" MANDIR="${MANDIR}" \
+ 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+ 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}"
+ 
+@@ -24,7 +24,7 @@
+ 	-mkdir ${MANDIR}
+ 	for i in ${ALL}; \
+ 	    do (cd $$i; ${MAKE} ${MFLAGS} \
+-		DESTDIR="${DESTDIR}"  MANDIR="${MANDIR}" \
++		ATALK_DESTDIR="${ATALK_DESTDIR}"  MANDIR="${MANDIR}" \
+ 		SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+ 	        ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+ 		INSTALL="${INSTALL}" install); \
diff --git a/net/netatalk/patches/patch-ay b/net/netatalk/patches/patch-ay
index 761e4eb6079..4d8ff693ff4 100644
--- a/net/netatalk/patches/patch-ay
+++ b/net/netatalk/patches/patch-ay
@@ -1,13 +1,13 @@
-$NetBSD: patch-ay,v 1.1 1999/02/23 00:31:40 wrstuden Exp $
+$NetBSD: patch-ay,v 1.2 1999/08/31 22:09:43 wrstuden Exp $
 
---- libatalk/nbp/nbp_lkup.c.orig	Tue Oct  7 17:21:57 1997
-+++ libatalk/nbp/nbp_lkup.c	Thu Feb 18 20:19:56 1999
-@@ -6,7 +6,7 @@
- #include <sys/types.h>
- #include <sys/param.h>
- #include <sys/socket.h>
--#include <sys/signal.h>
-+#include <signal.h>
- #include <sys/time.h>
- #include <strings.h>
- #include <netdb.h>
+--- man/man1/Makefile	Tue Feb 20 09:16:24 1996
++++ man/man1/Makefile	Mon Aug 30 06:47:43 1999
+@@ -16,7 +16,7 @@
+ 	-mkdir ${MANDIR}/man1
+ 	for i in ${SRC} ; do \
+ 	    rm -f ${MANDIR}/man1/$$i; \
+-	    sed -e s@:DESTDIR:@${DESTDIR}@ -e s@:SBINDIR:@${SBINDIR}@ \
++	    sed -e s@:DESTDIR:@${ATALK_DESTDIR}@ -e s@:SBINDIR:@${SBINDIR}@ \
+ 		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
+ 		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
+ 		-e s@:INCDIR:@${INCDIR}@ \
diff --git a/net/netatalk/patches/patch-az b/net/netatalk/patches/patch-az
index 3d6f7591cf7..729ee9957e6 100644
--- a/net/netatalk/patches/patch-az
+++ b/net/netatalk/patches/patch-az
@@ -1,13 +1,13 @@
-$NetBSD: patch-az,v 1.1 1999/02/23 00:31:40 wrstuden Exp $
+$NetBSD: patch-az,v 1.2 1999/08/31 22:09:43 wrstuden Exp $
 
---- libatalk/nbp/nbp_rgstr.c.orig	Tue Oct  7 17:22:14 1997
-+++ libatalk/nbp/nbp_rgstr.c	Thu Feb 18 20:20:04 1999
-@@ -6,7 +6,7 @@
- #include <sys/types.h>
- #include <sys/param.h>
- #include <sys/socket.h>
--#include <sys/signal.h>
-+#include <signal.h>
- #include <sys/time.h>
- #include <sys/errno.h>
- #include <strings.h>
+--- man/man3/Makefile	Tue Feb 20 09:16:49 1996
++++ man/man3/Makefile	Mon Aug 30 06:47:44 1999
+@@ -14,7 +14,7 @@
+ 	-mkdir ${MANDIR}/man3
+ 	for i in ${SRC} ; do \
+ 	    rm -f ${MANDIR}/man3/$$i; \
+-	    sed -e s@:DESTDIR:@${DESTDIR}@ -e s@:SBINDIR:@${SBINDIR}@ \
++	    sed -e s@:DESTDIR:@${ATALK_DESTDIR}@ -e s@:SBINDIR:@${SBINDIR}@ \
+ 		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
+ 		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
+ 		-e s@:INCDIR:@${INCDIR}@ \
diff --git a/net/netatalk/patches/patch-ba b/net/netatalk/patches/patch-ba
index c8efe985734..71f4450ba6b 100644
--- a/net/netatalk/patches/patch-ba
+++ b/net/netatalk/patches/patch-ba
@@ -1,13 +1,13 @@
-$NetBSD: patch-ba,v 1.1 1999/02/23 00:31:40 wrstuden Exp $
+$NetBSD: patch-ba,v 1.2 1999/08/31 22:09:43 wrstuden Exp $
 
---- libatalk/nbp/nbp_unrgstr.c.orig	Tue Oct  7 17:22:39 1997
-+++ libatalk/nbp/nbp_unrgstr.c	Thu Feb 18 20:20:00 1999
-@@ -6,7 +6,7 @@
- #include <sys/types.h>
- #include <sys/param.h>
- #include <sys/socket.h>
--#include <sys/signal.h>
-+#include <signal.h>
- #include <sys/time.h>
- #include <sys/errno.h>
- #include <strings.h>
+--- man/man4/Makefile	Tue Feb 20 09:02:27 1996
++++ man/man4/Makefile	Mon Aug 30 06:47:44 1999
+@@ -13,7 +13,7 @@
+ 	-mkdir ${MANDIR}/man4
+ 	for i in ${SRC} ; do \
+ 	    rm -f ${MANDIR}/man4/$$i; \
+-	    sed -e s@:DESTDIR:@${DESTDIR}@ -e s@:SBINDIR:@${SBINDIR}@ \
++	    sed -e s@:DESTDIR:@${ATALK_DESTDIR}@ -e s@:SBINDIR:@${SBINDIR}@ \
+ 		    -e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
+ 		    -e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
+ 		    -e s@:INCDIR:@${INCDIR}@ \
diff --git a/net/netatalk/patches/patch-bb b/net/netatalk/patches/patch-bb
index 2f50a2bbd17..7d31ea7be71 100644
--- a/net/netatalk/patches/patch-bb
+++ b/net/netatalk/patches/patch-bb
@@ -1,13 +1,13 @@
-$NetBSD: patch-bb,v 1.1 1999/02/23 00:31:40 wrstuden Exp $
+$NetBSD: patch-bb,v 1.2 1999/08/31 22:09:43 wrstuden Exp $
 
---- libatalk/nbp/nbp_util.c.orig	Tue Oct  7 17:21:38 1997
-+++ libatalk/nbp/nbp_util.c	Thu Feb 18 20:19:50 1999
-@@ -6,7 +6,7 @@
- #include <sys/types.h>
- #include <sys/param.h>
- #include <sys/socket.h>
--#include <sys/signal.h>
-+#include <signal.h>
- #include <sys/time.h>
- #include <sys/syslog.h>
- #include <netdb.h>
+--- man/man8/Makefile	Tue Feb 20 09:16:10 1996
++++ man/man8/Makefile	Mon Aug 30 06:47:44 1999
+@@ -14,7 +14,7 @@
+ 	-mkdir ${MANDIR}/man8
+ 	for i in ${SRC} ; do \
+ 	    rm -f ${MANDIR}/man8/$$i; \
+-	    sed -e s@:DESTDIR:@${DESTDIR}@ -e s@:SBINDIR:@${SBINDIR}@ \
++	    sed -e s@:DESTDIR:@${ATALK_DESTDIR}@ -e s@:SBINDIR:@${SBINDIR}@ \
+ 		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
+ 		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
+ 		-e s@:INCDIR:@${INCDIR}@ \
diff --git a/net/netatalk/patches/patch-bc b/net/netatalk/patches/patch-bc
new file mode 100644
index 00000000000..6a46db8f641
--- /dev/null
+++ b/net/netatalk/patches/patch-bc
@@ -0,0 +1,34 @@
+$NetBSD: patch-bc,v 1.1 1999/08/31 22:09:43 wrstuden Exp $
+
+--- man/man8/psf.8	Tue Feb 20 08:38:20 1996
++++ man/man8/psf.8	Mon Aug 30 06:47:44 1999
+@@ -90,13 +90,13 @@
+ .RS
+ .nf
+ laser|lp|LaserWriter Plus on AppleTalk:\\
+-    :sd=/usr/spool/lpd/laser:\\
+-    :lp=/usr/spool/lpd/laser/null:\\
+-    :lf=/var/adm/lpd-errs:pw#80:hl:\\
+-    :of=:LIBDIR:/filters/ofpap:\\
+-    :if=:LIBDIR:/filters/ifpaprev:\\
+-    :tf=:LIBDIR:/filters/tfpaprev:\\
+-    :df=:LIBDIR:/filters/dfpaprev:
++    :sd=/usr/spool/output/laser:\\
++    :lp=/usr/spool/output/laser/null:\\
++    :lf=/var/log/lpd-errs:pw#80:hl:\\
++    :of=:RESDIR:/psffilters/ofpap:\\
++    :if=:RESDIR:/psffilters/ifpaprev:\\
++    :tf=:RESDIR:/psffilters/tfpaprev:\\
++    :df=:RESDIR:/psffilters/dfpaprev:
+ .fi
+ .RE
+ .sp
+@@ -110,7 +110,7 @@
+ for each printer, as has been done above.
+ .LP
+ Finally, there is a file in the spool directory,
+-.BR /var/spool/lpd/laser ,
++.BR /var/spool/output/laser ,
+ called
+ .BR .paprc ,
+ which
diff --git a/net/netatalk/patches/patch-bd b/net/netatalk/patches/patch-bd
new file mode 100644
index 00000000000..9ea4088e358
--- /dev/null
+++ b/net/netatalk/patches/patch-bd
@@ -0,0 +1,61 @@
+$NetBSD: patch-bd,v 1.1 1999/08/31 22:09:43 wrstuden Exp $
+
+--- sys/netbsd/Makefile	Sat Sep 26 08:15:09 1998
++++ sys/netbsd/Makefile	Tue Aug 31 02:15:30 1999
+@@ -1,9 +1,8 @@
+ # NetBSD specific defines, passed to subdirectories.
+ DEFS=	-DBSD4_4
+-OPTOPTS=	-O2
+ CC=	gcc -Werror -I../../sys/netbsd/
+ INSTALL=	install
+-ADDLIBS=	-lcrypt
++ADDLIBS=	-Wl,-R${LIBDIR} -lcrypt
+ 
+ ALL=	../../libatalk ../../include ../../bin ../../etc ../../man
+ 
+@@ -16,12 +15,14 @@
+ 	    ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
+ 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+ 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+-	    DESTDIR="${DESTDIR}" AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" all
++	    ATALK_DESTDIR="${ATALK_DESTDIR}" AFSDIR="${AFSDIR}" \
++	    KRBDIR="${KRBDIR}" EXAMPLEDIR="${EXAMPLEDIR}" all
+ 
+ FRC:
+ 
+ install :
+-	-mkdir ${DESTDIR} ${SBINDIR} ${BINDIR} ${ETCDIR} ${LIBDIR}
++	-mkdir ${ATALK_DESTDIR} ${SBINDIR} ${BINDIR} ${ETCDIR}
++	-mkdir ${LIBDIR} ${LIBEXECDIR} ${RESDIR} ${EXAMPLEDIR}
+ 	for i in ${ALL}; \
+ 	    do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \
+ 		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
+@@ -30,19 +31,22 @@
+ 		AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" \
+ 		INSTALL="${INSTALL}" $@); \
+ 	done
++	for i in `ls ../../config`; \
++		do ${INSTALL} -c ../../config/$$i ${EXAMPLEDIR}; \
++	done
+ 	rm -f ${ETCDIR}/rc.atalk
+-	sed -e s@:DESTDIR:@${DESTDIR}@ -e s@:SBINDIR:@${SBINDIR}@ \
++	sed -e s@:DESTDIR:@${ATALK_DESTDIR}@ -e s@:SBINDIR:@${SBINDIR}@ \
+ 		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
+ 		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
+ 		-e s@:INCDIR:@${INCDIR}@ \
+ 	    < ../../rc.atalk.bsd > ${ETCDIR}/rc.atalk
+ 	@echo
+-	@echo "Install is done.  If you're using a version of NetBSD"
+-	@echo "earlier than 1.3, don't forget to add lines from"
+-	@echo "services.atalk to /etc/services"
++	@echo "Install is done."
++	@echo
++	@echo "Example configuration files are in ${EXAMPLEDIR}."
+ 	@echo
+-	@echo "Don't forget to call rc.atalk in /etc/rc.local.  See README"
+-	@echo "and README.NETBSD for more information."
++	@echo "Don't forget to call rc.atalk in /etc/rc.local.  See"
++	@echo "README.NETBSD for kernel configuration information."
+ 
+ clean :
+ 	for i in ${ALL}; \
diff --git a/net/netatalk/pkg/PLIST b/net/netatalk/pkg/PLIST
index 5083fd63343..738c80a313f 100644
--- a/net/netatalk/pkg/PLIST
+++ b/net/netatalk/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1998/12/26 22:09:27 agc Exp $
+@comment $NetBSD: PLIST,v 1.2 1999/08/31 22:09:43 wrstuden Exp $
 etc/rc.atalk
 include/atalk/adouble.h
 include/atalk/rtmp.h
@@ -13,7 +13,6 @@ include/atalk/afp.h
 include/atalk/aep.h
 include/atalk/zip.h
 lib/libatalk.a
-lib/libatalk_p.a
 lib/libatalk_pic.a
 lib/libatalk.so.1.0
 bin/aecho
@@ -59,6 +58,10 @@ sbin/afpd
 sbin/atalkd
 sbin/papd
 sbin/etc2ps
+share/examples/netatalk/AppleVolumes.default
+share/examples/netatalk/AppleVolumes.system
+share/examples/netatalk/atalkd.conf
+share/examples/netatalk/papd.conf
 share/psffilters/ofpap
 share/psffilters/ifpap
 share/psffilters/tfpap