diff options
author | Eric Hameleers <alien@slackware.com> | 2008-05-07 12:21:53 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2008-05-07 12:21:53 +0000 |
commit | 83d9d9f1f21ae1cd9a39c45ebb2f63ae56a4820a (patch) | |
tree | 10b26eaaac797b554d6df248f2b419352e236deb /enchant/build/enchant.SlackBuild | |
parent | 77e7de49ef33e838d34100a2b4f7acb16307259c (diff) | |
download | asb-83d9d9f1f21ae1cd9a39c45ebb2f63ae56a4820a.tar.gz asb-83d9d9f1f21ae1cd9a39c45ebb2f63ae56a4820a.tar.xz |
Update to 1.4.2
Diffstat (limited to 'enchant/build/enchant.SlackBuild')
-rwxr-xr-x | enchant/build/enchant.SlackBuild | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/enchant/build/enchant.SlackBuild b/enchant/build/enchant.SlackBuild index b6f7367f..d6e747ce 100755 --- a/enchant/build/enchant.SlackBuild +++ b/enchant/build/enchant.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 @@ -32,6 +32,8 @@ # Changelog: # 1.3.0-1: 08/Nov/2007 by Eric Hameleers <alien@slackware.com> # * Initial build. +# 1.4.2-1: 07/may/2008 by Eric Hameleers <alien@slackware.com> +# * Update. # # Run 'sh enchant.SlackBuild --cleanup' to build a Slackware package. # The package (.tgz) plus descriptive .txt file are created in /tmp . @@ -45,13 +47,12 @@ PRGNAM=enchant VERSION=${VERSION:-1.3.0} ARCH=${ARCH:-i486} BUILD=${BUILD:-1} +TAG=${TAG:-alien} DOCS="AUTHORS BUGS COPYING.LIB ChangeLog HACKING MAINTAINERS NEWS README TODO" # 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} @@ -104,9 +105,9 @@ esac # Create working directories: 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/* # always erase old package's contents +mkdir -p $OUTPUT # place for the package to be saved # Source file availability: if ! [ -f ${SOURCE} ]; then @@ -115,7 +116,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 20 -O "${SOURCE}" "${SRCURL}" || true if [ $? -ne 0 -o ! -s "${SOURCE}" ]; then echo "Downloading '$(basename ${SOURCE})' failed... aborting the build." mv -f "${SOURCE}" "${SOURCE}".FAIL @@ -152,6 +153,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} \ --localstatedir=/var \ @@ -175,11 +177,9 @@ 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 {} \; -# Move incorrectly installed man pages, if any: -[ -d $PKG/usr/share/man ] && \ - mv $PKG/usr/share/man $PKG/usr/ && rmdir $PKG/usr/share || true # Compress the man page(s): if [ -d $PKG/usr/man ]; then find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \; @@ -198,11 +198,11 @@ cat $SRCDIR/slack-desc > $PKG/install/slack-desc # 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 |