diff options
author | Eric Hameleers <alien@slackware.com> | 2008-05-23 09:25:53 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2008-05-23 09:25:53 +0000 |
commit | 257fe2a811291e91072fa9a7b53c1a00e0d6b6bb (patch) | |
tree | 655cfd37a3cec47463607f30b01a85c0b9c32960 /dosbox/build/dosbox.SlackBuild | |
parent | 4e99c4513daa07933bdff2c956b0b8a8d7796442 (diff) | |
download | asb-257fe2a811291e91072fa9a7b53c1a00e0d6b6bb.tar.gz asb-257fe2a811291e91072fa9a7b53c1a00e0d6b6bb.tar.xz |
Add TAG=alien; change SRCDIR; add SlackBuild to docdir
Also add slack-required file to the package
Diffstat (limited to '')
-rwxr-xr-x | dosbox/build/dosbox.SlackBuild | 61 |
1 files changed, 33 insertions, 28 deletions
diff --git a/dosbox/build/dosbox.SlackBuild b/dosbox/build/dosbox.SlackBuild index 9f590cbd..95008fd8 100755 --- a/dosbox/build/dosbox.SlackBuild +++ b/dosbox/build/dosbox.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh # $Id$ -# Copyright (c) 2006,2007 Eric Hameleers <alien@slackware.com> +# Copyright (c) 2006-2008 Eric Hameleers <alien@slackware.com> # # Permission to use, copy, modify, and distribute this software for # any purpose with or without fee is hereby granted, provided that @@ -39,6 +39,8 @@ # * Update. # 0.72-1: 03/sep/2007 by Eric Hameleers <alien@slackware.com> # * Update. +# 0.72-2: 03/sep/2007 by Eric Hameleers <alien@slackware.com> +# * SlackBuild script updates # # Run 'sh dosbox.SlackBuild --cleanup' to build a Slackware package. # The package (.tgz) plus descriptive .txt file are created in /tmp . @@ -51,15 +53,14 @@ PRGNAM=dosbox VERSION=${VERSION:-"0.72"} ARCH=${ARCH:-i486} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} +TAG=${TAG:-alien} DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO \ docs/README.video" # 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} @@ -67,7 +68,7 @@ PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} SOURCE="${SRCDIR}/${PRGNAM}-${VERSION}.tar.gz" -SRCURL="http://dl.sourceforge.net/${PRGNAM}/${PRGNAM}-${VERSION}.tar.gz" +SRCURL="http://downloads.sourceforge.net/${PRGNAM}/${PRGNAM}-${VERSION}.tar.gz" ## ## --- with a little luck, you won't have to edit below this point --- ## @@ -81,16 +82,13 @@ set -u P1=${1:-1} # Slackware 11 and up need other option (gcc > 3.3.x) -if [ `gcc -dumpversion | tr -d '.' |cut -c 1-2` -gt 33 ]; then +if [ $(gcc -dumpversion | tr -d '.' |cut -c 1-2) -gt 33 ]; then MOPT=tune else MOPT=cpu fi case "$ARCH" in - i386) SLKCFLAGS="-O2 -march=i386 -m${MOPT}=i686" - SLKLDFLAGS=""; LIBDIRSUFFIX="" - ;; i486) SLKCFLAGS="-O2 -march=i486 -m${MOPT}=i686" SLKLDFLAGS=""; LIBDIRSUFFIX="" ;; @@ -109,26 +107,26 @@ case "$ARCH" in esac mkdir -p $TMP/tmp-$PRGNAM # location to build the source -rm -rf $TMP/tmp-$PRGNAM/* # By default we remove the 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/* # remove the 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 if ! [ "x${SRCURL}" == "x" ]; then # Check if the $SRCDIR is writable at all - if not, download to $OUTPUT - [ -w "$SRCDIR" ] || SOURCE="$OUTPUT/`basename $SOURCE`" - echo "Source '`basename ${SOURCE}`' not available yet..." - echo "Will download file to `dirname $SOURCE`" - wget -nv --connect-timeout=20 -O "${SOURCE}" "${SRCURL}" || true + [ -w "$SRCDIR" ] || SOURCE="$OUTPUT/$(basename $SOURCE)" + echo "Source '$(basename ${SOURCE})' not available yet..." + echo "Will download file to $(dirname $SOURCE)" + wget -nv -T 30 -O "${SOURCE}" "${SRCURL}" || true if [ $? -ne 0 -o ! -s "${SOURCE}" ]; then - echo "Downloading '`basename ${SOURCE}`' failed... aborting the build." + echo "Downloading '$(basename ${SOURCE})' failed... aborting the build." mv -f "${SOURCE}" "${SOURCE}".FAIL exit 1 fi else - echo "File '`basename ${SOURCE}`' not available... aborting the build." + echo "File '$(basename ${SOURCE})' not available... aborting the build." exit 1 fi fi @@ -152,9 +150,9 @@ fi cd $TMP/tmp-$PRGNAM echo "Extracting the source archive(s) for $PRGNAM..." -if `file ${SOURCE} | grep -q ": bzip2"`; then +if $(file ${SOURCE} | grep -q ": bzip2"); then tar -xjvf ${SOURCE} -elif `file ${SOURCE} | grep -q ": gzip"`; then +elif $(file ${SOURCE} | grep -q ": gzip"); then tar -xzvf ${SOURCE} fi cd ${PRGNAM}-${VERSION} @@ -163,12 +161,12 @@ chmod -R u+w,go+r-w,a-s . echo Building ... CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ LDFLAGS="$SLKLDFLAGS" \ ./configure --prefix=/usr \ --localstatedir=/var \ --sysconfdir=/etc \ - --datarootdir=/usr \ - --datadir=/usr/share \ + --mandir=/usr/man \ --program-prefix="" \ --program-suffix="" \ --build=$ARCH-slackware-linux \ @@ -187,7 +185,8 @@ fi # 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) find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \; @@ -204,14 +203,20 @@ cat $SRCDIR/slack-desc > $PKG/install/slack-desc if [ -f $SRCDIR/doinst.sh ]; then cat $SRCDIR/doinst.sh >> $PKG/install/doinst.sh fi +if [ -f $SRCDIR/slack-required ]; then + cat $SRCDIR/slack-required > $PKG/install/slack-required +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 +if [ -f $PKG/install/slack-required ]; then + cat $PKG/install/slack-required > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.dep +fi # Clean up the extra stuff: if [ "$P1" = "--cleanup" ]; then |