Update netatalk to 1.6.0. Significant changes since 1.5.5, from "NEWS":

Changes in 1.6.0
================

* FIX: pap looks at the STDOUT file descriptor to see if it's connected to
       a tty, instead of STDIN.

Changes in 1.6pre2
==================

* UPD: Removed --with-catsearch option from configure and enable FPCatSearch
       by default.
* UPD: The dbpath argument does now support variable substitution.
* FIX: Build fix for non-GNU-C compilers in libatalk/util/logger.c.
* FIX: Two directories with the same name but different case confused the
       Mac Finder.
* FIX: The ROOT_PARENT directory could get invalidated.

Changes in 1.6pre1
====================

* NEW: Long file name mangling support.
* NEW: Improved log file support.
* NEW: Server-side find capability ("FPCatSearch")
* NEW: Concurrent datastore (CDB) is now the default CNID datastore.  This
       should be heavily tested in a multiuser environment.
* NEW: Variable substitution support has been added for the dbpath AppleVolume
       option.
* UPD: CNID DID handling is now enabled by default.
* FIX: Various bug and build fixes as well as code cleanups.

*******************************************************************************
Changes to the package:

- Now use buildlink2.
- Drop --with-flock for now, as it's currently broken.
- Add (heretofore) missing dependendency on "devel/rx".
- Add --with-did=last, to avoid having to create a dependendency on db3.
   --with-did=last was the default with netatalk 1.5.5.

6 files changed, 64 insertions, 45 deletions

diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index 5d5eb8f028e..b31c9252fbb 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.20 2003/01/28 22:03:53 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2003/02/15 20:01:06 fredb Exp $
 
-DISTNAME=	netatalk-1.5.5
+DISTNAME=	netatalk-1.6.0
 CATEGORIES=	net print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=netatalk/} \
 		http://me.in-berlin.de/~jroger/netatalk/
@@ -10,6 +10,7 @@ HOMEPAGE=	http://sourceforge.net/projects/netatalk/
 COMMENT=	Netatalk appletalk file and print services
 
 GNU_CONFIGURE=	YES
+USE_BUILDLINK2=	YES
 USE_PKGINSTALL=	YES
 USE_GMAKE=	YES
 USE_PERL5=	YES
@@ -22,13 +23,15 @@ RCD_SCRIPTS=	atalkd afpd papd timelord
 
 .include "../../mk/bsd.prefs.mk"
 
-CONFIGURE_ARGS+=	--with-tcp-wrappers --with-flock-locks \
+CONFIGURE_ARGS+=	--enable-netbsd \
 			--enable-timelord \
-			--localstatedir=/var/netatalk \
+			--with-did=last \
+			--with-tcp-wrappers \
 			--sbindir=${PREFIX}/libexec/netatalk \
-			--with-uams-path=${PREFIX}/libexec/netatalk/uams \
 			--sysconfdir=${PKG_SYSCONFDIR} \
-			--enable-netbsd
+			--localstatedir=/var/netatalk \
+			--with-nls-dir=${PREFIX}/share/netatalk/nls \
+			--with-uams-path=${PREFIX}/libexec/netatalk/uams
 
 pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/libexec/psffilters
@@ -40,4 +43,5 @@ pre-install:
 					${PREFIX}/share/examples/netatalk/
 .endfor
 
+.include "../../devel/rx/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/netatalk/PLIST b/net/netatalk/PLIST
index b9f29c30b93..b10997f12da 100644
--- a/net/netatalk/PLIST
+++ b/net/netatalk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/05/25 12:55:24 markd Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/02/15 20:01:06 fredb Exp $
 bin/achfile
 bin/acleandir.rc
 bin/add_netatalk_printer
@@ -31,7 +31,6 @@ bin/papstatus
 bin/parsecode
 bin/psorder
 bin/single2bin
-bin/test_parse_mtab
 bin/timeout
 bin/unbin
 bin/unhex
@@ -45,10 +44,12 @@ include/atalk/aep.h
 include/atalk/afp.h
 include/atalk/asp.h
 include/atalk/atp.h
+include/atalk/boolean.h
 include/atalk/cnid.h
 include/atalk/compat.h
 include/atalk/ddp.h
 include/atalk/dsi.h
+include/atalk/logger.h
 include/atalk/nbp.h
 include/atalk/netddp.h
 include/atalk/pap.h
@@ -148,7 +149,6 @@ man/man5/netatalk.conf.5
 man/man5/papd.conf.5
 man/man8/afpd.8
 man/man8/atalkd.8
-man/man8/pap.8
 man/man8/papd.8
 man/man8/papstatus.8
 man/man8/psf.8
diff --git a/net/netatalk/distinfo b/net/netatalk/distinfo
index 81aa8246f06..806de970746 100644
--- a/net/netatalk/distinfo
+++ b/net/netatalk/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.6 2002/09/30 09:25:22 abs Exp $
+$NetBSD: distinfo,v 1.7 2003/02/15 20:01:06 fredb Exp $
 
-SHA1 (netatalk-1.5.5.tar.gz) = 3d4def4231f1630fb596d7f8c8ca70c7dc661b9a
-Size (netatalk-1.5.5.tar.gz) = 835649 bytes
-SHA1 (patch-aa) = 0d533245bc01003ecfa4e6b5c6403a82387aa2c4
-SHA1 (patch-ab) = 0921842982de335732e8c0618b66caa27ee9f6fb
-SHA1 (patch-ac) = 2eb551644d08da9e59d675d1a61296f21ad69d90
+SHA1 (netatalk-1.6.0.tar.gz) = f3be966dd1bcf2f1f66501f59e3a2743558c58ac
+Size (netatalk-1.6.0.tar.gz) = 827737 bytes
+SHA1 (patch-ab) = b54f506b2db7fd53393cffb9d05cd688e63a50c3
+SHA1 (patch-ac) = 18d3bff990ddb78146d1e1d2f9e07d6826a7bfd2
 SHA1 (patch-ad) = 311d00d165688d4baa1365ba6c4147bd6293f3d8
 SHA1 (patch-ae) = 9bae8aef01e7b23fb26c9deddc53386b294d1e1c
diff --git a/net/netatalk/patches/patch-aa b/net/netatalk/patches/patch-aa
deleted file mode 100644
index 681f749070b..00000000000
--- a/net/netatalk/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2002/09/30 09:25:23 abs Exp $
-
---- configure.orig	Sun Sep  1 17:50:59 2002
-+++ configure
-@@ -12460,7 +12460,7 @@ if test "${with_pkgconfdir+set}" = set; 
- 
- fi;
- 
--	NLSDIR="${PKGCONFDIR}/nls"
-+	NLSDIR="${prefix}/share/netatalk/nls"
- 
- 
- # Check whether --with-nls-dir or --without-nls-dir was given.
diff --git a/net/netatalk/patches/patch-ab b/net/netatalk/patches/patch-ab
index 6f71dc87a5b..d7b3a8cfaeb 100644
--- a/net/netatalk/patches/patch-ab
+++ b/net/netatalk/patches/patch-ab
@@ -1,19 +1,19 @@
-$NetBSD: patch-ab,v 1.5 2002/09/30 09:25:23 abs Exp $
+$NetBSD: patch-ab,v 1.6 2003/02/15 20:01:07 fredb Exp $
 
---- distrib/initscripts/Makefile.in.orig	Sun Sep  1 17:57:04 2002
+--- distrib/initscripts/Makefile.in.orig	Mon Nov 25 21:15:15 2002
 +++ distrib/initscripts/Makefile.in
-@@ -155,12 +155,12 @@ EXTRA_DIST = $(TEMPLATES) rc.atalk.cobal
- # checking for NetBSD init scripts
- #
- @USE_COBALT_TRUE@sysvdir = /etc/rc.d/init.d
--@USE_NETBSD_TRUE@sysvdir = /etc/rc.d
-+@USE_NETBSD_TRUE@sysvdir = ${prefix}/etc/rc.d
- @USE_REDHAT_TRUE@sysvdir = /etc/rc.d/init.d
+@@ -124,12 +124,12 @@ EXTRA_DIST = $(TEMPLATES) rc.atalk.cobal
  @USE_SUSE_TRUE@sysvdir = /etc/rc.d
+ @USE_COBALT_TRUE@sysvdir = /etc/rc.d/init.d
  @USE_TRU64_TRUE@sysvdir = /sbin/init.d
- @USE_COBALT_TRUE@sysv_SCRIPTS = atalk
--@USE_NETBSD_TRUE@sysv_SCRIPTS = afp atalk pap timelord
-+@USE_NETBSD_TRUE@sysv_SCRIPTS = afpd atalkd papd timelord
+-@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 = 
diff --git a/net/netatalk/patches/patch-ac b/net/netatalk/patches/patch-ac
index 3e80058dfc7..e33f31c19ad 100644
--- a/net/netatalk/patches/patch-ac
+++ b/net/netatalk/patches/patch-ac
@@ -1,9 +1,38 @@
-$NetBSD: patch-ac,v 1.6 2002/09/30 09:25:24 abs Exp $
+The original commit message for this patch:
 
---- etc/atalkd/main.c.orig	Wed Mar 13 20:50:26 2002
+    http://mail-index.netbsd.org/source-changes/1999/09/17/0023.html
+
+    Patch from Juergen Hannken-Illjes, which should solve PR#8308 (net 0 is
+    reserved for lo0, it can't be used on other interfaces).
+
+Here is PR #8308:
+
+    http://www.NetBSD.org/cgi-bin/query-pr-single.pl?number=8308
+
+and also the change that exposed the bug:
+
+    http://mail-index.netbsd.org/source-changes/1999/08/24/0035.html
+
+and finally, the discussion referred to in the above change:
+
+    http://mail-index.netbsd.org/tech-net/1999/06/30/0002.html
+    http://mail-index.netbsd.org/tech-net/1999/07/01/0005.html
+    http://mail-index.netbsd.org/tech-net/1999/07/01/0007.html
+    http://mail-index.netbsd.org/tech-net/1999/07/02/0003.html
+    http://mail-index.netbsd.org/tech-net/1999/07/02/0016.html
+    http://mail-index.netbsd.org/tech-net/1999/07/02/0017.html
+    http://mail-index.netbsd.org/tech-net/1999/07/02/0018.html
+    http://mail-index.netbsd.org/tech-net/1999/07/02/0020.html
+    http://mail-index.netbsd.org/tech-net/1999/07/02/0022.html
+    http://mail-index.netbsd.org/tech-net/1999/07/03/0004.html
+
+
+$NetBSD: patch-ac,v 1.7 2003/02/15 20:01:07 fredb Exp $
+
+--- etc/atalkd/main.c.orig	Sat Oct  5 08:20:13 2002
 +++ etc/atalkd/main.c
-@@ -274,12 +274,12 @@ void as_timer(void)
- 		    syslog( LOG_INFO, "config for no router" );
+@@ -278,12 +278,12 @@ static void as_timer(int sig)
+ 		    LOG(log_info, logtype_atalkd, "config for no router" );
  		      
  		    if ( iface->i_flags & IFACE_PHASE2 ) {
 -			iface->i_rt->rt_firstnet = 0;
@@ -16,4 +45,4 @@ $NetBSD: patch-ac,v 1.6 2002/09/30 09:25:24 abs Exp $
 +				htons(1), htons( STARTUP_LASTNET ));
  		    }
  		    if ( looproute( iface, RTMP_ADD ) ) { /* -1 or 1 */
- 			syslog( LOG_ERR,
+ 			LOG(log_error, logtype_atalkd,