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

6 files changed, 76 insertions, 190 deletions

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"