graphics/hugin: Updated for version 2009.4.0

4 files changed, 54 insertions, 22 deletions

diff --git a/graphics/hugin/README b/graphics/hugin/README
index 444b55b7fe..1522b8ce89 100644
--- a/graphics/hugin/README
+++ b/graphics/hugin/README
@@ -6,11 +6,8 @@ pictures and much more.
 Build Requirements:
 wxWidgets (wxPython, wxGTK, wxX11). Only tested with wxPython.
 libpano13
-boost
-openexr
-exiv2
 
 Run-time requirements:
 exiftool
-enblend
+enblend-enfuse
 autopano-sift-C
diff --git a/graphics/hugin/hugin.SlackBuild b/graphics/hugin/hugin.SlackBuild
index 717946d493..c12131f9e6 100644
--- a/graphics/hugin/hugin.SlackBuild
+++ b/graphics/hugin/hugin.SlackBuild
@@ -1,13 +1,31 @@
 #!/bin/sh
-
+#
 # Slackware build script for Hugin
-# Written by Erik Hanson  erik@slackbuilds.org
+#
+# 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.
 
 set -eu
 
 PRGNAM=hugin
-VERSION=0.7.0_rc2
-SRCVER=0.7.0
+VERSION=2009.4.0
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -19,18 +37,21 @@ 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
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
-rm -rf $PRGNAM-$SRCVER
+rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$SRCVER
+cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
@@ -38,24 +59,28 @@ cmake \
   -DCMAKE_C_FLAGS="$SLKCFLAGS" \
   -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
   -DCMAKE_EXE_LINKER_FLAGS="-lpthread" \
+  -DLIB_SUFFIX="$LIBDIRSUFFIX" \
   -DCMAKE_INSTALL_PREFIX=/usr .
 
 make
 make install DESTDIR=$PKG
 
-find $PKG | xargs file | egrep "ELF.*executable" | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-find $PKG | xargs file | egrep "ELF.*shared object" | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+find $PKG | xargs file | egrep "ELF.*executable" | cut -f 1 -d : | \
+  xargs strip --strip-unneeded 2> /dev/null
+find $PKG | xargs file | egrep "ELF.*shared object" | cut -f 1 -d : | \
+  xargs strip --strip-unneeded 2> /dev/null
 
 mv $PKG/usr/share/man $PKG/usr/man
 gzip -9 $PKG/usr/man/man?/*.?
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION $PKG/install
-cp -a AUTHORS COPYING ChangeLog INSTALL_cmake LICENCE LICENCE_JHEAD \
-      LICENCE_VIGRA README README_JP README_WINDOWS TODO \
-      $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog INSTALL_cmake LICENCE_VIGRA README README_JP \
+  README_WINDOWS 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
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 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/graphics/hugin/hugin.info b/graphics/hugin/hugin.info
index 84fe6b0a61..95afc049ad 100644
--- a/graphics/hugin/hugin.info
+++ b/graphics/hugin/hugin.info
@@ -1,8 +1,10 @@
 PRGNAM="hugin"
-VERSION="0.7.0_rc2"
+VERSION="2009.4.0"
 HOMEPAGE="http://hugin.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/hugin/hugin-0.7.0_rc2.tar.gz"
-MD5SUM="41d7c79aa23bdd017e23e93f265b9e49"
+DOWNLOAD="http://downloads.sourceforge.net/hugin/hugin-2009.4.0.tar.gz"
+MD5SUM="ed197d35213a46c77489f512cb8ff191"
+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/graphics/hugin/slack-desc b/graphics/hugin/slack-desc
index e5dcf5474a..1e7f373b3f 100644
--- a/graphics/hugin/slack-desc
+++ b/graphics/hugin/slack-desc
@@ -1,5 +1,13 @@
+# 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------------------------------------------------------|
 hugin: Hugin (Panorama photo stitcher)
-hugin: 
+hugin:
 hugin: An easy to use cross-platform panoramic imaging toolchain based on
 hugin: Panorama Tools. With hugin you can assemble a mosaic of photographs
 hugin: into a complete immersive panorama, stitch any series of overlapping