From 3519f9f5c56bc484435beea87ec8f18be09fa4ef Mon Sep 17 00:00:00 2001
From: Hunter Sezen <ovariegata@yahoo.com>
Date: Thu, 7 Sep 2017 21:59:59 +0700
Subject: libraries/CoinMP: Fix path.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 libraries/CoinMP/CoinMP.SlackBuild |  21 ++++++++++-----------
 libraries/CoinMP/CoinMP.info       |   2 +-
 libraries/CoinMP/destdir.diff.gz   | Bin 0 -> 264 bytes
 3 files changed, 11 insertions(+), 12 deletions(-)
 create mode 100644 libraries/CoinMP/destdir.diff.gz

(limited to 'libraries')

diff --git a/libraries/CoinMP/CoinMP.SlackBuild b/libraries/CoinMP/CoinMP.SlackBuild
index e5c6fc7896..45774667f7 100644
--- a/libraries/CoinMP/CoinMP.SlackBuild
+++ b/libraries/CoinMP/CoinMP.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for CoinMP
 
-# Copyright 2015 Hunter Sezen California, USA
+# Copyright 2015, 2017 Hunter Sezen California, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,12 +24,12 @@
 
 PRGNAM=CoinMP
 VERSION=${VERSION:-1.8.3}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -54,7 +54,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e
+set -eu
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -69,6 +69,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# Fix the $DESTDIR
+zcat $CWD/destdir.diff.gz | patch -p1
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -82,12 +85,8 @@ make install DESTDIR=$PKG
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-# not sure why these are put here, but lets move them
-mv $PKG$PKG/usr/share/coin/doc/CoinMP/* $PKG/usr/share/coin/doc/CoinMP
-rm -rf $PKG/tmp
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS INSTALL LICENSE README $PKG/usr/doc/$PRGNAM-$VERSION
+mv $PKG/usr/share/coin/doc $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/libraries/CoinMP/CoinMP.info b/libraries/CoinMP/CoinMP.info
index 23e40cb119..3be30e85ec 100644
--- a/libraries/CoinMP/CoinMP.info
+++ b/libraries/CoinMP/CoinMP.info
@@ -1,7 +1,7 @@
 PRGNAM="CoinMP"
 VERSION="1.8.3"
 HOMEPAGE="https://projects.coin-or.org/CoinMP"
-DOWNLOAD="http://www.coin-or.org/download/source/CoinMP/CoinMP-1.8.3.tgz"
+DOWNLOAD="https://www.coin-or.org/download/source/CoinMP/CoinMP-1.8.3.tgz"
 MD5SUM="0a1e94502a6909e1afb800af6934f022"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/libraries/CoinMP/destdir.diff.gz b/libraries/CoinMP/destdir.diff.gz
new file mode 100644
index 0000000000..42e330790b
Binary files /dev/null and b/libraries/CoinMP/destdir.diff.gz differ
-- 
cgit v1.2.3