1 files changed, 15 insertions, 20 deletions
diff --git a/graphics/OpenCASCADE/OpenCASCADE.SlackBuild b/graphics/OpenCASCADE/OpenCASCADE.SlackBuild
index 194ded8a47..2da57b1fb5 100644
--- a/graphics/OpenCASCADE/OpenCASCADE.SlackBuild
+++ b/graphics/OpenCASCADE/OpenCASCADE.SlackBuild
@@ -23,11 +23,11 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# revision date: 2012/01/03
+# revision date: 2013/11/17
 
 PRGNAM=OpenCASCADE
-VERSION=${VERSION:-6.5.2}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-6.6.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 SRCVERSION=$( echo $VERSION | sed "s/\.//g" )
@@ -68,25 +68,20 @@ rm -rf $PRGNAM-$VERSION
 # Source untars in current directory...
 mkdir $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
-tar xvf $CWD/${PRGNAM}${SRCVERSION}.tar.gz
+tar xvf $CWD/${PRGNAM}${SRCVERSION}.tgz
 chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Patch source for newer gcc versions
-#  (avoids "not declared in this scope" errors)
-patch -p1 < $CWD/newgcc.patch
-
-# Fix for newer fgtl versions
-#  (based on earlier patch from openSUSE)
-patch -p1 < $CWD/OpenCASCADE-6.5.2_ftgl.patch
-
-# Change to the directory where we'll build from
 cd ros
 
 autoreconf -f -i
 
 CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS -fpermissive" \
+CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -125,25 +120,25 @@ mkdir -p $PKG/usr/src/$PRGNAM
 ) || exit 1
 
 # Remove unnecessary (and confusing) files
-rm -r $PKG/usr/{lin,Linux,env_DRAW.sh}
+rm -r $PKG/usr/Linux $PKG/usr/*.sh
 
 mkdir -p $PKG/usr/share/$PRGNAM
-cp -a data samples $PKG/usr/share/$PRGNAM
+cp -a ros/data ros/samples $PKG/usr/share/$PRGNAM
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  README LICENSE ros/README.txt \
+  ros/LICENSE ros/README \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 # If you want *all* documentation in the package, use INSTALL_FULL_DOCS=yes
-#   but be warned: we're talking about ~ 600MB of documentation...
+#   but be warned: we're talking about ~ 520MB of documentation...
 if [ "${INSTALL_FULL_DOCS:-no}" = "yes" ]; then
   cp -a \
-    doc/* \
+    ros/doc/* \
     $PKG/usr/doc/$PRGNAM-$VERSION
 fi