Reimport of old umich netatalk as net/netatalk-umich to move out of way

of current netatalk.

41 files changed, 991 insertions, 0 deletions

diff --git a/net/netatalk-umich/DEINSTALL b/net/netatalk-umich/DEINSTALL
new file mode 100644
index 00000000000..067921dcb04
--- /dev/null
+++ b/net/netatalk-umich/DEINSTALL
@@ -0,0 +1,28 @@
+#!/bin/sh
+#
+# $NetBSD: DEINSTALL,v 1.1.1.1 2002/05/25 12:25:50 markd Exp $
+
+PKGNAME=$1
+STAGE=$2
+
+case ${STAGE} in
+DEINSTALL)
+	;;
+POST-DEINSTALL)
+	ETCDIR=/etc/netatalk
+
+	cat << EOF
+===========================================================================
+If you won't be using ${PKGNAME} any longer, you may want to
+remove the netatalk configuration file directory:
+
+	${ETCDIR}
+===========================================================================
+EOF
+	;;
+*)
+	echo "Unexpected argument: ${STAGE}"
+	exit 1
+	;;
+esac
+exit 0
diff --git a/net/netatalk-umich/DESCR b/net/netatalk-umich/DESCR
new file mode 100644
index 00000000000..ea98e3e3082
--- /dev/null
+++ b/net/netatalk-umich/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-umich/INSTALL b/net/netatalk-umich/INSTALL
new file mode 100644
index 00000000000..8d67e27ee23
--- /dev/null
+++ b/net/netatalk-umich/INSTALL
@@ -0,0 +1,69 @@
+#!/bin/sh
+#
+# $NetBSD: INSTALL,v 1.1.1.1 2002/05/25 12:25:50 markd Exp $
+
+PKGNAME=$1
+STAGE=$2
+
+case ${STAGE} in
+PRE-INSTALL)
+	;;
+POST-INSTALL)
+	ETCDIR=/etc/netatalk
+
+	mkdir -p ${ETCDIR}
+
+	# The idea is to copy old config files over to the new location if
+	# they exist.  Otherwise, copy the default config from the examples
+	# directory.
+	#
+	if [ -f ${PKG_PREFIX}/etc/atalkd.conf ]
+	then
+		for file in \
+			AppleVolumes.default \
+			AppleVolumes.system \
+			atalkd.conf \
+			papd.conf
+		do
+			if [ ! -f ${ETCDIR}/${file} -a -f ${PKG_PREFIX}/etc/${file} ]
+			then
+				echo "  ${ETCDIR}/${file}"
+				cp ${PKG_PREFIX}/etc/${file} ${ETCDIR}/${file}
+				chmod 644 ${ETCDIR}/${file}
+			fi
+		done
+		echo "done."
+		cat << EOF
+===========================================================================
+Old configuration files were copied from ${PKG_PREFIX}/etc to
+${ETCDIR}.  You may want to remove the old files as they are no
+longer necessary.
+===========================================================================
+EOF
+	else
+		echo "Installing configuration files:"
+		for file in \
+			AppleVolumes.default \
+			AppleVolumes.system \
+			atalkd.conf \
+			papd.conf
+		do
+			if [ -f ${ETCDIR}/${file} ]
+			then
+				echo "  ${ETCDIR}/${file} already exists"
+			else
+				echo "  ${ETCDIR}/${file}"
+				cp ${PKG_PREFIX}/share/examples/netatalk/${file} \
+					${ETCDIR}/${file}
+				chmod 644 ${ETCDIR}/${file}
+			fi
+		done
+		echo "done."
+	fi
+	;;
+*)
+	echo "Unexpected argument: ${STAGE}"
+	exit 1
+	;;
+esac
+exit 0
diff --git a/net/netatalk-umich/Makefile b/net/netatalk-umich/Makefile
new file mode 100644
index 00000000000..a9826cfe193
--- /dev/null
+++ b/net/netatalk-umich/Makefile
@@ -0,0 +1,25 @@
+# $NetBSD: Makefile,v 1.1.1.1 2002/05/25 12:25:51 markd Exp $
+#
+
+DISTNAME=		netatalk-990130
+PKGNAME=		netatalk-umich-19990130
+PKGREVISION=		2
+WRKSRC=			${WRKDIR}/netatalk-990130
+CATEGORIES=		net
+MASTER_SITES=		ftp://terminator.rs.itd.umich.edu/unix/netatalk/
+
+MAINTAINER=		wrstuden@netbsd.org
+HOMEPAGE=		http://www.umich.edu/~rsug/netatalk/
+COMMENT=		University of Michigan's netatalk; AppleTalk interworking
+
+CONFLICTS=		netatalk-asun-[0-9]*
+CONFLICTS+=		netatalk-[0-9]*
+
+do-configure:
+	${CP} ${FILESDIR}/shlib_version ${WRKSRC}/libatalk
+
+post-install:
+	${RM} ${PREFIX}/share/examples/netatalk/AppleVolumes.system.orig
+	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/netatalk-umich/PLIST b/net/netatalk-umich/PLIST
new file mode 100644
index 00000000000..6409775f193
--- /dev/null
+++ b/net/netatalk-umich/PLIST
@@ -0,0 +1,97 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/25 12:25:51 markd Exp $
+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
+include/atalk/adouble.h
+include/atalk/aep.h
+include/atalk/afp.h
+include/atalk/asp.h
+include/atalk/atp.h
+include/atalk/compat.h
+include/atalk/ddp.h
+include/atalk/nbp.h
+include/atalk/pap.h
+include/atalk/paths.h
+include/atalk/rtmp.h
+include/atalk/zip.h
+lib/libatalk.a
+lib/libatalk.so
+lib/libatalk.so.1
+lib/libatalk.so.1.0
+lib/libatalk_pic.a
+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
+sbin/afpd
+sbin/atalkd
+sbin/etc2ps
+sbin/papd
+share/examples/netatalk/AppleVolumes.default
+share/examples/netatalk/AppleVolumes.system
+share/examples/netatalk/atalkd.conf
+share/examples/netatalk/papd.conf
+share/pagecount.ps
+share/psffilters/dfmpap
+share/psffilters/dfmpaprev
+share/psffilters/dfpap
+share/psffilters/dfpaprev
+share/psffilters/dfwmpap
+share/psffilters/dfwmpaprev
+share/psffilters/dfwpap
+share/psffilters/dfwpaprev
+share/psffilters/ifmpap
+share/psffilters/ifmpaprev
+share/psffilters/ifpap
+share/psffilters/ifpaprev
+share/psffilters/ifwmpap
+share/psffilters/ifwmpaprev
+share/psffilters/ifwpap
+share/psffilters/ifwpaprev
+share/psffilters/ofmpap
+share/psffilters/ofpap
+share/psffilters/ofwmpap
+share/psffilters/ofwpap
+share/psffilters/tfmpap
+share/psffilters/tfmpaprev
+share/psffilters/tfpap
+share/psffilters/tfpaprev
+share/psffilters/tfwmpap
+share/psffilters/tfwmpaprev
+share/psffilters/tfwpap
+share/psffilters/tfwpaprev
+@dirrm share/psffilters
+@dirrm share/examples/netatalk
+@dirrm include/atalk
diff --git a/net/netatalk-umich/distinfo b/net/netatalk-umich/distinfo
new file mode 100644
index 00000000000..659364ccdf2
--- /dev/null
+++ b/net/netatalk-umich/distinfo
@@ -0,0 +1,38 @@
+$NetBSD: distinfo,v 1.1.1.1 2002/05/25 12:25:51 markd Exp $
+
+SHA1 (netatalk-990130.tar.gz) = 30f16274edc756bd68b0dc00946d5978b7102b3c
+Size (netatalk-990130.tar.gz) = 244708 bytes
+SHA1 (patch-aa) = 18980f712f55c07b82b17489a2a0218d5ee1d76b
+SHA1 (patch-ab) = 7ea187513b53a9e3b57db7e7584a45e948aceb32
+SHA1 (patch-ac) = 92a3f18cc48723eed347f7c8c28f866488312126
+SHA1 (patch-ad) = bc4e04ad7291ec461ac8b68da992038ed00e0099
+SHA1 (patch-ae) = c4f9321035dcae73659a4e4b56a977c5fbde8a8b
+SHA1 (patch-af) = 7f008b824d3e76eaae5bfb0bf2824eeb65d456a1
+SHA1 (patch-ag) = 6d6fb16733f3840c13c12bace13718b8ba54c2a4
+SHA1 (patch-ah) = 6fea50bb8aace1e49496438042895a3c6ad89338
+SHA1 (patch-ai) = d0b84cf1fdb861ae858cbd3a10edf331f9251769
+SHA1 (patch-aj) = b5ab5bcbea8cfd97287877b2b809bc5c0a81ad99
+SHA1 (patch-ak) = 0ddd4cce800dfe2ee73c140b72cb9a73a216516b
+SHA1 (patch-al) = 36ce394b80ce817369e4f63c3b6094628bb3d3df
+SHA1 (patch-am) = 7767655ffbda36bfd4c1c8297f04e2a7d043917b
+SHA1 (patch-an) = a6cae51dc134c95b23475009d5bc6255856c2f95
+SHA1 (patch-ao) = 965699c06fd9c207af7974435385da2a0ec056f7
+SHA1 (patch-ap) = 14519adcb9238d20d63897cf433b3754a8a0415b
+SHA1 (patch-aq) = 953d79debaa4a4892be4d8d74fbd8dbf20d9fbde
+SHA1 (patch-ar) = b75e7d0d2528cc1c84ffa53fbf2c29adbcfe5fe9
+SHA1 (patch-as) = 0dce5dbc8153ff96ff03d0283bded53891201b9c
+SHA1 (patch-at) = cd67216be1671f300125c31c49bb36f84eaf5719
+SHA1 (patch-au) = e3411307be207059ac10ebe145c75a20da5ac18c
+SHA1 (patch-av) = f795c36e277d94f50d4eb20f6b56a7e4764748d7
+SHA1 (patch-aw) = 5e5a7c2c1c568a337aee56e1539e3954f9c49307
+SHA1 (patch-ax) = d4a7999f466b560717164da3b2bd4e842e66239d
+SHA1 (patch-ay) = 8b81cf679732e6dbc16365e4fa88076f0c95088f
+SHA1 (patch-az) = ec81040364a16f5484d64773dd3a0944adb9bc06
+SHA1 (patch-ba) = 4d110e1ad93a9f202013e24c260d1826e676edc8
+SHA1 (patch-bb) = 22acce3ae0e7e5b91365d9690bfda1016fdb9e0a
+SHA1 (patch-bc) = 93a0802d65f0c632cb8d4aad0545a6b09b4e5a65
+SHA1 (patch-bd) = 18769aeabf7a4c5091648f50a2a605524f0efe51
+SHA1 (patch-be) = 171df73ca215ee4c09ecab4330573e6d6ca5dce3
+SHA1 (patch-bf) = ba3fd24f72e8e8b3ec42f970586cf46c3d067cd7
+SHA1 (patch-bg) = ed9f8a18fdcd109d7e7cb65bb507abf29429843d
+SHA1 (patch-bh) = d2188c4cfc40a74d8bfcad7b0a81ae537fa4f273
diff --git a/net/netatalk-umich/files/shlib_version b/net/netatalk-umich/files/shlib_version
new file mode 100644
index 00000000000..b920b18e8e5
--- /dev/null
+++ b/net/netatalk-umich/files/shlib_version
@@ -0,0 +1,4 @@
+#	$NetBSD: shlib_version,v 1.1.1.1 2002/05/25 12:25:51 markd Exp $
+#
+major=1
+minor=0
diff --git a/net/netatalk-umich/patches/patch-aa b/net/netatalk-umich/patches/patch-aa
new file mode 100644
index 00000000000..97676dd58c8
--- /dev/null
+++ b/net/netatalk-umich/patches/patch-aa
@@ -0,0 +1,53 @@
+$NetBSD: patch-aa,v 1.1.1.1 2002/05/25 12:25:51 markd Exp $
+
+--- 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
++# 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=/etc/netatalk
+ # 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
++# for example config files
++EXAMPLEDIR=$(ATALK_DESTDIR)/share/examples/netatalk
+ 
+ #SBINDIR=/usr/sbin
+ #BINDIR=/usr/bin
+@@ -57,8 +61,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}" EXAMPLEDIR="${EXAMPLEDIR}" $@
+ 
+ FRC:
+ 
diff --git a/net/netatalk-umich/patches/patch-ab b/net/netatalk-umich/patches/patch-ab
new file mode 100644
index 00000000000..6826750b367
--- /dev/null
+++ b/net/netatalk-umich/patches/patch-ab
@@ -0,0 +1,22 @@
+$NetBSD: patch-ab,v 1.1.1.1 2002/05/25 12:25:51 markd Exp $
+
+--- 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}"
+ 
+ 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-umich/patches/patch-ac b/net/netatalk-umich/patches/patch-ac
new file mode 100644
index 00000000000..94f6986be85
--- /dev/null
+++ b/net/netatalk-umich/patches/patch-ac
@@ -0,0 +1,22 @@
+$NetBSD: patch-ac,v 1.1.1.1 2002/05/25 12:25:51 markd Exp $
+
+--- 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}"
++	    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-umich/patches/patch-ad b/net/netatalk-umich/patches/patch-ad
new file mode 100644
index 00000000000..edcf209a5a6
--- /dev/null
+++ b/net/netatalk-umich/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1.1.1 2002/05/25 12:25:51 markd Exp $
+
+--- 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-umich/patches/patch-ae b/net/netatalk-umich/patches/patch-ae
new file mode 100644
index 00000000000..ce6bada8907
--- /dev/null
+++ b/net/netatalk-umich/patches/patch-ae
@@ -0,0 +1,31 @@
+$NetBSD: patch-ae,v 1.1.1.1 2002/05/25 12:25:51 markd Exp $
+
+--- 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;
+ 
+     /* 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;
+ 
+     /* 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;
+ 
+     /* 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-umich/patches/patch-af b/net/netatalk-umich/patches/patch-af
new file mode 100644
index 00000000000..3c8999b58e9
--- /dev/null
+++ b/net/netatalk-umich/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1.1.1 2002/05/25 12:25:51 markd Exp $
+
+--- 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-umich/patches/patch-ag b/net/netatalk-umich/patches/patch-ag
new file mode 100644
index 00000000000..bc1b1aecb8e
--- /dev/null
+++ b/net/netatalk-umich/patches/patch-ag
@@ -0,0 +1,21 @@
+$NetBSD: patch-ag,v 1.1.1.1 2002/05/25 12:25:51 markd Exp $
+
+--- 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-umich/patches/patch-ah b/net/netatalk-umich/patches/patch-ah
new file mode 100644
index 00000000000..52955b45e3d
--- /dev/null
+++ b/net/netatalk-umich/patches/patch-ah
@@ -0,0 +1,39 @@
+$NetBSD: patch-ah,v 1.1.1.1 2002/05/25 12:25:51 markd Exp $
+
+--- 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-umich/patches/patch-ai b/net/netatalk-umich/patches/patch-ai
new file mode 100644
index 00000000000..c5150fd9881
--- /dev/null
+++ b/net/netatalk-umich/patches/patch-ai
@@ -0,0 +1,18 @@
+$NetBSD: patch-ai,v 1.1.1.1 2002/05/25 12:25:51 markd Exp $
+
+--- 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-umich/patches/patch-aj b/net/netatalk-umich/patches/patch-aj
new file mode 100644
index 00000000000..3dd5abe3204
--- /dev/null
+++ b/net/netatalk-umich/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1.1.1 2002/05/25 12:25:51 markd Exp $
+
+--- 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-umich/patches/patch-ak b/net/netatalk-umich/patches/patch-ak
new file mode 100644
index 00000000000..70c7f3e15cd
--- /dev/null
+++ b/net/netatalk-umich/patches/patch-ak
@@ -0,0 +1,80 @@
+$NetBSD: patch-ak,v 1.1.1.1 2002/05/25 12:25:51 markd Exp $
+
+--- 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-umich/patches/patch-al b/net/netatalk-umich/patches/patch-al
new file mode 100644
index 00000000000..6efa51d0dd1
--- /dev/null
+++ b/net/netatalk-umich/patches/patch-al
@@ -0,0 +1,8 @@
+$NetBSD: patch-al,v 1.1.1.1 2002/05/25 12:25:51 markd Exp $
+
+--- 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-umich/patches/patch-am b/net/netatalk-umich/patches/patch-am
new file mode 100644
index 00000000000..45441bfd55f
--- /dev/null
+++ b/net/netatalk-umich/patches/patch-am
@@ -0,0 +1,9 @@
+$NetBSD: patch-am,v 1.1.1.1 2002/05/25 12:25:51 markd Exp $
+
+--- 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-umich/patches/patch-an b/net/netatalk-umich/patches/patch-an
new file mode 100644
index 00000000000..4f161301fef
--- /dev/null
+++ b/net/netatalk-umich/patches/patch-an
@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.1.1.1 2002/05/25 12:25:51 markd Exp $
+
+--- 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-umich/patches/patch-ao b/net/netatalk-umich/patches/patch-ao
new file mode 100644
index 00000000000..7faf0b176dc
--- /dev/null
+++ b/net/netatalk-umich/patches/patch-ao
@@ -0,0 +1,9 @@
+$NetBSD: patch-ao,v 1.1.1.1 2002/05/25 12:25:51 markd Exp $
+
+--- 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-umich/patches/patch-ap b/net/netatalk-umich/patches/patch-ap
new file mode 100644
index 00000000000..f6d82ab7175
--- /dev/null
+++ b/net/netatalk-umich/patches/patch-ap
@@ -0,0 +1,12 @@
+$NetBSD: patch-ap,v 1.1.1.1 2002/05/25 12:25:52 markd Exp $
+
+--- 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-umich/patches/patch-aq b/net/netatalk-umich/patches/patch-aq
new file mode 100644
index 00000000000..994e9683c5f
--- /dev/null
+++ b/net/netatalk-umich/patches/patch-aq
@@ -0,0 +1,8 @@
+$NetBSD: patch-aq,v 1.1.1.1 2002/05/25 12:25:52 markd Exp $
+
+--- 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-umich/patches/patch-ar b/net/netatalk-umich/patches/patch-ar
new file mode 100644
index 00000000000..893747bf750
--- /dev/null
+++ b/net/netatalk-umich/patches/patch-ar
@@ -0,0 +1,8 @@
+$NetBSD: patch-ar,v 1.1.1.1 2002/05/25 12:25:52 markd Exp $
+
+--- 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-umich/patches/patch-as b/net/netatalk-umich/patches/patch-as
new file mode 100644
index 00000000000..0c5d4c37450
--- /dev/null
+++ b/net/netatalk-umich/patches/patch-as
@@ -0,0 +1,13 @@
+$NetBSD: patch-as,v 1.1.1.1 2002/05/25 12:25:52 markd Exp $
+
+--- 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-umich/patches/patch-at b/net/netatalk-umich/patches/patch-at
new file mode 100644
index 00000000000..4019be1b034
--- /dev/null
+++ b/net/netatalk-umich/patches/patch-at
@@ -0,0 +1,13 @@
+$NetBSD: patch-at,v 1.1.1.1 2002/05/25 12:25:52 markd Exp $
+
+--- 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-umich/patches/patch-au b/net/netatalk-umich/patches/patch-au
new file mode 100644
index 00000000000..742f42d7e86
--- /dev/null
+++ b/net/netatalk-umich/patches/patch-au
@@ -0,0 +1,13 @@
+$NetBSD: patch-au,v 1.1.1.1 2002/05/25 12:25:52 markd Exp $
+
+--- 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-umich/patches/patch-av b/net/netatalk-umich/patches/patch-av
new file mode 100644
index 00000000000..ca916e4639c
--- /dev/null
+++ b/net/netatalk-umich/patches/patch-av
@@ -0,0 +1,13 @@
+$NetBSD: patch-av,v 1.1.1.1 2002/05/25 12:25:52 markd 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-umich/patches/patch-aw b/net/netatalk-umich/patches/patch-aw
new file mode 100644
index 00000000000..1321b61ffe7
--- /dev/null
+++ b/net/netatalk-umich/patches/patch-aw
@@ -0,0 +1,8 @@
+$NetBSD: patch-aw,v 1.1.1.1 2002/05/25 12:25:52 markd 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-umich/patches/patch-ax b/net/netatalk-umich/patches/patch-ax
new file mode 100644
index 00000000000..7f4925e0d08
--- /dev/null
+++ b/net/netatalk-umich/patches/patch-ax
@@ -0,0 +1,22 @@
+$NetBSD: patch-ax,v 1.1.1.1 2002/05/25 12:25:52 markd Exp $
+
+--- 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-umich/patches/patch-ay b/net/netatalk-umich/patches/patch-ay
new file mode 100644
index 00000000000..8bf7cc13024
--- /dev/null
+++ b/net/netatalk-umich/patches/patch-ay
@@ -0,0 +1,13 @@
+$NetBSD: patch-ay,v 1.1.1.1 2002/05/25 12:25:52 markd Exp $
+
+--- 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-umich/patches/patch-az b/net/netatalk-umich/patches/patch-az
new file mode 100644
index 00000000000..b1d057ffe39
--- /dev/null
+++ b/net/netatalk-umich/patches/patch-az
@@ -0,0 +1,13 @@
+$NetBSD: patch-az,v 1.1.1.1 2002/05/25 12:25:52 markd Exp $
+
+--- 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-umich/patches/patch-ba b/net/netatalk-umich/patches/patch-ba
new file mode 100644
index 00000000000..4f29a5ddf3e
--- /dev/null
+++ b/net/netatalk-umich/patches/patch-ba
@@ -0,0 +1,13 @@
+$NetBSD: patch-ba,v 1.1.1.1 2002/05/25 12:25:52 markd Exp $
+
+--- 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-umich/patches/patch-bb b/net/netatalk-umich/patches/patch-bb
new file mode 100644
index 00000000000..98d8f8485e4
--- /dev/null
+++ b/net/netatalk-umich/patches/patch-bb
@@ -0,0 +1,13 @@
+$NetBSD: patch-bb,v 1.1.1.1 2002/05/25 12:25:52 markd Exp $
+
+--- 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-umich/patches/patch-bc b/net/netatalk-umich/patches/patch-bc
new file mode 100644
index 00000000000..141c13d5326
--- /dev/null
+++ b/net/netatalk-umich/patches/patch-bc
@@ -0,0 +1,34 @@
+$NetBSD: patch-bc,v 1.1.1.1 2002/05/25 12:25:52 markd 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-umich/patches/patch-bd b/net/netatalk-umich/patches/patch-bd
new file mode 100644
index 00000000000..90bc77c536d
--- /dev/null
+++ b/net/netatalk-umich/patches/patch-bd
@@ -0,0 +1,63 @@
+$NetBSD: patch-bd,v 1.1.1.1 2002/05/25 12:25:52 markd Exp $
+
+--- sys/netbsd/Makefile	Sat Sep 26 08:15:09 1998
++++ sys/netbsd/Makefile	Wed Jun 28 19:36:36 2000
+@@ -1,9 +1,9 @@
+ # NetBSD specific defines, passed to subdirectories.
+ DEFS=	-DBSD4_4
+-OPTOPTS=	-O2
+-CC=	gcc -Werror -I../../sys/netbsd/
++#CC=	gcc -Werror -I../../sys/netbsd/
++OPTOPTS= -Werror -I../../sys/netbsd/
+ INSTALL=	install
+-ADDLIBS=	-lcrypt
++ADDLIBS=	-Wl,-R${LIBDIR} -lcrypt
+ 
+ ALL=	../../libatalk ../../include ../../bin ../../etc ../../man
+ 
+@@ -16,12 +16,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 +32,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-umich/patches/patch-be b/net/netatalk-umich/patches/patch-be
new file mode 100644
index 00000000000..c09132d270c
--- /dev/null
+++ b/net/netatalk-umich/patches/patch-be
@@ -0,0 +1,18 @@
+$NetBSD: patch-be,v 1.1.1.1 2002/05/25 12:25:52 markd Exp $
+
+--- etc/atalkd/main.c.orig	Sun Oct  5 17:50:47 1997
++++ etc/atalkd/main.c	Tue Aug 31 15:58:11 1999
+@@ -191,10 +191,10 @@
+ 		    syslog( LOG_INFO, "config for no router" );
+ 		    if ( iface->i_flags & IFACE_PHASE2 ) {
+-			iface->i_rt->rt_firstnet = 0;
++			iface->i_rt->rt_firstnet = htons( 1 );
+ 			iface->i_rt->rt_lastnet = htons( STARTUP_LASTNET );
+ 			setaddr( iface, IFACE_PHASE2,
+ 				iface->i_addr.sat_addr.s_net,
+ 				iface->i_addr.sat_addr.s_node,
+-				0, htons( STARTUP_LASTNET ));
++				htons( 1 ), htons( STARTUP_LASTNET ));
+ 		    }
+ 		    if ( looproute( iface, RTMP_ADD ) < 0 ) {
+
diff --git a/net/netatalk-umich/patches/patch-bf b/net/netatalk-umich/patches/patch-bf
new file mode 100644
index 00000000000..dc4ddcdf81c
--- /dev/null
+++ b/net/netatalk-umich/patches/patch-bf
@@ -0,0 +1,61 @@
+$NetBSD: patch-bf,v 1.1.1.1 2002/05/25 12:25:52 markd Exp $
+
+--- etc/papd/printcap.c.orig	Sat Aug 16 19:20:28 1997
++++ etc/papd/printcap.c	Mon Jan 17 19:40:24 2000
+@@ -159,6 +159,7 @@
+ 	char ibuf[BUFSIZ];
+ 	char *cp2;
+ 	int tf;
++	int skip;
+ 
+ 	hopcount = 0;
+ 	tbuf = bp;
+@@ -177,7 +178,7 @@
+ 			cp2 = getenv("TERM");
+ 			if (cp2==(char *) 0 || strcmp(name,cp2)==0) {
+ 				strcpy(bp,cp);
+-				return(tnchktc());
++				return(tnchktc(cap));
+ 			} else {
+ 				tf = open(cap, 0);
+ 			}
+@@ -191,6 +192,7 @@
+ #endif
+ 	if (tf < 0)
+ 		return (-1);
++	skip = 0;
+ 	for (;;) {
+ 		cp = bp;
+ 		for (;;) {
+@@ -204,12 +206,20 @@
+ 			}
+ 			c = ibuf[i++];
+ 			if (c == '\n') {
+-				if (cp > bp && cp[-1] == '\\'){
++				if (!skip && cp > bp && cp[-1] == '\\'){
+ 					cp--;
+ 					continue;
+ 				}
+-				break;
++				skip = 0;
++				if (cp == bp)
++					continue;
++				else
++					break;
+ 			}
++			if (c == '#' && cp == bp)
++				skip++;
++			if (skip)
++				continue;
+ 			if (cp >= bp+BUFSIZ) {
+ 				write(2,"Termcap entry too long\n", 23);
+ 				break;
+@@ -223,7 +233,7 @@
+ 		 */
+ 		if (tnamatch(name)) {
+ 			close(tf);
+-			return(tnchktc());
++			return(tnchktc(cap));
+ 		}
+ 	}
+ }
diff --git a/net/netatalk-umich/patches/patch-bg b/net/netatalk-umich/patches/patch-bg
new file mode 100644
index 00000000000..e9cd0e33730
--- /dev/null
+++ b/net/netatalk-umich/patches/patch-bg
@@ -0,0 +1,12 @@
+$NetBSD: patch-bg,v 1.1.1.1 2002/05/25 12:25:52 markd Exp $
+--- config/AppleVolumes.system.orig	Fri Jul 28 00:53:30 2000
++++ config/AppleVolumes.system	Fri Jul 28 00:53:08 2000
+@@ -26,7 +26,7 @@
+ .html	TEXT	MOS!
+ .rtf	TEXT	MSWD
+ .doc	WDBN	MSWD
+-.pdf	CARO	PDF 
++.pdf	PDF 	CARO
+ 
+ # compressed archives
+ .bin	BINA	MB2P
diff --git a/net/netatalk-umich/patches/patch-bh b/net/netatalk-umich/patches/patch-bh
new file mode 100644
index 00000000000..5cc1474928f
--- /dev/null
+++ b/net/netatalk-umich/patches/patch-bh
@@ -0,0 +1,13 @@
+$NetBSD: patch-bh,v 1.1.1.1 2002/05/25 12:25:52 markd Exp $
+--- etc/atalkd/route.c.orig	Tue Oct 17 23:29:04 2000
++++ etc/atalkd/route.c	Tue Oct 17 23:30:19 2000
+@@ -34,7 +34,8 @@
+     u_char	sam_family;
+     u_short	sam_pad;
+     u_short	sam_mask;
+-} mask = { sizeof( struct sockaddr_m ), 0, 0, 0xffff };
++    u_short	sam_pad2;
++} mask = { sizeof( struct sockaddr_m ), 0, 0, 0xffff, 0 };
+ 
+ struct rt_msg_at {
+     struct rt_msghdr	rtma_rtm;