[SM-Commit] GIT changes to master grimoire by Pol Vinogradov (e0da50fcbf0ba200c13f76ae47fc4697484d05b7)

Pol Vinogradov scm at mail.sourcemage.org
Sun Dec 3 18:41:56 EST 2006


GIT changes to master grimoire by Pol Vinogradov <vin.public at gmail.com>:

 science/cern_root/BUILD     |    1 
 science/cern_root/CONFIGURE |    2 
 science/cern_root/DEPENDS   |   99 +++++++++++++++++++++++++++++++++++++++++++-
 science/cern_root/DETAILS   |    6 --
 science/cern_root/HISTORY   |    9 ++++
 science/cern_root/INSTALL   |    4 -
 6 files changed, 112 insertions(+), 9 deletions(-)

New commits:
commit e0da50fcbf0ba200c13f76ae47fc4697484d05b7
Author: Pol Vinogradov <vin.public at gmail.com>
Commit: Pol Vinogradov <vin.public at gmail.com>

    science/cern_root:
    
    DETAILS: version 5.13.06, removed UPDATED, MD5[0]
    BUILD: added docdir to ./configure
    DEPENDS: added much optional dependencies, removed glibc, added check
    for modular xorg with libxpm and libxi depends, depends on gsl only
    if mathmore is selected for building
    CONFIGURE: added note for mathmore about gsl dependency
    INSTALL: install and track_rootifying

diff --git a/science/cern_root/BUILD b/science/cern_root/BUILD
index 750b449..22c4736 100755
--- a/science/cern_root/BUILD
+++ b/science/cern_root/BUILD
@@ -6,6 +6,7 @@ OPTS="$OPTS --build=$ARK $MATHCORE $MATH
             --libdir=${TRACK_ROOT}/usr/lib/root                        \
             --incdir=${TRACK_ROOT}/usr/include/root                    \
             --datadir=${TRACK_ROOT}/usr/share/root                     \
+            --docdir=${TRACK_ROOT}/usr/share/doc/${SPELL}              \
             --mandir=${TRACK_ROOT}/usr/share/man/man1                  \
             $OPTS                                                     &&
 
diff --git a/science/cern_root/CONFIGURE b/science/cern_root/CONFIGURE
index 22a5728..3f8bf98 100755
--- a/science/cern_root/CONFIGURE
+++ b/science/cern_root/CONFIGURE
@@ -2,7 +2,7 @@ config_query_list ARK "Choose your archi
 powerpc-linux-gnu &&
 config_query_option MATHCORE "Enable mathcore?" y "--enable-mathcore" \
 "" &&
-config_query_option MATHMORE "Enable mathmore?" y "--enable-mathmore" \
+config_query_option MATHMORE "Enable mathmore (needs gsl)?" y "--enable-mathmore" \
 "" &&
 config_query_option REFLEX "Enable reflex?" y "--enable-reflex" ""   &&
 config_query_option CINTEX "Enable cintex?" y "--enable-cintex" ""   &&
diff --git a/science/cern_root/DEPENDS b/science/cern_root/DEPENDS
index ac2c531..26dbd29 100755
--- a/science/cern_root/DEPENDS
+++ b/science/cern_root/DEPENDS
@@ -1,3 +1,98 @@
-depends glibc                                        &&
-depends X11-LIBS                                     
+if [[ "${MATHMORE}" == "--enable-mathmore" ]]
+then
+  depends  gsl
+fi                           &&
 
+depends  X11-LIBS            &&
+
+source  $GRIMOIRE/FUNCTIONS  &&
+
+if  check_if_xorg_modular_libs  ;  then
+  depends  libxpm            &&
+  depends  libxi
+fi                           &&
+
+optional_depends  fftw                                  \
+                  "--enable-fftw3"                      \
+                  "--disable-fftw3"                     \
+                  "for Fast Fourier Transform support"  &&
+
+optional_depends  freetype2                     \
+                  "--disable-builtin-freetype"  \
+                  "--enable-builtin-freetype"   \
+                  "for system libfreetype"      &&
+
+optional_depends  krb5                     \
+                  "--enable-krb5"          \
+                  "--disable-krb5"         \
+                  "for Kerberos5 support"  &&
+
+optional_depends  libiodbc            \
+                  "--enable-odbc"     \
+                  "--disable-odbc"    \
+                  "for ODBC support"  &&
+
+optional_depends  libxml2           \
+                  "--enable-xml"    \
+                  "--disable-xml"   \
+                  "for XML parser"  &&
+
+optional_depends  mysql                \
+                  "--enable-mysql"     \
+                  "--disable-mysql"    \
+                  "for MySQL support"  &&
+
+optional_depends  OPENGL                \
+                  "--enable-opengl"     \
+                  "--disable-opengl"    \
+                  "for OPENGL support"  &&
+
+optional_depends  openldap            \
+                  "--enable-ldap"     \
+                  "--disable-ldap"    \
+                  "for LDAP support"  &&
+
+optional_depends  openssl                       \
+                  "--enable-ssl"                \
+                  "--disable-ssl"               \
+                  "for SSL encryption support"  &&
+
+optional_depends  pcre                      \
+                  "--disable-builtin-pcre"  \
+                  "--enable-builtin-pcre"   \
+                  "for system libpcre"      &&
+
+optional_depends  postgresql                \
+                  "--enable-pgsql"          \
+                  "--disable-pgsql"         \
+                  "for PostgreSQL support"  &&
+
+optional_depends  python                      \
+                  "--enable-python"           \
+                  "--disable-python"          \
+                  "for Python ROOT bindings"  &&
+
+optional_depends  qt-x11                     \
+                  "--enable-qt"              \
+                  "--disable-qt"             \
+                  "for Qt graphics backend"  &&
+
+optional_depends  ruby                      \
+                  "--enable-ruby"           \
+                  "--disable-rubu"          \
+                  "for Ruby ROOT bindings"  &&
+
+optional_depends  shadow                         \
+                  "--enable-shadowpw"            \
+                  "--disable-shadowpw"           \
+                  "for Shadow password support"  &&
+
+optional_depends  tiff                                    \
+                  "--enable-astiff"                       \
+                  "--disable-astiff"                      \
+                  "for tiff support in image processing"  &&
+
+optional_depends  zlib                      \
+                  "--disable-builtin-zlib"  \
+                  "--enable-builtin-zlib"   \
+                  "for system libz"
diff --git a/science/cern_root/DETAILS b/science/cern_root/DETAILS
index edf15ea..5de0f29 100755
--- a/science/cern_root/DETAILS
+++ b/science/cern_root/DETAILS
@@ -1,13 +1,11 @@
            SPELL=cern_root
-         VERSION=5.04.00 
+         VERSION=5.13.06
           SOURCE=root_v$VERSION.source.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/root
    SOURCE_URL[0]=ftp://root.cern.ch/root/$SOURCE
         WEB_SITE=http://root.cern.ch
          ENTERED=20040713
-         UPDATED=20051018 
-     SOURCE_HASH=sha512:a25231886493b7e558470395e795c73c382248e399cfa7b84b16047b8cbed2e3293d906bf27855529633d08f6e4a8d951bbab4fca232c662ed81bccfd9d5da33
-          MD5[0]='e61c7a538adc71c93ba4ccf5e7d4605f'
+     SOURCE_HASH=sha512:5d461595be3b83c3b50fe0b4aafc2833d089472d1364ae09849190996f59c3d07238c6543b86537810d43dbe5b11e9e3364f51aa8c282a780cb0341073d2a43b
       LICENSE[0]=LGPL
         KEYWORDS="science"
            SHORT="OO data analysis framework created by CERN physicists."
diff --git a/science/cern_root/HISTORY b/science/cern_root/HISTORY
index ed66c91..aede719 100644
--- a/science/cern_root/HISTORY
+++ b/science/cern_root/HISTORY
@@ -1,3 +1,12 @@
+2006-12-04 Pol Vinogradov <vin.public at gmail.com>
+	* DETAILS: version 5.13.06, removed UPDATED, MD5[0]
+	* BUILD: added docdir to ./configure
+	* DEPENDS: added much optional dependencies, removed glibc, added check
+	  for modular xorg with libxpm and libxi depends, depends on gsl only
+	  if mathmore is selected for building
+	* CONFIGURE: added note for mathmore about gsl dependency
+	* INSTALL: install and track_rootifying
+
 2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed BUILD_API=2.
 
diff --git a/science/cern_root/INSTALL b/science/cern_root/INSTALL
index 6411a7d..83f861f 100755
--- a/science/cern_root/INSTALL
+++ b/science/cern_root/INSTALL
@@ -1,6 +1,6 @@
 default_install  &&
 
-if  !  grep  -q  "root"  /etc/ld.so.conf
+if  !  grep  -q  "root"  ${TRACK_ROOT}/etc/ld.so.conf
 then
-	echo  "/usr/lib/root"  >>  /etc/ld.so.conf
+  echo  "${TRACK_ROOT}/usr/lib/root"  >>  ${INSTALL_ROOT}/etc/ld.so.conf
 fi



More information about the SM-Commit mailing list