aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/exif/README4
-rw-r--r--graphics/exif/exif.SlackBuild66
-rw-r--r--graphics/exif/exif.info6
3 files changed, 41 insertions, 35 deletions
diff --git a/graphics/exif/README b/graphics/exif/README
index 69df784f10fca..be325e54d11fd 100644
--- a/graphics/exif/README
+++ b/graphics/exif/README
@@ -1,2 +1,2 @@
-'exif' is a small command-line utility to show EXIF information hidden in JPEG
-files. It is written to demonstrate the power of libexif.
+'exif' is a small command-line utility to show EXIF information hidden
+in JPEG files. It is written to demonstrate the power of libexif.
diff --git a/graphics/exif/exif.SlackBuild b/graphics/exif/exif.SlackBuild
index ef3096e1a4a41..55b81442b7b45 100644
--- a/graphics/exif/exif.SlackBuild
+++ b/graphics/exif/exif.SlackBuild
@@ -3,28 +3,38 @@
# Slackware build script for exif
# Written by Kyle Guinn <elyk03@gmail.com>
-PRGNAM="exif"
-VERSION=${VERSION:-"0.6.15"}
-ARCH=${ARCH:-"i486"}
-BUILD=${BUILD:-"1"}
-TAG=${TAG:-"_SBo"}
+PRGNAM=exif
+VERSION=${VERSION:-0.6.20}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+ case "$(uname -m)" in
+ i?86) ARCH=i486 ;;
+ arm*) ARCH=arm ;;
+ *) ARCH=$(uname -m) ;;
+ esac
+fi
CWD=$(pwd)
-TMP=${TMP:-"/tmp/SBo"}
+TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM-$VERSION
-OUTPUT=${OUTPUT:-"/tmp"}
+OUTPUT=${OUTPUT:-/tmp}
-DOCS="ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README"
+DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README"
if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
- LIBDIRSUFFIX=""
+ SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+ LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
+ SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
+ SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e
@@ -33,31 +43,27 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar -xjvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
cd $PRGNAM-$VERSION
chown -R root:root .
chmod -R u+w,go+r-w,a-st .
CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --disable-static \
- --build=$ARCH-slackware-linux \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --mandir=/usr/man \
+ --infodir=/usr/info \
+ --docdir=/usr/doc/$PRGNAM-$VERSION \
+ --disable-static \
+ --build=$ARCH-slackware-linux \
make
make install-strip DESTDIR=$PKG
-( 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
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
@@ -67,4 +73,4 @@ 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.${PKGTYPE:-"tgz"}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/graphics/exif/exif.info b/graphics/exif/exif.info
index 833d671ad20cf..31e3cc88899ca 100644
--- a/graphics/exif/exif.info
+++ b/graphics/exif/exif.info
@@ -1,10 +1,10 @@
PRGNAM="exif"
VERSION="0.6.15"
HOMEPAGE="http://libexif.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/libexif/exif-0.6.15.tar.bz2"
-MD5SUM="ed5f245c191c30824a4c05a805df3bd0"
+DOWNLOAD="http://downloads.sourceforge.net/libexif/exif-0.6.20.tar.bz2"
+MD5SUM="4d88291883506d4ee52d1eec9ed5f42a"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="Kyle Guinn"
EMAIL="elyk03@gmail.com"
-APPROVED="Erik Hanson"
+APPROVED="rworkman"