[100529] trunk/dports/python

[blair at macports.org]

Revision: 100529
          https://trac.macports.org/changeset/100529
Author:   blair at macports.org
Date:     2012-12-14 13:34:35 -0800 (Fri, 14 Dec 2012)
Log Message:
-----------
py-zeroc-ice35: new Python bindings for Ice 3.5b; based on py-zeroc-ice34.

Modified Paths:
--------------
    trunk/dports/python/py-zeroc-ice35/Portfile
    trunk/dports/python/py-zeroc-ice35/files/patch-py.config.Make.rules.Darwin.diff

Added Paths:
-----------
    trunk/dports/python/py-zeroc-ice35/

Modified: trunk/dports/python/py-zeroc-ice35/Portfile
===================================================================
--- trunk/dports/python/py-zeroc-ice34/Portfile	2012-12-14 20:57:13 UTC (rev 100528)
+++ trunk/dports/python/py-zeroc-ice35/Portfile	2012-12-14 21:34:35 UTC (rev 100529)
@@ -3,10 +3,11 @@
 PortSystem 1.0
 PortGroup       python 1.0
 
-name            py-zeroc-ice34
-version         3.4.2
-revision        1
-set branch      [join [lrange [split ${version} .] 0 1] .]
+name            py-zeroc-ice35
+set real_version 3.5b
+version         0.0.${real_version}
+#set branch      [join [lrange [split ${real_version} .] 0 1] .]
+set branch      3.5
 categories-append   devel
 maintainers     blair
 license         GPL-2
@@ -33,11 +34,10 @@
 
 homepage        http://www.zeroc.com/
 master_sites    ${homepage}download/Ice/${branch}/
-dist_subdir     zeroc-ice34
-distname        Ice-${version}
-checksums       md5 e97672eb4a63c6b8dd202d0773e19dc7 \
-                sha1 8c84d6e3b227f583d05e08251e07047e6c3a6b42 \
-                rmd160 7ce680a4eb5fa9d0bb6f8b8910e267dfc2373d75
+dist_subdir     zeroc-ice35
+distname        Ice-${real_version}
+checksums       sha1 1c40ca1152055ed824cec01bb4e25d7733812854 \
+                sha256 223e48213b1a5f087c760a2937d54d2878d78dc0b50cc506806ade57609fb083
 patchfiles      patch-py.config.Make.rules.Darwin.diff
 platforms       darwin
 
@@ -56,7 +56,7 @@
         set python.include  ${python.prefix}/include/python${python.branch}
     }
 
-    depends_lib-append  port:zeroc-ice34
+    depends_lib-append  port:zeroc-ice35
 
     build.dir       ${worksrcpath}/py
 
@@ -64,8 +64,8 @@
         reinplace "s/-O2/-g -O2/" ${build.dir}/config/Make.rules.Darwin
 
         # Prevent name conflicts between libICE.* from xorg-libice and
-        # libIce.* from this port by renaming libIce.* to libZeroCIce.*.
-        reinplace "s/-lIce /-lZeroCIce /" \
+        # libIce.* from this port by renaming s/libIce/libZerocIce/.
+        reinplace -E {s/-lIce([ A-Z]|$)/-lZerocIce\1/g} \
             ${build.dir}/config/Make.rules \
             ${build.dir}/config/Make.rules.Darwin
     }

Modified: trunk/dports/python/py-zeroc-ice35/files/patch-py.config.Make.rules.Darwin.diff
===================================================================
--- trunk/dports/python/py-zeroc-ice34/files/patch-py.config.Make.rules.Darwin.diff	2012-12-14 20:57:13 UTC (rev 100528)
+++ trunk/dports/python/py-zeroc-ice35/files/patch-py.config.Make.rules.Darwin.diff	2012-12-14 21:34:35 UTC (rev 100529)
@@ -1,6 +1,6 @@
-diff -ru ../Ice-3.3.1.orig/py/config/Make.rules.Darwin ./py/config/Make.rules.Darwin
---- ../Ice-3.3.1.orig/py/config/Make.rules.Darwin	2009-03-20 10:52:15.000000000 -0700
-+++ ./py/config/Make.rules.Darwin	2009-04-05 02:43:03.000000000 -0700
+diff -ru ../Ice-3.5b.orig/py/config/Make.rules.Darwin ./py/config/Make.rules.Darwin
+--- ../Ice-3.5b.orig/py/config/Make.rules.Darwin	2012-12-12 13:15:12.000000000 -0800
++++ ./py/config/Make.rules.Darwin	2012-12-14 13:13:59.000000000 -0800
 @@ -18,7 +18,7 @@
      ifeq ($(shell test ! -f $(PYTHON_HOME)/Python && echo 0),0)
          $(error Unable to find Python framework See config/Make.rules.Darwin)
@@ -19,12 +19,9 @@
  
  CXXFLAGS		= -ftemplate-depth-128 -Wall -D_REENTRANT
  
-@@ -46,6 +46,6 @@
- mkshlib                 = $(CXX) -bundle $(shlibldflags) -o $(1) $(3) $(4)
- 
+@@ -48,4 +48,4 @@
  BASELIBS		= -lIceUtil -lpthread 
--LIBS			= -lIce $(BASELIBS)
-+LIBS			= -lZeroCIce $(BASELIBS)
+ LIBS			= -lIce $(BASELIBS)
  
 -PLATFORM_HAS_READLINE   := no
 +PLATFORM_HAS_READLINE   := yes
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121214/f902484b/attachment.html>