Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci In directory vz-cvs-3.sog:/tmp/cvs-serv28301
Modified Files: root5.info Log Message: Split part which requires gfortran into a separate variante. Add mysql support. Other minor packaging fixes. Index: root5.info =================================================================== RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/root5.info,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- root5.info 26 Sep 2011 10:14:40 -0000 1.2 +++ root5.info 6 Oct 2011 17:41:56 -0000 1.3 @@ -1,8 +1,9 @@ Info3: << -Package: root5%type_pkg[-pythia] +Package: root5%type_pkg[-cernlib]%type_pkg[-pythia] Version: 5.30.02 -Revision: 11 +Revision: 12 Type: << + -cernlib (boolean), -pythia (boolean) << GCC: 4.0 @@ -26,18 +27,24 @@ libpng3, libtiff, libxml2, + mysql-unified-dev, pcre, x11-dev, + (%type_pkg[-cernlib]) gcc46, (%type_pkg[-pythia]) root-pythia, (%type_pkg[-pythia]) pythia8, << Conflicts: << root5, - root5-pythia + root5-cernlib, + root5-pythia, + root5-cernlib-pythia << Replaces: << root5, - root5-pythia + root5-cernlib, + root5-pythia, + root5-cernlib-pythia << Source: ftp://root.cern.ch/root/root_v%v.source.tar.gz Source-MD5: 8a5a5451ddaae276abc9d2e263b29b88 @@ -53,6 +60,7 @@ --with-fftw3-incdir=%p/include --with-fftw3-libdir=%p/lib \ --with-gviz-incdir=%p/include --with-gviz-libdir=%p/lib \ --with-gsl-incdir=%p/include --with-gsl-libdir=%p/lib \ + --with-mysql-incdir=%p/include/mysql --with-mysql-libdir=%p/lib/mysql \ --with-xml-incdir=%p/include/libxml2 --with-xml-libdir=%p/lib \ --disable-afs \ --disable-builtin-freetype \ @@ -61,7 +69,6 @@ --disable-builtin-pcre \ --disable-builtin-zlib \ --disable-builtin_ftgl \ - --disable-mysql \ --enable-gdml \ --enable-minuit2 \ --enable-roofit \ @@ -69,6 +76,8 @@ --enable-soversion \ --enable-table \ --enable-unuran + (%type_pkg[-cernlib]) --with-f77=%p/bin/gfortran + (%type_raw[-cernlib] = .) --with-f77=' ' (%type_pkg[-pythia]) --with-pythia6-libdir=%p/lib/root (%type_pkg[-pythia]) --with-pythia8-libdir=%p/lib (%type_pkg[-pythia]) --with-pythia8-incdir=%p/include/pythia8 @@ -211,11 +220,15 @@ Description: Shared libraries for %N Conflicts: << root5-shlibs, - root5-pythia-shlibs + root5-cernlib-shlibs, + root5-pythia-shlibs, + root5-cernlib-pythia-shlibs << Replaces: << root5-shlibs, - root5-pythia-shlibs + root5-cernlib-shlibs, + root5-pythia-shlibs, + root5-cernlib-pythia-shlibs << Depends: << fftw3-shlibs, @@ -229,8 +242,10 @@ libpng3-shlibs, libtiff-shlibs, libxml2-shlibs, + mysql-unified-shlibs, pcre-shlibs, x11-shlibs, + (%type_pkg[-cernlib]) gcc46-shlibs, (%type_pkg[-pythia]) pythia8-shlibs, (%type_pkg[-pythia]) root-pythia-shlibs << @@ -295,8 +310,8 @@ lib/root/libGuiHtml.5.dylib lib/root/libGviz3d.5.30.dylib lib/root/libGviz3d.5.dylib - lib/root/libHbook.5.30.dylib - lib/root/libHbook.5.dylib + (%type_pkg[-cernlib]) lib/root/libHbook.5.30.dylib + (%type_pkg[-cernlib]) lib/root/libHbook.5.dylib lib/root/libHist.5.30.dylib lib/root/libHist.5.dylib lib/root/libHistFactory.5.30.dylib @@ -353,6 +368,8 @@ lib/root/libRIO.5.dylib lib/root/libRLDAP.5.30.dylib lib/root/libRLDAP.5.dylib + lib/root/libRMySQL.5.30.dylib + lib/root/libRMySQL.5.dylib lib/root/libRODBC.5.30.dylib lib/root/libRODBC.5.dylib lib/root/libRecorder.5.30.dylib @@ -451,8 +468,8 @@ lib/root/libmap2Dict.5.dylib lib/root/libmapDict.5.30.dylib lib/root/libmapDict.5.dylib - lib/root/libminicern.5.30.dylib - lib/root/libminicern.5.dylib + (%type_pkg[-cernlib]) lib/root/libminicern.5.30.dylib + (%type_pkg[-cernlib]) lib/root/libminicern.5.dylib lib/root/libmultimap2Dict.5.30.dylib lib/root/libmultimap2Dict.5.dylib lib/root/libmultimapDict.5.30.dylib @@ -497,7 +514,7 @@ %p/lib/root/libGuiBld.5.dylib 5.0.0 %n (>=5.02.00-1) %p/lib/root/libGuiHtml.5.dylib 5.0.0 %n (>=5.15.08-1) %p/lib/root/libGviz3d.5.dylib 5.0.0 %n (>=5.30.01-1) - %p/lib/root/libHbook.5.dylib 5.0.0 %n (>=5.02.00-1) + (%type_pkg[-cernlib]) %p/lib/root/libHbook.5.dylib 5.0.0 %n (>=5.02.00-1) %p/lib/root/libHist.5.dylib 5.0.0 %n (>=5.02.00-1) %p/lib/root/libHistFactory.5.dylib 5.0.0 %n (>=5.30.01-1) %p/lib/root/libHistPainter.5.dylib 5.0.0 %n (>=5.02.00-1) @@ -526,6 +543,7 @@ %p/lib/root/libRGL.5.dylib 5.0.0 %n (>=5.02.00-1) %p/lib/root/libRIO.5.dylib 5.0.0 %n (>=5.15.04-1) %p/lib/root/libRLDAP.5.dylib 5.0.0 %n (>=5.02.00-1) + %p/lib/root/libRMySQL.5.dylib 5.0.0 %n (>=5.30.02-12) %p/lib/root/libRODBC.5.dylib 5.0.0 %n (>=5.11.02-1) %p/lib/root/libRecorder.5.dylib 5.0.0 %n (>=5.21.04-1) %p/lib/root/libReflex.5.dylib 5.0.0 %n (>=5.02.00-1) @@ -575,7 +593,7 @@ %p/lib/root/liblistDict.5.dylib 5.0.0 %n (>=5.12.00-1) %p/lib/root/libmap2Dict.5.dylib 5.0.0 %n (>=5.12.00-1) %p/lib/root/libmapDict.5.dylib 5.0.0 %n (>=5.12.00-1) - %p/lib/root/libminicern.5.dylib 5.0.0 %n (>=5.19.04-1) + (%type_pkg[-cernlib]) %p/lib/root/libminicern.5.dylib 5.0.0 %n (>=5.19.04-1) %p/lib/root/libmultimap2Dict.5.dylib 5.0.0 %n (>=5.12.00-1) %p/lib/root/libmultimapDict.5.dylib 5.0.0 %n (>=5.12.00-1) %p/lib/root/libmultisetDict.5.dylib 5.0.0 %n (>=5.12.00-1) @@ -611,7 +629,8 @@ platform on which to build data acquisition, simulation and data analysis systems. -The package variant %{ni}-pythia builds the interfaces to PYTHIA 6 and 8. +The package variant %{ni}-cernlib provides interfaces to legacy cernlib +formats, the variant %{ni}-pythia builds the interfaces to PYTHIA 6 and 8. << DescPackaging: << This package has a somewhat unorthodox layout due to the fact that ------------------------------------------------------------------------------ All the data continuously generated in your IT infrastructure contains a definitive record of customers, application performance, security threats, fraudulent activity and more. Splunk takes this data and makes sense of it. Business sense. IT sense. Common sense. http://p.sf.net/sfu/splunk-d2dcopy1 _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs