Ticket #24904: patch.diff

devel/ice-cpp/files/patch-ice.cpp.config.Make.rules.diff

@@ -1 @@
-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)))
+--- cpp/config/Make.rules.orig  2010-02-25 09:55:46.000000000 -0600
++++ cpp/config/Make.rules       2010-05-16 00:37:22.000000000 -0500
+@@ -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 +11 @@
 +   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

devel/ice-cpp/Portfile

@@ -47 +47 @@
                 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
 

devel/ice-java/Portfile

@@ -34 +34 @@
 dist_subdir     ice-cpp
 distname        Ice-${version}
 patchfiles      patch-java.src.ant.Slice2JavaTask.java.diff
+patch.pre_args  -p1
 checksums       md5 998b10627ade020cb00f5beb73efc0e0 \
                 sha1 1c8fe296af8d65d16cddac39a8bc24b71e069f75 \
                 rmd160 e874749f8d7d1916c1e3b19c006a7f2216e10f53
@@ -46 +47 @@
                 port:jgoodies-looks \
                 port:proguard
 
-patch {
-        set cmd "cd ${workpath}/Ice-${version} && patch -p1 < ${filespath}/patch-java.src.ant.Slice2JavaTask.java.diff"
-        ui_debug ${cmd}
-        system ${cmd}
-}
-
 use_configure        no
 
 set classpath ${prefix}/lib/db46/db.jar:${prefix}/share/java/forms.jar:${prefix}/share/java/looks.jar:${prefix}/share/java/proguard.jar