4 files changed, 32 insertions, 26 deletions
diff --git a/libraries/jasper/README b/libraries/jasper/README
index bb6cbb653d2ae..9b4be45995bd4 100644
--- a/libraries/jasper/README
+++ b/libraries/jasper/README
@@ -1,4 +1,5 @@
-JasPer is a collection of software (a library and application programs)
-for the coding and manipulation of images.  This software can handle image 
-data in a variety of formats.  One such format supported by JasPer is the
-JPEG-2000 format defined in ISO/IEC 15444-1.
+JasPer is a collection of software (i.e., a library and application
+programs) for the coding and manipulation of images. This software
+can handle image data in a variety of formats. One such format
+supported by JasPer is the JPEG-2000 format defined in ISO/IEC
+15444-1.
diff --git a/libraries/jasper/jasper.SlackBuild b/libraries/jasper/jasper.SlackBuild
index 1cf84f4e2a76f..ac6639a0f7a76 100644
--- a/libraries/jasper/jasper.SlackBuild
+++ b/libraries/jasper/jasper.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for JasPer
 
-# Copyright 2007  Frank Caraballo <fecaraballo[AT]gmail.com>
+# Copyright 2007, 2008  Frank Caraballo <fecaraballo{at}gmail{dot}com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,24 +22,23 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified by the SlackBuilds.org project
-
 PRGNAM=jasper
-VERSION=1.900.1
+VERSION=${VERSION:-1.900.1}
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-PDOCS="ChangeLog COPYRIGHT INSTALL LICENSE NEWS README doc"
-
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
 fi
 
 rm -rf $PKG
@@ -49,7 +48,11 @@ rm -rf $PRGNAM-$VERSION
 unzip $CWD/$PRGNAM-$VERSION.zip || exit 1
 cd $PRGNAM-$VERSION || exit 1
 chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -57,8 +60,9 @@ CXXFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  --enable-shared \
-  --disable-static \
+  --enable-shared=yes \
+  --enable-static=no \
+  --build=$ARCH-slackware-linux \
   || exit 1
 
 make || exit 1
@@ -70,7 +74,8 @@ make install-strip DESTDIR=$PKG || exit 1
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $PDOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog COPYRIGHT INSTALL LICENSE NEWS README doc \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/libraries/jasper/jasper.info b/libraries/jasper/jasper.info
index 99e12bd575135..7b62252adab41 100644
--- a/libraries/jasper/jasper.info
+++ b/libraries/jasper/jasper.info
@@ -4,5 +4,5 @@ HOMEPAGE="http://www.ece.uvic.ca/~mdadams/jasper/"
 DOWNLOAD="http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-1.900.1.zip"
 MD5SUM="a342b2b4495b3e1394e161eb5d85d754"
 MAINTAINER="Frank Caraballo"
-EMAIL="fecaraballo[AT]gmail.com"
-APPROVED="rworkman"
+EMAIL="fecaraballo{at}gmail{dot}com"
+APPROVED="Michiel"
+\ No newline at end of file
diff --git a/libraries/jasper/slack-desc b/libraries/jasper/slack-desc
index c5bc1f0044f7a..03d3dba5625d4 100644
--- a/libraries/jasper/slack-desc
+++ b/libraries/jasper/slack-desc
@@ -1,18 +1,18 @@
 # 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 ':'.
+# 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------------------------------------------------------|
 jasper: JasPer (Software Tool Kit for the Handling of Image Data)
 jasper:
-jasper: JasPer is a collection of software (i.e., a library and
-jasper: application programs) for the coding and manipulation of
-jasper: images. This software can handle image data in a variety
-jasper: of formats. One such format supported by JasPer is the
-jasper: JPEG-2000 format defined in ISO/IEC 15444-1.
+jasper: JasPer is a collection of software (i.e., a library and application
+jasper: programs) for the coding and manipulation of images. This software
+jasper: can handle image data in a variety of formats. One such format
+jasper: supported by JasPer is the JPEG-2000 format defined in ISO/IEC
+jasper: 15444-1.
 jasper:
 jasper: Homepage: http://www.ece.uvic.ca/~mdadams/jasper/
 jasper: