netatalk-asun-2.1.3 - appletalk file and print services, enhanced by Adrian Sun

29 files changed, 820 insertions, 0 deletions

diff --git a/net/netatalk-asun/Makefile b/net/netatalk-asun/Makefile
new file mode 100644
index 00000000000..f7a248653bf
--- /dev/null
+++ b/net/netatalk-asun/Makefile
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1.1.1 2000/07/31 17:36:01 abs Exp $
+
+DISTNAME=	netatalk-1.4b2+asun2.1.3
+PKGNAME=	netatalk-asun-2.1.3
+CATEGORIES=	net print
+MASTER_SITES=   ftp://ftp.hanse.de/sites/transit/mirror/ftp.u.washington.edu/public/asun/
+
+MAINTAINER=	abs@netbsd.org
+HOMEPAGE=	http://www.umich.edu/~rsug/netatalk/
+
+CONFLICTS=	netatalk-[0-9]*
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/netatalk-asun/files/md5 b/net/netatalk-asun/files/md5
new file mode 100644
index 00000000000..555c0d6871c
--- /dev/null
+++ b/net/netatalk-asun/files/md5
@@ -0,0 +1,3 @@
+$NetBSD: md5,v 1.1.1.1 2000/07/31 17:36:01 abs Exp $
+
+MD5 (netatalk-1.4b2+asun2.1.3.tar.gz) = b417c5977f36f4125d0932076df54db5
diff --git a/net/netatalk-asun/files/patch-sum b/net/netatalk-asun/files/patch-sum
new file mode 100644
index 00000000000..3c774e2543a
--- /dev/null
+++ b/net/netatalk-asun/files/patch-sum
@@ -0,0 +1,25 @@
+$NetBSD: patch-sum,v 1.1.1.1 2000/07/31 17:36:01 abs Exp $
+
+MD5 (patch-aa) = 52e496b64abbfbcd5e96a95e70bfd879
+MD5 (patch-ab) = 22df30d11cc80241a993ba1c8a0b045c
+MD5 (patch-ac) = a5d188aba1e25b0440a60548196906c8
+MD5 (patch-ad) = b08be45bffc5760760c467c64b28d2c3
+MD5 (patch-ae) = 478f09192ea8f2e752f3c134dd6914a7
+MD5 (patch-af) = 2a42ee6fb9bde4b3f3c6424ff58f6f5d
+MD5 (patch-ag) = 81032d4c56b37351da95d3bd09b3f667
+MD5 (patch-ah) = 7bcf0a8005a0c8b02a317dc22cad8470
+MD5 (patch-ai) = 31db7b2ab384e79c29e0f43deefb1979
+MD5 (patch-aj) = 8d908e872f726426342d27f57fcb1866
+MD5 (patch-ak) = b57cd527de222fae5c6298b4a568aecd
+MD5 (patch-al) = 54616bb4ae2664da3d12509ea0958245
+MD5 (patch-am) = 13aec52cd5657a8621a1414636816384
+MD5 (patch-an) = 1ae6c5744fbcc4709e56629159e32886
+MD5 (patch-ao) = 864504dd1cc1450f4fbffeddb58fa431
+MD5 (patch-ap) = de0ec8b9e22071bf3e226d2df40b3a1b
+MD5 (patch-aq) = 70c7d135a87d2374de842e99ea68a2c7
+MD5 (patch-ar) = 09432735c4961c0c1a045945a646e9ea
+MD5 (patch-as) = c460b86d1df69f044a0242d38599f0f3
+MD5 (patch-at) = 75245bf0f135051a15091ed1286d127d
+MD5 (patch-au) = 833fd3281c3642905f3e38c100b1e668
+MD5 (patch-av) = cfbf28c38a83293d34f94b549a71f073
+MD5 (patch-aw) = fafa4fd874a331e4daa0bbed6dba253b
diff --git a/net/netatalk-asun/patches/patch-aa b/net/netatalk-asun/patches/patch-aa
new file mode 100644
index 00000000000..0071b71fdcd
--- /dev/null
+++ b/net/netatalk-asun/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1.1.1 2000/07/31 17:36:01 abs Exp $
+
+--- etc/afpd/nls/Makefile.orig	Sat Dec 12 11:01:06 1998
++++ etc/afpd/nls/Makefile	Mon Jul 31 14:07:25 2000
+@@ -14,7 +14,7 @@
+ 
+ install: 
+ 	-mkdir ${RESDIR}/nls
+-	${INSTALL} -m 644 maccode.* ${RESDIR}/nls
++	${INSTALL} -c -m 644 maccode.* ${RESDIR}/nls
+ 
+ clean:
+ 	rm -f *.o
diff --git a/net/netatalk-asun/patches/patch-ab b/net/netatalk-asun/patches/patch-ab
new file mode 100644
index 00000000000..37300381442
--- /dev/null
+++ b/net/netatalk-asun/patches/patch-ab
@@ -0,0 +1,41 @@
+$NetBSD: patch-ab,v 1.1.1.1 2000/07/31 17:36:01 abs Exp $
+
+--- etc/afpd/Makefile.orig	Sat Feb  6 20:02:31 1999
++++ etc/afpd/Makefile	Mon Jul 31 14:07:25 2000
+@@ -72,6 +72,7 @@
+ 	fi; \
+ 	${MAKE} ${MFLAGS} CC="${CC}" ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" \
+ 	    OPTOPTS="${OPTOPTS}" DESTDIR="${DESTDIR}" DESDIR="${DESDIR}" \
++	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+ 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+ 	    PAMDIR="${PAMDIR}" TCPWRAPDIR="${TCPWRAPDIR}" \
+@@ -92,6 +93,7 @@
+ ${SUBDIRS}: FRC
+ 	cd $@; ${MAKE} ${MFLAGS} CC="${CC}" DEFS="${DEFS}" \
+ 	    OPTOPTS="${OPTOPTS}" DESTDIR="${DESTDIR}" DESDIR="${DESDIR}" \
++	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+ 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}"
+ 
+@@ -119,17 +121,19 @@
+ 	for i in ${SUBDIRS}; \
+ 	do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \
+ 		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
++		LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 	        SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+ 	        ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+ 		DESTDIR="${DESTDIR}" INSTALL="${INSTALL}" \
+ 		install); \
+ 	done
+-	${INSTALL} -c afpd ${SBINDIR}
++	${INSTALL} -c afpd ${LIBEXECDIR}
+ 
+ clean :
+ 	for i in ${SUBDIRS}; \
+ 	do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \
+ 		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
++		LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 	        SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+ 	        ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+ 		DESTDIR="${DESTDIR}" INSTALL="${INSTALL}" \
diff --git a/net/netatalk-asun/patches/patch-ac b/net/netatalk-asun/patches/patch-ac
new file mode 100644
index 00000000000..0f688913ec7
--- /dev/null
+++ b/net/netatalk-asun/patches/patch-ac
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.1.1.1 2000/07/31 17:36:01 abs Exp $
+
+--- etc/afpd/status.c.orig	Wed Dec 16 18:38:38 1998
++++ etc/afpd/status.c	Mon Jul 31 14:07:25 2000
+@@ -52,7 +52,8 @@
+ static int status_server(char *data, const char *server)
+ {
+     struct afp_status	*status;
+-    char                *Obj, *Type, *Zone;
++    const char          *Obj;
++    char                *Type, *Zone;
+     int			len;
+ 
+     status = (struct afp_status *) data;
diff --git a/net/netatalk-asun/patches/patch-ad b/net/netatalk-asun/patches/patch-ad
new file mode 100644
index 00000000000..1f2f706ac2d
--- /dev/null
+++ b/net/netatalk-asun/patches/patch-ad
@@ -0,0 +1,34 @@
+$NetBSD: patch-ad,v 1.1.1.1 2000/07/31 17:36:01 abs Exp $
+
+--- etc/psf/Makefile.orig	Thu Feb  4 06:57:52 1999
++++ etc/psf/Makefile	Mon Jul 31 14:07:25 2000
+@@ -25,21 +25,21 @@
+ psf.o : psf.c
+ 	${CC} ${CFLAGS} -D_PATH_PAP=\"${BINDIR}/pap\" \
+ 	    -D_PATH_PSORDER=\"${BINDIR}/psorder\" \
+-	    -D_PATH_PSA=\"${SBINDIR}/psa\" \
+-	    -D_PATH_PSFILTER=\"${SBINDIR}/etc2ps\" \
++	    -D_PATH_PSA=\"${LIBEXECDIR}/psa\" \
++	    -D_PATH_PSFILTER=\"${LIBEXECDIR}/etc2ps\" \
+ 	    -D_PATH_PAGECOUNT=\"${RESDIR}/pagecount.ps\" \
+ 	    ${CPPFLAGS} -c psf.c
+ 
+ install : all
+ 	-mkdir ${RESDIR}
+-	-mkdir ${RESDIR}/filters
+-	${INSTALL} -c psa ${SBINDIR}
+-	${INSTALL} -c etc2ps.sh ${SBINDIR}/etc2ps
++	-mkdir ${LIBEXECDIR}/filters
++	${INSTALL} -c psa ${LIBEXECDIR}
++	${INSTALL} -c etc2ps.sh ${LIBEXECDIR}/etc2ps
+ 	${INSTALL} -c pagecount.ps ${RESDIR}
+-	${INSTALL} -c psf ${SBINDIR}
++	${INSTALL} -c psf ${LIBEXECDIR}
+ 	for i in ${LINKS} ; do \
+-	    rm -f ${RESDIR}/filters/$$i; \
+-	    ln -s ${SBINDIR}/psf ${RESDIR}/filters/$$i; \
++	    rm -f ${LIBEXECDIR}/filters/$$i; \
++	    ln -s ../psf ${LIBEXECDIR}/filters/$$i; \
+ 	done
+ 
+ clean :
diff --git a/net/netatalk-asun/patches/patch-ae b/net/netatalk-asun/patches/patch-ae
new file mode 100644
index 00000000000..3f02ba0d780
--- /dev/null
+++ b/net/netatalk-asun/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1.1.1 2000/07/31 17:36:01 abs Exp $
+
+--- etc/atalkd/Makefile.orig	Wed Jul  9 20:51:55 1997
++++ etc/atalkd/Makefile	Mon Jul 31 14:07:25 2000
+@@ -23,7 +23,7 @@
+ 	    ${CPPFLAGS} -c config.c
+ 
+ install : all
+-	${INSTALL} -c atalkd ${SBINDIR}
++	${INSTALL} -c atalkd ${LIBEXECDIR}
+ 
+ clean :
+ 	rm -f a.out core* *.o *.bak *[Ee]rrs tags
diff --git a/net/netatalk-asun/patches/patch-af b/net/netatalk-asun/patches/patch-af
new file mode 100644
index 00000000000..84c1ea7911e
--- /dev/null
+++ b/net/netatalk-asun/patches/patch-af
@@ -0,0 +1,21 @@
+$NetBSD: patch-af,v 1.1.1.1 2000/07/31 17:36:01 abs Exp $
+
+--- etc/papd/Makefile.orig	Tue May 20 18:35:42 1997
++++ etc/papd/Makefile	Mon Jul 31 14:07:25 2000
+@@ -20,6 +20,7 @@
+ 	fi; \
+         ${MAKE} ${MFLAGS} CC="${CC}" ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" \
+ 	    OPTOPTS="${OPTOPTS}" DESTDIR="${DESTDIR}" \
++	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+ 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+ 	    KRBLIBS="$${KRBLIBS}" KRBLIBDIRS="$${KRBLIBDIRS}" \
+@@ -56,7 +57,7 @@
+ 	    ${CPPFLAGS} -c main.c
+ 
+ install : all
+-	${INSTALL} -c papd ${SBINDIR}
++	${INSTALL} -c papd ${LIBEXECDIR}
+ 
+ clean :
+ 	rm -f a.out core* *.o *.bak *[Ee]rrs tags
diff --git a/net/netatalk-asun/patches/patch-ag b/net/netatalk-asun/patches/patch-ag
new file mode 100644
index 00000000000..92d35c8ab24
--- /dev/null
+++ b/net/netatalk-asun/patches/patch-ag
@@ -0,0 +1,24 @@
+$NetBSD: patch-ag,v 1.1.1.1 2000/07/31 17:36:02 abs Exp $
+
+--- etc/Makefile.orig	Mon Dec  7 21:52:29 1998
++++ etc/Makefile	Mon Jul 31 14:07:25 2000
+@@ -8,6 +8,7 @@
+ ${ALL}: FRC
+ 	cd $@; ${MAKE} ${MFLAGS} CC="${CC}" \
+ 	    ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
++	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+ 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+ 	    DESTDIR="${DESTDIR}" AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" \
+@@ -25,9 +26,11 @@
+ install:
+ 	-mkdir ${ETCDIR}
+ 	-mkdir ${SBINDIR}
++	-mkdir ${LIBEXECDIR}
+ 	for i in ${ALL}; \
+ 	    do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \
+ 		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
++		LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 	        SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+ 	        ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+ 		DESTDIR="${DESTDIR}" AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" \
diff --git a/net/netatalk-asun/patches/patch-ah b/net/netatalk-asun/patches/patch-ah
new file mode 100644
index 00000000000..826a2aa1bcd
--- /dev/null
+++ b/net/netatalk-asun/patches/patch-ah
@@ -0,0 +1,29 @@
+$NetBSD: patch-ah,v 1.1.1.1 2000/07/31 17:36:02 abs Exp $
+
+--- sys/ultrix/Makefile.orig	Thu Feb  4 07:30:55 1999
++++ sys/ultrix/Makefile	Mon Jul 31 14:07:25 2000
+@@ -24,6 +24,7 @@
+ ${ALL}:	FRC
+ 	cd $@; ${MAKE} ${MFLAGS} CC="${CC}" \
+ 	    ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
++	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+ 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+ 	    AFPLIBS="${AFPLIBS}" \
+@@ -36,6 +37,7 @@
+ 	for i in ${ALL}; \
+ 	    do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \
+ 		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
++		LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 	        SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+ 	        ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+ 		DESTDIR="${DESTDIR}" MANDIR="${MANDIR}" \
+@@ -46,6 +48,8 @@
+ 	sed -e s@:DESTDIR:@${DESTDIR}@ -e s@:SBINDIR:@${SBINDIR}@ \
+ 		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
+ 		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
++		-e s@:LIBEXECDIR:@${LIBEXECDIR}@ \
++		-e s@:EXAMPLEDIR:@${EXAMPLEDIR}@ \
+ 		-e s@:INCDIR:@${INCDIR}@ \
+ 	    < ../../rc.atalk.bsd > ${ETCDIR}/rc.atalk
+ 	@echo
diff --git a/net/netatalk-asun/patches/patch-ai b/net/netatalk-asun/patches/patch-ai
new file mode 100644
index 00000000000..6b5be75053e
--- /dev/null
+++ b/net/netatalk-asun/patches/patch-ai
@@ -0,0 +1,37 @@
+$NetBSD: patch-ai,v 1.1.1.1 2000/07/31 17:36:02 abs Exp $
+
+--- sys/linux/Makefile.orig	Sat Feb 27 21:10:59 1999
++++ sys/linux/Makefile	Mon Jul 31 14:07:25 2000
+@@ -23,6 +23,7 @@
+ ${ALL}:	FRC
+ 	cd $@; ${MAKE} ${MFLAGS} CC="${CC}" \
+ 	    ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
++	    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-aj b/net/netatalk-asun/patches/patch-aj
new file mode 100644
index 00000000000..c0b7d649144
--- /dev/null
+++ b/net/netatalk-asun/patches/patch-aj
@@ -0,0 +1,34 @@
+$NetBSD: patch-aj,v 1.1.1.1 2000/07/31 17:36:02 abs Exp $
+
+--- sys/sunos/Makefile.orig	Fri Sep 18 04:20:15 1998
++++ sys/sunos/Makefile	Mon Jul 31 14:07:25 2000
+@@ -51,6 +51,7 @@
+ ${ALL}:	FRC
+ 	cd $@; ${MAKE} ${MFLAGS} CC="${CC}" \
+ 	    ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
++	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+ 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+ 	    AFPLIBS="${AFPLIBS}" \
+@@ -69,9 +70,12 @@
+ 	-mkdir ${BINDIR}
+ 	-mkdir ${ETCDIR}
+ 	-mkdir ${LIBDIR}
++	-mkdir ${LIBEXECDIR}
++	-mkdir ${EXAMPLEDIR}
+ 	for i in ${ALL}; \
+ 	    do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \
+ 		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
++		LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 	        SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+ 	        ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+ 		DESTDIR="${DESTDIR}" MANDIR="${MANDIR}" AFPLIBS="${AFPLIBS}" \
+@@ -83,6 +87,8 @@
+ 		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
+ 		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
+ 		-e s@:INCDIR:@${INCDIR}@ -e 's@^##@@' \
++		-e s@:LIBEXECDIR:@${LIBEXECDIR}@ \
++		-e s@:EXAMPLEDIR:@${EXAMPLEDIR}@ \
+ 	    < ../../rc.atalk.bsd > ${ETCDIR}/rc.atalk
+ 	@echo
+ 	@echo "Install is done.  Don't forget to add lines from"
diff --git a/net/netatalk-asun/patches/patch-ak b/net/netatalk-asun/patches/patch-ak
new file mode 100644
index 00000000000..fc5b1ea22b0
--- /dev/null
+++ b/net/netatalk-asun/patches/patch-ak
@@ -0,0 +1,43 @@
+$NetBSD: patch-ak,v 1.1.1.1 2000/07/31 17:36:02 abs Exp $
+
+--- sys/solaris/Makefile.orig	Wed Feb  3 19:52:10 1999
++++ sys/solaris/Makefile	Mon Jul 31 14:07:25 2000
+@@ -48,6 +48,7 @@
+ 	esac; \
+ 	echo "Making $@ for $$PROCESSOR..."; \
+ 	${MAKE} ${MFLAGS} \
++	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}"\
+ 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+ 	    MANDIR="${MANDIR}" DESTDIR="${DESTDIR}" AFSDIR="${AFSDIR}" \
+@@ -67,6 +68,7 @@
+ ${ALL}:	FRC
+ 	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-al b/net/netatalk-asun/patches/patch-al
new file mode 100644
index 00000000000..61ff870578d
--- /dev/null
+++ b/net/netatalk-asun/patches/patch-al
@@ -0,0 +1,33 @@
+$NetBSD: patch-al,v 1.1.1.1 2000/07/31 17:36:02 abs Exp $
+
+--- sys/freebsd/Makefile.orig	Thu Feb  4 07:38:12 1999
++++ sys/freebsd/Makefile	Mon Jul 31 14:07:25 2000
+@@ -20,6 +20,7 @@
+ ${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-am b/net/netatalk-asun/patches/patch-am
new file mode 100644
index 00000000000..aacb9fa7089
--- /dev/null
+++ b/net/netatalk-asun/patches/patch-am
@@ -0,0 +1,71 @@
+$NetBSD: patch-am,v 1.1.1.1 2000/07/31 17:36:02 abs Exp $
+
+--- sys/netbsd/Makefile.orig	Thu Feb  4 07:30:30 1999
++++ sys/netbsd/Makefile	Mon Jul 31 14:07:25 2000
+@@ -1,10 +1,10 @@
+ # NetBSD specific defines, passed to subdirectories.
+ DEFS=	-DBSD4_4
+-OPTOPTS=	-O2
+-CC=	gcc -I../../sys/netbsd/ -I/usr/include/kerberosIV
++OPTOPTS=	-Werror -I../../sys/netbsd/
++#CC=	gcc -I../../sys/netbsd/ -I/usr/include/kerberosIV
+ INSTALL=	install
+ AFPLIBS = 	-lcrypt -lrpcsvc
+-ADDLIBS =
++ADDLIBS=	-Wl,-R${LIBDIR}
+ 
+ ALL=	../../libatalk ../../include ../../bin ../../etc ../../man
+ 
+@@ -19,6 +19,7 @@
+ ${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-an b/net/netatalk-asun/patches/patch-an
new file mode 100644
index 00000000000..9845041add1
--- /dev/null
+++ b/net/netatalk-asun/patches/patch-an
@@ -0,0 +1,33 @@
+$NetBSD: patch-an,v 1.1.1.1 2000/07/31 17:36:02 abs Exp $
+
+--- sys/openbsd/Makefile.orig	Mon Feb 22 23:02:31 1999
++++ sys/openbsd/Makefile	Mon Jul 31 14:07:25 2000
+@@ -19,6 +19,7 @@
+ ${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-ao b/net/netatalk-asun/patches/patch-ao
new file mode 100644
index 00000000000..023882a9c34
--- /dev/null
+++ b/net/netatalk-asun/patches/patch-ao
@@ -0,0 +1,13 @@
+$NetBSD: patch-ao,v 1.1.1.1 2000/07/31 17:36:02 abs Exp $
+
+--- man/man4/Makefile.orig	Tue May 20 18:35:43 1997
++++ man/man4/Makefile	Mon Jul 31 14:07:25 2000
+@@ -17,6 +17,8 @@
+ 		    -e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
+ 		    -e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
+ 		    -e s@:INCDIR:@${INCDIR}@ \
++		    -e s@:LIBEXECDIR:@${LIBEXECDIR}@ \
++		    -e s@:EXAMPLEDIR:@${EXAMPLEDIR}@ \
+ 		    < $$i > ${MANDIR}/man4/$$i; \
+ 	done
+ 
diff --git a/net/netatalk-asun/patches/patch-ap b/net/netatalk-asun/patches/patch-ap
new file mode 100644
index 00000000000..50faa9d4a3a
--- /dev/null
+++ b/net/netatalk-asun/patches/patch-ap
@@ -0,0 +1,13 @@
+$NetBSD: patch-ap,v 1.1.1.1 2000/07/31 17:36:02 abs Exp $
+
+--- man/man8/Makefile.orig	Tue May 20 18:35:43 1997
++++ man/man8/Makefile	Mon Jul 31 14:07:25 2000
+@@ -18,6 +18,8 @@
+ 		-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-aq b/net/netatalk-asun/patches/patch-aq
new file mode 100644
index 00000000000..6704eef79f7
--- /dev/null
+++ b/net/netatalk-asun/patches/patch-aq
@@ -0,0 +1,19 @@
+$NetBSD: patch-aq,v 1.1.1.1 2000/07/31 17:36:02 abs Exp $
+
+--- man/man8/psf.8.orig	Tue May 20 18:35:43 1997
++++ man/man8/psf.8	Mon Jul 31 14:07:25 2000
+@@ -93,10 +93,10 @@
+     :sd=/usr/spool/lpd/laser:\\
+     :lp=/usr/spool/lpd/laser/null:\\
+     :lf=/var/adm/lpd-errs:pw#80:hl:\\
+-    :of=:LIBDIR:/filters/ofpap:\\
+-    :if=:LIBDIR:/filters/ifpaprev:\\
+-    :tf=:LIBDIR:/filters/tfpaprev:\\
+-    :df=:LIBDIR:/filters/dfpaprev:
++    :of=:LIBEXECDIR:/filters/ofpap:\\
++    :if=:LIBEXECDIR:/filters/ifpaprev:\\
++    :tf=:LIBEXECDIR:/filters/tfpaprev:\\
++    :df=:LIBEXECDIR:/filters/dfpaprev:
+ .fi
+ .RE
+ .sp
diff --git a/net/netatalk-asun/patches/patch-ar b/net/netatalk-asun/patches/patch-ar
new file mode 100644
index 00000000000..e18bca4de25
--- /dev/null
+++ b/net/netatalk-asun/patches/patch-ar
@@ -0,0 +1,13 @@
+$NetBSD: patch-ar,v 1.1.1.1 2000/07/31 17:36:02 abs Exp $
+
+--- man/man1/Makefile.orig	Tue May 20 18:35:43 1997
++++ man/man1/Makefile	Mon Jul 31 14:07:25 2000
+@@ -20,6 +20,8 @@
+ 		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
+ 		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
+ 		-e s@:INCDIR:@${INCDIR}@ \
++		-e s@:LIBEXECDIR:@${LIBEXECDIR}@ \
++		-e s@:EXAMPLEDIR:@${EXAMPLEDIR}@ \
+ 		< $$i > ${MANDIR}/man1/$$i; \
+ 	done
+ 
diff --git a/net/netatalk-asun/patches/patch-as b/net/netatalk-asun/patches/patch-as
new file mode 100644
index 00000000000..11c296cb146
--- /dev/null
+++ b/net/netatalk-asun/patches/patch-as
@@ -0,0 +1,13 @@
+$NetBSD: patch-as,v 1.1.1.1 2000/07/31 17:36:02 abs Exp $
+
+--- man/man3/Makefile.orig	Tue May 20 18:35:43 1997
++++ man/man3/Makefile	Mon Jul 31 14:07:25 2000
+@@ -18,6 +18,8 @@
+ 		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
+ 		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
+ 		-e s@:INCDIR:@${INCDIR}@ \
++		-e s@:LIBEXECDIR:@${LIBEXECDIR}@ \
++		-e s@:EXAMPLEDIR:@${EXAMPLEDIR}@ \
+ 		< $$i > ${MANDIR}/man3/$$i; \
+ 	done
+ 
diff --git a/net/netatalk-asun/patches/patch-at b/net/netatalk-asun/patches/patch-at
new file mode 100644
index 00000000000..298fc45ac5a
--- /dev/null
+++ b/net/netatalk-asun/patches/patch-at
@@ -0,0 +1,20 @@
+$NetBSD: patch-at,v 1.1.1.1 2000/07/31 17:36:02 abs Exp $
+
+--- man/Makefile.orig	Tue May 20 18:35:43 1997
++++ man/Makefile	Mon Jul 31 14:07:25 2000
+@@ -8,6 +8,7 @@
+ ${ALL}: FRC
+ 	cd $@; ${MAKE} ${MFLAGS} CC="${CC}" DEFS="${DEFS}" \
+ 	    OPTOPTS="${OPTOPTS}" DESTDIR="${DESTDIR}" MANDIR="${MANDIR}" \
++	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+ 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}"
+ 
+@@ -25,6 +26,7 @@
+ 	for i in ${ALL}; \
+ 	    do (cd $$i; ${MAKE} ${MFLAGS} \
+ 		DESTDIR="${DESTDIR}"  MANDIR="${MANDIR}" \
++		LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 		SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+ 	        ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+ 		INSTALL="${INSTALL}" install); \
diff --git a/net/netatalk-asun/patches/patch-au b/net/netatalk-asun/patches/patch-au
new file mode 100644
index 00000000000..83e879b7fa0
--- /dev/null
+++ b/net/netatalk-asun/patches/patch-au
@@ -0,0 +1,20 @@
+$NetBSD: patch-au,v 1.1.1.1 2000/07/31 17:36:02 abs Exp $
+
+--- bin/Makefile.orig	Wed Dec 30 07:30:33 1998
++++ bin/Makefile	Mon Jul 31 14:07:25 2000
+@@ -7,6 +7,7 @@
+ ${ALL}: FRC
+ 	cd $@; ${MAKE} ${MFLAGS} CC="${CC}" \
+ 	    ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
++	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}"\
+ 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+ 	    DESTDIR="${DESTDIR}"
+@@ -24,6 +25,7 @@
+ 	for i in ${ALL}; \
+ 	    do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \
+ 		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
++		LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 	        SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+ 	        ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+ 		DESTDIR="${DESTDIR}" INSTALL="${INSTALL}" install); \
diff --git a/net/netatalk-asun/patches/patch-av b/net/netatalk-asun/patches/patch-av
new file mode 100644
index 00000000000..417e9facf14
--- /dev/null
+++ b/net/netatalk-asun/patches/patch-av
@@ -0,0 +1,66 @@
+$NetBSD: patch-av,v 1.1.1.1 2000/07/31 17:36:02 abs Exp $
+
+--- Makefile.orig	Sun Feb  7 11:15:46 1999
++++ Makefile	Mon Jul 31 14:07:25 2000
+@@ -1,22 +1,27 @@
+ # Root of installation. Subdirectories will be ${DESTDIR}/etc,
+ # ${DESTDIR}/bin, and ${DESTDIR}/lib.
+-DESTDIR=/usr/local/atalk
++DESTDIR=${PREFIX}
+ 
+ # for system-level binaries
+-SBINDIR=$(DESTDIR)/etc
++SBINDIR=$(DESTDIR)/sbin
++LIBEXECDIR=$(DESTDIR)/libexec
+ # for user-level binaries
+ BINDIR=$(DESTDIR)/bin
+ # for program libraries (*.a)
+ LIBDIR=$(DESTDIR)/lib
+ # for machine-independent resources (pagecount.ps, etc.)
+-RESDIR=$(DESTDIR)/etc
++RESDIR=$(DESTDIR)/share
+ # for configuration files (AppleVolumes.system, etc.)
+-ETCDIR=$(DESTDIR)/etc
++ETCDIR=/etc/netatalk
++# for startup script
++RCDIR=$(DESTDIR)/etc/rc.d
+ # for include files
+ INCDIR=$(DESTDIR)/include
+ # Root of man pages.  Subdirectories will be
+ # ${MANDIR}/man1, ${MANDIR}/man4, and ${MANDIR}/man8.
+ MANDIR=$(DESTDIR)/man
++# for example config files
++EXAMPLEDIR=$(DESTDIR)/share/examples/netatalk
+ 
+ #SBINDIR=/usr/sbin
+ #BINDIR=/usr/bin
+@@ -32,7 +37,7 @@
+ # Location of the DES library and include files. Comment this out if you
+ # don't want Randnum Exchange and 2-Way Randnum Exchange as allowable UAMs 
+ # for afpd. We expect libdes.a in $DESDIR/lib and des.h in $DESDIR/include.
+-DESDIR=/usr/local
++#DESDIR=/usr/local
+ 
+ # Location of the tcp wrapper library and include files. Comment this out
+ # if you don't want tcp wrapper support. having tcp wrapper support is
+@@ -41,7 +46,7 @@
+ 
+ # Location of PAM support library and include files. Comment this out
+ # if you don't want to enable PAM support
+-PAMDIR=/usr
++#PAMDIR=/usr
+ 
+  
+ # Location of the AFS and Kerberos libraries and include files.  Uncomment
+@@ -73,9 +78,10 @@
+ 	esac; \
+ 	echo "Making $@ for $$ARCH..."; \
+ 	cd sys/$$ARCH && ${MAKE} ${MFLAGS} \
++	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}"\
+ 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+-	    DESTDIR="${DESTDIR}" MANDIR="${MANDIR}" \
++	    RCDIR="${RCDIR}" DESTDIR="${DESTDIR}" MANDIR="${MANDIR}" \
+ 	    TCPWRAPDIR="${TCPWRAPDIR}" PAMDIR="${PAMDIR}" DB2DIR="${DB2DIR}" \
+ 	    AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" DESDIR="${DESDIR}" $@
+ 
diff --git a/net/netatalk-asun/patches/patch-aw b/net/netatalk-asun/patches/patch-aw
new file mode 100644
index 00000000000..3671d43e2d6
--- /dev/null
+++ b/net/netatalk-asun/patches/patch-aw
@@ -0,0 +1,44 @@
+$NetBSD: patch-aw,v 1.1.1.1 2000/07/31 17:36:02 abs Exp $
+
+--- rc.atalk.bsd.orig	Mon Aug 25 23:00:54 1997
++++ rc.atalk.bsd	Mon Jul 31 14:10:24 2000
+@@ -1,3 +1,4 @@
++#!/bin/sh
+ #
+ # AppleTalk daemons. Make sure not to start atalkd in the background:
+ # its data structures must have time to stablize before running the
+@@ -14,26 +15,22 @@
+ ##fi
+ 
+ echo -n 'starting appletalk daemons:'
+-if [ -x :SBINDIR:/atalkd ]; then
+-	:SBINDIR:/atalkd;		echo -n ' atalkd'
++if [ -x :LIBEXECDIR:/atalkd ]; then
++	:LIBEXECDIR:/atalkd;		echo -n ' atalkd'
+ fi
+ 
+ if [ -x :BINDIR:/nbprgstr ]; then
+-	:BINDIR:/nbprgstr -p 4 `hostname|sed 's/\..*$//'`:Workstation
+-	:BINDIR:/nbprgstr -p 4 `hostname|sed 's/\..*$//'`:netatalk
++	:BINDIR:/nbprgstr -p 4 `hostname -s |sed 's/\..*$//'`:Workstation
++	:BINDIR:/nbprgstr -p 4 `hostname -s |sed 's/\..*$//'`:netatalk
+ 					echo -n ' nbprgstr'
+ fi
+ 
+-if [ -x :SBINDIR:/papd ]; then
+-	:SBINDIR:/papd;		echo -n ' papd'
++if [ -x :LIBEXECDIR:/papd -a :ETCDIR:/papd.conf ]; then
++	:LIBEXECDIR:/papd;		echo -n ' papd'
+ fi
+ 
+-if [ -x :SBINDIR:/afpd ]; then
+-	:SBINDIR:/afpd;		echo -n ' afpd'
+-fi
+-
+-if [ -x :SBINDIR:/timelord ]; then
+-	:SBINDIR:/timelord;		echo -n ' timelord'
++if [ -x :LIBEXECDIR:/afpd -a :ETCDIR:/AppleVolumes.system ]; then
++	:LIBEXECDIR:/afpd;		echo -n ' afpd'
+ fi
+ 
+ 					echo '.'
diff --git a/net/netatalk-asun/pkg/COMMENT b/net/netatalk-asun/pkg/COMMENT
new file mode 100644
index 00000000000..91738192b16
--- /dev/null
+++ b/net/netatalk-asun/pkg/COMMENT
@@ -0,0 +1 @@
+Netatalk appletalk file and print services, enhanced by Adrian Sun
diff --git a/net/netatalk-asun/pkg/DESCR b/net/netatalk-asun/pkg/DESCR
new file mode 100644
index 00000000000..df00cba18bb
--- /dev/null
+++ b/net/netatalk-asun/pkg/DESCR
@@ -0,0 +1,16 @@
+netatalk is an implementation of the AppleTalk Protocol Suite for
+Unix systems. The current release contains support for EtherTalk
+Phase I and II, DDP, RTMP, NBP, ZIP, AEP, ATP, PAP, ASP, and AFP.
+
+DDP is in the kernel. atalkd implements RTMP, NBP, ZIP, and AEP.
+It is the AppleTalk equivalent of Unix routed and ifconfig. There
+is also a client-stub library for NBP. ATP and ASP are implemented
+as libraries. papd allows Macs to spool to lpd or a pipe, and pap
+allows Unix machines to print to AppleTalk connected printers. psf
+is a PostScript printer filter for lpd, designed to use pap. psorder
+is a PostScript reverser, called by psf to reverse pages printed
+to face-up stacking printers. afpd provides Macs with an interface
+to the Unix file system. Refer to the appropriate man pages for
+operational information.
+
+This version has been enhanced by Adrian Sun.
diff --git a/net/netatalk-asun/pkg/PLIST b/net/netatalk-asun/pkg/PLIST
new file mode 100644
index 00000000000..8d73ae084c9
--- /dev/null
+++ b/net/netatalk-asun/pkg/PLIST
@@ -0,0 +1,101 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2000/07/31 17:36:02 abs Exp $
+bin/adv1tov2
+bin/aecho
+bin/getzones
+bin/hqx2bin
+bin/macbinary
+bin/megatron
+bin/nbplkup
+bin/nbprgstr
+bin/nbpunrgstr
+bin/pap
+bin/papstatus
+bin/psorder
+bin/single2bin
+bin/unbin
+bin/unhex
+bin/unsingle
+etc/rc.d/netatalk.sh
+include/atalk/adouble.h
+include/atalk/aep.h
+include/atalk/afp.h
+include/atalk/asp.h
+include/atalk/atp.h
+include/atalk/cnid.h
+include/atalk/compat.h
+include/atalk/ddp.h
+include/atalk/dsi.h
+include/atalk/nbp.h
+include/atalk/pap.h
+include/atalk/paths.h
+include/atalk/rtmp.h
+include/atalk/server_child.h
+include/atalk/util.h
+include/atalk/zip.h
+include/netatalk/aarp.h
+include/netatalk/at.h
+include/netatalk/at_var.h
+include/netatalk/ddp.h
+include/netatalk/ddp_var.h
+include/netatalk/endian.h
+include/netatalk/phase2.h
+lib/libatalk.a
+lib/libatalk_p.a
+libexec/afpd
+libexec/atalkd
+libexec/etc2ps
+libexec/filters/ifmpap
+libexec/filters/ifmpaprev
+libexec/filters/ifpap
+libexec/filters/ifpaprev
+libexec/filters/ifwmpap
+libexec/filters/ifwmpaprev
+libexec/filters/ifwpap
+libexec/filters/ifwpaprev
+libexec/filters/ofmpap
+libexec/filters/ofpap
+libexec/filters/ofwmpap
+libexec/filters/ofwpap
+libexec/filters/tfmpap
+libexec/filters/tfmpaprev
+libexec/filters/tfpap
+libexec/filters/tfpaprev
+libexec/filters/tfwmpap
+libexec/filters/tfwmpaprev
+libexec/filters/tfwpap
+libexec/filters/tfwpaprev
+libexec/papd
+libexec/psa
+libexec/psf
+man/man1/aecho.1
+man/man1/getzones.1
+man/man1/hqx2bin.1
+man/man1/macbinary.1
+man/man1/megatron.1
+man/man1/nbp.1
+man/man1/nbplkup.1
+man/man1/nbprgstr.1
+man/man1/pap.1
+man/man1/papstatus.1
+man/man1/psorder.1
+man/man1/single2bin.1
+man/man1/unbin.1
+man/man1/unhex.1
+man/man1/unsingle.1
+man/man3/atalk_aton.3
+man/man3/nbp_name.3
+man/man4/atalk.4
+man/man8/afpd.8
+man/man8/atalkd.8
+man/man8/papd.8
+man/man8/psf.8
+share/examples/netatalk/AppleVolumes.default
+share/examples/netatalk/AppleVolumes.system
+share/examples/netatalk/afpd.conf
+share/examples/netatalk/atalkd.conf
+share/examples/netatalk/netatalk.pamd
+share/examples/netatalk/papd.conf
+share/nls/maccode.437
+share/nls/maccode.850
+share/nls/maccode.iso8859-1
+share/pagecount.ps