update to 5.10

There were 3 major revisions inbetween, so I honestly can't tell
what changed.
(would be good to libtoolize this one day, but for now I've done
only minimal changes to the freebsd5 configuration)

14 files changed, 310 insertions, 230 deletions

diff --git a/misc/root/patches/patch-aa b/misc/root/patches/patch-aa
index 1b9822fdd51..4d32176dd93 100644
--- a/misc/root/patches/patch-aa
+++ b/misc/root/patches/patch-aa
@@ -1,20 +1,81 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/11/17 16:17:03 drochner Exp $
---- Makefile.orig	Sat Nov  6 21:18:31 1999
-+++ Makefile	Sat Nov  6 21:20:12 1999
-@@ -14,6 +14,7 @@
- 	@echo "  make mklinux              for MkLinux gcc and glibc"
- 	@echo "  make freebsd              for FreeBSD"
- 	@echo "  make freebsd4             for FreeBSD 4.x"
-+	@echo "  make NetBSD               for NetBSD"
- 	@echo "  make hpux                 for HP-UX 10.20 CC"
- 	@echo "  make hpuxacc              for HP-UX 10.20 aCC"
- 	@echo "  make hpuxegcs             for HP-UX 10.20 egcs 1.1.x"
-@@ -29,7 +30,7 @@
+$NetBSD: patch-aa,v 1.2 2006/05/27 12:38:27 drochner Exp $
+
+--- unix/src/TUnixSystem.cxx.orig	2006-05-26 16:51:20.000000000 +0200
++++ unix/src/TUnixSystem.cxx
+@@ -62,7 +62,7 @@
+ #if defined(R__AIX) || defined(R__LINUX) || defined(R__ALPHA) || \
+     defined(R__SGI) || defined(R__HIUX) || defined(R__FBSD) || \
+     defined(R__OBSD) || defined(R__LYNXOS) || defined(R__MACOSX) || \
+-    defined(R__HURD)
++    defined(R__HURD) || defined(__NetBSD__)
+ #   include <sys/ioctl.h>
+ #endif
+ #if defined(R__AIX) || defined(R__SOLARIS)
+@@ -87,8 +87,12 @@
+ #   include <sys/param.h>
+ #   include <sys/mount.h>
+ #else
++#ifdef __NetBSD__
++#include <sys/statvfs.h>
++#else
+ #   include <sys/statfs.h>
+ #endif
++#endif
  
+ #include <utime.h>
+ #include <syslog.h>
+@@ -174,7 +178,7 @@
+ #elif defined(R__GLIBC) || (defined(R__FBSD) && defined(R__ALPHA)) || \
+       (defined(R__SUNGCC3) && defined(__arch64__)) || \
+       defined(MAC_OS_X_VERSION_10_4) || \
+-      (defined(R__AIX) && defined(_AIX43))
++      (defined(R__AIX) && defined(_AIX43) || defined(__NetBSD__))
+ #   define USE_SOCKLEN_T
+ #endif
  
- linux linuxegcs linuxrh42 linuxdeb linuxdeb2 linuxkcc linuxsuse6 \
--linuxpgcc linuxppcegcs mklinux freebsd freebsd4 hpux hpuxacc \
-+linuxpgcc linuxppcegcs mklinux freebsd freebsd4 netbsd hpux hpuxacc \
- hpuxegcs alphacxx6 alphaegcs solaris solarisCC5.0 solarisegcs sgikcc sgiegcs \
- sgi64egcs aixegcs:
- 	@(inode1=`ls -id $$ROOTSYS | awk '{ print $$1 }'`; \
+@@ -411,6 +415,7 @@ void TUnixSystem::SetProgname(const char
+ //______________________________________________________________________________
+ void TUnixSystem::SetDisplay()
+ {
++#if 0
+    // Set DISPLAY environment variable based on utmp entry. Only for UNIX.
+ 
+    if (!Getenv("DISPLAY")) {
+@@ -451,6 +456,7 @@ void TUnixSystem::SetDisplay()
+          free(gUtmpContents);
+       }
+    }
++#endif
+ }
+ 
+ //______________________________________________________________________________
+@@ -3446,7 +3452,11 @@ int TUnixSystem::UnixFSstat(const char *
+    // The function returns 0 in case of success and 1 if the file system could
+    // not be stat'ed.
+ 
++#ifdef __NetBSD__
++   struct statvfs statfsbuf;
++#else
+    struct statfs statfsbuf;
++#endif
+ #if defined(R__SGI) || (defined(R__SOLARIS) && !defined(R__LINUX))
+    if (statfs(path, &statfsbuf, sizeof(struct statfs), 0) == 0) {
+       *id = statfsbuf.f_fstyp;
+@@ -3454,6 +3464,9 @@ int TUnixSystem::UnixFSstat(const char *
+       *blocks = statfsbuf.f_blocks;
+       *bfree = statfsbuf.f_bfree;
+ #else
++#ifdef __NetBSD__
++   if (statvfs((char*)path, &statfsbuf) == 0) {
++#else
+    if (statfs((char*)path, &statfsbuf) == 0) {
+ #ifdef R__OBSD
+       // Convert BSD filesystem names to Linux filesystem type numbers
+@@ -3480,6 +3493,7 @@ int TUnixSystem::UnixFSstat(const char *
+ #else
+       *id = statfsbuf.f_type;
+ #endif
++#endif
+       *bsize = statfsbuf.f_bsize;
+       *blocks = statfsbuf.f_blocks;
+       *bfree = statfsbuf.f_bavail;
diff --git a/misc/root/patches/patch-ab b/misc/root/patches/patch-ab
index a165c3a147f..ee295325384 100644
--- a/misc/root/patches/patch-ab
+++ b/misc/root/patches/patch-ab
@@ -1,17 +1,13 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/11/17 16:17:03 drochner Exp $
---- src/RConfig.h.orig	Sat Nov  6 21:37:18 1999
-+++ src/RConfig.h	Sat Nov  6 21:38:11 1999
-@@ -106,6 +106,13 @@
- #   define R__NOSTATS         /* problem using stats with FreeBSD malloc/free */
+$NetBSD: patch-ab,v 1.2 2006/05/27 12:38:27 drochner Exp $
+
+--- auth/src/TAuthenticate.cxx.orig	2006-05-26 17:05:03.000000000 +0200
++++ auth/src/TAuthenticate.cxx
+@@ -47,7 +47,7 @@
+ #include <sys/types.h>
+ #include <time.h>
+ #if !defined(R__WIN32) && !defined(R__MACOSX) && !defined(R__FBSD) && \
+-    !defined(R__OBSD)
++    !defined(R__OBSD) && !defined(__NetBSD__)
+ #include <crypt.h>
  #endif
- 
-+#if defined(__NetBSD__)
-+#   define R__FBSD	/* XXX */
-+#   define R__UNIX
-+#   define R__BYTESWAP
-+#   define R__NOSTATS         /* problem using stats with FreeBSD malloc/free */
-+#endif
-+
- #ifdef _HIUX_SOURCE
- #   define R__HIUX
- #   define R__UNIX
+ #ifdef WIN32
diff --git a/misc/root/patches/patch-ac b/misc/root/patches/patch-ac
index 2537d0597ce..e9e964d35ef 100644
--- a/misc/root/patches/patch-ac
+++ b/misc/root/patches/patch-ac
@@ -1,12 +1,13 @@
-$NetBSD: patch-ac,v 1.1.1.1 1999/11/17 16:17:03 drochner Exp $
---- src/cfortran.h.orig	Sat Nov  6 22:17:00 1999
-+++ src/cfortran.h	Sat Nov  6 22:17:45 1999
-@@ -80,7 +80,7 @@
- #if !(defined(mipsFortran)||defined(DECFortran)||defined(vmsFortran)||defined(CONVEXFortran)||defined(PowerStationFortran))
- /* If no Fortran compiler is given, we choose one for the machines we know.   */
- #if defined(lynx) || defined(VAXUltrix) || defined(linux) || defined(_HIUX_SOURCE) || \
--    defined(__FreeBSD__)
-+    defined(__FreeBSD__) || defined(__NetBSD__)
- #define f2cFortran    /* Lynx:      Only support f2c at the moment.
-                          VAXUltrix: f77 behaves like f2c.
-                            Support f2c or f77 with gcc, vcc with f2c.
+$NetBSD: patch-ac,v 1.2 2006/05/27 12:38:27 drochner Exp $
+
+--- base/inc/RConfig.h.orig	2006-05-26 17:38:48.000000000 +0200
++++ base/inc/RConfig.h
+@@ -272,7 +272,7 @@
+ #   define NEED_SNPRINTF
+ #endif
+ 
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined (__NetBSD__)
+ #   define R__FBSD
+ #   define R__UNIX
+ #   define R__BYTESWAP
diff --git a/misc/root/patches/patch-ad b/misc/root/patches/patch-ad
index 9d2d3103bee..629cf924b19 100644
--- a/misc/root/patches/patch-ad
+++ b/misc/root/patches/patch-ad
@@ -1,12 +1,23 @@
-$NetBSD: patch-ad,v 1.1.1.1 1999/11/17 16:17:03 drochner Exp $
---- src/ROOTX_rootx.cxx.orig	Sat Nov  6 22:39:37 1999
-+++ src/ROOTX_rootx.cxx	Sat Nov  6 22:40:18 1999
-@@ -34,7 +34,7 @@
- #define HAVE_UTMPX_H
- #define UTMP_NO_ADDR
- #endif
--#if defined(__alpha) || defined(_AIX) || defined(__FreeBSD__)
-+#if defined(__alpha) || defined(_AIX) || defined(__FreeBSD__) || defined(__NetBSD__)
- #define UTMP_NO_ADDR
- #endif
+$NetBSD: patch-ad,v 1.2 2006/05/27 12:38:27 drochner Exp $
+
+--- base/src/TMapFile.cxx.orig	2006-05-26 17:50:02.000000000 +0200
++++ base/src/TMapFile.cxx
+@@ -104,7 +104,7 @@
+ #include <sys/sem.h>
+ #if defined(R__HPUX) || (defined (R__ALPHA) && !defined(R__FBSD)) || \
+     defined (R__SOLARIS) || defined(R__AIX) || defined(R__HIUX) || \
+-    __GLIBC_MINOR__ > 0
++    __GLIBC_MINOR__ > 0 || defined(__NetBSD__)
+ union semun {
+    int val;                      // value for SETVAL
+    struct semid_ds *buf;         // buffer for IPC_STAT & IPC_SET
+@@ -760,8 +760,7 @@ void TMapFile::CreateSemaphore(int pid)
+ #ifdef HAVE_SEMOP
+ #ifndef WIN32
+    // create semaphore to synchronize access (should use read/write lock)
+-   fSemaphore = semget(IPC_PRIVATE, 1, SEM_R|SEM_A|(SEM_R>>3)|(SEM_A>>3)|
+-                                       (SEM_R>>6)|(SEM_A>>6));
++   fSemaphore = semget(IPC_PRIVATE, 1, 0);
  
+    // set semaphore to 1
+    if (fSemaphore != -1) {
diff --git a/misc/root/patches/patch-ae b/misc/root/patches/patch-ae
index b98048d4514..56f334ba364 100644
--- a/misc/root/patches/patch-ae
+++ b/misc/root/patches/patch-ae
@@ -1,28 +1,13 @@
-$NetBSD: patch-ae,v 1.1.1.1 1999/11/17 16:17:03 drochner Exp $
---- src/ROOTD_daemon.cxx.orig	Sat Nov  6 22:42:10 1999
-+++ src/ROOTD_daemon.cxx	Sat Nov  6 22:44:40 1999
-@@ -41,13 +41,13 @@
- #define USE_SIGCHLD
- #endif
- 
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
- #define USE_SIGCHLD
- #define	SIGCLD SIGCHLD
- #endif
- 
- #if defined(__linux) || defined(__hpux) || defined(__sun) || defined(__sgi) || \
--    defined(_AIX) || defined(__FreeBSD__)
-+    defined(_AIX) || defined(__FreeBSD__) || defined(__NetBSD__)
- #define USE_SETSID
- #endif
- 
-@@ -61,7 +61,7 @@
- static void SigChild(int)
- {
-    int         pid;
--#if defined(__hpux) || defined(__FreeBSD__)
-+#if defined(__hpux) || defined(__FreeBSD__) || defined(__NetBSD__)
-    int status;
- #else
-    union wait  status;
+$NetBSD: patch-ae,v 1.2 2006/05/27 12:38:27 drochner Exp $
+
+--- eg/inc/cfortran.h.orig	2006-05-26 18:20:11.000000000 +0200
++++ eg/inc/cfortran.h
+@@ -89,7 +89,7 @@ only C calling FORTRAN subroutines will 
+ #if !(defined(mipsFortran)||defined(DECFortran)||defined(vmsFortran)||defined(CONVEXFortran)||defined(PowerStationFortran)||defined(AbsoftUNIXFortran)||defined(AbsoftProFortran)||defined(SXFortran))
+ /* If no Fortran compiler is given, we choose one for the machines we know.   */
+ #if defined(lynx) || defined(VAXUltrix) || defined(linux) || defined(_HIUX_SOURCE) || \
+-    defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
++    defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__NetBSD__)
+ #define f2cFortran    /* Lynx:      Only support f2c at the moment.
+                          VAXUltrix: f77 behaves like f2c.
+                            Support f2c or f77 with gcc, vcc with f2c.
diff --git a/misc/root/patches/patch-af b/misc/root/patches/patch-af
index b5b247e06a5..6a1c6103709 100644
--- a/misc/root/patches/patch-af
+++ b/misc/root/patches/patch-af
@@ -1,13 +1,13 @@
-$NetBSD: patch-af,v 1.1.1.1 1999/11/17 16:17:03 drochner Exp $
---- src/CINT_init.c.orig	Sat Nov  6 22:55:57 1999
-+++ src/CINT_init.c	Sat Nov  6 22:56:26 1999
-@@ -1876,6 +1876,9 @@
- #ifdef __FreeBSD__
-   sprintf(temp,"G__FBSD=%ld",(long)__FreeBSD__); G__getexpr(temp);
- #endif
-+#ifdef __NetBSD__
-+  sprintf(temp,"G__FBSD=%ld",(long)__NetBSD__); G__getexpr(temp);
-+#endif
- #ifdef __GNUC__
-   sprintf(temp,"G__GNUC=%ld",(long)__GNUC__); G__getexpr(temp);
- #endif
+$NetBSD: patch-af,v 1.2 2006/05/27 12:38:27 drochner Exp $
+
+--- rpdutils/src/rpdutils.cxx.orig	2006-05-26 19:20:46.000000000 +0200
++++ rpdutils/src/rpdutils.cxx
+@@ -70,7 +70,7 @@ extern "C" int ruserok(const char *, int
+ extern "C" int fstatfs(int file_descriptor, struct statfs *buffer);
+ #elif defined(linux) || defined(__hpux)
+ #include <sys/vfs.h>
+-#elif defined(__FreeBSD__) || defined(__OpenBSD__)
++#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+ #include <sys/param.h>
+ #include <sys/mount.h>
+ #else
diff --git a/misc/root/patches/patch-ag b/misc/root/patches/patch-ag
index 423fdb5ac47..2f1d2fd2f9c 100644
--- a/misc/root/patches/patch-ag
+++ b/misc/root/patches/patch-ag
@@ -1,12 +1,13 @@
-$NetBSD: patch-ag,v 1.1.1.1 1999/11/17 16:17:03 drochner Exp $
---- src/Makelib.orig	Sun Nov  7 00:23:42 1999
-+++ src/Makelib	Sun Nov  7 00:24:49 1999
-@@ -30,7 +30,7 @@
-    $LD $SOFLAGS $LDFLAGS -o $LIB $OBJS $EXTRA
- elif [ $PLATFORM = fbsd ]; then
-    echo $LD $SOFLAGS $LDFLAGS -o $LIB $OBJS $EXTRA
--   $LD $SOFLAGS $LDFLAGS -o $LIB `lorder $OBJS | tsort -q` $EXTRA
-+   $LD $SOFLAGS $LDFLAGS -o $LIB $OBJS $EXTRA
- # for elf:  echo $PLATFORM: $LD $SOFLAGS$SONAME $LDFLAGS -o $LIB $OBJS
- # for elf:  $LD $SOFLAGS$SONAME $LDFLAGS -o $LIB `lorder $OBJS | tsort -q`
- elif [ $LD = KCC ]; then
+$NetBSD: patch-ag,v 1.2 2006/05/27 12:38:27 drochner Exp $
+
+--- rootx/src/rootx.cxx.orig	2006-05-26 19:21:52.000000000 +0200
++++ rootx/src/rootx.cxx
+@@ -37,7 +37,7 @@
+ #endif
+ #if (defined(__alpha) && !defined(__linux)) || defined(_AIX) || \
+     defined(__FreeBSD__) || defined(__Lynx__) || defined(__APPLE__) || \
+-    defined(__OpenBSD__)
++    defined(__OpenBSD__) || defined(__NetBSD__)
+ #define UTMP_NO_ADDR
+ #endif
+ 
diff --git a/misc/root/patches/patch-ah b/misc/root/patches/patch-ah
index 9f1176e9bff..d468440f389 100644
--- a/misc/root/patches/patch-ah
+++ b/misc/root/patches/patch-ah
@@ -1,20 +1,47 @@
-$NetBSD: patch-ah,v 1.1.1.1 1999/11/17 16:17:03 drochner Exp $
---- src/BASE_MapFile.cxx.orig	Sun Nov  7 01:08:03 1999
-+++ src/BASE_MapFile.cxx	Sun Nov  7 01:08:18 1999
-@@ -140,14 +140,14 @@
- #include <sys/sem.h>
- #if defined(R__HPUX) || defined (R__ALPHA) || defined (R__SOLARIS) || \
-     defined(R__AIX) || defined(R__HIUX) || defined (R__MKLINUX) || \
--    __GLIBC_MINOR__ > 0
-+    __GLIBC_MINOR__ > 0 || defined (R__FBSD) /* XXX */
- union semun {
-    int val;                      // value for SETVAL
-    struct semid_ds *buf;         // buffer for IPC_STAT & IPC_SET
-    ushort *array;                // array for GETALL & SETALL
- };
- #endif
--#ifdef R__LINUX
-+#ifndef SEM_A
- #  define       SEM_A   0200     // alter permission
- #  define       SEM_R   0400     // read permission
+$NetBSD: patch-ah,v 1.2 2006/05/27 12:38:27 drochner Exp $
+
+--- rootd/src/rootd.cxx.orig	2006-05-26 19:22:55.000000000 +0200
++++ rootd/src/rootd.cxx
+@@ -242,7 +242,7 @@ extern "C" int fstatfs(int file_descript
+ extern "C" int fstatfs(int file_descriptor, struct statfs *buffer);
+ #elif defined(linux) || defined(__hpux) || defined(cygwingcc)
+ #include <sys/vfs.h>
+-#elif defined(__FreeBSD__) || defined(__OpenBSD__)
++#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+ #include <sys/param.h>
+ #include <sys/mount.h>
+ #else
+@@ -251,7 +251,7 @@ extern "C" int fstatfs(int file_descript
+ 
+ #if defined(linux) || defined(__hpux) || defined(_AIX) || defined(__alpha) || \
+     defined(__sun) || defined(__sgi) || defined(__FreeBSD__) || \
+-    defined(__APPLE__) || defined(cygwingcc) || defined(__OpenBSD__)
++    defined(__APPLE__) || defined(cygwingcc) || defined(__OpenBSD__) || defined(__NetBSD__)
+ #define HAVE_MMAP
  #endif
+ 
+@@ -293,7 +293,7 @@ static int fcntl_lockf(int fd, int op, o
+ 
+ #if defined(linux) || defined(__sun) || defined(__sgi) || \
+     defined(_AIX) || defined(__FreeBSD__) || defined(__APPLE__) || \
+-    defined(__MACH__) || defined(cygwingcc) || defined(__OpenBSD__)
++    defined(__MACH__) || defined(cygwingcc) || defined(__OpenBSD__) || defined(__NetBSD__)
+ #include <grp.h>
+ #include <sys/types.h>
+ #include <signal.h>
+@@ -1369,6 +1369,7 @@ void RootdPutFile(const char *msg)
+       }
+    }
+ 
++#if 0
+    // check file system space
+    if (strcmp(gFile, "/dev/null")) {
+       struct statfs statfsbuf;
+@@ -1386,6 +1387,7 @@ void RootdPutFile(const char *msg)
+          }
+       }
+    }
++#endif
+ 
+    // seek to restartat position
+    if (restartat) {
diff --git a/misc/root/patches/patch-ai b/misc/root/patches/patch-ai
index 0afb695645d..7eba8c55613 100644
--- a/misc/root/patches/patch-ai
+++ b/misc/root/patches/patch-ai
@@ -1,12 +1,13 @@
-$NetBSD: patch-ai,v 1.1.1.1 1999/11/17 16:17:03 drochner Exp $
---- src/C_Getline.c.orig	Sun Nov  7 01:48:21 1999
-+++ src/C_Getline.c	Sun Nov  7 01:49:21 1999
-@@ -342,7 +342,7 @@
- #define unix
+$NetBSD: patch-ai,v 1.2 2006/05/27 12:38:27 drochner Exp $
+
+--- rpdutils/src/daemon.cxx.orig	2006-05-26 19:23:53.000000000 +0200
++++ rpdutils/src/daemon.cxx
+@@ -212,7 +212,7 @@ out:
+ #elif defined(__sun)
+       sigignore(SIGCHLD);
+ #else
+-      signal(SIGCLD, SIG_IGN);
++      signal(SIGCHLD, SIG_IGN);
  #endif
- 
--#if defined(__hpux) || defined(__osf__)       /* W.Karig@gsi.de */
-+#if defined(__hpux) || defined(__osf__) || defined(__NetBSD__) /* W.Karig@gsi.de */
- #ifndef unix
- #define unix
  #endif
+    }
diff --git a/misc/root/patches/patch-aj b/misc/root/patches/patch-aj
index 475135432e1..6f7552197f9 100644
--- a/misc/root/patches/patch-aj
+++ b/misc/root/patches/patch-aj
@@ -1,40 +1,12 @@
-$NetBSD: patch-aj,v 1.1 2000/12/28 02:16:27 wiz Exp $
+$NetBSD: patch-aj,v 1.2 2006/05/27 12:38:27 drochner Exp $
 
---- src/UNIX_UnixSystem.cxx.orig	Tue Nov  2 11:38:04 1999
-+++ src/UNIX_UnixSystem.cxx
-@@ -1353,9 +1353,9 @@
-    // Get Internet Protocol (IP) address of host and port #.
- 
-    struct sockaddr_in addr;
--#if defined(R__AIX) || defined(R__FBSD)
-+#if defined(R__AIX)
-    size_t len = sizeof(addr);
--#elif defined(R__GLIBC)
-+#elif defined(R__GLIBC) || defined(R__FBSD)
-    socklen_t len = sizeof(addr);
- #else
-    int len = sizeof(addr);
-@@ -1391,9 +1391,9 @@
-    // Get Internet Protocol (IP) address of remote host and port #.
- 
-    struct sockaddr_in addr;
--#if defined(R__AIX) || defined(R__FBSD)
-+#if defined(R__AIX)
-    size_t len = sizeof(addr);
--#elif defined(R__GLIBC)
-+#elif defined(R__GLIBC) || defined(R__FBSD)
-    socklen_t len = sizeof(addr);
- #else
-    int len = sizeof(addr);
-@@ -1718,10 +1718,8 @@
- 
-    if (sock < 0) return -1;
- 
--#if defined(R__GLIBC) || defined(_AIX43)
-+#if defined(R__GLIBC) || defined(_AIX43) || defined(R__FBSD)
-    socklen_t optlen = sizeof(*val);
--#elif defined(R__FBSD)
--   size_t optlen = sizeof(*val);
- #else
-    int optlen = sizeof(*val);
- #endif
+--- config/ARCHS.orig	2006-05-26 19:54:56.000000000 +0200
++++ config/ARCHS
+@@ -35,6 +35,7 @@ macosxicc            for MacOS X with In
+ macosx64             for MacOS X with gcc 4.0 64 bit mode
+ macosxxlc            for MacOS X with IBM xl compilers
+ mklinux              for MkLinux gcc and glibc
++netbsd		     for NetBSD
+ openbsd              for OpenBSD >= 3.7
+ sgicc                for SGI IRIX 6.x CC
+ sgicc64              for SGI IRIX 6.x CC 64 bits
diff --git a/misc/root/patches/patch-ak b/misc/root/patches/patch-ak
index 1c9d0700c6d..863942d439b 100644
--- a/misc/root/patches/patch-ak
+++ b/misc/root/patches/patch-ak
@@ -1,13 +1,13 @@
-$NetBSD: patch-ak,v 1.1 2000/12/28 02:16:27 wiz Exp $
+$NetBSD: patch-ak,v 1.2 2006/05/27 12:38:27 drochner Exp $
 
---- src/ROOTD_rootd.cxx.orig	Tue Nov  2 11:45:18 1999
-+++ src/ROOTD_rootd.cxx
-@@ -128,7 +128,7 @@
- extern "C" char *crypt(const char *, const char *);
- #endif
+--- clib/src/Getline.c.orig	2006-05-26 22:33:35.000000000 +0200
++++ clib/src/Getline.c
+@@ -331,7 +331,7 @@ static void     search_forw(int s);     
+ #endif /* WIN32 */
  
--#ifdef __alpha
-+#if defined(__alpha) && !defined(__NetBSD__)
- extern "C" int initgroups(char *name, int basegid);
+ #if defined(_AIX) || defined(__Lynx__) || defined(__APPLE__) || \
+-	defined(__OpenBSD__)
++	defined(__OpenBSD__) || defined(__NetBSD__)
+ #define unix
  #endif
  
diff --git a/misc/root/patches/patch-al b/misc/root/patches/patch-al
index 97d9eb13338..be6203c0f40 100644
--- a/misc/root/patches/patch-al
+++ b/misc/root/patches/patch-al
@@ -1,13 +1,17 @@
-$NetBSD: patch-al,v 1.1 2000/12/28 02:16:27 wiz Exp $
+$NetBSD: patch-al,v 1.2 2006/05/27 12:38:27 drochner Exp $
 
---- src/PROOFD_proofd.cxx.orig	Tue Nov  2 11:45:22 1999
-+++ src/PROOFD_proofd.cxx
-@@ -57,7 +57,7 @@
- extern "C" char *crypt(const char *, const char *);
- #endif
- 
--#ifdef __alpha
-+#if defined(__alpha) && !defined(__NetBSD__)
- extern "C" int initgroups(char *name, int basegid);
- #endif
- 
+--- config/root-config.in.orig	2006-05-26 22:50:42.000000000 +0200
++++ config/root-config.in
+@@ -276,6 +276,12 @@ freebsd5)
+    auxcflags=
+    auxlibs="-lm -lstdc++"
+    ;;
++netbsd)
++   # NetBSD with libc
++   auxcflags=
++   auxlibs="-lm -lstdc++"
++   rootlibs="${rootlibs} -Wl,-R${libdir}"
++   ;;
+ openbsd)
+    # OpenBSD with libc
+    auxcflags=
diff --git a/misc/root/patches/patch-am b/misc/root/patches/patch-am
index 18bdec2278f..797544412b9 100644
--- a/misc/root/patches/patch-am
+++ b/misc/root/patches/patch-am
@@ -1,33 +1,39 @@
-$NetBSD: patch-am,v 1.1 2002/03/08 05:18:12 jmc Exp $
+$NetBSD: patch-am,v 1.2 2006/05/27 12:38:27 drochner Exp $
 
---- src/ROOTD_net.cxx.orig	Fri Mar  8 04:26:20 2002
-+++ src/ROOTD_net.cxx	Fri Mar  8 04:28:52 2002
-@@ -33,6 +33,10 @@
- #include <netdb.h>
- #include <errno.h>
+--- configure.orig	2006-05-26 23:29:18.000000000 +0200
++++ configure
+@@ -1982,21 +1982,20 @@ if test ! "x$enable_asimage" = "xno" ; t
+     # for a system library, then see if we have various headers needed.
+     if test "x$enable_builtin_afterimage" = "xyes" ; then
+        check_header "jpeglib.h" "" $ASIMAGE $ASIMAGE/include \
+-          /usr/local/include /usr/include /opt/include
++          ${LOCALBASE}/include
+        asjpegincdir=$found_dir
+        check_header "png.h" "" $ASIMAGE $ASIMAGE/include \
+-          /usr/local/include /usr/include /usr/local/include/libpng \
+-          /opt/include
++          ${LOCALBASE}/include
+        aspngincdir=$found_dir
+        if test ! "x$enable_astiff" = "xno" ; then
+            check_header "tiffio.h" "" $ASIMAGE $ASIMAGE/include \
+-               /usr/local/include /usr/include /opt/include
++               ${LOCALBASE}/include
+            astiffincdir=$found_dir
+        else
+            astiffincdir="--with-tiff=no"
+        fi
+        check_header "gif_lib.h" "" $ASIMAGE $ASIMAGE/include \
+-          /usr/local/include /usr/include /opt/include
++          ${LOCALBASE}/include
+        asgifincdir=$found_dir
  
-+#ifdef __NetBSD__
-+#include <sys/param.h>
-+#endif
-+
- //*KEEP,rootdp,T=C++.
- #include "rootdp.h"
- //*KEND.
-@@ -176,7 +180,7 @@
-       if (gDebug > 0) {
- #ifdef _AIX
-          size_t clilen = sizeof(tcp_cli_addr);
--#elif defined(R__GLIBC)
-+#elif defined(R__GLIBC) || (defined(__NetBSD__) && __NetBSD_Version__ >= 103100000)
-          socklen_t clilen = sizeof(tcp_cli_addr);
- #else
-          int clilen = sizeof(tcp_cli_addr);
-@@ -206,7 +210,7 @@
- again:
- #ifdef _AIX
-    size_t clilen = sizeof(tcp_cli_addr);
--#elif defined(R__GLIBC)
-+#elif defined(R__GLIBC) || (defined(__NetBSD__) && __NetBSD_Version__ >= 103100000)
-    socklen_t clilen = sizeof(tcp_cli_addr);
- #else
-    int clilen = sizeof(tcp_cli_addr);
+        asextralib=""
+@@ -2014,7 +2013,7 @@ if test ! "x$enable_asimage" = "xno" ; t
+        fi
+        for k in $aslibs ; do
+            check_library $k "$enable_shared" "" \
+-             $ASIMAGE $ASIMAGE/lib /usr/local/lib /usr/lib /opt/lib
++             $ASIMAGE $ASIMAGE/lib ${LOCALBASE}/lib /usr/lib
+            if test "x$k" = "xlibz" ; then
+                found_libz=$found_lib
+                found_dirz=$found_dir
diff --git a/misc/root/patches/patch-an b/misc/root/patches/patch-an
new file mode 100644
index 00000000000..d24af016689
--- /dev/null
+++ b/misc/root/patches/patch-an
@@ -0,0 +1,15 @@
+$NetBSD: patch-an,v 1.1 2006/05/27 12:38:27 drochner Exp $
+
+--- gl/Module.mk.orig	2006-05-27 01:05:13.000000000 +0200
++++ gl/Module.mk
+@@ -35,8 +35,8 @@ GLH1         := $(MODDIRI)/gl2ps.h $(MOD
+ GLH2         := $(filter-out $(GLH1), $(GLH))
+ 
+ ifneq ($(OPENGLLIB),)
+-GLLIBS       := $(OPENGLLIBDIR) $(OPENGLULIB) $(OPENGLLIB) \
+-                $(X11LIBDIR) -lX11 -lXext -lXmu -lXi -lm
++GLLIBS       := $(OPENGLLIBDIR) $(OPENGLULIB) $(OPENGLLIB) -Wl,-R${LOCALBASE}/lib \
++                $(X11LIBDIR) -lX11 -lXext -lXmu -lXi -lm -Wl,-R${X11BASE}/lib
+ endif
+ ifeq ($(ARCH),win32)
+ GLLIBS       := opengl32.lib glu32.lib $(LPATH)/libGraf.lib $(LPATH)/libHist.lib