development/avrdude: Updated for version 5.11.

Signed-off-by: Niels Horn <niels.horn@slackbuilds.org>

5 files changed, 32 insertions, 19 deletions

diff --git a/development/avrdude/README b/development/avrdude/README
index f62fa13265..e6d1e7ce48 100644
--- a/development/avrdude/README
+++ b/development/avrdude/README
@@ -1,3 +1,3 @@
-Avrdude is an open source utility to download/upload/manipulate the ROM and 
-EEPROM contents of AVR microcontrollers using the in-system programming 
+Avrdude is an open source utility to download/upload/manipulate the ROM and
+EEPROM contents of AVR microcontrollers using the in-system programming
 technique (ISP).
diff --git a/development/avrdude/avrdude.SlackBuild b/development/avrdude/avrdude.SlackBuild
index b18469a469..633db4ed37 100644
--- a/development/avrdude/avrdude.SlackBuild
+++ b/development/avrdude/avrdude.SlackBuild
@@ -5,16 +5,14 @@
 # Written by Dustin Schnee <schnee72{at}gmail{dot}com>
 
 PRGNAM=avrdude
-VERSION=${VERSION:-5.10}
+VERSION=${VERSION:-5.11}
 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
@@ -67,22 +65,23 @@ CXXFLAGS="$SLKCFLAGS" \
 make 
 make install DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+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
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+# avoid overwriting configuration
+mv $PKG/etc/$PRGNAM.conf $PKG/etc/$PRGNAM.conf.new
+
 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/development/avrdude/avrdude.info b/development/avrdude/avrdude.info
index 1c5b27bd6a..2851302fcf 100644
--- a/development/avrdude/avrdude.info
+++ b/development/avrdude/avrdude.info
@@ -1,10 +1,10 @@
 PRGNAM="avrdude"
-VERSION="5.10"
+VERSION="5.11"
 HOMEPAGE="http://www.nongnu.org/avrdude/"
-DOWNLOAD="http://download.savannah.gnu.org/releases-noredirect/avrdude/avrdude-5.10.tar.gz"
-MD5SUM="69b082683047e054348088fd63bad2ff"
+DOWNLOAD="http://download.savannah.gnu.org/releases-noredirect/avrdude/avrdude-5.11.tar.gz"
+MD5SUM="a03edce46cae0e8a825db0fe38a6b3a9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Dustin Schnee"
 EMAIL="schnee72{at}gmail{dot}com"
-APPROVED="dsomero"
+APPROVED="Niels Horn"
diff --git a/development/avrdude/doinst.sh b/development/avrdude/doinst.sh
new file mode 100644
index 0000000000..5a912d545b
--- /dev/null
+++ b/development/avrdude/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/avrdude.conf.new
diff --git a/development/avrdude/slack-desc b/development/avrdude/slack-desc
index e4931f0734..811af2aff0 100644
--- a/development/avrdude/slack-desc
+++ b/development/avrdude/slack-desc
@@ -11,10 +11,10 @@ avrdude:
 avrdude: Avrdude is an open source utility to download/upload/manipulate the 
 avrdude: ROM and EEPROM contents of AVR microcontrollers using the in-system 
 avrdude: programming technique (ISP).
-avrdude:   
-avrdude: Homepage: http://www.nongnu.org/avrdude/ 
-avrdude:   
 avrdude:
-avrdude: 
+avrdude: Homepage: http://www.nongnu.org/avrdude/
+avrdude:
+avrdude:
+avrdude:
 avrdude: