Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv32423
Modified Files:
root5.info root5.patch
Log Message:
Allow building if there's an /opt/local directory. Also incorporate changes
from dmacks (thanks).
Index: root5.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/root5.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- root5.patch 14 Dec 2011 13:51:06 -0000 1.2
+++ root5.patch 27 Jan 2012 14:51:30 -0000 1.3
@@ -2,7 +2,46 @@
===================================================================
--- root/configure (revision 42472)
+++ root/configure (working copy)
-@@ -2683,7 +2683,7 @@
+@@ -1747,12 +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
+ fi
+@@ -2296,12 +2290,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 +2302,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
+
+ ######################################################################
+@@ -2683,7 +2665,7 @@
result "ok"
ftglincdir=`pkg-config --cflags-only-I ftgl | sed 's/-I//g'`
ftgllibs=`pkg-config --libs-only-l ftgl`
@@ -11,7 +50,7 @@
enable_builtin_ftgl="no"
else
enable_builtin_ftgl="yes"
-@@ -3402,7 +3402,7 @@
+@@ -3402,7 +3384,7 @@
# At this time, libfftw3.a should always be prefered over .so,
# to avoid forcing users to install fftw3.
Index: root5.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/root5.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- root5.info 22 Jan 2012 07:23:35 -0000 1.5
+++ root5.info 27 Jan 2012 14:51:30 -0000 1.6
@@ -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)
@@ -12,12 +12,12 @@
Depends: <<
%n-shlibs (=%v-%r),
graphviz,
- x11,
- xrootd
+ x11
<<
BuildDepends: <<
fftw3,
fink (>= 0.28),
+ freetype219 (>= 2.3.12-1),
giflib,
glew,
graphviz-dev,
@@ -29,16 +29,16 @@
libtiff,
libxml2,
mysql-unified-dev,
+ openldap24-dev,
pcre,
+ system-openssl-dev,
x11-dev,
+ xft2-dev (>= 2.2.0-2),
xrootd-dev,
(%type_pkg[-cernlib]) gcc46,
(%type_pkg[-pythia]) root-pythia,
(%type_pkg[-pythia]) pythia8,
<<
-BuildConflicts: <<
- xft2-dev (>=2.2.0-2)
-<<
Conflicts: <<
root5,
root5-cernlib,
@@ -55,7 +55,7 @@
Source-MD5: 1c30e4e6eeae62ff1ad5118cd1309679
SourceDirectory: root
PatchFile: %{ni}.patch
-PatchFile-MD5: cb2195c0ea6a3ce2b3b5cdc14d8c0511
+PatchFile-MD5: f2c14d7502caf343a7c3edeea3dacb32
ConfigureParams: <<
--etcdir=%p/etc/root \
--docdir=%p/share/doc/%n \
@@ -222,6 +222,7 @@
<<
Depends: <<
fftw3-shlibs,
+ freetype219-shlibs (>= 2.3.12-1),
giflib-shlibs,
glew-shlibs,
graphviz-shlibs,
@@ -233,8 +234,11 @@
libtiff-shlibs,
libxml2-shlibs,
mysql-unified-shlibs,
+ openldap24-shlibs,
pcre-shlibs,
x11-shlibs,
+ xft2-shlibs (>= 2.2.0-2),
+ xrootd,
(%type_pkg[-cernlib]) gcc46-shlibs,
(%type_pkg[-pythia]) pythia8-shlibs,
(%type_pkg[-pythia]) root-pythia-shlibs
------------------------------------------------------------------------------
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
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
