Initial import of the University of Michigan version of Netatalk.

(userland tools and utilities for AppleTalk interworking).  This is
the standard, reference version.  Lacks AppleshareIP support.

Package done by Bill Studenmund (wrstuden@netbsd.org), munged about
a bit by myself. This is the 19981109 version of the sources.

26 files changed, 569 insertions, 0 deletions

diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
new file mode 100644
index 00000000000..cdafca79406
--- /dev/null
+++ b/net/netatalk/Makefile
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile,v 1.1.1.1 1998/12/26 22:09:27 agc Exp $
+#
+
+DISTNAME=		n-981109
+PKGNAME=		netatalk-19981109
+CATEGORIES=		net
+MASTER_SITES=		ftp://terminator.rs.itd.umich.edu/pub/
+
+MAINTAINER=		wrstuden@netbsd.org
+#HOMEPAGE=		http://
+
+WRKSRC=			${WRKDIR}/netatalk-981109
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/netatalk/files/md5 b/net/netatalk/files/md5
new file mode 100644
index 00000000000..8f52eb32820
--- /dev/null
+++ b/net/netatalk/files/md5
@@ -0,0 +1,3 @@
+$NetBSD: md5,v 1.1.1.1 1998/12/26 22:09:27 agc Exp $
+
+MD5 (n-981109.tar.gz) = 8fb448d8a6c74d1ad9b91528bad115d4
diff --git a/net/netatalk/patches/patch-aa b/net/netatalk/patches/patch-aa
new file mode 100644
index 00000000000..186bae43934
--- /dev/null
+++ b/net/netatalk/patches/patch-aa
@@ -0,0 +1,51 @@
+$NetBSD: patch-aa,v 1.1.1.1 1998/12/26 22:09:27 agc Exp $
+
+--- Makefile.orig	Thu Oct  1 18:45:05 1998
++++ Makefile	Sat Sep 26 10:49:57 1998
+@@ -1,22 +1,24 @@
+-# Root of installation. Subdirectories will be ${DESTDIR}/etc,
+-# ${DESTDIR}/bin, and ${DESTDIR}/lib.
+-DESTDIR=/usr/local/atalk
++# Root of installation. Subdirectories will be ${ATALK_DESTDIR}/etc,
++# ${ATALK_DESTDIR}/bin, and ${ATALK_DESTDIR}/lib.
++ATALK_DESTDIR=${PREFIX}
+ 
+ # for system-level binaries
+-SBINDIR=$(DESTDIR)/etc
++SBINDIR=$(ATALK_DESTDIR)/sbin
++# for system-level daemons
++LIBEXECDIR=$(ATALK_DESTDIR)/libexec
+ # for user-level binaries
+-BINDIR=$(DESTDIR)/bin
++BINDIR=$(ATALK_DESTDIR)/bin
+ # for program libraries (*.a)
+-LIBDIR=$(DESTDIR)/lib
++LIBDIR=$(ATALK_DESTDIR)/lib
+ # for machine-independent resources (pagecount.ps, etc.)
+-RESDIR=$(DESTDIR)/etc
++RESDIR=$(ATALK_DESTDIR)/share
+ # for configuration files (AppleVolumes.system, etc.)
+-ETCDIR=$(DESTDIR)/etc
++ETCDIR=$(ATALK_DESTDIR)/etc
+ # for include files
+-INCDIR=$(DESTDIR)/include
++INCDIR=$(ATALK_DESTDIR)/include
+ # Root of man pages.  Subdirectories will be
+ # ${MANDIR}/man1, ${MANDIR}/man4, and ${MANDIR}/man8.
+-MANDIR=$(DESTDIR)/man
++MANDIR=$(ATALK_DESTDIR)/man
+ 
+ #SBINDIR=/usr/sbin
+ #BINDIR=/usr/bin
+@@ -57,8 +59,9 @@
+ 	cd sys/$$ARCH && ${MAKE} ${MFLAGS} \
+ 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}"\
+ 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+-	    DESTDIR="${DESTDIR}" MANDIR="${MANDIR}" \
+-	    AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" $@
++	    ATALK_DESTDIR="${ATALK_DESTDIR}" MANDIR="${MANDIR}" \
++	    AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" LIBEXECDIR="${LIBEXECDIR}" \
++	    OPTOPTS="${OPTOPTS}" $@
+ 
+ FRC:
+ 
diff --git a/net/netatalk/patches/patch-ab b/net/netatalk/patches/patch-ab
new file mode 100644
index 00000000000..139b3114367
--- /dev/null
+++ b/net/netatalk/patches/patch-ab
@@ -0,0 +1,18 @@
+$NetBSD: patch-ab,v 1.1.1.1 1998/12/26 22:09:27 agc 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
+ 
+ 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-ac b/net/netatalk/patches/patch-ac
new file mode 100644
index 00000000000..18e7023fa0c
--- /dev/null
+++ b/net/netatalk/patches/patch-ac
@@ -0,0 +1,39 @@
+$NetBSD: patch-ac,v 1.1.1.1 1998/12/26 22:09:27 agc 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 @@
+ 	    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
+ 
+ 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}" \
+ 		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
+@@ -31,7 +31,7 @@
+ 		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
new file mode 100644
index 00000000000..d4407aea72c
--- /dev/null
+++ b/net/netatalk/patches/patch-ad
@@ -0,0 +1,39 @@
+$NetBSD: patch-ad,v 1.1.1.1 1998/12/26 22:09:27 agc 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 :
diff --git a/net/netatalk/patches/patch-ae b/net/netatalk/patches/patch-ae
new file mode 100644
index 00000000000..a2207bc4014
--- /dev/null
+++ b/net/netatalk/patches/patch-ae
@@ -0,0 +1,79 @@
+$NetBSD: patch-ae,v 1.1.1.1 1998/12/26 22:09:27 agc 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
+ 
+-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"
+ 
+-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
+ 
+-${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>
diff --git a/net/netatalk/patches/patch-af b/net/netatalk/patches/patch-af
new file mode 100644
index 00000000000..6399c510cc4
--- /dev/null
+++ b/net/netatalk/patches/patch-af
@@ -0,0 +1,8 @@
+$NetBSD: patch-af,v 1.1.1.1 1998/12/26 22:09:27 agc 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
diff --git a/net/netatalk/patches/patch-ag b/net/netatalk/patches/patch-ag
new file mode 100644
index 00000000000..ee41c53ec31
--- /dev/null
+++ b/net/netatalk/patches/patch-ag
@@ -0,0 +1,9 @@
+$NetBSD: patch-ag,v 1.1.1.1 1998/12/26 22:09:27 agc 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
diff --git a/net/netatalk/patches/patch-ah b/net/netatalk/patches/patch-ah
new file mode 100644
index 00000000000..61849eb55d1
--- /dev/null
+++ b/net/netatalk/patches/patch-ah
@@ -0,0 +1,9 @@
+$NetBSD: patch-ah,v 1.1.1.1 1998/12/26 22:09:27 agc 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
diff --git a/net/netatalk/patches/patch-ai b/net/netatalk/patches/patch-ai
new file mode 100644
index 00000000000..565cd3f6076
--- /dev/null
+++ b/net/netatalk/patches/patch-ai
@@ -0,0 +1,10 @@
+$NetBSD: patch-ai,v 1.1.1.1 1998/12/26 22:09:27 agc 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
diff --git a/net/netatalk/patches/patch-aj b/net/netatalk/patches/patch-aj
new file mode 100644
index 00000000000..c6cd7afac2e
--- /dev/null
+++ b/net/netatalk/patches/patch-aj
@@ -0,0 +1,8 @@
+$NetBSD: patch-aj,v 1.1.1.1 1998/12/26 22:09:27 agc 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
diff --git a/net/netatalk/patches/patch-ak b/net/netatalk/patches/patch-ak
new file mode 100644
index 00000000000..1f03e39a208
--- /dev/null
+++ b/net/netatalk/patches/patch-ak
@@ -0,0 +1,8 @@
+$NetBSD: patch-ak,v 1.1.1.1 1998/12/26 22:09:27 agc 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
diff --git a/net/netatalk/patches/patch-al b/net/netatalk/patches/patch-al
new file mode 100644
index 00000000000..79ce0ff8fc4
--- /dev/null
+++ b/net/netatalk/patches/patch-al
@@ -0,0 +1,22 @@
+$NetBSD: patch-al,v 1.1.1.1 1998/12/26 22:09:27 agc 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
+ 
diff --git a/net/netatalk/patches/patch-am b/net/netatalk/patches/patch-am
new file mode 100644
index 00000000000..29c47a5f6fd
--- /dev/null
+++ b/net/netatalk/patches/patch-am
@@ -0,0 +1,13 @@
+$NetBSD: patch-am,v 1.1.1.1 1998/12/26 22:09:27 agc 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}" \
diff --git a/net/netatalk/patches/patch-an b/net/netatalk/patches/patch-an
new file mode 100644
index 00000000000..cc4a152b074
--- /dev/null
+++ b/net/netatalk/patches/patch-an
@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.1.1.1 1998/12/26 22:09:27 agc 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}" \
diff --git a/net/netatalk/patches/patch-ao b/net/netatalk/patches/patch-ao
new file mode 100644
index 00000000000..a6f2515ab09
--- /dev/null
+++ b/net/netatalk/patches/patch-ao
@@ -0,0 +1,22 @@
+$NetBSD: patch-ao,v 1.1.1.1 1998/12/26 22:09:27 agc 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); \
diff --git a/net/netatalk/patches/patch-ap b/net/netatalk/patches/patch-ap
new file mode 100644
index 00000000000..7f265778fd3
--- /dev/null
+++ b/net/netatalk/patches/patch-ap
@@ -0,0 +1,13 @@
+$NetBSD: patch-ap,v 1.1.1.1 1998/12/26 22:09:27 agc 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}@ \
diff --git a/net/netatalk/patches/patch-aq b/net/netatalk/patches/patch-aq
new file mode 100644
index 00000000000..f9e3d8b1317
--- /dev/null
+++ b/net/netatalk/patches/patch-aq
@@ -0,0 +1,13 @@
+$NetBSD: patch-aq,v 1.1.1.1 1998/12/26 22:09:27 agc 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}@ \
diff --git a/net/netatalk/patches/patch-ar b/net/netatalk/patches/patch-ar
new file mode 100644
index 00000000000..8d2e9879f46
--- /dev/null
+++ b/net/netatalk/patches/patch-ar
@@ -0,0 +1,13 @@
+$NetBSD: patch-ar,v 1.1.1.1 1998/12/26 22:09:27 agc 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}@ \
diff --git a/net/netatalk/patches/patch-as b/net/netatalk/patches/patch-as
new file mode 100644
index 00000000000..cf4808ae02f
--- /dev/null
+++ b/net/netatalk/patches/patch-as
@@ -0,0 +1,13 @@
+$NetBSD: patch-as,v 1.1.1.1 1998/12/26 22:09:27 agc 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}@ \
diff --git a/net/netatalk/patches/patch-at b/net/netatalk/patches/patch-at
new file mode 100644
index 00000000000..6006a8aca70
--- /dev/null
+++ b/net/netatalk/patches/patch-at
@@ -0,0 +1,22 @@
+$NetBSD: patch-at,v 1.1.1.1 1998/12/26 22:09:27 agc 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:
diff --git a/net/netatalk/patches/patch-au b/net/netatalk/patches/patch-au
new file mode 100644
index 00000000000..ed794cf5c45
--- /dev/null
+++ b/net/netatalk/patches/patch-au
@@ -0,0 +1,34 @@
+$NetBSD: patch-au,v 1.1.1.1 1998/12/26 22:09:27 agc 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
diff --git a/net/netatalk/pkg/COMMENT b/net/netatalk/pkg/COMMENT
new file mode 100644
index 00000000000..116236b8698
--- /dev/null
+++ b/net/netatalk/pkg/COMMENT
@@ -0,0 +1 @@
+University of Michigan's netatalk, for AppleTalk interworking
diff --git a/net/netatalk/pkg/DESCR b/net/netatalk/pkg/DESCR
new file mode 100644
index 00000000000..ea98e3e3082
--- /dev/null
+++ b/net/netatalk/pkg/DESCR
@@ -0,0 +1,3 @@
+University of Michigan's netatalk userland tools and utilities, for
+AppleTalk interworking.  This is the standard, reference version. 
+Lacks AppleshareIP support.  See also the netatalk-asun package.
diff --git a/net/netatalk/pkg/PLIST b/net/netatalk/pkg/PLIST
new file mode 100644
index 00000000000..5083fd63343
--- /dev/null
+++ b/net/netatalk/pkg/PLIST
@@ -0,0 +1,92 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 1998/12/26 22:09:27 agc Exp $
+etc/rc.atalk
+include/atalk/adouble.h
+include/atalk/rtmp.h
+include/atalk/paths.h
+include/atalk/pap.h
+include/atalk/nbp.h
+include/atalk/ddp.h
+include/atalk/compat.h
+include/atalk/atp.h
+include/atalk/asp.h
+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
+bin/getzones
+bin/nbplkup
+bin/nbprgstr
+bin/nbpunrgstr
+bin/psorder
+bin/megatron
+bin/unbin
+bin/unhex
+bin/unsingle
+bin/hqx2bin
+bin/single2bin
+bin/macbinary
+bin/pap
+bin/papstatus
+libexec/psa
+libexec/psf
+man/man1/aecho.1
+man/man1/getzones.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/megatron.1
+man/man1/unhex.1
+man/man1/unbin.1
+man/man1/unsingle.1
+man/man1/macbinary.1
+man/man1/hqx2bin.1
+man/man1/single2bin.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
+sbin/afpd
+sbin/atalkd
+sbin/papd
+sbin/etc2ps
+share/psffilters/ofpap
+share/psffilters/ifpap
+share/psffilters/tfpap
+share/psffilters/dfpap
+share/psffilters/ifpaprev
+share/psffilters/tfpaprev
+share/psffilters/dfpaprev
+share/psffilters/ofwpap
+share/psffilters/ifwpap
+share/psffilters/tfwpap
+share/psffilters/dfwpap
+share/psffilters/ifwpaprev
+share/psffilters/tfwpaprev
+share/psffilters/dfwpaprev
+share/psffilters/ofmpap
+share/psffilters/ifmpap
+share/psffilters/tfmpap
+share/psffilters/dfmpap
+share/psffilters/ifmpaprev
+share/psffilters/tfmpaprev
+share/psffilters/dfmpaprev
+share/psffilters/ofwmpap
+share/psffilters/ifwmpap
+share/psffilters/tfwmpap
+share/psffilters/dfwmpap
+share/psffilters/ifwmpaprev
+share/psffilters/tfwmpaprev
+share/psffilters/dfwmpaprev
+share/pagecount.ps
+@dirrm include/atalk
+@dirrm share/psffilters