Fixup startup script - from Toru TAKAMIZU

40 files changed, 670 insertions, 777 deletions

diff --git a/net/netatalk-asun/patches/patch-aa b/net/netatalk-asun/patches/patch-aa
index e086b1dc25e..f17cf46a923 100644
--- a/net/netatalk-asun/patches/patch-aa
+++ b/net/netatalk-asun/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2000/08/15 14:48:23 abs Exp $
+$NetBSD: patch-aa,v 1.4 2001/05/21 18:42:21 abs Exp $
 
 --- Makefile.orig	Sun Feb  7 11:15:46 1999
 +++ Makefile
diff --git a/net/netatalk-asun/patches/patch-ab b/net/netatalk-asun/patches/patch-ab
index 86d78aac599..c6627924830 100644
--- a/net/netatalk-asun/patches/patch-ab
+++ b/net/netatalk-asun/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.3 2000/08/15 14:48:23 abs Exp $
+$NetBSD: patch-ab,v 1.4 2001/05/21 18:42:21 abs Exp $
 
 --- bin/Makefile.orig	Wed Dec 30 07:30:33 1998
 +++ bin/Makefile
diff --git a/net/netatalk-asun/patches/patch-ac b/net/netatalk-asun/patches/patch-ac
index e846500d93d..2124345158e 100644
--- a/net/netatalk-asun/patches/patch-ac
+++ b/net/netatalk-asun/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2000/08/15 14:48:23 abs Exp $
+$NetBSD: patch-ac,v 1.4 2001/05/21 18:42:21 abs Exp $
 
 --- config/AppleVolumes.system.orig	Thu Feb  4 07:49:04 1999
 +++ config/AppleVolumes.system
diff --git a/net/netatalk-asun/patches/patch-ad b/net/netatalk-asun/patches/patch-ad
index 112cc16d2bc..67c00785899 100644
--- a/net/netatalk-asun/patches/patch-ad
+++ b/net/netatalk-asun/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.3 2000/08/15 14:48:23 abs Exp $
+$NetBSD: patch-ad,v 1.4 2001/05/21 18:42:21 abs Exp $
 
 --- etc/Makefile.orig	Mon Dec  7 21:52:29 1998
 +++ etc/Makefile
diff --git a/net/netatalk-asun/patches/patch-ae b/net/netatalk-asun/patches/patch-ae
index f2896fb3437..61a73f84024 100644
--- a/net/netatalk-asun/patches/patch-ae
+++ b/net/netatalk-asun/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.4 2001/04/13 19:18:13 jonb Exp $
+$NetBSD: patch-ae,v 1.5 2001/05/21 18:42:21 abs Exp $
 
---- etc/afpd/Makefile.orig	Sat Feb  6 12:02:31 1999
-+++ etc/afpd/Makefile	Wed Apr 11 23:59:46 2001
+--- etc/afpd/Makefile.orig	Sat Feb  6 20:02:31 1999
++++ etc/afpd/Makefile
 @@ -72,6 +72,7 @@
  	fi; \
  	${MAKE} ${MFLAGS} CC="${CC}" ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" \
diff --git a/net/netatalk-asun/patches/patch-af b/net/netatalk-asun/patches/patch-af
index 3a0ca365752..765febbd4c4 100644
--- a/net/netatalk-asun/patches/patch-af
+++ b/net/netatalk-asun/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.3 2000/08/15 14:48:23 abs Exp $
+$NetBSD: patch-af,v 1.4 2001/05/21 18:42:21 abs Exp $
 
 --- etc/afpd/nls/Makefile.orig	Sat Dec 12 11:01:06 1998
 +++ etc/afpd/nls/Makefile
diff --git a/net/netatalk-asun/patches/patch-ag b/net/netatalk-asun/patches/patch-ag
index 3aa4e13533e..8a2747c22c4 100644
--- a/net/netatalk-asun/patches/patch-ag
+++ b/net/netatalk-asun/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.3 2000/08/15 14:48:23 abs Exp $
+$NetBSD: patch-ag,v 1.4 2001/05/21 18:42:21 abs Exp $
 
 --- etc/afpd/status.c.orig	Wed Dec 16 18:38:38 1998
 +++ etc/afpd/status.c
diff --git a/net/netatalk-asun/patches/patch-ah b/net/netatalk-asun/patches/patch-ah
index 2cae5858af6..13d3fa27878 100644
--- a/net/netatalk-asun/patches/patch-ah
+++ b/net/netatalk-asun/patches/patch-ah
@@ -1,19 +1,13 @@
-$NetBSD: patch-ah,v 1.3 2000/08/15 14:48:23 abs Exp $
+$NetBSD: patch-ah,v 1.4 2001/05/21 18:42:21 abs Exp $
 
---- etc/atalkd/main.c.orig	Mon Jan 25 09:21:13 1999
-+++ etc/atalkd/main.c
-@@ -245,12 +245,12 @@
- 		    syslog( LOG_INFO, "config for no router" );
- 		      
- 		    if ( iface->i_flags & IFACE_PHASE2 ) {
--			iface->i_rt->rt_firstnet = 0;
-+			iface->i_rt->rt_firstnet = htons( 1 );
- 			iface->i_rt->rt_lastnet = htons( STARTUP_LASTNET );
- 			setaddr( iface, IFACE_PHASE2,
- 				iface->i_addr.sat_addr.s_net,
- 				iface->i_addr.sat_addr.s_node,
--				0, htons( STARTUP_LASTNET ));
-+				htons( 1 ), htons( STARTUP_LASTNET ));
- 		    }
- 		    if ( looproute( iface, RTMP_ADD ) ) { /* -1 or 1 */
- 			syslog( LOG_ERR,
+--- etc/atalkd/Makefile.orig	Wed Jul  9 20:51:55 1997
++++ etc/atalkd/Makefile
+@@ -23,7 +23,7 @@
+ 	    ${CPPFLAGS} -c config.c
+ 
+ install : all
+-	${INSTALL} -c atalkd ${SBINDIR}
++	${INSTALL} -c atalkd ${LIBEXECDIR}
+ 
+ clean :
+ 	rm -f a.out core* *.o *.bak *[Ee]rrs tags
diff --git a/net/netatalk-asun/patches/patch-ai b/net/netatalk-asun/patches/patch-ai
index eead3bc8218..9df626de9fc 100644
--- a/net/netatalk-asun/patches/patch-ai
+++ b/net/netatalk-asun/patches/patch-ai
@@ -1,31 +1,19 @@
-$NetBSD: patch-ai,v 1.3 2000/08/15 14:48:23 abs Exp $
+$NetBSD: patch-ai,v 1.4 2001/05/21 18:42:21 abs Exp $
 
---- etc/atalkd/nbp.c.orig	Sun Dec 13 05:22:42 1998
-+++ etc/atalkd/nbp.c
-@@ -110,7 +110,7 @@
-     nn.nn_sat.sat_port = nt.nt_port;
- 
-     /* object */
--    if ( data >= end || ( *data < 0 || *data > 32 ) || data + *data > end ) {
-+    if ( data >= end || (*(unsigned char *)data > 32 ) || data + *data > end ) {
- 	syslog( LOG_INFO, "nbp_packet: malformed packet" );
- 	return 1;
-     }
-@@ -119,7 +119,7 @@
-     data += nn.nn_objlen;
- 
-     /* type */
--    if ( data >= end || ( *data < 0 || *data > 32 ) || data + *data > end ) {
-+    if ( data >= end || (*(unsigned char *)data > 32 ) || data + *data > end ) {
- 	syslog( LOG_INFO, "nbp_packet: malformed packet" );
- 	return 1;
-     }
-@@ -128,7 +128,7 @@
-     data += nn.nn_typelen;
- 
-     /* zone */
--    if ( data >= end || ( *data < 0 || *data > 32 ) || data + *data > end ) {
-+    if ( data >= end || (*(unsigned char *)data > 32 ) || data + *data > end ) {
- 	syslog( LOG_INFO, "nbp_packet: malformed packet" );
- 	return 1;
-     }
+--- etc/atalkd/main.c.orig	Mon Jan 25 09:21:13 1999
++++ etc/atalkd/main.c
+@@ -245,12 +245,12 @@
+ 		    syslog( LOG_INFO, "config for no router" );
+ 		      
+ 		    if ( iface->i_flags & IFACE_PHASE2 ) {
+-			iface->i_rt->rt_firstnet = 0;
++			iface->i_rt->rt_firstnet = htons( 1 );
+ 			iface->i_rt->rt_lastnet = htons( STARTUP_LASTNET );
+ 			setaddr( iface, IFACE_PHASE2,
+ 				iface->i_addr.sat_addr.s_net,
+ 				iface->i_addr.sat_addr.s_node,
+-				0, htons( STARTUP_LASTNET ));
++				htons( 1 ), htons( STARTUP_LASTNET ));
+ 		    }
+ 		    if ( looproute( iface, RTMP_ADD ) ) { /* -1 or 1 */
+ 			syslog( LOG_ERR,
diff --git a/net/netatalk-asun/patches/patch-aj b/net/netatalk-asun/patches/patch-aj
index 178fd7fe4c0..dc7f48768df 100644
--- a/net/netatalk-asun/patches/patch-aj
+++ b/net/netatalk-asun/patches/patch-aj
@@ -1,21 +1,31 @@
-$NetBSD: patch-aj,v 1.4 2001/04/13 19:18:13 jonb Exp $
+$NetBSD: patch-aj,v 1.5 2001/05/21 18:42:21 abs Exp $
 
---- etc/papd/Makefile.orig	Tue May 20 10:35:42 1997
-+++ etc/papd/Makefile	Thu Apr 12 00:01:30 2001
-@@ -20,6 +20,7 @@
- 	fi; \
-         ${MAKE} ${MFLAGS} CC="${CC}" ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" \
- 	    OPTOPTS="${OPTOPTS}" DESTDIR="${DESTDIR}" \
-+	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
- 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
- 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
- 	    KRBLIBS="$${KRBLIBS}" KRBLIBDIRS="$${KRBLIBDIRS}" \
-@@ -56,7 +57,7 @@
- 	    ${CPPFLAGS} -c main.c
+--- etc/atalkd/nbp.c.orig	Sun Dec 13 05:22:42 1998
++++ etc/atalkd/nbp.c
+@@ -110,7 +110,7 @@
+     nn.nn_sat.sat_port = nt.nt_port;
  
- install : all
--	${INSTALL} -c papd ${SBINDIR}
-+	${INSTALL} -c papd ${LIBEXECDIR}
+     /* object */
+-    if ( data >= end || ( *data < 0 || *data > 32 ) || data + *data > end ) {
++    if ( data >= end || (*(unsigned char *)data > 32 ) || data + *data > end ) {
+ 	syslog( LOG_INFO, "nbp_packet: malformed packet" );
+ 	return 1;
+     }
+@@ -119,7 +119,7 @@
+     data += nn.nn_objlen;
  
- clean :
- 	rm -f a.out core* *.o *.bak *[Ee]rrs tags
+     /* type */
+-    if ( data >= end || ( *data < 0 || *data > 32 ) || data + *data > end ) {
++    if ( data >= end || (*(unsigned char *)data > 32 ) || data + *data > end ) {
+ 	syslog( LOG_INFO, "nbp_packet: malformed packet" );
+ 	return 1;
+     }
+@@ -128,7 +128,7 @@
+     data += nn.nn_typelen;
+ 
+     /* zone */
+-    if ( data >= end || ( *data < 0 || *data > 32 ) || data + *data > end ) {
++    if ( data >= end || (*(unsigned char *)data > 32 ) || data + *data > end ) {
+ 	syslog( LOG_INFO, "nbp_packet: malformed packet" );
+ 	return 1;
+     }
diff --git a/net/netatalk-asun/patches/patch-ak b/net/netatalk-asun/patches/patch-ak
index d3a01e6abf2..ff708761b90 100644
--- a/net/netatalk-asun/patches/patch-ak
+++ b/net/netatalk-asun/patches/patch-ak
@@ -1,61 +1,14 @@
-$NetBSD: patch-ak,v 1.3 2000/08/15 14:48:23 abs Exp $
+$NetBSD: patch-ak,v 1.4 2001/05/21 18:42:21 abs Exp $
 
---- etc/papd/printcap.c.orig	Fri May 30 01:27:35 1997
-+++ etc/papd/printcap.c
-@@ -158,6 +158,7 @@
- 	register int i = 0, cnt = 0;
- 	char ibuf[BUFSIZ];
- 	int tf;
-+	int skip;
+--- etc/atalkd/route.c.orig	Tue May 20 18:35:42 1997
++++ etc/atalkd/route.c
+@@ -34,7 +34,8 @@
+     u_char	sam_family;
+     u_short	sam_pad;
+     u_short	sam_mask;
+-} mask = { sizeof( struct sockaddr_m ), 0, 0, 0xffff };
++    u_short	sam_pad2;
++} mask = { sizeof( struct sockaddr_m ), 0, 0, 0xffff, 0 };
  
- 	hopcount = 0;
- 	tbuf = bp;
-@@ -176,7 +177,7 @@
- 			cp2 = getenv("TERM");
- 			if (cp2==(char *) 0 || strcmp(name,cp2)==0) {
- 				strcpy(bp,cp);
--				return(tnchktc());
-+				return(tnchktc(cap));
- 			} else {
- 				tf = open(cap, 0);
- 			}
-@@ -190,6 +191,7 @@
- #endif
- 	if (tf < 0)
- 		return (-1);
-+	skip = 0;
- 	for (;;) {
- 		cp = bp;
- 		for (;;) {
-@@ -203,12 +205,20 @@
- 			}
- 			c = ibuf[i++];
- 			if (c == '\n') {
--				if (cp > bp && cp[-1] == '\\'){
-+				if (!skip && cp > bp && cp[-1] == '\\'){
- 					cp--;
- 					continue;
- 				}
--				break;
-+				skip = 0;
-+				if (cp == bp)
-+					continue;
-+				else
-+					break;
- 			}
-+			if (c == '#' && cp == bp)
-+				skip++;
-+			if (skip)
-+				continue;
- 			if (cp >= bp+BUFSIZ) {
- 				write(2,"Termcap entry too long\n", 23);
- 				break;
-@@ -222,7 +232,7 @@
- 		 */
- 		if (tnamatch(name)) {
- 			close(tf);
--			return(tnchktc());
-+			return(tnchktc(cap));
- 		}
- 	}
- }
+ struct rt_msg_at {
+     struct rt_msghdr	rtma_rtm;
diff --git a/net/netatalk-asun/patches/patch-al b/net/netatalk-asun/patches/patch-al
index 4f79802e1c4..55f97e35b99 100644
--- a/net/netatalk-asun/patches/patch-al
+++ b/net/netatalk-asun/patches/patch-al
@@ -1,34 +1,21 @@
-$NetBSD: patch-al,v 1.3 2000/08/15 14:48:23 abs Exp $
+$NetBSD: patch-al,v 1.4 2001/05/21 18:42:21 abs Exp $
 
---- etc/psf/Makefile.orig	Thu Feb  4 06:57:52 1999
-+++ etc/psf/Makefile
-@@ -25,21 +25,21 @@
- psf.o : psf.c
- 	${CC} ${CFLAGS} -D_PATH_PAP=\"${BINDIR}/pap\" \
- 	    -D_PATH_PSORDER=\"${BINDIR}/psorder\" \
--	    -D_PATH_PSA=\"${SBINDIR}/psa\" \
--	    -D_PATH_PSFILTER=\"${SBINDIR}/etc2ps\" \
-+	    -D_PATH_PSA=\"${LIBEXECDIR}/psa\" \
-+	    -D_PATH_PSFILTER=\"${LIBEXECDIR}/etc2ps\" \
- 	    -D_PATH_PAGECOUNT=\"${RESDIR}/pagecount.ps\" \
- 	    ${CPPFLAGS} -c psf.c
+--- etc/papd/Makefile.orig	Tue May 20 18:35:42 1997
++++ etc/papd/Makefile
+@@ -20,6 +20,7 @@
+ 	fi; \
+         ${MAKE} ${MFLAGS} CC="${CC}" ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" \
+ 	    OPTOPTS="${OPTOPTS}" DESTDIR="${DESTDIR}" \
++	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+ 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+ 	    KRBLIBS="$${KRBLIBS}" KRBLIBDIRS="$${KRBLIBDIRS}" \
+@@ -56,7 +57,7 @@
+ 	    ${CPPFLAGS} -c main.c
  
  install : all
- 	-mkdir ${RESDIR}
--	-mkdir ${RESDIR}/filters
--	${INSTALL} -c psa ${SBINDIR}
--	${INSTALL} -c etc2ps.sh ${SBINDIR}/etc2ps
-+	-mkdir ${LIBEXECDIR}/psffilters
-+	${INSTALL} -c psa ${LIBEXECDIR}
-+	${INSTALL} -c etc2ps.sh ${LIBEXECDIR}/etc2ps
- 	${INSTALL} -c pagecount.ps ${RESDIR}
--	${INSTALL} -c psf ${SBINDIR}
-+	${INSTALL} -c psf ${LIBEXECDIR}
- 	for i in ${LINKS} ; do \
--	    rm -f ${RESDIR}/filters/$$i; \
--	    ln -s ${SBINDIR}/psf ${RESDIR}/filters/$$i; \
-+	    rm -f ${LIBEXECDIR}/psffilters/$$i; \
-+	    ln -s ../psf ${LIBEXECDIR}/psffilters/$$i; \
- 	done
+-	${INSTALL} -c papd ${SBINDIR}
++	${INSTALL} -c papd ${LIBEXECDIR}
  
  clean :
+ 	rm -f a.out core* *.o *.bak *[Ee]rrs tags
diff --git a/net/netatalk-asun/patches/patch-am b/net/netatalk-asun/patches/patch-am
index 4c57e6db2d9..2bbd328e512 100644
--- a/net/netatalk-asun/patches/patch-am
+++ b/net/netatalk-asun/patches/patch-am
@@ -1,13 +1,61 @@
-$NetBSD: patch-am,v 1.3 2000/08/15 14:48:23 abs Exp $
+$NetBSD: patch-am,v 1.4 2001/05/21 18:42:21 abs Exp $
 
---- include/atalk/atp.h.orig	Wed May 28 16:22:52 1997
-+++ include/atalk/atp.h
-@@ -84,7 +84,7 @@
+--- etc/papd/printcap.c.orig	Fri May 30 01:27:35 1997
++++ etc/papd/printcap.c
+@@ -158,6 +158,7 @@
+ 	register int i = 0, cnt = 0;
+ 	char ibuf[BUFSIZ];
+ 	int tf;
++	int skip;
  
- struct atpbuf {
-     struct atpbuf	*atpbuf_next;		/* next buffer in chain */
--    short		atpbuf_dlen;		/* data length <= ATP_BUFSIZ */
-+    unsigned short	atpbuf_dlen;		/* data length <= ATP_BUFSIZ */
-     struct sockaddr_at	atpbuf_addr;		/* net address sent/recvd */
-     union {
- 	char		atpbuf_data[ ATP_BUFSIZ ];	/* the data */
+ 	hopcount = 0;
+ 	tbuf = bp;
+@@ -176,7 +177,7 @@
+ 			cp2 = getenv("TERM");
+ 			if (cp2==(char *) 0 || strcmp(name,cp2)==0) {
+ 				strcpy(bp,cp);
+-				return(tnchktc());
++				return(tnchktc(cap));
+ 			} else {
+ 				tf = open(cap, 0);
+ 			}
+@@ -190,6 +191,7 @@
+ #endif
+ 	if (tf < 0)
+ 		return (-1);
++	skip = 0;
+ 	for (;;) {
+ 		cp = bp;
+ 		for (;;) {
+@@ -203,12 +205,20 @@
+ 			}
+ 			c = ibuf[i++];
+ 			if (c == '\n') {
+-				if (cp > bp && cp[-1] == '\\'){
++				if (!skip && cp > bp && cp[-1] == '\\'){
+ 					cp--;
+ 					continue;
+ 				}
+-				break;
++				skip = 0;
++				if (cp == bp)
++					continue;
++				else
++					break;
+ 			}
++			if (c == '#' && cp == bp)
++				skip++;
++			if (skip)
++				continue;
+ 			if (cp >= bp+BUFSIZ) {
+ 				write(2,"Termcap entry too long\n", 23);
+ 				break;
+@@ -222,7 +232,7 @@
+ 		 */
+ 		if (tnamatch(name)) {
+ 			close(tf);
+-			return(tnchktc());
++			return(tnchktc(cap));
+ 		}
+ 	}
+ }
diff --git a/net/netatalk-asun/patches/patch-an b/net/netatalk-asun/patches/patch-an
index db4eb219b84..d0dd738d59c 100644
--- a/net/netatalk-asun/patches/patch-an
+++ b/net/netatalk-asun/patches/patch-an
@@ -1,13 +1,34 @@
-$NetBSD: patch-an,v 1.3 2000/08/15 14:48:23 abs Exp $
+$NetBSD: patch-an,v 1.4 2001/05/21 18:42:21 abs Exp $
 
---- libatalk/asp/asp_getsess.c.orig	Thu Jan 21 20:10:25 1999
-+++ libatalk/asp/asp_getsess.c
-@@ -7,7 +7,7 @@
- #include <stdlib.h>
- #include <syslog.h>
- #include <errno.h>
--#include <sys/signal.h>
-+#include <signal.h>
- #include <sys/time.h>
- #include <sys/types.h>
- #include <sys/uio.h>
+--- etc/psf/Makefile.orig	Thu Feb  4 06:57:52 1999
++++ etc/psf/Makefile
+@@ -25,21 +25,21 @@
+ psf.o : psf.c
+ 	${CC} ${CFLAGS} -D_PATH_PAP=\"${BINDIR}/pap\" \
+ 	    -D_PATH_PSORDER=\"${BINDIR}/psorder\" \
+-	    -D_PATH_PSA=\"${SBINDIR}/psa\" \
+-	    -D_PATH_PSFILTER=\"${SBINDIR}/etc2ps\" \
++	    -D_PATH_PSA=\"${LIBEXECDIR}/psa\" \
++	    -D_PATH_PSFILTER=\"${LIBEXECDIR}/etc2ps\" \
+ 	    -D_PATH_PAGECOUNT=\"${RESDIR}/pagecount.ps\" \
+ 	    ${CPPFLAGS} -c psf.c
+ 
+ install : all
+ 	-mkdir ${RESDIR}
+-	-mkdir ${RESDIR}/filters
+-	${INSTALL} -c psa ${SBINDIR}
+-	${INSTALL} -c etc2ps.sh ${SBINDIR}/etc2ps
++	-mkdir ${LIBEXECDIR}/psffilters
++	${INSTALL} -c psa ${LIBEXECDIR}
++	${INSTALL} -c etc2ps.sh ${LIBEXECDIR}/etc2ps
+ 	${INSTALL} -c pagecount.ps ${RESDIR}
+-	${INSTALL} -c psf ${SBINDIR}
++	${INSTALL} -c psf ${LIBEXECDIR}
+ 	for i in ${LINKS} ; do \
+-	    rm -f ${RESDIR}/filters/$$i; \
+-	    ln -s ${SBINDIR}/psf ${RESDIR}/filters/$$i; \
++	    rm -f ${LIBEXECDIR}/psffilters/$$i; \
++	    ln -s ../psf ${LIBEXECDIR}/psffilters/$$i; \
+ 	done
+ 
+ clean :
diff --git a/net/netatalk-asun/patches/patch-ao b/net/netatalk-asun/patches/patch-ao
index 5f795eaa4f0..096e9b5e195 100644
--- a/net/netatalk-asun/patches/patch-ao
+++ b/net/netatalk-asun/patches/patch-ao
@@ -1,12 +1,13 @@
-$NetBSD: patch-ao,v 1.3 2000/08/15 14:48:23 abs Exp $
+$NetBSD: patch-ao,v 1.4 2001/05/21 18:42:21 abs Exp $
 
---- libatalk/atp/atp_rsel.c.orig	Thu Feb  4 07:36:30 1999
-+++ libatalk/atp/atp_rsel.c
-@@ -10,6 +10,7 @@
- #include <sys/errno.h>
- #include <sys/uio.h>
- #include <signal.h>
-+#include <string.h>
+--- include/atalk/atp.h.orig	Wed May 28 16:22:52 1997
++++ include/atalk/atp.h
+@@ -84,7 +84,7 @@
  
- #include <netatalk/endian.h>
- #include <netatalk/at.h>
+ struct atpbuf {
+     struct atpbuf	*atpbuf_next;		/* next buffer in chain */
+-    short		atpbuf_dlen;		/* data length <= ATP_BUFSIZ */
++    unsigned short	atpbuf_dlen;		/* data length <= ATP_BUFSIZ */
+     struct sockaddr_at	atpbuf_addr;		/* net address sent/recvd */
+     union {
+ 	char		atpbuf_data[ ATP_BUFSIZ ];	/* the data */
diff --git a/net/netatalk-asun/patches/patch-ap b/net/netatalk-asun/patches/patch-ap
index f6584b7547a..06484bf1e16 100644
--- a/net/netatalk-asun/patches/patch-ap
+++ b/net/netatalk-asun/patches/patch-ap
@@ -1,16 +1,35 @@
-$NetBSD: patch-ap,v 1.3 2000/08/15 14:48:23 abs Exp $
+$NetBSD: patch-ap,v 1.4 2001/05/21 18:42:21 abs Exp $
 
---- libatalk/dsi/dsi_tcp.c.orig	Wed Nov 18 07:59:25 1998
-+++ libatalk/dsi/dsi_tcp.c
-@@ -108,6 +108,11 @@
-       exit(1);
-     }
-     newact.sa_handler = timeout_handler;
-+    sigemptyset(&newact.sa_mask);
-+    newact.sa_flags = 0;
-+    oldact.sa_handler = NULL;
-+    sigemptyset(&oldact.sa_mask);
-+    oldact.sa_flags = 0;
-     if (sigaction(SIGALRM, &newact, &oldact) < 0) {
- 	syslog(LOG_ERR, "dsi_tcp_open: sigaction: %m");
- 	exit(1);
+--- include/atalk/paths.h.orig	Fri Aug 15 06:25:58 1997
++++ include/atalk/paths.h
+@@ -12,7 +12,7 @@
+ /* lock file path. this should be re-organized a bit. */
+ #ifndef _PATH_LOCKDIR
+ #ifdef BSD4_4
+-#define _PATH_LOCKDIR           "/var/spool/lock/"
++#define _PATH_LOCKDIR           "/var/run/"
+ #else
+ #ifdef linux
+ #define _PATH_LOCKDIR           "/var/lock/"
+@@ -42,18 +42,18 @@
+  */
+ #define _PATH_ATALKDEBUG	"/tmp/atalkd.debug"
+ #define _PATH_ATALKDTMP		"atalkd.tmp"
+-#define _PATH_ATALKDLOCK	ATALKPATHCAT(_PATH_LOCKDIR,"atalkd")
++#define _PATH_ATALKDLOCK	ATALKPATHCAT(_PATH_LOCKDIR,"atalkd.pid")
+ 
+ /*
+  * psorder paths
+  */
+ #define _PATH_TMPPAGEORDER	"/tmp/psorderXXXXXX"
+-#define _PATH_PAPDLOCK		ATALKPATHCAT(_PATH_LOCKDIR,"papd")
++#define _PATH_PAPDLOCK		ATALKPATHCAT(_PATH_LOCKDIR,"papd.pid")
+ 
+ /*
+  * afpd paths
+  */
+ #define _PATH_AFPTKT		"/tmp/AFPtktXXXXXX"
+-#define _PATH_AFPDLOCK		ATALKPATHCAT(_PATH_LOCKDIR,"afpd")
++#define _PATH_AFPDLOCK		ATALKPATHCAT(_PATH_LOCKDIR,"afpd.pid")
+ 
+ #endif /* atalk/paths.h */
diff --git a/net/netatalk-asun/patches/patch-aq b/net/netatalk-asun/patches/patch-aq
index a0a8fffcfe3..c1d8af69474 100644
--- a/net/netatalk-asun/patches/patch-aq
+++ b/net/netatalk-asun/patches/patch-aq
@@ -1,13 +1,13 @@
-$NetBSD: patch-aq,v 1.3 2000/08/15 14:48:23 abs Exp $
+$NetBSD: patch-aq,v 1.4 2001/05/21 18:42:21 abs Exp $
 
---- libatalk/nbp/nbp_lkup.c.orig	Thu Feb  4 07:36:14 1999
-+++ libatalk/nbp/nbp_lkup.c
+--- libatalk/asp/asp_getsess.c.orig	Thu Jan 21 20:10:25 1999
++++ libatalk/asp/asp_getsess.c
 @@ -7,7 +7,7 @@
- #include <sys/types.h>
- #include <sys/param.h>
- #include <sys/socket.h>
+ #include <stdlib.h>
+ #include <syslog.h>
+ #include <errno.h>
 -#include <sys/signal.h>
 +#include <signal.h>
  #include <sys/time.h>
- #include <netatalk/endian.h>
- #include <netatalk/at.h>
+ #include <sys/types.h>
+ #include <sys/uio.h>
diff --git a/net/netatalk-asun/patches/patch-ar b/net/netatalk-asun/patches/patch-ar
index 5f88984eec0..d0252dfde3e 100644
--- a/net/netatalk-asun/patches/patch-ar
+++ b/net/netatalk-asun/patches/patch-ar
@@ -1,13 +1,12 @@
-$NetBSD: patch-ar,v 1.3 2000/08/15 14:48:24 abs Exp $
+$NetBSD: patch-ar,v 1.4 2001/05/21 18:42:21 abs Exp $
 
---- libatalk/nbp/nbp_rgstr.c.orig	Thu Aug 14 22:27:23 1997
-+++ libatalk/nbp/nbp_rgstr.c
-@@ -7,7 +7,7 @@
- #include <sys/types.h>
- #include <sys/param.h>
- #include <sys/socket.h>
--#include <sys/signal.h>
-+#include <signal.h>
- #include <sys/time.h>
- #include <errno.h>
+--- libatalk/atp/atp_rsel.c.orig	Thu Feb  4 07:36:30 1999
++++ libatalk/atp/atp_rsel.c
+@@ -10,6 +10,7 @@
+ #include <sys/errno.h>
+ #include <sys/uio.h>
+ #include <signal.h>
++#include <string.h>
+ 
+ #include <netatalk/endian.h>
  #include <netatalk/at.h>
diff --git a/net/netatalk-asun/patches/patch-as b/net/netatalk-asun/patches/patch-as
index 28cd8b5d588..84f48e677f8 100644
--- a/net/netatalk-asun/patches/patch-as
+++ b/net/netatalk-asun/patches/patch-as
@@ -1,13 +1,16 @@
-$NetBSD: patch-as,v 1.3 2000/08/15 14:48:24 abs Exp $
+$NetBSD: patch-as,v 1.4 2001/05/21 18:42:21 abs Exp $
 
---- libatalk/nbp/nbp_unrgstr.c.orig	Thu Feb  4 07:26:41 1999
-+++ libatalk/nbp/nbp_unrgstr.c
-@@ -7,7 +7,7 @@
- #include <sys/types.h>
- #include <sys/param.h>
- #include <sys/socket.h>
--#include <sys/signal.h>
-+#include <signal.h>
- #include <sys/time.h>
- #include <errno.h>
- #include <netatalk/endian.h>
+--- libatalk/dsi/dsi_tcp.c.orig	Wed Nov 18 07:59:25 1998
++++ libatalk/dsi/dsi_tcp.c
+@@ -108,6 +108,11 @@
+       exit(1);
+     }
+     newact.sa_handler = timeout_handler;
++    sigemptyset(&newact.sa_mask);
++    newact.sa_flags = 0;
++    oldact.sa_handler = NULL;
++    sigemptyset(&oldact.sa_mask);
++    oldact.sa_flags = 0;
+     if (sigaction(SIGALRM, &newact, &oldact) < 0) {
+ 	syslog(LOG_ERR, "dsi_tcp_open: sigaction: %m");
+ 	exit(1);
diff --git a/net/netatalk-asun/patches/patch-at b/net/netatalk-asun/patches/patch-at
index ccea13192da..6c4d240552f 100644
--- a/net/netatalk-asun/patches/patch-at
+++ b/net/netatalk-asun/patches/patch-at
@@ -1,8 +1,8 @@
-$NetBSD: patch-at,v 1.3 2000/08/15 14:48:24 abs Exp $
+$NetBSD: patch-at,v 1.4 2001/05/21 18:42:21 abs Exp $
 
---- libatalk/nbp/nbp_util.c.orig	Thu Feb  4 07:27:02 1999
-+++ libatalk/nbp/nbp_util.c
-@@ -6,7 +6,7 @@
+--- libatalk/nbp/nbp_lkup.c.orig	Thu Feb  4 07:36:14 1999
++++ libatalk/nbp/nbp_lkup.c
+@@ -7,7 +7,7 @@
  #include <sys/types.h>
  #include <sys/param.h>
  #include <sys/socket.h>
diff --git a/net/netatalk-asun/patches/patch-au b/net/netatalk-asun/patches/patch-au
index 4eb55a960e2..bc826b35b9b 100644
--- a/net/netatalk-asun/patches/patch-au
+++ b/net/netatalk-asun/patches/patch-au
@@ -1,20 +1,13 @@
-$NetBSD: patch-au,v 1.3 2000/08/15 14:48:24 abs Exp $
+$NetBSD: patch-au,v 1.4 2001/05/21 18:42:21 abs Exp $
 
---- man/Makefile.orig	Tue May 20 18:35:43 1997
-+++ man/Makefile
-@@ -8,6 +8,7 @@
- ${ALL}: FRC
- 	cd $@; ${MAKE} ${MFLAGS} CC="${CC}" DEFS="${DEFS}" \
- 	    OPTOPTS="${OPTOPTS}" DESTDIR="${DESTDIR}" MANDIR="${MANDIR}" \
-+	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
- 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
- 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}"
- 
-@@ -25,6 +26,7 @@
- 	for i in ${ALL}; \
- 	    do (cd $$i; ${MAKE} ${MFLAGS} \
- 		DESTDIR="${DESTDIR}"  MANDIR="${MANDIR}" \
-+		LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
- 		SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
- 	        ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
- 		INSTALL="${INSTALL}" install); \
+--- libatalk/nbp/nbp_rgstr.c.orig	Thu Aug 14 22:27:23 1997
++++ libatalk/nbp/nbp_rgstr.c
+@@ -7,7 +7,7 @@
+ #include <sys/types.h>
+ #include <sys/param.h>
+ #include <sys/socket.h>
+-#include <sys/signal.h>
++#include <signal.h>
+ #include <sys/time.h>
+ #include <errno.h>
+ #include <netatalk/at.h>
diff --git a/net/netatalk-asun/patches/patch-av b/net/netatalk-asun/patches/patch-av
index 588df8aa0da..9f580780e71 100644
--- a/net/netatalk-asun/patches/patch-av
+++ b/net/netatalk-asun/patches/patch-av
@@ -1,19 +1,13 @@
-$NetBSD: patch-av,v 1.4 2001/02/25 14:33:31 kei Exp $
+$NetBSD: patch-av,v 1.5 2001/05/21 18:42:21 abs Exp $
 
---- man/man1/Makefile.orig	Wed May 21 02:35:43 1997
-+++ man/man1/Makefile	Sun Feb 25 23:13:06 2001
-@@ -1,4 +1,4 @@
--SRC=	aecho.1 getzones.1 nbp.1 nbplkup.1 nbprgstr.1 nbplkup.1 \
-+SRC=	aecho.1 getzones.1 nbp.1 nbplkup.1 nbprgstr.1 nbpunrgstr.1 nbplkup.1 \
- 	pap.1 papstatus.1 psorder.1 megatron.1 unhex.1 unbin.1 \
- 	unsingle.1 macbinary.1 hqx2bin.1 single2bin.1
- 
-@@ -20,6 +20,8 @@
- 		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
- 		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
- 		-e s@:INCDIR:@${INCDIR}@ \
-+		-e s@:LIBEXECDIR:@${LIBEXECDIR}@ \
-+		-e s@:EXAMPLEDIR:@${EXAMPLEDIR}@ \
- 		< $$i > ${MANDIR}/man1/$$i; \
- 	done
- 
+--- libatalk/nbp/nbp_unrgstr.c.orig	Thu Feb  4 07:26:41 1999
++++ libatalk/nbp/nbp_unrgstr.c
+@@ -7,7 +7,7 @@
+ #include <sys/types.h>
+ #include <sys/param.h>
+ #include <sys/socket.h>
+-#include <sys/signal.h>
++#include <signal.h>
+ #include <sys/time.h>
+ #include <errno.h>
+ #include <netatalk/endian.h>
diff --git a/net/netatalk-asun/patches/patch-aw b/net/netatalk-asun/patches/patch-aw
index f911cd0ba23..7e298664d46 100644
--- a/net/netatalk-asun/patches/patch-aw
+++ b/net/netatalk-asun/patches/patch-aw
@@ -1,13 +1,13 @@
-$NetBSD: patch-aw,v 1.3 2000/08/15 14:48:24 abs Exp $
+$NetBSD: patch-aw,v 1.4 2001/05/21 18:42:21 abs Exp $
 
---- man/man3/Makefile.orig	Tue May 20 18:35:43 1997
-+++ man/man3/Makefile
-@@ -18,6 +18,8 @@
- 		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
- 		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
- 		-e s@:INCDIR:@${INCDIR}@ \
-+		-e s@:LIBEXECDIR:@${LIBEXECDIR}@ \
-+		-e s@:EXAMPLEDIR:@${EXAMPLEDIR}@ \
- 		< $$i > ${MANDIR}/man3/$$i; \
- 	done
- 
+--- libatalk/nbp/nbp_util.c.orig	Thu Feb  4 07:27:02 1999
++++ libatalk/nbp/nbp_util.c
+@@ -6,7 +6,7 @@
+ #include <sys/types.h>
+ #include <sys/param.h>
+ #include <sys/socket.h>
+-#include <sys/signal.h>
++#include <signal.h>
+ #include <sys/time.h>
+ #include <netatalk/endian.h>
+ #include <netatalk/at.h>
diff --git a/net/netatalk-asun/patches/patch-ax b/net/netatalk-asun/patches/patch-ax
index bd18c8fe64f..8094c445cb2 100644
--- a/net/netatalk-asun/patches/patch-ax
+++ b/net/netatalk-asun/patches/patch-ax
@@ -1,13 +1,20 @@
-$NetBSD: patch-ax,v 1.2 2000/08/15 14:48:24 abs Exp $
+$NetBSD: patch-ax,v 1.3 2001/05/21 18:42:21 abs Exp $
 
---- man/man4/Makefile.orig	Tue May 20 18:35:43 1997
-+++ man/man4/Makefile
-@@ -17,6 +17,8 @@
- 		    -e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
- 		    -e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
- 		    -e s@:INCDIR:@${INCDIR}@ \
-+		    -e s@:LIBEXECDIR:@${LIBEXECDIR}@ \
-+		    -e s@:EXAMPLEDIR:@${EXAMPLEDIR}@ \
- 		    < $$i > ${MANDIR}/man4/$$i; \
- 	done
+--- man/Makefile.orig	Tue May 20 18:35:43 1997
++++ man/Makefile
+@@ -8,6 +8,7 @@
+ ${ALL}: FRC
+ 	cd $@; ${MAKE} ${MFLAGS} CC="${CC}" DEFS="${DEFS}" \
+ 	    OPTOPTS="${OPTOPTS}" DESTDIR="${DESTDIR}" MANDIR="${MANDIR}" \
++	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+ 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}"
  
+@@ -25,6 +26,7 @@
+ 	for i in ${ALL}; \
+ 	    do (cd $$i; ${MAKE} ${MFLAGS} \
+ 		DESTDIR="${DESTDIR}"  MANDIR="${MANDIR}" \
++		LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 		SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+ 	        ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+ 		INSTALL="${INSTALL}" install); \
diff --git a/net/netatalk-asun/patches/patch-ay b/net/netatalk-asun/patches/patch-ay
index 8f359cf58d3..99b38399c71 100644
--- a/net/netatalk-asun/patches/patch-ay
+++ b/net/netatalk-asun/patches/patch-ay
@@ -1,13 +1,19 @@
-$NetBSD: patch-ay,v 1.2 2000/08/15 14:48:24 abs Exp $
+$NetBSD: patch-ay,v 1.3 2001/05/21 18:42:21 abs Exp $
 
---- man/man8/Makefile.orig	Tue May 20 18:35:43 1997
-+++ man/man8/Makefile
-@@ -18,6 +18,8 @@
+--- man/man1/Makefile.orig	Tue May 20 18:35:43 1997
++++ man/man1/Makefile
+@@ -1,4 +1,4 @@
+-SRC=	aecho.1 getzones.1 nbp.1 nbplkup.1 nbprgstr.1 nbplkup.1 \
++SRC=	aecho.1 getzones.1 nbp.1 nbplkup.1 nbprgstr.1 nbpunrgstr.1 nbplkup.1 \
+ 	pap.1 papstatus.1 psorder.1 megatron.1 unhex.1 unbin.1 \
+ 	unsingle.1 macbinary.1 hqx2bin.1 single2bin.1
+ 
+@@ -20,6 +20,8 @@
  		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
  		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
  		-e s@:INCDIR:@${INCDIR}@ \
 +		-e s@:LIBEXECDIR:@${LIBEXECDIR}@ \
 +		-e s@:EXAMPLEDIR:@${EXAMPLEDIR}@ \
- 		< $$i > ${MANDIR}/man8/$$i; \
+ 		< $$i > ${MANDIR}/man1/$$i; \
  	done
  
diff --git a/net/netatalk-asun/patches/patch-az b/net/netatalk-asun/patches/patch-az
index e1729e52602..999595d3166 100644
--- a/net/netatalk-asun/patches/patch-az
+++ b/net/netatalk-asun/patches/patch-az
@@ -1,19 +1,13 @@
-$NetBSD: patch-az,v 1.2 2000/08/15 14:48:24 abs Exp $
+$NetBSD: patch-az,v 1.3 2001/05/21 18:42:21 abs Exp $
 
---- man/man8/psf.8.orig	Tue May 20 18:35:43 1997
-+++ man/man8/psf.8
-@@ -93,10 +93,10 @@
-     :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=:LIBEXECDIR:/psffilters/ofpap:\\
-+    :if=:LIBEXECDIR:/psffilters/ifpaprev:\\
-+    :tf=:LIBEXECDIR:/psffilters/tfpaprev:\\
-+    :df=:LIBEXECDIR:/psffilters/dfpaprev:
- .fi
- .RE
- .sp
+--- man/man3/Makefile.orig	Tue May 20 18:35:43 1997
++++ man/man3/Makefile
+@@ -18,6 +18,8 @@
+ 		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
+ 		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
+ 		-e s@:INCDIR:@${INCDIR}@ \
++		-e s@:LIBEXECDIR:@${LIBEXECDIR}@ \
++		-e s@:EXAMPLEDIR:@${EXAMPLEDIR}@ \
+ 		< $$i > ${MANDIR}/man3/$$i; \
+ 	done
+ 
diff --git a/net/netatalk-asun/patches/patch-ba b/net/netatalk-asun/patches/patch-ba
index 966a728ebc1..fea7ef5a9bb 100644
--- a/net/netatalk-asun/patches/patch-ba
+++ b/net/netatalk-asun/patches/patch-ba
@@ -1,109 +1,13 @@
-$NetBSD: patch-ba,v 1.3 2001/04/13 19:18:13 jonb Exp $
+$NetBSD: patch-ba,v 1.4 2001/05/21 18:42:21 abs Exp $
 
---- rc.atalk.bsd.orig	Mon Aug 25 15:00:54 1997
-+++ rc.atalk.bsd	Fri Apr 13 10:35:59 2001
-@@ -1,39 +1,71 @@
-+#!/bin/sh
-+#
-+# $NetBSD: patch-ba,v 1.3 2001/04/13 19:18:13 jonb Exp $
-+#
-+# PROVIDE: atalkd
-+# REQUIRE: DAEMON
- #
- # AppleTalk daemons. Make sure not to start atalkd in the background:
- # its data structures must have time to stablize before running the
- # other processes.
- #
+--- man/man4/Makefile.orig	Tue May 20 18:35:43 1997
++++ man/man4/Makefile
+@@ -17,6 +17,8 @@
+ 		    -e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
+ 		    -e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
+ 		    -e s@:INCDIR:@${INCDIR}@ \
++		    -e s@:LIBEXECDIR:@${LIBEXECDIR}@ \
++		    -e s@:EXAMPLEDIR:@${EXAMPLEDIR}@ \
+ 		    < $$i > ${MANDIR}/man4/$$i; \
+ 	done
  
--#
--# SUNOS: UNCOMMENT THESE LINES TO LOAD THE KERNEL MODULE.  Note that
--# modunload-ing netatalk may cause your machine to panic or hang.
--#
--##echo -n 'loading netatalk: '
--##if [ -f :ETCDIR:/netatalk.o ]; then
--##	/usr/etc/modload -sym :ETCDIR:/netatalk.o;
--##fi
--
--echo -n 'starting appletalk daemons:'
--if [ -x :SBINDIR:/atalkd ]; then
--	:SBINDIR:/atalkd;		echo -n ' atalkd'
--fi
--
--if [ -x :BINDIR:/nbprgstr ]; then
--	:BINDIR:/nbprgstr -p 4 `hostname|sed 's/\..*$//'`:Workstation
--	:BINDIR:/nbprgstr -p 4 `hostname|sed 's/\..*$//'`:netatalk
--					echo -n ' nbprgstr'
--fi
--
--if [ -x :SBINDIR:/papd ]; then
--	:SBINDIR:/papd;		echo -n ' papd'
--fi
--
--if [ -x :SBINDIR:/afpd ]; then
--	:SBINDIR:/afpd;		echo -n ' afpd'
--fi
--
--if [ -x :SBINDIR:/timelord ]; then
--	:SBINDIR:/timelord;		echo -n ' timelord'
--fi
--
--					echo '.'
-+papd=:LIBEXECDIR:/papd
-+afpd=:LIBEXECDIR:/afpd
-+atalkd=:LIBEXECDIR:/atalkd
-+register=:BINDIR:/nbprgstr
-+
-+piddir=/var/run/
-+machine_name=`hostname -s |sed 's/\..*$//'`
-+afpd_args=
-+papd_args=
-+atalkd_args=
-+
-+cmd=${1:-start}
-+
-+case ${cmd} in
-+start)
-+	if [ -x ${atalkd} ]; then
-+		echo  'Starting atalkd.'
-+		${atalkd} ${atalkd_args}
-+	fi
-+
-+	if [ -x ${register} ]; then
-+		${register} -p 4 ${machine_name}:Workstation
-+		${register} -p 4 ${machine_name}:netatalk
-+	fi
-+
-+	if [ -x ${papd} -a :ETCDIR:/papd.conf ]; then
-+		echo  'Starting papd.'
-+		${papd} ${papd_args}
-+	fi
-+
-+	if [ -x ${afpd} -a :ETCDIR:/AppleVolumes.system ]; then
-+		echo  'Starting afpd.'
-+		${afpd} ${afpd_args}
-+	fi
-+	;;
-+stop)
-+	if [ -f ${piddir}afpd.pid ]; then
-+		echo "Stopping afpd."
-+		kill `cat ${piddir}afpd.pid`
-+	fi
-+	if [ -f ${piddir}papd.pid ]; then
-+		echo "Stopping papd."
-+		kill `cat ${piddir}papd.pid`
-+	fi
-+	if [ -f ${piddir}atalkd.pid ]; then
-+		echo "Stopping atalkd."
-+		kill `cat ${piddir}atalkd.pid`
-+	fi
-+	;;
-+restart)
-+	( $0 stop )
-+	sleep 5
-+	$0 start
-+	;;
-+*)
-+	echo "Unexpected argument: ${cmd}"
-+	;;
-+esac
-+exit 0
diff --git a/net/netatalk-asun/patches/patch-bb b/net/netatalk-asun/patches/patch-bb
index 7b0b96d6c25..b9235228edd 100644
--- a/net/netatalk-asun/patches/patch-bb
+++ b/net/netatalk-asun/patches/patch-bb
@@ -1,33 +1,13 @@
-$NetBSD: patch-bb,v 1.2 2000/08/15 14:48:24 abs Exp $
+$NetBSD: patch-bb,v 1.3 2001/05/21 18:42:21 abs Exp $
 
---- sys/freebsd/Makefile.orig	Thu Feb  4 07:38:12 1999
-+++ sys/freebsd/Makefile
-@@ -20,6 +20,7 @@
- ${ALL}:	FRC
- 	cd $@; ${MAKE} ${MFLAGS} CC="${CC}" \
- 	    ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
-+	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
- 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
- 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
- 	    DESTDIR="${DESTDIR}" AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" \
-@@ -29,9 +30,11 @@
- 
- install :
- 	-mkdir ${DESTDIR} ${SBINDIR} ${BINDIR} ${ETCDIR} ${LIBDIR}
-+	-mkdir ${LIBEXECDIR} ${EXAMPLEDIR}
- 	for i in ${ALL}; \
- 	    do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \
- 		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
-+		LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
- 	        SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
- 	        ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
- 		AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" AFPLIBS="${AFPLIBS}" \
-@@ -42,6 +45,8 @@
+--- man/man8/Makefile.orig	Tue May 20 18:35:43 1997
++++ man/man8/Makefile
+@@ -18,6 +18,8 @@
  		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
  		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
  		-e s@:INCDIR:@${INCDIR}@ \
 +		-e s@:LIBEXECDIR:@${LIBEXECDIR}@ \
 +		-e s@:EXAMPLEDIR:@${EXAMPLEDIR}@ \
- 	    < ../../rc.atalk.bsd > ${ETCDIR}/rc.atalk
- 	@echo
- 	@echo "Install is done.  Don't forget to add lines from"
+ 		< $$i > ${MANDIR}/man8/$$i; \
+ 	done
+ 
diff --git a/net/netatalk-asun/patches/patch-bc b/net/netatalk-asun/patches/patch-bc
index b2c6cf3b7d1..384585f3da6 100644
--- a/net/netatalk-asun/patches/patch-bc
+++ b/net/netatalk-asun/patches/patch-bc
@@ -1,37 +1,13 @@
-$NetBSD: patch-bc,v 1.2 2000/08/15 14:48:24 abs Exp $
+$NetBSD: patch-bc,v 1.3 2001/05/21 18:42:21 abs Exp $
 
---- sys/linux/Makefile.orig	Sat Feb 27 21:10:59 1999
-+++ sys/linux/Makefile
-@@ -23,6 +23,7 @@
- ${ALL}:	FRC
- 	cd $@; ${MAKE} ${MFLAGS} CC="${CC}" \
- 	    ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
-+	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
- 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
- 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
- 	    DESTDIR="${DESTDIR}" AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" \
-@@ -40,6 +41,8 @@
- 	sed -e s@:DESTDIR:@${DESTDIR}@ -e s@:SBINDIR:@${SBINDIR}@ \
- 		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
- 		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
-+		-e s@:LIBEXECDIR:@${LIBEXECDIR}@ \
-+		-e s@:EXAMPLEDIR:@${EXAMPLEDIR}@ \
- 		-e s@:INCDIR:@${INCDIR}@ \
- 		< ../../rc.atalk.redhat > /etc/rc.d/init.d/atalk.init; \
- 	sed -e s@:RCDIR:@/etc/rc.d/init.d@ \
-@@ -62,12 +65,15 @@
- 		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
- 		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
- 		-e s@:INCDIR:@${INCDIR}@ \
-+		-e s@:LIBEXECDIR:@${LIBEXECDIR}@ \
-+		-e s@:EXAMPLEDIR:@${EXAMPLEDIR}@ \
- 		< ../../rc.atalk.bsd > ${ETCDIR}/rc.atalk; \
- 	fi \
- 	fi
- 
- install : ${ETCDIR} install-sysv install-bsd
- 	-mkdir ${DESTDIR} ${SBINDIR} ${BINDIR} ${LIBDIR}
-+	-mkdir ${LIBEXECDIR} ${EXAMPLEDIR}
- 	for i in ${ALL}; \
- 	    do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \
- 		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
+--- man/man8/afpd.8.orig	Tue May 20 18:35:43 1997
++++ man/man8/afpd.8
+@@ -2,7 +2,7 @@
+ .SH NAME
+ afpd \- AppleTalk Filing Protocol daemon
+ .SH SYNOPSIS
+-.B :SBINDIR:/afpd
++.B :LIBEXECDIR:/afpd
+ [
+ .B -d
+ ]
diff --git a/net/netatalk-asun/patches/patch-bd b/net/netatalk-asun/patches/patch-bd
index 235e50de53d..c10e959d037 100644
--- a/net/netatalk-asun/patches/patch-bd
+++ b/net/netatalk-asun/patches/patch-bd
@@ -1,71 +1,13 @@
-$NetBSD: patch-bd,v 1.3 2001/01/26 05:21:46 hubertf Exp $
+$NetBSD: patch-bd,v 1.4 2001/05/21 18:42:21 abs Exp $
 
---- sys/netbsd/Makefile.orig	Thu Feb  4 07:30:30 1999
-+++ sys/netbsd/Makefile
-@@ -1,10 +1,10 @@
- # NetBSD specific defines, passed to subdirectories.
- DEFS=	-DBSD4_4
--OPTOPTS=	-O2
--CC=	gcc -I../../sys/netbsd/ -I/usr/include/kerberosIV
-+OPTOPTS=	-Werror -I../../sys/netbsd/
-+#CC=	gcc -I../../sys/netbsd/ -I/usr/include/kerberosIV
- INSTALL=	install
- AFPLIBS = 	-lcrypt -lrpcsvc
--ADDLIBS =
-+ADDLIBS=	-Wl,-R${LIBDIR}
- 
- ALL=	../../libatalk ../../include ../../bin ../../etc ../../man
- 
-@@ -19,6 +19,7 @@
- ${ALL}:	FRC
- 	cd $@; ${MAKE} ${MFLAGS} CC="${CC}" \
- 	    ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
-+	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
- 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
- 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
- 	    AFPLIBS="${AFPLIBS}" \
-@@ -28,30 +29,34 @@
- 
- install :
- 	-mkdir ${DESTDIR} ${SBINDIR} ${BINDIR} ${ETCDIR} ${LIBDIR}
-+	-mkdir ${LIBEXECDIR} ${EXAMPLEDIR} ${RCDIR}
- 	for i in ${ALL}; \
- 	    do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \
- 		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
-+		LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
- 	        SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
- 	        ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
- 		AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" AFPLIBS="${AFPLIBS}" \
- 		INSTALL="${INSTALL}" $@); \
- 	done
--	rm -f ${ETCDIR}/rc.atalk
-+	for i in `ls ../../config`; \
-+		do ${INSTALL} -c ../../config/$$i ${EXAMPLEDIR}; \
-+	done
-+	rm -f ${RCDIR}/netatalk
- 	sed -e s@:DESTDIR:@${DESTDIR}@ -e s@:SBINDIR:@${SBINDIR}@ \
- 		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
- 		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
- 		-e s@:INCDIR:@${INCDIR}@ \
--	    < ../../rc.atalk.bsd > ${ETCDIR}/rc.atalk
-+		-e s@:LIBEXECDIR:@${LIBEXECDIR}@ \
-+		-e s@:EXAMPLEDIR:@${EXAMPLEDIR}@ \
-+	    < ../../rc.atalk.bsd > ${RCDIR}/netatalk
-+	chmod 755 ${RCDIR}/netatalk
-+	@echo "Install is done."
- 	@echo
--	@echo "Install is done.  You might need to add services from"
--	@echo "services.atalk to /etc/services. The ddp services need to be"
--	@echo "added for NetBSD versions earlier than 1.3, and the AFP over"
--	@echo "TCP services need to be added for NetBSD 1.3.X, and for"
--	@echo "1.3-current dated June 27, 1998 and earlier."
-+	@echo "Example configuration files are in ${EXAMPLEDIR}."
- 	@echo
--	@echo "Don't forget to call rc.atalk in /etc/rc.local.  See README"
--	@echo "and README.NETBSD for more information."
--
-+	@echo "Don't forget to call ${RCDIR}/netatalk in /etc/rc.local."
-+	@echo "See README.NETBSD for kernel configuration information."
- clean :
- 	for i in ${ALL}; \
- 	    do (cd $$i; ${MAKE} ${MFLAGS} clean); \
+--- man/man8/atalkd.8.orig	Thu Feb  4 07:28:28 1999
++++ man/man8/atalkd.8
+@@ -2,7 +2,7 @@
+ .SH NAME
+ atalkd \- AppleTalk RTMP, NBP, ZIP, and AEP manager
+ .SH SYNOPSIS
+-.B :SBINDIR:/atalkd
++.B :LIBEXECDIR:/atalkd
+ [
+ .B -f
+ .I configfile
diff --git a/net/netatalk-asun/patches/patch-be b/net/netatalk-asun/patches/patch-be
index 9ed8a94e6d2..9426b6e74f2 100644
--- a/net/netatalk-asun/patches/patch-be
+++ b/net/netatalk-asun/patches/patch-be
@@ -1,33 +1,13 @@
-$NetBSD: patch-be,v 1.2 2000/08/15 14:48:24 abs Exp $
+$NetBSD: patch-be,v 1.3 2001/05/21 18:42:21 abs Exp $
 
---- sys/openbsd/Makefile.orig	Mon Feb 22 23:02:31 1999
-+++ sys/openbsd/Makefile
-@@ -19,6 +19,7 @@
- ${ALL}:	FRC
- 	cd $@; ${MAKE} ${MFLAGS} CC="${CC}" \
- 	    ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
-+	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
- 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
- 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
- 	    AFPLIBS="${AFPLIBS}" \
-@@ -28,9 +29,11 @@
- 
- install :
- 	-mkdir ${DESTDIR} ${SBINDIR} ${BINDIR} ${ETCDIR} ${LIBDIR}
-+	-mkdir ${LIBEXECDIR} ${EXAMPLEDIR}
- 	for i in ${ALL}; \
- 	    do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \
- 		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
-+		LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
- 	        SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
- 	        ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
- 		AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" AFPLIBS="${AFPLIBS}" \
-@@ -41,6 +44,8 @@
- 		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
- 		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
- 		-e s@:INCDIR:@${INCDIR}@ \
-+		-e s@:LIBEXECDIR:@${LIBEXECDIR}@ \
-+		-e s@:EXAMPLEDIR:@${EXAMPLEDIR}@ \
- 	    < ../../rc.atalk.bsd > ${ETCDIR}/rc.atalk
- 	@echo
- 	@echo "Install is done.  Don't forget to add lines from"
+--- man/man8/papd.tbl.orig	Tue May 20 18:35:43 1997
++++ man/man8/papd.tbl
+@@ -3,7 +3,7 @@
+ .SH NAME
+ papd \- AppleTalk print server daemon
+ .SH SYNOPSIS
+-.B :SBINDIR:/papd
++.B :LIBEXECDIR:/papd
+ [
+ .B -d
+ ] [
diff --git a/net/netatalk-asun/patches/patch-bf b/net/netatalk-asun/patches/patch-bf
index c9bf23f9798..940d2332f16 100644
--- a/net/netatalk-asun/patches/patch-bf
+++ b/net/netatalk-asun/patches/patch-bf
@@ -1,43 +1,19 @@
-$NetBSD: patch-bf,v 1.3 2000/08/15 14:48:24 abs Exp $
+$NetBSD: patch-bf,v 1.4 2001/05/21 18:42:21 abs Exp $
 
---- sys/solaris/Makefile.orig	Wed Feb  3 19:52:10 1999
-+++ sys/solaris/Makefile
-@@ -48,6 +48,7 @@
- 	esac; \
- 	echo "Making $@ for $$PROCESSOR..."; \
- 	${MAKE} ${MFLAGS} \
-+	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
- 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}"\
- 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
- 	    MANDIR="${MANDIR}" DESTDIR="${DESTDIR}" AFSDIR="${AFSDIR}" \
-@@ -67,6 +68,7 @@
- ${ALL}:	FRC
- 	cd $@; ${MAKE} ${MFLAGS} CC="${CC}" \
- 	    ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
-+	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
- 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
- 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
- 	    DESTDIR="${DESTDIR}" AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" \
-@@ -91,6 +93,8 @@
- 		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
- 		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
- 		-e s@:INCDIR:@${INCDIR}@ \
-+		-e s@:LIBEXECDIR:@${LIBEXECDIR}@ \
-+		-e s@:EXAMPLEDIR:@${EXAMPLEDIR}@ \
- 	    < ../../rc.atalk.sysv > /etc/init.d/atalk
- 	chmod 744 /etc/init.d/atalk
- 	-ln -s ../init.d/atalk /etc/rc2.d/S79atalk
-@@ -98,11 +102,13 @@
- 
- install :
- 	-mkdir ${DESTDIR} ${SBINDIR} ${BINDIR} ${ETCDIR} ${LIBDIR}
-+	-mkdir ${LIBEXECDIR} ${EXAMPLEDIR}
- 	sed -e s@:BINDIR:@${BINDIR}@ < ../../lp2pap.sh > ${RESDIR}/lp2pap.sh
- 	chmod 744 ${RESDIR}/lp2pap.sh
- 	for i in ${ALL}; \
- 	    do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \
- 		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
-+		LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
- 	        SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
- 	        ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
- 		AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" \
+--- man/man8/psf.8.orig	Tue May 20 18:35:43 1997
++++ man/man8/psf.8
+@@ -93,10 +93,10 @@
+     :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=:LIBEXECDIR:/psffilters/ofpap:\\
++    :if=:LIBEXECDIR:/psffilters/ifpaprev:\\
++    :tf=:LIBEXECDIR:/psffilters/tfpaprev:\\
++    :df=:LIBEXECDIR:/psffilters/dfpaprev:
+ .fi
+ .RE
+ .sp
diff --git a/net/netatalk-asun/patches/patch-bg b/net/netatalk-asun/patches/patch-bg
index 8ebf2c39e75..41679bd58a1 100644
--- a/net/netatalk-asun/patches/patch-bg
+++ b/net/netatalk-asun/patches/patch-bg
@@ -1,34 +1 @@
-$NetBSD: patch-bg,v 1.3 2000/08/15 14:48:24 abs Exp $
-
---- sys/sunos/Makefile.orig	Fri Sep 18 04:20:15 1998
-+++ sys/sunos/Makefile
-@@ -51,6 +51,7 @@
- ${ALL}:	FRC
- 	cd $@; ${MAKE} ${MFLAGS} CC="${CC}" \
- 	    ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
-+	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
- 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
- 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
- 	    AFPLIBS="${AFPLIBS}" \
-@@ -69,9 +70,12 @@
- 	-mkdir ${BINDIR}
- 	-mkdir ${ETCDIR}
- 	-mkdir ${LIBDIR}
-+	-mkdir ${LIBEXECDIR}
-+	-mkdir ${EXAMPLEDIR}
- 	for i in ${ALL}; \
- 	    do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \
- 		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
-+		LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
- 	        SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
- 	        ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
- 		DESTDIR="${DESTDIR}" MANDIR="${MANDIR}" AFPLIBS="${AFPLIBS}" \
-@@ -83,6 +87,8 @@
- 		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
- 		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
- 		-e s@:INCDIR:@${INCDIR}@ -e 's@^##@@' \
-+		-e s@:LIBEXECDIR:@${LIBEXECDIR}@ \
-+		-e s@:EXAMPLEDIR:@${EXAMPLEDIR}@ \
- 	    < ../../rc.atalk.bsd > ${ETCDIR}/rc.atalk
- 	@echo
- 	@echo "Install is done.  Don't forget to add lines from"
+Cannot strip away RCS IDs, please handle manually!
diff --git a/net/netatalk-asun/patches/patch-bh b/net/netatalk-asun/patches/patch-bh
index 9439db51f71..7afd19fd2d4 100644
--- a/net/netatalk-asun/patches/patch-bh
+++ b/net/netatalk-asun/patches/patch-bh
@@ -1,29 +1,33 @@
-$NetBSD: patch-bh,v 1.3 2000/08/15 14:48:24 abs Exp $
+$NetBSD: patch-bh,v 1.4 2001/05/21 18:42:21 abs Exp $
 
---- sys/ultrix/Makefile.orig	Thu Feb  4 07:30:55 1999
-+++ sys/ultrix/Makefile
-@@ -24,6 +24,7 @@
+--- sys/freebsd/Makefile.orig	Thu Feb  4 07:38:12 1999
++++ sys/freebsd/Makefile
+@@ -20,6 +20,7 @@
  ${ALL}:	FRC
  	cd $@; ${MAKE} ${MFLAGS} CC="${CC}" \
  	    ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
 +	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
  	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
  	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
- 	    AFPLIBS="${AFPLIBS}" \
-@@ -36,6 +37,7 @@
+ 	    DESTDIR="${DESTDIR}" AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" \
+@@ -29,9 +30,11 @@
+ 
+ install :
+ 	-mkdir ${DESTDIR} ${SBINDIR} ${BINDIR} ${ETCDIR} ${LIBDIR}
++	-mkdir ${LIBEXECDIR} ${EXAMPLEDIR}
  	for i in ${ALL}; \
  	    do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \
  		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
 +		LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
  	        SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
  	        ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
- 		DESTDIR="${DESTDIR}" MANDIR="${MANDIR}" \
-@@ -46,6 +48,8 @@
- 	sed -e s@:DESTDIR:@${DESTDIR}@ -e s@:SBINDIR:@${SBINDIR}@ \
+ 		AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" AFPLIBS="${AFPLIBS}" \
+@@ -42,6 +45,8 @@
  		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
  		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
+ 		-e s@:INCDIR:@${INCDIR}@ \
 +		-e s@:LIBEXECDIR:@${LIBEXECDIR}@ \
 +		-e s@:EXAMPLEDIR:@${EXAMPLEDIR}@ \
- 		-e s@:INCDIR:@${INCDIR}@ \
  	    < ../../rc.atalk.bsd > ${ETCDIR}/rc.atalk
  	@echo
+ 	@echo "Install is done.  Don't forget to add lines from"
diff --git a/net/netatalk-asun/patches/patch-bi b/net/netatalk-asun/patches/patch-bi
index a8079afb761..87cea73cf1b 100644
--- a/net/netatalk-asun/patches/patch-bi
+++ b/net/netatalk-asun/patches/patch-bi
@@ -1,13 +1,37 @@
-$NetBSD: patch-bi,v 1.3 2000/10/18 03:59:33 briggs Exp $
---- etc/atalkd/route.c.orig	Tue Oct 17 23:29:04 2000
-+++ etc/atalkd/route.c	Tue Oct 17 23:30:19 2000
-@@ -34,7 +34,8 @@
-     u_char	sam_family;
-     u_short	sam_pad;
-     u_short	sam_mask;
--} mask = { sizeof( struct sockaddr_m ), 0, 0, 0xffff };
-+    u_short	sam_pad2;
-+} mask = { sizeof( struct sockaddr_m ), 0, 0, 0xffff, 0 };
+$NetBSD: patch-bi,v 1.4 2001/05/21 18:42:22 abs Exp $
+
+--- sys/linux/Makefile.orig	Sat Feb 27 21:10:59 1999
++++ sys/linux/Makefile
+@@ -23,6 +23,7 @@
+ ${ALL}:	FRC
+ 	cd $@; ${MAKE} ${MFLAGS} CC="${CC}" \
+ 	    ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
++	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+ 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+ 	    DESTDIR="${DESTDIR}" AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" \
+@@ -40,6 +41,8 @@
+ 	sed -e s@:DESTDIR:@${DESTDIR}@ -e s@:SBINDIR:@${SBINDIR}@ \
+ 		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
+ 		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
++		-e s@:LIBEXECDIR:@${LIBEXECDIR}@ \
++		-e s@:EXAMPLEDIR:@${EXAMPLEDIR}@ \
+ 		-e s@:INCDIR:@${INCDIR}@ \
+ 		< ../../rc.atalk.redhat > /etc/rc.d/init.d/atalk.init; \
+ 	sed -e s@:RCDIR:@/etc/rc.d/init.d@ \
+@@ -62,12 +65,15 @@
+ 		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
+ 		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
+ 		-e s@:INCDIR:@${INCDIR}@ \
++		-e s@:LIBEXECDIR:@${LIBEXECDIR}@ \
++		-e s@:EXAMPLEDIR:@${EXAMPLEDIR}@ \
+ 		< ../../rc.atalk.bsd > ${ETCDIR}/rc.atalk; \
+ 	fi \
+ 	fi
  
- struct rt_msg_at {
-     struct rt_msghdr	rtma_rtm;
+ install : ${ETCDIR} install-sysv install-bsd
+ 	-mkdir ${DESTDIR} ${SBINDIR} ${BINDIR} ${LIBDIR}
++	-mkdir ${LIBEXECDIR} ${EXAMPLEDIR}
+ 	for i in ${ALL}; \
+ 	    do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \
+ 		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
diff --git a/net/netatalk-asun/patches/patch-bj b/net/netatalk-asun/patches/patch-bj
index c75383a7658..03cf87928f0 100644
--- a/net/netatalk-asun/patches/patch-bj
+++ b/net/netatalk-asun/patches/patch-bj
@@ -1,35 +1,71 @@
-$NetBSD: patch-bj,v 1.1 2001/04/13 19:18:13 jonb Exp $
+$NetBSD: patch-bj,v 1.2 2001/05/21 18:42:22 abs Exp $
 
---- include/atalk/paths.h.orig	Wed Apr 11 23:51:32 2001
-+++ include/atalk/paths.h	Wed Apr 11 23:52:17 2001
-@@ -12,7 +12,7 @@
- /* lock file path. this should be re-organized a bit. */
- #ifndef _PATH_LOCKDIR
- #ifdef BSD4_4
--#define _PATH_LOCKDIR           "/var/spool/lock/"
-+#define _PATH_LOCKDIR           "/var/run/"
- #else
- #ifdef linux
- #define _PATH_LOCKDIR           "/var/lock/"
-@@ -42,18 +42,18 @@
-  */
- #define _PATH_ATALKDEBUG	"/tmp/atalkd.debug"
- #define _PATH_ATALKDTMP		"atalkd.tmp"
--#define _PATH_ATALKDLOCK	ATALKPATHCAT(_PATH_LOCKDIR,"atalkd")
-+#define _PATH_ATALKDLOCK	ATALKPATHCAT(_PATH_LOCKDIR,"atalkd.pid")
+--- sys/netbsd/Makefile.orig	Thu Feb  4 07:30:30 1999
++++ sys/netbsd/Makefile
+@@ -1,10 +1,10 @@
+ # NetBSD specific defines, passed to subdirectories.
+ DEFS=	-DBSD4_4
+-OPTOPTS=	-O2
+-CC=	gcc -I../../sys/netbsd/ -I/usr/include/kerberosIV
++OPTOPTS=	-Werror -I../../sys/netbsd/
++#CC=	gcc -I../../sys/netbsd/ -I/usr/include/kerberosIV
+ INSTALL=	install
+ AFPLIBS = 	-lcrypt -lrpcsvc
+-ADDLIBS =
++ADDLIBS=	-Wl,-R${LIBDIR}
  
- /*
-  * psorder paths
-  */
- #define _PATH_TMPPAGEORDER	"/tmp/psorderXXXXXX"
--#define _PATH_PAPDLOCK		ATALKPATHCAT(_PATH_LOCKDIR,"papd")
-+#define _PATH_PAPDLOCK		ATALKPATHCAT(_PATH_LOCKDIR,"papd.pid")
+ ALL=	../../libatalk ../../include ../../bin ../../etc ../../man
  
- /*
-  * afpd paths
-  */
- #define _PATH_AFPTKT		"/tmp/AFPtktXXXXXX"
--#define _PATH_AFPDLOCK		ATALKPATHCAT(_PATH_LOCKDIR,"afpd")
-+#define _PATH_AFPDLOCK		ATALKPATHCAT(_PATH_LOCKDIR,"afpd.pid")
+@@ -19,6 +19,7 @@
+ ${ALL}:	FRC
+ 	cd $@; ${MAKE} ${MFLAGS} CC="${CC}" \
+ 	    ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
++	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+ 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+ 	    AFPLIBS="${AFPLIBS}" \
+@@ -28,30 +29,34 @@
  
- #endif /* atalk/paths.h */
+ install :
+ 	-mkdir ${DESTDIR} ${SBINDIR} ${BINDIR} ${ETCDIR} ${LIBDIR}
++	-mkdir ${LIBEXECDIR} ${EXAMPLEDIR} ${RCDIR}
+ 	for i in ${ALL}; \
+ 	    do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \
+ 		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
++		LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 	        SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+ 	        ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+ 		AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" AFPLIBS="${AFPLIBS}" \
+ 		INSTALL="${INSTALL}" $@); \
+ 	done
+-	rm -f ${ETCDIR}/rc.atalk
++	for i in `ls ../../config`; \
++		do ${INSTALL} -c ../../config/$$i ${EXAMPLEDIR}; \
++	done
++	rm -f ${RCDIR}/netatalk
+ 	sed -e s@:DESTDIR:@${DESTDIR}@ -e s@:SBINDIR:@${SBINDIR}@ \
+ 		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
+ 		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
+ 		-e s@:INCDIR:@${INCDIR}@ \
+-	    < ../../rc.atalk.bsd > ${ETCDIR}/rc.atalk
++		-e s@:LIBEXECDIR:@${LIBEXECDIR}@ \
++		-e s@:EXAMPLEDIR:@${EXAMPLEDIR}@ \
++	    < ../../rc.atalk.bsd > ${RCDIR}/netatalk
++	chmod 755 ${RCDIR}/netatalk
++	@echo "Install is done."
+ 	@echo
+-	@echo "Install is done.  You might need to add services from"
+-	@echo "services.atalk to /etc/services. The ddp services need to be"
+-	@echo "added for NetBSD versions earlier than 1.3, and the AFP over"
+-	@echo "TCP services need to be added for NetBSD 1.3.X, and for"
+-	@echo "1.3-current dated June 27, 1998 and earlier."
++	@echo "Example configuration files are in ${EXAMPLEDIR}."
+ 	@echo
+-	@echo "Don't forget to call rc.atalk in /etc/rc.local.  See README"
+-	@echo "and README.NETBSD for more information."
+-
++	@echo "Don't forget to call ${RCDIR}/netatalk in /etc/rc.local."
++	@echo "See README.NETBSD for kernel configuration information."
+ clean :
+ 	for i in ${ALL}; \
+ 	    do (cd $$i; ${MAKE} ${MFLAGS} clean); \
diff --git a/net/netatalk-asun/patches/patch-bk b/net/netatalk-asun/patches/patch-bk
index 505730a5e67..035aba01f20 100644
--- a/net/netatalk-asun/patches/patch-bk
+++ b/net/netatalk-asun/patches/patch-bk
@@ -1,13 +1,33 @@
-$NetBSD: patch-bk,v 1.1 2001/04/13 19:18:13 jonb Exp $
+$NetBSD: patch-bk,v 1.2 2001/05/21 18:42:22 abs Exp $
 
---- etc/atalkd/Makefile.orig	Wed Apr 11 23:56:32 2001
-+++ etc/atalkd/Makefile	Wed Apr 11 23:56:55 2001
-@@ -23,7 +23,7 @@
- 	    ${CPPFLAGS} -c config.c
+--- sys/openbsd/Makefile.orig	Mon Feb 22 23:02:31 1999
++++ sys/openbsd/Makefile
+@@ -19,6 +19,7 @@
+ ${ALL}:	FRC
+ 	cd $@; ${MAKE} ${MFLAGS} CC="${CC}" \
+ 	    ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
++	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+ 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+ 	    AFPLIBS="${AFPLIBS}" \
+@@ -28,9 +29,11 @@
  
- install : all
--	${INSTALL} -c atalkd ${SBINDIR}
-+	${INSTALL} -c atalkd ${LIBEXECDIR}
- 
- clean :
- 	rm -f a.out core* *.o *.bak *[Ee]rrs tags
+ install :
+ 	-mkdir ${DESTDIR} ${SBINDIR} ${BINDIR} ${ETCDIR} ${LIBDIR}
++	-mkdir ${LIBEXECDIR} ${EXAMPLEDIR}
+ 	for i in ${ALL}; \
+ 	    do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \
+ 		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
++		LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 	        SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+ 	        ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+ 		AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" AFPLIBS="${AFPLIBS}" \
+@@ -41,6 +44,8 @@
+ 		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
+ 		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
+ 		-e s@:INCDIR:@${INCDIR}@ \
++		-e s@:LIBEXECDIR:@${LIBEXECDIR}@ \
++		-e s@:EXAMPLEDIR:@${EXAMPLEDIR}@ \
+ 	    < ../../rc.atalk.bsd > ${ETCDIR}/rc.atalk
+ 	@echo
+ 	@echo "Install is done.  Don't forget to add lines from"
diff --git a/net/netatalk-asun/patches/patch-bl b/net/netatalk-asun/patches/patch-bl
index 0c81d4ff4f6..eaf6829b27b 100644
--- a/net/netatalk-asun/patches/patch-bl
+++ b/net/netatalk-asun/patches/patch-bl
@@ -1,13 +1,43 @@
-$NetBSD: patch-bl,v 1.1 2001/04/13 19:18:13 jonb Exp $
+$NetBSD: patch-bl,v 1.2 2001/05/21 18:42:22 abs Exp $
 
---- man/man8/afpd.8.orig	Fri Apr 13 08:36:32 2001
-+++ man/man8/afpd.8	Fri Apr 13 08:37:23 2001
-@@ -2,7 +2,7 @@
- .SH NAME
- afpd \- AppleTalk Filing Protocol daemon
- .SH SYNOPSIS
--.B :SBINDIR:/afpd
-+.B :LIBEXECDIR:/afpd
- [
- .B -d
- ]
+--- sys/solaris/Makefile.orig	Wed Feb  3 19:52:10 1999
++++ sys/solaris/Makefile
+@@ -48,6 +48,7 @@
+ 	esac; \
+ 	echo "Making $@ for $$PROCESSOR..."; \
+ 	${MAKE} ${MFLAGS} \
++	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}"\
+ 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+ 	    MANDIR="${MANDIR}" DESTDIR="${DESTDIR}" AFSDIR="${AFSDIR}" \
+@@ -67,6 +68,7 @@
+ ${ALL}:	FRC
+ 	cd $@; ${MAKE} ${MFLAGS} CC="${CC}" \
+ 	    ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
++	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+ 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+ 	    DESTDIR="${DESTDIR}" AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" \
+@@ -91,6 +93,8 @@
+ 		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
+ 		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
+ 		-e s@:INCDIR:@${INCDIR}@ \
++		-e s@:LIBEXECDIR:@${LIBEXECDIR}@ \
++		-e s@:EXAMPLEDIR:@${EXAMPLEDIR}@ \
+ 	    < ../../rc.atalk.sysv > /etc/init.d/atalk
+ 	chmod 744 /etc/init.d/atalk
+ 	-ln -s ../init.d/atalk /etc/rc2.d/S79atalk
+@@ -98,11 +102,13 @@
+ 
+ install :
+ 	-mkdir ${DESTDIR} ${SBINDIR} ${BINDIR} ${ETCDIR} ${LIBDIR}
++	-mkdir ${LIBEXECDIR} ${EXAMPLEDIR}
+ 	sed -e s@:BINDIR:@${BINDIR}@ < ../../lp2pap.sh > ${RESDIR}/lp2pap.sh
+ 	chmod 744 ${RESDIR}/lp2pap.sh
+ 	for i in ${ALL}; \
+ 	    do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \
+ 		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
++		LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 	        SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+ 	        ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+ 		AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" \
diff --git a/net/netatalk-asun/patches/patch-bm b/net/netatalk-asun/patches/patch-bm
index 1bed3b5dfc0..8654d5f8d26 100644
--- a/net/netatalk-asun/patches/patch-bm
+++ b/net/netatalk-asun/patches/patch-bm
@@ -1,13 +1,34 @@
-$NetBSD: patch-bm,v 1.1 2001/04/13 19:18:13 jonb Exp $
+$NetBSD: patch-bm,v 1.2 2001/05/21 18:42:22 abs Exp $
 
---- man/man8/atalkd.8.orig	Fri Apr 13 08:37:40 2001
-+++ man/man8/atalkd.8	Fri Apr 13 08:37:54 2001
-@@ -2,7 +2,7 @@
- .SH NAME
- atalkd \- AppleTalk RTMP, NBP, ZIP, and AEP manager
- .SH SYNOPSIS
--.B :SBINDIR:/atalkd
-+.B :LIBEXECDIR:/atalkd
- [
- .B -f
- .I configfile
+--- sys/sunos/Makefile.orig	Fri Sep 18 04:20:15 1998
++++ sys/sunos/Makefile
+@@ -51,6 +51,7 @@
+ ${ALL}:	FRC
+ 	cd $@; ${MAKE} ${MFLAGS} CC="${CC}" \
+ 	    ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
++	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+ 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+ 	    AFPLIBS="${AFPLIBS}" \
+@@ -69,9 +70,12 @@
+ 	-mkdir ${BINDIR}
+ 	-mkdir ${ETCDIR}
+ 	-mkdir ${LIBDIR}
++	-mkdir ${LIBEXECDIR}
++	-mkdir ${EXAMPLEDIR}
+ 	for i in ${ALL}; \
+ 	    do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \
+ 		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
++		LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 	        SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+ 	        ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+ 		DESTDIR="${DESTDIR}" MANDIR="${MANDIR}" AFPLIBS="${AFPLIBS}" \
+@@ -83,6 +87,8 @@
+ 		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
+ 		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
+ 		-e s@:INCDIR:@${INCDIR}@ -e 's@^##@@' \
++		-e s@:LIBEXECDIR:@${LIBEXECDIR}@ \
++		-e s@:EXAMPLEDIR:@${EXAMPLEDIR}@ \
+ 	    < ../../rc.atalk.bsd > ${ETCDIR}/rc.atalk
+ 	@echo
+ 	@echo "Install is done.  Don't forget to add lines from"
diff --git a/net/netatalk-asun/patches/patch-bn b/net/netatalk-asun/patches/patch-bn
index 1be9afe463a..df9368e2ff7 100644
--- a/net/netatalk-asun/patches/patch-bn
+++ b/net/netatalk-asun/patches/patch-bn
@@ -1,13 +1,29 @@
-$NetBSD: patch-bn,v 1.1 2001/04/13 19:18:14 jonb Exp $
+$NetBSD: patch-bn,v 1.2 2001/05/21 18:42:22 abs Exp $
 
---- man/man8/papd.tbl.orig	Fri Apr 13 08:36:48 2001
-+++ man/man8/papd.tbl	Fri Apr 13 08:37:11 2001
-@@ -3,7 +3,7 @@
- .SH NAME
- papd \- AppleTalk print server daemon
- .SH SYNOPSIS
--.B :SBINDIR:/papd
-+.B :LIBEXECDIR:/papd
- [
- .B -d
- ] [
+--- sys/ultrix/Makefile.orig	Thu Feb  4 07:30:55 1999
++++ sys/ultrix/Makefile
+@@ -24,6 +24,7 @@
+ ${ALL}:	FRC
+ 	cd $@; ${MAKE} ${MFLAGS} CC="${CC}" \
+ 	    ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
++	    LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+ 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+ 	    AFPLIBS="${AFPLIBS}" \
+@@ -36,6 +37,7 @@
+ 	for i in ${ALL}; \
+ 	    do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \
+ 		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
++		LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \
+ 	        SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+ 	        ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+ 		DESTDIR="${DESTDIR}" MANDIR="${MANDIR}" \
+@@ -46,6 +48,8 @@
+ 	sed -e s@:DESTDIR:@${DESTDIR}@ -e s@:SBINDIR:@${SBINDIR}@ \
+ 		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
+ 		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
++		-e s@:LIBEXECDIR:@${LIBEXECDIR}@ \
++		-e s@:EXAMPLEDIR:@${EXAMPLEDIR}@ \
+ 		-e s@:INCDIR:@${INCDIR}@ \
+ 	    < ../../rc.atalk.bsd > ${ETCDIR}/rc.atalk
+ 	@echo