[67802] trunk/dports/devel/ice-cpp

[blair at macports.org]

Revision: 67802
          http://trac.macports.org/changeset/67802
Author:   blair at macports.org
Date:     2010-05-18 10:52:58 -0700 (Tue, 18 May 2010)
Log Message:
-----------
Regenerate ice-cpp's patches so they remove the fuzz and require
"patch.pre_args -p1".  This is done so that upstream patches from
ZeroC, which are produced by git and have a leading "a/" and "b/"
directory elemenet in the diff, can be added to the port without
modification.  This simplies the patch block and can make it into a
post-patch block.

Modified Paths:
--------------
    trunk/dports/devel/ice-cpp/Portfile
    trunk/dports/devel/ice-cpp/files/patch-ice.cpp.config.Make.rules.Darwin.diff
    trunk/dports/devel/ice-cpp/files/patch-ice.cpp.config.Make.rules.diff

Modified: trunk/dports/devel/ice-cpp/Portfile
===================================================================
--- trunk/dports/devel/ice-cpp/Portfile	2010-05-18 17:37:25 UTC (rev 67801)
+++ trunk/dports/devel/ice-cpp/Portfile	2010-05-18 17:52:58 UTC (rev 67802)
@@ -35,6 +35,7 @@
 distname        Ice-${version}
 patchfiles      patch-ice.cpp.config.Make.rules.diff \
                 patch-ice.cpp.config.Make.rules.Darwin.diff
+patch.pre_args  -p1
 checksums       md5 998b10627ade020cb00f5beb73efc0e0 \
                 sha1 1c8fe296af8d65d16cddac39a8bc24b71e069f75 \
                 rmd160 e874749f8d7d1916c1e3b19c006a7f2216e10f53
@@ -47,15 +48,7 @@
                 port:readline \
                 port:mcpp
 
-patch {
-        set cmd "cd ${workpath}/Ice-${version} && patch -p0 < ${filespath}/patch-ice.cpp.config.Make.rules.diff"
-        ui_debug ${cmd}
-        system ${cmd}
-
-        set cmd "cd ${workpath}/Ice-${version} && patch -p0 < ${filespath}/patch-ice.cpp.config.Make.rules.Darwin.diff"
-        ui_debug ${cmd}
-        system ${cmd}
-
+post-patch {
         reinplace "s/-O2/-g -O2/" \
                 ${workpath}/Ice-${version}/cpp/config/Make.rules.Darwin
 

Modified: trunk/dports/devel/ice-cpp/files/patch-ice.cpp.config.Make.rules.Darwin.diff
===================================================================
--- trunk/dports/devel/ice-cpp/files/patch-ice.cpp.config.Make.rules.Darwin.diff	2010-05-18 17:37:25 UTC (rev 67801)
+++ trunk/dports/devel/ice-cpp/files/patch-ice.cpp.config.Make.rules.Darwin.diff	2010-05-18 17:52:58 UTC (rev 67802)
@@ -1,6 +1,6 @@
-diff -ru ../Ice-3.4.0.orig/cpp/config/Make.rules.Darwin ./cpp/config/Make.rules.Darwin
---- ../Ice-3.4.0.orig/cpp/config/Make.rules.Darwin	2010-02-25 07:55:41.000000000 -0800
-+++ ./cpp/config/Make.rules.Darwin	2010-05-14 22:18:38.000000000 -0700
+diff -ru Ice-3.4.0.orig/cpp/config/Make.rules.Darwin Ice-3.4.0/cpp/config/Make.rules.Darwin
+--- Ice-3.4.0.orig/cpp/config/Make.rules.Darwin	2010-02-25 07:55:41.000000000 -0800
++++ Ice-3.4.0/cpp/config/Make.rules.Darwin	2010-05-18 10:43:17.000000000 -0700
 @@ -11,7 +11,7 @@
  # This file is included by Make.rules when uname is Darwin.
  #

Modified: trunk/dports/devel/ice-cpp/files/patch-ice.cpp.config.Make.rules.diff
===================================================================
--- trunk/dports/devel/ice-cpp/files/patch-ice.cpp.config.Make.rules.diff	2010-05-18 17:37:25 UTC (rev 67801)
+++ trunk/dports/devel/ice-cpp/files/patch-ice.cpp.config.Make.rules.diff	2010-05-18 17:52:58 UTC (rev 67802)
@@ -1,8 +1,8 @@
-diff -ru ../Ice-3.3.0.orig/cpp/config/Make.rules ./cpp/config/Make.rules
---- ../Ice-3.3.0.orig/cpp/config/Make.rules	2008-05-16 10:24:06.000000000 -0700
-+++ ./cpp/config/Make.rules	2008-05-23 12:40:52.000000000 -0700
-@@ -163,9 +163,9 @@
- BZIP2_RPATH_LINK        = $(if $(BZIP2_HOME),$(call rpathlink,$(BZIP2_HOME)/$(libsubdir)))
+diff -ru Ice-3.4.0.orig/cpp/config/Make.rules Ice-3.4.0/cpp/config/Make.rules
+--- Ice-3.4.0.orig/cpp/config/Make.rules	2010-02-25 07:55:46.000000000 -0800
++++ Ice-3.4.0/cpp/config/Make.rules	2010-05-18 10:43:54.000000000 -0700
+@@ -188,9 +188,9 @@
+ ICONV_LIBS              = $(if $(ICONV_HOME),-L$(ICONV_HOME)/$(libsubdir)) $(ICONV_LIB)
  
  ifneq ($(DB_HOME),)
 -   DB_FLAGS             = -I$(DB_HOME)/include
@@ -12,5 +12,5 @@
 +   DB_LIBS              = -L$(DB_HOME)/$(libsubdir)/db46 -ldb_cxx
 +   DB_RPATH_LINK        = $(call rpathlink,$(DB_HOME)/$(libsubdir)/db46)
  else
-    ifeq ($(shell if [ -d /usr/include/db46 -a -d /usr/$(libsubdir)/db46 ] ; then echo yes; fi), yes)
-       DB_FLAGS          = -I/usr/include/db46
+    ifeq ($(shell if [ -d /usr/include/db48 -a -d /usr/$(libsubdir)/db48 ] ; then echo yes; fi), yes)
+       DB_FLAGS          = -I/usr/include/db48
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100518/819c09a2/attachment.html>