Update of /cvsroot/fink/experimental/dmacks/finkinfo
In directory vz-cvs-3.sog:/tmp/cvs-serv9555
Modified Files:
root5.info root5.patch
Log Message:
Don't autodetect macports; allow xft2 to be not-in-same-place-as-X11; not -jN
safe
Builds and passes all tests for me (with fink xft2-dev current)
Index: root5.patch
===================================================================
RCS file: /cvsroot/fink/experimental/dmacks/finkinfo/root5.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- root5.patch 21 Jan 2012 19:08:31 -0000 1.1
+++ root5.patch 21 Jan 2012 19:59:23 -0000 1.2
@@ -122,3 +122,44 @@
endif
endif
+diff -Nurd -x'*~' root.orig/configure root/configure
+--- root.orig/configure 2011-12-02 06:42:22.000000000 -0500
++++ root/configure 2012-01-21 14:02:27.000000000 -0500
+@@ -1747,11 +1747,6 @@
+ finkdir=`$cwhich fink 2>&1 | sed -ne "s/\/bin\/fink//p"`
+ logmsg "$finkdir"
+
+- if test -d /opt/local; then
+- logmsg "Checking MacPorts directory"
+- finkdir=/opt/local
+- logmsg "$finkdir"
+- fi
+
+ if [ `sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 2` -ge 5 ];
then
+ macosx105=yes
+@@ -2296,12 +2291,6 @@
+ result "See http://root.cern.ch/drupal/content/build-prerequisites";
+ exit 1
+ fi
+- if test "x$platform" = "xmacosx" &&
+- test ! "x$x11libdir" = "x$found_dir" ; then
+- result "`basename $0`: libXft not in same directory as libX11"
+- result "For consistency they should be in the same directory"
+- exit 1
+- fi
+
+ check_library "libXext" "$enable_shared" "$xextlibdir" \
+ ${finkdir:+$finkdir/lib} \
+@@ -2314,12 +2303,6 @@
+ result "See http://root.cern.ch/drupal/content/build-prerequisites";
+ exit 1
+ fi
+- if test "x$platform" = "xmacosx" &&
+- test ! "x$x11libdir" = "x$found_dir" ; then
+- result "`basename $0`: libXext not in same directory as libX11"
+- result "For consistency they should be in the same directory"
+- exit 1
+- fi
+ fi
+
+ ######################################################################
Index: root5.info
===================================================================
RCS file: /cvsroot/fink/experimental/dmacks/finkinfo/root5.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- root5.info 21 Jan 2012 19:08:31 -0000 1.1
+++ root5.info 21 Jan 2012 19:59:23 -0000 1.2
@@ -1,7 +1,7 @@
Info3: <<
Package: root5%type_pkg[-cernlib]%type_pkg[-pythia]
Version: 5.32.00
-Revision: 11
+Revision: 12
Type: <<
-cernlib (boolean),
-pythia (boolean)
@@ -52,7 +52,8 @@
Source-MD5: 1c30e4e6eeae62ff1ad5118cd1309679
SourceDirectory: root
PatchFile: %{ni}.patch
-PatchFile-MD5: cb2195c0ea6a3ce2b3b5cdc14d8c0511
+PatchFile-MD5: b769e5a7c83c864362c21a3b9539617b
+UseMaxBuildJobs: false
ConfigureParams: <<
--etcdir=%p/etc/root \
--docdir=%p/share/doc/%n \
------------------------------------------------------------------------------
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
