5 files changed, 52 insertions, 37 deletions
diff --git a/libraries/libinklevel/Makefile.diff b/libraries/libinklevel/Makefile.diff
deleted file mode 100644
index 6bd777f5c5..0000000000
--- a/libraries/libinklevel/Makefile.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- Makefile.orig	2006-08-21 11:13:12.000000000 -0500
-+++ Makefile	2006-08-21 14:58:59.000000000 -0500
-@@ -5,13 +5,12 @@
- 
- install: all
- 	mkdir -p $(DESTDIR)/include
--	install -m 644 -o root -g root inklevel.h $(DESTDIR)/include/inklevel.h
-+	install -m 644 inklevel.h $(DESTDIR)/include/inklevel.h
- 	mkdir -p $(DESTDIR)/lib
--	install -m 755 -o root -g root libinklevel.so.2.0.6.5 \
-+	install -m 755 libinklevel.so.2.0.6.5 \
- 	$(DESTDIR)/lib/libinklevel.so.2.0.6.5
- 	cd $(DESTDIR)/lib && rm -fr libinklevel.so && \
- 	ln -s libinklevel.so.2.0.6.5 libinklevel.so
--	ldconfig $(DESTDIR)/lib
- 
- clean:
- 	rm -fr *.o *.so.2.0.6.5 *~
diff --git a/libraries/libinklevel/libinklevel-0.7.2-Makefile.diff b/libraries/libinklevel/libinklevel-0.7.2-Makefile.diff
new file mode 100644
index 0000000000..db5c69cb1b
--- /dev/null
+++ b/libraries/libinklevel/libinklevel-0.7.2-Makefile.diff
@@ -0,0 +1,11 @@
+diff -Nur libinklevel-0.7.2.orig/Makefile libinklevel-0.7.2/Makefile
+--- libinklevel-0.7.2.orig/Makefile	2007-07-28 14:01:36.000000000 -0500
++++ libinklevel-0.7.2/Makefile	2008-01-06 13:46:04.856750896 -0600
+@@ -1,6 +1,6 @@
+ DESTDIR = 
+ PREFIX = /usr/local
+-CFLAGS = -Wall -O2 -fPIC -DPIC -I.
++CFLAGS += -Wall -O2 -fPIC -DPIC -I.
+ CC = gcc
+ 
+ all: libinklevel.so.4.0.7.2
diff --git a/libraries/libinklevel/libinklevel.SlackBuild b/libraries/libinklevel/libinklevel.SlackBuild
index 931f07dc7e..c8e63f1a72 100644
--- a/libraries/libinklevel/libinklevel.SlackBuild
+++ b/libraries/libinklevel/libinklevel.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for libinklevel
 
-# Copyright 2006  Robby Workman  (http://rlworkman.net)
+# Copyright 2006-2008  Robby Workman  (http://rlworkman.net)
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,33 +22,44 @@
 # 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=libinklevel
-VERSION=0.6.5
+VERSION=0.7.2
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-CWD=`pwd`
+
+CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-march=i486 -mtune=i686"
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-march=i686 -mtune=i686"
+fi
+
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM
-tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
-cd $PRGNAM
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
-chmod -R a-s,u+w,go+r-w .
+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 {} \;
 
-# Don't try to set ownership of installed files; we'll take care of that
-# in the build script
-patch -p0 < $CWD/Makefile.diff || exit 1
+# Apply a small patch to the default Makefile to respect additional CFLAGS
+# Sent upstream 20070105 --rworkman
+patch -p1 < $CWD/libinklevel-0.7.2-Makefile.diff
 
-make || exit 1
-make install DESTDIR=$PKG/usr || exit 1
+CFLAGS="$SLKCFLAGS" make
+make install PREFIX=/usr DESTDIR=$PKG
 
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
@@ -56,7 +67,7 @@ make install DESTDIR=$PKG/usr || exit 1
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING CHANGELOG README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/libraries/libinklevel/libinklevel.info b/libraries/libinklevel/libinklevel.info
index 7d91da9a77..33a02dda7f 100644
--- a/libraries/libinklevel/libinklevel.info
+++ b/libraries/libinklevel/libinklevel.info
@@ -1,8 +1,8 @@
 PRGNAM="libinklevel"
-VERSION="0.6.5"
+VERSION="0.7.2"
 HOMEPAGE="http://libinklevel.sourceforge.net/"
-DOWNLOAD="http://dl.sourceforge.net/libinklevel/libinklevel-0.6.5.tar.gz"
-MD5SUM="2bc2dd1e0b08de28d110355adcee8b22"
+DOWNLOAD="http://downloads.sourceforge.net/libinklevel/libinklevel-0.7.2.tar.gz"
+MD5SUM="1e55e9d2264493c2ee736de7bf6f709f"
 MAINTAINER="Robby Workman"
 EMAIL="rw@rlworkman.net"
-APPROVED="robw810,elohim"
+APPROVED="BP{k}"
diff --git a/libraries/libinklevel/slack-desc b/libraries/libinklevel/slack-desc
index 929de7ffe1..2a97aa3cd3 100644
--- a/libraries/libinklevel/slack-desc
+++ b/libraries/libinklevel/slack-desc
@@ -1,4 +1,12 @@
-libinklevel: libinklevel - library to check printer ink levels
+# 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------------------------------------------------------|
+libinklevel: libinklevel (library to check printer ink levels)
 libinklevel: 
 libinklevel: Libinklevel is a linux library to check the ink level of 
 libinklevel: ink jet printers connected via USB or parallel port.
@@ -6,3 +14,6 @@ libinklevel:
 libinklevel: Homepage: http://libinklevel.sourceforge.net/
 libinklevel: 
 libinklevel: 
+libinklevel: 
+libinklevel: 
+libinklevel: