From 15ec87e7111bd3562fe549556a097bacc8d884c3 Mon Sep 17 00:00:00 2001
From: Corrado Franco <conraid@gmail.com>
Date: Wed, 12 May 2010 17:42:47 +0200
Subject: [PATCH] multimedia/nted: Updated for version 1.5.1

---
 multimedia/nted/README          |  2 ++
 multimedia/nted/doinst.sh       |  1 -
 multimedia/nted/nted.SlackBuild | 16 +++++++++-------
 multimedia/nted/nted.info       |  9 ++++-----
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/multimedia/nted/README b/multimedia/nted/README
index 711aee1e4f..bd9f2f11a3 100644
--- a/multimedia/nted/README
+++ b/multimedia/nted/README
@@ -1,3 +1,5 @@
+NtEd
+
 NtEd is a GTK+ score editor. It intends to be really WYSIWYG: what 
 you see on the screen is exactly what you get on printer output. It 
 supports up to 4 voices per staff, drum notes, 5 lyrics lines, 
diff --git a/multimedia/nted/doinst.sh b/multimedia/nted/doinst.sh
index f03388f6c5..faca4c917c 100644
--- a/multimedia/nted/doinst.sh
+++ b/multimedia/nted/doinst.sh
@@ -1,4 +1,3 @@
-
 if [ -x /usr/bin/update-desktop-database ]; then
   ./usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1
 fi
diff --git a/multimedia/nted/nted.SlackBuild b/multimedia/nted/nted.SlackBuild
index 357208cd9c..75110d9325 100644
--- a/multimedia/nted/nted.SlackBuild
+++ b/multimedia/nted/nted.SlackBuild
@@ -1,5 +1,5 @@
 #!/bin/sh
-#
+
 # Slackware build script for nted
 #(http://vsr.informatik.tu-chemnitz.de/staff/jan/nted/nted.xhtml)
 #
@@ -22,11 +22,11 @@
 # WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# Modified by SlackBuilds.org
+
+# Modified by the SlackBuilds.org project
 
 PRGNAM=nted
-VERSION=${VERSION:-1.4.15}	
+VERSION=${VERSION:-1.5.1}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -40,10 +40,13 @@ DOCS="ABOUT* AUTHORS COPYING* ChangeLog FAQ INSTALL NEWS README"
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  SLKLDFLAGS=""; LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  SLKLDFLAGS=""; LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64"
 fi
 
 set -e
@@ -61,11 +64,12 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Configure
+LDFLAGS="$SLKLDFLAGS" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
@@ -89,11 +93,9 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
   for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
 )
 
-# Add slack-desc
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
-# Create package:
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
diff --git a/multimedia/nted/nted.info b/multimedia/nted/nted.info
index bbe1fa90ea..a0de7f8cd4 100644
--- a/multimedia/nted/nted.info
+++ b/multimedia/nted/nted.info
@@ -1,9 +1,8 @@
 PRGNAM="nted"
-VERSION="1.4.15"
+VERSION="1.5.1"
 HOMEPAGE="http://vsr.informatik.tu-chemnitz.de/staff/jan/nted/nted.xhtml"
-DOWNLOAD="http://vsr.informatik.tu-chemnitz.de/staff/jan/nted/nted-1.4.15.tar.gz"
-MD5SUM="563e50c166bcb1b3a7c81e108c827d84"
+DOWNLOAD="http://vsr.informatik.tu-chemnitz.de/staff/jan/nted/nted-1.5.1.tar.gz"
+MD5SUM="8de2a5a9b0632b957f94518ec2f91497"
 MAINTAINER="Corrado Franco"
-EMAIL="conraid@gmail.com"
+EMAIL="conraid@gmail.com" 
 APPROVED="dsomero"
- 
\ No newline at end of file