diff options
| -rw-r--r-- | libraries/avr-libc/avr-libc.SlackBuild | 56 | ||||
| -rw-r--r-- | libraries/avr-libc/avr-libc.info | 14 | ||||
| -rw-r--r-- | libraries/avr-libc/slack-desc | 2 |
3 files changed, 20 insertions, 52 deletions
diff --git a/libraries/avr-libc/avr-libc.SlackBuild b/libraries/avr-libc/avr-libc.SlackBuild index bcd84e4e5f..e72cdd24a9 100644 --- a/libraries/avr-libc/avr-libc.SlackBuild +++ b/libraries/avr-libc/avr-libc.SlackBuild @@ -9,11 +9,11 @@ # You can find a copy of this licence in the source tarball. # This script is released in the public domain. -# I am not responsible for any consequences that follow from the use -# of this script. +# I am not responsible for any consequences that follow from the +# incorrect use of this script. PRGNAM=avr-libc -VERSION=${VERSION:-1.7.0} +VERSION=${VERSION:-1.7.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -25,6 +25,12 @@ if [ -z "$ARCH" ]; then esac fi +# Add latex to path if it's not already in it. +if [ $(echo $PATH | grep "/usr/share/texmf/bin" | wc -l) -le 0 ]; then + echo "Latex not in path, adding /usr/share/texmf/bin to path" ; + PATH=$PATH:/usr/share/texmf/bin ; +fi + CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM @@ -44,7 +50,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -67,56 +73,24 @@ CXXFLAGS="$SLKCFLAGS" \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --localstatedir=/var \ - --mandir=/usr/avr/man \ + --mandir=/usr/man \ + --enable-doc \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --build=$ARCH-slackware-linux -make +make all make install DESTDIR=$PKG find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -mv $PKG/usr/share/doc $PKG/usr +# Create the directory for program documentation. mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION + cp -a \ AUTHORS ChangeLog* INSTALL LICENSE NEWS README \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -rmdir $PKG/usr/share 2>/dev/null || true -# Symlink for /usr/bin/avr-man to work properly -( cd $PKG/usr/doc/$PRGNAM-$VERSION ; ln -s ../../avr/man man ) - -# Extract and compress manpages if they are present. -if [ -f $CWD/$PRGNAM-manpages-$VERSION.tar.bz2 ]; then - TMPWD=$(pwd) - cd $PKG/usr/avr - tar xvf $CWD/$PRGNAM-manpages-$VERSION.tar.bz2 - find ./man -type f -exec gzip -9 {} \; - for i in $( find ./man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done - chown -R root:root ./man - cd $TMPWD -fi - -# Extract the pdf-manual and add it to the package if it's present. -if [ -f $CWD/$PRGNAM-user-manual-$VERSION.pdf.bz2 ]; then - TMPWD=$(pwd) - cp $CWD/$PRGNAM-user-manual-$VERSION.pdf.bz2 $PKG/usr/doc/$PRGNAM-$VERSION - cd $PKG/usr/doc/$PRGNAM-$VERSION - bunzip2 $PRGNAM-user-manual-$VERSION.pdf.bz2 - tar xvf $CWD/$PRGNAM-user-manual-$VERSION.tar.bz2 - chown root:root *.pdf - cd $TMPWD -fi - -# Extract the html-manual and add it to the package if it's present. -if [ -f $CWD/$PRGNAM-user-manual-$VERSION.tar.bz2 ]; then - TMPWD=$(pwd) - cd $PKG/usr/doc/$PRGNAM-$VERSION - tar xvf $CWD/$PRGNAM-user-manual-$VERSION.tar.bz2 - chown -R root:root . - cd $TMPWD -fi mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/libraries/avr-libc/avr-libc.info b/libraries/avr-libc/avr-libc.info index 8ddd285757..efb9caed5f 100644 --- a/libraries/avr-libc/avr-libc.info +++ b/libraries/avr-libc/avr-libc.info @@ -1,16 +1,10 @@ PRGNAM="avr-libc" -VERSION="1.7.0" +VERSION="1.7.1" HOMEPAGE="http://avr-libc.nongnu.org/" -DOWNLOAD="http://download.savannah.gnu.org/releases/avr-libc/avr-libc-1.7.0.tar.bz2 \ - http://download.savannah.gnu.org/releases/avr-libc/avr-libc-manpages-1.7.0.tar.bz2 \ - http://download.savannah.gnu.org/releases/avr-libc/avr-libc-user-manual-1.7.0.pdf.bz2 \ - http://download.savannah.gnu.org/releases/avr-libc/avr-libc-user-manual-1.7.0.tar.bz2" -MD5SUM="3eff7b779bd950400cb0a45f3c2fb377 \ - 83512f560ce9d16879f0828c72c2837a \ - e00fdace4335980ccdc863528f472613 \ - 9a7c1dc4b4f318edada0a42f46884b5e" +DOWNLOAD="http://download.savannah.gnu.org/releases/avr-libc/avr-libc-1.7.1.tar.bz2" +MD5SUM="8608061dcff075d44d5c59cb7b6a6f39" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Vliegendehuiskat" EMAIL="vliegendehuiskat [at] gmail [dot] com" -APPROVED="rworkman" +APPROVED="Niels Horn" diff --git a/libraries/avr-libc/slack-desc b/libraries/avr-libc/slack-desc index 6d5b700104..ba623b6110 100644 --- a/libraries/avr-libc/slack-desc +++ b/libraries/avr-libc/slack-desc @@ -5,7 +5,7 @@ # make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. - |-----handy-ruler-----------------------------------------------------| + |-----handy-ruler------------------------------------------------------| avr-libc: avr-libc (C library for programming on the AVR platform) avr-libc: avr-libc: This package contains a high quality C library |