- Update to 4.00.06

PR:		ports/69274
Submitted by:	Simon Lang <simon@lang-clan.de> (maintainer)

9 files changed, 669 insertions, 231 deletions

diff --git a/devel/root/Makefile b/devel/root/Makefile
index 9013f979a4db..324f32206135 100644
--- a/devel/root/Makefile
+++ b/devel/root/Makefile
@@ -1,80 +1,67 @@
 # New ports collection makefile for:   root
-# Date created:        7 April 2004
-# Whom:                Simon Lang <slang@freebsd.org>
+# Date created:        17 July 2004
+# Whom:                Simon Lang <simon@lang-clan.de>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	root
-PORTVERSION=	4.00.03
-CATEGORIES=	devel science math
-MASTER_SITES=	ftp://root.cern.ch/root/
-DISTNAME=	${PORTNAME}_v${PORTVERSION}.source
+PORTNAME=		root
+PORTVERSION=		4.00.06
+CATEGORIES=		devel science math
+MASTER_SITES=		ftp://root.cern.ch/root/
+DISTNAME=		${PORTNAME}_v${PORTVERSION}.sourcea
 
-MAINTAINER=	simon@lang-clan.de
-COMMENT=	An Object-Oriented Data Analysis Framework
+MAINTAINER=		simon@lang-clan.de
+COMMENT=		An Object-Oriented Data Analysis Framework
 
 HAS_CONFIGURE=		yes
-CONFIGURE_TARGET=	freebsd4
+CONFIGURE_TARGET=	freebsd5
 ALL_TARGET=		showbuild skip all
 USE_GMAKE=		yes
-USE_OPENLDAP=		yes
-USE_QT_VER=		3
-QT_NONSTANDARD=		yes
 USE_XLIB=		yes
 USE_XPM=		yes
 USE_GL=			yes
 USE_REINPLACE=		yes
+LIB_DEPENDS=		gmp.6:${PORTSDIR}/math/libgmp4
+USE_GNOME=		libxml2
 REINPLACE_ARGS=		-i ""
 WRKSRC=			${WRKDIR}/${PORTNAME}
 
 F77?=			f77
 
-# If the related ports are installed you may enable ROOT's support
-# for them, too. It *seams* that
-#   --enable-asimage   (After Image: ports/graphics/libafterimage)
-#   --enable-mysql     (MySQL:       ports/databases/mysql50-client)
-#   --enable-pgsql     (PostgreSQL:  ports/databases/postgresql73)
-# are working. A know but yet unsolved problem: The support of
-# Kerberos 5 needs some patches to ROOT.
-# For this port my intention was to use only features that are
-# available out of the box on a FreeBSD system running X11/QT.
+# If you have installed MySQL (ports/databases/mysql50-client), then
+# you may enable ROOT's support for it, too.
+# A know but yet unsolved problem: The support of Kerberos 5 needs some
+# patches to ROOT.
 # A lot of the features are related to software used in high
-# energy physics projects. Have a look to the ROOT web page for
-# more informations.
-CONFIGURE_ARGS=				\
-	${CONFIGURE_TARGET}		\
-	--prefix=${PREFIX}		\
-	--etcdir=${PREFIX}/etc		\
-	--mandir=${PREFIX}/man/man1	\
-	--disable-afs			\
-	--disable-alien			\
-	--disable-asimage		\
-	--disable-cern			\
-	--disable-chirp			\
-	--disable-dcache		\
-	--enable-exceptions		\
-	--enable-explicitlink		\
-	--disable-globus		\
-	--disable-krb5			\
-	--enable-ldap			\
-	--disable-mysql			\
-	--enable-opengl			\
-	--disable-openiv		\
-	--disable-pgsql			\
-	--disable-pythia		\
-	--disable-pythia6		\
-	--with-qt-incdir=${QT_PREFIX}/include	\
-	--with-qt-libdir=${QT_PREFIX}/lib	\
-	--disable-rfio			\
-	--disable-rpath			\
-	--disable-sapdb			\
-	--disable-shadowpw		\
-	--enable-shared			\
-	--enable-soversion		\
-	--disable-srp			\
-	--disable-table			\
-	--disable-venus
+# energy physics projects. Have a look to the ROOT web page for more
+# informations.
+CONFIGURE_ARGS=		${CONFIGURE_TARGET}		\
+			--prefix=${PREFIX}		\
+			--etcdir=${PREFIX}/etc		\
+			--mandir=${PREFIX}/man/man1	\
+			--disable-afs			\
+			--disable-alien			\
+			--disable-cern			\
+			--disable-chirp			\
+			--disable-dcache		\
+			--disable-globus		\
+			--disable-krb5			\
+			--disable-mysql			\
+			--disable-openiv		\
+			--disable-pythia		\
+			--disable-pythia6		\
+			--disable-rfio			\
+			--disable-rpath			\
+			--disable-sapdb			\
+			--disable-shadowpw		\
+			--disable-venus			\
+			--enable-opengl			\
+			--enable-exceptions		\
+			--enable-explicitlink		\
+			--enable-shared			\
+			--enable-soversion		\
+			--enable-table
 
 INSTALLS_SHLIB=		yes
 NO_FILTER_SHLIBS=	yes
@@ -86,12 +73,76 @@ MAN1+=			root.exe.1 rootcint.1 rootd.1 rootn.exe.1
 MODTESTS=		Event hsimple minexam tcollex tstring
 MAKE_TENV=		${MAKE_ENV} CXX="${CXX}" LDFLAGS="${LDFLAGS}"
 
+# Auto detection of installed packages which then can be used by ROOT
+.if exists(${LOCALBASE}/lib/libpq.so.3)
+WITH_POSTGRESQL=	yes
+.endif
+
+.if exists(${LOCALBASE}/lib/libldap.so.2)
+WITH_LDAP=		yes
+.endif
+
+.if exists(${LOCALBASE}/lib/libsrp.a)
+WITH_SRP=		yes
+.endif
+
+# Settings depending on additionally installed packages
+.if !defined(WITHOUT_QT)
+USE_QT_VER=		3
+QT_NONSTANDARD=		yes
+CONFIGURE_ARGS+=	--enable-qt                           \
+			--with-qt-incdir=${QT_PREFIX}/include \
+			--with-qt-libdir=${QT_PREFIX}/lib
+PLIST_SUB+=		QT=""
+.else
+CONFIGURE_ARGS+=	--disable-qt
+LIB_DEPENDS+=		tiff.4:${PORTSDIR}/graphics/tiff      \
+			jpeg.9:${PORTSDIR}/graphics/jpeg      \
+			png.5:${PORTSDIR}/graphics/png        \
+			ungif.5:${PORTSDIR}/graphics/libungif
+PLIST_SUB+=		QT="@comment "
+.endif
+
+.if !defined(WITHOUT_AFTERIMAGE)
+CONFIGURE_ARGS+=	--enable-asimage
+PLIST_SUB+=		AFTERIMAGE=""
+LIB_DEPENDS+=		AfterImage.0:${PORTSDIR}/graphics/libafterimage
+.else
+CONFIGURE_ARGS+=	--disable-asimage
+PLIST_SUB+=		AFTERIMAGE="@comment "
+.endif
+
+.if !defined(WITHOUT_POSTGRESQL) && defined(WITH_POSTGRESQL)
+CONFIGURE_ARGS+=	--enable-pgsql
+LIB_DEPENDS+=		pq.3:${PORTSDIR}/databases/postgresql
+PLIST_SUB+=		POSTGRESQL=""
+.else
+CONFIGURE_ARGS+=	--disable-pgsql
+PLIST_SUB+=		POSTGRESQL="@comment "
+.endif
+
+.if !defined(WITHOUT_LDAP) && defined(WITH_LDAP)
+USE_OPENLDAP=		yes
+CONFIGURE_ARGS+=	--enable-ldap
+PLIST_SUB+=		LDAP=""
+.else
+CONFIGURE_ARGS+=	--disable-ldap
+PLIST_SUB+=		LDAP="@comment "
+.endif
+
+.if !defined(WITHOUT_SRP) && defined(WITH_SRP)
+CONFIGURE_ARGS+=	--enable-srp
+BUILD_DEPENDS+=		${LOCALBASE}/lib/libsrp.a:${PORTSDIR}/security/srp
+.else
+CONFIGURE_ARGS+=	--disable-srp
+.endif
+
 .include <bsd.port.pre.mk>
 
 # The thread sub-system was not working for ROOT versions 3.x on FreeBSD 4.x
 # systems. Meanwhile maybe it's working with some patches - but I have no
 # FreeBSD 4.x system still running for testing  ;-)
-.if ${OSVERSION} < 500016
+.if ${OSVERSION} < 500016 || defined(WITHOUT_THREADS)
 CONFIGURE_ARGS+=	--disable-thread
 PLIST_SUB+=		THREADS="@comment "
 .else
@@ -103,15 +154,44 @@ MAKE_ENV+=		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"	\
 PLIST_SUB+=		THREADS=""
 .endif
 
-.if ${OSVERSION} >= 502112
-BROKEN=			"Coredump during install on FreeBSD >= 5.x"
+pre-everything::
+.if !defined(WITHOUT_QT)
+	@${ECHO_MSG} "===> Define WITHOUT_QT to disable QT backend"
+.endif
+.if !defined(WITHOUT_THREADS)
+	@${ECHO_MSG} "===> Define WITHOUT_THREADS to disable threads"
+.endif
+.if !defined(WITHOUT_AFTERIMAGE)
+	@${ECHO_MSG} "===> Define WITHOUT_AFTERIMAGE to disable AfterImage support"
+.endif
+.if defined(WITHOUT_LDAP) || !defined(WITH_LDAP)
+	@${ECHO_MSG} "===> Define WITH_LDAP to enable LDAP support"
 .endif
+.if defined(WITHOUT_SRP) || !defined(WITH_SRP)
+	@${ECHO_MSG} "===> Define WITH_SRP to enable SRP authentification"
+.endif
+.if defined(WITHOUT_POSTGRESQL) || !defined(WITH_POSTGRESQL)
+	@${ECHO_MSG} "===> Define WITH_POSTGRESQL to enable Postgres SQL support"
+.endif
+	@sleep 3
 
 post-patch:
+	@${RM} ${WRKSRC}/configure.orig
+	@${RM} ${WRKSRC}/config/Makefile.freebsd4.orig
+	@${RM} ${WRKSRC}/config/Makefile.freebsd5.orig
+	@${RM} ${WRKSRC}/config/root-config.in.orig
 	@${RM} ${WRKSRC}/test/Makefile.arch.orig
-	@${REINPLACE_CMD} -e 's|auxcflags=\"-pthread|auxcflags=\"${PTHREAD_CFLAGS}| ;	\
-		s|auxlibs=\"-pthread|auxlibs=\"${PTHREAD_LIBS}|'			\
-			${WRKSRC}/config/root-config.in
+.if ${OSVERSION} < 500016 || defined(WITHOUT_THREADS)
+	@${REINPLACE_CMD} -e                                  \
+		's|auxcflags=\"PTHREAD-CFLAGS|auxcflags=\"| ; \
+		s|auxlibs=\"PTHREAD-LIBS|auxlibs=\"|'         \
+		${WRKSRC}/config/root-config.in
+.else
+	@${REINPLACE_CMD} -e                                                 \
+		's|auxcflags=\"PTHREAD-CFLAGS|auxcflags=\"${PTHREAD_CFLAGS}|;\
+		s|auxlibs=\"PTHREAD-LIBS|auxlibs=\"${PTHREAD_LIBS}|'         \
+		${WRKSRC}/config/root-config.in
+.endif
 
 .if defined(MAINTAINER_MODE)
 test:	install
diff --git a/devel/root/distinfo b/devel/root/distinfo
index 456267ae41b9..c17936fbb1d3 100644
--- a/devel/root/distinfo
+++ b/devel/root/distinfo
@@ -1,2 +1,2 @@
-MD5 (root_v4.00.03.source.tar.gz) = e99a141b0d0717b6a2377ad66c7d3b2d
-SIZE (root_v4.00.03.source.tar.gz) = 10689865
+MD5 (root_v4.00.06.sourcea.tar.gz) = 8fec2ea3252dd6bd76f9933665c7142c
+SIZE (root_v4.00.06.sourcea.tar.gz) = 10953070
diff --git a/devel/root/files/patch-config::Makefile.freebsd4 b/devel/root/files/patch-config::Makefile.freebsd4
index ff8c7a896a1a..599d8c0993dd 100644
--- a/devel/root/files/patch-config::Makefile.freebsd4
+++ b/devel/root/files/patch-config::Makefile.freebsd4
@@ -1,55 +1,82 @@
---- config/Makefile.freebsd4.orig	Mon Feb 16 11:12:43 2004
-+++ config/Makefile.freebsd4	Sat Apr 17 00:35:00 2004
-@@ -5,7 +5,7 @@
- PLATFORM      = fbsd
- 
- DEBUGFLAGS    = -g
--OPTFLAGS      = -O
-+#OPTFLAGS     = -O
- ifeq (debug,$(findstring debug,$(ROOTBUILD)))
- OPT           = $(DEBUGFLAGS)
- NOOPT         =
-@@ -15,10 +15,10 @@
- endif
- 
- # Compiler:
--CXX           = g++
--CC            = gcc
--CXXFLAGS      = -pipe -W -Wall -fPIC -I/usr/X11R6/include $(EXTRA_CXXFLAGS)
--CFLAGS        = -pipe -W -Wall -fPIC -I/usr/X11R6/include $(EXTRA_CFLAGS)
-+#CXX          = g++
-+#CC           = gcc
-+CXXFLAGS     += -W -Wall -fPIC -I$(X11BASE)/include $(EXTRA_CXXFLAGS)
-+CFLAGS       += -W -Wall -fPIC -I$(X11BASE)/include $(EXTRA_CFLAGS)
- CINTCXXFLAGS  = -pipe -W -Wall -fPIC -DG__REGEXP $(EXTRA_CXXFLAGS) \
-                 -DG__UNIX -DG__SHAREDLIB -DG__ROOT -DG__REDIRECTIO -DG__OSFDLL
- CINTCFLAGS    = -pipe -W -Wall -fPIC -DG__REGEXP -DG__UNIX -DG__SHAREDLIB \
-@@ -26,13 +26,13 @@
- COMPILER      = gnu
- 
- ifeq ($(ENABLETHREAD),yes)
--CXXFLAGS     += -pthread
--CINTCXXFLAGS += -pthread
-+CXXFLAGS     += $(PTHREAD_CFLAGS)
-+CINTCXXFLAGS += $(PTHREAD_CFLAGS)
- endif
- 
- # Linker:
--LD            = g++
--LDFLAGS       = $(OPT) $(EXTRA_LDFLAGS)
-+LD            = $(CXX)
-+LDFLAGS      += $(OPT) $(EXTRA_LDFLAGS)
- SOFLAGS       = -shared -Wl,-x -Wl,-soname,
- SOEXT         = so
- 
-@@ -43,8 +43,8 @@
- CRYPTLIBS     = -lcrypt
- 
- # Fortran:
--F77           = f77
--F77FLAGS      = $(OPT)
-+#F77          = f77
-+F77FLAGS     += $(OPT)
- F77LIBS       = -lg2c
- 
- # Extras
+*** config/Makefile.freebsd4.orig	Mon Feb 16 11:12:43 2004
+--- config/Makefile.freebsd4	Wed Jun 16 15:23:15 2004
+***************
+*** 5,11 ****
+  PLATFORM      = fbsd
+  
+  DEBUGFLAGS    = -g
+- OPTFLAGS      = -O
+  ifeq (debug,$(findstring debug,$(ROOTBUILD)))
+  OPT           = $(DEBUGFLAGS)
+  NOOPT         =
+--- 5,10 ----
+***************
+*** 15,24 ****
+  endif
+  
+  # Compiler:
+! CXX           = g++
+! CC            = gcc
+! CXXFLAGS      = -pipe -W -Wall -fPIC -I/usr/X11R6/include $(EXTRA_CXXFLAGS)
+! CFLAGS        = -pipe -W -Wall -fPIC -I/usr/X11R6/include $(EXTRA_CFLAGS)
+  CINTCXXFLAGS  = -pipe -W -Wall -fPIC -DG__REGEXP $(EXTRA_CXXFLAGS) \
+                  -DG__UNIX -DG__SHAREDLIB -DG__ROOT -DG__REDIRECTIO -DG__OSFDLL
+  CINTCFLAGS    = -pipe -W -Wall -fPIC -DG__REGEXP -DG__UNIX -DG__SHAREDLIB \
+--- 14,23 ----
+  endif
+  
+  # Compiler:
+! CXXFLAGS     += -W -Wall -fPIC -I$(X11BASE)/include -I$(LOCALBASE)/include
+! CXXFLAGS     += $(EXTRA_CXXFLAGS)
+! CFLAGS       += -W -Wall -fPIC -I$(X11BASE)/include -I$(LOCALBASE)/include
+! CFLAGS       += $(EXTRA_CFLAGS)
+  CINTCXXFLAGS  = -pipe -W -Wall -fPIC -DG__REGEXP $(EXTRA_CXXFLAGS) \
+                  -DG__UNIX -DG__SHAREDLIB -DG__ROOT -DG__REDIRECTIO -DG__OSFDLL
+  CINTCFLAGS    = -pipe -W -Wall -fPIC -DG__REGEXP -DG__UNIX -DG__SHAREDLIB \
+***************
+*** 26,38 ****
+  COMPILER      = gnu
+  
+  ifeq ($(ENABLETHREAD),yes)
+! CXXFLAGS     += -pthread
+! CINTCXXFLAGS += -pthread
+  endif
+  
+  # Linker:
+! LD            = g++
+! LDFLAGS       = $(OPT) $(EXTRA_LDFLAGS)
+  SOFLAGS       = -shared -Wl,-x -Wl,-soname,
+  SOEXT         = so
+  
+--- 25,37 ----
+  COMPILER      = gnu
+  
+  ifeq ($(ENABLETHREAD),yes)
+! CXXFLAGS     += $(PTHREAD_CFLAGS)
+! CINTCXXFLAGS += $(PTHREAD_CFLAGS)
+  endif
+  
+  # Linker:
+! LD            = $(CXX)
+! LDFLAGS      += $(OPT) $(EXTRA_LDFLAGS)
+  SOFLAGS       = -shared -Wl,-x -Wl,-soname,
+  SOEXT         = so
+  
+***************
+*** 43,50 ****
+  CRYPTLIBS     = -lcrypt
+  
+  # Fortran:
+! F77           = f77
+! F77FLAGS      = $(OPT)
+  F77LIBS       = -lg2c
+  
+  # Extras
+--- 42,48 ----
+  CRYPTLIBS     = -lcrypt
+  
+  # Fortran:
+! F77FLAGS     += $(OPT)
+  F77LIBS       = -lg2c
+  
+  # Extras
diff --git a/devel/root/files/patch-config::Makefile.freebsd5 b/devel/root/files/patch-config::Makefile.freebsd5
new file mode 100644
index 000000000000..096523138d5f
--- /dev/null
+++ b/devel/root/files/patch-config::Makefile.freebsd5
@@ -0,0 +1,90 @@
+*** config/Makefile.freebsd5.orig	Tue Jun 15 19:28:13 2004
+--- config/Makefile.freebsd5	Wed Jun 16 15:22:55 2004
+***************
+*** 1,11 ****
+  # -*- mode: makefile -*-
+  #
+! # Makefile of ROOT for FreeBSD 4.5
+  
+  PLATFORM      = fbsd
+  
+  DEBUGFLAGS    = -g
+- OPTFLAGS      = -O
+  ifeq (debug,$(findstring debug,$(ROOTBUILD)))
+  OPT           = $(DEBUGFLAGS)
+  NOOPT         =
+--- 1,10 ----
+  # -*- mode: makefile -*-
+  #
+! # Makefile of ROOT for FreeBSD 5.x
+  
+  PLATFORM      = fbsd
+  
+  DEBUGFLAGS    = -g
+  ifeq (debug,$(findstring debug,$(ROOTBUILD)))
+  OPT           = $(DEBUGFLAGS)
+  NOOPT         =
+***************
+*** 15,33 ****
+  endif
+  
+  # Compiler:
+! CXX           = g++
+! CC            = gcc
+! CXXFLAGS      = -pipe -W -Wall -fPIC -I/usr/X11R6/include $(EXTRA_CXXFLAGS)
+! CFLAGS        = -pipe -W -Wall -fPIC -I/usr/X11R6/include $(EXTRA_CFLAGS)
+  CINTCXXFLAGS  = -pipe -W -Wall -fPIC -DG__REGEXP $(EXTRA_CXXFLAGS) \
+                  -DG__UNIX -DG__SHAREDLIB -DG__ROOT -DG__REDIRECTIO -DG__OSFDLL
+  CINTCFLAGS    = -pipe -W -Wall -fPIC -DG__REGEXP -DG__UNIX -DG__SHAREDLIB \
+                  -DG__ROOT -DG__REDIRECTIO -DG__OSFDLL $(EXTRA_CFLAGS)
+  COMPILER      = gnu
+  
+  # Linker:
+! LD            = g++
+! LDFLAGS       = $(OPT) $(EXTRA_LDFLAGS)
+  SOFLAGS       = -shared -Wl,-x -Wl,-soname,
+  SOEXT         = so
+  
+--- 14,37 ----
+  endif
+  
+  # Compiler:
+! CXXFLAGS     += -W -Wall -fPIC -I$(X11BASE)/include -I$(LOCALBASE)/include
+! CXXFLAGS     += $(EXTRA_CXXFLAGS)
+! CFLAGS       += -W -Wall -fPIC -I$(X11BASE)/include -I$(LOCALBASE)/include
+! CFLAGS       += $(EXTRA_CFLAGS)
+  CINTCXXFLAGS  = -pipe -W -Wall -fPIC -DG__REGEXP $(EXTRA_CXXFLAGS) \
+                  -DG__UNIX -DG__SHAREDLIB -DG__ROOT -DG__REDIRECTIO -DG__OSFDLL
+  CINTCFLAGS    = -pipe -W -Wall -fPIC -DG__REGEXP -DG__UNIX -DG__SHAREDLIB \
+                  -DG__ROOT -DG__REDIRECTIO -DG__OSFDLL $(EXTRA_CFLAGS)
+  COMPILER      = gnu
+  
++ ifeq ($(ENABLETHREAD),yes)
++ CXXFLAGS     += $(PTHREAD_CFLAGS)
++ CINTCXXFLAGS += $(PTHREAD_CFLAGS)
++ endif
++ 
+  # Linker:
+! LD            = $(CXX)
+! LDFLAGS      += $(OPT) $(EXTRA_LDFLAGS)
+  SOFLAGS       = -shared -Wl,-x -Wl,-soname,
+  SOEXT         = so
+  
+***************
+*** 38,45 ****
+  CRYPTLIBS     = -lcrypt
+  
+  # Fortran:
+! F77           = f77
+! F77FLAGS      = $(OPT)
+  F77LIBS       = -lg2c
+  
+  # Extras
+--- 42,48 ----
+  CRYPTLIBS     = -lcrypt
+  
+  # Fortran:
+! F77FLAGS     += $(OPT)
+  F77LIBS       = -lg2c
+  
+  # Extras
diff --git a/devel/root/files/patch-config::root-config.in b/devel/root/files/patch-config::root-config.in
new file mode 100644
index 000000000000..ad70021bb492
--- /dev/null
+++ b/devel/root/files/patch-config::root-config.in
@@ -0,0 +1,28 @@
+*** config/root-config.in.orig  Mon Jul  5 16:49:16 2004
+--- config/root-config.in       Mon Jul  5 16:51:05 2004
+***************
+*** 245,253 ****
+     auxlibs="-lm -lg++"
+     ;;
+  freebsd4)
+!    # FreeBSD with glibc
+     auxcflags=
+     auxlibs="-lm -lstdc++"
+     ;;
+  macosx)
+     # MacOS X with gcc (GNU cc v3.1) and possible fink (fink.sf.net)
+--- 245,258 ----
+     auxlibs="-lm -lg++"
+     ;;
+  freebsd4)
+!    # FreeBSD 4.x with glibc
+     auxcflags=
+     auxlibs="-lm -lstdc++"
++    ;;
++ freebsd5)
++    # FreeBSD 5.x with glibc
++    auxcflags="PTHREAD-CFLAGS"
++    auxlibs="PTHREAD-LIBS -lm -lstdc++"
+     ;;
+  macosx)
+     # MacOS X with gcc (GNU cc v3.1) and possible fink (fink.sf.net)
diff --git a/devel/root/files/patch-configure b/devel/root/files/patch-configure
index f68b2459fbf3..59586f005ba1 100644
--- a/devel/root/files/patch-configure
+++ b/devel/root/files/patch-configure
@@ -1,11 +1,35 @@
---- configure.orig	Thu Feb 19 01:11:18 2004
-+++ configure	Sat Apr 17 13:54:24 2004
-@@ -901,7 +901,7 @@
-     ;;
- freebsd*)
-     if test "x$enable_thread" = "xyes"; then
--       threadlib="-pthread"
-+       threadlib="$PTHREAD_LIBS"
-        threadlibdir=
-     fi
-     ;;
+*** configure.orig	Tue Jun 15 19:44:02 2004
+--- configure	Wed Jun 16 09:42:21 2004
+***************
+*** 905,918 ****
+      ;;
+  freebsd*)
+      if test "x$enable_thread" = "xyes"; then
+!        threadlib="-pthread"
+         threadlibdir=
+      fi
+      ;;
+  esac
+  if test "x$enable_thread" = "xyes" && \
+     test ! "$platform" = "win32"    && \
+!    test ! "$platform" = "freebsd4" ; then
+      check_library "libpthread" "$enable_shared" "$threadlibdir" \
+  	$THREAD $THREAD/lib /usr/lib /usr/local/lib /usr/lib/X11 \
+  	/usr/local/lib/X11 /usr/X11R6/lib /usr/local/X11R6/lib \
+--- 905,920 ----
+      ;;
+  freebsd*)
+      if test "x$enable_thread" = "xyes"; then
+!        threadlib="$PTHREAD_LIBS"
+         threadlibdir=
+      fi
+      ;;
+  esac
+  if test "x$enable_thread" = "xyes" && \
+     test ! "$platform" = "win32"    && \
+!    test ! "$platform" = "freebsd5" && \
+!    test ! "$platform" = "freebsd4" && \
+!    test ! "$platform" = "freebsd" ; then
+      check_library "libpthread" "$enable_shared" "$threadlibdir" \
+  	$THREAD $THREAD/lib /usr/lib /usr/local/lib /usr/lib/X11 \
+  	/usr/local/lib/X11 /usr/X11R6/lib /usr/local/X11R6/lib \
diff --git a/devel/root/files/patch-gcc34 b/devel/root/files/patch-gcc34
new file mode 100644
index 000000000000..04b4be260321
--- /dev/null
+++ b/devel/root/files/patch-gcc34
@@ -0,0 +1,51 @@
+===================================================================
+RCS file: /home/cvs/root/cint/src/gcc3strm.cxx,v
+retrieving revision 1.17
+retrieving revision 1.18
+diff -u -r1.17 -r1.18
+--- cint/src/gcc3strm.cxx	2004/04/26 21:50:31	1.17
++++ cint/src/gcc3strm.cxx	2004/07/01 20:02:52	1.18
+@@ -139,7 +139,8 @@
+ }
+ 
+ static int G__G__stream_5_4_0(G__value *result7,G__CONST char *funcname,struct G__param *libp,int hash) {
+-      G__letint(result7,108,(long)((const fpos<mbstate_t>*)(G__getstructoffset()))->operator long());
++   const fpos<mbstate_t>*pos = (const fpos<mbstate_t>*)(G__getstructoffset());
++   G__letint(result7,108,(long)(*pos));
+    return(1 || funcname || hash || result7 || libp) ;
+ }
+ 
+@@ -2023,13 +2024,13 @@
+    return(1 || funcname || hash || result7 || libp) ;
+ }
+ 
+-static int G__G__stream__1_16(G__value *result7,G__CONST char *funcname,struct G__param *libp,int hash) {
+-      {
+-        const ostream& obj=operator<<(*(ostream*)libp->para[0].ref,*(streampos*)libp->para[1].ref);
+-         result7->ref=(long)(&obj); result7->obj.i=(long)(&obj);
+-      }
+-   return(1 || funcname || hash || result7 || libp) ;
+-}
++// static int G__G__stream__1_16(G__value *result7,G__CONST char *funcname,struct G__param *libp,int hash) {
++//       {
++//         const ostream& obj=operator<<(*(ostream*)libp->para[0].ref,*(streampos*)libp->para[1].ref);
++//          result7->ref=(long)(&obj); result7->obj.i=(long)(&obj);
++//       }
++//    return(1 || funcname || hash || result7 || libp) ;
++// }
+ 
+ static int G__G__stream__2_16(G__value *result7,G__CONST char *funcname,struct G__param *libp,int hash) {
+       {
+@@ -3621,9 +3622,9 @@
+    G__memfunc_setup("operator<<",996,G__G__stream__0_16,117,G__get_linked_tagnum(&G__G__streamLN_basic_ostreamlEcharcOchar_traitslEchargRsPgR),G__defined_typename("ostream"),1,2,1,1,0,
+ "u 'basic_ostream<char,char_traits<char> >' 'ostream' 1 - - g - - 0 - -",(char*)NULL
+ ,(void*)NULL,0);
+-   G__memfunc_setup("operator<<",996,G__G__stream__1_16,117,G__get_linked_tagnum(&G__G__streamLN_basic_ostreamlEcharcOchar_traitslEchargRsPgR),G__defined_typename("ostream"),1,2,1,1,0,
+-"u 'basic_ostream<char,char_traits<char> >' 'ostream' 1 - - u 'fpos<mbstate_t>' 'streampos' 11 - -",(char*)NULL
+-,(void*)NULL,0);
++//    G__memfunc_setup("operator<<",996,G__G__stream__1_16,117,G__get_linked_tagnum(&G__G__streamLN_basic_ostreamlEcharcOchar_traitslEchargRsPgR),G__defined_typename("ostream"),1,2,1,1,0,
++// "u 'basic_ostream<char,char_traits<char> >' 'ostream' 1 - - u 'fpos<mbstate_t>' 'streampos' 11 - -",(char*)NULL
++// ,(void*)NULL,0);
+    G__memfunc_setup("operator>>",1000,G__G__stream__2_16,117,G__get_linked_tagnum(&G__G__streamLN_basic_istreamlEcharcOchar_traitslEchargRsPgR),G__defined_typename("istream"),1,2,1,1,0,
+ "u 'basic_istream<char,char_traits<char> >' 'istream' 1 - - c - - 1 - -",(char*)NULL
+ ,(void*)NULL,0);
diff --git a/devel/root/files/patch-test::Makefile.arch b/devel/root/files/patch-test::Makefile.arch
index fda34e13eef8..e144e7e95b8a 100644
--- a/devel/root/files/patch-test::Makefile.arch
+++ b/devel/root/files/patch-test::Makefile.arch
@@ -1,25 +1,40 @@
---- test/Makefile.arch.orig	Sat Apr 17 10:25:16 2004
-+++ test/Makefile.arch	Sat Apr 17 10:41:58 2004
-@@ -9,7 +9,6 @@
- ARCH         := $(shell root-config --arch)
- PLATFORM      = $(ARCH)
- 
--CXX           =
- ObjSuf        = o
- SrcSuf        = cxx
- ExeSuf        =
-@@ -426,10 +425,10 @@
- 
- ifeq ($(ARCH),freebsd4)
- # FreeBSD with glibc
--CXX           = g++
--CXXFLAGS      = -O -pipe -W -Wall -fPIC
--LD            = g++
--LDFLAGS       = -O
-+#CXX          = g++
-+CXXFLAGS     += -W -Wall -fPIC
-+LD            = $(CXX)
-+#LDFLAGS      = -O
- SOFLAGS       = -shared -Wl,-x
- endif
- 
+*** test/Makefile.arch.orig	Tue Jun 15 20:02:44 2004
+--- test/Makefile.arch	Wed Jun 16 10:05:39 2004
+***************
+*** 9,15 ****
+  ARCH         := $(shell root-config --arch)
+  PLATFORM      = $(ARCH)
+  
+- CXX           =
+  ObjSuf        = o
+  SrcSuf        = cxx
+  ExeSuf        =
+--- 9,14 ----
+***************
+*** 426,435 ****
+  
+  ifeq ($(ARCH),freebsd4)
+  # FreeBSD with glibc
+! CXX           = g++
+! CXXFLAGS      = -O -pipe -W -Wall -fPIC
+! LD            = g++
+! LDFLAGS       = -O
+  SOFLAGS       = -shared -Wl,-x
+  endif
+  
+--- 425,439 ----
+  
+  ifeq ($(ARCH),freebsd4)
+  # FreeBSD with glibc
+! CXXFLAGS     += -W -Wall -fPIC
+! LD            = $(CXX)
+! SOFLAGS       = -shared -Wl,-x
+! endif
+! 
+! ifeq ($(ARCH),freebsd5)
+! # FreeBSD with glibc
+! CXXFLAGS     += -W -Wall -fPIC
+! LD            = $(CXX)
+  SOFLAGS       = -shared -Wl,-x
+  endif
+  
diff --git a/devel/root/pkg-plist b/devel/root/pkg-plist
index 2f67b15e840b..18f3d96a4faf 100644
--- a/devel/root/pkg-plist
+++ b/devel/root/pkg-plist
@@ -30,7 +30,7 @@ include/root/Buttons.h
 include/root/Bytes.h
 include/root/Byteswap.h
 include/root/CallFunc.h
-include/root/CintLDAP.h
+%%LDAP%%include/root/CintLDAP.h
 include/root/Class.h
 include/root/DataMbr.h
 include/root/Demangle.h
@@ -68,6 +68,8 @@ include/root/Rtypes.h
 include/root/RtypesCint.h
 include/root/RtypesImp.h
 include/root/Strlen.h
+%%AFTERIMAGE%%include/root/TASImage.h
+%%AFTERIMAGE%%include/root/TASPaletteEditor.h
 include/root/TApplication.h
 include/root/TApplicationImp.h
 include/root/TArc.h
@@ -111,6 +113,7 @@ include/root/TBrowserImp.h
 include/root/TBtree.h
 include/root/TBuffer.h
 include/root/TButton.h
+include/root/TCL.h
 include/root/TCONE.h
 include/root/TCONS.h
 include/root/TCTUB.h
@@ -119,6 +122,7 @@ include/root/TCanvas.h
 include/root/TCanvasImp.h
 include/root/TChain.h
 include/root/TChainElement.h
+include/root/TChair.h
 include/root/TCint.h
 include/root/TClass.h
 include/root/TClassEdit.h
@@ -130,6 +134,8 @@ include/root/TClassTree.h
 include/root/TClonesArray.h
 include/root/TCollection.h
 include/root/TColor.h
+include/root/TColumnView.h
+include/root/TComplex.h
 %%THREADS%%include/root/TCondition.h
 %%THREADS%%include/root/TConditionImp.h
 include/root/TCondor.h
@@ -147,6 +153,8 @@ include/root/TCutG.h
 include/root/TDSet.h
 include/root/TDSetProxy.h
 include/root/TDataMember.h
+include/root/TDataSet.h
+include/root/TDataSetIter.h
 include/root/TDataType.h
 include/root/TDatabasePDG.h
 include/root/TDatime.h
@@ -156,11 +164,13 @@ include/root/TDecompChol.h
 include/root/TDecompLU.h
 include/root/TDecompQRH.h
 include/root/TDecompSVD.h
+include/root/TDecompSparse.h
 include/root/TDialogCanvas.h
 include/root/TDiamond.h
 include/root/TDictionary.h
 include/root/TDirectory.h
 include/root/TDrawPanelHist.h
+include/root/TDsKey.h
 include/root/TELTU.h
 include/root/TEllipse.h
 include/root/TEmulatedVectorProxy.h
@@ -179,6 +189,8 @@ include/root/TFTP.h
 include/root/TFeldmanCousins.h
 include/root/TFile.h
 include/root/TFileDrawMap.h
+include/root/TFileIter.h
+include/root/TFileSet.h
 include/root/TFitPanel.h
 include/root/TFitPanelGraph.h
 include/root/TFitter.h
@@ -205,6 +217,7 @@ include/root/TGFSComboBox.h
 include/root/TGFSContainer.h
 include/root/TGFileDialog.h
 include/root/TGFont.h
+include/root/TGFontDialog.h
 include/root/TGFrame.h
 include/root/TGGC.h
 include/root/TGIcon.h
@@ -258,6 +271,7 @@ include/root/TGedToolBox.h
 include/root/TGenPhaseSpace.h
 include/root/TGenerator.h
 include/root/TGenericClassInfo.h
+include/root/TGenericTable.h
 include/root/TGeoArb8.h
 include/root/TGeoAtt.h
 include/root/TGeoBBox.h
@@ -267,6 +281,7 @@ include/root/TGeoChecker.h
 include/root/TGeoCompositeShape.h
 include/root/TGeoCone.h
 include/root/TGeoEltu.h
+include/root/TGeoHelix.h
 include/root/TGeoMCGeometry.h
 include/root/TGeoManager.h
 include/root/TGeoMaterial.h
@@ -293,6 +308,7 @@ include/root/TGeoVoxelFinder.h
 include/root/TGeoXtru.h
 include/root/TGeometry.h
 include/root/TGlobal.h
+include/root/TGondzioSolver.h
 include/root/TGraph.h
 include/root/TGraph2D.h
 include/root/TGraph2DErrors.h
@@ -336,6 +352,7 @@ include/root/THistPainter.h
 include/root/THostAuth.h
 include/root/THtml.h
 include/root/TImage.h
+include/root/TIndexTable.h
 include/root/TInetAddress.h
 include/root/TInspectCanvas.h
 include/root/TInspectorImp.h
@@ -343,10 +360,10 @@ include/root/TInterpreter.h
 include/root/TIterator.h
 include/root/TKey.h
 include/root/TKeyMapFile.h
-include/root/TLDAPAttribute.h
-include/root/TLDAPEntry.h
-include/root/TLDAPResult.h
-include/root/TLDAPServer.h
+%%LDAP%%include/root/TLDAPAttribute.h
+%%LDAP%%include/root/TLDAPEntry.h
+%%LDAP%%include/root/TLDAPResult.h
+%%LDAP%%include/root/TLDAPServer.h
 include/root/TLatex.h
 include/root/TLeaf.h
 include/root/TLeafB.h
@@ -372,6 +389,7 @@ include/root/TMCParticleType.h
 include/root/TMCProcess.h
 include/root/TMCVerbose.h
 include/root/TMD5.h
+include/root/TMLPAnalyzer.h
 include/root/TMap.h
 include/root/TMapFile.h
 include/root/TMarker.h
@@ -384,6 +402,7 @@ include/root/TMatrixDBase.h
 include/root/TMatrixDCramerInv.h
 include/root/TMatrixDEigen.h
 include/root/TMatrixDLazy.h
+include/root/TMatrixDSparse.h
 include/root/TMatrixDSym.h
 include/root/TMatrixDSymEigen.h
 include/root/TMatrixDUtils.h
@@ -393,6 +412,7 @@ include/root/TMatrixFCramerInv.h
 include/root/TMatrixFLazy.h
 include/root/TMatrixFSym.h
 include/root/TMatrixFUtils.h
+include/root/TMehrotraSolver.h
 include/root/TMemberInspector.h
 include/root/TMemberStreamer.h
 include/root/TMessage.h
@@ -418,6 +438,7 @@ include/root/TNtupleD.h
 include/root/TObjArray.h
 include/root/TObjString.h
 include/root/TObject.h
+include/root/TObjectSet.h
 include/root/TObjectTable.h
 include/root/TOrdCollection.h
 include/root/TPARA.h
@@ -427,6 +448,7 @@ include/root/TPDGCode.h
 include/root/TPGON.h
 include/root/TPServerSocket.h
 include/root/TPSocket.h
+include/root/TPacketizer.h
 include/root/TPacketizer2.h
 include/root/TPad.h
 include/root/TPadEditorOld.h
@@ -443,12 +465,18 @@ include/root/TPaveLabel.h
 include/root/TPaveStats.h
 include/root/TPaveText.h
 include/root/TPavesText.h
+%%POSTGRESQL%%include/root/TPgSQLResult.h
+%%POSTGRESQL%%include/root/TPgSQLRow.h
+%%POSTGRESQL%%include/root/TPgSQLServer.h
 include/root/TPluginManager.h
 include/root/TPoint.h
 include/root/TPoints.h
+include/root/TPoints3D.h
 include/root/TPoints3DABC.h
+include/root/TPointsArray3D.h
 include/root/TPolyLine.h
 include/root/TPolyLine3D.h
+include/root/TPolyLineShape.h
 include/root/TPolyMarker.h
 include/root/TPolyMarker3D.h
 %%THREADS%%include/root/TPosixCondition.h
@@ -469,8 +497,22 @@ include/root/TProofLimitsFinder.h
 include/root/TProofPlayer.h
 include/root/TProofProgressDialog.h
 include/root/TProofServ.h
+include/root/TProofStats.h
+include/root/TQCommand.h
 include/root/TQConnection.h
 include/root/TQObject.h
+include/root/TQpDataBase.h
+include/root/TQpDataDens.h
+include/root/TQpDataSparse.h
+include/root/TQpLinSolverBase.h
+include/root/TQpLinSolverDens.h
+include/root/TQpLinSolverSparse.h
+include/root/TQpProbBase.h
+include/root/TQpProbDens.h
+include/root/TQpProbSparse.h
+include/root/TQpResidual.h
+include/root/TQpSolverBase.h
+include/root/TQpVar.h
 include/root/TROOT.h
 %%THREADS%%include/root/TRWLock.h
 include/root/TRandom.h
@@ -481,6 +523,7 @@ include/root/TRef.h
 include/root/TRefArray.h
 include/root/TRefCnt.h
 include/root/TRegexp.h
+include/root/TResponseTable.h
 include/root/TRint.h
 include/root/TRolke.h
 include/root/TRootApplication.h
@@ -542,6 +585,13 @@ include/root/TTUBS.h
 include/root/TTVLVContainer.h
 include/root/TTVSession.h
 include/root/TTabCom.h
+include/root/TTable.h
+include/root/TTable3Points.h
+include/root/TTableDescriptor.h
+include/root/TTableIter.h
+include/root/TTableMap.h
+include/root/TTablePoints.h
+include/root/TTableSorter.h
 include/root/TTask.h
 include/root/TText.h
 %%THREADS%%include/root/TThread.h
@@ -595,13 +645,24 @@ include/root/TVirtualUtil3D.h
 include/root/TVirtualUtilHist.h
 include/root/TVirtualUtilPad.h
 include/root/TVirtualX.h
+include/root/TVolume.h
+include/root/TVolumePosition.h
+include/root/TVolumeView.h
+include/root/TVolumeViewIter.h
 include/root/TWbox.h
 include/root/TWebFile.h
 include/root/TWin32GLKernel.h
 include/root/TWin32GLViewerImp.h
+include/root/TXMLBuffer.h
+include/root/TXMLDtdGenerator.h
+include/root/TXMLEngine.h
+include/root/TXMLFile.h
+include/root/TXMLKey.h
+include/root/TXMLSetup.h
 include/root/TXTRU.h
 include/root/Tailor.h
 include/root/Token.h
+include/root/Ttypes.h
 include/root/Type.h
 include/root/Typedf.h
 include/root/Varargs.h
@@ -655,6 +716,7 @@ include/root/snprintf.h
 include/root/stdstrct.h
 include/root/sunos.h
 include/root/sunstrm.h
+include/root/tableDescriptor.h
 include/root/trees.h
 include/root/vc7strm.h
 include/root/vcstrm.h
@@ -761,7 +823,12 @@ lib/root/cint/include/makefile
 lib/root/cint/include/makehpib
 lib/root/cint/include/makeit.bat
 lib/root/cint/include/makeit.c
+lib/root/cint/include/makemat
 lib/root/cint/include/math.h
+lib/root/cint/include/matrix.cxx
+lib/root/cint/include/matrix.h
+lib/root/cint/include/matrixstream.h
+lib/root/cint/include/matrixstream.hi
 lib/root/cint/include/mkincld.c
 lib/root/cint/include/new
 lib/root/cint/include/new.h
@@ -828,6 +895,7 @@ lib/root/cint/lib/cbstream/CVS/Root
 lib/root/cint/lib/cbstream/Makefile
 lib/root/cint/lib/cbstream/fstrm.h
 lib/root/cint/lib/cbstream/iostrm.h
+lib/root/cint/lib/cbstream/linkdef.h
 lib/root/cint/lib/cbstream/readme.txt
 lib/root/cint/lib/cbstream/strstrm.h
 lib/root/cint/lib/dll_stl/CVS/Entries
@@ -983,6 +1051,7 @@ lib/root/cint/lib/snstream/Makefile
 lib/root/cint/lib/snstream/fstrm.h
 lib/root/cint/lib/snstream/iostrm.h
 lib/root/cint/lib/snstream/length.cxx
+lib/root/cint/lib/snstream/linkdef.h
 lib/root/cint/lib/snstream/readme.txt
 lib/root/cint/lib/snstream/sstrm.h
 lib/root/cint/lib/socket/CVS/Entries
@@ -1159,6 +1228,10 @@ lib/root/cint/stl/utility.h
 lib/root/cint/stl/valarray
 lib/root/cint/stl/vector
 lib/root/cint/stl/vector.h
+%%AFTERIMAGE%%lib/root/libASImage.so
+%%AFTERIMAGE%%lib/root/libASImage.so.4
+%%AFTERIMAGE%%lib/root/libASImage.so.4.00
+%%AFTERIMAGE%%lib/root/libAfterImage.a
 lib/root/libCint.so
 lib/root/libCint.so.4
 lib/root/libCint.so.4.00
@@ -1222,6 +1295,9 @@ lib/root/libMinuit.so.4.00
 lib/root/libNew.so
 lib/root/libNew.so.4
 lib/root/libNew.so.4.00
+%%POSTGRESQL%%lib/root/libPgSQL.so
+%%POSTGRESQL%%lib/root/libPgSQL.so.4
+%%POSTGRESQL%%lib/root/libPgSQL.so.4.00
 lib/root/libPhysics.so
 lib/root/libPhysics.so.4
 lib/root/libPhysics.so.4.00
@@ -1234,15 +1310,24 @@ lib/root/libProof.so.4.00
 lib/root/libProofGui.so
 lib/root/libProofGui.so.4
 lib/root/libProofGui.so.4.00
+lib/root/libQuadp.so
+lib/root/libQuadp.so.4
+lib/root/libQuadp.so.4.00
 lib/root/libRGL.so
 lib/root/libRGL.so.4
 lib/root/libRGL.so.4.00
-lib/root/libRLDAP.so
-lib/root/libRLDAP.so.4
-lib/root/libRLDAP.so.4.00
+%%LDAP%%lib/root/libRLDAP.so
+%%LDAP%%lib/root/libRLDAP.so.4
+%%LDAP%%lib/root/libRLDAP.so.4.00
+lib/root/libRXML.so
+lib/root/libRXML.so.4
+lib/root/libRXML.so.4.00
 lib/root/libRint.so
 lib/root/libRint.so.4
 lib/root/libRint.so.4.00
+lib/root/libTable.so
+lib/root/libTable.so.4
+lib/root/libTable.so.4.00
 %%THREADS%%lib/root/libThread.so
 %%THREADS%%lib/root/libThread.so.4
 %%THREADS%%lib/root/libThread.so.4.00
@@ -1287,6 +1372,7 @@ share/aclocal/root.m4
 %%DOCSDIR%%/test/Makefile
 %%DOCSDIR%%/test/Makefile.arch
 %%DOCSDIR%%/test/Makefile.win32
+%%DOCSDIR%%/test/QpRandomDriver.cxx
 %%DOCSDIR%%/test/README
 %%DOCSDIR%%/test/RootShower/.rootshowerrc
 %%DOCSDIR%%/test/RootShower/CVS/Entries
@@ -1374,6 +1460,7 @@ share/aclocal/root.m4
 %%DOCSDIR%%/test/Tetris.h
 %%DOCSDIR%%/test/bench.cxx
 %%DOCSDIR%%/test/benchLinkDef.h
+%%DOCSDIR%%/test/ctorture.cxx
 %%DOCSDIR%%/test/dt_DrawTest.C
 %%DOCSDIR%%/test/dt_MakeFiles.sh
 %%DOCSDIR%%/test/dt_MakeRef.C
@@ -1431,7 +1518,9 @@ share/aclocal/root.m4
 %%DOCSDIR%%/tutorials/benchmarks.C
 %%DOCSDIR%%/tutorials/bent.C
 %%DOCSDIR%%/tutorials/bill.C
+%%DOCSDIR%%/tutorials/binomial.C
 %%DOCSDIR%%/tutorials/canvas.C
+%%DOCSDIR%%/tutorials/canvas.rb
 %%DOCSDIR%%/tutorials/cernbuild.C
 %%DOCSDIR%%/tutorials/cernstaff.C
 %%DOCSDIR%%/tutorials/cernstaff.dat
@@ -1446,8 +1535,12 @@ share/aclocal/root.m4
 %%DOCSDIR%%/tutorials/copytree3.C
 %%DOCSDIR%%/tutorials/customContextMenu.C
 %%DOCSDIR%%/tutorials/customTH1Fmenu.C
+%%DOCSDIR%%/tutorials/demo.py
+%%DOCSDIR%%/tutorials/demo.rb
 %%DOCSDIR%%/tutorials/demos.C
 %%DOCSDIR%%/tutorials/demoshelp.C
+%%DOCSDIR%%/tutorials/demoshelp.py
+%%DOCSDIR%%/tutorials/demoshelp.rb
 %%DOCSDIR%%/tutorials/dirs.C
 %%DOCSDIR%%/tutorials/draw2dopt.C
 %%DOCSDIR%%/tutorials/ellipse.C
@@ -1458,10 +1551,16 @@ share/aclocal/root.m4
 %%DOCSDIR%%/tutorials/exec3.C
 %%DOCSDIR%%/tutorials/feynman.C
 %%DOCSDIR%%/tutorials/fildir.C
+%%DOCSDIR%%/tutorials/fildir.py
 %%DOCSDIR%%/tutorials/file.C
+%%DOCSDIR%%/tutorials/file.py
 %%DOCSDIR%%/tutorials/fillrandom.C
+%%DOCSDIR%%/tutorials/fillrandom.py
+%%DOCSDIR%%/tutorials/fillrandom.rb
 %%DOCSDIR%%/tutorials/first.C
+%%DOCSDIR%%/tutorials/first.py
 %%DOCSDIR%%/tutorials/fit1.C
+%%DOCSDIR%%/tutorials/fit1.py
 %%DOCSDIR%%/tutorials/fit1_C.C
 %%DOCSDIR%%/tutorials/fit2.C
 %%DOCSDIR%%/tutorials/fit2a.C
@@ -1471,18 +1570,23 @@ share/aclocal/root.m4
 %%DOCSDIR%%/tutorials/fithist.C
 %%DOCSDIR%%/tutorials/fitslicesy.C
 %%DOCSDIR%%/tutorials/formula1.C
+%%DOCSDIR%%/tutorials/formula1.py
 %%DOCSDIR%%/tutorials/framework.C
+%%DOCSDIR%%/tutorials/framework.py
+%%DOCSDIR%%/tutorials/framework.rb
 %%DOCSDIR%%/tutorials/galaxy.pal.root
 %%DOCSDIR%%/tutorials/galaxy.root
 %%DOCSDIR%%/tutorials/galaxy_image.C
 %%DOCSDIR%%/tutorials/games.C
 %%DOCSDIR%%/tutorials/gaxis.C
 %%DOCSDIR%%/tutorials/geant3tasks.C
+%%DOCSDIR%%/tutorials/geodemo.C
 %%DOCSDIR%%/tutorials/geometry.C
-%%DOCSDIR%%/tutorials/geoshapes.C
 %%DOCSDIR%%/tutorials/gerrors.C
+%%DOCSDIR%%/tutorials/gerrors.py
 %%DOCSDIR%%/tutorials/gerrors2.C
 %%DOCSDIR%%/tutorials/graph.C
+%%DOCSDIR%%/tutorials/graph.py
 %%DOCSDIR%%/tutorials/graph2derrorsfit.C
 %%DOCSDIR%%/tutorials/graph2dfit.C
 %%DOCSDIR%%/tutorials/graphApply.C
@@ -1492,20 +1596,27 @@ share/aclocal/root.m4
 %%DOCSDIR%%/tutorials/h1analysis.h
 %%DOCSDIR%%/tutorials/h1chain.C
 %%DOCSDIR%%/tutorials/h1draw.C
+%%DOCSDIR%%/tutorials/h1draw.py
 %%DOCSDIR%%/tutorials/hadd.C
 %%DOCSDIR%%/tutorials/hadd_old.C
 %%DOCSDIR%%/tutorials/hbars.C
 %%DOCSDIR%%/tutorials/hclient.C
 %%DOCSDIR%%/tutorials/hcons.C
 %%DOCSDIR%%/tutorials/hksimple.C
+%%DOCSDIR%%/tutorials/hksimple.rb
 %%DOCSDIR%%/tutorials/hlabels1.C
 %%DOCSDIR%%/tutorials/hlabels2.C
 %%DOCSDIR%%/tutorials/hprod.C
 %%DOCSDIR%%/tutorials/hserv.C
 %%DOCSDIR%%/tutorials/hserv2.C
 %%DOCSDIR%%/tutorials/hsimple.C
+%%DOCSDIR%%/tutorials/hsimple.py
+%%DOCSDIR%%/tutorials/hsimple.rb
 %%DOCSDIR%%/tutorials/hstack.C
+%%DOCSDIR%%/tutorials/hstack.rb
 %%DOCSDIR%%/tutorials/hsum.C
+%%DOCSDIR%%/tutorials/hsum.py
+%%DOCSDIR%%/tutorials/hsum.rb
 %%DOCSDIR%%/tutorials/hsumTimer.C
 %%DOCSDIR%%/tutorials/hsumanim.C
 %%DOCSDIR%%/tutorials/htest.C
@@ -1519,6 +1630,7 @@ share/aclocal/root.m4
 %%DOCSDIR%%/tutorials/labels2.C
 %%DOCSDIR%%/tutorials/langaus.C
 %%DOCSDIR%%/tutorials/latex.C
+%%DOCSDIR%%/tutorials/latex.rb
 %%DOCSDIR%%/tutorials/latex2.C
 %%DOCSDIR%%/tutorials/latex3.C
 %%DOCSDIR%%/tutorials/limit.C
@@ -1529,19 +1641,25 @@ share/aclocal/root.m4
 %%DOCSDIR%%/tutorials/mlpHiggs.root
 %%DOCSDIR%%/tutorials/motorcycle.C
 %%DOCSDIR%%/tutorials/motorcycle.dat
+%%DOCSDIR%%/tutorials/mrt.py
 %%DOCSDIR%%/tutorials/multidimfit.C
 %%DOCSDIR%%/tutorials/multifit.C
+%%DOCSDIR%%/tutorials/multifit.py
 %%DOCSDIR%%/tutorials/multigraph.C
+%%DOCSDIR%%/tutorials/multigraph.rb
 %%DOCSDIR%%/tutorials/myfit.C
 %%DOCSDIR%%/tutorials/na49.C
 %%DOCSDIR%%/tutorials/na49geomfile.C
 %%DOCSDIR%%/tutorials/na49view.C
 %%DOCSDIR%%/tutorials/na49visible.C
 %%DOCSDIR%%/tutorials/ntuple1.C
+%%DOCSDIR%%/tutorials/ntuple1.py
+%%DOCSDIR%%/tutorials/ntuple1.rb
 %%DOCSDIR%%/tutorials/oldbenchmarks.C
 %%DOCSDIR%%/tutorials/pad2png.C
 %%DOCSDIR%%/tutorials/pclient.C
 %%DOCSDIR%%/tutorials/peaks.C
+%%DOCSDIR%%/tutorials/permute.C
 %%DOCSDIR%%/tutorials/principal.C
 %%DOCSDIR%%/tutorials/pserv.C
 %%DOCSDIR%%/tutorials/psexam.C
@@ -1562,6 +1680,7 @@ share/aclocal/root.m4
 %%DOCSDIR%%/tutorials/second.C
 %%DOCSDIR%%/tutorials/seism.C
 %%DOCSDIR%%/tutorials/shapes.C
+%%DOCSDIR%%/tutorials/shapes.py
 %%DOCSDIR%%/tutorials/shapesAnim.C
 %%DOCSDIR%%/tutorials/shared.C
 %%DOCSDIR%%/tutorials/solveLinear.C
@@ -1573,6 +1692,8 @@ share/aclocal/root.m4
 %%DOCSDIR%%/tutorials/sqlselect.C
 %%DOCSDIR%%/tutorials/staff.C
 %%DOCSDIR%%/tutorials/surfaces.C
+%%DOCSDIR%%/tutorials/surfaces.py
+%%DOCSDIR%%/tutorials/surfaces.rb
 %%DOCSDIR%%/tutorials/tasks.C
 %%DOCSDIR%%/tutorials/tcl.C
 %%DOCSDIR%%/tutorials/testrandom.C
@@ -1580,7 +1701,9 @@ share/aclocal/root.m4
 %%DOCSDIR%%/tutorials/timeonaxis.C
 %%DOCSDIR%%/tutorials/timeonaxis2.C
 %%DOCSDIR%%/tutorials/tornado.C
+%%DOCSDIR%%/tutorials/tornado.py
 %%DOCSDIR%%/tutorials/tree.C
+%%DOCSDIR%%/tutorials/tree.py
 %%DOCSDIR%%/tutorials/tree0.C
 %%DOCSDIR%%/tutorials/tree1.C
 %%DOCSDIR%%/tutorials/tree2.C
@@ -1798,75 +1921,75 @@ share/root/proof/utils/pload
 share/root/proof/utils/pps
 share/root/proof/utils/proof-facility
 share/root/proof/utils/push
-@dirrm share/root/proof/utils
-@dirrm share/root/proof/etc
-@dirrm share/root/proof
-@dirrm share/root/macros
-@dirrm share/root/icons
-@dirrm share/root/fonts
-@dirrm share/root
-@dirrm %%DOCSDIR%%/tutorials
-@dirrm %%DOCSDIR%%/test/RootShower/icons/CVS
-@dirrm %%DOCSDIR%%/test/RootShower/icons
-@dirrm %%DOCSDIR%%/test/RootShower/anim/CVS
-@dirrm %%DOCSDIR%%/test/RootShower/anim
-@dirrm %%DOCSDIR%%/test/RootShower/CVS
-@dirrm %%DOCSDIR%%/test/RootShower
-@dirrm %%DOCSDIR%%/test
-@dirrm %%DOCSDIR%%
-@dirrm lib/root/cint/stl
-@dirrm lib/root/cint/lib/xlib/CVS
-@dirrm lib/root/cint/lib/xlib
-@dirrm lib/root/cint/lib/win32api/CVS
-@dirrm lib/root/cint/lib/win32api
-@dirrm lib/root/cint/lib/vcstream/CVS
-@dirrm lib/root/cint/lib/vcstream
-@dirrm lib/root/cint/lib/vc7strm/CVS
-@dirrm lib/root/cint/lib/vc7strm
-@dirrm lib/root/cint/lib/stream/CVS
-@dirrm lib/root/cint/lib/stream
-@dirrm lib/root/cint/lib/stdstrct/CVS
-@dirrm lib/root/cint/lib/stdstrct
-@dirrm lib/root/cint/lib/socket/CVS
-@dirrm lib/root/cint/lib/socket
-@dirrm lib/root/cint/lib/snstream/CVS
-@dirrm lib/root/cint/lib/snstream
-@dirrm lib/root/cint/lib/qt/CVS
-@dirrm lib/root/cint/lib/qt
-@dirrm lib/root/cint/lib/pthread/CVS
-@dirrm lib/root/cint/lib/pthread
-@dirrm lib/root/cint/lib/prec_stl/CVS
-@dirrm lib/root/cint/lib/prec_stl
-@dirrm lib/root/cint/lib/posix/CVS
-@dirrm lib/root/cint/lib/posix
-@dirrm lib/root/cint/lib/longlong/CVS
-@dirrm lib/root/cint/lib/longlong
-@dirrm lib/root/cint/lib/ipc/CVS
-@dirrm lib/root/cint/lib/ipc
-@dirrm lib/root/cint/lib/iccstrm/CVS
-@dirrm lib/root/cint/lib/iccstrm
-@dirrm lib/root/cint/lib/gl/CVS
-@dirrm lib/root/cint/lib/gl
-@dirrm lib/root/cint/lib/gcc3strm/sys/CVS
-@dirrm lib/root/cint/lib/gcc3strm/sys
+@dirrm include/root
+@dirrm lib/root/cint/include/GL/CVS
+@dirrm lib/root/cint/include/GL
+@dirrm lib/root/cint/include/X11/CVS
+@dirrm lib/root/cint/include/X11
+@dirrm lib/root/cint/include/sys/CVS
+@dirrm lib/root/cint/include/sys
+@dirrm lib/root/cint/include
+@dirrm lib/root/cint/lib/bcstream/CVS
+@dirrm lib/root/cint/lib/bcstream
+@dirrm lib/root/cint/lib/cbstream/CVS
+@dirrm lib/root/cint/lib/cbstream
+@dirrm lib/root/cint/lib/dll_stl/CVS
+@dirrm lib/root/cint/lib/dll_stl
+@dirrm lib/root/cint/lib/gcc3strm/CVS
 @dirrm lib/root/cint/lib/gcc3strm/bits/CVS
 @dirrm lib/root/cint/lib/gcc3strm/bits
-@dirrm lib/root/cint/lib/gcc3strm/CVS
+@dirrm lib/root/cint/lib/gcc3strm/sys/CVS
+@dirrm lib/root/cint/lib/gcc3strm/sys
 @dirrm lib/root/cint/lib/gcc3strm
-@dirrm lib/root/cint/lib/dll_stl/CVS
-@dirrm lib/root/cint/lib/dll_stl
-@dirrm lib/root/cint/lib/cbstream/CVS
-@dirrm lib/root/cint/lib/cbstream
-@dirrm lib/root/cint/lib/bcstream/CVS
-@dirrm lib/root/cint/lib/bcstream
+@dirrm lib/root/cint/lib/gl/CVS
+@dirrm lib/root/cint/lib/gl
+@dirrm lib/root/cint/lib/iccstrm/CVS
+@dirrm lib/root/cint/lib/iccstrm
+@dirrm lib/root/cint/lib/ipc/CVS
+@dirrm lib/root/cint/lib/ipc
+@dirrm lib/root/cint/lib/longlong/CVS
+@dirrm lib/root/cint/lib/longlong
+@dirrm lib/root/cint/lib/posix/CVS
+@dirrm lib/root/cint/lib/posix
+@dirrm lib/root/cint/lib/prec_stl/CVS
+@dirrm lib/root/cint/lib/prec_stl
+@dirrm lib/root/cint/lib/pthread/CVS
+@dirrm lib/root/cint/lib/pthread
+@dirrm lib/root/cint/lib/qt/CVS
+@dirrm lib/root/cint/lib/qt
+@dirrm lib/root/cint/lib/snstream/CVS
+@dirrm lib/root/cint/lib/snstream
+@dirrm lib/root/cint/lib/socket/CVS
+@dirrm lib/root/cint/lib/socket
+@dirrm lib/root/cint/lib/stdstrct/CVS
+@dirrm lib/root/cint/lib/stdstrct
+@dirrm lib/root/cint/lib/stream/CVS
+@dirrm lib/root/cint/lib/stream
+@dirrm lib/root/cint/lib/vc7strm/CVS
+@dirrm lib/root/cint/lib/vc7strm
+@dirrm lib/root/cint/lib/vcstream/CVS
+@dirrm lib/root/cint/lib/vcstream
+@dirrm lib/root/cint/lib/win32api/CVS
+@dirrm lib/root/cint/lib/win32api
+@dirrm lib/root/cint/lib/xlib/CVS
+@dirrm lib/root/cint/lib/xlib
 @dirrm lib/root/cint/lib
-@dirrm lib/root/cint/include/sys/CVS
-@dirrm lib/root/cint/include/sys
-@dirrm lib/root/cint/include/X11/CVS
-@dirrm lib/root/cint/include/X11
-@dirrm lib/root/cint/include/GL/CVS
-@dirrm lib/root/cint/include/GL
-@dirrm lib/root/cint/include
+@dirrm lib/root/cint/stl
 @dirrm lib/root/cint
 @dirrm lib/root
-@dirrm include/root
+@dirrm %%DOCSDIR%%/test/RootShower/CVS
+@dirrm %%DOCSDIR%%/test/RootShower/anim/CVS
+@dirrm %%DOCSDIR%%/test/RootShower/anim
+@dirrm %%DOCSDIR%%/test/RootShower/icons/CVS
+@dirrm %%DOCSDIR%%/test/RootShower/icons
+@dirrm %%DOCSDIR%%/test/RootShower
+@dirrm %%DOCSDIR%%/tutorials
+@dirrm %%DOCSDIR%%/test
+@dirrm %%DOCSDIR%%
+@dirrm share/root/fonts
+@dirrm share/root/icons
+@dirrm share/root/macros
+@dirrm share/root/proof/etc
+@dirrm share/root/proof/utils
+@dirrm share/root/proof
+@dirrm share/root