Merge branch 'master' of github.com:openscad/openscad

Conflicts:
	scripts/linux-build-dependencies.sh

3 files changed, 40 insertions, 1 deletions

diff --git a/scripts/freebsd-build-dependencies.sh b/scripts/freebsd-build-dependencies.sh
new file mode 100755
index 0000000..4ea61de
--- /dev/null
+++ b/scripts/freebsd-build-dependencies.sh
@@ -0,0 +1,28 @@
+#!/usr/local/bin/bash -e
+
+echo "Tested on FreeBSD 9. Please see README.md for info on older systems."
+
+if [ "`pkg_info | grep -i cgal `" ]; then
+	echo Stopping. Please remove any CGAL packages you have installed and restart
+	exit
+fi
+
+if [ "`pkg_info | grep -i opencsg`" ]; then
+	echo Stopping. Please remove any OpenCSG packages you have installed and restart
+	exit
+fi
+
+OPENSCADDIR=$PWD
+if [ ! -f $OPENSCADDIR/openscad.pro ]; then
+  echo "Must be run from the OpenSCAD source root directory"
+  exit 0
+fi
+
+. ./scripts/setenv-freebsdbuild.sh
+
+pkg_add -r bison boost-libs cmake git bash eigen2 flex gmake gmp mpfr 
+pkg_add -r xorg libGLU libXmu libXi xorg-vfbserver glew
+pkg_add -r qt4-corelib qt4-gui qt4-moc qt4-opengl qt4-qmake qt4-rcc qt4-uic
+
+BASEDIR=/usr/local ./scripts/linux-build-dependencies.sh cgal-use-sys-libs
+BASEDIR=/usr/local ./scripts/linux-build-dependencies.sh opencsg
diff --git a/scripts/linux-build-dependencies.sh b/scripts/linux-build-dependencies.sh
index be27d2a..a9dbbc5 100755
--- a/scripts/linux-build-dependencies.sh
+++ b/scripts/linux-build-dependencies.sh
@@ -207,6 +207,10 @@ build_opencsg()
 	  fi
 	fi
 
+  if [ `uname | grep FreeBSD` ]; then
+    sed -ibak s/X11R6/local/g src/Makefile
+   fi
+
   if [ "`command -v qmake-qt4`" ]; then
     OPENCSG_QMAKE=qmake-qt4
   else
@@ -225,6 +229,7 @@ build_opencsg()
 	fi
 
   make
+
   cp -av lib/* $DEPLOYDIR/lib
   cp -av include/* $DEPLOYDIR/include
   cd $OPENSCADDIR
@@ -267,7 +272,7 @@ if [ ! $NUMCPU ]; then
 fi
 
 if [ ! -d $BASEDIR/bin ]; then
-  mkdir --parents $BASEDIR/bin
+  mkdir -p $BASEDIR/bin
 fi
 
 echo "Using basedir:" $BASEDIR
diff --git a/scripts/setenv-freebsdbuild.sh b/scripts/setenv-freebsdbuild.sh
new file mode 100644
index 0000000..49f1783
--- /dev/null
+++ b/scripts/setenv-freebsdbuild.sh
@@ -0,0 +1,6 @@
+# run with '. ./scripts/setenv-freebsdbuild.sh'
+
+# use in conjuction with freebsd-build-dependencies.sh
+
+QMAKESPEC=freebsd-g++
+QTDIR=/usr/local/share/qt4