diff options
author | taca <taca> | 2009-02-22 07:35:16 +0000 |
---|---|---|
committer | taca <taca> | 2009-02-22 07:35:16 +0000 |
commit | fc43e7cc60ddabf1e7542ed08b676521c768afeb (patch) | |
tree | c3a6505541e9a6c6178b28e1167bb8045cf3bec6 /net | |
parent | 66ed29605fc76bef9ba98f249f5c4129ebd71cac (diff) | |
download | pkgsrc-fc43e7cc60ddabf1e7542ed08b676521c768afeb.tar.gz |
* Add cjk(Chinese/Japaneses/Korean) patch which would be included in
feature 2.1 release. It could make netatalk1 package obsolete.
* Use RCD_SCRIPTS instead of substituting a Makefile to be fix pkglint
errors.
* Move PKG_OPTION part to options.mk
* From patch-aa, remove last change which made by
configure/gnu-configure.mk.
* Change content of MESSAGE from covered by pkginstall framework to
caution about migration from netatalk 1.x.
Approved by MAINTAINER and PKGREVISION.
Diffstat (limited to 'net')
-rw-r--r-- | net/netatalk/MESSAGE | 19 | ||||
-rw-r--r-- | net/netatalk/Makefile | 51 | ||||
-rw-r--r-- | net/netatalk/distinfo | 7 | ||||
-rw-r--r-- | net/netatalk/options.mk | 50 | ||||
-rw-r--r-- | net/netatalk/patches/patch-aa | 13 |
5 files changed, 72 insertions, 68 deletions
diff --git a/net/netatalk/MESSAGE b/net/netatalk/MESSAGE index c531d93ca01..7297e5a9820 100644 --- a/net/netatalk/MESSAGE +++ b/net/netatalk/MESSAGE @@ -1,18 +1,11 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.4 2008/03/22 04:40:45 taca Exp $ +$NetBSD: MESSAGE,v 1.5 2009/02/22 07:35:16 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 +For users migrating from netatalk 1.x, note that CAP encoding isn't +supported by Netatalk 2 any more. You could convert encoding of file +names from CAP to UTF-8 with some tools, but it is simple and safe way. -Example Netatalk config files have been installed in the examples directory -at ${PREFIX}/share/examples/netatalk. Production config files are -installed in ${PKG_SYSCONFDIR}. If no config files existed before this -package was installed, default config files were copied in. +* You should backup your volumes to a client. +* Restore backuped volumes from the client. =========================================================================== diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile index b9d170b8fe0..4f5e8429e45 100644 --- a/net/netatalk/Makefile +++ b/net/netatalk/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.62 2009/02/12 06:44:55 markd Exp $ +# $NetBSD: Makefile,v 1.63 2009/02/22 07:35:16 taca Exp $ DISTNAME= netatalk-2.0.3 -PKGREVISION= 12 +PKGREVISION= 13 CATEGORIES= net print MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=netatalk/} EXTRACT_SUFX= .tar.bz2 @@ -57,54 +57,21 @@ MAKE_DIRS+= ${PKG_SYSCONFDIR}/msg SUBST_CLASSES+= paths SUBST_MESSAGE.paths= Fixing hardcoded paths. -SUBST_STAGE.paths= post-patch +SUBST_STAGE.paths= pre-configure 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}," + +RCD_SCRIPTS= afpd atalkd papd timelord cnid_metad +.for f in ${RCD_SCRIPTS} +RCD_SCRIPT_SRC.${f}= ${WRKSRC}/distrib/initscripts/${f} +.endfor SUBST_CLASSES+= rc SUBST_FILES.rc= ${WRKSRC}/bin/afile/acleandir.rc SUBST_SED.rc+= -e 's,@PREFIX@,${PREFIX:Q},g' SUBST_STAGE.rc= pre-configure -PKG_OPTIONS_VAR= PKG_OPTIONS.netatalk -PKG_SUPPORTED_OPTIONS= cups kerberos pam slp - -.include "../../mk/bsd.options.mk" - -.if !empty(PKG_OPTIONS:Mcups) -.include "../../print/cups/buildlink3.mk" -CONFIGURE_ARGS+= --enable-cups -.else -CONFIGURE_ARGS+= --disable-cups -.endif - -PLIST_VARS+= gssapi -.if !empty(PKG_OPTIONS:Mkerberos) -.include "../../mk/krb5.buildlink3.mk" -CONFIGURE_ARGS+= --with-gssapi --enable-krbV-uam -CONFIGURE_ENV+= GSSAPI_LIBS="-lkrb5 -lroken -lasn1 -lcrypto -lcom_err" -PLIST.gssapi= yes -.else -CONFIGURE_ARGS+= --without-gssapi -.endif - -PLIST_VARS+= pam -.if !empty(PKG_OPTIONS:Mpam) -.include "../../mk/pam.buildlink3.mk" -CONFIGURE_ARGS+= --with-pam -PLIST.pam= yes -MESSAGE_SRC+= MESSAGE MESSAGE.pam -.else -CONFIGURE_ARGS+= --without-pam -.endif - -.if !empty(PKG_OPTIONS:Mslp) -.include "../../net/openslp/buildlink3.mk" -CONFIGURE_ARGS+= --enable-srvloc -.else -CONFIGURE_ARGS+= --disable-srvloc -.endif +.include "options.mk" INSTALLATION_DIRS= libexec/psffilters diff --git a/net/netatalk/distinfo b/net/netatalk/distinfo index 3589a7bf388..986049bd05f 100644 --- a/net/netatalk/distinfo +++ b/net/netatalk/distinfo @@ -1,9 +1,12 @@ -$NetBSD: distinfo,v 1.28 2008/12/29 08:48:45 markd Exp $ +$NetBSD: distinfo,v 1.29 2009/02/22 07:35:16 taca Exp $ +SHA1 (netatalk-2.0.3-cjk-2b.patch.gz) = 0c303a9d20ca7277b2914acc2cd5b12b24857629 +RMD160 (netatalk-2.0.3-cjk-2b.patch.gz) = 58b2710261e7f37e465f39f716c387447927fc69 +Size (netatalk-2.0.3-cjk-2b.patch.gz) = 25545 bytes SHA1 (netatalk-2.0.3.tar.bz2) = ce2d5dd123467ccae72fc62ca4ee3738019455f2 RMD160 (netatalk-2.0.3.tar.bz2) = 29b763400a45797ac4a8e499d5328aa91a091c91 Size (netatalk-2.0.3.tar.bz2) = 1471804 bytes -SHA1 (patch-aa) = dc0ee0a09c2a763fe475f9f1e6b77bf32cf5f482 +SHA1 (patch-aa) = 0c5176e46b33667efd175c668617527aee33a05f SHA1 (patch-ab) = 10bf2fdd900a6c2189376757e921bb6228e0f19c SHA1 (patch-ac) = ba559d1b957172e77ec8eb9cc5c60d2f88044ffa SHA1 (patch-ad) = 311d00d165688d4baa1365ba6c4147bd6293f3d8 diff --git a/net/netatalk/options.mk b/net/netatalk/options.mk new file mode 100644 index 00000000000..924c4af5406 --- /dev/null +++ b/net/netatalk/options.mk @@ -0,0 +1,50 @@ +# $NetBSD: options.mk,v 1.1 2009/02/22 07:35:16 taca Exp $ +# +PKG_OPTIONS_VAR= PKG_OPTIONS.netatalk +PKG_SUPPORTED_OPTIONS= cjk cups kerberos pam slp + +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Mcjk) +# CJK(Chinese/Japanese/Korean) patch. +# +# http://www003.upp.so-net.ne.jp/hat/netatalk/cjk.html +# +PATCHFILES+= netatalk-2.0.3-cjk-2b.patch.gz +PATCH_SITES+= http://www003.upp.so-net.ne.jp/hat/files/ +PATCH_DIST_STRIP.netatalk-2.0.3-cjk-2b.patch.gz= -p1 +.endif + +.if !empty(PKG_OPTIONS:Mcups) +.include "../../print/cups/buildlink3.mk" +CONFIGURE_ARGS+= --enable-cups +.else +CONFIGURE_ARGS+= --disable-cups +.endif + +PLIST_VARS+= gssapi +.if !empty(PKG_OPTIONS:Mkerberos) +.include "../../mk/krb5.buildlink3.mk" +CONFIGURE_ARGS+= --with-gssapi --enable-krbV-uam +CONFIGURE_ENV+= GSSAPI_LIBS="-lkrb5 -lroken -lasn1 -lcrypto -lcom_err" +PLIST.gssapi= yes +.else +CONFIGURE_ARGS+= --without-gssapi +.endif + +PLIST_VARS+= pam +.if !empty(PKG_OPTIONS:Mpam) +.include "../../mk/pam.buildlink3.mk" +CONFIGURE_ARGS+= --with-pam +PLIST.pam= yes +MESSAGE_SRC+= MESSAGE MESSAGE.pam +.else +CONFIGURE_ARGS+= --without-pam +.endif + +.if !empty(PKG_OPTIONS:Mslp) +.include "../../net/openslp/buildlink3.mk" +CONFIGURE_ARGS+= --enable-srvloc +.else +CONFIGURE_ARGS+= --disable-srvloc +.endif diff --git a/net/netatalk/patches/patch-aa b/net/netatalk/patches/patch-aa index 5e7fa321cd9..c07d8992412 100644 --- a/net/netatalk/patches/patch-aa +++ b/net/netatalk/patches/patch-aa @@ -1,3 +1,5 @@ +$NetBSD: patch-aa,v 1.17 2009/02/22 07:35:16 taca Exp $ + --- configure.orig 2005-05-17 18:14:29.000000000 -0400 +++ configure 2008-04-05 21:15:47.000000000 -0400 @@ -12464,7 +12464,7 @@ @@ -54,14 +56,3 @@ ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 -@@ -20437,6 +20437,10 @@ - _ACEOF - cat >>$CONFIG_STATUS <<\_ACEOF - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) -+ : Avoid regenerating within pkgsrc -+ exit 0 -+ : Avoid regenerating within pkgsrc -+ exit 0 - ac_cs_recheck=: ;; - --version | --vers* | -V ) - echo "$ac_cs_version"; exit 0 ;; |