development/Amaya: Updated for version 10.0.1

3 files changed, 26 insertions, 19 deletions

diff --git a/development/Amaya/Amaya.SlackBuild b/development/Amaya/Amaya.SlackBuild
index 13c1361046..a1931b7f45 100644
--- a/development/Amaya/Amaya.SlackBuild
+++ b/development/Amaya/Amaya.SlackBuild
@@ -29,37 +29,44 @@
 # 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.
+#
+#
+# Changed to version 10.0.1 by ks/30.08.2008
 
 set -e
 
 PRGNAM=Amaya
-VERSION=9.54
+VERSION=10.0.1
+SRCVER=10.0
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
-    SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
-    SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
 fi
 
 rm -rf $PKG 
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP || exit 1
-rm -rf $TMP/$PRGNAM$VERSION
-tar -xzvf $CWD/$(echo $PRGNAM |tr [A] [a])-sources-$VERSION.tgz || exit 1
+rm -rf $TMP/$PRGNAM$SRCVER
+tar -xzvf $CWD/$(echo $PRGNAM |tr [A] [a])-sources-$VERSION.tgz
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
 # Creating a subdirectory as specified in the README as we Have to run 
 # configure from within a subdir
-mkdir $PRGNAM$VERSION/$PRGNAM/Slackware 
-cd $PRGNAM$VERSION/$PRGNAM/Slackware
+mkdir -p $PRGNAM$SRCVER/$PRGNAM/Slackware 
+cd $PRGNAM$SRCVER/$PRGNAM/Slackware
 
 CFLAGS="$SLKFLAGS" \
 	../configure \
@@ -68,21 +75,21 @@ CFLAGS="$SLKFLAGS" \
 	--sysconfdir=$PKG/etc \
 	--localstatedir=$PKG/var 
 
-make || exit 1
-make install || exit 1
+make
+make install
 
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION 
-cp -a $TMP/$PRGNAM$VERSION/$PRGNAM/README* $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $TMP/$PRGNAM$SRCVER/$PRGNAM/README* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 # Creating /usr/bin/amaya-wx symbolic link
 mkdir -p $PKG/usr/bin
 ( cd $PKG/usr/bin
-  ln -sf ../../opt/$PRGNAM-$VERSION/wx/bin/amaya amaya
+  ln -sf ../../opt/$PRGNAM/wx/bin/amaya amaya
 )
 
 # Deleting useless files
@@ -98,5 +105,5 @@ 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.tgz || exit 1
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz 
 
diff --git a/development/Amaya/Amaya.desktop b/development/Amaya/Amaya.desktop
index 42ac41b93b..1805176ffb 100644
--- a/development/Amaya/Amaya.desktop
+++ b/development/Amaya/Amaya.desktop
@@ -3,7 +3,7 @@ Encoding=UTF-8
 Name=Amaya
 Comment=Edit the Web
 Categories=Application;Development;
-Exec=/opt/Amaya-9.54/wx/bin/amaya %u
+Exec=/opt/Amaya/wx/bin/amaya %u
 Icon=/usr/share/pixmaps/Amaya.png
 Terminal=false
 Type=Application
diff --git a/development/Amaya/Amaya.info b/development/Amaya/Amaya.info
index c60754d7c8..6b96271f6c 100644
--- a/development/Amaya/Amaya.info
+++ b/development/Amaya/Amaya.info
@@ -1,8 +1,8 @@
 PRGNAM="Amaya"
-VERSION="9.54"
+VERSION="10.0.1"
 HOMEPAGE="http://www.w3.org/Amaya"
-DOWNLOAD="http://www.w3.org/Amaya/Distribution/amaya-sources-9.54.tgz"
-MD5SUM="d907d6e9fc349e4eaeca49c163a6829f"
-MAINTAINER="Alex Lysenka"
-EMAIL="me@alkos333.net"
-APPROVED="BP{k}"
+DOWNLOAD="ftp://ftp.w3.org/pub/amaya/amaya-sources-10.0.1.tgz"
+MD5SUM="0a32af56cf81c13b6efc5c65c2137859"
+MAINTAINER="Kai Schreyer"
+EMAIL="kabrus@go4more.de"
+APPROVED="David Somero"
\ No newline at end of file