Install an rc script for cnid_metad as reported by

PR pkg/38268 from HAT.

And a little pkglint fixes.

Bump PKGREVISION.

5 files changed, 54 insertions, 8 deletions

diff --git a/net/netatalk/MESSAGE b/net/netatalk/MESSAGE
index bb50937d635..c531d93ca01 100644
--- a/net/netatalk/MESSAGE
+++ b/net/netatalk/MESSAGE
@@ -1,11 +1,12 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.3 2002/08/29 11:16:14 abs Exp $
+$NetBSD: MESSAGE,v 1.4 2008/03/22 04:40:45 taca Exp $
 
 To have Netatalk start automatically at boot, you will need to set the
 following variables in /etc/rc.conf (replacing "YES" with "NO" for those
 services you wish to not run):
 		atalkd=YES
 		afpd=YES
+		cnid_metad=YES
 		papd=YES
 		timelord=YES
 
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index 4a4dc29e466..a1ec62b5f56 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.56 2008/01/18 05:08:45 tnn Exp $
+# $NetBSD: Makefile,v 1.57 2008/03/22 04:40:45 taca Exp $
 
 DISTNAME=	netatalk-2.0.3
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	net print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=netatalk/}
 EXTRACT_SUFX=	.tar.bz2
@@ -29,14 +29,16 @@ CONF_FILES=	${EG_DIR}/AppleVolumes.default ${PKG_SYSCONFDIR}/AppleVolumes.defaul
 
 CONFLICTS=	netatalk-asun-[0-9]* netatalk-umich-[0-9]*
 
-RCD_SCRIPTS=	atalkd afpd papd timelord
+RCD_SCRIPTS=	atalkd afpd cnid_metad papd timelord
 RCD_SCRIPT_SRC.atalkd=		# empty
 RCD_SCRIPT_SRC.afpd=		# empty
+RCD_SCRIPT_SRC.cnid_metad=	# empty
 RCD_SCRIPT_SRC.papd=		# empty
 RCD_SCRIPT_SRC.timelord=	# empty
 
 .include "../../mk/bsd.prefs.mk"
 
+BUILD_DEFS+=		VARBASE
 CONFIGURE_ARGS+=	--enable-netbsd \
 			--enable-overwrite \
 			--enable-timelord \
@@ -55,8 +57,8 @@ SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Fixing hardcoded paths.
 SUBST_STAGE.paths=	post-patch
 SUBST_FILES.paths=	etc/psf/etc2ps.sh distrib/initscripts/Makefile.in
-SUBST_SED.paths=	-e "s,^\(DVIPS=\)\(/usr/local/tex\)\(/bin\),\1${PREFIX}\3,"
-SUBST_SED.paths+=	-e "s,\(NETBSD.*\)/etc/rc.d,\1${PREFIX}/${RCD_SCRIPTS_EXAMPLEDIR},"
+SUBST_SED.paths=	-e "s,^\\(DVIPS=\\)\\(/usr/local/tex\\)\\(/bin\\),\\1${PREFIX}\\3,"
+SUBST_SED.paths+=	-e "s,\\(NETBSD.*\\)/etc/rc.d,\\1${PREFIX}/${RCD_SCRIPTS_EXAMPLEDIR},"
 
 SUBST_CLASSES+=		rc
 SUBST_FILES.rc=		${WRKSRC}/bin/afile/acleandir.rc
diff --git a/net/netatalk/PLIST b/net/netatalk/PLIST
index 967b59ae654..634c2b91a27 100644
--- a/net/netatalk/PLIST
+++ b/net/netatalk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2005/07/31 13:19:55 markd Exp $
+@comment $NetBSD: PLIST,v 1.15 2008/03/22 04:40:45 taca Exp $
 bin/achfile
 bin/acleandir.rc
 bin/adv1tov2
@@ -160,6 +160,7 @@ share/examples/netatalk/papd.conf
 ${PAM}share/examples/netatalk/netatalk.pamd
 share/examples/rc.d/afpd
 share/examples/rc.d/atalkd
+share/examples/rc.d/cnid_metad
 share/examples/rc.d/papd
 share/examples/rc.d/timelord
 share/netatalk/pagecount.ps
diff --git a/net/netatalk/distinfo b/net/netatalk/distinfo
index af255bf486e..43cc4fc162e 100644
--- a/net/netatalk/distinfo
+++ b/net/netatalk/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.25 2007/12/31 09:22:07 taca Exp $
+$NetBSD: distinfo,v 1.26 2008/03/22 04:40:45 taca Exp $
 
 SHA1 (netatalk-2.0.3.tar.bz2) = ce2d5dd123467ccae72fc62ca4ee3738019455f2
 RMD160 (netatalk-2.0.3.tar.bz2) = 29b763400a45797ac4a8e499d5328aa91a091c91
@@ -16,3 +16,4 @@ SHA1 (patch-al) = df56d837eeb5698b0247fc0233448d254392fe43
 SHA1 (patch-am) = a01ab55a793c5249cc6fa0a4d98d61e43f173021
 SHA1 (patch-an) = 5472758813b927708ca178809fb89733719e67b4
 SHA1 (patch-bi) = b592d058a1d61322c03d1c3d44e39b48f2ddf7c3
+SHA1 (patch-bj) = 578f4ac2fbe3e4f5d85a4ac24a778ce9d2e75045
diff --git a/net/netatalk/patches/patch-bj b/net/netatalk/patches/patch-bj
new file mode 100644
index 00000000000..3a790ba3bfb
--- /dev/null
+++ b/net/netatalk/patches/patch-bj
@@ -0,0 +1,41 @@
+$NetBSD: patch-bj,v 1.1 2008/03/22 04:40:45 taca Exp $
+
+--- distrib/initscripts/Makefile.in.orig	2008-03-18 00:13:18.000000000 +0900
++++ distrib/initscripts/Makefile.in
+@@ -243,7 +243,7 @@ TEMPLATES = \
+ 	rc.atalk.debian.tmpl
+ 
+ 
+-CLEANFILES = $(GENERATED_FILES) atalk afpd atalkd papd timelord
++CLEANFILES = $(GENERATED_FILES) atalk afpd atalkd papd timelord cnid_metad
+ EXTRA_DIST = $(TEMPLATES) rc.atalk.cobalt
+ 
+ 
+@@ -293,7 +293,7 @@ EXTRA_DIST = $(TEMPLATES) rc.atalk.cobal
+ # checking for Solaris init scripts
+ #
+ @USE_SOLARIS_TRUE@sysvdir = /etc/init.d
+-@USE_NETBSD_TRUE@sysv_SCRIPTS = afpd atalkd papd timelord
++@USE_NETBSD_TRUE@sysv_SCRIPTS = afpd atalkd papd timelord cnid_metad
+ @USE_SUSE_TRUE@sysv_SCRIPTS = atalk
+ @USE_GENTOO_TRUE@sysv_SCRIPTS = atalk
+ @USE_REDHAT_TRUE@sysv_SCRIPTS = atalk
+@@ -536,6 +536,7 @@ uninstall: uninstall-startup
+ 
+ @USE_NETBSD_TRUE@afpd: rc.afpd.netbsd
+ @USE_NETBSD_TRUE@	cp -f $< $@
++@USE_NETBSD_TRUE@	chmod a+x $@
+ 
+ @USE_NETBSD_TRUE@atalkd: rc.atalkd.netbsd
+ @USE_NETBSD_TRUE@	cp -f $< $@
+@@ -549,6 +550,10 @@ uninstall: uninstall-startup
+ @USE_NETBSD_TRUE@	cp -f $< $@
+ @USE_NETBSD_TRUE@	chmod a+x $@
+ 
++@USE_NETBSD_TRUE@cnid_metad: rc.cnid_metad.netbsd
++@USE_NETBSD_TRUE@	cp -f $< $@
++@USE_NETBSD_TRUE@	chmod a+x $@
++
+ @USE_NETBSD_TRUE@install-data-hook:
+ 
+ @USE_NETBSD_TRUE@uninstall-hook: