[105462] trunk/dports/science/root
larryv at macports.org
larryv at macports.org
Sun Apr 21 07:52:17 PDT 2013
Revision: 105462
https://trac.macports.org/changeset/105462
Author: larryv at macports.org
Date: 2013-04-21 07:52:17 -0700 (Sun, 21 Apr 2013)
Log Message:
-----------
root: Update to 5.34.06, add clang3{2,3} variants (maintainer, #38868).
Also:
- Prevent cocoa variant from using Clang 3.3.
- Remove now-unnecessary patch to force use of system "file".
Modified Paths:
--------------
trunk/dports/science/root/Portfile
Removed Paths:
-------------
trunk/dports/science/root/files/patch-configure.diff
Modified: trunk/dports/science/root/Portfile
===================================================================
--- trunk/dports/science/root/Portfile 2013-04-21 14:08:12 UTC (rev 105461)
+++ trunk/dports/science/root/Portfile 2013-04-21 14:52:17 UTC (rev 105462)
@@ -4,8 +4,7 @@
PortSystem 1.0
name root
-version 5.34.05
-revision 1
+version 5.34.06
categories science
maintainers gmail.com:mattiafrancescomoro hep.phy.cam.ac.uk:jonesc
license LGPL-2.1+
@@ -19,8 +18,8 @@
master_sites http://root.cern.ch/download/ \
ftp://root.cern.ch/root/
-checksums rmd160 eeb3c54b292ee6258c33d16ef28c03aa9fa077c3 \
- sha256 448e180a5ed6f53b5ee49ead014a98e742e97198a4ca760f086467db5d230c9d
+checksums rmd160 643fd9b787f52843295b1e6ae8f22622141c3337 \
+ sha256 ddbec31fee5bd645203d8c464f98bb29e7ce2bc63976fba885c2ed0b1a09016a
worksrcdir root
@@ -38,8 +37,6 @@
port:xpm \
port:expat
-patchfiles patch-configure.diff
-
post-patch {
reinplace "s|-lfreetype| \`freetype-config --libs\`|g" ${worksrcpath}/config/root-config.in
reinplace "s|\"/usr/include\"|\"${prefix}/include/\" \"/usr/include\"|g" ${worksrcpath}/configure
@@ -368,11 +365,11 @@
variant cocoa description {Enables native OSX graphical backend instead of X11} {
# Check we are using a clang compiler
pre-fetch {
- if { ![string match "*clang*" ${configure.compiler}] } {
+ if { ![string match "*clang*" ${configure.compiler}] || [string match "macports-clang-3.3" ${configure.compiler}] } {
ui_error "The cocoa variant is experimental and can currently only be built"
- ui_error "using a clang compiler. Your current compiler is ${configure.compiler}."
- ui_error "Please try again using either the clang31 variant, or the system"
- ui_error "clang compiler using configure.compiler=clang"
+ ui_error "using a clang(<3.3) compiler. Your current compiler is ${configure.compiler}."
+ ui_error "Please try again using either of the clang31 or clang32 variants,"
+ ui_error "or the system clang compiler using configure.compiler=clang"
return -code error "Unsupported compiler for cocoa support"
}
}
@@ -383,32 +380,44 @@
patchfiles-append patch-builtin-afterimage-disabletiff.diff
}
-variant gcc45 conflicts gcc46 gcc47 gcc48 clang31 description {Compile using MacPorts gcc 4.5} {
+variant gcc45 conflicts gcc46 gcc47 gcc48 clang31 clang32 clang33 description {Compile using MacPorts gcc 4.5} {
configure.compiler macports-gcc-4.5
depends_lib-append port:gcc45
}
-variant gcc46 conflicts gcc45 gcc47 gcc48 clang31 description {Compile using MacPorts gcc 4.6} {
+variant gcc46 conflicts gcc45 gcc47 gcc48 clang31 clang32 clang33 description {Compile using MacPorts gcc 4.6} {
configure.compiler macports-gcc-4.6
depends_lib-append port:gcc46
}
-variant gcc47 conflicts gcc45 gcc46 gcc48 clang31 description {Compile using MacPorts gcc 4.7} {
+variant gcc47 conflicts gcc45 gcc46 gcc48 clang31 clang32 clang33 description {Compile using MacPorts gcc 4.7} {
configure.compiler macports-gcc-4.7
depends_lib-append port:gcc47
}
-variant gcc48 conflicts gcc45 gcc46 gcc47 clang31 description {Compile using MacPorts gcc 4.8} {
+variant gcc48 conflicts gcc45 gcc46 gcc47 clang31 clang32 clang33 description {Compile using MacPorts gcc 4.8} {
configure.compiler macports-gcc-4.8
depends_lib-append port:gcc48
}
-variant clang31 conflicts gcc45 gcc46 gcc47 gcc48 description {Compile using MacPorts clang 3.1} {
+variant clang31 conflicts gcc45 gcc46 gcc47 gcc48 clang32 clang33 description {Compile using MacPorts clang 3.1} {
configure.compiler macports-clang-3.1
depends_lib-append port:clang-3.1
configure.args-append --with-llvm-config="${prefix}/bin/llvm-config-mp-3.1"
}
+variant clang32 conflicts gcc45 gcc46 gcc47 gcc48 clang31 clang33 description {Compile using MacPorts clang 3.2} {
+ configure.compiler macports-clang-3.2
+ depends_lib-append port:clang-3.2
+ configure.args-append --with-llvm-config="${prefix}/bin/llvm-config-mp-3.2"
+}
+
+variant clang33 conflicts gcc45 gcc46 gcc47 gcc48 clang31 clang32 description {Compile using MacPorts clang 3.3} {
+ configure.compiler macports-clang-3.3
+ depends_lib-append port:clang-3.3
+ configure.args-append --with-llvm-config="${prefix}/bin/llvm-config-mp-3.3"
+}
+
if {[variant_isset qt_mac]} {
PortGroup qt4 1.0
}
Deleted: trunk/dports/science/root/files/patch-configure.diff
===================================================================
--- trunk/dports/science/root/files/patch-configure.diff 2013-04-21 14:08:12 UTC (rev 105461)
+++ trunk/dports/science/root/files/patch-configure.diff 2013-04-21 14:52:17 UTC (rev 105462)
@@ -1,36 +0,0 @@
---- configure.original 2012-10-28 18:18:50.000000000 +0000
-+++ configure 2012-10-28 18:21:14.000000000 +0000
-@@ -436,19 +436,19 @@
- chklib64file=`ar t $chklib64 | awk '{if (NR == 2) print $1}'`
- logmsg " ar x $chklib64 $chklib64file"
- ar x $chklib64 $chklib64file
-- logmsg " file $filearg $chklib64file | grep '64-bit'"
-- if file $filearg $chklib64file | grep '64-bit' > /dev/null 2>& 1 ; then
-+ logmsg " /usr/bin/file $filearg $chklib64file | grep '64-bit'"
-+ if /usr/bin/file $filearg $chklib64file | grep '64-bit' > /dev/null 2>& 1 ; then
- ret=1
- fi
- rm -f $chklib64file
- fi
- else
-- if file $filearg $chklib64 | grep 'ASCII' > /dev/null 2>& 1 ; then
-+ if /usr/bin/file $filearg $chklib64 | grep 'ASCII' > /dev/null 2>& 1 ; then
- check_link $chklib64
- ret=$link_result
- else
-- logmsg " file $filearg $chklib64 | grep '64-bit'"
-- if file $filearg $chklib64 | grep '64-bit' > /dev/null 2>& 1 ; then
-+ logmsg " /usr/bin/file $filearg $chklib64 | grep '64-bit'"
-+ if /usr/bin/file $filearg $chklib64 | grep '64-bit' > /dev/null 2>& 1 ; then
- ret=1
- fi
- fi
-@@ -2597,7 +2597,7 @@
- if `$cwhich freetype-config > /dev/null 2>&1` && test "x$host" = "x" ; then
- if test "x$macosx108" = "xyes" && (file -h `$cwhich freetype-config` | grep 'xstub' > /dev/null 2>&1 || test "x$enable_cocoa" = "xyes"); then
- enable_builtin_freetype="yes"
-- if file -h `$cwhich freetype-config` | grep 'xstub' > /dev/null 2>&1 ; then
-+ if /usr/bin/file -h `$cwhich freetype-config` | grep 'xstub' > /dev/null 2>&1 ; then
- result "XQuartz not installed"
- else
- result "using builtin freetype"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130421/e8eaff59/attachment.html>
More information about the macports-changes
mailing list