diff options
| -rw-r--r-- | system/ink/Makefile.diff | 11 | ||||
| -rw-r--r-- | system/ink/ink-0.4.1-Makefile.diff | 21 | ||||
| -rw-r--r-- | system/ink/ink.SlackBuild | 49 | ||||
| -rw-r--r-- | system/ink/ink.info | 8 | ||||
| -rw-r--r-- | system/ink/slack-desc | 14 |
5 files changed, 66 insertions, 37 deletions
diff --git a/system/ink/Makefile.diff b/system/ink/Makefile.diff deleted file mode 100644 index 725bc53db3..0000000000 --- a/system/ink/Makefile.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ink/Makefile.orig 2006-08-22 16:26:25.132141803 -0500 -+++ ink/Makefile 2006-08-22 16:27:15.018192620 -0500 -@@ -5,7 +5,7 @@ - - install: all - mkdir -p $(DESTDIR)/bin -- install -m 755 -o root -g root ink $(DESTDIR)/bin/ink -+ install -m 755 ink $(DESTDIR)/bin/ink - - clean: - rm -fr ink *~ diff --git a/system/ink/ink-0.4.1-Makefile.diff b/system/ink/ink-0.4.1-Makefile.diff new file mode 100644 index 0000000000..05c6741e62 --- /dev/null +++ b/system/ink/ink-0.4.1-Makefile.diff @@ -0,0 +1,21 @@ +diff -Nur ink-0.4.1.orig/Makefile ink-0.4.1/Makefile +--- ink-0.4.1.orig/Makefile 2006-09-06 09:06:22.000000000 -0500 ++++ ink-0.4.1/Makefile 2008-01-06 13:52:42.531413083 -0600 +@@ -1,12 +1,13 @@ +-CFLAGS = -Wall -O2 -L$(PWD)/../../../libinklevel/cvs/libinklevel \ ++CFLAGS += -Wall -O2 -L$(PWD)/../../../libinklevel/cvs/libinklevel \ + -I$(PWD)/../../../libinklevel/cvs/libinklevel -linklevel +-DESTDIR = /usr/local/ ++DESTDIR= ++PREFIX = /usr/local/ + + all: ink + + install: all +- mkdir -p $(DESTDIR)/bin +- install -m 755 -o root -g root ink $(DESTDIR)/bin/ink ++ mkdir -p $(DESTDIR)/$(PREFIX)/bin ++ install -m 755 -o root -g root ink $(DESTDIR)/$(PREFIX)/bin/ink + + clean: + rm -fr ink *.o *~ diff --git a/system/ink/ink.SlackBuild b/system/ink/ink.SlackBuild index b344b72592..c1dbb40050 100644 --- a/system/ink/ink.SlackBuild +++ b/system/ink/ink.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for ink -# 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,46 +22,55 @@ # 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=ink -VERSION=0.3.1 +VERSION=0.4.1 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 || exit 1 -rm -rf $PRGNAM -tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1 -cd $PRGNAM || exit 1 +cd $TMP +rm -rf $PRGNAM-$VERSION +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 {} \; + +# Patch the Makefile to fix DESTDIR and add PREFIX +# Sent upstream 20070106 --rworkman +patch -p1 < $CWD/ink-0.4.1-Makefile.diff -# Don't set uid and gid during install; we'll handle it in the build script -cat $CWD/Makefile.diff | patch -p1 || exit 1 -make || exit 1 -make install DESTDIR=$PKG/usr || exit 1 +CFLAGS="$SLKCFLAGS" make +make PREFIX=/usr DESTDIR=$PKG install -( cd $PKG - find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -) +strip --strip-unneeded $PKG/usr/bin/ink # No man pages mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README +cp -a AUTHORS COPYING README $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -chown -R root.root . /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz - diff --git a/system/ink/ink.info b/system/ink/ink.info index fa802d966a..2c554582d1 100644 --- a/system/ink/ink.info +++ b/system/ink/ink.info @@ -1,8 +1,8 @@ PRGNAM="ink" -VERSION="0.3.1" +VERSION="0.4.1" HOMEPAGE="http://ink.sourceforge.net/" -DOWNLOAD="http://dl.sourceforge.net/ink/ink-0.3.1.tar.gz" -MD5SUM="3f1df6868b7a7503b7551b3017e11f2d" +DOWNLOAD="http://downloads.sourceforge.net/ink/ink-0.4.1.tar.gz" +MD5SUM="7234ef5ab8982417c6443767dd0f46cd" MAINTAINER="Robby Workman" EMAIL="rw@rlworkman.net" -APPROVED="robw810,elohim" +APPROVED="BP{k}" diff --git a/system/ink/slack-desc b/system/ink/slack-desc index 4cfecb4307..7e2b16ce0b 100644 --- a/system/ink/slack-desc +++ b/system/ink/slack-desc @@ -1,9 +1,19 @@ +# 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 ':'. -ink: printer ink level monitor + |-----handy-ruler------------------------------------------------------| +ink: ink (printer ink level monitor) ink: -ink: Ink is a command line tool for checking the ink level of your printer +ink: Ink is a command line tool for checking the ink level of your printer ink: on a system which runs Linux. It makes use of libinklevel. ink: ink: Homepage: http://ink.sourceforge.net/ ink: ink: +ink: +ink: +ink: |