5 files changed, 48 insertions, 30 deletions
diff --git a/graphics/ufraw/README b/graphics/ufraw/README
index 74547f72bd939..00db50418a2d3 100644
--- a/graphics/ufraw/README
+++ b/graphics/ufraw/README
@@ -1,10 +1,13 @@
-The UFRaw (Unidentified Flying Raw) is a tool for reading and manipulating 
-raw images from digital cameras.  It supports most of the existing raw 
-formats (any format supported by DCRaw).  UFRaw can be used on its own or 
+The UFRaw (Unidentified Flying Raw) is a tool for reading and manipulating
+raw images from digital cameras.  It supports most of the existing raw
+formats (any format supported by DCRaw).  UFRaw can be used on its own or
 as a Gimp plug-in.
 
-UFRaw depends on dcraw, which is also available at SlackBuilds.org.
-However, you can add "--enable-extras" to the configure arguments in the 
-build script to use the included dcraw. 
-An optional dependency is exiv2 (available at SlackBuilds.org) if you want 
-the ability to read exif data with ufraw.
+UFRaw requires dcraw and gtkimageview; lensfun is an optional dependency
+(run the build script with LENSFUN=yes if you have it installed).
+
+However, you can add "--enable-extras" to the configure arguments in the
+build script to use the included dcraw.  You'll need gtkimageview if you
+want to include the image preview window.  You can build ufraw without 
+gtkimageview (run the build script with GTK=no), but you'll only have command 
+line interface to UFRaw.
diff --git a/graphics/ufraw/doinst.sh b/graphics/ufraw/doinst.sh
deleted file mode 100644
index 3857649f506a8..0000000000000
--- a/graphics/ufraw/doinst.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database -q usr/share/applications &> /dev/null
-fi
diff --git a/graphics/ufraw/slack-desc b/graphics/ufraw/slack-desc
index 0a831386f710a..150d531f2d127 100644
--- a/graphics/ufraw/slack-desc
+++ b/graphics/ufraw/slack-desc
@@ -5,15 +5,15 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-      |-----handy-ruler------------------------------------------------------|
+     |-----handy-ruler------------------------------------------------------|
 ufraw: Unindentified Flying RAW (UFRaw)
-ufraw: 
+ufraw:
 ufraw: ufraw is a utility to read and manipulate raw images from
 ufraw: digital cameras. It can be used on its own or as a Gimp plug-in.
 ufraw: It reads raw images using Dave Coffin's raw conversion utility
 ufraw: DCRaw. UFRaw supports basic color management using Little CMS,
 ufraw: allowing the user to apply color profiles.
-ufraw: 
+ufraw:
 ufraw: Home Page: http://ufraw.sourceforge.net/
 ufraw:
 ufraw:
diff --git a/graphics/ufraw/ufraw.SlackBuild b/graphics/ufraw/ufraw.SlackBuild
index 3b65ef359da22..3cf6e80d6017a 100644
--- a/graphics/ufraw/ufraw.SlackBuild
+++ b/graphics/ufraw/ufraw.SlackBuild
@@ -1,14 +1,16 @@
 #!/bin/sh
+
 # Slackware Package Build Script for UFRaw (Unidentified Flying Raw)
 # Home Page http://ufraw.sourceforge.net/
-# Copyright (c) 2007, Nishant Limbachia (nishant@mnspace.net)
+
+# Copyright (c) 2007-2009, Nishant Limbachia, Hoffman Est, IL, USA (nishant@mnspace.net)
 # Copyright (c) 2007, Robby Workman <rworkman@slackbuilds.org>
 # All rights reserved.
 #
-# Redistribution and use of this script, with or without modification, is 
+# Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
 #
-# 1. Redistributions of script must retain the above copyright notice, 
+# 1. Redistributions of script must retain the above copyright notice,
 #    this list of conditions and the following disclaimer.
 #
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
@@ -21,27 +23,39 @@
 # 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. 
-#
-#Modified by SlackBuilds.org
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ufraw
-VERSION=0.15
+VERSION=0.16
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+if [ "${LENSFUN:-no}" = "no" ]; then
+  lensfun_option="--without-lensfun"
+else
+  lensfun_option="--with-lensfun"
+fi
+
+if [ "${GTK:-yes}" = "yes" ]; then
+  gtk_option="--with-gtk"
+else
+  gtk_option="--without-gtk"
+fi
+
 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 -e 	# Exit on most errors
@@ -63,16 +77,19 @@ CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --sysconfdir=/etc \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --localstatedir=/var \
   --mandir=/usr/man \
   --enable-mime \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux \
+  $lensfun_option \
+  $gtk_option
 
 make
 make install DESTDIR=$PKG
 
 ( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 )
 
@@ -91,7 +108,6 @@ cp -a COPYING MANIFEST README TODO $PKG/usr/doc/$PRGNAM-$VERSION
 
 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/ufraw/ufraw.info b/graphics/ufraw/ufraw.info
index e4ccb525b216a..915248c331f97 100644
--- a/graphics/ufraw/ufraw.info
+++ b/graphics/ufraw/ufraw.info
@@ -1,8 +1,10 @@
 PRGNAM="ufraw"
-VERSION="0.15"
+VERSION="0.16"
 HOMEPAGE="http://ufraw.sourceforge.net/"
-DOWNLOAD="http://superb-east.dl.sourceforge.net/sourceforge/ufraw/ufraw-0.15.tar.gz"
-MD5SUM="6d8f6c98a388c438784cd909dd82d540"
+DOWNLOAD="http://downloads.sourceforge.net/project/ufraw/ufraw/ufraw-0.16/ufraw-0.16.tar.gz"
+MD5SUM="61e100e42f17e3a7fcfae64506eebd14"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Nishant Limbachia"
 EMAIL="nishant@mnspace.net"
-APPROVED="dsomero"
+APPROVED="rworkman"