--- whizard-1.95/scripts/installation/install_whizard-64.orig	2010-12-07 15:56:04.000000000 +0900
+++ whizard-1.95/scripts/installation/install_whizard-64	2012-11-07 21:23:41.000000000 +0900
@@ -1,5 +1,6 @@
 #!/bin/sh
-FILES_FOR_WHIZARD_64=/afs/desy.de/user/b/berggren/public/files-for-whizard-64
+#FILES_FOR_WHIZARD_64=/afs/desy.de/user/b/berggren/public/files-for-whizard-64
+FILES_FOR_WHIZARD_64=/opt/whizard/src/orig
 define_cernlib(){
   remove_motif(){
     # removes the compilation of binaries needing the motif
@@ -69,8 +70,8 @@
     # whizard with gfortran4.4 it works. 
     mkdir bin
     cd bin
-    ln -s `which gfortran44` gfortran
-    ln -s `which gcc44` gcc
+    ln -s `which gfortran` gfortran
+    ln -s `which gcc` gcc
     cd ..
   fi
   cd bin
@@ -171,7 +172,8 @@
   patch_pythia `pwd`
   make
   cd ../lib/
-  mv liblund.a ../../cernlib_64/2005/lib/libpythia${ver3}.a
+  #mv liblund.a ../../cernlib_64/2005/lib/libpythia${ver3}.a
+  mv liblund.a $CERN_ROOT/lib/libpythia${ver3}.a
   cd $here
 }
 define_ocaml(){
@@ -189,7 +191,9 @@
   cd ocaml-${mayor}.${minor}
   if [[ "$1" ==  "install" ]] 
   then
-    ./configure -prefix `pwd`
+    mv -f configure configure.orig
+    sed -e 's/-no-cpp-precomp//' -e's/-arch x86_64//' configure.orig > configure
+    sh configure -prefix `pwd`
     # ( sometimes the make gets a 'Text file busy' error, this is why
     #   it is re-run.  boot/ocamlrun gives an error, but makes the
     #   file available in the the following step)
@@ -215,7 +219,8 @@
   fi
   #  (if you already have ocaml, make sure these are defined correctly)
   export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:`pwd`/lib
-  export PATH=$PATH:`pwd`/bin
+  #export PATH=$PATH:`pwd`/bin
+  export PATH=`pwd`/bin:$PATH
   cd $here
 }
 define_stdhep(){
@@ -234,7 +239,8 @@
   if [[ "$1" ==  "install" ]] 
   then
     export STDHEP_DIR=`pwd`
-    gmake all
+    patch -p1 -s -b < $FILES_FOR_WHIZARD_64/stdhep-${vers}-macosx10.7.patch
+    gmake all MAKE="make F77=$F77"
   fi
   # (if you already have stdhep-64 make sure this is set. Whizard
   # and stdhep itself have different opinions on what this should
@@ -245,8 +251,8 @@
 define_tauola(){
   local here
   here=`pwd`
-  ln -s `which gfortran44` gfortran
-  ln -s `which gcc44` gcc
+  #ln -s `which gfortran44` gfortran
+  #ln -s `which gcc44` gcc
   #
   #  Now, our TAUOLA :
   #
@@ -254,10 +260,25 @@
   then
     tar -xzf $2 
   fi
-  cd tauola_desy/TAUOLA/
+  #--
+  # Darwin
+  #--
+  cd tauola_desy/
+  if [[ "$1" ==  "install" ]] 
+  then
+    for i in `find . -name '*.F'`; do eval "mv $i `dirname $i`/`basename $i .F`_F"; done
+    patch -p1 -s -b < ${FILES_FOR_WHIZARD_64}/tauola_desy-darwin.patch
+  fi
+  cd TAUOLA/
   if [[ "$1" ==  "install" ]] 
   then
     export WHZ=`pwd`/../..
+    #--
+    # Darwin
+    #--
+    cd platform
+    ln -sf make-darwin.inc make.inc
+    cd ..
     #
     #  (make sure make.inc points to the right architecture)
     #
@@ -267,7 +288,7 @@
     cd ..
     # make the rest. There will be an error, but it doesn't
     # matter, it happens after the libraries have been made...
-    bash make_tauola_script
+    sh make_tauola_script
     cd tauola
     make
     mv glib.a libtauola.a
@@ -281,7 +302,7 @@
   cd $here
 }
 define_whizard(){
-  export F95=`which gfortran44`
+  export F95=`which gfortran`
   # (for gfortran, needed for our user.f90 and for a6f. Means that there is
   # no restriction on line-length. The f95 standard defines max line-length
   # to 132, which apearently ifort and lf95 ingnores)
@@ -300,7 +321,7 @@
     if [ -d whizard-${vers} ] 
     then
       cd whizard-${vers}
-      svn update
+      #svn update
     else
       svn co svn+ssh://svn.cern.ch/reps/lcgentools/trunk/Whizard_${vers} whizard-${vers}
     fi
@@ -308,6 +329,7 @@
     #mkdir whizard-${vers}
     #cd whizard-${vers}
     #tar -xzf ../whizard-${vers}.tgz    #
+    chmod 755 configure
     cd $here
   }
   install_lumi_files(){
@@ -319,7 +341,7 @@
     tar -xzf $1
     mkdir /tmp/lumi_linker_directory/
     cd /tmp/lumi_linker_directory/
-    ln -s ${here}/energy_spread/* .
+    ln -sf ${here}/energy_spread/* .
     cd $here
   }
   install_a6f(){
@@ -439,7 +461,9 @@
     local here
     here=`pwd`
     cd whizard-${1}
-    cd a6f/include
+    cd a6f
+    mkdir -p lib bin
+    cd include
     #patch_a6f
     cd $here
   }
@@ -455,21 +479,38 @@
     local here
     here=`pwd`
     cd whizard-$1
+    chmod 755 bin/cat bin/make-depend
     #
     #  and configure: g2c because stdhep is compiled by g77, pytaud.o explicitly
     #  since otherwise the dummy version in pythia will be loaded. I prefere
     #  explicit paths rather than -L -l combinations, which gives less control
     # 
-    ./configure \
-     LIBS=" /usr/lib/gcc/x86_64-redhat-linux/3.4.6/libg2c.a" USERLIBS="$(pwd)/a6f/include/pytaud.o $(pwd)/a6f/lib/libinclude.a $TAUOLALIB/libtauola.a $PHOTOSLIB/libphotos.a"
+    #./configure \
+    # LIBS=" /usr/lib/gcc/x86_64-redhat-linux/3.4.6/libg2c.a" USERLIBS="$(pwd)/a6f/include/pytaud.o $(pwd)/a6f/lib/libinclude.a $TAUOLALIB/libtauola.a $PHOTOSLIB/libphotos.a"
+    ./configure --disable-metapost \
+     LIBS="" USERLIBS="$(pwd)/a6f/include/pytaud.o $(pwd)/a6f/lib/libinclude.a $TAUOLALIB/libtauola.a $PHOTOSLIB/libphotos.a"
+    make distclean
+    ./configure --disable-metapost \
+     LIBS="" USERLIBS="$(pwd)/a6f/include/pytaud.o $(pwd)/a6f/lib/libinclude.a $TAUOLALIB/libtauola.a $PHOTOSLIB/libphotos.a"
     #
     #   make our stuff. the kinds and limits modules must exist before 
     #
+    mkdir -p include lib bin
     cd kinds-src
     make install
     cd ..
+    cd vamp-src
+    make install
+    cd ..
     cd whizard-src
     $F95 $FCFLAGS  -I../include -c limits.f90
+    $F95 $FCFLAGS  -I../include -c bytes.f90
+    $F95 $FCFLAGS  -I../include -c mpi90.f90
+    $F95 $FCFLAGS  -I../include -c diagnostics.f90
+    cp -p limits.o bytes.o diagnostics.o mpi90.o ../a6f/lib/
+    cp -p limits.o bytes.o diagnostics.o mpi90.o ../include/
+    cp -p limits.mod bytes.mod diagnostics.mod mpi90.mod ../a6f/include/
+    cp -p limits.mod bytes.mod diagnostics.mod mpi90.mod ../include/
     cd ..
     make -C a6f/include/  A6F=.. WHIZ=../.. WH195=../.. SHELL=/bin/bash
     #  
@@ -507,11 +548,11 @@
   install_a6f ${whizvers}
   #install_our_user  ${whizvers}  ${FILES_FOR_WHIZARD_64}/user.f90-for-whiz${vers}
   compile_whizard ${whizvers}
-  build_whizard_models ${whizvers} \
-          ${FILES_FOR_WHIZARD_64}/whizard.prc-msugra_1  \
-          ${FILES_FOR_WHIZARD_64}/whizard.prc.NMSSM \
-          ${FILES_FOR_WHIZARD_64}/whizard.prc-point5 \
-          ${FILES_FOR_WHIZARD_64}/whizard.in-msugra-1
+  #build_whizard_models ${whizvers} \
+  #        ${FILES_FOR_WHIZARD_64}/whizard.prc-msugra_1  \
+  #        ${FILES_FOR_WHIZARD_64}/whizard.prc.NMSSM \
+  #        ${FILES_FOR_WHIZARD_64}/whizard.prc-point5 \
+  #        ${FILES_FOR_WHIZARD_64}/whizard.in-msugra-1
   cd $here
 }
 # If you are brave, remove the "#---" and run it all.
--- whizard-1.95/whizard-1.95/omega-src/bundle/Makefile.in.orig	2010-12-01 12:11:00.000000000 +0900
+++ whizard-1.95/whizard-1.95/omega-src/bundle/Makefile.in	2012-11-07 20:59:52.000000000 +0900
@@ -198,7 +198,7 @@
 clean_caml clean: clean_cache
 
 clean_cache:
-	find -name 'omega_cache_*' -exec rm -f '{}' ';'
+	find . -name 'omega_cache_*' -exec rm -f '{}' ';'
 
 realclean: clean
 	for d in $(SUBDIRS); \