graphics/potrace: Updated for version 1.8

5 files changed, 30 insertions, 21 deletions

diff --git a/graphics/potrace/README b/graphics/potrace/README
index 6542fe6207..9343d0a1cb 100644
--- a/graphics/potrace/README
+++ b/graphics/potrace/README
@@ -11,4 +11,3 @@ antialiasing).
 
 Mkbitmap is a program distributed with Potrace which can be used to pre-process
 the input for better tracing behavior on greyscale and color images.
-
diff --git a/graphics/potrace/potrace-1.8-xfig.patch.gz b/graphics/potrace/potrace-1.8-xfig.patch.gz
new file mode 100644
index 0000000000..281fd514f3
--- /dev/null
+++ b/graphics/potrace/potrace-1.8-xfig.patch.gz
diff --git a/graphics/potrace/potrace.SlackBuild b/graphics/potrace/potrace.SlackBuild
index aebb2899d6..7455caf327 100644
--- a/graphics/potrace/potrace.SlackBuild
+++ b/graphics/potrace/potrace.SlackBuild
@@ -3,14 +3,14 @@
 # Slackware build script for potrace
 # Written by Kyle Guinn
 
-# Modified by the SlackBuilds.org project
+set -e
 
 PRGNAM=potrace
-VERSION=1.7
+VERSION=1.8
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-CWD=`pwd`
+CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -23,30 +23,32 @@ fi
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
+cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
-cd $PRGNAM-$VERSION || exit 1
-
+tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
+# Apply the xfig patch
+zcat $CWD/potrace-1.8-xfig.patch.gz | patch -p0
+
+# For metric units and papersizes, use the following flags to configure:
+# --enable-metric   Use metric units (centimeters) as default
+# --enable-a4       Use A4 as the default papersize
+
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --sysconfdir=/etc \
-  --localstatedir=/var \
-  || exit 1
+  --localstatedir=/var
+make
+make install-strip DESTDIR=$PKG
 
-make || exit 1
-make install-strip DESTDIR=$PKG || exit 1
-
-if [ -d $PKG/usr/man ]; then
 ( cd $PKG/usr/man
   find . -type f -exec gzip -9 {} \;
-  for i in `find . -type l` ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+  for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
 )
-fi
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README \
diff --git a/graphics/potrace/potrace.info b/graphics/potrace/potrace.info
index 1dbb9570ab..4f9f0561bb 100644
--- a/graphics/potrace/potrace.info
+++ b/graphics/potrace/potrace.info
@@ -1,8 +1,8 @@
 PRGNAM="potrace"
-VERSION="1.7"
+VERSION="1.8"
 HOMEPAGE="http://potrace.sourceforge.net/"
-DOWNLOAD="http://potrace.sourceforge.net/download/potrace-1.7.tar.gz"
-MD5SUM="8bfaabf935c03643a6875bde36fe6302"
+DOWNLOAD="http://downloads.sourceforge.net/potrace/potrace-1.8.tar.gz"
+MD5SUM="e73b45565737d64011612704dd4d9f86"
 MAINTAINER="Kyle Guinn"
 EMAIL="elyk03@gmail.com"
-APPROVED="robw810"
+APPROVED="alien"
diff --git a/graphics/potrace/slack-desc b/graphics/potrace/slack-desc
index ea049326ab..301fcc6dcb 100644
--- a/graphics/potrace/slack-desc
+++ b/graphics/potrace/slack-desc
@@ -1,4 +1,12 @@
-potrace: Potrace
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+       |-----handy-ruler------------------------------------------------------|
+potrace: Potrace (bitmap utility)
 potrace:
 potrace: Potrace is a utility for tracing a bitmap, which means, transforming
 potrace: a bitmap into a smooth, scalable image.  The input is a bitmap (PBM,