diff -uNr 3.05.05.ORIG/base/src/TMapFile.cxx 3.05.05/base/src/TMapFile.cxx
--- 3.05.05.ORIG/base/src/TMapFile.cxx	Thu Apr  3 22:46:49 2003
+++ 3.05.05/base/src/TMapFile.cxx	Tue Jun  3 20:49:13 2003
@@ -11,6 +11,9 @@
 #ifdef WIN32
 #pragma optimize("",off)
 #endif
+#if 1
+#include <iostream.h>
+#endif
 
 //////////////////////////////////////////////////////////////////////////
 //                                                                      //
@@ -96,7 +99,7 @@
 #include "TClass.h"
 #include "TMath.h"
 
-#if defined(R__UNIX) && !defined(R__MACOSX) && !defined(R__WINGCC)
+#if defined(R__UNIX) && !defined(R__WINGCC)
 #define HAVE_SEMOP
 #include <sys/types.h>
 #include <sys/ipc.h>
@@ -808,13 +811,13 @@
       int intr = 0;
 again:
       if (semop(fSemaphore, &buf, 1) == -1) {
-#if defined(R__FBSD)
+#if defined(R__FBSD) || defined(R__MACOSX)
          if (TSystem::GetErrno() == EINVAL)
 #else
          if (TSystem::GetErrno() == EIDRM)
 #endif
             fSemaphore = -1;
-#if !defined(R__FBSD)
+#if !defined(R__FBSD) && !defined(R__MACOSX)
          if (TSystem::GetErrno() == EINTR) {
             if (intr > 2)
                return -1;
@@ -851,7 +854,7 @@
    if (fSemaphore != -1) {
       struct sembuf buf = { 0, 1, SEM_UNDO };
       if (semop(fSemaphore, &buf, 1) == -1) {
-#if defined(R__FBSD)
+#if defined(R__FBSD) || defined(R__MACOSX)
          if (TSystem::GetErrno() == EINVAL)
 #else
          if (TSystem::GetErrno() == EIDRM)
@@ -1116,8 +1119,19 @@
    // the desired address is already in use.
 
 #ifdef HAVE_MMAP
+#if 1
+cerr << "HAVE_MMAP in TMapFile::MapToAddress()" << endl;
+#endif
    if (TStorage::HasCustomNewDelete())
+#if 1
+{
+cerr << "HasCustomNewDelete in TMapFile::MapToAddress()" << endl;
+cerr << "fgMapAddress = " << (void *)fgMapAddress << endl;
+#endif
       return (void *)fgMapAddress;
+#if 1
+}
+#endif
    else
       return (void *)-1;
 #else
diff -uNr 3.05.05.ORIG/bin/root-config 3.05.05/bin/root-config
--- 3.05.05.ORIG/bin/root-config	Mon May 12 21:58:40 2003
+++ 3.05.05/bin/root-config	Fri Jun 13 01:33:51 2003
@@ -329,7 +329,7 @@
 fi
 exec_prefix=${prefix}
 exec_prefix_set=no
-new_set=no
+new_set=yes
 libsout=no
 cflags=""
 noauxlibs=no
diff -uNr 3.05.05.ORIG/config/Makefile.macosx 3.05.05/config/Makefile.macosx
--- 3.05.05.ORIG/config/Makefile.macosx	Sat Apr 26 16:51:51 2003
+++ 3.05.05/config/Makefile.macosx	Thu Jun 12 21:22:21 2003
@@ -60,3 +60,54 @@
 FINK_CXXFLAGS = $(shell [ -d /sw/include ] && echo -I/sw/include)
 FINK_CFLAGS   = $(shell [ -d /sw/include ] && echo -I/sw/include)
 FINK_LDFLAGS  = $(shell [ -d /sw/lib ] && echo -L/sw/lib)
+
+
+
+CORELIBEXTRA += -Llib -lNew
+
+ALIENLIBEXTRA += -Llib -lNew
+ASIMAGELIBEXTRA += -Llib -lNew
+CHIRPLIBEXTRA += -Llib -lNew
+# CINTLIBEXTRA += -Llib -lNew
+DCACHELIBEXTRA += -Llib -lNew
+EGLIBEXTRA += -Llib -lNew
+FUMILILIBEXTRA += -Llib -lNew
+G3DLIBEXTRA += -Llib -lNew
+GEOMLIBEXTRA += -Llib -lNew
+GEOMPAINTERLIBEXTRA += -Llib -lNew
+GLLIBEXTRA += -Llib -lNew
+GPADLIBEXTRA += -Llib -lNew
+GRAFLIBEXTRA += -Llib -lNew
+GUILIBEXTRA += -Llib -lNew
+RFIOLIBEXTRA += -Llib -lNew
+# HBOOKLIBEXTRA += -Llib -lNew
+HISTLIBEXTRA += -Llib -lNew
+HISTPAINTERLIBEXTRA += -Llib -lNew
+HTMLLIBEXTRA += -Llib -lNew
+KRB5AUTHLIBEXTRA += -Llib -lNew
+LDAPLIBEXTRA += -Llib -lNew
+MATRIXLIBEXTRA += -Llib -lNew
+MCLIBEXTRA += -Llib -lNew
+MINUITLIBEXTRA += -Llib -lNew
+MYSQLLIBEXTRA += -Llib -lNew
+PGSQLLIBEXTRA += -Llib -lNew
+PHYSICSLIBEXTRA += -Llib -lNew
+POSTSCRIPTLIBEXTRA += -Llib -lNew
+PROOFLIBEXTRA += -Llib -lNew
+PROOFGUILIBEXTRA += -Llib -lNew
+PYTHIALIBEXTRA += -Llib -lNew
+PYTHIA6LIBEXTRA += -Llib -lNew
+RINTLIBEXTRA += -Llib -lNew
+SAPDBLIBEXTRA += -Llib -lNew
+SRPUTILSLIBEXTRA += -Llib -lNew
+TABLELIBEXTRA += -Llib -lNew
+THREADLIBEXTRA += -Llib -lNew
+TREELIBEXTRA += -Llib -lNew
+TREEPLAYERLIBEXTRA += -Llib -lNew
+TREEVIEWERLIBEXTRA += -Llib -lNew
+VENUSLIBEXTRA += -Llib -lNew
+WIN32LIBEXTRA += -Llib -lNew
+WIN32GDKLIBEXTRA += -Llib -lNew
+X11LIBEXTRA += -Llib -lNew
+X11TTFLIBEXTRA += -Llib -lNew
+X3DLIBEXTRA += -Llib -lNew
diff -uNr 3.05.05.ORIG/test/Makefile 3.05.05/test/Makefile
--- 3.05.05.ORIG/test/Makefile	Fri May  2 20:29:36 2003
+++ 3.05.05/test/Makefile	Fri Jun 13 01:41:27 2003
@@ -425,11 +425,11 @@
 CXX           = c++
 CXXFLAGS      = -O -pipe -Wall
 LD            = c++
-LDFLAGS       = -O -Xlinker -bind_at_load -flat_namespace
+LDFLAGS       = -O -Xlinker -bind_at_load -flat_namespace -L$(ROOTSYS)/lib -lNew
 # The SOFLAGS will be used to create the .dylib; the .so will
 # be created separately
 DllSuf        = dylib
-SOFLAGS       = -dynamiclib -flat_namespace -undefined suppress
+SOFLAGS       = -dynamiclib -flat_namespace -undefined suppress -L$(ROOTSYS)/lib -lNew
 endif
 
 ifeq ($(ARCH),hiux)