system/ink: Updated for version 0.5.0

4 files changed, 26 insertions, 32 deletions

diff --git a/system/ink/ink-0.4.1-Makefile.diff b/system/ink/ink-0.4.1-Makefile.diff
deleted file mode 100644
index 05c6741e62d91..0000000000000
--- a/system/ink/ink-0.4.1-Makefile.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-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-0.5.0-Makefile.patch b/system/ink/ink-0.5.0-Makefile.patch
new file mode 100644
index 0000000000000..3179b24474135
--- /dev/null
+++ b/system/ink/ink-0.5.0-Makefile.patch
@@ -0,0 +1,11 @@
+diff -Nur ink-0.5.0.orig/Makefile ink-0.5.0/Makefile
+--- ink-0.5.0.orig/Makefile	2009-01-24 08:42:14.000000000 -0600
++++ ink-0.5.0/Makefile	2009-06-27 00:15:12.457466539 -0500
+@@ -1,6 +1,6 @@
+ DESTDIR = 
+ PREFIX = /usr/local/
+-CFLAGS += -Wall -O2 -linklevel
++CFLAGS += -Wall $(EXTRA_CFLAGS) -linklevel
+ CC = gcc
+ OS=linux
+ 
diff --git a/system/ink/ink.SlackBuild b/system/ink/ink.SlackBuild
index c1dbb400500c5..671723942304f 100644
--- a/system/ink/ink.SlackBuild
+++ b/system/ink/ink.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for ink
 
-# Copyright 2006-2008  Robby Workman (http://rlworkman.net)
+# Copyright 2006-2009  Robby Workman (http://rlworkman.net)
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ink
-VERSION=0.4.1
+VERSION=0.5.0
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -35,8 +35,13 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e
@@ -54,11 +59,8 @@ find . \
  \( -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
-
-CFLAGS="$SLKCFLAGS" make
+patch -p1 < $CWD/ink-0.5.0-Makefile.patch
+make EXTRA_CFLAGS="$SLKCFLAGS"
 make PREFIX=/usr DESTDIR=$PKG install
 
 strip --strip-unneeded $PKG/usr/bin/ink
@@ -73,4 +75,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.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/ink/ink.info b/system/ink/ink.info
index 2c554582d156a..2f12d55b82b23 100644
--- a/system/ink/ink.info
+++ b/system/ink/ink.info
@@ -1,8 +1,10 @@
 PRGNAM="ink"
-VERSION="0.4.1"
+VERSION="0.5.0"
 HOMEPAGE="http://ink.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/ink/ink-0.4.1.tar.gz"
-MD5SUM="7234ef5ab8982417c6443767dd0f46cd"
+DOWNLOAD="http://downloads.sourceforge.net/ink/ink-0.5.0.tar.gz"
+DOWNLOAD_x86_64=""
+MD5SUM="ddbbc4164384fc7185bc07b7602e4a8d"
+MD5SUM_x86_64=""
 MAINTAINER="Robby Workman"
 EMAIL="rw@rlworkman.net"
 APPROVED="BP{k}"