3 files changed, 56 insertions, 18 deletions
diff --git a/libraries/libpano13/libpano13.SlackBuild b/libraries/libpano13/libpano13.SlackBuild
index 39772e734f9ca..5d36d8b3af24e 100644
--- a/libraries/libpano13/libpano13.SlackBuild
+++ b/libraries/libpano13/libpano13.SlackBuild
@@ -1,12 +1,29 @@
 #!/bin/sh
-
+#
 # Slackware build script for libpano13
-# Written by Erik Hanson  erik@slackbuilds.org
-
-set -eu
+#
+# Copyright 2009-2010  Erik W. Hanson, Minneapolis, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libpano13
-VERSION=2.9.12
+VERSION=2.9.14
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -18,12 +35,19 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
+set -eu
+
 rm -rf $PKG
-mkdir -p $TMP $PKG
+mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
@@ -34,19 +58,23 @@ chmod -R u+w,go+r-w,a-s .
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  --sysconfdir=/etc \
-  --localstatedir=/var/lib \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
-  --disable-static
+  --disable-static \
+  --build=$ARCH-slackware-linux
 
 make
 make install-strip DESTDIR=$PKG
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION $PKG/install
-cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README README.linux README.mac \
-      README.windows TODO $PKG/usr/doc/$PRGNAM-$VERSION
+gzip -9 $PKG/usr/man/man?/*.?
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libpano13/libpano13.info b/libraries/libpano13/libpano13.info
index 462dc58cb1481..49e50c5170691 100644
--- a/libraries/libpano13/libpano13.info
+++ b/libraries/libpano13/libpano13.info
@@ -1,8 +1,10 @@
 PRGNAM="libpano13"
-VERSION="2.9.12"
+VERSION="2.9.14"
 HOMEPAGE="http://panotools.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/panotools/libpano13-2.9.12.tar.gz"
-MD5SUM="3ca4f7bfe5a7b0acd86901d502dee8ca"
+DOWNLOAD="http://downloads.sourceforge.net/panotools/libpano13-2.9.14.tar.gz"
+MD5SUM="fb011aead63974e630739ed55d75a4b0"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Erik Hanson"
 EMAIL="erik@slackbuilds.org"
-APPROVED="David Somero"
-\ No newline at end of file
+APPROVED="dsomero"
diff --git a/libraries/libpano13/slack-desc b/libraries/libpano13/slack-desc
index d8c6ed178acb0..f551cd0c434db 100644
--- a/libraries/libpano13/slack-desc
+++ b/libraries/libpano13/slack-desc
@@ -1,11 +1,19 @@
+# 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------------------------------------------------------|
 libpano13: libpano13 (part of Panorama Tools)
 libpano13: 
 libpano13: This is the pano13 library, part of the Panorama Tools by Helmut
 libpano13: Dersch of the University of Applied Sciences Furtwangen.
 libpano13:
+libpano13: Homepage: http://panotools.sourceforge.net/
 libpano13:
 libpano13:
 libpano13:
 libpano13:
-libpano13: http://panotools.sourceforge.net/
 libpano13: