fixes for netbsd. clarify readme.

4 files changed, 56 insertions, 17 deletions

diff --git a/README.md b/README.md
index 6d2a631..c9a7779 100644
--- a/README.md
+++ b/README.md
@@ -152,7 +152,9 @@ can download and build dependencies into $HOME/openscad_deps as follows:
     source ./scripts/setenv-unibuild.sh
     ./scripts/uni-build-dependencies.sh
 
-This may take several hours. After completion, again check dependencies
+This may take an hour or two. Note it will not build huge deps like gcc 
+or qt, only the main ones (boost, CGAL, opencsg, etc). After completion, 
+again check dependencies
 
     source ./scripts/setenv-unibuild.sh
     ./scripts/check-dependencies.sh
diff --git a/scripts/check-dependencies.sh b/scripts/check-dependencies.sh
index 0c69124..b60fae6 100755
--- a/scripts/check-dependencies.sh
+++ b/scripts/check-dependencies.sh
@@ -107,6 +107,10 @@ qt4_sysver()
   if [ ! -e $qt4path ]; then
     qt4path=$1/include/QtCore/qglobal.h
   fi
+  if [ ! -e $qt4path ]; then
+    # netbsd
+    qt4path=$1/qt4/include/QtCore/qglobal.h 
+  fi
   if [ ! -e $qt4path ]; then return; fi
   qt4ver=`grep 'define  *QT_VERSION_STR  *' $qt4path | awk '{print $3}'`
   qt4ver=`echo $qt4ver | sed s/'"'//g`
@@ -169,11 +173,21 @@ cmake_sysver()
 
 make_sysver()
 {
+  make_sysver_tmp=
   binmake=$1/bin/make
   if [ -x $1/bin/gmake ]; then binmake=$1/bin/gmake ;fi
   if [ ! -x $binmake ]; then return ;fi
-  make_sysver_result=`$binmake --version 2>&1 | grep -i 'gnu make' | sed s/"[^0-9.]"/" "/g`
-  if [ ! "`echo $make_sysver_result | grep [0-9]`" ]; then return; fi
+  make_sysver_tmp=`$binmake --version 2>&1`
+
+  debug finding gnu make: raw make response: $make_sysver_tmp
+  if [ ! "`echo $make_sysver_tmp | grep -i gnu`" ]; then
+    return;
+  fi
+
+  make_sysver_tmp=`$binmake --version 2>&1 | grep -i 'gnu make' | sed s/"[^0-9.]"/" "/g`
+  if [ "`echo $make_sysver_tmp | grep [0-9]`" ]; then
+    make_sysver_result=$make_sysver_tmp
+  fi
 }
 
 bash_sysver()
@@ -402,10 +416,13 @@ find_min_version()
   fmvdep=$1
   get_minversion_from_readme $fmvdep
   fmvtmp=$get_minversion_from_readme_result
+
+  # items not included in README.md
   if [ $fmvdep = "git" ]; then fmvtmp=1.5 ; fi
   if [ $fmvdep = "curl" ]; then fmvtmp=6 ; fi
   if [ $fmvdep = "make" ]; then fmvtmp=3 ; fi
   if [ $fmvdep = "python" ]; then fmvtmp=2 ; fi
+
   find_min_version_result=$fmvtmp
 }
 
@@ -574,7 +591,8 @@ checkargs()
 main()
 {
   deps="qt4 cgal gmp cmake mpfr boost opencsg glew eigen gcc"
-  deps="$deps python bison flex git curl make"
+  deps="$deps bison flex git curl make"
+  #deps="$deps python" # needs work, only needed for tests
   #deps="$deps imagemagick" # needs work, only needed for tests
   #deps="eigen glew opencsg" # debug
   pretty_print title
diff --git a/scripts/setenv-unibuild.sh b/scripts/setenv-unibuild.sh
index 5462983..e7fe614 100644
--- a/scripts/setenv-unibuild.sh
+++ b/scripts/setenv-unibuild.sh
@@ -23,6 +23,7 @@ setenv_common()
  fi
  DEPLOYDIR=$BASEDIR
 
+ export BASEDIR
  export PATH=$BASEDIR/bin:$PATH
  export LD_LIBRARY_PATH=$DEPLOYDIR/lib:$DEPLOYDIR/lib64
  export LD_RUN_PATH=$DEPLOYDIR/lib:$DEPLOYDIR/lib64
@@ -51,6 +52,20 @@ setenv_freebsd()
  QTDIR=/usr/local/share/qt4
 }
 
+setenv_netbsd()
+{
+ setenv_common
+ QMAKESPEC=netbsd-g++
+ QTDIR=/usr/pkg/qt4
+ PATH=/usr/pkg/qt4/bin:$PATH
+ LD_LIBRARY_PATH=/usr/pkg/qt4/lib:$LD_LIBRARY_PATH
+
+ export QMAKESPEC
+ export QTDIR
+ export PATH
+ export LD_LIBRARY_PATH
+}
+
 setenv_linux_clang()
 {
  export CC=clang
@@ -69,4 +84,8 @@ if [ "`uname | grep -i 'linux\|debian'`" ]; then
  fi
 elif [ "`uname | grep -i freebsd`" ]; then
  setenv_freebsd
+elif [ "`uname | grep -i netbsd`" ]; then
+ setenv_netbsd
+else
+ echo unknown system. edit $0
 fi
diff --git a/scripts/uni-build-dependencies.sh b/scripts/uni-build-dependencies.sh
index 17f1be2..804eaa5 100755
--- a/scripts/uni-build-dependencies.sh
+++ b/scripts/uni-build-dependencies.sh
@@ -28,7 +28,7 @@ build_git()
   cd $BASEDIR/src
   rm -rf git-$version
   if [ ! -f git-$version.tar.gz ]; then
-    curl -O http://git-core.googlecode.com/files/git-$version.tar.gz
+    curl --insecure -O http://git-core.googlecode.com/files/git-$version.tar.gz
   fi
   tar zxf git-$version.tar.gz
   cd git-$version
@@ -44,7 +44,7 @@ build_cmake()
   cd $BASEDIR/src
   rm -rf cmake-$version
   if [ ! -f cmake-$version.tar.gz ]; then
-    curl -O http://www.cmake.org/files/v2.8/cmake-$version.tar.gz
+    curl --insecure -O http://www.cmake.org/files/v2.8/cmake-$version.tar.gz
   fi
   tar zxf cmake-$version.tar.gz
   cd cmake-$version
@@ -80,7 +80,7 @@ build_gmp()
   cd $BASEDIR/src
   rm -rf gmp-$version
   if [ ! -f gmp-$version.tar.bz2 ]; then
-    curl -O ftp://ftp.gmplib.org/pub/gmp-$version/gmp-$version.tar.bz2
+    curl --insecure -O ftp://ftp.gmplib.org/pub/gmp-$version/gmp-$version.tar.bz2
   fi
   tar xjf gmp-$version.tar.bz2
   cd gmp-$version
@@ -97,7 +97,7 @@ build_mpfr()
   cd $BASEDIR/src
   rm -rf mpfr-$version
   if [ ! -f mpfr-$version.tar.bz2 ]; then
-    curl -O http://www.mpfr.org/mpfr-$version/mpfr-$version.tar.bz2
+    curl --insecure -O http://www.mpfr.org/mpfr-$version/mpfr-$version.tar.bz2
   fi
   tar xjf mpfr-$version.tar.bz2
   cd mpfr-$version
@@ -116,7 +116,7 @@ build_boost()
   cd $BASEDIR/src
   rm -rf boost_$bversion
   if [ ! -f boost_$bversion.tar.bz2 ]; then
-    curl -LO http://downloads.sourceforge.net/project/boost/boost/$version/boost_$bversion.tar.bz2
+    curl --insecure -LO http://downloads.sourceforge.net/project/boost/boost/$version/boost_$bversion.tar.bz2
   fi
   tar xjf boost_$bversion.tar.bz2
   cd boost_$bversion
@@ -147,11 +147,11 @@ build_cgal()
   rm -rf CGAL-$version
   if [ ! -f CGAL-$version.tar.gz ]; then
     #4.0.2
-    curl -O https://gforge.inria.fr/frs/download.php/31174/CGAL-$version.tar.bz2
-    # 4.0 curl -O https://gforge.inria.fr/frs/download.php/30387/CGAL-$version.tar.gz
-    # 3.9 curl -O https://gforge.inria.fr/frs/download.php/29125/CGAL-$version.tar.gz
-    # 3.8 curl -O https://gforge.inria.fr/frs/download.php/28500/CGAL-$version.tar.gz
-    # 3.7 curl -O https://gforge.inria.fr/frs/download.php/27641/CGAL-$version.tar.gz
+    curl --insecure -O https://gforge.inria.fr/frs/download.php/31174/CGAL-$version.tar.bz2
+    # 4.0 curl --insecure -O https://gforge.inria.fr/frs/download.php/30387/CGAL-$version.tar.gz
+    # 3.9 curl --insecure -O https://gforge.inria.fr/frs/download.php/29125/CGAL-$version.tar.gz
+    # 3.8 curl --insecure -O https://gforge.inria.fr/frs/download.php/28500/CGAL-$version.tar.gz
+    # 3.7 curl --insecure -O https://gforge.inria.fr/frs/download.php/27641/CGAL-$version.tar.gz
   fi
   tar jxf CGAL-$version.tar.bz2
   cd CGAL-$version
@@ -171,7 +171,7 @@ build_glew()
   cd $BASEDIR/src
   rm -rf glew-$version
   if [ ! -f glew-$version.tgz ]; then
-    curl -LO http://downloads.sourceforge.net/project/glew/glew/$version/glew-$version.tgz
+    curl --insecure -LO http://downloads.sourceforge.net/project/glew/glew/$version/glew-$version.tgz
   fi
   tar xzf glew-$version.tgz
   cd glew-$version
@@ -213,7 +213,7 @@ build_opencsg()
   cd $BASEDIR/src
   rm -rf OpenCSG-$version
   if [ ! -f OpenCSG-$version.tar.gz ]; then
-    curl -O http://www.opencsg.org/OpenCSG-$version.tar.gz
+    curl --insecure -O http://www.opencsg.org/OpenCSG-$version.tar.gz
   fi
   tar xzf OpenCSG-$version.tar.gz
   cd OpenCSG-$version
@@ -265,7 +265,7 @@ build_eigen()
   fi
   rm -rf ./$EIGENDIR
   if [ ! -f eigen-$version.tar.bz2 ]; then
-    curl -LO http://bitbucket.org/eigen/eigen/get/$version.tar.bz2
+    curl --insecure -LO http://bitbucket.org/eigen/eigen/get/$version.tar.bz2
     mv $version.tar.bz2 eigen-$version.tar.bz2
   fi
   tar xjf eigen-$version.tar.bz2