From eda9f7b6afef467eea0f45fe1b45aefc2e0bd873 Mon Sep 17 00:00:00 2001 From: Nishant Limbachia Date: Sun, 30 Oct 2011 23:18:00 -0200 Subject: [PATCH] system/dar: Updated for version 2.4.2. Signed-off-by: Niels Horn --- system/dar/dar.SlackBuild | 9 +++++---- system/dar/dar.info | 8 ++++---- system/dar/doinst.sh | 14 ++++++++++++++ 3 files changed, 23 insertions(+), 8 deletions(-) create mode 100644 system/dar/doinst.sh diff --git a/system/dar/dar.SlackBuild b/system/dar/dar.SlackBuild index 4a4d43790f..a50ee10a1d 100644 --- a/system/dar/dar.SlackBuild +++ b/system/dar/dar.SlackBuild @@ -30,16 +30,14 @@ # No additional license terms added :-) PRGNAM="dar" -VERSION=${VERSION:-2.3.11} +VERSION=${VERSION:-2.4.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -63,7 +61,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -fr $TMP/$PRGNAM-$VERSION $PKG mkdir -p $TMP $PKG $OUTPUT @@ -100,6 +98,8 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done +mv $PKG/etc/darrc $PKG/etc/darrc.new + mkdir -p $PKG/usr/doc mv $PKG/usr/share/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION cp -a AUTHORS ChangeLog COPYING INSTALL NEWS README TODO THANKS \ @@ -109,6 +109,7 @@ chown -R root:root $PKG/usr/doc mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/dar/dar.info b/system/dar/dar.info index 790cc65f3e..3b28a5c0ea 100644 --- a/system/dar/dar.info +++ b/system/dar/dar.info @@ -1,10 +1,10 @@ PRGNAM="dar" -VERSION="2.3.11" +VERSION="2.4.2" HOMEPAGE="http://dar.linux.free.fr/" -DOWNLOAD="http://downloads.sourceforge.net/dar/dar-2.3.11.tar.gz" -MD5SUM="5f8766f50069faf0a915e691372e56f8" +DOWNLOAD="http://downloads.sourceforge.net/dar/dar-2.4.2.tar.gz" +MD5SUM="b23c0509513b895f4ab9ce9191b2f65b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Nishant Limbachia" EMAIL="nishant@mnspace.net" -APPROVED="dsomero" +APPROVED="Niels Horn" diff --git a/system/dar/doinst.sh b/system/dar/doinst.sh new file mode 100644 index 0000000000..321869192d --- /dev/null +++ b/system/dar/doinst.sh @@ -0,0 +1,14 @@ +config() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + # If there's no config file by that name, mv it over: + if [ ! -r $OLD ]; then + mv $NEW $OLD + elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then + # toss the redundant copy + rm $NEW + fi + # Otherwise, we leave the .new copy for the admin to consider... +} + +config etc/darrc.new