From 4505a4b576fa89e2d53269aef8d80accacaadc41 Mon Sep 17 00:00:00 2001
From: Niels Horn <niels.horn@gmail.com>
Date: Sat, 3 Sep 2011 09:21:33 -0400
Subject: system/herculesstudio: Updated for version 1.3.0.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
---
 system/herculesstudio/herculesstudio.SlackBuild | 42 +++++++++++++++++++------
 system/herculesstudio/herculesstudio.info       |  6 ++--
 2 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/system/herculesstudio/herculesstudio.SlackBuild b/system/herculesstudio/herculesstudio.SlackBuild
index 11ab7b9cb128..1a895ad49be9 100644
--- a/system/herculesstudio/herculesstudio.SlackBuild
+++ b/system/herculesstudio/herculesstudio.SlackBuild
@@ -3,11 +3,30 @@
 # Slackware build script for herculesstudio
 # a GUI for the Hercules Emulator
 
-# Written by Niels Horn <niels.horn@gmail.com>
-# revision date 2010/08/21
+# Copyright 2010-2011 Niels Horn, Rio de Janeiro, RJ, Brazil
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# 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.
+
+# revision date 2011/08/08
 
 PRGNAM=herculesstudio
-VERSION=${VERSION:-1.2.0}
+VERSION=${VERSION:-1.3.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -45,9 +64,11 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGUNTARRED
+rm -rf $PRGNAM-$VERSION
+# the tarball untars in the current directory...
+mkdir $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION-src.tar.gz
-cd $PRGUNTARRED
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -59,7 +80,13 @@ find . \
 sed -i "s,/usr/local/,/usr/,g" $PRGUNTARRED.pro
 
 qmake
-make
+
+# Accept our CXXFLAGS
+sed -i "/^CXXFLAGS/s/=/+=/" Makefile.Release
+
+# Set CXXFLAGS and force CXX directly to g++ so that we have verbose output
+CXXFLAGS="$SLKCFLAGS" \
+  make CXX=g++
 make install INSTALL_ROOT=$PKG
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
@@ -70,7 +97,6 @@ mkdir -p $PKG/usr/share/{applications,pixmaps}
 cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
 cat $CWD/$PRGNAM.png > $PKG/usr/share/pixmaps/$PRGNAM.png
 
-# Copy documentation to the docs directory
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   COPYING INSTALL INSTALL-BIN \
@@ -81,7 +107,5 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
-# Build the package
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
-
diff --git a/system/herculesstudio/herculesstudio.info b/system/herculesstudio/herculesstudio.info
index 1cca65fca0c2..6645b782d579 100644
--- a/system/herculesstudio/herculesstudio.info
+++ b/system/herculesstudio/herculesstudio.info
@@ -1,8 +1,8 @@
 PRGNAM="herculesstudio"
-VERSION="1.2.0"
+VERSION="1.3.0"
 HOMEPAGE="http://www.mvsdasd.org/hercstudio/"
-DOWNLOAD="http://www.mvsdasd.org/hercstudio/herculesstudio-1.2.0-src.tar.gz"
-MD5SUM="0ff659c6cd958cf22fb87e746e1b652b"
+DOWNLOAD="http://www.mvsdasd.org/hercstudio/herculesstudio-1.3.0-src.tar.gz"
+MD5SUM="79c2f6bb9de1a572f113e89d9f7e32f8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Niels Horn"
-- 
cgit v1.2.3