4 files changed, 54 insertions, 18 deletions
diff --git a/graphics/enblend-enfuse/README b/graphics/enblend-enfuse/README
index 694d51d180..df7b2689e5 100644
--- a/graphics/enblend-enfuse/README
+++ b/graphics/enblend-enfuse/README
@@ -3,4 +3,4 @@ Enfuse combines images that overlap into a single image with good exposure
 and good focus. Both programs assume that your images are already lined up.
 To make panoramas with Enblend and/or Enfuse, use Hugin.
 
-Requires GLEW, OpenEXR and libxmi, available at SlackBuilds.org.
+Requires libxmi, available at SlackBuilds.org.
diff --git a/graphics/enblend-enfuse/enblend-enfuse.SlackBuild b/graphics/enblend-enfuse/enblend-enfuse.SlackBuild
index ed85d95d84..abc39c7576 100644
--- a/graphics/enblend-enfuse/enblend-enfuse.SlackBuild
+++ b/graphics/enblend-enfuse/enblend-enfuse.SlackBuild
@@ -1,10 +1,29 @@
-#!/bin/sh -eu
-
-# Slackware build script for enblend-enfuse
-# Written by Erik Hanson  erik@slackbuilds.org
+#!/bin/sh
+#
+# Slackware build script for Enblend-Enfuse
+#
+# 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=enblend-enfuse
-VERSION=3.2
+VERSION=4.0
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -16,18 +35,23 @@ 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
 cd $TMP
-rm -rf $PRGNAM-$VERSION
+rm -rf $PRGNAM-$VERSION-*
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION-*
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
@@ -35,11 +59,11 @@ CXXFLAGS="$SLKCFLAGS" \
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  --sysconfdir=/etc \
-  --localstatedir=/var/lib \
   --mandir=/usr/man \
   --infodir=/usr/info \
-  --disable-static
+  --disable-static \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --build=$ARCH-slackware-linux
 
 make
 make install-strip DESTDIR=$PKG
@@ -48,11 +72,13 @@ gzip -9 $PKG/usr/man/man?/*.?
 gzip -9 $PKG/usr/info/*.info
 rm -rf $PKG/usr/info/dir
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION $PKG/install
-cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README README_WINDOWS.txt \
-      TODO VIGRA_LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog NEWS README README.txt VERSION VIGRA_LICENSE \
+  $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/graphics/enblend-enfuse/enblend-enfuse.info b/graphics/enblend-enfuse/enblend-enfuse.info
index 38fca39c00..d874676921 100644
--- a/graphics/enblend-enfuse/enblend-enfuse.info
+++ b/graphics/enblend-enfuse/enblend-enfuse.info
@@ -1,8 +1,10 @@
 PRGNAM="enblend-enfuse"
-VERSION="3.2"
+VERSION="4.0"
 HOMEPAGE="http://enblend.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/enblend/enblend-enfuse-3.2.tar.gz"
-MD5SUM="9b6ebaf672f5103c633a53c9723d99c3"
+DOWNLOAD="http://downloads.sourceforge.net/enblend/enblend-enfuse-4.0.tar.gz"
+MD5SUM="2e7c950061e0085fd75d94576130250f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Erik Hanson"
 EMAIL="erik@slackbuilds.org"
 APPROVED="dsomero"
diff --git a/graphics/enblend-enfuse/slack-desc b/graphics/enblend-enfuse/slack-desc
index 3749e6bfa6..9299a3783b 100644
--- a/graphics/enblend-enfuse/slack-desc
+++ b/graphics/enblend-enfuse/slack-desc
@@ -1,3 +1,11 @@
+# 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------------------------------------------------------|
 enblend-enfuse: Enblend-Enfuse (Image Blending and Enfusing tools)
 enblend-enfuse: 
 enblend-enfuse: Enblend combines images that overlap into a single large image