>Number:         21341
>Category:       pkg
>Synopsis:       Update net/netatalk package
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sun Apr 27 12:40:00 UTC 2003
>Closed-Date:
>Last-Modified:
>Originator:     Toru TAKAMIZU
>Release:        NetBSD 1.6.1
>Organization:
>Environment:
System: NetBSD localhost 1.6.1 NetBSD 1.6.1 (MIWA) #26: Mon Mar 3 01:02:39 JST 2003 toru@localhost:/usr/src/sys/arch/i386/compile/MIWA i386
Architecture: i386
Machine: i386

>Description:

The attached patch provides the update to the latest(1.6.2) release.
This patch introduces patches/patch-af, so distinfo should be regenerated.
I did not turn on "--with-bdb=..." (this time again), because
I don't know whether the "known issues" of CNID and Berkeley DB have gone.

By tweaking Makefile in addition to patches/patch-af, I adjusted
path etc. in ${PREFIX}/libexec/etc2ps.sh. If the developer(s) think
my approach is ugly, don't hesitate to change it.

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.

>How-To-Repeat:
>Fix:

Index: Makefile
===================================================================
RCS file: /cvs/cvsroot/pkgsrc/net/netatalk/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- Makefile	2003/02/23 19:18:51	1.22
+++ Makefile	2003/04/27 11:00:57
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.22 2003/02/23 19:18:51 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/
@@ -34,6 +34,11 @@
 
 #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
Index: PLIST
===================================================================
RCS file: /cvs/cvsroot/pkgsrc/net/netatalk/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
--- PLIST	2003/02/23 19:18:51	1.4
+++ PLIST	2003/04/27 11:00:58
@@ -77,6 +77,7 @@
 lib/libatalk.la
 libexec/netatalk/afpd
 libexec/netatalk/atalkd
+libexec/netatalk/etc2ps.sh
 libexec/netatalk/ifmpap
 libexec/netatalk/ifmpaprev
 libexec/netatalk/ifpap
Index: distinfo
===================================================================
RCS file: /cvs/cvsroot/pkgsrc/net/netatalk/distinfo,v
retrieving revision 1.10
diff -u -r1.10 distinfo
--- distinfo	2003/02/23 19:18:51	1.10
+++ distinfo	2003/04/27 11:00:58
@@ -1,9 +1,10 @@
 $NetBSD: distinfo,v 1.10 2003/02/23 19:18:51 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) = 8501a4fba3513b646fa0b8d23dd7fecd0d7264a2
--- /dev/null	Sun Apr 27 20:00:19 2003
+++ patches/patch-af	Sun Apr 27 19:52:15 2003
@@ -0,0 +1,28 @@
+--- 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
>Release-Note:
>Audit-Trail:
>Unformatted: