From 6976c18f463417126c59c5cf922bf5398eb5d601 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Wed, 11 Jun 2008 08:41:54 +0000 Subject: Update for 2.23.3; Add TAG=alien; better SRCDIR; add SlackBuild to docdir --- gnome-menus/build/gnome-menus.SlackBuild | 71 +++++++++++++++----------------- 1 file changed, 34 insertions(+), 37 deletions(-) (limited to 'gnome-menus') diff --git a/gnome-menus/build/gnome-menus.SlackBuild b/gnome-menus/build/gnome-menus.SlackBuild index 1ef06302..bb79463b 100755 --- a/gnome-menus/build/gnome-menus.SlackBuild +++ b/gnome-menus/build/gnome-menus.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh # $Id$ -# Copyright (c) 2007 Eric Hameleers +# Copyright (c) 2007-2008 Eric Hameleers # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -30,8 +30,10 @@ # URL: http://ftp.gnome.org/pub/gnome/sources/ # Needs: # Changelog: -# 2.19.5-1: 26/Jul/2007 by Eric Hameleers +# 2.19.5-1: 26/Jul/2007 by Eric Hameleers # * Initial build. +# 2.23.3-1: 11/jun/2008 by Eric Hameleers +# * Update # # Run 'sh gnome-menus.SlackBuild --cleanup' to build a Slackware package. # The package (.tgz) plus descriptive .txt file are created in /tmp . @@ -42,24 +44,22 @@ # Set initial variables: PRGNAM=gnome-menus -VERSION=${VERSION:-2.19.5} +VERSION=${VERSION:-2.23.3} MAJOR=$( echo ${VERSION} | cut -d. -f1-2 ) ARCH=${ARCH:-i486} BUILD=${BUILD:-1} +TAG=${TAG:-alien} DOCS="AUTHORS COPYING* ChangeLog HACKING INSTALL NEWS README" # 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://ftp.gnome.org/pub/gnome/sources/gnome-menus/2.19/gnome-menus-2.19.5.tar.bz2 SOURCE="$SRCDIR/${PRGNAM}-${VERSION}.tar.bz2" SRCURL="http://ftp.gnome.org/pub/gnome/sources/${PRGNAM}/${MAJOR}/${PRGNAM}-${VERSION}.tar.bz2" @@ -75,16 +75,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="" ;; @@ -105,25 +102,25 @@ esac # Create working directories: 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 +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 --connect-timeout=30 -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 @@ -142,9 +139,9 @@ 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 cd ${PRGNAM}-${VERSION} @@ -154,13 +151,12 @@ 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 \ --sysconfdir=/etc \ - --datarootdir=/usr \ - --datadir=/usr/share \ - --localedir=/usr/share/locale \ + --mandir=/usr/man \ --enable-inotify \ --program-prefix="" \ --program-suffix="" \ @@ -171,20 +167,20 @@ 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 # Move configuration files to .new - if these are installed unwantingly, -# the KDE menus will suddenly look a lot different!: +# the KDE menus will suddenly look a lot different!!! : mv $PKG/etc/xdg/menus/applications.menu{,.new} mv $PKG/etc/xdg/menus/preferences.menu{,.new} mv $PKG/etc/xdg/menus/settings.menu{,.new} # Add this to the doinst.sh: -! [ -d $PKG/install ] && mkdir -p $PKG/install +mkdir -p $PKG/install cat <> $PKG/install/doinst.sh # Handle the incoming configuration files: config() { @@ -202,6 +198,8 @@ config() { done } +# If these are installed unwantingly, +# the KDE menus will suddenly look a lot different!!! : #config etc/xdg/menus/applications.menu.new #config etc/xdg/menus/preferences.menu.new #config etc/xdg/menus/settings.menu.new @@ -211,15 +209,14 @@ EOINS # 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 +chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION +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 {} \; - 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: @@ -240,13 +237,13 @@ 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}.dep + cat $PKG/install/slack-required > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.dep fi # Clean up the extra stuff: -- cgit v1.2.3