[69270] trunk/dports/science/root
michaelld at macports.org
michaelld at macports.org
Tue Jun 29 00:18:58 PDT 2010
Revision: 69270
http://trac.macports.org/changeset/69270
Author: michaelld at macports.org
Date: 2010-06-29 00:18:52 -0700 (Tue, 29 Jun 2010)
Log Message:
-----------
Bump to 5.26.00b .
Add variants for qt4-mac and qt4-x11 (fixes ticket #23748).
Corrected use of qt4-* dependency.
Explicit compilation as 32-bit or 64-bit.
Hack to get around issues finding Qt libraries.
Modified Paths:
--------------
trunk/dports/science/root/Portfile
Added Paths:
-----------
trunk/dports/science/root/files/
trunk/dports/science/root/files/patch-config-Makefile.config.diff
trunk/dports/science/root/files/patch-configure.diff
Modified: trunk/dports/science/root/Portfile
===================================================================
--- trunk/dports/science/root/Portfile 2010-06-29 07:14:14 UTC (rev 69269)
+++ trunk/dports/science/root/Portfile 2010-06-29 07:18:52 UTC (rev 69270)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 4; truncate-lines: t -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -3,5 +4,5 @@
name root
-version 5.26.00
+version 5.26.00b
revision 2
categories science
@@ -17,9 +18,9 @@
distname ${name}_v${version}.source
master_sites ftp://root.cern.ch/root/
-checksums md5 0665462b9c9a153e20d2efcde6cf427c \
- sha1 318c5adf7f54f8206d9173d2fb0dc196a0e87192 \
- rmd160 bf7f91abd76ec86f69eb80506291cb8d4f87614e
+checksums md5 46d524a37f4c67cb4a6921d3d7721f8a \
+ sha1 70db6f9cf6acc29bcf0060a4c2e1f9e24c26702a \
+ rmd160 057ce1151a534f00a445ec69392e7a7a3bd55ca8
worksrcdir root
@@ -28,6 +29,9 @@
port:xpm \
port:zlib
+# patches to allow 'configure' to find Qt framework libraries and 'moc'
+patchfiles patch-configure.diff
+
pre-configure {
build.args CC=${configure.cc} \
CXX=${configure.cxx} \
@@ -39,6 +43,12 @@
reinplace "s|/usr/include |${prefix}/include /usr/include |g" ${worksrcpath}/configure
reinplace "s|\"/usr/lib\"|\"${prefix}/lib/\" \"/usr/lib\"g|" ${worksrcpath}/configure
+ # the build type (32 or 64 bit) -must- be for first argument
+ if {${build_arch} == "i386" || ${build_arch} == "ppc"} {
+ configure.pre_args macosx --prefix=${prefix}
+ } else {
+ configure.pre_args macos64 --prefix=${prefix}
+ }
}
configure.args --with-cc=${configure.cc} \
@@ -49,21 +59,21 @@
--libdir="${prefix}/lib/root" \
--testdir="${prefix}/share/root/test" \
--tutdir="${prefix}/share/root/tutorials" \
- --disable-qt \
--etcdir=${prefix}/etc/root \
--disable-builtin-afterimage \
--disable-builtin-freetype \
--disable-builtin-glew \
- --disable-opengl \
--disable-builtin-ftgl \
--disable-builtin-pcre \
--disable-builtin-zlib \
--disable-fftw3 \
--disable-krb5 \
--disable-ldap \
+ --disable-mysql \
--disable-odbc \
+ --disable-opengl \
--disable-pythia8 \
- --disable-mysql \
+ --disable-qt \
--disable-roofit \
--disable-ssl \
--disable-xml \
@@ -153,15 +163,29 @@
depends_lib-append port:libxml2
}
-variant qt description {Builds port with qt support} {
+variant qt_x11 conflicts qt_mac description {Builds port with Qt support via X11 UI} {
configure.args-delete --disable-qt
configure.args-append --enable-qt \
--with-qt-incdir="${prefix}/libexec/qt4-x11/include/" \
- --with-qt-libdir="${prefix}/libexec/qt4-x11/lib"
-
+ --with-qt-libdir="${prefix}/libexec/qt4-x11/lib" \
+ --with-mocdir="${prefix}/bin"
depends_lib-append port:qt4-x11
}
+variant qt_mac conflicts qt_x11 description {Builds port with Qt support via Mac UI} {
+ configure.args-delete --disable-qt
+ configure.args-append --enable-qt \
+ --with-qt-incdir="${prefix}/libexec/qt4-mac/include/" \
+ --with-qt-libdir="${prefix}/libexec/qt4-mac/lib" \
+ --with-mocdir="${prefix}/bin"
+ depends_lib-append port:qt4-mac
+
+ post-configure {
+ # patch up the Makefile.config to handle the QTLIB frameworks correctly
+ system "cd ${worksrcpath} && patch -p0 < ${filespath}/patch-config-Makefile.config.diff"
+ }
+}
+
variant mysql description {Builds port with mysql support} {
configure.args-delete --disable-mysql
configure.args-append --enable-mysql \
Added: trunk/dports/science/root/files/patch-config-Makefile.config.diff
===================================================================
--- trunk/dports/science/root/files/patch-config-Makefile.config.diff (rev 0)
+++ trunk/dports/science/root/files/patch-config-Makefile.config.diff 2010-06-29 07:18:52 UTC (rev 69270)
@@ -0,0 +1,11 @@
+--- config/Makefile.config_orig 2010-06-25 21:17:25.000000000 -0600
++++ config/Makefile.config 2010-06-25 21:18:05.000000000 -0600
+@@ -96,7 +96,7 @@
+ BUILDQT := yes
+ BUILDQTGSI := yes
+ QTLIBDIR := -L/opt/local/libexec/qt4-mac/lib
+-QTLIB := QtCore.la QtGui.la Qt3Support.la QtOpenGL.la QtSvg.la QtXml.la QtWebKit.la QtNetwork.la
++QTLIB := -F/opt/local/libexec/qt4-mac/lib -framework QtCore -framework QtGui -framework Qt3Support -framework QtOpenGL -framework QtSvg -framework QtXml -framework QtWebKit -framework QtNetwork -framework ApplicationServices -framework Carbon -framework AppKit -L/opt/local/libexec/qt4-mac/lib -lpng -lz -lm
+ QTINCDIR := $(filter-out /usr/include, /opt/local/libexec/qt4-mac/include/ /opt/local/libexec/qt4-mac/include//Qt /opt/local/libexec/qt4-mac/include//Qt3Support /opt/local/libexec/qt4-mac/include//QtAssistant /opt/local/libexec/qt4-mac/include//QtCore /opt/local/libexec/qt4-mac/include//QtDBus /opt/local/libexec/qt4-mac/include//QtDesigner /opt/local/libexec/qt4-mac/include//QtGui /opt/local/libexec/qt4-mac/include//QtHelp /opt/local/libexec/qt4-mac/include//QtMultimedia /opt/local/libexec/qt4-mac/include//QtNetwork /opt/local/libexec/qt4-mac/include//QtOpenGL /opt/local/libexec/qt4-mac/include//QtScript /opt/local/libexec/qt4-mac/include//QtScriptTools /opt/local/libexec/qt4-mac/include//QtSql /opt/local/libexec/qt4-mac/include//QtSvg /opt/local/libexec/qt4-mac/include//QtTest /opt/local/libexec/qt4-mac/include//QtUiTools /opt/local/libexec/qt4-mac/include//QtWebKit /opt/local/libexec/qt4-mac/include//QtXml /opt/local/libexec/qt4-mac/include//QtXmlPatterns)
+ QTVERS := 4
+ QTMOCEXE := /opt/local/bin/moc
Added: trunk/dports/science/root/files/patch-configure.diff
===================================================================
--- trunk/dports/science/root/files/patch-configure.diff (rev 0)
+++ trunk/dports/science/root/files/patch-configure.diff 2010-06-29 07:18:52 UTC (rev 69270)
@@ -0,0 +1,19 @@
+--- configure_orig 2010-06-25 21:01:29.000000000 -0600
++++ configure 2010-06-25 21:01:36.000000000 -0600
+@@ -388,7 +388,7 @@
+ done
+ slibs=""
+ for i in $lib ; do
+- for ext in .so .sl .dylib .dll.a ; do # .dll.a for cygwin gcc
++ for ext in .so .sl .dylib .dll.a .la ; do # .dll.a for cygwin gcc
+ slibs="$slibs $i$ext"
+ done
+ done
+@@ -1420,6 +1420,7 @@
+ --with-ldap-libdir=*) ldaplibdir=$optarg ; enable_ldap="yes" ;;
+ --with-mysql-incdir=*) mysqlincdir=$optarg ; enable_mysql="yes" ;;
+ --with-mysql-libdir=*) mysqllibdir=$optarg ; enable_mysql="yes" ;;
++ --with-mocdir=*) mocdir=$optarg ;;
+ --with-monalisa-incdir=*)monalisaincdir=$optarg; enable_monalisa="yes";;
+ --with-monalisa-libdir=*)monalisalibdir=$optarg; enable_monalisa="yes";;
+ --with-odbc-incdir=*) odbcincdir=$optarg ; enable_odbc="yes" ;;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100629/c3bcd295/attachment.html>
More information about the macports-changes
mailing list