summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/rawstudio/README2
-rw-r--r--graphics/rawstudio/rawstudio.SlackBuild20
-rw-r--r--graphics/rawstudio/rawstudio.info4
-rw-r--r--graphics/rawstudio/slack-desc12
4 files changed, 19 insertions, 19 deletions
diff --git a/graphics/rawstudio/README b/graphics/rawstudio/README
index cb47f2c050..1657940995 100644
--- a/graphics/rawstudio/README
+++ b/graphics/rawstudio/README
@@ -1,4 +1,4 @@
Rawstudio is an open-source program to read and manipulate
RAW images from most digital cameras.
-This requires exiv2 and GConf.
+This requires GConf, available at SlackBuilds.org
diff --git a/graphics/rawstudio/rawstudio.SlackBuild b/graphics/rawstudio/rawstudio.SlackBuild
index d3c248261a..2bea0000d0 100644
--- a/graphics/rawstudio/rawstudio.SlackBuild
+++ b/graphics/rawstudio/rawstudio.SlackBuild
@@ -3,7 +3,7 @@
# Slackware Package Build Script for rawstudio
# Home Page http://rawstudio.org/
-# Copyright (c) 2007, Nishant Limbachia (nishant@mnspace.net)
+# Copyright (c) 2007-2009, Nishant Limbachia, Hoffman Est, IL, USA (nishant@mnspace.net)
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -40,10 +40,13 @@ 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 -e # Exit on most errors
@@ -65,6 +68,7 @@ CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
--sysconfdir=/etc \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
--localstatedir=/var \
--mandir=/usr/man \
--build=$ARCH-slackware-linux
@@ -72,15 +76,9 @@ CXXFLAGS="$SLKCFLAGS" \
make
make install DESTDIR=$PKG
-# Move the rawstudio primary icon to /usr/share/pixmaps toplevel dir
-mv $PKG/usr/share/icons/rawstudio.png $PKG/usr/share/pixmaps
-rmdir $PKG/usr/share/icons
-
( cd $PKG
- 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
+ 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
)
( cd $PKG/usr/man
@@ -90,11 +88,11 @@ rmdir $PKG/usr/share/icons
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \
- pixmaps/artwork.license $PKG/usr/doc/$PRGNAM-$VERSION
+ pixmaps/artwork.license $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/rawstudio/rawstudio.info b/graphics/rawstudio/rawstudio.info
index 5bdd4f259f..beaa5aaff7 100644
--- a/graphics/rawstudio/rawstudio.info
+++ b/graphics/rawstudio/rawstudio.info
@@ -3,6 +3,8 @@ VERSION="1.2"
HOMEPAGE="http://rawstudio.org/"
DOWNLOAD="http://rawstudio.org/files/release/rawstudio-1.2.tar.gz"
MD5SUM="25399cd80294fa44220a8940fc77689f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
MAINTAINER="Nishant Limbachia"
EMAIL="nishant@mnspace.net"
-APPROVED="rworkman"
+APPROVED="Erik Hanson"
diff --git a/graphics/rawstudio/slack-desc b/graphics/rawstudio/slack-desc
index 567ce5ac00..34bb8c6d32 100644
--- a/graphics/rawstudio/slack-desc
+++ b/graphics/rawstudio/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------------------------------------------------------|
rawstudio: RAWStudio (read and manipulate RAW images)
rawstudio:
rawstudio: Rawstudio is an open-source program to read and manipulate
rawstudio: RAW images from most digital cameras. Rawstudio can convert
rawstudio: RAW files into JPEG, PNG, or TIF images.
-rawstudio:
+rawstudio:
rawstudio: Home Page: http://www.rawstudio.org/
-rawstudio:
-rawstudio:
-rawstudio:
-rawstudio:
+rawstudio:
+rawstudio:
+rawstudio:
+rawstudio: