[Scummvm-cvs-logs] SF.net SVN: scummvm:[48963] scummvm/trunk/dists/slackware

[fingolfin at users.sourceforge.net]

Revision: 48963
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48963&view=rev
Author:   fingolfin
Date:     2010-05-07 11:18:18 +0000 (Fri, 07 May 2010)

Log Message:
-----------
Update scummvm.SlackBuild based on discussion with Robert Kelsen

Modified Paths:
--------------
    scummvm/trunk/dists/slackware/scummvm.SlackBuild
    scummvm/trunk/dists/slackware/scummvm.SlackBuild.in

Property Changed:
----------------
    scummvm/trunk/dists/slackware/scummvm.SlackBuild
    scummvm/trunk/dists/slackware/scummvm.SlackBuild.in

Modified: scummvm/trunk/dists/slackware/scummvm.SlackBuild
===================================================================
--- scummvm/trunk/dists/slackware/scummvm.SlackBuild	2010-05-07 07:56:57 UTC (rev 48962)
+++ scummvm/trunk/dists/slackware/scummvm.SlackBuild	2010-05-07 11:18:18 UTC (rev 48963)
@@ -1,6 +1,7 @@
 #!/bin/sh
 # ScummVM Slackware 9(.1) Package Creation Script
-# by Jay Lanagan - roni at parodius.com
+# Initial version by Jay Lanagan <roni at parodius.com>
+# Updated by Robert Kelsen <rkelsen at optusnet.com.au>
 
 CWD=`pwd`
 if [ "$TMP" = "" ]; then
@@ -19,37 +20,17 @@
   mkdir -p $PKG
 fi
 
-cd $TMP
-# tar xzvf scummvm-$VERSION.tgz
-tar xzvf scummvm-$VERSION.tar.gz
-# cd scummvm-$VERSION
-cd scummvm
-chown -R root.root .
-CXXFLAGS="-O2 -march=i486 -mcpu=i686" \
-./configure
+#cd $TMP
+tar xvf scummvm-$VERSION.tar.bz2
+cd scummvm-$VERSION
+./configure --prefix=/usr --bindir=/usr/games
 make
 strip scummvm
-chmod 755 scummvm
-mkdir -p $PKG/usr/bin
-cp scummvm $PKG/usr/bin
-chown -R root:bin $PKG/usr/bin
-gzip -9 dists/scummvm.6
-mkdir -p $PKG/usr/man/man6
-cp dists/scummvm.6.gz $PKG/usr/man/man6
-mkdir -p $PKG/usr/doc/scummvm-$VERSION
-cp -a AUTHORS COPYING COPYRIGHT ChangeLog NEWS README TODO \
-  $PKG/usr/doc/scummvm-$VERSION
-chmod 644 $PKG/usr/doc/scummvm-$VERSION
+make install DESTDIR=$PKG
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-mkdir -p $PKG/usr/share/pixmaps
-cp -a icons/scummvm.ico icons/scummvm.xpm \
-  $PKG/usr/share/pixmaps
-mkdir -p $PKG/usr/share/applications
-cp -a dists/scummvm.desktop \
-  $PKG/usr/share/applications
-
 cd $PKG
+chown -R root.root .
 makepkg -l y -c n $TMP/scummvm-$VERSION-$ARCH-$BUILD.tgz
 
 if [ "$1" = "--cleanup" ]; then

Modified: scummvm/trunk/dists/slackware/scummvm.SlackBuild.in
===================================================================
--- scummvm/trunk/dists/slackware/scummvm.SlackBuild.in	2010-05-07 07:56:57 UTC (rev 48962)
+++ scummvm/trunk/dists/slackware/scummvm.SlackBuild.in	2010-05-07 11:18:18 UTC (rev 48963)
@@ -1,6 +1,7 @@
 #!/bin/sh
 # ScummVM Slackware 9(.1) Package Creation Script
-# by Jay Lanagan - roni at parodius.com
+# Initial version by Jay Lanagan <roni at parodius.com>
+# Updated by Robert Kelsen <rkelsen at optusnet.com.au>
 
 CWD=`pwd`
 if [ "$TMP" = "" ]; then
@@ -19,37 +20,17 @@
   mkdir -p $PKG
 fi
 
-cd $TMP
-# tar xzvf scummvm-$VERSION.tgz
-tar xzvf scummvm-$VERSION.tar.gz
-# cd scummvm-$VERSION
-cd scummvm
-chown -R root.root .
-CXXFLAGS="-O2 -march=i486 -mcpu=i686" \
-./configure
+#cd $TMP
+tar xvf scummvm-$VERSION.tar.bz2
+cd scummvm-$VERSION
+./configure --prefix=/usr --bindir=/usr/games
 make
 strip scummvm
-chmod 755 scummvm
-mkdir -p $PKG/usr/bin
-cp scummvm $PKG/usr/bin
-chown -R root:bin $PKG/usr/bin
-gzip -9 dists/scummvm.6
-mkdir -p $PKG/usr/man/man6
-cp dists/scummvm.6.gz $PKG/usr/man/man6
-mkdir -p $PKG/usr/doc/scummvm-$VERSION
-cp -a AUTHORS COPYING COPYRIGHT ChangeLog NEWS README TODO \
-  $PKG/usr/doc/scummvm-$VERSION
-chmod 644 $PKG/usr/doc/scummvm-$VERSION
+make install DESTDIR=$PKG
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-mkdir -p $PKG/usr/share/pixmaps
-cp -a icons/scummvm.ico icons/scummvm.xpm \
-  $PKG/usr/share/pixmaps
-mkdir -p $PKG/usr/share/applications
-cp -a dists/scummvm.desktop \
-  $PKG/usr/share/applications
-
 cd $PKG
+chown -R root.root .
 makepkg -l y -c n $TMP/scummvm-$VERSION-$ARCH-$BUILD.tgz
 
 if [ "$1" = "--cleanup" ]; then


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.