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

[chninkel at users.sourceforge.net]

Revision: 19731
          http://gar.svn.sourceforge.net/gar/?rev=19731&view=rev
Author:   chninkel
Date:     2012-11-24 14:31:45 +0000 (Sat, 24 Nov 2012)
Log Message:
-----------
cyrus_imapd/trunk: removed config2header patch (applied upstream)

Modified Paths:
--------------
    csw/mgar/pkg/cyrus_imapd/trunk/Makefile
    csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW
    csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW
    csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW

Removed Paths:
-------------
    csw/mgar/pkg/cyrus_imapd/trunk/files/0002-fix-config2header.patch

Modified: csw/mgar/pkg/cyrus_imapd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cyrus_imapd/trunk/Makefile	2012-11-24 14:18:28 UTC (rev 19730)
+++ csw/mgar/pkg/cyrus_imapd/trunk/Makefile	2012-11-24 14:31:45 UTC (rev 19731)
@@ -182,12 +182,6 @@
 #   <http://www.opencsw.org/mantis/view.php?id=3766>
 PATCHFILES += 0001-Force-linkage-to-libperl.so.patch
 
-# Fix config2header so it works with argument like
-# "CC=/path/to/CC arg1 arg2"
-# mandatory to work with assignment like
-# "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

Deleted: csw/mgar/pkg/cyrus_imapd/trunk/files/0002-fix-config2header.patch
===================================================================
--- csw/mgar/pkg/cyrus_imapd/trunk/files/0002-fix-config2header.patch	2012-11-24 14:18:28 UTC (rev 19730)
+++ csw/mgar/pkg/cyrus_imapd/trunk/files/0002-fix-config2header.patch	2012-11-24 14:31:45 UTC (rev 19731)
@@ -1,12 +0,0 @@
-diff --speed-large-files --minimal -Nru ./tools/config2header ./tools/config2header.new
---- ./tools/config2header	Sat Nov 20 00:11:21 2010
-+++ ./tools/config2header.new	Sat Nov 20 00:11:11 2010
-@@ -71,7 +71,7 @@
- # Look for CC=xxx "assigments" in the argument list.
- #
- while ($#ARGV >= 0) {
--	last unless ($ARGV[0] =~ m/^(\S+)=(\S+)$/);
-+	last unless ($ARGV[0] =~ m/^(\S+)=(.+)$/);
- 	eval "\$$1='$2';";
- 	die "$@" if ($@);
- 	shift @ARGV;

Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW
===================================================================
--- csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW	2012-11-24 14:18:28 UTC (rev 19730)
+++ csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW	2012-11-24 14:31:45 UTC (rev 19731)
@@ -5,6 +5,7 @@
   * Fixed dependencies problems:
     - missing pm_cyrus dependency for cyrus_imapd_utils
     - netsnmpd dependency mistake.
+  \xC3 Removed config2header patch as it was applied upstream.
 
  -- Yann Rouillard <yann at opencsw.org>  Sat, 24 Nov 2012 15:12:49 +0100
 

Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW
===================================================================
--- csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW	2012-11-24 14:18:28 UTC (rev 19730)
+++ csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW	2012-11-24 14:31:45 UTC (rev 19731)
@@ -5,6 +5,7 @@
   * Fixed dependencies problems:
     - missing pm_cyrus dependency for cyrus_imapd_utils
     - netsnmpd dependency mistake.
+  * Removed config2header patch as it was applied upstream.
 
  -- Yann Rouillard <yann at opencsw.org>  Sat, 24 Nov 2012 15:12:49 +0100
 

Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW
===================================================================
--- csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW	2012-11-24 14:18:28 UTC (rev 19730)
+++ csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW	2012-11-24 14:31:45 UTC (rev 19731)
@@ -5,6 +5,7 @@
   * Fixed dependencies problems:
     - missing pm_cyrus dependency for cyrus_imapd_utils
     - netsnmpd dependency mistake.
+  * Removed config2header patch as it was applied upstream.
 
  -- Yann Rouillard <yann at opencsw.org>  Sat, 24 Nov 2012 15:12:49 +0100
 

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