academic/OpenVSP: Fix build.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 16 insertions, 19 deletions

diff --git a/academic/OpenVSP/OpenVSP.SlackBuild b/academic/OpenVSP/OpenVSP.SlackBuild
index dc986d3d6db34..aeba706b14095 100644
--- a/academic/OpenVSP/OpenVSP.SlackBuild
+++ b/academic/OpenVSP/OpenVSP.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for OpenVSP
 
-# Copyright 2022 Lenard Spencer, Orlando, Florida, USA
+# Copyright 2022,2024 Lenard Spencer, Orlando, Florida, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=OpenVSP
 VERSION=${VERSION:-3.35.3}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -38,9 +38,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -70,8 +67,8 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf ${PRGNAM}-${PRGNAM}_$VERSION
-tar -xvf $CWD/${PRGNAM}_$VERSION.tar.gz || tar -xvf $CWD/${PRGNAM}-${PRGNAM}_$VERSION.tar.gz
-cd $PRGNAM-${PRGNAM}_$VERSION
+tar -xvf $CWD/${PRGNAM}-${PRGNAM}_$VERSION.tar.gz
+cd ${PRGNAM}-${PRGNAM}_$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -95,7 +92,7 @@ cd buildlibs
   -DCMAKE_BUILD_TYPE=Release \
   -Wno-dev \
   ../Libraries
-  make
+  make -j1 # Parallel jobs tend to break the build
 
 cd ../build
   cmake \
@@ -105,7 +102,7 @@ cd ../build
     -DCMAKE_INSTALL_PREFIX=/opt/$PRGNAM \
     -DCMAKE_BUILD_TYPE=Release \
     -Wno-dev ..
-  make
+  make -j1 # Parallel jobs tend to break the build
   make install DESTDIR=$PKG
 cd ..
 
diff --git a/academic/OpenVSP/OpenVSP.info b/academic/OpenVSP/OpenVSP.info
index 4c7dfcc61debb..d978524848a65 100644
--- a/academic/OpenVSP/OpenVSP.info
+++ b/academic/OpenVSP/OpenVSP.info
@@ -1,10 +1,10 @@
 PRGNAM="OpenVSP"
 VERSION="3.35.3"
 HOMEPAGE="https://openvsp.org"
-DOWNLOAD="UNSUPPORTED"
-MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/OpenVSP/OpenVSP/archive/OpenVSP_3.35.3/OpenVSP_3.35.3.tar.gz"
-MD5SUM_x86_64="af5c3f99ac3b2b870e3bdcff3b392bd4"
+DOWNLOAD="https://github.com/OpenVSP/OpenVSP/archive/OpenVSP_3.35.3/OpenVSP-OpenVSP_3.35.3.tar.gz"
+MD5SUM="af5c3f99ac3b2b870e3bdcff3b392bd4"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 REQUIRES="fltk"
 MAINTAINER="Lenard Spencer"
 EMAIL="lenardrspencer@gmail.com"
diff --git a/academic/OpenVSP/README b/academic/OpenVSP/README
index 48fa8bcc39ddb..47c61224386db 100644
--- a/academic/OpenVSP/README
+++ b/academic/OpenVSP/README
@@ -8,10 +8,10 @@ others for NASA since the early 1990's.  On January 10 2012, OpenVSP
 was released as an open source project under the NASA Open Source
 Agreement (NOSA) version 1.3.
 
-You can download sample aircraft at http://hangar.openvsp.org.
-
 Requires fltk from Slackware's /extra folder.
 
-NOTE: OpenVSP version 3.35.3 is the last version that will build on
-Slackware 15.0 as newer versions require a newer version of cmake.
-The latest version 3.39.1 will build on current.
+NOTES: 1. OpenVSP version 3.35.3 is the last version that will build
+          on Slackware 15.0 as newer versions require a newer version
+          of cmake.
+       2. OpenVSP will NOT build on -current as of yet (this includes
+          newer versions) because of incompatibilities with GCC 14.
diff --git a/academic/OpenVSP/slack-desc b/academic/OpenVSP/slack-desc
index c7938a8842412..3589a1f6810f4 100644
--- a/academic/OpenVSP/slack-desc
+++ b/academic/OpenVSP/slack-desc
@@ -15,5 +15,5 @@ OpenVSP: engineering analysis.  OpenVSP was released as an open source project
 OpenVSP: under the NASA Open Source Agreement (NOSA) version 1.3.
 OpenVSP:
 OpenVSP:
-OpenVSP: homepage: http://openvsp.org
+OpenVSP: homepage: https://openvsp.org
 OpenVSP: