From 9ba99400038f7aa2a37c59a722b52eff0ea43f51 Mon Sep 17 00:00:00 2001 From: "B. Watson" Date: Tue, 21 Mar 2017 21:44:15 -0400 Subject: [PATCH] python/pygame: s/NAME/PRGNAM/g, i486=>i586. Signed-off-by: B. Watson Signed-off-by: David Spencer --- python/pygame/pygame.SlackBuild | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/python/pygame/pygame.SlackBuild b/python/pygame/pygame.SlackBuild index cabc340de3..9267ec0cdb 100644 --- a/python/pygame/pygame.SlackBuild +++ b/python/pygame/pygame.SlackBuild @@ -4,14 +4,14 @@ # Modified by the SlackBuilds.org project # Modified by Bojan Popovic (bocke@slackware-srbija.org), 2014. -NAME=pygame +PRGNAM=pygame VERSION=${VERSION:-1.9.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -19,13 +19,13 @@ fi CWD=$(pwd) TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$NAME +PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} SRCVERSION=${VERSION}release -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" elif [ "$ARCH" = "x86_64" ]; then @@ -39,9 +39,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP || exit 1 -rm -rf $NAME-$SRCVERSION -tar xvf $CWD/$NAME-$SRCVERSION.tar.?z* || exit 1 -cd $NAME-$SRCVERSION || exit 1 +rm -rf $PRGNAM-$SRCVERSION +tar xvf $CWD/$PRGNAM-$SRCVERSION.tar.?z* || exit 1 +cd $PRGNAM-$SRCVERSION || exit 1 chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -59,12 +59,12 @@ python setup.py install --root=$PKG find $PKG | xargs 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/$NAME-$VERSION -cp -a WHATSNEW README.txt $PKG/usr/doc/$NAME-$VERSION -cat $CWD/$NAME.SlackBuild > $PKG/usr/doc/$NAME-$VERSION/$NAME.SlackBuild +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a WHATSNEW README.txt $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 -p $OUTPUT/$NAME-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}