[csw-devel] SF.net SVN: gar:[21031] csw/mgar/pkg/netatalk/trunk

[slowfranklin at users.sourceforge.net]

Revision: 21031
          http://gar.svn.sourceforge.net/gar/?rev=21031&view=rev
Author:   slowfranklin
Date:     2013-05-08 12:45:48 +0000 (Wed, 08 May 2013)
Log Message:
-----------
netatalk/trunk: Rename SMF manifest to cswnetatalk and add PRESERVECONF

Modified Paths:
--------------
    csw/mgar/pkg/netatalk/trunk/Makefile
    csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.postinstall
    csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.preremove

Added Paths:
-----------
    csw/mgar/pkg/netatalk/trunk/files/0004-Prevent-SMF-manifest-import-on-install.patch

Modified: csw/mgar/pkg/netatalk/trunk/Makefile
===================================================================
--- csw/mgar/pkg/netatalk/trunk/Makefile	2013-05-08 12:14:44 UTC (rev 21030)
+++ csw/mgar/pkg/netatalk/trunk/Makefile	2013-05-08 12:45:48 UTC (rev 21031)
@@ -45,7 +45,21 @@
 PATCHFILES += 0000-Add-rpath-for-bdb.patch
 PATCHFILES += 0001-Fix-use-of-unnamed-union-inside-struct.patch
 PATCHFILES += 0003-Fix-misspelled-compiler-variable.patch
+PATCHFILES += 0004-Prevent-SMF-manifest-import-on-install.patch
 
+REINPLACEMENTS += manifest1
+REINPLACE_MATCH_manifest1 = network/netatalk
+REINPLACE_WITH_manifest1 = network/cswnetatalk
+REINPLACE_FILES_manifest1 += netatalk.xml.in
+
+REINPLACEMENTS += manifest2
+REINPLACE_MATCH_manifest2 = name="netatalk"
+REINPLACE_WITH_manifest2 =  name="cswnetatalk"
+REINPLACE_FILES_manifest2 += netatalk.xml.in
+
+PRESERVECONF += $(sysconfdir)/afp.conf
+PRESERVECONF += $(sysconfdir)/extmap.conf
+
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --libdir=$(prefix)/lib/netatalk
 CONFIGURE_ARGS += --with-uams-path=$(prefix)/lib/netatalk
@@ -57,8 +71,10 @@
 CONFIGURE_ARGS += --with-init-dir=/var/opt/csw/svc/manifest/network/
 
 # Path to XML dtd
-CHECKPKG_OVERRIDES_CSWnetatalk += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/network/netatalk.xml
+CHECKPKG_OVERRIDES_CSWnetatalk += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/network/cswnetatalk.xml
 
-
 include gar/category.mk
 
+post-install-modulated:
+	mv $(DESTDIR)/var/opt/csw/svc/manifest/network/netatalk.xml $(DESTDIR)/var/opt/csw/svc/manifest/network/cswnetatalk.xml
+	@$(MAKECOOKIE)

Added: csw/mgar/pkg/netatalk/trunk/files/0004-Prevent-SMF-manifest-import-on-install.patch
===================================================================
--- csw/mgar/pkg/netatalk/trunk/files/0004-Prevent-SMF-manifest-import-on-install.patch	                        (rev 0)
+++ csw/mgar/pkg/netatalk/trunk/files/0004-Prevent-SMF-manifest-import-on-install.patch	2013-05-08 12:45:48 UTC (rev 21031)
@@ -0,0 +1,25 @@
+From 4f487a28be731ecd36e30ea2ca3b4039ba69132a Mon Sep 17 00:00:00 2001
+From: Ralph Boehme <sloowfranklin at gmail.com>
+Date: Wed, 8 May 2013 13:59:21 +0200
+Subject: [PATCH] Prevent SMF manifest import on install
+
+---
+ distrib/initscripts/Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/distrib/initscripts/Makefile.in b/distrib/initscripts/Makefile.in
+index 3ceeba3..e030cc6 100644
+--- a/distrib/initscripts/Makefile.in
++++ b/distrib/initscripts/Makefile.in
+@@ -719,7 +719,7 @@ uninstall: uninstall-startup
+ @USE_NETBSD_TRUE at uninstall-startup: uninstall-am
+ 
+ @USE_SOLARIS_TRUE at install-data-hook:
+- at USE_SOLARIS_TRUE@	svccfg import netatalk.xml
++# @USE_SOLARIS_TRUE@	svccfg import netatalk.xml
+ 
+ @USE_SOLARIS_TRUE at uninstall-startup:
+ @USE_SOLARIS_TRUE@	svccfg delete network/netatalk
+-- 
+1.8.1.4
+

Modified: csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.postinstall
===================================================================
--- csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.postinstall	2013-05-08 12:14:44 UTC (rev 21030)
+++ csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.postinstall	2013-05-08 12:45:48 UTC (rev 21031)
@@ -1,2 +1,2 @@
 #!/bin/sh
-chroot ${PKG_INSTALL_ROOT:-/} /usr/sbin/svccfg import /var/opt/csw/svc/manifest/network/netatalk.xml > /dev/null 2>&1
+chroot ${PKG_INSTALL_ROOT:-/} /usr/sbin/svccfg import /var/opt/csw/svc/manifest/network/cswnetatalk.xml > /dev/null 2>&1

Modified: csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.preremove
===================================================================
--- csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.preremove	2013-05-08 12:14:44 UTC (rev 21030)
+++ csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.preremove	2013-05-08 12:45:48 UTC (rev 21031)
@@ -1,2 +1,2 @@
 #!/bin/sh
-chroot ${PKG_INSTALL_ROOT:-/} /usr/sbin/svccfg delete -f netatalk
+chroot ${PKG_INSTALL_ROOT:-/} /usr/sbin/svccfg delete -f cswnetatalk

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.