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

[guengel at users.sourceforge.net]

Revision: 16786
          http://gar.svn.sourceforge.net/gar/?rev=16786&view=rev
Author:   guengel
Date:     2012-01-17 19:34:52 +0000 (Tue, 17 Jan 2012)
Log Message:
-----------
cyrus_imapd/trunk: Added patch to make mkimap (mkdirs) work out of the box.

Modified Paths:
--------------
    csw/mgar/pkg/cyrus_imapd/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus-imapd-fix-path-in-mkimap.patch

Modified: csw/mgar/pkg/cyrus_imapd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cyrus_imapd/trunk/Makefile	2012-01-17 00:24:42 UTC (rev 16785)
+++ csw/mgar/pkg/cyrus_imapd/trunk/Makefile	2012-01-17 19:34:52 UTC (rev 16786)
@@ -186,6 +186,10 @@
 # "CC="/opt/SUNWspro/bin/cc -xrunpath"
 PATCHFILES += 0002-fix-config2header.patch
 
+# Changes location of imapd.conf from /etc/imapd.conf to
+# /etc/opt/csw/cyrus/imapd.conf in mkimap (mkdirs)
+PATCHFILES += cyrus-imapd-fix-path-in-mkimap.patch
+
 # cyradmrc.pl should be in /etc/opt/csw/etc/cyrus, not in /usr/local/etc/
 PATCHFILES += cyradmrc.pl-path-modification.patch
 
@@ -270,7 +274,7 @@
 install-additional-files:
 	# we provide our class action scripts to modify /etc/inet/services
 	ginstall -D $(WORKDIR_FIRSTMOD)/services $(PKGROOT)/etc/opt/csw/pkg/CSWcyrusimapd/services
-	
+		
 	# configuration and init file installation
 	ginstall -D "$(WORKDIR_FIRSTMOD)/cswcyrus" "$(PKGROOT)/etc/opt/csw/init.d/cswcyrus"
 	ginstall -D "$(WORKDIR_FIRSTMOD)/cswcyrus.xml" "$(PKGROOT)/var/opt/csw/svc/manifest/network/cswcyrus.xml"
@@ -324,6 +328,8 @@
 
 # we rename some tools with too generic names
 cyrus-rename:
+# I don't think renaming mkimap is clever, the online documentation
+# refers to mkimap. Renaming it may confuse users --raos
 	mv $(PKGROOT)/$(sbindir)/mkimap $(PKGROOT)/$(sbindir)/mkdirs
 	( for FILE in mkdirs mknewsgroups dohash undohash rehash; do \
 		mv $(PKGROOT)/$(sbindir)/$$FILE $(PKGROOT)/$(sbindir)/cyrus-$$FILE; \

Added: csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus-imapd-fix-path-in-mkimap.patch
===================================================================
--- csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus-imapd-fix-path-in-mkimap.patch	                        (rev 0)
+++ csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus-imapd-fix-path-in-mkimap.patch	2012-01-17 19:34:52 UTC (rev 16786)
@@ -0,0 +1,11 @@
+--- cyrus-imapd-2.4.10/tools/mkimap.orig	Tue Jan 17 20:14:11 2012
++++ cyrus-imapd-2.4.10/tools/mkimap	Tue Jan 17 20:13:14 2012
+@@ -90,7 +90,7 @@
+     close CONF;
+ }
+ 
+-$imapdconf = shift || "/etc/imapd.conf";
++$imapdconf = shift || "/etc/opt/csw/cyrus/imapd.conf";
+ 
+ push @configs, $imapdconf;
+ 

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