[SCM] root-system: CERN's ROOT Data Analysis Framework branch, master, updated. upstream/5.34.00_rc1-33-g198c7d9

[Lifeng Sun]

The following commit has been merged in the master branch:
commit b26b6f9c719bc6782c76fba3c0c6e7c8a5fa34e8
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Sat Jun 23 23:25:30 2012 +0800

    Improve kfreebsd patch. Thanks to pinotree#debian-hurd.

diff --git a/debian/patches/74-kfreebsd.patch b/debian/patches/74-kfreebsd.patch
index dfd248a..9981e7a 100644
--- a/debian/patches/74-kfreebsd.patch
+++ b/debian/patches/74-kfreebsd.patch
@@ -171,7 +171,7 @@
  
  /* added by Fons Radamakers in 2000 Oct 2 */
 -#if (defined(__linux) || defined(__linux__) || defined(linux)) && ! defined(__CINT__)
-+#if (defined(__linux) || defined(__linux__) || defined(linux)) || defined(__FreeBSD_kernel__) && ! defined(__CINT__)
++#if (defined(__linux) || defined(__linux__) || defined(linux) || defined(__FreeBSD_kernel__)) && ! defined(__CINT__)
  #   include <features.h>
  #   if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 2
  #      define G__NONSCALARFPOS2
@@ -182,7 +182,7 @@
     unsigned long getpos() { return((unsigned long)0 /* m_pos */ ); } //not used
     void setspos(unsigned long pos) {
 -#if defined(__linux)
-+#if defined(__linux) || defined(__FreeBSD_kernel__)
++#if defined(__linux) || defined(__GLIBC__)
   #if (__GNUC__==2 && __GNUC_MINOR__<96)
    #if defined(_G_IO_IO_FILE_VERSION) && _G_IO_IO_FILE_VERSION == 0x20001
        m_pos.__pos = pos;    // this is for Debian
@@ -258,7 +258,7 @@
         enable_memstat="no" ;;
 --- a/core/base/inc/RConfig.h
 +++ b/core/base/inc/RConfig.h
-@@ -350,6 +350,20 @@
+@@ -350,6 +350,21 @@
  #   define HAS_STRLCPY
  #endif
  
@@ -273,6 +273,7 @@
 +#   if defined(__amd64__)
 +#      define R__B64
 +#   endif
++#   define R__GLIBC
 +#   define R__THROWNEWDELETE /* new/delete throw exceptions */
 +#endif
 +
@@ -290,16 +291,6 @@
  #   include <sys/ioctl.h>
  #endif
  #if defined(R__AIX) || defined(R__SOLARIS)
-@@ -195,7 +195,8 @@
-       (defined(R__SUNGCC3) && defined(__arch64__)) || \
-       defined(R__OBSD) || defined(MAC_OS_X_VERSION_10_4) || \
-       (defined(R__AIX) && defined(_AIX43)) || \
--      (defined(R__SOLARIS) && defined(_SOCKLEN_T))
-+      (defined(R__SOLARIS) && defined(_SOCKLEN_T)) || \
-+      defined(__FreeBSD_kernel__)
- #   define USE_SOCKLEN_T
- #endif
- 
 --- a/graf3d/gl/src/TGLFaceSet.cxx
 +++ b/graf3d/gl/src/TGLFaceSet.cxx
 @@ -34,7 +34,7 @@
@@ -340,7 +331,7 @@
  #define       f2cFortran
  #endif
 -#if        defined(__GNUC__) && defined(linux) /* 06/21/00 PDW (CFITSIO) */
-+#if        defined(__GNUC__) && (defined(linux) || defined(__FreeBSD_kernel__)) /* 06/21/00 PDW (CFITSIO) */
++#if        defined(__GNUC__) && (defined(linux) || defined(__GLIBC__)) /* 06/21/00 PDW (CFITSIO) */
  #define       f2cFortran
  #endif
  #if defined(macintosh)                         /* 11/1999 (CFITSIO) */
@@ -355,30 +346,6 @@
      (defined(__CYGWIN__) && defined(__GNUC__))
  #define USE_SETSID
  #endif
---- a/net/rpdutils/src/net.cxx
-+++ b/net/rpdutils/src/net.cxx
-@@ -38,7 +38,8 @@
-      (defined(R__SUNGCC3) && defined(__arch64__)) || \
-      defined(R__OBSD) || defined(MAC_OS_X_VERSION_10_4) || \
-      (defined(R__AIX) && defined(_AIX43)) || \
--     (defined(R__SOLARIS) && defined(_SOCKLEN_T))
-+     (defined(R__SOLARIS) && defined(_SOCKLEN_T)) || \
-+     defined(__FreeBSD_kernel__)
- #   define USE_SOCKLEN_T
- #endif
- 
---- a/net/rpdutils/src/netpar.cxx
-+++ b/net/rpdutils/src/netpar.cxx
-@@ -51,7 +51,8 @@
-       (defined(R__SUNGCC3) && defined(__arch64__)) || \
-       defined(R__OBSD) || defined(MAC_OS_X_VERSION_10_4) || \
-       (defined(R__AIX) && defined(_AIX43)) || \
--      (defined(R__SOLARIS) && defined(_SOCKLEN_T))
-+      (defined(R__SOLARIS) && defined(_SOCKLEN_T)) || \
-+      defined(__FreeBSD_kernel__)
- #   define USE_SOCKLEN_T
- #endif
- 
 --- a/net/rpdutils/src/rpdutils.cxx
 +++ b/net/rpdutils/src/rpdutils.cxx
 @@ -190,7 +190,7 @@
@@ -399,18 +366,6 @@
  static int setresgid(gid_t r, gid_t e, gid_t)
  {
     if (setgid(r) == -1)
---- a/net/rpdutils/src/ssh.cxx
-+++ b/net/rpdutils/src/ssh.cxx
-@@ -40,7 +40,8 @@
-       (defined(R__SUNGCC3) && defined(__arch64__)) || \
-       defined(R__OBSD) || defined(MAC_OS_X_VERSION_10_4) || \
-       (defined(R__AIX) && defined(_AIX43)) || \
--      (defined(R__SOLARIS) && defined(_SOCKLEN_T))
-+      (defined(R__SOLARIS) && defined(_SOCKLEN_T)) || \
-+      defined(__FreeBSD_kernel__)
- #   define USE_SOCKLEN_T
- #endif
- 
 --- a/build/unix/makelib.sh
 +++ b/build/unix/makelib.sh
 @@ -65,7 +65,7 @@

-- 
root-system: CERN's ROOT Data Analysis Framework