If pkgdiff reports 'Cannot strip away RCS IDs, please handle manually!'

mkpatches faithfully files that away as a patch, which somewhat broke
my previous update. Fixing.

42 files changed, 150 insertions, 44 deletions

diff --git a/net/netatalk-asun/Makefile b/net/netatalk-asun/Makefile
index da51ca5c02f..f79ff420158 100644
--- a/net/netatalk-asun/Makefile
+++ b/net/netatalk-asun/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2001/05/09 14:12:40 fredb Exp $
+# $NetBSD: Makefile,v 1.10 2001/05/24 17:00:57 abs Exp $
 
 DISTNAME=	netatalk-1.4b2+asun2.1.3
-PKGNAME=	netatalk-asun-2.1.3nb4
+PKGNAME=	netatalk-asun-2.1.3nb5
 CATEGORIES=	net print
 MASTER_SITES=   ftp://ftp.cobaltnet.com/pub/users/asun/release/ \
 		ftp://ftp.hanse.de/sites/transit/mirror/ftp.u.washington.edu/public/asun/
diff --git a/net/netatalk-asun/distinfo b/net/netatalk-asun/distinfo
index 0618966d69f..49591b735db 100644
--- a/net/netatalk-asun/distinfo
+++ b/net/netatalk-asun/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2001/05/22 06:52:01 abs Exp $
+$NetBSD: distinfo,v 1.4 2001/05/24 17:00:57 abs Exp $
 
 SHA1 (netatalk-1.4b2+asun2.1.3.tar.gz) = 2b6d73125515867eb042bd30cb792ed41aea2013
 Size (netatalk-1.4b2+asun2.1.3.tar.gz) = 338362 bytes
@@ -34,7 +34,7 @@ SHA1 (patch-bc) = 4bb0b862193aee287a56075ac3e4904a52dbf940
 SHA1 (patch-bd) = 2ea9141bd31fb0132ae8523b35138c59286ca12d
 SHA1 (patch-be) = 2440763a8c5645e46d14ee7cc106f79297640b0e
 SHA1 (patch-bf) = 80cf807ca119b68fd0870533ccac125c5052a144
-SHA1 (patch-bg) = 0481ac3fefb21ce165c42e6dddac1ac36955eb41
+SHA1 (patch-bg) = 199fa7524d8cfab1723ad8faf091f8f5be2b3185
 SHA1 (patch-bh) = 4bec94b6996dfbe2eac3caf0623c5726b342fb0c
 SHA1 (patch-bi) = cb3054b0c92b5bb3efc148f98456af2adfdf0b09
 SHA1 (patch-bj) = 701cd788975dc32b56807d46a1c498f936d3f616
diff --git a/net/netatalk-asun/patches/patch-aa b/net/netatalk-asun/patches/patch-aa
index f17cf46a923..82cec23241a 100644
--- a/net/netatalk-asun/patches/patch-aa
+++ b/net/netatalk-asun/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2001/05/21 18:42:21 abs Exp $
+$NetBSD: patch-aa,v 1.5 2001/05/24 17:00:57 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 c6627924830..42228b40a62 100644
--- a/net/netatalk-asun/patches/patch-ab
+++ b/net/netatalk-asun/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.4 2001/05/21 18:42:21 abs Exp $
+$NetBSD: patch-ab,v 1.5 2001/05/24 17:00:57 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 2124345158e..d07cd7fb24a 100644
--- a/net/netatalk-asun/patches/patch-ac
+++ b/net/netatalk-asun/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.4 2001/05/21 18:42:21 abs Exp $
+$NetBSD: patch-ac,v 1.5 2001/05/24 17:00:57 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 67c00785899..005fb8e7539 100644
--- a/net/netatalk-asun/patches/patch-ad
+++ b/net/netatalk-asun/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.4 2001/05/21 18:42:21 abs Exp $
+$NetBSD: patch-ad,v 1.5 2001/05/24 17:00:57 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 61a73f84024..b43ff215c52 100644
--- a/net/netatalk-asun/patches/patch-ae
+++ b/net/netatalk-asun/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.5 2001/05/21 18:42:21 abs Exp $
+$NetBSD: patch-ae,v 1.6 2001/05/24 17:00:57 abs Exp $
 
 --- etc/afpd/Makefile.orig	Sat Feb  6 20:02:31 1999
 +++ etc/afpd/Makefile
diff --git a/net/netatalk-asun/patches/patch-af b/net/netatalk-asun/patches/patch-af
index 765febbd4c4..6657192cce0 100644
--- a/net/netatalk-asun/patches/patch-af
+++ b/net/netatalk-asun/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.4 2001/05/21 18:42:21 abs Exp $
+$NetBSD: patch-af,v 1.5 2001/05/24 17:00:58 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 8a2747c22c4..33f4ebea7e0 100644
--- a/net/netatalk-asun/patches/patch-ag
+++ b/net/netatalk-asun/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.4 2001/05/21 18:42:21 abs Exp $
+$NetBSD: patch-ag,v 1.5 2001/05/24 17:00:58 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 13d3fa27878..21067173989 100644
--- a/net/netatalk-asun/patches/patch-ah
+++ b/net/netatalk-asun/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.4 2001/05/21 18:42:21 abs Exp $
+$NetBSD: patch-ah,v 1.5 2001/05/24 17:00:58 abs Exp $
 
 --- etc/atalkd/Makefile.orig	Wed Jul  9 20:51:55 1997
 +++ etc/atalkd/Makefile
diff --git a/net/netatalk-asun/patches/patch-ai b/net/netatalk-asun/patches/patch-ai
index 9df626de9fc..9d09fe90239 100644
--- a/net/netatalk-asun/patches/patch-ai
+++ b/net/netatalk-asun/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.4 2001/05/21 18:42:21 abs Exp $
+$NetBSD: patch-ai,v 1.5 2001/05/24 17:00:58 abs Exp $
 
 --- etc/atalkd/main.c.orig	Mon Jan 25 09:21:13 1999
 +++ etc/atalkd/main.c
diff --git a/net/netatalk-asun/patches/patch-aj b/net/netatalk-asun/patches/patch-aj
index dc7f48768df..344878a1dee 100644
--- a/net/netatalk-asun/patches/patch-aj
+++ b/net/netatalk-asun/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.5 2001/05/21 18:42:21 abs Exp $
+$NetBSD: patch-aj,v 1.6 2001/05/24 17:00:58 abs Exp $
 
 --- etc/atalkd/nbp.c.orig	Sun Dec 13 05:22:42 1998
 +++ etc/atalkd/nbp.c
diff --git a/net/netatalk-asun/patches/patch-ak b/net/netatalk-asun/patches/patch-ak
index ff708761b90..1b4df9dac5a 100644
--- a/net/netatalk-asun/patches/patch-ak
+++ b/net/netatalk-asun/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.4 2001/05/21 18:42:21 abs Exp $
+$NetBSD: patch-ak,v 1.5 2001/05/24 17:00:58 abs Exp $
 
 --- etc/atalkd/route.c.orig	Tue May 20 18:35:42 1997
 +++ etc/atalkd/route.c
diff --git a/net/netatalk-asun/patches/patch-al b/net/netatalk-asun/patches/patch-al
index 55f97e35b99..2d000bf76b1 100644
--- a/net/netatalk-asun/patches/patch-al
+++ b/net/netatalk-asun/patches/patch-al
@@ -1,4 +1,4 @@
-$NetBSD: patch-al,v 1.4 2001/05/21 18:42:21 abs Exp $
+$NetBSD: patch-al,v 1.5 2001/05/24 17:00:58 abs Exp $
 
 --- etc/papd/Makefile.orig	Tue May 20 18:35:42 1997
 +++ etc/papd/Makefile
diff --git a/net/netatalk-asun/patches/patch-am b/net/netatalk-asun/patches/patch-am
index 2bbd328e512..2fab7960c3c 100644
--- a/net/netatalk-asun/patches/patch-am
+++ b/net/netatalk-asun/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.4 2001/05/21 18:42:21 abs Exp $
+$NetBSD: patch-am,v 1.5 2001/05/24 17:00:58 abs Exp $
 
 --- etc/papd/printcap.c.orig	Fri May 30 01:27:35 1997
 +++ etc/papd/printcap.c
diff --git a/net/netatalk-asun/patches/patch-an b/net/netatalk-asun/patches/patch-an
index d0dd738d59c..f351d5bdeb4 100644
--- a/net/netatalk-asun/patches/patch-an
+++ b/net/netatalk-asun/patches/patch-an
@@ -1,4 +1,4 @@
-$NetBSD: patch-an,v 1.4 2001/05/21 18:42:21 abs Exp $
+$NetBSD: patch-an,v 1.5 2001/05/24 17:00:58 abs Exp $
 
 --- etc/psf/Makefile.orig	Thu Feb  4 06:57:52 1999
 +++ etc/psf/Makefile
diff --git a/net/netatalk-asun/patches/patch-ao b/net/netatalk-asun/patches/patch-ao
index 096e9b5e195..66be4ae2999 100644
--- a/net/netatalk-asun/patches/patch-ao
+++ b/net/netatalk-asun/patches/patch-ao
@@ -1,4 +1,4 @@
-$NetBSD: patch-ao,v 1.4 2001/05/21 18:42:21 abs Exp $
+$NetBSD: patch-ao,v 1.5 2001/05/24 17:00:58 abs Exp $
 
 --- include/atalk/atp.h.orig	Wed May 28 16:22:52 1997
 +++ include/atalk/atp.h
diff --git a/net/netatalk-asun/patches/patch-ap b/net/netatalk-asun/patches/patch-ap
index 06484bf1e16..baf637072c1 100644
--- a/net/netatalk-asun/patches/patch-ap
+++ b/net/netatalk-asun/patches/patch-ap
@@ -1,4 +1,4 @@
-$NetBSD: patch-ap,v 1.4 2001/05/21 18:42:21 abs Exp $
+$NetBSD: patch-ap,v 1.5 2001/05/24 17:00:58 abs Exp $
 
 --- include/atalk/paths.h.orig	Fri Aug 15 06:25:58 1997
 +++ include/atalk/paths.h
diff --git a/net/netatalk-asun/patches/patch-aq b/net/netatalk-asun/patches/patch-aq
index c1d8af69474..67fa5365c1b 100644
--- a/net/netatalk-asun/patches/patch-aq
+++ b/net/netatalk-asun/patches/patch-aq
@@ -1,4 +1,4 @@
-$NetBSD: patch-aq,v 1.4 2001/05/21 18:42:21 abs Exp $
+$NetBSD: patch-aq,v 1.5 2001/05/24 17:00:58 abs Exp $
 
 --- libatalk/asp/asp_getsess.c.orig	Thu Jan 21 20:10:25 1999
 +++ libatalk/asp/asp_getsess.c
diff --git a/net/netatalk-asun/patches/patch-ar b/net/netatalk-asun/patches/patch-ar
index d0252dfde3e..eaf06fad06a 100644
--- a/net/netatalk-asun/patches/patch-ar
+++ b/net/netatalk-asun/patches/patch-ar
@@ -1,4 +1,4 @@
-$NetBSD: patch-ar,v 1.4 2001/05/21 18:42:21 abs Exp $
+$NetBSD: patch-ar,v 1.5 2001/05/24 17:00:58 abs Exp $
 
 --- libatalk/atp/atp_rsel.c.orig	Thu Feb  4 07:36:30 1999
 +++ libatalk/atp/atp_rsel.c
diff --git a/net/netatalk-asun/patches/patch-as b/net/netatalk-asun/patches/patch-as
index 84f48e677f8..5332134c58b 100644
--- a/net/netatalk-asun/patches/patch-as
+++ b/net/netatalk-asun/patches/patch-as
@@ -1,4 +1,4 @@
-$NetBSD: patch-as,v 1.4 2001/05/21 18:42:21 abs Exp $
+$NetBSD: patch-as,v 1.5 2001/05/24 17:00:58 abs Exp $
 
 --- libatalk/dsi/dsi_tcp.c.orig	Wed Nov 18 07:59:25 1998
 +++ libatalk/dsi/dsi_tcp.c
diff --git a/net/netatalk-asun/patches/patch-at b/net/netatalk-asun/patches/patch-at
index 6c4d240552f..62344117c05 100644
--- a/net/netatalk-asun/patches/patch-at
+++ b/net/netatalk-asun/patches/patch-at
@@ -1,4 +1,4 @@
-$NetBSD: patch-at,v 1.4 2001/05/21 18:42:21 abs Exp $
+$NetBSD: patch-at,v 1.5 2001/05/24 17:00:58 abs Exp $
 
 --- libatalk/nbp/nbp_lkup.c.orig	Thu Feb  4 07:36:14 1999
 +++ libatalk/nbp/nbp_lkup.c
diff --git a/net/netatalk-asun/patches/patch-au b/net/netatalk-asun/patches/patch-au
index bc826b35b9b..2d22920ec0f 100644
--- a/net/netatalk-asun/patches/patch-au
+++ b/net/netatalk-asun/patches/patch-au
@@ -1,4 +1,4 @@
-$NetBSD: patch-au,v 1.4 2001/05/21 18:42:21 abs Exp $
+$NetBSD: patch-au,v 1.5 2001/05/24 17:00:58 abs Exp $
 
 --- libatalk/nbp/nbp_rgstr.c.orig	Thu Aug 14 22:27:23 1997
 +++ libatalk/nbp/nbp_rgstr.c
diff --git a/net/netatalk-asun/patches/patch-av b/net/netatalk-asun/patches/patch-av
index 9f580780e71..70f398a5133 100644
--- a/net/netatalk-asun/patches/patch-av
+++ b/net/netatalk-asun/patches/patch-av
@@ -1,4 +1,4 @@
-$NetBSD: patch-av,v 1.5 2001/05/21 18:42:21 abs Exp $
+$NetBSD: patch-av,v 1.6 2001/05/24 17:00:58 abs Exp $
 
 --- libatalk/nbp/nbp_unrgstr.c.orig	Thu Feb  4 07:26:41 1999
 +++ libatalk/nbp/nbp_unrgstr.c
diff --git a/net/netatalk-asun/patches/patch-aw b/net/netatalk-asun/patches/patch-aw
index 7e298664d46..2f424d9ea86 100644
--- a/net/netatalk-asun/patches/patch-aw
+++ b/net/netatalk-asun/patches/patch-aw
@@ -1,4 +1,4 @@
-$NetBSD: patch-aw,v 1.4 2001/05/21 18:42:21 abs Exp $
+$NetBSD: patch-aw,v 1.5 2001/05/24 17:00:58 abs Exp $
 
 --- libatalk/nbp/nbp_util.c.orig	Thu Feb  4 07:27:02 1999
 +++ libatalk/nbp/nbp_util.c
diff --git a/net/netatalk-asun/patches/patch-ax b/net/netatalk-asun/patches/patch-ax
index 8094c445cb2..ec031f93096 100644
--- a/net/netatalk-asun/patches/patch-ax
+++ b/net/netatalk-asun/patches/patch-ax
@@ -1,4 +1,4 @@
-$NetBSD: patch-ax,v 1.3 2001/05/21 18:42:21 abs Exp $
+$NetBSD: patch-ax,v 1.4 2001/05/24 17:00:58 abs Exp $
 
 --- man/Makefile.orig	Tue May 20 18:35:43 1997
 +++ man/Makefile
diff --git a/net/netatalk-asun/patches/patch-ay b/net/netatalk-asun/patches/patch-ay
index 99b38399c71..74217fb60f6 100644
--- a/net/netatalk-asun/patches/patch-ay
+++ b/net/netatalk-asun/patches/patch-ay
@@ -1,4 +1,4 @@
-$NetBSD: patch-ay,v 1.3 2001/05/21 18:42:21 abs Exp $
+$NetBSD: patch-ay,v 1.4 2001/05/24 17:00:58 abs Exp $
 
 --- man/man1/Makefile.orig	Tue May 20 18:35:43 1997
 +++ man/man1/Makefile
diff --git a/net/netatalk-asun/patches/patch-az b/net/netatalk-asun/patches/patch-az
index 999595d3166..1f55d3e8493 100644
--- a/net/netatalk-asun/patches/patch-az
+++ b/net/netatalk-asun/patches/patch-az
@@ -1,4 +1,4 @@
-$NetBSD: patch-az,v 1.3 2001/05/21 18:42:21 abs Exp $
+$NetBSD: patch-az,v 1.4 2001/05/24 17:00:58 abs Exp $
 
 --- man/man3/Makefile.orig	Tue May 20 18:35:43 1997
 +++ man/man3/Makefile
diff --git a/net/netatalk-asun/patches/patch-ba b/net/netatalk-asun/patches/patch-ba
index fea7ef5a9bb..e138aac211d 100644
--- a/net/netatalk-asun/patches/patch-ba
+++ b/net/netatalk-asun/patches/patch-ba
@@ -1,4 +1,4 @@
-$NetBSD: patch-ba,v 1.4 2001/05/21 18:42:21 abs Exp $
+$NetBSD: patch-ba,v 1.5 2001/05/24 17:00:58 abs Exp $
 
 --- man/man4/Makefile.orig	Tue May 20 18:35:43 1997
 +++ man/man4/Makefile
diff --git a/net/netatalk-asun/patches/patch-bb b/net/netatalk-asun/patches/patch-bb
index b9235228edd..1ea86c3e3db 100644
--- a/net/netatalk-asun/patches/patch-bb
+++ b/net/netatalk-asun/patches/patch-bb
@@ -1,4 +1,4 @@
-$NetBSD: patch-bb,v 1.3 2001/05/21 18:42:21 abs Exp $
+$NetBSD: patch-bb,v 1.4 2001/05/24 17:00:58 abs Exp $
 
 --- man/man8/Makefile.orig	Tue May 20 18:35:43 1997
 +++ man/man8/Makefile
diff --git a/net/netatalk-asun/patches/patch-bc b/net/netatalk-asun/patches/patch-bc
index 384585f3da6..7391fd79fda 100644
--- a/net/netatalk-asun/patches/patch-bc
+++ b/net/netatalk-asun/patches/patch-bc
@@ -1,4 +1,4 @@
-$NetBSD: patch-bc,v 1.3 2001/05/21 18:42:21 abs Exp $
+$NetBSD: patch-bc,v 1.4 2001/05/24 17:00:58 abs Exp $
 
 --- man/man8/afpd.8.orig	Tue May 20 18:35:43 1997
 +++ man/man8/afpd.8
diff --git a/net/netatalk-asun/patches/patch-bd b/net/netatalk-asun/patches/patch-bd
index c10e959d037..382f8437dab 100644
--- a/net/netatalk-asun/patches/patch-bd
+++ b/net/netatalk-asun/patches/patch-bd
@@ -1,4 +1,4 @@
-$NetBSD: patch-bd,v 1.4 2001/05/21 18:42:21 abs Exp $
+$NetBSD: patch-bd,v 1.5 2001/05/24 17:00:58 abs Exp $
 
 --- man/man8/atalkd.8.orig	Thu Feb  4 07:28:28 1999
 +++ man/man8/atalkd.8
diff --git a/net/netatalk-asun/patches/patch-be b/net/netatalk-asun/patches/patch-be
index 9426b6e74f2..2b8667331b1 100644
--- a/net/netatalk-asun/patches/patch-be
+++ b/net/netatalk-asun/patches/patch-be
@@ -1,4 +1,4 @@
-$NetBSD: patch-be,v 1.3 2001/05/21 18:42:21 abs Exp $
+$NetBSD: patch-be,v 1.4 2001/05/24 17:00:58 abs Exp $
 
 --- man/man8/papd.tbl.orig	Tue May 20 18:35:43 1997
 +++ man/man8/papd.tbl
diff --git a/net/netatalk-asun/patches/patch-bf b/net/netatalk-asun/patches/patch-bf
index 940d2332f16..72bfd67dfb6 100644
--- a/net/netatalk-asun/patches/patch-bf
+++ b/net/netatalk-asun/patches/patch-bf
@@ -1,4 +1,4 @@
-$NetBSD: patch-bf,v 1.4 2001/05/21 18:42:21 abs Exp $
+$NetBSD: patch-bf,v 1.5 2001/05/24 17:00:58 abs Exp $
 
 --- man/man8/psf.8.orig	Tue May 20 18:35:43 1997
 +++ man/man8/psf.8
diff --git a/net/netatalk-asun/patches/patch-bg b/net/netatalk-asun/patches/patch-bg
index 41679bd58a1..fe7089387dd 100644
--- a/net/netatalk-asun/patches/patch-bg
+++ b/net/netatalk-asun/patches/patch-bg
@@ -1 +1,107 @@
-Cannot strip away RCS IDs, please handle manually!
+$NetBSD: patch-bg,v 1.5 2001/05/24 17:00:58 abs Exp $
+
+--- rc.atalk.bsd.orig	Mon Aug 25 23:00:54 1997
++++ rc.atalk.bsd
+@@ -1,39 +1,69 @@
++#!/bin/sh
++#
++# 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.
+ #
+ 
+-#
+-# 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 -e :ETCDIR:/papd.conf ]; then
++		echo  'Starting papd.'
++		${papd} ${papd_args}
++	fi
++
++	if [ -x ${afpd} -a -e :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-bh b/net/netatalk-asun/patches/patch-bh
index 7afd19fd2d4..25fabb4a69d 100644
--- a/net/netatalk-asun/patches/patch-bh
+++ b/net/netatalk-asun/patches/patch-bh
@@ -1,4 +1,4 @@
-$NetBSD: patch-bh,v 1.4 2001/05/21 18:42:21 abs Exp $
+$NetBSD: patch-bh,v 1.5 2001/05/24 17:00:58 abs Exp $
 
 --- sys/freebsd/Makefile.orig	Thu Feb  4 07:38:12 1999
 +++ sys/freebsd/Makefile
diff --git a/net/netatalk-asun/patches/patch-bi b/net/netatalk-asun/patches/patch-bi
index 87cea73cf1b..696df12efb8 100644
--- a/net/netatalk-asun/patches/patch-bi
+++ b/net/netatalk-asun/patches/patch-bi
@@ -1,4 +1,4 @@
-$NetBSD: patch-bi,v 1.4 2001/05/21 18:42:22 abs Exp $
+$NetBSD: patch-bi,v 1.5 2001/05/24 17:00:58 abs Exp $
 
 --- sys/linux/Makefile.orig	Sat Feb 27 21:10:59 1999
 +++ sys/linux/Makefile
diff --git a/net/netatalk-asun/patches/patch-bj b/net/netatalk-asun/patches/patch-bj
index 03cf87928f0..903c3d9833b 100644
--- a/net/netatalk-asun/patches/patch-bj
+++ b/net/netatalk-asun/patches/patch-bj
@@ -1,4 +1,4 @@
-$NetBSD: patch-bj,v 1.2 2001/05/21 18:42:22 abs Exp $
+$NetBSD: patch-bj,v 1.3 2001/05/24 17:00:58 abs Exp $
 
 --- sys/netbsd/Makefile.orig	Thu Feb  4 07:30:30 1999
 +++ sys/netbsd/Makefile
diff --git a/net/netatalk-asun/patches/patch-bk b/net/netatalk-asun/patches/patch-bk
index 035aba01f20..080d281c2ff 100644
--- a/net/netatalk-asun/patches/patch-bk
+++ b/net/netatalk-asun/patches/patch-bk
@@ -1,4 +1,4 @@
-$NetBSD: patch-bk,v 1.2 2001/05/21 18:42:22 abs Exp $
+$NetBSD: patch-bk,v 1.3 2001/05/24 17:00:58 abs Exp $
 
 --- sys/openbsd/Makefile.orig	Mon Feb 22 23:02:31 1999
 +++ sys/openbsd/Makefile
diff --git a/net/netatalk-asun/patches/patch-bl b/net/netatalk-asun/patches/patch-bl
index eaf6829b27b..21faa51cd59 100644
--- a/net/netatalk-asun/patches/patch-bl
+++ b/net/netatalk-asun/patches/patch-bl
@@ -1,4 +1,4 @@
-$NetBSD: patch-bl,v 1.2 2001/05/21 18:42:22 abs Exp $
+$NetBSD: patch-bl,v 1.3 2001/05/24 17:00:58 abs Exp $
 
 --- sys/solaris/Makefile.orig	Wed Feb  3 19:52:10 1999
 +++ sys/solaris/Makefile
diff --git a/net/netatalk-asun/patches/patch-bm b/net/netatalk-asun/patches/patch-bm
index 8654d5f8d26..8dc20869b31 100644
--- a/net/netatalk-asun/patches/patch-bm
+++ b/net/netatalk-asun/patches/patch-bm
@@ -1,4 +1,4 @@
-$NetBSD: patch-bm,v 1.2 2001/05/21 18:42:22 abs Exp $
+$NetBSD: patch-bm,v 1.3 2001/05/24 17:00:58 abs Exp $
 
 --- sys/sunos/Makefile.orig	Fri Sep 18 04:20:15 1998
 +++ sys/sunos/Makefile
diff --git a/net/netatalk-asun/patches/patch-bn b/net/netatalk-asun/patches/patch-bn
index df9368e2ff7..89504e21d24 100644
--- a/net/netatalk-asun/patches/patch-bn
+++ b/net/netatalk-asun/patches/patch-bn
@@ -1,4 +1,4 @@
-$NetBSD: patch-bn,v 1.2 2001/05/21 18:42:22 abs Exp $
+$NetBSD: patch-bn,v 1.3 2001/05/24 17:00:58 abs Exp $
 
 --- sys/ultrix/Makefile.orig	Thu Feb  4 07:30:55 1999
 +++ sys/ultrix/Makefile