[96916] trunk/dports/devel
pixilla at macports.org
pixilla at macports.org
Tue Aug 21 06:56:25 PDT 2012
Revision: 96916
https://trac.macports.org/changeset/96916
Author: pixilla at macports.org
Date: 2012-08-21 06:56:24 -0700 (Tue, 21 Aug 2012)
Log Message:
-----------
devel/ace:
- Update version to 6.1.2.
- Cleanup _universal.
devel/tao:
- Update version to 6.1.2.
- Cleanup _universal.
Modified Paths:
--------------
trunk/dports/devel/ace/Portfile
trunk/dports/devel/tao/Portfile
Modified: trunk/dports/devel/ace/Portfile
===================================================================
--- trunk/dports/devel/ace/Portfile 2012-08-21 13:31:38 UTC (rev 96915)
+++ trunk/dports/devel/ace/Portfile 2012-08-21 13:56:24 UTC (rev 96916)
@@ -3,15 +3,10 @@
PortSystem 1.0
-# Disable the full universal support since ACE already does most of this
-# and the extra stuff in muniversal (including making two build trees
-# and using libtool to merge libraries) does not work for this case.
-# PortGroup muniversal 1.0
-
name ace
set name_package ACE
version 6.1.2
-revision 1
+revision 2
distname ${name_package}-${version}
categories devel
maintainers fourpalms.org:lockhart openmaintainer
@@ -37,10 +32,6 @@
universal_variant yes
-variant ssl description {Enable SSL} {
- depends_lib port:openssl
-}
-
use_bzip2 yes
worksrcdir ACE_wrappers
@@ -61,13 +52,12 @@
11 lion
12 mountainlion
}
-if {"darwin" == ${os.platform}} {
- foreach {key value} [array get os.names] {
- if {${key} == ${os.major}} {
- set os.name ${value}
- }
+foreach {key value} [array get os.names] {
+ if {${key} == ${os.major}} {
+ set os.name ${value}
}
}
+
set libenv DYLD_LIBRARY_PATH=${worksrcpath}/lib
set aceenv ACE_ROOT=${worksrcpath}
set makearg INSTALL_PREFIX=${prefix}
@@ -78,29 +68,46 @@
${worksrcpath}/ace/config.h \
${worksrcpath}/include/makeinclude/platform_macros.GNU
# disable the assignment for compilers in lion and use our environment instead
+ ui_info "patching platform_macosx_lion.GNU"
reinplace "s|^\\(CXX:=.*\\)|# \\1|g" \
${worksrcpath}/include/makeinclude/platform_macosx_lion.GNU
reinplace "s|^\\(CC:=.*\\)|# \\1|g" \
${worksrcpath}/include/makeinclude/platform_macosx_lion.GNU
+}
- if {[variant_exists universal] && [variant_isset universal]} {
- ui_debug "Enabling a universal build"
+depends_lib-append path:bin/perl:perl5
+
+proc setuniversalflags {fname cxxflags ldflags} {
+ set apat "-arch \[ \]*\[a-z\]\[_a-z0-9\]*"
+ if {[file exists ${fname}]} {
+ reinplace "s|^\\(\[ \]*FLAGS_C_CC\[ \]*+=\[ \]*\\)${apat}\\(\[ \]*${apat}\\)*|\\1${cxxflags}|g" \
+ ${fname}
+ reinplace "s|^\\(\[ \]*LDFLAGS\[ \]*+=\[ \]*\\)${apat}\\(\[ \]*${apat}\\)*|\\1${ldflags}|g" \
+ ${fname}
+ } else {
+ ui_warn "File ${fname} not found for patching"
+ }
+}
+
+variant universal {
+ post-patch {
+ ui_info "patching platform_macros.GNU"
reinplace "s|buildbits=64|buildbits=universal|g" \
${worksrcpath}/include/makeinclude/platform_macros.GNU
- # do not set universal=1 which tries i386 and PPC but fails
- reinplace "s|universal=0|universal=0|g" \
- ${worksrcpath}/include/makeinclude/platform_macros.GNU
+ setuniversalflags ${worksrcpath}/include/makeinclude/platform_macosx_${os.name}.GNU \
+ ${configure.universal_cxxflags} ${configure.universal_ldflags}
}
+}
- if {[variant_exists ssl] && [variant_isset ssl]} {
- ui_debug "Enabling SSL"
+variant ssl description {Enable SSL} {
+ depends_lib-append port:openssl
+
+ post-patch {
reinplace "s|ssl=0|ssl=1|g" \
${worksrcpath}/include/makeinclude/platform_macros.GNU
}
}
-depends_lib path:bin/perl:perl5
-
use_configure no
use_parallel_build no
Modified: trunk/dports/devel/tao/Portfile
===================================================================
--- trunk/dports/devel/tao/Portfile 2012-08-21 13:31:38 UTC (rev 96915)
+++ trunk/dports/devel/tao/Portfile 2012-08-21 13:56:24 UTC (rev 96916)
@@ -10,15 +10,10 @@
PortSystem 1.0
-# Disable the full universal support since TAO already does most of this
-# and the extra stuff in muniversal (including making two build trees
-# and using libtool to merge libraries) does not work for this case.
-# PortGroup muniversal 1.0
-
name tao
set name_package ACE+TAO
version 6.1.2
-revision 1
+revision 2
distname ${name_package}-${version}
categories devel
platforms darwin
@@ -40,11 +35,8 @@
ftp://download.dre.vanderbilt.edu/previous_versions
universal_variant yes
+default_variants +server
-variant ssl description {Enable SSL} {
- depends_lib port:openssl
-}
-
use_bzip2 yes
worksrcdir ACE_wrappers
@@ -70,6 +62,7 @@
set os.name ${value}
}
}
+
set libenv DYLD_LIBRARY_PATH=${worksrcpath}/lib
set aceenv ACE_ROOT=${worksrcpath}
set taoenv TAO_ROOT=${worksrcpath}/TAO
@@ -92,39 +85,63 @@
reinplace "s|@MACOSX@|${os.name}|g" \
${worksrcpath}/ace/config.h \
${worksrcpath}/include/makeinclude/platform_macros.GNU
- # disable the assignment for compilers in lion and use our environment instead
+ # Disable the assignment for compilers in lion and use our environment instead
+ ui_info "patching platform_macosx_lion.GNU"
reinplace "s|^\\(CXX:=.*\\)|# \\1|g" \
${worksrcpath}/include/makeinclude/platform_macosx_lion.GNU
reinplace "s|^\\(CC:=.*\\)|# \\1|g" \
${worksrcpath}/include/makeinclude/platform_macosx_lion.GNU
+}
- if {[variant_exists universal] && [variant_isset universal]} {
- ui_debug "Enabling a universal build"
+depends_lib-append path:bin/perl:perl5 \
+ port:tcl \
+ port:zlib
+
+variant universal {
+ post-patch {
+ ui_info "patching platform_macros.GNU"
reinplace "s|buildbits=64|buildbits=universal|g" \
${worksrcpath}/include/makeinclude/platform_macros.GNU
- # do not set universal=1 which tries i386 and PPC but fails
- reinplace "s|universal=0|universal=0|g" \
- ${worksrcpath}/include/makeinclude/platform_macros.GNU
+ set apat "-arch \[ \]*\[a-z\]\[_a-z0-9\]*"
+ reinplace "s|${apat}\\(\[ \]*${apat}\\)*|${configure.universal_cxxflags}|g" \
+ ${worksrcpath}/include/makeinclude/platform_macosx_lion.GNU
+ ui_info "patching platform_macosx_snowleopard.GNU"
+ reinplace "s|${apat}\\(\[ \]*${apat}\\)*|${configure.universal_cxxflags}|g" \
+ ${worksrcpath}/include/makeinclude/platform_macosx_snowleopard.GNU
}
+}
- if {[variant_exists ssl] && [variant_isset ssl]} {
- ui_debug "Enabling SSL"
+variant ssl description {Enable SSL} {
+ depends_lib-append port:openssl
+
+ post-patch {
reinplace "s|ssl=0|ssl=1|g" \
${worksrcpath}/include/makeinclude/platform_macros.GNU
}
+}
- reinplace "s|@PREFIX@|${prefix}|g" \
- ${worksrcpath}/org.macports.${taodaemon}.plist
- reinplace "s|@USER@|${taouser}|g" \
- ${worksrcpath}/org.macports.${taodaemon}.plist
- reinplace "s|@DAEMON@|${taodaemon}|g" \
- ${worksrcpath}/org.macports.${taodaemon}.plist
+variant server description {Enable CosNaming server} {
+ post-patch {
+ ui_info "patching org.macports.${taodaemon}.plist"
+ reinplace "s|@PREFIX@|${prefix}|g" \
+ ${worksrcpath}/org.macports.${taodaemon}.plist
+ reinplace "s|@USER@|${taouser}|g" \
+ ${worksrcpath}/org.macports.${taodaemon}.plist
+ reinplace "s|@DAEMON@|${taodaemon}|g" \
+ ${worksrcpath}/org.macports.${taodaemon}.plist
+ }
+
+ pre-install {
+ delete ${destroot}${prefix}/etc/LaunchDaemons/org.macports.${taodaemon}/org.macports.${taodaemon}.plist
+ delete ${destroot}${prefix}/etc/LaunchDaemons/org.macports.${taodaemon}/${taodaemon}.wrapper
+ copy ${worksrcpath}/org.macports.${taodaemon}.plist \
+ ${destroot}${prefix}/etc/LaunchDaemons/org.macports.${taodaemon}/org.macports.${taodaemon}.plist
+ }
+
+ startupitem.create yes
+ startupitem.name ${taodaemon}
}
-depends_lib path:bin/perl:perl5 \
- port:tcl \
- port:zlib
-
use_configure no
use_parallel_build no
@@ -153,14 +170,6 @@
# Files required to build CosEvent classes but not installed
copy ${worksrcpath}/TAO/orbsvcs/orbsvcs/ESF ${destroot}/${prefix}/include/orbsvcs/ESF
}
-pre-install {
- delete ${destroot}${prefix}/etc/LaunchDaemons/org.macports.${taodaemon}/org.macports.${taodaemon}.plist
- delete ${destroot}${prefix}/etc/LaunchDaemons/org.macports.${taodaemon}/${taodaemon}.wrapper
- copy ${worksrcpath}/org.macports.${taodaemon}.plist \
- ${destroot}${prefix}/etc/LaunchDaemons/org.macports.${taodaemon}/org.macports.${taodaemon}.plist
-}
-startupitem.create yes
-startupitem.name ${taodaemon}
livecheck.type regex
livecheck.url ${master_sites}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120821/89c7e7fd/attachment.html>
More information about the macports-changes
mailing list