[csw-devel] SF.net SVN: gar:[11992] csw/mgar/pkg/cyrus_imapd/trunk

[chninkel at users.sourceforge.net]

Revision: 11992
          http://gar.svn.sourceforge.net/gar/?rev=11992&view=rev
Author:   chninkel
Date:     2010-12-17 22:26:17 +0000 (Fri, 17 Dec 2010)

Log Message:
-----------
cyrus_imapd: fixed manifest file with new configuration file path

Modified Paths:
--------------
    csw/mgar/pkg/cyrus_imapd/trunk/Makefile
    csw/mgar/pkg/cyrus_imapd/trunk/files/cswcyrus.xml

Modified: csw/mgar/pkg/cyrus_imapd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cyrus_imapd/trunk/Makefile	2010-12-17 20:47:57 UTC (rev 11991)
+++ csw/mgar/pkg/cyrus_imapd/trunk/Makefile	2010-12-17 22:26:17 UTC (rev 11992)
@@ -55,7 +55,7 @@
 PKGFILES_CSWcyrusimapd += $(sysconfdir)/cyrus/imapd.conf.CSW
 PKGFILES_CSWcyrusimapd += $(sysconfdir)/cyrus/cyrus.conf.CSW
 PKGFILES_CSWcyrusimapd += /etc$(prefix)/init.d/cswcyrus
-PKGFILES_CSWcyrusimapd += /var/$(prefix)/svc/manifest/network/cswcyrus.xml
+PKGFILES_CSWcyrusimapd += /var$(prefix)/svc/manifest/network/cswcyrus\.xml
 PKGFILES_CSWcyrusimapd += $(localstatedir)/cyrus.*
 
 PROTOTYPE_MODIFIERS = cyrusdir
@@ -101,8 +101,12 @@
 DISTFILES += pm_cyrus.changelog.CSW
 
 # We move from /opt/csw/{etc,var} to /{etc,var}/opt/csw
-MIGRATE_FILES_CSWcyrusimapd = cyrus
+MIGRATE_FILES_CSWcyrusimapd = cyrus.conf imapd.conf
+MIGRATE_SOURCE_DIR = $(prefix)/etc/cyrus
+MIGRATE_DEST_DIR = $(sysconfdir)/cyrus
 
+
+
 # compile_et is not provided by krb5lib_dev so we must provide our own version
 # taken from the krb5 source.
 DISTFILES += compile_et et_c.awk et_h.awk
@@ -264,6 +268,6 @@
 	# let's remove pod files
 	gfind $(PKGROOT)$(perllib) -name "perllocal.pod" -exec rm '{}' ';'
 	# and CVS directories
-	 gfind $(PKGROOT) -type d -depth -name "CVS" -exec rm -rf '{}' ';'
+	 gfind $(PKGROOT) -depth -type d -name "CVS" -exec rm -rf '{}' ';'
 	
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/cswcyrus.xml
===================================================================
--- csw/mgar/pkg/cyrus_imapd/trunk/files/cswcyrus.xml	2010-12-17 20:47:57 UTC (rev 11991)
+++ csw/mgar/pkg/cyrus_imapd/trunk/files/cswcyrus.xml	2010-12-17 22:26:17 UTC (rev 11992)
@@ -45,7 +45,7 @@
 				restart_on='refresh'
 				type='path'>
 				<service_fmri
-					value='file://localhost/opt/csw/etc/cyrus/cyrus.conf' />
+					value='file://localhost/etc/opt/csw/cyrus/cyrus.conf' />
 			</dependency>
 
 			<dependent


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