development/amaya: Misc. changes + new license

Signed-off-by: Niels Horn <niels.horn@slackbuilds.org>

4 files changed, 30 insertions, 5 deletions

diff --git a/development/amaya/amaya.SlackBuild b/development/amaya/amaya.SlackBuild
index 3661c3ec9f..6417cea649 100644
--- a/development/amaya/amaya.SlackBuild
+++ b/development/amaya/amaya.SlackBuild
@@ -2,13 +2,32 @@
 
 # Slackware build script for amaya
 
-# Written by Vincent Batts, http://hashbangbash.com/
+# Copyright 2010  Vincent Batts, vbatts@hashbangbash.com, http://hashbangbash.com/
+# Copyright 2010, 2011  Vincent Batts, Vienna, VA, USA
+# 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.
 
 # Modified by the SlackBuilds.org team
 
 PRGNAM=amaya
 VERSION=${VERSION:-11.3.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -83,7 +102,9 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 # silly hack to link correctly
-rm -r $PKG/opt/bin/
+if [ -d $PKG/opt/bin ] ; then
+  rm -r $PKG/opt/bin/
+fi
 mkdir -p $PKG/usr/bin
 ( cd $PKG/usr/bin/ ; ln -s ../../opt/Amaya/wx/bin/$PRGNAM )
 
@@ -99,6 +120,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/amaya/amaya.info b/development/amaya/amaya.info
index dcf13368eb..4a5785bdc5 100644
--- a/development/amaya/amaya.info
+++ b/development/amaya/amaya.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Vincent Batts"
 EMAIL="vbatts@hashbangbash.com"
-APPROVED="rworkman"
+APPROVED="Niels Horn"
diff --git a/development/amaya/doinst.sh b/development/amaya/doinst.sh
new file mode 100644
index 0000000000..5fb28930db
--- /dev/null
+++ b/development/amaya/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
diff --git a/development/amaya/slack-desc b/development/amaya/slack-desc
index 9f6810be08..5576c00302 100644
--- a/development/amaya/slack-desc
+++ b/development/amaya/slack-desc
@@ -7,7 +7,7 @@
 
      |-----handy-ruler------------------------------------------------------|
 amaya: amaya (W3 Web Editor)
-amaya: 
+amaya:
 amaya: Amaya is a Web editor, i.e. a tool used to create and update 
 amaya: documents directly on the Web.  Browsing features are seamlessly 
 amaya: integrated with the editing and remote access features in a