potrace: update to 1.16

1 files changed, 43 insertions, 27 deletions

diff --git a/potrace/build/potrace.SlackBuild b/potrace/build/potrace.SlackBuild
index fc51ca12..8a83a2ab 100755
--- a/potrace/build/potrace.SlackBuild
+++ b/potrace/build/potrace.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright 2008, 2009, 2010, 2011  Eric Hameleers, Eindhoven, NL
+# Copyright 2008, 2009, 2010, 2011, 2020  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -40,6 +40,8 @@
 #             * Update.
 # 1.10-1:   16/sep/2011 by Eric Hameleers <alien@slackware.com>
 #             * Update.
+# 1.16-1:   08/nov/2020 by Eric Hameleers <alien@slackware.com>
+#             * Update.
 # 
 # Run 'sh potrace.SlackBuild' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -50,8 +52,9 @@
 # Set initial variables:
 
 PRGNAM=potrace
-VERSION=${VERSION:-1.10}
+VERSION=${VERSION:-1.16}
 BUILD=${BUILD:-1}
+NUMJOBS=${NUMJOBS:-" -j$(nproc) "}
 TAG=${TAG:-alien}
 
 DOCS="AUTHORS COPYING ChangeLog NEWS README*"
@@ -65,7 +68,7 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 SOURCE="$SRCDIR/${PRGNAM}-${VERSION}.tar.gz"
-SRCURL="http://potrace.sourceforge.net/download/${PRGNAM}-${VERSION}.tar.gz"
+SRCURL="http://potrace.sourceforge.net/download/${VERSION}/${PRGNAM}-${VERSION}.tar.gz"
 
 ##
 ## --- with a little luck, you won't have to edit below this point --- ##
@@ -73,14 +76,37 @@ SRCURL="http://potrace.sourceforge.net/download/${PRGNAM}-${VERSION}.tar.gz"
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
-    arm*) export ARCH=arm ;;
+  case "$(uname -m)" in
+    i?86) ARCH=i586 ;;
+    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
-       *) export ARCH=$( uname -m ) ;;
+    *) ARCH=$(uname -m) ;;
   esac
+  export ARCH
 fi
 
+# Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+case "$ARCH" in
+  i?86)      SLKCFLAGS="-O2 -march=${ARCH} -mtune=i686"
+             SLKLDFLAGS=""; LIBDIRSUFFIX=""
+             ;;
+  x86_64)    SLKCFLAGS="-O2 -fPIC"
+             SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64"
+             ;;
+  armv7hl)   SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
+             SLKLDFLAGS=""; LIBDIRSUFFIX=""
+             ;;
+  *)         SLKCFLAGS=${SLKCFLAGS:-"-O2"}
+             SLKLDFLAGS=${SLKLDFLAGS:-""}; LIBDIRSUFFIX=${LIBDIRSUFFIX:-""}
+             ;;
+esac
+
+case "$ARCH" in
+    arm*)    TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)       TARGET=$ARCH-slackware-linux ;;
+esac
+
+
 # Exit the script on errors:
 set -e
 trap 'echo "$0 FAILED at line ${LINENO}" | tee $OUTPUT/error-${PRGNAM}.log' ERR
@@ -92,24 +118,14 @@ P1=${1:-1}
 _UMASK_=$(umask)
 umask 0022
 
-case "$ARCH" in
-  i486)      SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-             SLKLDFLAGS=""; LIBDIRSUFFIX=""
-             ;;
-  x86_64)    SLKCFLAGS="-O2 -fPIC"
-             SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64"
-             ;;
-  *)         SLKCFLAGS="-O2"
-             SLKLDFLAGS=""; LIBDIRSUFFIX=""
-             ;;
-esac
-
 # Create working directories:
 mkdir -p $OUTPUT          # place for the package to be saved
 mkdir -p $TMP/tmp-$PRGNAM # location to build the source
 mkdir -p $PKG             # place for the package to be built
 rm -rf $PKG/*             # always erase old package's contents
 rm -rf $TMP/tmp-$PRGNAM/* # remove the remnants of previous build
+rm -rf $OUTPUT/{checkout,configure,make,install,error,makepkg,patch}-$PRGNAM.log
+                          # remove old log files
 
 # Source file availability:
 if ! [ -f ${SOURCE} ]; then
@@ -119,7 +135,7 @@ if ! [ -f ${SOURCE} ]; then
   if [ -f ${SOURCE} ]; then echo "Ah, found it!"; continue; fi
   if ! [ "x${SRCURL}" == "x" ]; then
     echo "Will download file to $(dirname $SOURCE)"
-    wget -nv -T 20 -O "${SOURCE}" "${SRCURL}" || true
+    wget --no-check-certificate -nv -T 20 -O "${SOURCE}" "${SRCURL}" || true
     if [ $? -ne 0 -o ! -s "${SOURCE}" ]; then
       echo "Downloading '$(basename ${SOURCE})' failed... aborting the build."
       mv -f "${SOURCE}" "${SOURCE}".FAIL
@@ -147,7 +163,7 @@ echo "Extracting the source archive(s) for $PRGNAM..."
 tar -xvf ${SOURCE}
 cd ${PRGNAM}-${VERSION}
 chown -R root:root .
-chmod -R u+w,go+r-w,a+X-s .
+chmod -R u+w,go+r-w,a+rX-st .
 
 echo Building ...
 LDFLAGS="$SLKLDFLAGS" \
@@ -157,20 +173,23 @@ CFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
   --localstatedir=/var \
   --sysconfdir=/etc \
+  --disable-static \
   --enable-metric \
   --enable-a4 \
+  --with-libpotrace \
   --program-prefix= \
   --program-suffix= \
   --build=$ARCH-slackware-linux \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
 
-make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
+make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
 make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log
 
-# Remove useless directories from the package:
-rmdir $PKG/usr/{include,lib${LIBDIRSUFFIX}} 2>/dev/null || true
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
 
 # Add documentation:
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
@@ -192,9 +211,6 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 # Add a package description:
 mkdir -p $PKG/install
 cat $SRCDIR/slack-desc > $PKG/install/slack-desc
-if [ -f $SRCDIR/doinst.sh ]; then
-  cat $SRCDIR/doinst.sh >> $PKG/install/doinst.sh
-fi
 
 # Build the package:
 cd $PKG