Update to netatalk-1.6.2, uses patches contributed by Toru TAKAMIZU in

PR pkg/21341. From "NEWS":

Changes in 1.6.2
================

* FIX: atalkd: Fixes for reading long configuration file lines. [Dan Wilga]
* FIX: afpd: CNID id allocation in a multiuser environment.
* FIX: papd: Fix PSSP support when PAM is enabled.
* FIX: macusers: Can now cope with IP addresses as well as host names.
* FIX: etc2ps.sh: Install correctly.

4 files changed, 43 insertions, 6 deletions

diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index 2b554cf98b8..3146d3f1882 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2003/02/23 19:18:51 fredb Exp $
+# $NetBSD: Makefile,v 1.23 2003/04/28 04:07:45 fredb Exp $
 
-DISTNAME=	netatalk-1.6.1
+DISTNAME=	netatalk-1.6.2
 CATEGORIES=	net print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=netatalk/} \
 		http://me.in-berlin.de/~jroger/netatalk/
@@ -35,6 +35,11 @@ CONFIGURE_ARGS+=	--enable-netbsd \
 #CONFIGURE_ARGS+=	--with-flock-locks	# broken
 #CONFIGURE_ARGS+=	--with-bdb=${PREFIX}	# still some known issues
 
+post-patch:
+	mv ${WRKSRC}/etc/psf/etc2ps.sh ${WRKSRC}/etc/psf/etc2ps.sh.tmp
+	${SED} -e "s,^\(DVIPS=\)\(/usr/local/tex\)\(/bin\),\1${PREFIX}\3," \
+		< ${WRKSRC}/etc/psf/etc2ps.sh.tmp > ${WRKSRC}/etc/psf/etc2ps.sh
+
 pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/libexec/psffilters
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/netatalk
diff --git a/net/netatalk/PLIST b/net/netatalk/PLIST
index 211cfec7698..59ebc5285ed 100644
--- a/net/netatalk/PLIST
+++ b/net/netatalk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2003/02/23 19:18:51 fredb Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/04/28 04:07:45 fredb Exp $
 bin/achfile
 bin/acleandir.rc
 bin/add_netatalk_printer
@@ -77,6 +77,7 @@ lib/libatalk.a
 lib/libatalk.la
 libexec/netatalk/afpd
 libexec/netatalk/atalkd
+libexec/netatalk/etc2ps.sh
 libexec/netatalk/ifmpap
 libexec/netatalk/ifmpaprev
 libexec/netatalk/ifpap
diff --git a/net/netatalk/distinfo b/net/netatalk/distinfo
index 70ca8955b05..a4bd760bc34 100644
--- a/net/netatalk/distinfo
+++ b/net/netatalk/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.10 2003/02/23 19:18:51 fredb Exp $
+$NetBSD: distinfo,v 1.11 2003/04/28 04:07:45 fredb Exp $
 
-SHA1 (netatalk-1.6.1.tar.gz) = c8710bbe720e7e22d2b5e743c1779b68c6b15295
-Size (netatalk-1.6.1.tar.gz) = 849252 bytes
+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 (patch-ac) = 18d3bff990ddb78146d1e1d2f9e07d6826a7bfd2
 SHA1 (patch-ad) = 311d00d165688d4baa1365ba6c4147bd6293f3d8
 SHA1 (patch-ae) = 9bae8aef01e7b23fb26c9deddc53386b294d1e1c
+SHA1 (patch-af) = 997909d7cf444a2481693069864da9134ce413d4
diff --git a/net/netatalk/patches/patch-af b/net/netatalk/patches/patch-af
new file mode 100644
index 00000000000..74630a0402f
--- /dev/null
+++ b/net/netatalk/patches/patch-af
@@ -0,0 +1,30 @@
+$NetBSD: patch-af,v 1.6 2003/04/28 04:07:46 fredb Exp $
+
+--- etc/psf/etc2ps.sh.orig	Sun Apr 27 15:00:44 2003
++++ etc/psf/etc2ps.sh	Sun Apr 27 19:51:31 2003
+@@ -9,15 +9,12 @@
+ # tag in the case.
+ #
+ 
+-DVIPSPATH=/usr/local/tex/bin
+ DVIPS=/usr/local/tex/bin/dvips
+ DVIPSARGS="-f -q"
+ 
+-TROFF2PS=/usr/local/psroff/troff2/troff2ps
++TROFF2PS="groff -Tps"
+ TROFF2PSARGS="-Z -O-.10"
+ 
+-PATH=/usr/bin:$DVIPSPATH; export PATH
+-
+ case $1 in
+ 
+ #
+@@ -39,7 +36,7 @@
+ # troff2ps is from psroff by Chris Lewis.
+ #
+ tf*)
+-    if [ -x "$TROFF2PS" ]; then
++    if [ -x "/usr/bin/groff" ]; then
+ 	exec $TROFF2PS $TROFF2PSARGS
+     else
+ 	echo "$0: filter troff2ps uninstalled" 1>&2