3 files changed, 21 insertions, 31 deletions
diff --git a/games/nestopia/nestopia.SlackBuild b/games/nestopia/nestopia.SlackBuild
index 1fa5ae5065b6..c993882c7995 100644
--- a/games/nestopia/nestopia.SlackBuild
+++ b/games/nestopia/nestopia.SlackBuild
@@ -5,11 +5,7 @@
 # Written by Dugan Chen (thedoogster@gmail.com)
 
 PRGNAM=nestopia
-VERSION=${VERSION:-1.40}
-
-SRCVER=${SRCVER:-140}
-LINUXVER=${LINUXVER:-h}
-
+VERSION=${VERSION:-20120918_334cc05}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -27,13 +23,13 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  SLKCFLAGS="-O3 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  SLKCFLAGS="-O3 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
+  SLKCFLAGS="-O3 -fPIC"
   LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
@@ -46,11 +42,9 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 
 cd $TMP
-rm -rf $PRGNAM-$VERSION$LINUXVER
-mkdir $PRGNAM-$VERSION$LINUXVER
-cd $PRGNAM-$VERSION$LINUXVER
-unzip $CWD/Nestopia${SRCVER}src.zip
-unzip $CWD/nst${SRCVER}_lnx_release_$LINUXVER.zip
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
+cd $PRGNAM-$VERSION
 
 chown -R root:root .
 find . \
@@ -59,26 +53,24 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" make
+sed -i -e "s|/local||" -e "s|-O3 -g3|${SLKCFLAGS}|" Makefile
 
-mkdir -p $PKG/usr/bin
-install -D -m755 nst $PKG/usr/bin/
+make -j1
 
-mkdir -p $PKG/usr/share/$PRGNAM
-install -m644 nstcontrols $PKG/usr/share/$PRGNAM/
-install -m644 NstDatabase.xml $PKG/usr/share/$PRGNAM/
+install -m0755 -D $PRGNAM $PKG/usr/bin/$PRGNAM
+install -m0644 -D NstDatabase.xml $PKG/usr/share/$PRGNAM/NstDatabase.xml
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION$LINUXVER
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  COPYING Makefile README.Linux changelog.txt copying.txt readme.html doc/* \
-  $PKG//usr/doc/$PRGNAM-$VERSION$LINUXVER
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION$LINUXVER/$PRGNAM.SlackBuild
+  COPYING README changelog.* readme.html doc/* \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION$LINUXVER-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/nestopia/nestopia.info b/games/nestopia/nestopia.info
index aaeec842987b..7fb9c4d6b227 100644
--- a/games/nestopia/nestopia.info
+++ b/games/nestopia/nestopia.info
@@ -1,10 +1,8 @@
 PRGNAM="nestopia"
-VERSION="1.40h"
-HOMEPAGE="http://rbelmont.mameworld.info/?page_id=200"
-DOWNLOAD="http://downloads.sourceforge.net/project/nestopia/Nestopia/v1.40/Nestopia140src.zip \
-          http://rbelmont.mameworld.info/nst140_lnx_release_h.zip"
-MD5SUM="526c99a06d2b257135e7047b0ed95ae0 \
-        f9a9a905bada67e11dac1364612d0b35"
+VERSION="20120918_334cc05"
+HOMEPAGE="http://0ldsk00l.ca/nestopia.html"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/nestopia-20120918_334cc05.tar.xz"
+MD5SUM="dadba73e2cc3d52bd7da53d62ee9f026"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/games/nestopia/slack-desc b/games/nestopia/slack-desc
index e919c2a75826..2ed4dc491d9e 100644
--- a/games/nestopia/slack-desc
+++ b/games/nestopia/slack-desc
@@ -13,7 +13,7 @@ nestopia: It strives for the most accurate emulation possible at the pixel-by-
 nestopia: pixel and sample-by-sample level. It was also one of the inspirations
 nestopia: for bsnes.
 nestopia:
-nestopia: http://rbelmont.mameworld.info/?page_id=200
+nestopia: http://0ldsk00l.ca/nestopia.html
 nestopia:
 nestopia:
 nestopia: