diff options
author | Eric Hameleers <alien@slackware.com> | 2007-11-19 21:23:40 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2007-11-19 21:23:40 +0000 |
commit | 737c6e617a81c9f97c20e4a8b427949eb1422116 (patch) | |
tree | 4678f9320919ed336a206f95e95f13a70873e030 /catdoc | |
parent | 5b93bf3db036d8620d8d620f8bd287c04b89fe48 (diff) | |
download | asb-737c6e617a81c9f97c20e4a8b427949eb1422116.tar.gz asb-737c6e617a81c9f97c20e4a8b427949eb1422116.tar.xz |
UPdate for Slackware 12.0
Diffstat (limited to 'catdoc')
-rwxr-xr-x | catdoc/build/catdoc.SlackBuild | 109 |
1 files changed, 34 insertions, 75 deletions
diff --git a/catdoc/build/catdoc.SlackBuild b/catdoc/build/catdoc.SlackBuild index f97b9222..8fec84c5 100755 --- a/catdoc/build/catdoc.SlackBuild +++ b/catdoc/build/catdoc.SlackBuild @@ -1,6 +1,7 @@ #!/bin/sh # $Id$ # Copyright (c) 2007 Eric Hameleers <alien@slackware.com> +# All rights reserved. # # Permission to use, copy, modify, and distribute this software for # any purpose with or without fee is hereby granted, provided that @@ -31,6 +32,8 @@ # Changelog: # 0.94.2-1: 12/Mar/2007 by Eric Hameleers <alien@slackware.com> # * Initial build. +# 0.94.2-2: 19/Nov/2007 by Eric Hameleers <alien@slackware.com> +# * Rebuild for Slackware 12.0 # # Run 'sh catdoc.SlackBuild --cleanup' to build a Slackware package. # The package (.tgz) plus descriptive .txt file are created in /tmp . @@ -38,19 +41,18 @@ # # ----------------------------------------------------------------------------- -# --- INIT --- # Set initial variables: PRGNAM=catdoc VERSION=${VERSION:-0.94.2} ARCH=${ARCH:-i486} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} DOCS="CODING.STD COPYING CREDITS INSTALL* NEWS README TODO" # Where do we look for sources? -CWD=`pwd` -SRCDIR=`dirname $0` +CWD=$(pwd) +SRCDIR=$(dirname $0) [ "${SRCDIR:0:1}" == "." ] && SRCDIR=${CWD}/${SRCDIR} # Place to build (TMP) package (PKG) and output (OUTPUT) the program: @@ -74,7 +76,7 @@ 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 @@ -101,42 +103,28 @@ case "$ARCH" in ;; esac -if [ ! -d $TMP/tmp-$PRGNAM ]; then - mkdir -p $TMP/tmp-$PRGNAM # location to build the source -elif [ "$P1" != "--oldbuild" ]; then - # If the "--oldbuild" parameter is present, we keep - # the old build files and continue; - # By default we remove the remnants of previous build and continue: - rm -rf $TMP/tmp-$PRGNAM/* -fi - -if [ ! -d $PKG ]; then - mkdir -p $PKG # place for the package to be built -else - rm -rf $PKG/* # We always erase old package's contents: -fi - -if [ ! -d $OUTPUT ]; then - mkdir -p $OUTPUT # place for the package to be saved -fi - - -# --- SOURCE FILE AVAILABILITY --- +# 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 +# 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 -O "${SOURCE}" "${SRCURL}" || true - if [ $? -ne 0 ]; then - echo "Downloading '`basename ${SOURCE}`' failed... aborting the build." + [ -w "$SRCDIR" ] || SOURCE="$OUTPUT/$(basename $SOURCE)" + echo "Source '$(basename ${SOURCE})' not available yet..." + echo "Will download file to $(dirname $SOURCE)" + 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 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 @@ -153,22 +141,17 @@ echo "|| $PRGNAM-$VERSION" echo "++" 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 -chown -R root:root * -chmod -R u+w,go+r-w,a-s * cd ${PRGNAM}-${VERSION} - - -# --- BUILDING --- +chown -R root:root . +chmod -R u+w,go+r-w,a-s . echo Building ... - LDFLAGS="$SLKLDFLAGS" \ CFLAGS="$SLKCFLAGS" \ ./configure --prefix=/usr \ @@ -179,60 +162,39 @@ CFLAGS="$SLKCFLAGS" \ --with-install-root=$PKG \ --program-prefix="" \ --program-suffix="" \ - $ARCH-slackware-linux \ + --build=$ARCH-slackware-linux \ 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log -# # Install all the needed stuff to the package dir -# # 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 fi - -# --- DOCUMENTATION --- - +# 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/* -# Compress the man page(s) -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 - -# Compress info pages and remove the package's dir file -if [ -d $PKG/usr/info ]; then - rm -rf $PKG/usr/info/dir - gzip -9f $PKG/usr/info/*.info* +# 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 fi -# Strip binaries +# Strip binaries: cd $PKG 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 cd - - -# --- OWNERSHIP, RIGHTS --- - -chmod -R o-w $PKG - - -# --- PACKAGE DESCRIPTION --- - +# Add a package description: mkdir -p $PKG/install cat $SRCDIR/slack-desc > $PKG/install/slack-desc -if [ -f $SRCDIR/doinst.sh ]; then - cat $SRCDIR/doinst.sh >> $PKG/install/doinst.sh -fi - - -# --- BUILDING --- # Build the package: cd $PKG @@ -242,9 +204,6 @@ md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz > ${PRGNAM}-${VERSION}-${ARCH}- cd - cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txt - -# --- CLEANUP --- - # Clean up the extra stuff: if [ "$P1" = "--cleanup" ]; then rm -rf $TMP/tmp-$PRGNAM |