development/sdcc: Updated for version 3.4.0 + new maintainer.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 83 insertions, 20 deletions

diff --git a/development/sdcc/README b/development/sdcc/README
index 6a934229d1..5d908ecb77 100644
--- a/development/sdcc/README
+++ b/development/sdcc/README
@@ -5,6 +5,3 @@ Source Software,  distributed under GNU General Public License (GPL).
 
 By default, this will build sdcc without pic support. If you want that, install 
 gputils and run the script as follows:  ENABLE_PIC=y sh ./sdcc.SlackBuild
-
-You can download the doc tarball from:
-http://downloads.sourceforge.net/project/sdcc/sdcc-doc/3.0.0/sdcc-doc-3.0.0.tar.bz2
diff --git a/development/sdcc/patches/source-tree.patch b/development/sdcc/patches/source-tree.patch
new file mode 100644
index 0000000000..dea29a7b87
--- /dev/null
+++ b/development/sdcc/patches/source-tree.patch
@@ -0,0 +1,34 @@
+diff --git a/device/lib/Makefile.in b/device/lib/Makefile.in
+--- a/device/lib/Makefile.in
++++ b/device/lib/Makefile.in
+@@ -521,10 +521,10 @@
+ 	for src in $(MODELS) ds390 ds400 z80 z180 r2k r3ka tlcs90 gbz80 hc08 s08 stm8 pic14 pic16; do \
+ 	  find $(sdcc_libdir)/src/$$src -depth \
+ 	    \( -name '*.rel' -o -name '*.dump*' -o -name '*.sym' -o -name '*.o' -o -name '*.lib' -o \
+-	    -name '*.lst' -o -name '*.asm' -o -name '.svn' -o -name 'autom4te.cache' -o \
++	    -name '*.lst' -o -name '*.asm' -o -name '*.cod' -o -name '*.hex' -o -name '.svn' -o -name 'autom4te.cache' -o \
+ 	    -name 'build' -o -name 'bin' -o -name 'Makefile*' -o -name 'config*' -o \
+-	    -name 'depcomp' -o -name 'missing' -o -name 'install-sh' -o \
+-	    -name 'bootstrap.sh' \) \
++	    -name 'depcomp' -o -name 'missing' -o -name 'install-sh' -o -name 'stamp-h1' -o \
++	    -name 'bootstrap.sh' -o -name '.deps' -o -name '.checkdevices' -o -name '.checksupport' -o -name 'pics.supported' \) \
+ 	    -exec rm -rf {} + ; \
+ 	done
+ 	find $(sdcc_libdir)/src/mcs51 -depth \
+diff --git a/device/non-free/lib/Makefile.in b/device/non-free/lib/Makefile.in
+--- a/device/non-free/lib/Makefile.in
++++ b/device/non-free/lib/Makefile.in
+@@ -354,10 +354,10 @@
+ 	for src in pic14 pic16; do \
+ 	  find $(sdcc_libdir)/src/$$src -depth \
+ 	    \( -name '*.rel' -o -name '*.dump*' -o -name '*.sym' -o -name '*.o' -o -name '*.lib' -o \
+-	    -name '*.lst' -o -name '*.asm' -o -name '.svn' -o -name 'autom4te.cache' -o \
++	    -name '*.lst' -o -name '*.asm' -o -name '*.cod' -o -name '*.hex' -o -name '.svn' -o -name 'autom4te.cache' -o \
+ 	    -name 'build' -o -name 'bin' -o -name 'Makefile*' -o -name 'config*' -o \
+-	    -name 'depcomp' -o -name 'missing' -o -name 'install-sh' -o \
+-	    -name 'bootstrap.sh' \) \
++	    -name 'depcomp' -o -name 'missing' -o -name 'install-sh' -o -name 'stamp-h1' -o \
++	    -name 'bootstrap.sh' -o -name '.deps' -o -name '.checkdevices' -o -name '.checksupport' -o -name 'pics.supported' \) \
+ 	    -exec rm -rf {} + ; \
+ 	done
+ 
diff --git a/development/sdcc/sdcc.SlackBuild b/development/sdcc/sdcc.SlackBuild
index 09675b6835..05fb845662 100644
--- a/development/sdcc/sdcc.SlackBuild
+++ b/development/sdcc/sdcc.SlackBuild
@@ -2,10 +2,28 @@
 
 # Slackware build script for sdcc
 
-# Written by Grissiom <chaos.proton@gmail.com>
+# Copyright 2014 Kyle Guinn <elyk03@gmail.com>, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=sdcc
-VERSION=${VERSION:-3.0.0}
+VERSION=${VERSION:-3.4.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -22,6 +40,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+DOCS="COPYING ChangeLog"
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -36,16 +56,14 @@ else
   LIBDIRSUFFIX=""
 fi
 
-ENABLE_PIC=${ENABLE_PIC:-no}
-
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM
+rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-src-$VERSION.tar.bz2
-cd $PRGNAM
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -53,22 +71,36 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-if [ "$ENABLE_PIC" = 'no' ]; then
-  enable_pic='--disable-pic-port --disable-pic16-port'
-else
-  enable_pic='--enable-pic-port --enable-pic16-port'
+# A few Makefiles install (copy) the source tree _after_ building, and
+# accidentally install a bunch of build byproducts which they try to clean
+# up afterwards.  Delete some byproducts that they missed.
+for patch in $CWD/patches/* ; do
+  patch -p1 < $patch
+done
+
+# Requires lyx, latex2html, possibly others.  Untested.
+if [ "${ENABLE_DOC:-no}" != 'no' ]; then
+  enable_doc='--enable-doc'
+fi
+
+# Requires gputils.
+if [ "${ENABLE_PIC:-no}" = 'no' ]; then
+  enable_pic='--disable-pic14-port --disable-pic16-port'
 fi
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --libdir=/usr/lib${LIBDIRSUFFIX}/$PRGNAM \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
+  --infodir=/usr/info \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux \
+  --enable-libgc \
+  $enable_doc \
   $enable_pic
 
 make
@@ -78,7 +110,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/development/sdcc/sdcc.info b/development/sdcc/sdcc.info
index be375d5ed8..270235972e 100644
--- a/development/sdcc/sdcc.info
+++ b/development/sdcc/sdcc.info
@@ -1,10 +1,10 @@
 PRGNAM="sdcc"
-VERSION="3.0.0"
+VERSION="3.4.0"
 HOMEPAGE="http://sdcc.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/project/sdcc/sdcc/3.0.0/sdcc-src-3.0.0.tar.bz2"
-MD5SUM="20fbd49a3421e09fe65577c45524c89e"
+DOWNLOAD="http://downloads.sourceforge.net/project/sdcc/sdcc/3.4.0/sdcc-src-3.4.0.tar.bz2"
+MD5SUM="92db2ea2526f6cef412547bb1e759a48"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Grissiom"
-EMAIL="chaos.proton@gmail.com"
+MAINTAINER="Kyle Guinn"
+EMAIL="elyk03@gmail.com"