diff options
author | Eric Hameleers <alien@slackware.com> | 2008-05-08 07:58:45 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2008-05-08 07:58:45 +0000 |
commit | 61ccb3358e0e53cc424410d48d9217cc53c1bd69 (patch) | |
tree | a1a74bde5c8b86c66169ddc6cdcc502d8255382f | |
parent | 8b3dbec6151a33543e22033748c0f54b44cce896 (diff) | |
download | asb-61ccb3358e0e53cc424410d48d9217cc53c1bd69.tar.gz asb-61ccb3358e0e53cc424410d48d9217cc53c1bd69.tar.xz |
Add TAG=alien ; change SRCDIR determination ; add SlackBuild to docdir
-rwxr-xr-x | jasper/build/jasper.SlackBuild | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/jasper/build/jasper.SlackBuild b/jasper/build/jasper.SlackBuild index 00871a65..f25728ac 100755 --- a/jasper/build/jasper.SlackBuild +++ b/jasper/build/jasper.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh # $Id$ -# Copyright (c) 2007 Eric Hameleers <alien@slackware.com> +# Copyright (c) 2007-2008 Eric Hameleers <alien@slackware.com> # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -45,13 +45,12 @@ PRGNAM=jasper VERSION=${VERSION:-1.900.1} ARCH=${ARCH:-i486} BUILD=${BUILD:-1} +TAG=${TAG:-alien} DOCS="ChangeLog COPYRIGHT INSTALL LICENSE NEWS README doc/jasper.pdf" # Where do we look for sources? -CWD=$(pwd) -SRCDIR=$(dirname $0) -[ "${SRCDIR:0:1}" == "." ] && SRCDIR=${CWD}/${SRCDIR} +SRCDIR=$(cd $(dirname $0); pwd) # Place to build (TMP) package (PKG) and output (OUTPUT) the program: TMP=${TMP:-/tmp/build} @@ -103,10 +102,10 @@ esac # Create working directories: mkdir -p $TMP/tmp-$PRGNAM # location to build the source -rm -rf $TMP/tmp-$PRGNAM/* # Delete remnants of previous build -mkdir -p $PKG # place for the package to be built -rm -rf $PKG/* # We always erase old package's contents: -mkdir -p $OUTPUT # place for the package to be saved +rm -rf $TMP/tmp-$PRGNAM/* # delete remnants of previous build +mkdir -p $PKG # place for the package to be built +rm -rf $PKG/* # erase old package's contents +mkdir -p $OUTPUT # place for the package to be saved # Source file availability: if ! [ -f ${SOURCE} ]; then @@ -115,7 +114,7 @@ if ! [ -f ${SOURCE} ]; then [ -w "$SRCDIR" ] || SOURCE="$OUTPUT/$(basename $SOURCE)" echo "Source '$(basename ${SOURCE})' not available yet..." echo "Will download file to $(dirname $SOURCE)" - wget -nv --connect-timeout=30 -O "${SOURCE}" "${SRCURL}" || true + wget -nv -T 30 -O "${SOURCE}" "${SRCURL}" || true if [ $? -ne 0 -o ! -s "${SOURCE}" ]; then echo "Downloading '$(basename ${SOURCE})' failed... aborting the build." mv -f "${SOURCE}" "${SOURCE}".FAIL @@ -180,7 +179,8 @@ fi # Add documentation: mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true -chmod -R a-w $PKG/usr/doc/$PRGNAM-$VERSION/* +cp -a $SRCDIR/$(basename $0) $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +find $PKG/usr/doc -type f -exec chmod 644 {} \; # Compress the man page(s): if [ -d $PKG/usr/man ]; then @@ -203,11 +203,11 @@ fi # Build the package: cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log +makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log cd $OUTPUT -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz.md5 +md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz.md5 cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txt +cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt # Clean up the extra stuff: if [ "$P1" = "--cleanup" ]; then |