Index: .bashrc
===================================================================
--- .bashrc	(revision 48)
+++ .bashrc	(revision 50)
@@ -182,9 +182,12 @@
 export MICO_VERSION=2.3.12
 export MICO_PATH=$FOAM_SRC/mico-$MICO_VERSION
 export MICO_ARCH_PATH=$MICO_PATH/platforms/$WM_OPTIONS
+if [ $WM_ARCH == "darwin" ]	    
+then
+    export MICO_ARCH_PATH=/opt/local
+fi
 export PATH=$MICO_ARCH_PATH/bin:$PATH
 
-
 # FoamX
 # ~~~~~
 export FOAMX_PATH=$FOAM_UTILITIES/preProcessing/FoamX
Index: .OpenFOAM-1.4/apps/paraview/bashrc
===================================================================
--- .OpenFOAM-1.4/apps/paraview/bashrc	(revision 48)
+++ .OpenFOAM-1.4/apps/paraview/bashrc	(revision 50)
@@ -44,16 +44,21 @@
 #    export PATH=$PATH:$CMAKE_HOME/bin
 #fi
 
-export ParaView_VERSION=2.4.3
+export ParaView_VERSION=2.6.1
 
 export ParaView_INST_DIR=$WM_PROJECT_INST_DIR/$WM_ARCH/paraview-$ParaView_VERSION
-export ParaView_DIR=$ParaView_INST_DIR/lib/paraview-2.4
+export ParaView_DIR=$ParaView_INST_DIR/lib/paraview-2.6
 
 if [ -r $ParaView_INST_DIR ]; then
     export PV_INTERFACE_PATH=$FOAM_UTILITIES/postProcessing/graphics/PVFoamReader/PVFoamReader/Make
 
     export PATH=$ParaView_INST_DIR/bin:$PATH
     export LD_LIBRARY_PATH=${ParaView_INST_DIR}/lib:${ParaView_INST_DIR}/lib/vtk:${LD_LIBRARY_PATH}
+
+    if [ $WM_ARCH == "darwin" ]	    
+    then
+	export DYLD_LIBRARY_PATH=${ParaView_INST_DIR}/lib:${ParaView_INST_DIR}/lib/vtk:${DYLD_LIBRARY_PATH}
+    fi
 fi
 
 if [ -r $ParaView_DIR ]; then
Index: applications/utilities/postProcessing/graphics/PVFoamReader/Allwmake
===================================================================
--- applications/utilities/postProcessing/graphics/PVFoamReader/Allwmake	(revision 48)
+++ applications/utilities/postProcessing/graphics/PVFoamReader/Allwmake	(revision 50)
@@ -3,5 +3,10 @@
 
 if [ "$ParaView_DIR" -a -r $ParaView_DIR ] ; then
     wmake libso vtkFoam
-    (cd PVFoamReader; mkdir -p Make/$WM_OPTIONS > /dev/null 2>&1; cd Make/$WM_OPTIONS; cmake ../..; make)
+    if [ $WM_ARCH == "darwin" ]     
+    then
+	(cd PVFoamReader; mkdir -p Make/$WM_OPTIONS > /dev/null 2>&1; cd Make/$WM_OPTIONS; cmake ../..; sed -i bak -e 's/.*/& -undefined dynamic_lookup/' CMakeFiles/PVFoamReader.dir/link.txt; make)
+    else
+	(cd PVFoamReader; mkdir -p Make/$WM_OPTIONS > /dev/null 2>&1; cd Make/$WM_OPTIONS; cmake ../..; make)
+    fi
 fi
Index: applications/utilities/preProcessing/FoamX/C++/FoamXLib/ITypeDescriptorImpl.C
===================================================================
--- applications/utilities/preProcessing/FoamX/C++/FoamXLib/ITypeDescriptorImpl.C	(revision 48)
+++ applications/utilities/preProcessing/FoamX/C++/FoamXLib/ITypeDescriptorImpl.C	(revision 50)
@@ -252,7 +252,7 @@
             for (label i=0; i<valueList_.size(); i++)
             {
                 valueList_[i].setType(type_);
-                valueList_[i].setValue(anyList[ulong(i)]);
+                valueList_[i].setValue(anyList[(unsigned long)(i)]);
             }
         }
         else
Index: bin/patchTool
===================================================================
--- bin/patchTool	(revision 48)
+++ bin/patchTool	(revision 50)
@@ -45,7 +45,7 @@
 # getValue file var
 #   Prints value of 'var=value' in file.
 getValue() {
-    val=`grep "^[ \t]*$2[ \t]*=" $1 | sed -e "s/^[ \t]*$2[ \t]*=//" | head -1`
+    val=`grep "^[ \t]*$2[ \t]*=" $1 | sed -e "s/^[ \t]*$2[ \t]*=//" | head -n 1`
     if [ -z "$val" ]; then
         return 1
     fi
@@ -56,7 +56,7 @@
 # getPID processName
 # Prints pid of named process (looks at users processes only)
 getPID() {
-    ps -u $LOGNAME -o 'pid,args' | fgrep "$1" | fgrep -v grep | head -1 | awk '{ print $1 }'
+    ps -u $LOGNAME -o 'pid,args' | fgrep "$1" | fgrep -v grep | head -n 1 | awk '{ print $1 }'
 }
 
 # cleanup
Index: bin/FoamX
===================================================================
--- bin/FoamX	(revision 48)
+++ bin/FoamX	(revision 50)
@@ -46,7 +46,7 @@
 # getValue file var
 #   Prints value of 'var=value' in file.
 getValue() {
-    val=`grep "^[ \t]*$2[ \t]*=" $1 | sed -e "s/^[ \t]*$2[ \t]*=//" | head -1`
+    val=`grep "^[ \t]*$2[ \t]*=" $1 | sed -e "s/^[ \t]*$2[ \t]*=//" | head -n 1`
     if [ -z "$val" ]; then
         return 1
     fi
Index: bin/killFoamX
===================================================================
--- bin/killFoamX	(revision 48)
+++ bin/killFoamX	(revision 50)
@@ -55,7 +55,7 @@
 # getValue file var
 #   Prints value of 'var=value' in file.
 getValue() {
-    val=`grep "^[ \t]*$2[ \t]*=" $1 | sed -e "s/^[ \t]*$2[ \t]*=//" | head -1`
+    val=`grep "^[ \t]*$2[ \t]*=" $1 | sed -e "s/^[ \t]*$2[ \t]*=//" | head -n 1`
     if [ -z "$val" ]; then
         return 1
     fi
@@ -67,7 +67,7 @@
 # getPID processName
 # Prints pid of named process (looks at users processes only)
 getPID() {
-    ps -u $LOGNAME -o 'pid,args' | fgrep " $1" | fgrep -v grep | head -1 | awk '{ print $1 }'
+    ps -u $LOGNAME -o 'pid,args' | fgrep " $1" | fgrep -v grep | head -n 1 | awk '{ print $1 }'
 }
 
 # myKillAll processName
@@ -122,7 +122,7 @@
 fi
 myIOP="inet:$HOSTNAME:$HOSTPORT"
 
-NAMESERV_THREADS=`ps -u $LOGNAME -o 'pid,args' | fgrep " nsd" | fgrep "$myIOP" | fgrep -v fgrep | head -1 | awk '{ print $1 }'`
+NAMESERV_THREADS=`ps -u $LOGNAME -o 'pid,args' | fgrep " nsd" | fgrep "$myIOP" | fgrep -v fgrep | head -n 1 | awk '{ print $1 }'`
 # Kill the MICO nameserver if it is running
 if [ "$NAMESERV_THREADS" ]
 then
Index: bin/foamEndJob
===================================================================
--- bin/foamEndJob	(revision 48)
+++ bin/foamEndJob	(revision 50)
@@ -49,7 +49,7 @@
 # getNumberedLine dictionary entry
 # Prints dictionary entry line + lineno
 getNumberedLine() {
-    grep -n "^[ \t]*$2[ \t]" $1 | grep -v '^//' | head -1
+    grep -n "^[ \t]*$2[ \t]" $1 | grep -v '^//' | head -n 1
 }
 
 # getLine dictionary entry
@@ -135,7 +135,7 @@
 
 # newerFile file1 file2
 newerFile() {
-    latest=`ls -1 -t $1 $2 2> /dev/null | head -1`
+    latest=`ls -1 -t $1 $2 2> /dev/null | head -n 1`
     if [ "$latest" = $1 ]; then
         return 0
     else
Index: bin/foamInstallationTest
===================================================================
--- bin/foamInstallationTest	(revision 48)
+++ bin/foamInstallationTest	(revision 50)
@@ -220,11 +220,11 @@
     case $1 in
         icoFoam) VERSION=`$1 2>&1 | grep ' Version:' | sed -e 's/.*Version:/Version:/' | cut -d" " -f2`;;
         gcc) VERSION=`$1 -v 2>&1 | grep 'version' | cut -d" " -f3`;;
-        gtar) VERSION=`$APP_PATH --version | head -1`;;
+        gtar) VERSION=`$APP_PATH --version | head -n 1`;;
         gzip)
             case $OS in
             SunOS) VERSION=`$1 --version 2>&1 | grep gzip | cut -d" " -f2`;;
-            *) VERSION=`$1 --version | head -1 | cut -d" " -f2`;;
+            *) VERSION=`$1 --version | head -n 1 | cut -d" " -f2`;;
             esac
             ;;
         dx) unset DXEXEC; VERSION=`$1 -version 2>&1 | grep 'Open ' | grep 'Script' | cut -d" " -f6`;;
Index: bin/runFoamXHB
===================================================================
--- bin/runFoamXHB	(revision 48)
+++ bin/runFoamXHB	(revision 50)
@@ -47,7 +47,7 @@
 # getValue file var
 #   Prints value of 'var=value' in file.
 getValue() {
-    val=`grep "^[ \t]*$2[ \t]*=" $1 | sed -e "s/^[ \t]*$2[ \t]*=//" | head -1`
+    val=`grep "^[ \t]*$2[ \t]*=" $1 | sed -e "s/^[ \t]*$2[ \t]*=//" | head -n 1`
     if [ -z "$val" ]; then
         return 1
     fi
@@ -58,7 +58,7 @@
 # getPID processName
 # Prints pid of named process (looks at users processes only)
 getPID() {
-    ps -u $LOGNAME -o 'pid,args' | fgrep " $1" | fgrep -v fgrep | head -1 | awk '{ print $1 }'
+    ps -u $LOGNAME -o 'pid,args' | fgrep " $1" | fgrep -v fgrep | head -n 1 | awk '{ print $1 }'
 }
 
 # cleanup
@@ -69,7 +69,7 @@
     #- reset traps
     trap 0 2 3 15
 
-    NAMESERV_THREADS=`ps -u $LOGNAME -o 'pid,args' | fgrep " nsd" | fgrep "$myIOP" | fgrep -v fgrep | head -1 | awk '{ print $1 }'`
+    NAMESERV_THREADS=`ps -u $LOGNAME -o 'pid,args' | fgrep " nsd" | fgrep "$myIOP" | fgrep -v fgrep | head -n 1 | awk '{ print $1 }'`
     # Kill the MICO nameserver if it is running
     if [ "$NAMESERV_THREADS" ]; then
 	    echo "`basename $0`: Killing name server nsd(pid $NAMESERV_THREADS)."