update to 5.15.169

This fixes (additionally to internal changes) compilation with gcc3.
(it likely breaks on gcc2 now, but the effort to make it support
both gcc versions isn't worth it imho)

4 files changed, 119 insertions, 58 deletions

diff --git a/lang/cint/Makefile b/lang/cint/Makefile
index fefc428bfeb..38bd28e23c6 100644
--- a/lang/cint/Makefile
+++ b/lang/cint/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2004/01/20 12:19:16 agc Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/02 17:01:34 drochner Exp $
 
-DISTNAME=		cint5.14
-PKGNAME=		cint-5.14.40
+DISTNAME=		cint5.15
+PKGNAME=		cint-5.15.169
 CATEGORIES=		lang
-MASTER_SITES=		${MASTER_SITE_BACKUP}
+MASTER_SITES=		ftp://root.cern.ch/root/
+#MASTER_SITES=		${MASTER_SITE_BACKUP}
 
 MAINTAINER=		drochner@NetBSD.org
 HOMEPAGE=		http://root.cern.ch/root/Cint.html
diff --git a/lang/cint/PLIST b/lang/cint/PLIST
index 9414d6e1a43..c97563ccedf 100644
--- a/lang/cint/PLIST
+++ b/lang/cint/PLIST
@@ -1,33 +1,45 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:22:55 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/05/02 17:01:34 drochner Exp $
 bin/cint
 bin/makecint
 cint/G__ci.h
 cint/MAKEINFO
 cint/cint
-cint/makecint
-cint/include/_exception.h
-cint/include/_iostream
 cint/include/Common.h
-cint/include/README
+cint/include/GL/gl.h
+cint/include/GL/glu.h
+cint/include/GL/glut.h
+cint/include/GL/xmesa.h
 cint/include/README.txt
 cint/include/ReadF.C
 cint/include/ReadF.cxx
-cint/include/ReadF.dl
+cint/include/ReadF.dll
 cint/include/ReadF.h
 cint/include/RegE.C
 cint/include/RegE.cxx
-cint/include/RegE.dl
+cint/include/RegE.dll
 cint/include/RegE.h
+cint/include/X11/Xlib.h
+cint/include/X11/Xutil.h
+cint/include/X11/keysym.h
+cint/include/X11/xos.h
+cint/include/_complex
+cint/include/_complex.h
+cint/include/_exception
+cint/include/_exception.h
+cint/include/_iostream
+cint/include/_stdexcept
+cint/include/_stdexcept.h
 cint/include/api.h
 cint/include/array.c
-cint/include/array.dl
+cint/include/array.dll
 cint/include/array.h
 cint/include/arrayiostream.h
 cint/include/assert.h
+cint/include/bool
 cint/include/bool.h
 cint/include/boolean.h
 cint/include/carray.c
-cint/include/carray.dl
+cint/include/carray.dll
 cint/include/carray.h
 cint/include/cassert
 cint/include/cctype
@@ -61,33 +73,44 @@ cint/include/exception
 cint/include/exception.h
 cint/include/fcntl.h
 cint/include/fft.c
-cint/include/fft.dl
+cint/include/fft.dll
 cint/include/fft.h
 cint/include/float.h
 cint/include/fstream
 cint/include/fstream.h
 cint/include/graphbuf.h
+cint/include/iomanip
 cint/include/iomanip.h
 cint/include/iosenum.cxx
 cint/include/iosenum.h
 cint/include/iosenum.h.bk
+cint/include/iosenum.win32
 cint/include/iosfwd
 cint/include/iosfwd.h
 cint/include/iostream
 cint/include/iostream.h
 cint/include/istream
+cint/include/limits
 cint/include/limits.h
+cint/include/locale
 cint/include/locale.h
-cint/include/long.dl
+cint/include/long.dll
 cint/include/lsm.c
-cint/include/lsm.dl
+cint/include/lsm.dll
 cint/include/lsm.h
 cint/include/math.h
+cint/include/matrix.cxx
+cint/include/matrix.dll
+cint/include/matrix.h
+cint/include/matrixstream.h
+cint/include/matrixstream.hi
 cint/include/mkincld
 cint/include/mkincld.c
+cint/include/new
 cint/include/new.h
 cint/include/ostream
 cint/include/platform.h
+cint/include/pthread.dll
 cint/include/pthread.h
 cint/include/readfile.h
 cint/include/regex.h
@@ -98,40 +121,78 @@ cint/include/socket.h
 cint/include/spice.h
 cint/include/sstream
 cint/include/statistics.c
-cint/include/statistics.dl
+cint/include/statistics.dll
 cint/include/statistics.h
 cint/include/stdarg.h
+cint/include/stdcxxfunc.dll
 cint/include/stddef.h
+cint/include/stdexcept
 cint/include/stdfunc.dll
 cint/include/stdio.h
+cint/include/stdiostream.h
 cint/include/stdlib.h
 cint/include/stream.h
+cint/include/streambuf
 cint/include/string.h
 cint/include/striostream.h
+cint/include/strstream
 cint/include/strstream.h
+cint/include/sys/cdefs.h
+cint/include/sys/file.h
+cint/include/sys/ipc.dll
+cint/include/sys/ipc.h
+cint/include/sys/msg.h
+cint/include/sys/sem.h
+cint/include/sys/shm.h
+cint/include/sys/stat.h
+cint/include/sys/types.h
 cint/include/systypes.h
+cint/include/termios.h
 cint/include/time.h
+cint/include/timespec.h
 cint/include/typeinfo
 cint/include/typeinfo.h
 cint/include/unistd.h
 cint/include/windows.h
 cint/include/winsock.h
 cint/include/xgraph.c
-cint/include/xgraph.dl
+cint/include/xgraph.dll
 cint/include/xygraphbuf.h
-cint/include/sys/ipc.h
-cint/include/sys/msg.h
-cint/include/sys/sem.h
-cint/include/sys/shm.h
-cint/include/sys/stat.h
-cint/include/sys/types.h
+cint/lib/prec_stl/README.txt
+cint/lib/prec_stl/algorithm
+cint/lib/prec_stl/bitset
+cint/lib/prec_stl/climits
+cint/lib/prec_stl/complex
+cint/lib/prec_stl/deque
+cint/lib/prec_stl/exception
+cint/lib/prec_stl/functional
+cint/lib/prec_stl/iterator
+cint/lib/prec_stl/limits
+cint/lib/prec_stl/list
+cint/lib/prec_stl/map
+cint/lib/prec_stl/memory
+cint/lib/prec_stl/multimap
+cint/lib/prec_stl/multiset
+cint/lib/prec_stl/numeric
+cint/lib/prec_stl/queue
+cint/lib/prec_stl/set
+cint/lib/prec_stl/stack
+cint/lib/prec_stl/stdexcept
+cint/lib/prec_stl/string
+cint/lib/prec_stl/utility
+cint/lib/prec_stl/valarray
+cint/lib/prec_stl/vector
+cint/makecint
 cint/stl/G__postprocess.h
 cint/stl/README.txt
 cint/stl/_algorithm
 cint/stl/_autocontainer
 cint/stl/_bitset
+cint/stl/_climits
+cint/stl/_climits.h
 cint/stl/_deque
 cint/stl/_deque.h
+cint/stl/_functional
 cint/stl/_iterator
 cint/stl/_iterator.h
 cint/stl/_list
@@ -139,6 +200,7 @@ cint/stl/_list.h
 cint/stl/_map
 cint/stl/_map.h
 cint/stl/_memory
+cint/stl/_memory.h
 cint/stl/_multimap
 cint/stl/_multimap.h
 cint/stl/_multiset
@@ -148,6 +210,7 @@ cint/stl/_set
 cint/stl/_set.h
 cint/stl/_stack
 cint/stl/_stack.h
+cint/stl/_string
 cint/stl/_utility
 cint/stl/_utility.h
 cint/stl/_vector
@@ -157,9 +220,9 @@ cint/stl/algobase.h
 cint/stl/algorithm
 cint/stl/bitset
 cint/stl/bool
-cint/stl/bool.h
 cint/stl/bstring.h
 cint/stl/bvector.h
+cint/stl/complex.dll
 cint/stl/defalloc.h
 cint/stl/deque
 cint/stl/deque.dll
@@ -200,10 +263,12 @@ cint/stl/lset.h
 cint/stl/map
 cint/stl/map.dll
 cint/stl/map.h
+cint/stl/map2.dll
 cint/stl/memory
 cint/stl/multimap
 cint/stl/multimap.dll
 cint/stl/multimap.h
+cint/stl/multimap2.dll
 cint/stl/multiset
 cint/stl/multiset.dll
 cint/stl/multiset.h
@@ -225,6 +290,7 @@ cint/stl/set.h
 cint/stl/stack
 cint/stl/stack.dll
 cint/stl/stack.h
+cint/stl/stdexcept.dll
 cint/stl/string
 cint/stl/string.dll
 cint/stl/tempbuf.cpp
@@ -238,30 +304,12 @@ cint/stl/valarray
 cint/stl/vector
 cint/stl/vector.dll
 cint/stl/vector.h
-cint/lib/prec_stl/README.txt
-cint/lib/prec_stl/algorithm
-cint/lib/prec_stl/bitset
-cint/lib/prec_stl/deque
-cint/lib/prec_stl/exception
-cint/lib/prec_stl/functional
-cint/lib/prec_stl/iterator
-cint/lib/prec_stl/limits
-cint/lib/prec_stl/list
-cint/lib/prec_stl/map
-cint/lib/prec_stl/memory
-cint/lib/prec_stl/multimap
-cint/lib/prec_stl/multiset
-cint/lib/prec_stl/numeric
-cint/lib/prec_stl/queue
-cint/lib/prec_stl/set
-cint/lib/prec_stl/stack
-cint/lib/prec_stl/string
-cint/lib/prec_stl/utility
-cint/lib/prec_stl/valarray
-cint/lib/prec_stl/vector
-@dirrm cint/include/sys
-@dirrm cint/include
+cint/stl/vectorbool.dll
 @dirrm cint/stl
 @dirrm cint/lib/prec_stl
 @dirrm cint/lib
+@dirrm cint/include/sys
+@dirrm cint/include/X11
+@dirrm cint/include/GL
+@dirrm cint/include
 @dirrm cint
diff --git a/lang/cint/distinfo b/lang/cint/distinfo
index aa3fedd961e..c8b505d8d70 100644
--- a/lang/cint/distinfo
+++ b/lang/cint/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 09:03:06 agc Exp $
+$NetBSD: distinfo,v 1.4 2005/05/02 17:01:34 drochner Exp $
 
-SHA1 (cint-5.14.40/cint5.14.tar.gz) = 2c7fbada85a0c65273ae4b7550c31b489151c999
-RMD160 (cint-5.14.40/cint5.14.tar.gz) = 25841a149e901992f400064c96c45dc910ffa733
-Size (cint-5.14.40/cint5.14.tar.gz) = 1258267 bytes
-SHA1 (patch-aa) = 3813554ba0650dac2281697e2bd876c1a1105d11
+SHA1 (cint-5.15.169/cint5.15.tar.gz) = 286f24ab91fcb21c78b82852aed8740485ab5a73
+RMD160 (cint-5.15.169/cint5.15.tar.gz) = 84798099d28fbd3be2fa253b007f762f86700cad
+Size (cint-5.15.169/cint5.15.tar.gz) = 2142561 bytes
+SHA1 (patch-aa) = 7f0c6c93b146507fecca71d6c596d98194cfc7ad
diff --git a/lang/cint/patches/patch-aa b/lang/cint/patches/patch-aa
index 21933e2b37d..d7c7ed9f763 100644
--- a/lang/cint/patches/patch-aa
+++ b/lang/cint/patches/patch-aa
@@ -1,12 +1,24 @@
-$NetBSD: patch-aa,v 1.2 2000/07/22 23:11:18 dmcmahill Exp $
---- platform/netbsd.orig	Sat Oct 11 17:19:04 1997
-+++ platform/netbsd	Sat Nov  6 16:09:33 1999
-@@ -19,7 +19,7 @@
+$NetBSD: patch-aa,v 1.3 2005/05/02 17:01:34 drochner Exp $
+
+--- platform/netbsd.orig	2004-05-09 04:40:32.000000000 +0200
++++ platform/netbsd
+@@ -19,8 +19,8 @@ CPPPREP     = g++ -E
  CCDLLOPT    = -fPIC
  LDDLLOPT    = -shared
  OPTIMIZE    = -O
 -LDOPT       = -lm -ltermcap -lbsd -ldl -rdynamic
+-SYSMACRO    = -DG__REGEXP -DG__SHAREDLIB -DG__OSFDLL
 +LDOPT       = -lm -ltermcap -Wl,--export-dynamic
- SYSMACRO    = -DG__REGEXP -DG__SHAREDLIB -DG__OSFDLL
++SYSMACRO    = -DG__REGEXP -DG__SHAREDLIB -DG__OSFDLL -DG__NEWSTDHEADER
  OTHMACRO    =
  SYSIPATH    =
+ 
+@@ -30,7 +30,7 @@ CINTLIB     = $(CINTSYSDIR)/src/G__ci.a
+ READLINEA   = $(CINTSYSDIR)/readline/libreadline.a
+ APIO	    = Api.o Class.o BaseCls.o Type.o DataMbr.o Method.o MethodAr.o CallFunc.o Typedf.o Apiif.o Token.o
+ RANLIB	    = /usr/bin/ranlib
+-STDLIBS     = libstrm.o stdstrct.o
++STDLIBS     = gcc3strm.o stdstrct.o
+ PLATFORM    =
+ 
+ # source code postfix