[110177] trunk/dports/java/zeroc-ice35-java

[blair at macports.org]

Revision: 110177
          https://trac.macports.org/changeset/110177
Author:   blair at macports.org
Date:     2013-08-27 19:49:43 -0700 (Tue, 27 Aug 2013)
Log Message:
-----------
zeroc-ice35-java: update to 3.5.0.

Modified Paths:
--------------
    trunk/dports/java/zeroc-ice35-java/Portfile

Added Paths:
-----------
    trunk/dports/java/zeroc-ice35-java/files/
    trunk/dports/java/zeroc-ice35-java/files/patch-ice.scripts.TestUtil.py.diff

Modified: trunk/dports/java/zeroc-ice35-java/Portfile
===================================================================
--- trunk/dports/java/zeroc-ice35-java/Portfile	2013-08-28 01:34:19 UTC (rev 110176)
+++ trunk/dports/java/zeroc-ice35-java/Portfile	2013-08-28 02:49:43 UTC (rev 110177)
@@ -3,11 +3,8 @@
 PortSystem 1.0
 
 name            zeroc-ice35-java
-set real_version 3.5b
-version         0.0.${real_version}
-revision        2
-#set branch      [join [lrange [split ${real_version} .] 0 1] .]
-set branch      3.5
+version         3.5.0
+set branch      [join [lrange [split ${version} .] 0 1] .]
 categories      java devel
 maintainers     blair
 conflicts       zeroc-ice33-java zeroc-ice34-java
@@ -35,9 +32,12 @@
 homepage        http://www.zeroc.com/
 master_sites    ${homepage}download/Ice/${branch}/
 dist_subdir     zeroc-ice35
-distname        Ice-${real_version}
-checksums       sha1 1c40ca1152055ed824cec01bb4e25d7733812854 \
-                sha256 223e48213b1a5f087c760a2937d54d2878d78dc0b50cc506806ade57609fb083
+distname        Ice-${version}
+checksums       sha1   8501afaf86c0d62192cfc1b83c338178f73e98e9 \
+                sha256 583d4a819d50ad8b79b1e9ad45abfa3078f981486271ca8cd9ede8fa420ff575
+patchfiles      patch-ice.scripts.TestUtil.py.diff
+patch.pre_args  -p1
+
 platforms       darwin
 
 depends_lib     port:db46-java \

Added: trunk/dports/java/zeroc-ice35-java/files/patch-ice.scripts.TestUtil.py.diff
===================================================================
--- trunk/dports/java/zeroc-ice35-java/files/patch-ice.scripts.TestUtil.py.diff	                        (rev 0)
+++ trunk/dports/java/zeroc-ice35-java/files/patch-ice.scripts.TestUtil.py.diff	2013-08-28 02:49:43 UTC (rev 110177)
@@ -0,0 +1,42 @@
+Prevent runtime issues due to DYLD_LIBRARY_PATH being set, so use
+DYLD_FALLBACK_LIBRARY_PATH instead.
+
+$ cd /opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_release_ports_java_zeroc-ice35-java/zeroc-ice35-java/work/Ice-3.5.0/java/test/Slice/generation
+$ DYLD_LIBRARY_PATH=/opt/local/lib:/opt/local/lib/db46 ./run.py 
+starting client... ok
+dyld: Symbol not found: __cg_jpeg_resync_to_restart
+  Referenced from: /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/ImageIO
+  Expected in: /opt/local/lib/libJPEG.dylib
+ in /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/ImageIO
+unexpected exit status: expected: 0, got -5
+Traceback (most recent call last):
+  File "./run.py", line 28, in <module>
+    clientProc.waitTestSuccess()
+  File "/opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_release_ports_java_zeroc-ice35-java/zeroc-ice35-java/work/Ice-3.5.0/scripts/Expect.py", line 564, in waitTestSuccess
+    test(self.exitstatus, exitstatus)
+  File "/opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_release_ports_java_zeroc-ice35-java/zeroc-ice35-java/work/Ice-3.5.0/scripts/Expect.py", line 549, in test
+    assert False
+AssertionError
+
+
+diff -ru Ice-3.5.0.orig/scripts/TestUtil.py Ice-3.5.0/scripts/TestUtil.py
+--- Ice-3.5.0.orig/scripts/TestUtil.py	2013-03-11 08:19:47.000000000 -0700
++++ Ice-3.5.0/scripts/TestUtil.py	2013-08-27 18:11:26.000000000 -0700
+@@ -182,7 +182,7 @@
+ def dumpenv(env, lang):
+     if env is None:
+         env = os.environ
+-    vars = ["PATH", "LD_LIBRARY_PATH", "DYLD_LIBRARY_PATH", "SHLIB_PATH", "LIBPATH", "LD_LIBRARY_PATH_64"]
++    vars = ["PATH", "LD_LIBRARY_PATH", "DYLD_LIBRARY_PATH", "DYLD_FALLBACK_LIBRARY_PATH", "SHLIB_PATH", "LIBPATH", "LD_LIBRARY_PATH_64"]
+     if lang is None:
+         vars.extend(["CLASSPATH", "MONO_PATH", "DEVPATH", "PYTHONPATH", "RUBYLIB"])
+     elif lang == "cpp":
+@@ -205,7 +205,7 @@
+     if isWin32():
+         addPathToEnv("PATH", libpath, env)
+     elif isDarwin():
+-        addPathToEnv("DYLD_LIBRARY_PATH", libpath, env)
++        addPathToEnv("DYLD_FALLBACK_LIBRARY_PATH", libpath, env)
+     elif isAIX():
+         addPathToEnv("LIBPATH", libpath, env)
+     else:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130827/4adf96c8/attachment-0001.html>