From 14c7c03a628182c74069e353807c94e2f24158b8 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Fri, 23 May 2008 09:39:59 +0000 Subject: Add TAG=alien, new SRCDIR line, add SlackBuild to docdir, Get rid of ``. --- dosemu/build/dosemu.SlackBuild | 57 +++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 29 deletions(-) (limited to 'dosemu') diff --git a/dosemu/build/dosemu.SlackBuild b/dosemu/build/dosemu.SlackBuild index 1645b704..d347cfc0 100755 --- a/dosemu/build/dosemu.SlackBuild +++ b/dosemu/build/dosemu.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh # $Id$ -# Copyright (c) 2007 Eric Hameleers +# Copyright (c) 2007-2008 Eric Hameleers # # Permission to use, copy, modify, and distribute this software for # any purpose with or without fee is hereby granted, provided that @@ -37,6 +37,8 @@ # * Update. # 1.4.0-2: 16/dec/2007 by Eric Hameleers # * Fix permissions on the freedos binaries. +# 1.4.0-3: 23/may/2008 by Eric Hameleers +# * SlackBuild script updates # # Run 'sh dosemu.SlackBuild --cleanup' to build a Slackware package. # The package (.tgz) plus descriptive .txt file are created in /tmp . @@ -50,21 +52,19 @@ PRGNAM=dosemu VERSION=${VERSION:-"1.4.0"} FDVERSION=${FDVERSION:-"1.0"} ARCH=${ARCH:-"i486"} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} +TAG=${TAG:-alien} DOCS="BUGS COPYING* ChangeLog* INSTALL NEWS QuickStart README* THANKS VERSION" # 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"} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-"/tmp"} -# Input URL: http://dl.sourceforge.net/dosemu/dosemu-1.3.4.tgz SOURCE[0]="$SRCDIR/${PRGNAM}-${VERSION}.tgz" SRCURL[0]="http://downloads.sourceforge.net/${PRGNAM}/${PRGNAM}-${VERSION}.tgz" @@ -89,16 +89,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="" ;; @@ -119,26 +116,26 @@ esac # Prepare build environment: mkdir -p $TMP/tmp-$PRGNAM # location to build the source rm -rf $TMP/tmp-$PRGNAM/* # 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 +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: for (( i = 0; i < ${#SOURCE[*]}; i++ )) ; do if ! [ -f ${SOURCE[$i]} ]; then if ! [ "x${SRCURL[$i]}" == "x" ]; then # Check if the $SRCDIR is writable at all - if not, download to $OUTPUT - [ -w "$SRCDIR" ] || SOURCE[$i]="$OUTPUT/`basename ${SOURCE[$i]}`" - echo "Source '`basename ${SOURCE[$i]}`' not available yet..." - echo "Will download file to `dirname $SOURCE[$i]`" - wget -nv -T 20 -O "${SOURCE[$i]}" "${SRCURL[$i]}" || true + [ -w "$SRCDIR" ] || SOURCE[$i]="$OUTPUT/$(basename ${SOURCE[$i]})" + echo "Source '$(basename ${SOURCE[$i]})' not available yet..." + echo "Will download file to $(dirname $SOURCE[$i])" + wget -nv -T 30 -O "${SOURCE[$i]}" "${SRCURL[$i]}" || true if [ $? -ne 0 -o ! -s "${SOURCE[$i]}" ]; then - echo "Downloading '`basename ${SOURCE[$i]}`' failed.. aborting the build." + echo "Downloading '$(basename ${SOURCE[$i]})' failed.. aborting the build." mv -f "${SOURCE[$i]}" "${SOURCE[$i]}".FAIL exit 1 fi else - echo "File '`basename ${SOURCE[$i]}`' not available.. aborting the build." + echo "File '$(basename ${SOURCE[$i]})' not available.. aborting the build." exit 1 fi fi @@ -158,7 +155,7 @@ echo "++" cd $TMP/tmp-$PRGNAM echo "Extracting the source archive(s) for $PRGNAM..." -if `file ${SOURCE[0]} | grep -q ": bzip2"`; then +if $(file ${SOURCE[0]} | grep -q ": bzip2"); then tar -xjvf ${SOURCE[0]} else tar -xvf ${SOURCE[0]} @@ -170,6 +167,7 @@ chmod -R u+w,go+r-w,a-s . echo Building ... LDFLAGS="$SLKLDFLAGS" \ CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ ./configure --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --mandir=/usr/man \ @@ -188,7 +186,7 @@ mkdir -p $PKG/usr/bin # Use installwatch if available, to produce a logfile of the installation # process that is more easily readable: -if `which installwatch > /dev/null 2>&1`; then +if $(which installwatch > /dev/null 2>&1); then installwatch -o $OUTPUT/install-${PRGNAM}.log make DESTDIR=$PKG install else make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log @@ -209,7 +207,7 @@ cat <<-EOT > $PKG/usr/share/applications/dosemu.desktop Encoding=UTF-8 Exec=xdosemu Name=dosemu - GnericName=dosemu + GenericName=dosemu Comment=A DOS EMUlator Icon=/usr/share/pixmaps/dosemu.xpm Terminal=false @@ -256,18 +254,19 @@ EOINS # Add some 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 find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \; - for i in `find $PKG/usr/man -type l -name "*.?"` ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done + for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done fi # Strip binaries: ( cd $PKG - find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true ) # Add a package description: @@ -279,11 +278,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 -- cgit v1.2.3