Sat Mar 22 04:40:45 2008 UTC ()
Install an rc script for cnid_metad as reported by
PR pkg/38268 from HAT.

And a little pkglint fixes.

Bump PKGREVISION.


(taca)
diff -r1.3 -r1.4 pkgsrc/net/netatalk/MESSAGE
diff -r1.56 -r1.57 pkgsrc/net/netatalk/Makefile
diff -r1.14 -r1.15 pkgsrc/net/netatalk/PLIST
diff -r1.25 -r1.26 pkgsrc/net/netatalk/distinfo
diff -r0 -r1.1 pkgsrc/net/netatalk/patches/patch-bj
cvs diff -r1.3 -r1.4 pkgsrc/net/netatalk/Attic/MESSAGE (expand / switch to unified diff)

--- pkgsrc/net/netatalk/Attic/MESSAGE 2002/08/29 11:16:14 1.3
+++ pkgsrc/net/netatalk/Attic/MESSAGE 2008/03/22 04:40:45 1.4
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1=========================================================================== 1===========================================================================
2$NetBSD: MESSAGE,v 1.3 2002/08/29 11:16:14 abs Exp $ 2$NetBSD: MESSAGE,v 1.4 2008/03/22 04:40:45 taca Exp $
3 3
4To have Netatalk start automatically at boot, you will need to set the 4To have Netatalk start automatically at boot, you will need to set the
5following variables in /etc/rc.conf (replacing "YES" with "NO" for those 5following variables in /etc/rc.conf (replacing "YES" with "NO" for those
6services you wish to not run): 6services you wish to not run):
7 atalkd=YES 7 atalkd=YES
8 afpd=YES 8 afpd=YES
 9 cnid_metad=YES
9 papd=YES 10 papd=YES
10 timelord=YES 11 timelord=YES
11 12
12Example Netatalk config files have been installed in the examples directory 13Example Netatalk config files have been installed in the examples directory
13at ${PREFIX}/share/examples/netatalk. Production config files are 14at ${PREFIX}/share/examples/netatalk. Production config files are
14installed in ${PKG_SYSCONFDIR}. If no config files existed before this 15installed in ${PKG_SYSCONFDIR}. If no config files existed before this
15package was installed, default config files were copied in. 16package was installed, default config files were copied in.
16 17
17=========================================================================== 18===========================================================================
cvs diff -r1.56 -r1.57 pkgsrc/net/netatalk/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/net/netatalk/Attic/Makefile 2008/01/18 05:08:45 1.56
+++ pkgsrc/net/netatalk/Attic/Makefile 2008/03/22 04:40:45 1.57
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.56 2008/01/18 05:08:45 tnn Exp $ 1# $NetBSD: Makefile,v 1.57 2008/03/22 04:40:45 taca Exp $
2 2
3DISTNAME= netatalk-2.0.3 3DISTNAME= netatalk-2.0.3
4PKGREVISION= 8 4PKGREVISION= 9
5CATEGORIES= net print 5CATEGORIES= net print
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=netatalk/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=netatalk/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= markd@NetBSD.org 9MAINTAINER= markd@NetBSD.org
10HOMEPAGE= http://netatalk.sourceforge.net/ 10HOMEPAGE= http://netatalk.sourceforge.net/
11COMMENT= Netatalk appletalk file and print services 11COMMENT= Netatalk appletalk file and print services
12 12
13DEPENDS= rc>=1.5:../../shells/rc 13DEPENDS= rc>=1.5:../../shells/rc
14 14
15GNU_CONFIGURE= YES 15GNU_CONFIGURE= YES
16USE_TOOLS+= gmake perl:run 16USE_TOOLS+= gmake perl:run
17USE_LIBTOOL= YES 17USE_LIBTOOL= YES
@@ -19,54 +19,56 @@ USE_OLD_DES_API=YES @@ -19,54 +19,56 @@ USE_OLD_DES_API=YES
19BUILDLINK_TRANSFORM+= l:db-4.2:db4 19BUILDLINK_TRANSFORM+= l:db-4.2:db4
20 20
21PKG_SYSCONFSUBDIR= netatalk 21PKG_SYSCONFSUBDIR= netatalk
22EG_DIR= ${PREFIX}/share/examples/netatalk 22EG_DIR= ${PREFIX}/share/examples/netatalk
23CONF_FILES= ${EG_DIR}/AppleVolumes.default ${PKG_SYSCONFDIR}/AppleVolumes.default \ 23CONF_FILES= ${EG_DIR}/AppleVolumes.default ${PKG_SYSCONFDIR}/AppleVolumes.default \
24 ${EG_DIR}/AppleVolumes.system ${PKG_SYSCONFDIR}/AppleVolumes.system \ 24 ${EG_DIR}/AppleVolumes.system ${PKG_SYSCONFDIR}/AppleVolumes.system \
25 ${EG_DIR}/afpd.conf ${PKG_SYSCONFDIR}/afpd.conf \ 25 ${EG_DIR}/afpd.conf ${PKG_SYSCONFDIR}/afpd.conf \
26 ${EG_DIR}/atalkd.conf ${PKG_SYSCONFDIR}/atalkd.conf \ 26 ${EG_DIR}/atalkd.conf ${PKG_SYSCONFDIR}/atalkd.conf \
27 ${EG_DIR}/netatalk.conf ${PKG_SYSCONFDIR}/netatalk.conf \ 27 ${EG_DIR}/netatalk.conf ${PKG_SYSCONFDIR}/netatalk.conf \
28 ${EG_DIR}/papd.conf ${PKG_SYSCONFDIR}/papd.conf 28 ${EG_DIR}/papd.conf ${PKG_SYSCONFDIR}/papd.conf
29 29
30CONFLICTS= netatalk-asun-[0-9]* netatalk-umich-[0-9]* 30CONFLICTS= netatalk-asun-[0-9]* netatalk-umich-[0-9]*
31 31
32RCD_SCRIPTS= atalkd afpd papd timelord 32RCD_SCRIPTS= atalkd afpd cnid_metad papd timelord
33RCD_SCRIPT_SRC.atalkd= # empty 33RCD_SCRIPT_SRC.atalkd= # empty
34RCD_SCRIPT_SRC.afpd= # empty 34RCD_SCRIPT_SRC.afpd= # empty
 35RCD_SCRIPT_SRC.cnid_metad= # empty
35RCD_SCRIPT_SRC.papd= # empty 36RCD_SCRIPT_SRC.papd= # empty
36RCD_SCRIPT_SRC.timelord= # empty 37RCD_SCRIPT_SRC.timelord= # empty
37 38
38.include "../../mk/bsd.prefs.mk" 39.include "../../mk/bsd.prefs.mk"
39 40
 41BUILD_DEFS+= VARBASE
40CONFIGURE_ARGS+= --enable-netbsd \ 42CONFIGURE_ARGS+= --enable-netbsd \
41 --enable-overwrite \ 43 --enable-overwrite \
42 --enable-timelord \ 44 --enable-timelord \
43 --libexecdir=${PREFIX}/libexec/netatalk \ 45 --libexecdir=${PREFIX}/libexec/netatalk \
44 --sbindir=${PREFIX}/libexec/netatalk \ 46 --sbindir=${PREFIX}/libexec/netatalk \
45 --with-pkgconfdir=${PKG_SYSCONFDIR:Q} \ 47 --with-pkgconfdir=${PKG_SYSCONFDIR:Q} \
46 --with-message-dir=${PKG_SYSCONFDIR}/msg \ 48 --with-message-dir=${PKG_SYSCONFDIR}/msg \
47 --localstatedir=${VARBASE}/netatalk \ 49 --localstatedir=${VARBASE}/netatalk \
48 --with-uams-path=${PREFIX}/libexec/netatalk/uams \ 50 --with-uams-path=${PREFIX}/libexec/netatalk/uams \
49 --with-bdb=${BUILDLINK_PREFIX.db4} \ 51 --with-bdb=${BUILDLINK_PREFIX.db4} \
50 --with-ssl-dir=${BUILDLINK_PREFIX.openssl} 52 --with-ssl-dir=${BUILDLINK_PREFIX.openssl}
51 53
52MAKE_DIRS+= ${PKG_SYSCONFDIR}/msg 54MAKE_DIRS+= ${PKG_SYSCONFDIR}/msg
53 55
54SUBST_CLASSES+= paths 56SUBST_CLASSES+= paths
55SUBST_MESSAGE.paths= Fixing hardcoded paths. 57SUBST_MESSAGE.paths= Fixing hardcoded paths.
56SUBST_STAGE.paths= post-patch 58SUBST_STAGE.paths= post-patch
57SUBST_FILES.paths= etc/psf/etc2ps.sh distrib/initscripts/Makefile.in 59SUBST_FILES.paths= etc/psf/etc2ps.sh distrib/initscripts/Makefile.in
58SUBST_SED.paths= -e "s,^\(DVIPS=\)\(/usr/local/tex\)\(/bin\),\1${PREFIX}\3," 60SUBST_SED.paths= -e "s,^\\(DVIPS=\\)\\(/usr/local/tex\\)\\(/bin\\),\\1${PREFIX}\\3,"
59SUBST_SED.paths+= -e "s,\(NETBSD.*\)/etc/rc.d,\1${PREFIX}/${RCD_SCRIPTS_EXAMPLEDIR}," 61SUBST_SED.paths+= -e "s,\\(NETBSD.*\\)/etc/rc.d,\\1${PREFIX}/${RCD_SCRIPTS_EXAMPLEDIR},"
60 62
61SUBST_CLASSES+= rc 63SUBST_CLASSES+= rc
62SUBST_FILES.rc= ${WRKSRC}/bin/afile/acleandir.rc 64SUBST_FILES.rc= ${WRKSRC}/bin/afile/acleandir.rc
63SUBST_SED.rc+= -e 's,@PREFIX@,${PREFIX:Q},g' 65SUBST_SED.rc+= -e 's,@PREFIX@,${PREFIX:Q},g'
64SUBST_STAGE.rc= pre-configure 66SUBST_STAGE.rc= pre-configure
65 67
66PKG_OPTIONS_VAR= PKG_OPTIONS.netatalk 68PKG_OPTIONS_VAR= PKG_OPTIONS.netatalk
67PKG_SUPPORTED_OPTIONS= cups kerberos pam slp 69PKG_SUPPORTED_OPTIONS= cups kerberos pam slp
68 70
69.include "../../mk/bsd.options.mk" 71.include "../../mk/bsd.options.mk"
70 72
71.if !empty(PKG_OPTIONS:Mcups) 73.if !empty(PKG_OPTIONS:Mcups)
72.include "../../print/cups/buildlink3.mk" 74.include "../../print/cups/buildlink3.mk"
cvs diff -r1.14 -r1.15 pkgsrc/net/netatalk/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/net/netatalk/Attic/PLIST 2005/07/31 13:19:55 1.14
+++ pkgsrc/net/netatalk/Attic/PLIST 2008/03/22 04:40:45 1.15
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.14 2005/07/31 13:19:55 markd Exp $ 1@comment $NetBSD: PLIST,v 1.15 2008/03/22 04:40:45 taca Exp $
2bin/achfile 2bin/achfile
3bin/acleandir.rc 3bin/acleandir.rc
4bin/adv1tov2 4bin/adv1tov2
5bin/aecho 5bin/aecho
6bin/afile 6bin/afile
7bin/afpd-mtab.pl 7bin/afpd-mtab.pl
8bin/afppasswd 8bin/afppasswd
9bin/apple_cp 9bin/apple_cp
10bin/apple_mv 10bin/apple_mv
11bin/apple_rm 11bin/apple_rm
12bin/asip-status.pl 12bin/asip-status.pl
13bin/binheader 13bin/binheader
14bin/cleanappledouble.pl 14bin/cleanappledouble.pl
@@ -150,24 +150,25 @@ man/man8/papd.8 @@ -150,24 +150,25 @@ man/man8/papd.8
150man/man8/papstatus.8 150man/man8/papstatus.8
151man/man8/psf.8 151man/man8/psf.8
152man/man8/timelord.8 152man/man8/timelord.8
153share/aclocal/netatalk.m4 153share/aclocal/netatalk.m4
154share/examples/netatalk/AppleVolumes.default 154share/examples/netatalk/AppleVolumes.default
155share/examples/netatalk/AppleVolumes.system 155share/examples/netatalk/AppleVolumes.system
156share/examples/netatalk/afpd.conf 156share/examples/netatalk/afpd.conf
157share/examples/netatalk/atalkd.conf 157share/examples/netatalk/atalkd.conf
158share/examples/netatalk/netatalk.conf 158share/examples/netatalk/netatalk.conf
159share/examples/netatalk/papd.conf 159share/examples/netatalk/papd.conf
160${PAM}share/examples/netatalk/netatalk.pamd 160${PAM}share/examples/netatalk/netatalk.pamd
161share/examples/rc.d/afpd 161share/examples/rc.d/afpd
162share/examples/rc.d/atalkd 162share/examples/rc.d/atalkd
 163share/examples/rc.d/cnid_metad
163share/examples/rc.d/papd 164share/examples/rc.d/papd
164share/examples/rc.d/timelord 165share/examples/rc.d/timelord
165share/netatalk/pagecount.ps 166share/netatalk/pagecount.ps
166@dirrm share/netatalk 167@dirrm share/netatalk
167@dirrm share/examples/netatalk 168@dirrm share/examples/netatalk
168@exec ${MKDIR} %D/libexec/psffilters 169@exec ${MKDIR} %D/libexec/psffilters
169@dirrm libexec/psffilters 170@dirrm libexec/psffilters
170@dirrm libexec/netatalk/uams 171@dirrm libexec/netatalk/uams
171@dirrm libexec/netatalk 172@dirrm libexec/netatalk
172@dirrm include/netatalk 173@dirrm include/netatalk
173@dirrm include/atalk 174@dirrm include/atalk
cvs diff -r1.25 -r1.26 pkgsrc/net/netatalk/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/net/netatalk/Attic/distinfo 2007/12/31 09:22:07 1.25
+++ pkgsrc/net/netatalk/Attic/distinfo 2008/03/22 04:40:45 1.26
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1$NetBSD: distinfo,v 1.25 2007/12/31 09:22:07 taca Exp $ 1$NetBSD: distinfo,v 1.26 2008/03/22 04:40:45 taca Exp $
2 2
3SHA1 (netatalk-2.0.3.tar.bz2) = ce2d5dd123467ccae72fc62ca4ee3738019455f2 3SHA1 (netatalk-2.0.3.tar.bz2) = ce2d5dd123467ccae72fc62ca4ee3738019455f2
4RMD160 (netatalk-2.0.3.tar.bz2) = 29b763400a45797ac4a8e499d5328aa91a091c91 4RMD160 (netatalk-2.0.3.tar.bz2) = 29b763400a45797ac4a8e499d5328aa91a091c91
5Size (netatalk-2.0.3.tar.bz2) = 1471804 bytes 5Size (netatalk-2.0.3.tar.bz2) = 1471804 bytes
6SHA1 (patch-aa) = e7511326445f805aca80b561c9a9d76ffec8e629 6SHA1 (patch-aa) = e7511326445f805aca80b561c9a9d76ffec8e629
7SHA1 (patch-ab) = 10bf2fdd900a6c2189376757e921bb6228e0f19c 7SHA1 (patch-ab) = 10bf2fdd900a6c2189376757e921bb6228e0f19c
8SHA1 (patch-ac) = ba559d1b957172e77ec8eb9cc5c60d2f88044ffa 8SHA1 (patch-ac) = ba559d1b957172e77ec8eb9cc5c60d2f88044ffa
9SHA1 (patch-ad) = 311d00d165688d4baa1365ba6c4147bd6293f3d8 9SHA1 (patch-ad) = 311d00d165688d4baa1365ba6c4147bd6293f3d8
10SHA1 (patch-af) = 997909d7cf444a2481693069864da9134ce413d4 10SHA1 (patch-af) = 997909d7cf444a2481693069864da9134ce413d4
11SHA1 (patch-ag) = 1785045e56d93ea0747e264a1d1a8c743e7c798d 11SHA1 (patch-ag) = 1785045e56d93ea0747e264a1d1a8c743e7c798d
12SHA1 (patch-ah) = 318626f5c6d21f025ae5e08c9da76bd4c493f7e6 12SHA1 (patch-ah) = 318626f5c6d21f025ae5e08c9da76bd4c493f7e6
13SHA1 (patch-ai) = e8f453569db891100221f27bf579c66a18a650b7 13SHA1 (patch-ai) = e8f453569db891100221f27bf579c66a18a650b7
14SHA1 (patch-ak) = ee205781dffb02b558353e95a07f7f66e143614a 14SHA1 (patch-ak) = ee205781dffb02b558353e95a07f7f66e143614a
15SHA1 (patch-al) = df56d837eeb5698b0247fc0233448d254392fe43 15SHA1 (patch-al) = df56d837eeb5698b0247fc0233448d254392fe43
16SHA1 (patch-am) = a01ab55a793c5249cc6fa0a4d98d61e43f173021 16SHA1 (patch-am) = a01ab55a793c5249cc6fa0a4d98d61e43f173021
17SHA1 (patch-an) = 5472758813b927708ca178809fb89733719e67b4 17SHA1 (patch-an) = 5472758813b927708ca178809fb89733719e67b4
18SHA1 (patch-bi) = b592d058a1d61322c03d1c3d44e39b48f2ddf7c3 18SHA1 (patch-bi) = b592d058a1d61322c03d1c3d44e39b48f2ddf7c3
 19SHA1 (patch-bj) = 578f4ac2fbe3e4f5d85a4ac24a778ce9d2e75045
File Added: pkgsrc/net/netatalk/patches/Attic/patch-bj
$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: