[79863] trunk/dports/devel/libACE

[pixilla at macports.org]

Revision: 79863
          http://trac.macports.org/changeset/79863
Author:   pixilla at macports.org
Date:     2011-06-28 12:24:21 -0700 (Tue, 28 Jun 2011)
Log Message:
-----------
devel/libACE: Upgrade to 6.0.3. Fix +universal.

Modified Paths:
--------------
    trunk/dports/devel/libACE/Portfile

Added Paths:
-----------
    trunk/dports/devel/libACE/files/patch-ace-CDR_Base.inl.diff

Removed Paths:
-------------
    trunk/dports/devel/libACE/files/patch-configure.diff

Modified: trunk/dports/devel/libACE/Portfile
===================================================================
--- trunk/dports/devel/libACE/Portfile	2011-06-28 17:10:44 UTC (rev 79862)
+++ trunk/dports/devel/libACE/Portfile	2011-06-28 19:24:21 UTC (rev 79863)
@@ -2,10 +2,11 @@
 # $Id$
 
 PortSystem          1.0
+PortGroup           muniversal 1.0
 
 name                libACE
 set name_package    ACE
-version             6.0.1
+version             6.0.3
 distname            ${name_package}-${version}
 categories          devel
 maintainers         gmail.com:enrique.fernandez.perdomo pixilla
@@ -26,20 +27,22 @@
 homepage            http://www.cs.wustl.edu/~schmidt/ACE.html
 master_sites        http://download.dre.vanderbilt.edu/previous_versions
 
-checksums           sha1    27b63f309d247d1a208fc7ce194bc2b56153bac9 \
-                    rmd160  559fae18b42f0d479229708b114917b514a0ad7d
+checksums           sha1    a213b4b49817586806dc49b6878685d635e62bce \
+                    rmd160  f7873fdd058109f87003c7756069d52cf0d31543
 
 worksrcdir          ACE_wrappers
+
+patchfiles          patch-ace-CDR_Base.inl.diff
+
+configure.env-append "DYLD_LIBRARY_PATH=${worksrcpath}/lib:\${DYLD_LIBRARY_PATH}"
 configure.dir       ${worksrcpath}/build
 configure.cmd       ../configure
-build.dir           ${worksrcpath}/build
-patchfiles          patch-configure.diff
-
 configure.args      --disable-ssl
-
 pre-configure {
     xinstall -d ${worksrcpath}/build
 }
+build.dir           ${worksrcpath}/build
+build.env-append    "DYLD_LIBRARY_PATH=${worksrcpath}/lib:\${DYLD_LIBRARY_PATH}"
 
 livecheck.url       ${master_sites}
 livecheck.regex     ${name_package}-(\\d+\[0-9a-z.\]*)${extract.suffix}

Added: trunk/dports/devel/libACE/files/patch-ace-CDR_Base.inl.diff
===================================================================
--- trunk/dports/devel/libACE/files/patch-ace-CDR_Base.inl.diff	                        (rev 0)
+++ trunk/dports/devel/libACE/files/patch-ace-CDR_Base.inl.diff	2011-06-28 19:24:21 UTC (rev 79863)
@@ -0,0 +1,17 @@
+--- ace/CDR_Base.inl.orig	2011-06-03 21:31:31.000000000 -0700
++++ ace/CDR_Base.inl	2011-06-03 21:30:57.000000000 -0700
+@@ -174,10 +174,10 @@
+   // 64 bit architecture.
+   register unsigned long x =
+     * reinterpret_cast<const unsigned long*> (orig);
+-  register unsigned long x84 = (x & 0x000000ff000000ffUL) << 24;
+-  register unsigned long x73 = (x & 0x0000ff000000ff00UL) << 8;
+-  register unsigned long x62 = (x & 0x00ff000000ff0000UL) >> 8;
+-  register unsigned long x51 = (x & 0xff000000ff000000UL) >> 24;
++  register unsigned long x84 = (x & 0x000000ff000000ffLLU) << 24;
++  register unsigned long x73 = (x & 0x0000ff000000ff00LLU) << 8;
++  register unsigned long x62 = (x & 0x00ff000000ff0000LLU) >> 8;
++  register unsigned long x51 = (x & 0xff000000ff000000LLU) >> 24;
+   x = (x84 | x73 | x62 | x51);
+   x = (x << 32) | (x >> 32);
+   *reinterpret_cast<unsigned long*> (target) = x;

Deleted: trunk/dports/devel/libACE/files/patch-configure.diff
===================================================================
--- trunk/dports/devel/libACE/files/patch-configure.diff	2011-06-28 17:10:44 UTC (rev 79862)
+++ trunk/dports/devel/libACE/files/patch-configure.diff	2011-06-28 19:24:21 UTC (rev 79863)
@@ -1,15 +0,0 @@
---- configure.orig	2011-03-08 06:03:22.000000000 -0800
-+++ configure	2011-03-08 06:04:23.000000000 -0800
-@@ -24418,10 +24418,10 @@
-      case "$host_os" in
-      darwin*)
- 
--$as_echo "#define ACE_LD_SEARCH_PATH ACE_LIB_TEXT (\"DYLD_LIBRARY_PATH\")" >>confdefs.h
-+$as_echo "#define ACE_LD_SEARCH_PATH ACE_TEXT (\"DYLD_LIBRARY_PATH\")" >>confdefs.h
- 
- 
--$as_echo "#define ACE_DLL_SUFFIX ACE_LIB_TEXT (\".dylib\")" >>confdefs.h
-+$as_echo "#define ACE_DLL_SUFFIX ACE_TEXT (\".dylib\")" >>confdefs.h
- 
- 	;;
-      esac
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110628/91c89b15/attachment-0001.html>