- Update to 2.6.2.2006.12.13

PR:		ports/106673
Submitted by:	Tijl Coosemans <tijl@ulyssis.org> (maintainer)

4 files changed, 52 insertions, 27 deletions

diff --git a/lang/sdcc-devel/Makefile b/lang/sdcc-devel/Makefile
index c4770d19ea51..ca5cb79c878e 100644
--- a/lang/sdcc-devel/Makefile
+++ b/lang/sdcc-devel/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	sdcc
-PORTVERSION=	2.6.1.2006.10.12
+PORTVERSION=	2.6.2.2006.12.13
 CATEGORIES=	lang
 MASTER_SITES=	http://sdcc.sourceforge.net/snapshots/sdcc-src/ \
 		http://kalimero.be/mirror/
-DISTNAME=	${PORTNAME}-src-20061012-4408
+DISTNAME=	${PORTNAME}-src-20061213-4514
 
 MAINTAINER=	tijl@ulyssis.org
 COMMENT=	Small Device C Compiler
@@ -36,6 +36,11 @@ OPTIONS=	MCS51   "Intel mcs51 port" on \
 
 .include <bsd.port.pre.mk>
 
+.if !defined(WITHOUT_MCS51) && !defined(WITHOUT_UCSIM) && ${OSVERSION} < 500019
+LIB_DEPENDS=	readline.5:${PORTSDIR}/devel/readline
+CONFIGURE_ARGS=	CPPFLAGS="-I/usr/local/include" LDFLAGS="-L/usr/local/lib"
+.endif
+
 .if defined(WITHOUT_MCS51) && defined(WITHOUT_DS390)
 CONFIGURE_ARGS+=	--disable-51
 PLIST_SUB+=		MCS51DS390="@comment "
diff --git a/lang/sdcc-devel/distinfo b/lang/sdcc-devel/distinfo
index eb8de8852605..ec5160b9a83a 100644
--- a/lang/sdcc-devel/distinfo
+++ b/lang/sdcc-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (sdcc-src-20061012-4408.tar.bz2) = aa887a67df999f3826b3b351b1039be6
-SHA256 (sdcc-src-20061012-4408.tar.bz2) = 56729602b9fad6494387cc2c66af44ea8f1a19963ad7a9b22bf68c62ae637b60
-SIZE (sdcc-src-20061012-4408.tar.bz2) = 3221636
+MD5 (sdcc-src-20061213-4514.tar.bz2) = 6a45fc99e3183995bf8c6f40ed8cac4f
+SHA256 (sdcc-src-20061213-4514.tar.bz2) = 9ece65c860b950de8c4fe5955ce116a07ae57ffe2c04842345b735184ec25aa5
+SIZE (sdcc-src-20061213-4514.tar.bz2) = 3234308
diff --git a/lang/sdcc-devel/files/patch-configure.in b/lang/sdcc-devel/files/patch-configure.in
index ea3d1d3846d3..3138ab8cd5c6 100644
--- a/lang/sdcc-devel/files/patch-configure.in
+++ b/lang/sdcc-devel/files/patch-configure.in
@@ -1,6 +1,6 @@
---- configure.in.orig	Sat Sep 16 16:10:20 2006
-+++ configure.in	Thu Oct 12 17:57:12 2006
-@@ -653,6 +653,11 @@
+--- configure.in.orig	Tue Nov 21 16:27:08 2006
++++ configure.in	Wed Dec 13 16:32:58 2006
+@@ -629,6 +629,11 @@
  
  test $OPT_DISABLE_AVR = 0 && AC_CONFIG_FILES([src/avr/Makefile])
  
@@ -12,12 +12,14 @@
  if test $OPT_DISABLE_DS390 = 0; then
    AC_CONFIG_FILES([src/ds390/Makefile])
    test $OPT_DISABLE_DEVICE_LIB = 0 && AC_CONFIG_FILES([device/lib/ds390/Makefile])
-@@ -671,8 +676,6 @@
+@@ -647,9 +652,7 @@
+ fi
  
  if test $OPT_DISABLE_MCS51 = 0; then
-   AC_CONFIG_FILES([src/mcs51/Makefile
+-  AC_CONFIG_FILES([src/mcs51/Makefile
 -                   as/mcs51/Makefile
--                   as/link/mcs51/Makefile
-                    debugger/mcs51/Makefile])
+-                   as/link/mcs51/Makefile])
++  AC_CONFIG_FILES([src/mcs51/Makefile])
    test $OPT_DISABLE_DEVICE_LIB = 0 && AC_CONFIG_FILES([device/lib/mcs51/Makefile
                                                         device/lib/small/Makefile
+                                                        device/lib/medium/Makefile
diff --git a/lang/sdcc-devel/pkg-plist b/lang/sdcc-devel/pkg-plist
index e116c3f5cfd5..5909877d8381 100644
--- a/lang/sdcc-devel/pkg-plist
+++ b/lang/sdcc-devel/pkg-plist
@@ -105,6 +105,22 @@ bin/sdcpp
 %%DATADIR%%/include/math.h
 %%MCS51%%%%DATADIR%%/include/mcs51/8051.h
 %%MCS51%%%%DATADIR%%/include/mcs51/8052.h
+%%MCS51%%%%DATADIR%%/include/mcs51/C8051F000.h
+%%MCS51%%%%DATADIR%%/include/mcs51/C8051F018.h
+%%MCS51%%%%DATADIR%%/include/mcs51/C8051F020.h
+%%MCS51%%%%DATADIR%%/include/mcs51/C8051F040.h
+%%MCS51%%%%DATADIR%%/include/mcs51/C8051F060.h
+%%MCS51%%%%DATADIR%%/include/mcs51/C8051F120.h
+%%MCS51%%%%DATADIR%%/include/mcs51/C8051F200.h
+%%MCS51%%%%DATADIR%%/include/mcs51/C8051F300.h
+%%MCS51%%%%DATADIR%%/include/mcs51/C8051F310.h
+%%MCS51%%%%DATADIR%%/include/mcs51/C8051F320.h
+%%MCS51%%%%DATADIR%%/include/mcs51/C8051F326.h
+%%MCS51%%%%DATADIR%%/include/mcs51/C8051F330.h
+%%MCS51%%%%DATADIR%%/include/mcs51/C8051F340.h
+%%MCS51%%%%DATADIR%%/include/mcs51/C8051F350.h
+%%MCS51%%%%DATADIR%%/include/mcs51/C8051F410.h
+%%MCS51%%%%DATADIR%%/include/mcs51/C8051F520.h
 %%MCS51%%%%DATADIR%%/include/mcs51/P89LPC901.h
 %%MCS51%%%%DATADIR%%/include/mcs51/P89LPC922.h
 %%MCS51%%%%DATADIR%%/include/mcs51/P89LPC932.h
@@ -119,21 +135,7 @@ bin/sdcpp
 %%MCS51%%%%DATADIR%%/include/mcs51/at89x051.h
 %%MCS51%%%%DATADIR%%/include/mcs51/at89x51.h
 %%MCS51%%%%DATADIR%%/include/mcs51/at89x52.h
-%%MCS51%%%%DATADIR%%/include/mcs51/c8051f000.h
-%%MCS51%%%%DATADIR%%/include/mcs51/c8051f018.h
-%%MCS51%%%%DATADIR%%/include/mcs51/c8051f020.h
-%%MCS51%%%%DATADIR%%/include/mcs51/c8051f040.h
-%%MCS51%%%%DATADIR%%/include/mcs51/c8051f060.h
-%%MCS51%%%%DATADIR%%/include/mcs51/c8051f120.h
-%%MCS51%%%%DATADIR%%/include/mcs51/c8051f200.h
-%%MCS51%%%%DATADIR%%/include/mcs51/c8051f300.h
-%%MCS51%%%%DATADIR%%/include/mcs51/c8051f310.h
-%%MCS51%%%%DATADIR%%/include/mcs51/c8051f320.h
-%%MCS51%%%%DATADIR%%/include/mcs51/c8051f326.h
-%%MCS51%%%%DATADIR%%/include/mcs51/c8051f330.h
-%%MCS51%%%%DATADIR%%/include/mcs51/c8051f340.h
-%%MCS51%%%%DATADIR%%/include/mcs51/c8051f350.h
-%%MCS51%%%%DATADIR%%/include/mcs51/c8051f410.h
+%%MCS51%%%%DATADIR%%/include/mcs51/cc2430.h
 %%MCS51%%%%DATADIR%%/include/mcs51/cc2510fx.h
 %%MCS51%%%%DATADIR%%/include/mcs51/compiler.h
 %%MCS51%%%%DATADIR%%/include/mcs51/lint.h
@@ -145,6 +147,7 @@ bin/sdcpp
 %%MCS51%%%%DATADIR%%/include/mcs51/reg764.h
 %%MCS51%%%%DATADIR%%/include/mcs51/regc515c.h
 %%MCS51%%%%DATADIR%%/include/mcs51/sab80515.h
+%%MCS51%%%%DATADIR%%/include/mcs51/serial_IO.h
 %%PIC%%%%DATADIR%%/include/pic/errno.h
 %%PIC%%%%DATADIR%%/include/pic/float.h
 %%PIC%%%%DATADIR%%/include/pic/limits.h
@@ -369,6 +372,8 @@ bin/sdcpp
 %%DEVLIB%%%%DS390%%%%DATADIR%%/lib/ds390/_gptrgetc.rel
 %%DEVLIB%%%%DS390%%%%DATADIR%%/lib/ds390/_gptrput.asm
 %%DEVLIB%%%%DS390%%%%DATADIR%%/lib/ds390/_gptrput.rel
+%%DEVLIB%%%%DS390%%%%DATADIR%%/lib/ds390/_heap.asm
+%%DEVLIB%%%%DS390%%%%DATADIR%%/lib/ds390/_heap.rel
 %%DEVLIB%%%%DS390%%%%DATADIR%%/lib/ds390/_iscntrl.asm
 %%DEVLIB%%%%DS390%%%%DATADIR%%/lib/ds390/_iscntrl.rel
 %%DEVLIB%%%%DS390%%%%DATADIR%%/lib/ds390/_isdigit.asm
@@ -533,6 +538,7 @@ bin/sdcpp
 %%DEVLIB%%%%DS390%%%%DATADIR%%/lib/ds390/printf_tiny.rel
 %%DEVLIB%%%%DS390%%%%DATADIR%%/lib/ds390/printfl.asm
 %%DEVLIB%%%%DS390%%%%DATADIR%%/lib/ds390/printfl.rel
+%%DEVLIB%%%%DS390%%%%DATADIR%%/lib/ds390/putchar.rel
 %%DEVLIB%%%%DS390%%%%DATADIR%%/lib/ds390/puts.asm
 %%DEVLIB%%%%DS390%%%%DATADIR%%/lib/ds390/puts.rel
 %%DEVLIB%%%%DS390%%%%DATADIR%%/lib/ds390/rand.asm
@@ -635,6 +641,8 @@ bin/sdcpp
 %%DEVLIB%%%%DS390%%%%DATADIR%%/lib/ds400/_gptrgetc.rel
 %%DEVLIB%%%%DS390%%%%DATADIR%%/lib/ds400/_gptrput.asm
 %%DEVLIB%%%%DS390%%%%DATADIR%%/lib/ds400/_gptrput.rel
+%%DEVLIB%%%%DS390%%%%DATADIR%%/lib/ds400/_heap.asm
+%%DEVLIB%%%%DS390%%%%DATADIR%%/lib/ds400/_heap.rel
 %%DEVLIB%%%%DS390%%%%DATADIR%%/lib/ds400/_iscntrl.asm
 %%DEVLIB%%%%DS390%%%%DATADIR%%/lib/ds400/_iscntrl.rel
 %%DEVLIB%%%%DS390%%%%DATADIR%%/lib/ds400/_isdigit.asm
@@ -1080,6 +1088,8 @@ bin/sdcpp
 %%DEVLIB%%%%HC08%%%%DATADIR%%/lib/hc08/_fsneq.rel
 %%DEVLIB%%%%HC08%%%%DATADIR%%/lib/hc08/_fssub.asm
 %%DEVLIB%%%%HC08%%%%DATADIR%%/lib/hc08/_fssub.rel
+%%DEVLIB%%%%HC08%%%%DATADIR%%/lib/hc08/_heap.asm
+%%DEVLIB%%%%HC08%%%%DATADIR%%/lib/hc08/_heap.rel
 %%DEVLIB%%%%HC08%%%%DATADIR%%/lib/hc08/_iscntrl.asm
 %%DEVLIB%%%%HC08%%%%DATADIR%%/lib/hc08/_iscntrl.rel
 %%DEVLIB%%%%HC08%%%%DATADIR%%/lib/hc08/_isdigit.asm
@@ -1316,6 +1326,8 @@ bin/sdcpp
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/large/_gptrgetc.rel
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/large/_gptrput.asm
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/large/_gptrput.rel
+%%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/large/_heap.asm
+%%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/large/_heap.rel
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/large/_iscntrl.asm
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/large/_iscntrl.rel
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/large/_isdigit.asm
@@ -1586,6 +1598,8 @@ bin/sdcpp
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/medium/_gptrgetc.rel
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/medium/_gptrput.asm
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/medium/_gptrput.rel
+%%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/medium/_heap.asm
+%%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/medium/_heap.rel
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/medium/_iscntrl.asm
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/medium/_iscntrl.rel
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/medium/_isdigit.asm
@@ -1992,6 +2006,8 @@ bin/sdcpp
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small/_gptrgetc.rel
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small/_gptrput.asm
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small/_gptrput.rel
+%%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small/_heap.asm
+%%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small/_heap.rel
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small/_iscntrl.asm
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small/_iscntrl.rel
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small/_isdigit.asm
@@ -2262,6 +2278,8 @@ bin/sdcpp
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small-stack-auto/_gptrgetc.rel
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small-stack-auto/_gptrput.asm
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small-stack-auto/_gptrput.rel
+%%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small-stack-auto/_heap.asm
+%%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small-stack-auto/_heap.rel
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small-stack-auto/_iscntrl.asm
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small-stack-auto/_iscntrl.rel
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small-stack-auto/_isdigit.asm