Update netatalk to 2.0.1

Changes:
     * Netatalk's file server, afpd, now speaking AFP 3.1 allows long
       filenames, UTF-8 names, large file support and full MacOS X
       compatibility
     * The print server task, papd, can directly interact with CUPS,
       automagically sharing all CUPS queues
     * Kerberos V support, allowing true "Single Sign On"
     * Whole rework of the CNID subsystem, providing reliable and
       persistant storage of file and directory IDs
     * Huge improvements regarding product documentation making
       Netatalk's features accessible more easily
     * Tons of bugs fixed compared to all previous versions

12 files changed, 142 insertions, 282 deletions

diff --git a/net/netatalk/DESCR b/net/netatalk/DESCR
index 325d78f573e..4b775d4e9d1 100644
--- a/net/netatalk/DESCR
+++ b/net/netatalk/DESCR
@@ -1,14 +1,6 @@
-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.
+Netatalk is a freely-available, kernel level implementation of the AppleTalk
+Protocol Suite, originally for BSD-derived systems. A *NIX/*BSD system
+running netatalk is capable of serving many macintosh clients simultaneously
+as an AppleTalk router, AppleShare file server (AFP), *NIX/*BSD print server,
+and for accessing AppleTalk printers via Printer Access Protocol (PAP).
+Included are a number of minor printing and debugging utilities.
diff --git a/net/netatalk/INSTALL b/net/netatalk/INSTALL
deleted file mode 100644
index f53e11a3020..00000000000
--- a/net/netatalk/INSTALL
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: INSTALL,v 1.5 2003/08/30 20:22:59 jlam Exp $
-
-case ${STAGE} in
-POST-INSTALL)
-	ETCDIR=@PKG_SYSCONFDIR@/netatalk
-
-	${MKDIR} -p ${ETCDIR}
-
-	${ECHO} "Installing configuration files:"
-	for file in \
-		AppleVolumes.default AppleVolumes.system afpd.conf \
-		atalkd.conf netatalk.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."
-	;;
-esac
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index 72dd2d9d8c0..70ebc57ad11 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -1,23 +1,29 @@
-# $NetBSD: Makefile,v 1.31 2004/10/03 00:17:56 tv Exp $
+# $NetBSD: Makefile,v 1.32 2004/11/02 11:26:28 markd Exp $
 
-DISTNAME=	netatalk-1.6.2
-PKGREVISION=	1
+DISTNAME=	netatalk-2.0.1
 CATEGORIES=	net print
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=netatalk/} \
-		http://me.in-berlin.de/~jroger/netatalk/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=netatalk/}
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	markd@NetBSD.org
-HOMEPAGE=	http://sourceforge.net/projects/netatalk/
+HOMEPAGE=	http://netatalk.sourceforge.net/
 COMMENT=	Netatalk appletalk file and print services
 
 GNU_CONFIGURE=	YES
 USE_BUILDLINK3=	YES
 USE_GNU_TOOLS+=	make
 USE_PERL5=	YES
-USE_LIBTOOL=		YES
-
-USE_PKGINSTALL=		YES
-INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
+USE_LIBTOOL=	YES
+
+USE_PKGINSTALL=	YES
+PKG_SYSCONFSUBDIR=	netatalk
+EG_DIR=		${PREFIX}/share/examples/netatalk
+CONF_FILES=	${EG_DIR}/AppleVolumes.default ${PKG_SYSCONFDIR}/AppleVolumes.default \
+		${EG_DIR}/AppleVolumes.system ${PKG_SYSCONFDIR}/AppleVolumes.system \
+		${EG_DIR}/afpd.conf ${PKG_SYSCONFDIR}/afpd.conf \
+		${EG_DIR}/atalkd.conf ${PKG_SYSCONFDIR}/atalkd.conf \
+		${EG_DIR}/netatalk.conf ${PKG_SYSCONFDIR}/netatalk.conf \
+		${EG_DIR}/papd.conf ${PKG_SYSCONFDIR}/papd.conf
 
 CONFLICTS=	netatalk-asun-[0-9]* netatalk-umich-[0-9]*
 
@@ -26,17 +32,18 @@ RCD_SCRIPTS=	atalkd afpd papd timelord
 .include "../../mk/bsd.prefs.mk"
 
 CONFIGURE_ARGS+=	--enable-netbsd \
+			--enable-overwrite \
+			--enable-srvloc \
 			--enable-timelord \
-			--with-did=last \
-			--with-tcp-wrappers \
+			--libexecdir=${PREFIX}/libexec/netatalk \
 			--sbindir=${PREFIX}/libexec/netatalk \
-			--sysconfdir=${PKG_SYSCONFDIR} \
-			--localstatedir=/var/netatalk \
-			--with-nls-dir=${PREFIX}/share/netatalk/nls \
-			--with-uams-path=${PREFIX}/libexec/netatalk/uams
-
-#CONFIGURE_ARGS+=	--with-flock-locks	# broken
-#CONFIGURE_ARGS+=	--with-bdb=${PREFIX}	# still some known issues
+			--with-pkgconfdir=${PKG_SYSCONFDIR} \
+			--localstatedir=${VARBASE}/netatalk \
+			--with-uams-path=${PREFIX}/libexec/netatalk/uams \
+			--with-bdb=${BUILDLINK_PREFIX.db4} \
+			--with-gssapi --enable-krbV-uam
+CONFIGURE_ENV+=	GSSAPI_LIBS="-lkrb5 -lroken -lasn1 -lcrypto -lcom_err"
+LIBS+=-ldes
 
 post-patch:
 	mv ${WRKSRC}/etc/psf/etc2ps.sh ${WRKSRC}/etc/psf/etc2ps.sh.tmp
@@ -45,15 +52,11 @@ post-patch:
 
 pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/libexec/psffilters
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/netatalk
-.for FILE in atalkd.conf netatalk.conf papd.conf AppleVolumes.default \
-		AppleVolumes.system afpd.conf
-	@-( cd ${WRKSRC}/config; ${MAKE_PROGRAM} ${FILE} )
-	${INSTALL_DATA} ${WRKSRC}/config/${FILE} \
-					${PREFIX}/share/examples/netatalk/
-.endfor
-
-#.include "../../databases/db3/buildlink3.mk"
-.include "../../devel/rx/buildlink3.mk"
+
+.include "../../databases/db4/buildlink3.mk"
+.include "../../net/openslp/buildlink3.mk"
+.include "../../print/cups/buildlink3.mk"
+.include "../../security/tcp_wrappers/buildlink3.mk"
+.include "../../mk/krb5.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/netatalk/PLIST b/net/netatalk/PLIST
index fd8fe66b24a..2cb76adaa7b 100644
--- a/net/netatalk/PLIST
+++ b/net/netatalk/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.7 2004/09/22 08:09:48 jlam Exp $
+@comment $NetBSD: PLIST,v 1.8 2004/11/02 11:26:28 markd Exp $
 bin/achfile
 bin/acleandir.rc
-bin/add_netatalk_printer
 bin/adv1tov2
 bin/aecho
 bin/afile
@@ -10,15 +9,16 @@ bin/afppasswd
 bin/apple_cp
 bin/apple_mv
 bin/apple_rm
+bin/asip-status.pl
 bin/binheader
 bin/cleanappledouble.pl
-@comment bin/cnid_maint
+bin/cnid2_create
+bin/cnid_maint
 bin/getzones
 bin/hqx2bin
 bin/lp2pap.sh
 bin/macbinary
 bin/macusers
-bin/makecode
 bin/megatron
 bin/nadheader
 bin/nbplkup
@@ -29,12 +29,13 @@ bin/netatalkshorternamelinks.pl
 bin/nu
 bin/pap
 bin/papstatus
-bin/parsecode
 bin/psorder
+bin/showppd
 bin/single2bin
 bin/timeout
 bin/unbin
 bin/unhex
+bin/uniconv
 bin/unsingle
 include/atalk/adouble.h
 include/atalk/aep.h
@@ -46,6 +47,7 @@ include/atalk/cnid.h
 include/atalk/compat.h
 include/atalk/ddp.h
 include/atalk/dsi.h
+include/atalk/list.h
 include/atalk/logger.h
 include/atalk/nbp.h
 include/atalk/netddp.h
@@ -53,6 +55,7 @@ include/atalk/pap.h
 include/atalk/paths.h
 include/atalk/rtmp.h
 include/atalk/server_child.h
+include/atalk/tdb.h
 include/atalk/uam.h
 include/atalk/util.h
 include/atalk/zip.h
@@ -72,6 +75,8 @@ include/netatalk/phase2.h
 lib/libatalk.la
 libexec/netatalk/afpd
 libexec/netatalk/atalkd
+libexec/netatalk/cnid_dbd
+libexec/netatalk/cnid_metad
 libexec/netatalk/etc2ps.sh
 libexec/netatalk/ifmpap
 libexec/netatalk/ifmpaprev
@@ -100,6 +105,7 @@ libexec/netatalk/timelord
 libexec/netatalk/uams/uams_clrtxt.so
 libexec/netatalk/uams/uams_dhx.so
 libexec/netatalk/uams/uams_dhx_passwd.la
+libexec/netatalk/uams/uams_gss.la
 libexec/netatalk/uams/uams_guest.la
 libexec/netatalk/uams/uams_passwd.la
 libexec/netatalk/uams/uams_randnum.la
@@ -111,6 +117,7 @@ man/man1/afppasswd.1
 man/man1/apple_cp.1
 man/man1/apple_mv.1
 man/man1/apple_rm.1
+man/man1/asip-status.pl.1
 man/man1/getzones.1
 man/man1/hqx2bin.1
 man/man1/macbinary.1
@@ -127,6 +134,7 @@ man/man1/single2bin.1
 man/man1/timeout.1
 man/man1/unbin.1
 man/man1/unhex.1
+man/man1/uniconv.1
 man/man1/unsingle.1
 man/man3/atalk_aton.3
 man/man3/nbp_name.3
@@ -138,6 +146,8 @@ man/man5/netatalk.conf.5
 man/man5/papd.conf.5
 man/man8/afpd.8
 man/man8/atalkd.8
+man/man8/cnid_dbd.8
+man/man8/cnid_metad.8
 man/man8/papd.8
 man/man8/papstatus.8
 man/man8/psf.8
@@ -149,13 +159,7 @@ share/examples/netatalk/afpd.conf
 share/examples/netatalk/atalkd.conf
 share/examples/netatalk/netatalk.conf
 share/examples/netatalk/papd.conf
-share/netatalk/nls/maccode.437
-share/netatalk/nls/maccode.850
-share/netatalk/nls/maccode.iso8859-1
-share/netatalk/nls/maccode.iso8859-1.adapted
-share/netatalk/nls/maccode.koi8-r
 share/netatalk/pagecount.ps
-@dirrm share/netatalk/nls
 @dirrm share/netatalk
 @dirrm share/examples/netatalk
 @exec ${MKDIR} %D/libexec/psffilters
diff --git a/net/netatalk/buildlink3.mk b/net/netatalk/buildlink3.mk
index 0b614f0f1f7..741c523d866 100644
--- a/net/netatalk/buildlink3.mk
+++ b/net/netatalk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/10/03 00:17:56 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/11/02 11:26:28 markd Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 NETATALK_BUILDLINK3_MK:=	${NETATALK_BUILDLINK3_MK}+
@@ -7,15 +7,13 @@ NETATALK_BUILDLINK3_MK:=	${NETATALK_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	netatalk
 .endif
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGESNnetatalk}
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nnetatalk}
 BUILDLINK_PACKAGES+=	netatalk
 
 .if !empty(NETATALK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.netatalk+=	netatalk>=1.6.2
-BUILDLINK_RECOMMENDED.netatalk+=	netatalk>=1.6.2nb1
-BUILDLINK_PKGSRCDIR.netatalk?=	../../net/netatalk
+BUILDLINK_DEPENDS.netatalk+=	netatalk>=2.0.1
+BUILDLINK_PKGSRCDIR.netatalk?=	../../mcs/netatalk
+BUILDLINK_DEPMETHOD.netatalk?=	build
 .endif	# NETATALK_BUILDLINK3_MK
 
-.include "../../devel/rx/buildlink3.mk"
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/net/netatalk/distinfo b/net/netatalk/distinfo
index a4bd760bc34..802fe6423a4 100644
--- a/net/netatalk/distinfo
+++ b/net/netatalk/distinfo
@@ -1,10 +1,12 @@
-$NetBSD: distinfo,v 1.11 2003/04/28 04:07:45 fredb Exp $
+$NetBSD: distinfo,v 1.12 2004/11/02 11:26:28 markd Exp $
 
-SHA1 (netatalk-1.6.2.tar.gz) = b3e451b2c40c70feda4f81d92162d08fa063fc48
-Size (netatalk-1.6.2.tar.gz) = 855933 bytes
-SHA1 (patch-aa) = 0e7dc8d0524376e162f7d8d243720e12f8cbb5fb
-SHA1 (patch-ab) = 609bc6f137bb13ece41408277634e9f09c746e61
+SHA1 (netatalk-2.0.1.tar.bz2) = b61fd7595b8d03971fbd6c0dce0ed307e8916628
+Size (netatalk-2.0.1.tar.bz2) = 1465827 bytes
+SHA1 (patch-aa) = 23c68f79a8eb8c360cd11f47a88d890b8fc88ab1
+SHA1 (patch-ab) = 057a8a4ef188068237550199e2c87db0c0cc5dfd
 SHA1 (patch-ac) = 18d3bff990ddb78146d1e1d2f9e07d6826a7bfd2
 SHA1 (patch-ad) = 311d00d165688d4baa1365ba6c4147bd6293f3d8
-SHA1 (patch-ae) = 9bae8aef01e7b23fb26c9deddc53386b294d1e1c
 SHA1 (patch-af) = 997909d7cf444a2481693069864da9134ce413d4
+SHA1 (patch-ag) = d49dd0bd69ceccccc85021edc9ccb2130e6689cd
+SHA1 (patch-ah) = 318626f5c6d21f025ae5e08c9da76bd4c493f7e6
+SHA1 (patch-ai) = e8f453569db891100221f27bf579c66a18a650b7
diff --git a/net/netatalk/patches/patch-aa b/net/netatalk/patches/patch-aa
index 94917bddfeb..e7e35176835 100644
--- a/net/netatalk/patches/patch-aa
+++ b/net/netatalk/patches/patch-aa
@@ -1,158 +1,13 @@
-$NetBSD: patch-aa,v 1.10 2003/02/23 19:18:51 fredb Exp $
+$NetBSD: patch-aa,v 1.11 2004/11/02 11:26:28 markd Exp $
 
---- configure.orig	Sun Feb 16 12:46:32 2003
-+++ configure	Sun Feb 23 16:55:12 2003
-@@ -8084,64 +8084,6 @@
- fi
+--- configure.orig	2004-09-15 23:44:25.000000000 +1200
++++ configure
+@@ -19013,7 +19013,7 @@ if test "${enable_krbV_uam+set}" = set; 
+ 		if test x"$enableval" = x"yes"; then
  
+ 	FOUND_GSSAPI=no
+-	GSSAPI_LIBS=""
++	#GSSAPI_LIBS=""
+ 	GSSAPI_CFLAGS=""
  
--echo "$as_me:$LINENO: checking for main in -lcrypt" >&5
--echo $ECHO_N "checking for main in -lcrypt... $ECHO_C" >&6
--if test "${ac_cv_lib_crypt_main+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lcrypt  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--
--int
--main ()
--{
--main ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_lib_crypt_main=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_lib_crypt_main=no
--fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_main" >&5
--echo "${ECHO_T}$ac_cv_lib_crypt_main" >&6
--if test $ac_cv_lib_crypt_main = yes; then
--  cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBCRYPT 1
--_ACEOF
--
--  LIBS="-lcrypt $LIBS"
--
--fi
--
--
- echo "$as_me:$LINENO: checking for main in -ld" >&5
- echo $ECHO_N "checking for main in -ld... $ECHO_C" >&6
- if test "${ac_cv_lib_d_main+set}" = set; then
-@@ -13066,13 +13008,13 @@
- 			savedldflags="$LDFLAGS"
- 			CFLAGS="$CFLAGS -I$bdbdir"
- 			LDFLAGS="-L$bdblibdir $LDFLAGS"
--			echo "$as_me:$LINENO: checking for main in -ldb" >&5
--echo $ECHO_N "checking for main in -ldb... $ECHO_C" >&6
-+			echo "$as_me:$LINENO: checking for main in -ldb3" >&5
-+echo $ECHO_N "checking for main in -ldb3... $ECHO_C" >&6
- if test "${ac_cv_lib_db_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldb  $LIBS"
-+LIBS="-ldb3  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -13118,7 +13060,7 @@
  
- 				bdbfound=yes
- 				BDB_CFLAGS="-I$bdbdir"
--				BDB_LIBS="-L$bdblibdir -ldb"
-+				BDB_LIBS="-L$bdblibdir -ldb3"
- 				BDB_BIN=$bdbbindir
- 				BDB_PATH="`echo $bdbdir | sed 's,include/db3$,,'`"
- 
-@@ -14552,7 +14494,62 @@
- 	fi
- 
- 
-+echo "$as_me:$LINENO: checking for main in -lcrypt" >&5
-+echo $ECHO_N "checking for main in -lcrypt... $ECHO_C" >&6
-+if test "${ac_cv_lib_crypt_main+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lcrypt  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+
-+int
-+main ()
-+{
-+main ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_lib_crypt_main=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_crypt_main=no
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_main" >&5
-+echo "${ECHO_T}$ac_cv_lib_crypt_main" >&6
-+if test $ac_cv_lib_crypt_main = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBCRYPT 1
-+_ACEOF
-+
-+  LIBS="-lcrypt $LIBS"
- 
-+fi
- 
- 
- # Check whether --enable-pgp-uam or --disable-pgp-uam was given.
diff --git a/net/netatalk/patches/patch-ab b/net/netatalk/patches/patch-ab
index abbe7eb15a7..f75d59eb9a1 100644
--- a/net/netatalk/patches/patch-ab
+++ b/net/netatalk/patches/patch-ab
@@ -1,19 +1,13 @@
-$NetBSD: patch-ab,v 1.7 2003/02/23 19:18:52 fredb Exp $
+$NetBSD: patch-ab,v 1.8 2004/11/02 11:26:28 markd Exp $
 
---- distrib/initscripts/Makefile.in.orig	Sun Feb 16 12:50:01 2003
-+++ distrib/initscripts/Makefile.in	Sun Feb 23 13:18:29 2003
-@@ -125,12 +125,12 @@
- @USE_SUSE_TRUE@sysvdir = /etc/init.d
- @USE_COBALT_TRUE@sysvdir = /etc/rc.d/init.d
- @USE_TRU64_TRUE@sysvdir = /sbin/init.d
+--- distrib/initscripts/Makefile.in.orig	2004-08-27 23:24:05.000000000 +1200
++++ distrib/initscripts/Makefile.in
+@@ -246,7 +246,7 @@ EXTRA_DIST = $(TEMPLATES) rc.atalk.cobal
+ #
+ # checking for NetBSD init scripts
+ #
 -@USE_NETBSD_TRUE@sysvdir = /etc/rc.d
-+@USE_NETBSD_TRUE@sysvdir = ${prefix}/etc/rc.d#	pkgsrc *only*!
- @USE_REDHAT_TRUE@sysv_SCRIPTS = atalk
- @USE_SUSE_TRUE@sysv_SCRIPTS = atalk
- @USE_COBALT_TRUE@sysv_SCRIPTS = atalk
- @USE_TRU64_TRUE@sysv_SCRIPTS = atalk
--@USE_NETBSD_TRUE@sysv_SCRIPTS = afp atalk pap timelord
-+@USE_NETBSD_TRUE@sysv_SCRIPTS = afpd atalkd papd timelord
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../config.h
- CONFIG_CLEAN_FILES = 
++@USE_NETBSD_TRUE@sysvdir = ${prefix}/etc/rc.d# pkgsrc *only*!
+ 
+ 
+ #
diff --git a/net/netatalk/patches/patch-ae b/net/netatalk/patches/patch-ae
deleted file mode 100644
index 89fe0b29c0e..00000000000
--- a/net/netatalk/patches/patch-ae
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2002/09/30 09:25:24 abs Exp $
-
---- man/man8/psf.8.tmpl.orig	Tue Sep 19 18:13:47 2000
-+++ man/man8/psf.8.tmpl
-@@ -93,10 +93,10 @@ 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:
-+    :of=:SBINDIR:/filters/ofpap:\\
-+    :if=:SBINDIR:/filters/ifpaprev:\\
-+    :tf=:SBINDIR:/filters/tfpaprev:\\
-+    :df=:SBINDIR:/filters/dfpaprev:
- .fi
- .RE
- .sp
diff --git a/net/netatalk/patches/patch-ag b/net/netatalk/patches/patch-ag
new file mode 100644
index 00000000000..6b266e20715
--- /dev/null
+++ b/net/netatalk/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.4 2004/11/02 11:26:28 markd Exp $
+
+--- etc/afpd/unix.h.orig	2004-05-11 06:40:33.000000000 +1200
++++ etc/afpd/unix.h
+@@ -32,7 +32,7 @@ typedef int	mode_t;
+ #define f_frsize f_fsize
+ #else /* TRU64 */
+ /* temp fix, was: defined(HAVE_SYS_STATVFS) || defined(__svr4__) */
+-#if defined(__svr4__)
++#if defined(__svr4__) || defined(__NetBSD__)
+ #include <sys/statvfs.h>
+ #define statfs statvfs
+ #else /* HAVE_SYS_STATVFS || __svr4__ */
diff --git a/net/netatalk/patches/patch-ah b/net/netatalk/patches/patch-ah
new file mode 100644
index 00000000000..1a149c3b069
--- /dev/null
+++ b/net/netatalk/patches/patch-ah
@@ -0,0 +1,22 @@
+$NetBSD: patch-ah,v 1.4 2004/11/02 11:26:28 markd Exp $
+
+--- config/Makefile.in.orig	2004-10-28 03:41:56.000000000 +1300
++++ config/Makefile.in
+@@ -392,13 +392,14 @@ uninstall-am: uninstall-info-am
+ #
+ # install configuration files
+ #
++egconfdir = @prefix@/share/examples/netatalk
+ 
+ install-config-files: $(CONFFILES) $(GENFILES)
+-	$(mkinstalldirs) $(DESTDIR)$(pkgconfdir)
++	$(mkinstalldirs) $(DESTDIR)$(egconfdir)
+ 	for f in $(CONFFILES) $(GENFILES); do \
+ 		if test "x$(OVERWRITE_CONFIG)" = "xyes" -o ! -f $(DESTDIR)$(pkgconfdir)/$$f; then \
+-			echo "$(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)"; \
+-			$(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir); \
++			echo "$(INSTALL_DATA) $$f $(DESTDIR)$(egconfdir)"; \
++			$(INSTALL_DATA) $$f $(DESTDIR)$(egconfdir); \
+ 		else \
+ 			echo "not overwriting $$f"; \
+ 		fi; \
diff --git a/net/netatalk/patches/patch-ai b/net/netatalk/patches/patch-ai
new file mode 100644
index 00000000000..9da6b4f6872
--- /dev/null
+++ b/net/netatalk/patches/patch-ai
@@ -0,0 +1,21 @@
+$NetBSD: patch-ai,v 1.4 2004/11/02 11:26:28 markd Exp $
+
+--- distrib/initscripts/rc.afpd.netbsd.tmpl.orig	2002-01-17 19:04:35.000000000 +1300
++++ distrib/initscripts/rc.afpd.netbsd.tmpl
+@@ -2,6 +2,7 @@
+ #
+ # PROVIDE: afpd
+ # REQUIRE: atalkd
++# KEYWORD: shutdown
+ #
+ # AppleTalk daemons. Make sure not to start atalkd in the background:
+ # its data structures must have time to stablize before running the
+@@ -15,7 +16,7 @@ rcvar=$name
+ command=":SBINDIR:/afpd"
+ etcdir=":ETCDIR:"
+ pidfile="/var/run/${name}.pid"
+-required_files="$etcdir/papd.conf $etcdir/AppleVolumes.default $etcdir/AppleVolumes.system"
++required_files="$etcdir/afpd.conf $etcdir/AppleVolumes.default $etcdir/AppleVolumes.system"
+ 
+ load_rc_config $name
+ run_rc_command "$1"