diff -uNr src.ORIG/config/MacOSX.cf src/config/MacOSX.cf
--- src.ORIG/config/MacOSX.cf	2016-02-08 21:18:52.000000000 +0900
+++ src/config/MacOSX.cf	2016-02-08 21:46:09.000000000 +0900
@@ -74,8 +74,8 @@
 
 # define BuildXvExt     NO
 #define OptimizedCDebugFlags -O0 -g -pipe
-#define ExtraLoadFlags -L/usr/X11R6/lib \
--L/usr/osxws/lib -lgfortran -Wl,-no_pie
+#define ExtraLoadFlags -L/opt/X11/lib \
+-L/opt/osxws/lib -lgfortran -Wl,-no_pie
 
 #define BuildExamples YES
 
@@ -88,7 +88,7 @@
 #define HasVoidSignalReturn YES
 
 #ifndef DependFlags
-#define DependFlags -I/usr/include/ansi -I/usr/include/bsd
+#define DependFlags -I/opt/osxws/include/compat -I/opt/osxws/include
 #endif
 
 #define InstallCmd	install	/* unlink old */
@@ -121,7 +121,7 @@
 #define CcCmd cc
 #endif
 
-#define CppCmd        /usr/bin/cpp
+#define CppCmd        /opt/osxws/bin/cpp
 
 #include <MacOSX.rules>
 #include <xf86.rules>
@@ -150,12 +150,12 @@
 #define CERNLIB_GFORTRAN
 #define CERNLIB_QMLXIA64
 
-#define X11Includes             -I/usr/X11R6/include
+#define X11Includes             -I/opt/X11/include
 
 /*
  *  Create a Make Variable to allow building with/out Motif
  */
-#define MotifIncludes		-I/usr/X11R6/include
+#define MotifIncludes		-I/opt/X11/include -I/opt/X11/include/freetype2
 #undef MotifDependantMakeVar
 #define MotifDependantMakeVar(variable,value)                           @@\
 ifneq ($(strip $(HAVE_MOTIF)),)                                         @@\
diff -uNr src.ORIG/scripts/cernlib src/scripts/cernlib
--- src.ORIG/scripts/cernlib	2016-02-08 21:18:52.000000000 +0900
+++ src/scripts/cernlib	2016-02-08 21:29:30.000000000 +0900
@@ -116,8 +116,8 @@
 	       [ -d /usr/X11R6/lib ] && SYSGMOTIF="-L/usr/X11R6/lib -lXm -lXt -lXp -lXext -lX11"
 	       [ `uname -m` = ppc ] && SYSGMOTIF="$SYSGMOTIF -lSM -lICE -lXpm"
 	       ;;
-      Darwin)  [ -d /usr/X11R6/lib ] && SYSGX11="-L/usr/X11R6/lib -lX11"
-	       [ -d /usr/X11R6/lib ] && SYSGMOTIF="-L/usr/X11R6/lib -lXm -lXt -lXp -lXext -lX11 -lSM -lICE -lXpm"
+      Darwin)  [ -d /opt/X11/lib ] && SYSGX11="-L/opt/X11/lib -lX11"
+	       [ -d /opt/X11/lib ] && SYSGMOTIF="-L/opt/X11/lib -lXm -lXt -lXp -lXext -lX11 -lSM -lICE -lXpm"
 	       ;;
       NeXT)    SYSGX11="/usr/lib/X11/libX11.r" ;
                SYSGMOTIF="-lXm -lXt /usr/lib/X11/libX11.r" ;;
@@ -216,7 +216,7 @@
         if [ x`echo $CERNLIB | grep -c kernlib` != x0 ]; then
 	      CERNLIB=`echo $CERNLIB | sed -e 's;kernlib;packlib;g'`
         fi
-	CERNLIB1="$CERNLIB -L/usr/osxws/lib -lcompat -ldl"
+	CERNLIB1="$CERNLIB -L/opt/osxws/lib -lcompat -ldl"
      fi
   fi