diff options
author | Frank Caraballo <fecaraballo{at}gmail{dot}com> | 2010-05-12 17:36:44 +0200 |
---|---|---|
committer | David Somero <xgizzmo@slackbuilds.org> | 2010-05-12 17:36:44 +0200 |
commit | 015701f9930331433dcb5cc131bd94ecbb26b199 (patch) | |
tree | 3960d4dabae3c80bff57dcf8ccd5c20379c20ab6 /academic | |
parent | 8b72deef213907f7743fc9d6c7c6e776da4d1abb (diff) |
academic/tuxtype2: Updated for version 1.5.3
Diffstat (limited to 'academic')
-rw-r--r-- | academic/tuxtype2/README | 1 | ||||
-rw-r--r-- | academic/tuxtype2/doinst.sh | 5 | ||||
-rw-r--r-- | academic/tuxtype2/slack-desc | 10 | ||||
-rw-r--r-- | academic/tuxtype2/tuxtype2.SlackBuild | 38 | ||||
-rw-r--r-- | academic/tuxtype2/tuxtype2.desktop | 2 | ||||
-rw-r--r-- | academic/tuxtype2/tuxtype2.info | 4 |
6 files changed, 31 insertions, 29 deletions
diff --git a/academic/tuxtype2/README b/academic/tuxtype2/README index c6d68cc44d74a..17a44b12528d8 100644 --- a/academic/tuxtype2/README +++ b/academic/tuxtype2/README @@ -1,4 +1,3 @@ "Tux Typing" is an educational typing tutor for children. It features several different types of gameplay, at a variety of difficulty levels. - diff --git a/academic/tuxtype2/doinst.sh b/academic/tuxtype2/doinst.sh index 98d466d8b908b..392c12adb9bd3 100644 --- a/academic/tuxtype2/doinst.sh +++ b/academic/tuxtype2/doinst.sh @@ -1,3 +1,4 @@ -if [ -x usr/bin/update-desktop-database ]; then - ./usr/bin/update-desktop-database ./usr/share/applications >/dev/null 2>&1 +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications fi + diff --git a/academic/tuxtype2/slack-desc b/academic/tuxtype2/slack-desc index 41bd6b5046abf..a2d95341c1b75 100644 --- a/academic/tuxtype2/slack-desc +++ b/academic/tuxtype2/slack-desc @@ -1,11 +1,11 @@ # HOW TO EDIT THIS FILE: # The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. - |-----handy-ruler------------------------------------------------------| + |-----handy-ruler------------------------------------------------------| tuxtype2: Tux Typing 2 (Educational Typing Tutor) tuxtype2: tuxtype2: "Tux Typing" is an educational typing tutor for children. It diff --git a/academic/tuxtype2/tuxtype2.SlackBuild b/academic/tuxtype2/tuxtype2.SlackBuild index 9e570f66b1aa4..2cfbef2b91a30 100644 --- a/academic/tuxtype2/tuxtype2.SlackBuild +++ b/academic/tuxtype2/tuxtype2.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for Tux Typing 2 -# Copyright 2007 Frank Caraballo - fecaraballo[AT]gmail.com +# Copyright 2007, 2008 Frank Caraballo <fecaraballo{at}gmail{dot}com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,18 +22,12 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Slight modification by the SlackBuild project - -if [ "$(id -u)" != "0" ]; then - echo "This script must be run as root!" - exit 1 -fi - PRGNAM=tuxtype2 -VERSION=1.5.3 +VERSION=${VERSION:-1.5.3} ARCH=${ARCH:-i486} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} + CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM @@ -43,16 +37,22 @@ if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" elif [ "$ARCH" = "i686" ]; then 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 $PRGNAM-$VERSION -tar -xvf $CWD/$PRGNAM-$VERSION.tar.* || exit 1 +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* || exit 1 cd $PRGNAM-$VERSION || exit 1 chown -R root:root . -chmod -R u+w,go+r-w,a-s . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -60,6 +60,7 @@ CXXFLAGS="$SLKCFLAGS" \ --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ + --build=$ARCH-slackware-linux \ || exit 1 make || exit 1 @@ -68,14 +69,15 @@ make install-strip DESTDIR=$PKG || exit 1 mv $PKG/usr/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +mkdir -p $PKG/usr/share/{applications,pixmaps} +cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop +( cd $PKG/usr/share/pixmaps + ln -s ../tuxtype2/tuxtype2.ico tuxtype2.png +) + mkdir -p $PKG/install -cat $CWD/doinst.sh > $PKG/install/doinst.sh cat $CWD/slack-desc > $PKG/install/slack-desc - -mkdir -p $PKG/usr/share/applications -cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop -mkdir -p $PKG/usr/share/pixmaps -( cd $PKG/usr/share/pixmaps ; ln -sf ../tuxtype2/data/images/tux0.png tuxtype2.png ) +cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz diff --git a/academic/tuxtype2/tuxtype2.desktop b/academic/tuxtype2/tuxtype2.desktop index 8ea1a0f442718..4f65a3a253f09 100644 --- a/academic/tuxtype2/tuxtype2.desktop +++ b/academic/tuxtype2/tuxtype2.desktop @@ -6,5 +6,5 @@ Exec=tuxtype2 Terminal=false Type=Application Categories=Application;Education -Icon=/usr/share/pixmaps/tuxtype2.png +Icon=tuxtype2.png StartupNotify=false diff --git a/academic/tuxtype2/tuxtype2.info b/academic/tuxtype2/tuxtype2.info index 9b080fbfd983f..9dfbba95ec25b 100644 --- a/academic/tuxtype2/tuxtype2.info +++ b/academic/tuxtype2/tuxtype2.info @@ -1,8 +1,8 @@ PRGNAM="tuxtype2" VERSION="1.5.3" HOMEPAGE="http://tuxtype.sourceforge.net/" -DOWNLOAD="http://dl.sourceforge.net/tuxtype/tuxtype2-1.5.3.tar.bz2" +DOWNLOAD="http://downloads.sourceforge.net/tuxtype/tuxtype2-1.5.3.tar.bz2" MD5SUM="ca04e65d3b19ddeeedb8a49147ed642b" MAINTAINER="Frank Caraballo" EMAIL="fecaraballo{at}gmail{dot}com" -APPROVED="BP{k}" +APPROVED="dsomero" |