diff -Naur geant4.9.3.orig/config/sys/Darwin-g++.gmk geant4.9.3.new/config/sys/Darwin-g++.gmk --- geant4.9.3.orig/config/sys/Darwin-g++.gmk 2009-12-18 18:23:02.000000000 +0100 +++ geant4.9.3.new/config/sys/Darwin-g++.gmk 2010-01-27 09:53:59.000000000 +0100 @@ -33,13 +33,13 @@ FCFLAGS += -O2 -g CCFLAGS += -O2 -g endif - FC := gfortran + FC := @FORTRAN@ FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore LDFLAGS += -bind_at_load -arch_multiple - FCLIBS := -lg2c -lnsl + FCLIBS := @FORTRAN_LIBS@ SHEXT := dylib ifndef X11FLAGS - X11FLAGS := -I/usr/include/X11/extensions -I/usr/include/X11 + X11FLAGS := -I/usr/X11R6/include endif ifndef X11LIBS X11LIBS := -L/usr/X11R6/lib -lXmu -lXt -lXext -lX11 -lXi -lSM -lICE @@ -136,15 +136,32 @@ define build-granular-shared-lib @libdir=`(cd $(@D);/bin/pwd)`; \ + libname=`(echo $(@F) | /usr/bin/sed 's/\.dylib/.@VERSION@.dylib/')`; \ + compversion=`(echo @VERSION@ | /usr/bin/cut -d'.' -f1-2)`; \ + libs=`(/bin/ls -1 $$libdir/*$$compversion.dylib | /usr/bin/xargs -IFILE /usr/bin/basename FILE .$$compversion.dylib | /usr/bin/sed -n 's|^lib|-l|p')`; \ cd $(G4TMPDIR); \ - $(CXX) -dynamiclib -single_module -undefined dynamic_lookup \ - -o $$libdir/$(@F) $(INTYLIBS) *.o + $(CXX) -dynamiclib -single_module -undefined dynamic_lookup \ + -install_name @PREFIX@/lib/geant4.9/Darwin-g++/`echo $$libname | /usr/bin/cut -d'.' -f1-3`".dylib" \ + -compatibility_version $$compversion -current_version @VERSION@ \ + -o $$libdir/$$libname *.o -L$(G4LIB)/$(G4SYSTEM) $$libs \ + -L$(CLHEP_LIB_DIR) -l$(CLHEP_LIB) $(INTYLIBS); \ + /bin/ln -s $$libname $$libdir/`echo $$libname | /usr/bin/cut -d'.' -f1-3`".dylib"; \ + /bin/ln -s $$libname $$libdir/`echo $$libname | /usr/bin/cut -d'.' -f1`".dylib" endef define build-global-shared-lib @libdir=`(cd $(@D);/bin/pwd)`; \ + libname=`(echo $(@F) | /usr/bin/sed 's/\.dylib/.@VERSION@.dylib/')`; \ + compversion=`(echo @VERSION@ | /usr/bin/cut -d'.' -f1-2)`; \ + libs=`(/bin/ls -1 $$libdir/*$$compversion.dylib | /usr/bin/xargs -IFILE /usr/bin/basename FILE .$$compversion.dylib | /usr/bin/sed -n 's|^lib|-l|p')`; \ cd $(G4TMP)/$(G4SYSTEM); \ - $(CXX) -dynamiclib -single_module -undefined dynamic_lookup \ - -o $$libdir/$(@F) $(INTYLIBS) $(foreach dir,$(SUBLIBS),$(dir)/*.o); + $(CXX) -dynamiclib -single_module -undefined dynamic_lookup \ + -install_name @PREFIX@/lib/geant4.9/Darwin-g++/`echo $$libname | /usr/bin/cut -d'.' -f1-3`".dylib" \ + -compatibility_version $$compversion -current_version @VERSION@ \ + -o $$libdir/$$libname \ + $(foreach dir,$(SUBLIBS),$(dir)/*.o) \ + -L$(CLHEP_LIB_DIR) -l$(CLHEP_LIB) $(INTYLIBS); \ + /bin/ln -s $$libname $$libdir/`echo $$libname | /usr/bin/cut -d'.' -f1-3`".dylib"; \ + /bin/ln -s $$libname $$libdir/`echo $$libname | /usr/bin/cut -d'.' -f1`".dylib" endef endif diff -Naur geant4.9.3.orig/fink.sh geant4.9.3.new/fink.sh --- geant4.9.3.orig/fink.sh 1970-01-01 01:00:00.000000000 +0100 +++ geant4.9.3.new/fink.sh 2010-01-27 09:53:59.000000000 +0100 @@ -0,0 +1,66 @@ +g4clhep_base_dir='@PREFIX@' +g4clhep_include_dir='@PREFIX@/include' +g4clhep_lib='CLHEP' +g4clhep_lib_dir='@PREFIX@/lib' +g4compiler='g++' +g4data='@PREFIX@/share/geant4.9/data' +g4debug='n' +d_portable='define' +g4global='n' +g4granular='y' +g4include='' +g4includes_flag='y' +g4install='@BUILDDIR@' +g4lib_build_shared='y' +g4lib_build_static='y' +g4lib_use_granular='y' +g4lib_use_shared='n' +g4lib_use_static='y' +g4make='make' +g4osname='Darwin' +g4system='Darwin-g++' +g4ui_build_gag_session='y' +g4ui_build_terminal_session='y' +g4ui_build_win32_session='n' +g4ui_build_xaw_session='n' +g4ui_build_xm_session='y' +g4ui_use_gag='y' +g4ui_use_tcsh='y' +g4ui_use_terminal='y' +g4ui_use_win32='n' +g4ui_use_xaw='n' +g4ui_use_xm='y' +g4vis_build_asciitree_driver='y' +g4vis_build_dawn_driver='y' +g4vis_build_dawnfile_driver='y' +g4vis_build_oiwin32_driver='n' +g4vis_build_oix_driver='n' +g4vis_build_openglwin32_driver='n' +g4vis_build_openglx_driver='y' +g4vis_build_openglxm_driver='y' +g4vis_build_raytracer_driver='y' +g4vis_build_vrml_driver='y' +g4vis_build_vrmlfile_driver='y' +g4vis_oglhome='/usr/X11R6/' +g4vis_use_asciitree='y' +g4vis_use_dawn='y' +g4vis_use_dawnfile='y' +g4vis_use_oiwin32='n' +g4vis_use_oix='n' +g4vis_use_openglwin32='n' +g4vis_use_openglx='y' +g4vis_use_openglxm='y' +g4vis_use_raytracer='y' +g4vis_use_vrml='y' +g4vis_use_vrmlfile='y' +g4w_use_g3tog4='@BUILDCERN@' +g4wanalysis_build='' +g4wanalysis_build_jas='' +g4wanalysis_build_lab='' +g4wanalysis_build_lizard='' +g4wanalysis_use='n' +g4wanalysis_use_jas='' +g4wanalysis_use_lab='' +g4wanalysis_use_lizard='' +g4wlib_build_zlib='y' +g4wlib_build_g3tog4='@BUILDCERN@' diff -Naur geant4.9.3.orig/source/GNUmakefile geant4.9.3.new/source/GNUmakefile --- geant4.9.3.orig/source/GNUmakefile 2009-12-18 18:25:34.000000000 +0100 +++ geant4.9.3.new/source/GNUmakefile 2010-01-27 09:53:59.000000000 +0100 @@ -42,7 +42,7 @@ glob global: banner kernel_global ifdef G4LIB_USE_G3TOG4 - @for dir in $(SUBDIR4); do (cd $$dir && $(MAKE)); done;: + @for dir in $(SUBDIR4); do (cd $$dir && $(MAKE) global); done;: endif @$(MAKE) liblist @$(ECHO) "Libraries installation completed !" diff -Naur geant4.9.3.orig/source/g3tog4/GNUmakefile geant4.9.3.new/source/g3tog4/GNUmakefile --- geant4.9.3.orig/source/g3tog4/GNUmakefile 2009-12-18 18:24:24.000000000 +0100 +++ geant4.9.3.new/source/g3tog4/GNUmakefile 2010-01-27 09:53:59.000000000 +0100 @@ -104,7 +104,7 @@ all: lib -lib: cleanf libc libF +lib: cleanf libc libF bin ifneq ($(G4LIB_BUILD_SHARED),) libc : $(G4LIBDIR)/lib$(name).$(SHEXT) --- geant4.9.3.orig/Configure 2009-12-18 18:23:01.000000000 +0100 +++ geant4.9.3.new/Configure 2010-01-26 11:42:43.000000000 +0100 @@ -657,19 +657,6 @@ ;; esac -: Sanity checks -case "$fastread$alldone" in -yescontyes|yesexityes) ;; -*) - if test "x$g4query_conf" != "xyes" ; then - if test ! -t 0; then - echo "Say 'sh Configure', not 'sh &1 case "$silent" in true) exec 1>/dev/null;;