- Update to 4.02.00

- Unbreak on 5.x
- Break on 4.x
- Break on amd64

PR:		ports/78043
Submitted by:	Alexander S. Usov <usov@KVI.nl>
Approved by:	maintainer

5 files changed, 8 insertions, 258 deletions

diff --git a/devel/root/files/patch-config::Makefile.freebsd4 b/devel/root/files/patch-config::Makefile.freebsd4
deleted file mode 100644
index 599d8c0993dd..000000000000
--- a/devel/root/files/patch-config::Makefile.freebsd4
+++ /dev/null
@@ -1,82 +0,0 @@
-*** 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
deleted file mode 100644
index 096523138d5f..000000000000
--- a/devel/root/files/patch-config::Makefile.freebsd5
+++ /dev/null
@@ -1,90 +0,0 @@
-*** 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-configure b/devel/root/files/patch-configure
deleted file mode 100644
index 59586f005ba1..000000000000
--- a/devel/root/files/patch-configure
+++ /dev/null
@@ -1,35 +0,0 @@
-*** 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
deleted file mode 100644
index 04b4be260321..000000000000
--- a/devel/root/files/patch-gcc34
+++ /dev/null
@@ -1,51 +0,0 @@
-===================================================================
-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-xml::Module.mk b/devel/root/files/patch-xml::Module.mk
new file mode 100644
index 000000000000..1a7691353b78
--- /dev/null
+++ b/devel/root/files/patch-xml::Module.mk
@@ -0,0 +1,8 @@
+--- xml/Module.mk.orig	Tue Feb 22 17:32:18 2005
++++ xml/Module.mk	Tue Feb 22 17:32:42 2005
+@@ -67,4 +67,4 @@
+ 
+ ##### extra rules ######
+ $(XMLO): %.o: %.cxx
+-	$(CXX) $(OPT) $(CXXFLAGS) -I$(XMLINCDIR) -o $@ -c $<
++	$(CXX) $(OPT) $(CXXFLAGS) -I$(XMLINCDIR) -I/usr/local/include -o $@ -c $<