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

[chninkel at users.sourceforge.net]

Revision: 15154
          http://gar.svn.sourceforge.net/gar/?rev=15154&view=rev
Author:   chninkel
Date:     2011-07-20 13:30:57 +0000 (Wed, 20 Jul 2011)

Log Message:
-----------
cyrus_imapd: fixed some policy compliance errors

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

Modified: csw/mgar/pkg/cyrus_imapd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cyrus_imapd/trunk/Makefile	2011-07-20 13:26:19 UTC (rev 15153)
+++ csw/mgar/pkg/cyrus_imapd/trunk/Makefile	2011-07-20 13:30:57 UTC (rev 15154)
@@ -33,12 +33,12 @@
 
 SPKG_DESC_CSWcyrusimapd = Pop and Imap server from the Cyrus mail system
 CATALOGNAME_CSWcyrusimapd = cyrus_imapd
-RUNTIME_DEP_PKGS_CSWcyrusimapd = CSWosslrt CSWsasl CSWbdb42 CSWkrb5lib CSWnetsnmp CSWzlib CSWtcpwrap
+RUNTIME_DEP_PKGS_CSWcyrusimapd = CSWosslrt CSWsasl CSWbdb42 CSWkrb5lib CSWnetsnmp CSWzlib CSWtcpwrap CSWlibpcreposix0 CSWlibpcre0
 #SPKG_CLASSES_CSWcyrusimapd = none services cswpreserveconf cswinitsmf
 
 SPKG_DESC_CSWcyrusimapdutils = Various admin utilities for Cyrus Imapd/Popd
 CATALOGNAME_CSWcyrusimapdutils = cyrus_imapd_utils
-RUNTIME_DEP_PKGS_CSWcyrusimapdutils = CSWpmcyrus CSWosslrt CSWsasl CSWbdb42 CSWkrb5lib CSWzlib
+RUNTIME_DEP_PKGS_CSWcyrusimapdutils = CSWpmcyrus CSWosslrt CSWsasl CSWbdb42 CSWkrb5lib CSWzlib CSWlibpcreposix0 CSWlibpcre0
 #SPKG_CLASSES_CSWcyrusimapdutils = none 
 
 SPKG_DESC_CSWpmcyrus = Perl interface to Cyrus Imap functions
@@ -99,7 +99,13 @@
 CHECKPKG_OVERRIDES_CSWcyrusimapd += file-with-bad-content|/usr/local|root/opt/csw/share/doc/cyrus_imapd/text/install-testing
 CHECKPKG_OVERRIDES_CSWcyrusimapd += file-with-bad-content|/usr/local|root/opt/csw/share/doc/cyrus_imapd/text/install-compile
 
+# We will not fix this today
+CHECKPKG_OVERRIDES_CSWpmcyrus += catalogname-does-not-match-pkgname|pkgname=CSWpmcyrus|catalogname=pm_cyrus|expected-catalogname=pmcyrus
+CHECKPKG_OVERRIDES_CSWcyrusimapdutils += catalogname-does-not-match-pkgname|pkgname=CSWcyrusimapdutils|catalogname=cyrus_imapd_utils|expected-catalogname=cyrusimapdutils
+CHECKPKG_OVERRIDES_CSWcyrusimapd += catalogname-does-not-match-pkgname|pkgname=CSWcyrusimapd|catalogname=cyrus_imapd|expected-catalogname=cyrusimapd
 
+
+
 ###### Upstream and opencsw files information #######
 
 MASTER_SITES = ftp://ftp.cyrusimap.org/cyrus-imapd/ http://email.uoa.gr/download/cyrus/cyrus-imapd-$(VERSION)/ http://www.vx.sk/download/patches/cyrus-imapd/
@@ -158,6 +164,9 @@
 # "CC="/opt/SUNWspro/bin/cc -xrunpath"
 PATCHFILES += 0002-fix-config2header.patch
 
+# cyradmrc.pl should be in /etc/opt/csw/etc/cyrus, not in /usr/local/etc/
+PATCHFILES += cyradmrc.pl-path-modification.patch
+
 #GARCOMPILER = GNU
 #GNU_CC_OPT = -g
 #GNU_LD_OPT = -g


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