- Apply the whole patch (in my previous commit I only patched the Makefile)

  from ports/104358.

4 files changed, 42 insertions, 12 deletions

diff --git a/lang/sdcc-devel/distinfo b/lang/sdcc-devel/distinfo
index e82030e5fcb3..eb8de8852605 100644
--- a/lang/sdcc-devel/distinfo
+++ b/lang/sdcc-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (sdcc-src-20060810-4330.tar.bz2) = bb29f37e7daf07b3a1f293e12883f3cb
-SHA256 (sdcc-src-20060810-4330.tar.bz2) = 917957613171da8a59903a1e29697f5a7ed84ebe3fdca99c6dbe6327e6f2a94e
-SIZE (sdcc-src-20060810-4330.tar.bz2) = 3139179
+MD5 (sdcc-src-20061012-4408.tar.bz2) = aa887a67df999f3826b3b351b1039be6
+SHA256 (sdcc-src-20061012-4408.tar.bz2) = 56729602b9fad6494387cc2c66af44ea8f1a19963ad7a9b22bf68c62ae637b60
+SIZE (sdcc-src-20061012-4408.tar.bz2) = 3221636
diff --git a/lang/sdcc-devel/files/patch-Makefile.in b/lang/sdcc-devel/files/patch-Makefile.in
index 4815ced1f3a4..b19a02683593 100644
--- a/lang/sdcc-devel/files/patch-Makefile.in
+++ b/lang/sdcc-devel/files/patch-Makefile.in
@@ -1,12 +1,12 @@
---- Makefile.in.orig	Thu May 11 22:06:55 2006
-+++ Makefile.in	Thu Jun 29 16:05:04 2006
+--- Makefile.in.orig	Fri Sep 15 08:52:50 2006
++++ Makefile.in	Thu Oct 12 18:14:59 2006
 @@ -27,6 +27,10 @@
  ifeq ($(OPT_DISABLE_MCS51), 0)
- SDCC_ASLINK     += as/mcs51
+ SDCC_ASLINK     += as/mcs51 as/link/mcs51
  SDCC_MISC	+= debugger/mcs51
 +else
 +ifeq ($(OPT_DISABLE_DS390), 0)
-+SDCC_ASLINK     += as/mcs51
++SDCC_ASLINK     += as/mcs51 as/link/mcs51
 +endif
  endif
  
diff --git a/lang/sdcc-devel/files/patch-configure.in b/lang/sdcc-devel/files/patch-configure.in
index 85ea08513d55..ea3d1d3846d3 100644
--- a/lang/sdcc-devel/files/patch-configure.in
+++ b/lang/sdcc-devel/files/patch-configure.in
@@ -1,21 +1,23 @@
---- configure.in.orig	Thu May 11 22:06:55 2006
-+++ configure.in	Wed Jun 28 22:22:07 2006
-@@ -634,6 +634,10 @@
+--- configure.in.orig	Sat Sep 16 16:10:20 2006
++++ configure.in	Thu Oct 12 17:57:12 2006
+@@ -653,6 +653,11 @@
  
  test $OPT_DISABLE_AVR = 0 && AC_CONFIG_FILES([src/avr/Makefile])
  
 +if test $OPT_DISABLE_DS390 = 0 -o $OPT_DISABLE_MCS51 = 0; then
-+  AC_CONFIG_FILES([as/mcs51/Makefile])
++  AC_CONFIG_FILES([as/mcs51/Makefile
++                   as/link/mcs51/Makefile])
 +fi
 +
  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])
-@@ -652,7 +656,6 @@
+@@ -671,8 +676,6 @@
  
  if test $OPT_DISABLE_MCS51 = 0; then
    AC_CONFIG_FILES([src/mcs51/Makefile
 -                   as/mcs51/Makefile
+-                   as/link/mcs51/Makefile
                     debugger/mcs51/Makefile])
    test $OPT_DISABLE_DEVICE_LIB = 0 && AC_CONFIG_FILES([device/lib/mcs51/Makefile
                                                         device/lib/small/Makefile
diff --git a/lang/sdcc-devel/pkg-plist b/lang/sdcc-devel/pkg-plist
index 4198018d8d35..e116c3f5cfd5 100644
--- a/lang/sdcc-devel/pkg-plist
+++ b/lang/sdcc-devel/pkg-plist
@@ -253,6 +253,7 @@ bin/sdcpp
 %%PIC16%%%%DATADIR%%/include/pic16/pic18f252.h
 %%PIC16%%%%DATADIR%%/include/pic16/pic18f2550.h
 %%PIC16%%%%DATADIR%%/include/pic16/pic18f258.h
+%%PIC16%%%%DATADIR%%/include/pic16/pic18f2620.h
 %%PIC16%%%%DATADIR%%/include/pic16/pic18f4220.h
 %%PIC16%%%%DATADIR%%/include/pic16/pic18f4331.h
 %%PIC16%%%%DATADIR%%/include/pic16/pic18f442.h
@@ -262,6 +263,7 @@ bin/sdcpp
 %%PIC16%%%%DATADIR%%/include/pic16/pic18f4520.h
 %%PIC16%%%%DATADIR%%/include/pic16/pic18f4550.h
 %%PIC16%%%%DATADIR%%/include/pic16/pic18f458.h
+%%PIC16%%%%DATADIR%%/include/pic16/pic18f4620.h
 %%PIC16%%%%DATADIR%%/include/pic16/pic18f6520.h
 %%PIC16%%%%DATADIR%%/include/pic16/pic18f6620.h
 %%PIC16%%%%DATADIR%%/include/pic16/pic18f6680.h
@@ -533,6 +535,8 @@ bin/sdcpp
 %%DEVLIB%%%%DS390%%%%DATADIR%%/lib/ds390/printfl.rel
 %%DEVLIB%%%%DS390%%%%DATADIR%%/lib/ds390/puts.asm
 %%DEVLIB%%%%DS390%%%%DATADIR%%/lib/ds390/puts.rel
+%%DEVLIB%%%%DS390%%%%DATADIR%%/lib/ds390/rand.asm
+%%DEVLIB%%%%DS390%%%%DATADIR%%/lib/ds390/rand.rel
 %%DEVLIB%%%%DS390%%%%DATADIR%%/lib/ds390/realloc.asm
 %%DEVLIB%%%%DS390%%%%DATADIR%%/lib/ds390/realloc.rel
 %%DEVLIB%%%%DS390%%%%DATADIR%%/lib/ds390/rtc390.rel
@@ -796,6 +800,8 @@ bin/sdcpp
 %%DEVLIB%%%%DS390%%%%DATADIR%%/lib/ds400/printfl.rel
 %%DEVLIB%%%%DS390%%%%DATADIR%%/lib/ds400/puts.asm
 %%DEVLIB%%%%DS390%%%%DATADIR%%/lib/ds400/puts.rel
+%%DEVLIB%%%%DS390%%%%DATADIR%%/lib/ds400/rand.asm
+%%DEVLIB%%%%DS390%%%%DATADIR%%/lib/ds400/rand.rel
 %%DEVLIB%%%%DS390%%%%DATADIR%%/lib/ds400/realloc.asm
 %%DEVLIB%%%%DS390%%%%DATADIR%%/lib/ds400/realloc.rel
 %%DEVLIB%%%%DS390%%%%DATADIR%%/lib/ds400/ser_ir.asm
@@ -1006,6 +1012,8 @@ bin/sdcpp
 %%DEVLIB%%%%Z80%%%%DATADIR%%/lib/gbz80/putchar.o
 %%DEVLIB%%%%Z80%%%%DATADIR%%/lib/gbz80/puts.asm
 %%DEVLIB%%%%Z80%%%%DATADIR%%/lib/gbz80/puts.o
+%%DEVLIB%%%%Z80%%%%DATADIR%%/lib/gbz80/rand.asm
+%%DEVLIB%%%%Z80%%%%DATADIR%%/lib/gbz80/rand.o
 %%DEVLIB%%%%Z80%%%%DATADIR%%/lib/gbz80/realloc.asm
 %%DEVLIB%%%%Z80%%%%DATADIR%%/lib/gbz80/realloc.o
 %%DEVLIB%%%%Z80%%%%DATADIR%%/lib/gbz80/shift.o
@@ -1214,6 +1222,8 @@ bin/sdcpp
 %%DEVLIB%%%%HC08%%%%DATADIR%%/lib/hc08/printf_large.rel
 %%DEVLIB%%%%HC08%%%%DATADIR%%/lib/hc08/puts.asm
 %%DEVLIB%%%%HC08%%%%DATADIR%%/lib/hc08/puts.rel
+%%DEVLIB%%%%HC08%%%%DATADIR%%/lib/hc08/rand.asm
+%%DEVLIB%%%%HC08%%%%DATADIR%%/lib/hc08/rand.rel
 %%DEVLIB%%%%HC08%%%%DATADIR%%/lib/hc08/realloc.asm
 %%DEVLIB%%%%HC08%%%%DATADIR%%/lib/hc08/realloc.rel
 %%DEVLIB%%%%HC08%%%%DATADIR%%/lib/hc08/sincosf.asm
@@ -1478,6 +1488,8 @@ bin/sdcpp
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/large/printfl.rel
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/large/puts.asm
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/large/puts.rel
+%%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/large/rand.asm
+%%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/large/rand.rel
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/large/realloc.asm
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/large/realloc.rel
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/large/ser_ir.asm
@@ -1746,6 +1758,8 @@ bin/sdcpp
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/medium/printfl.rel
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/medium/puts.asm
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/medium/puts.rel
+%%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/medium/rand.asm
+%%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/medium/rand.rel
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/medium/realloc.asm
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/medium/realloc.rel
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/medium/ser_ir.asm
@@ -1851,8 +1865,10 @@ bin/sdcpp
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f2455.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f248.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f252.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f2525.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f2550.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f258.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f2620.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f4220.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f4320.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f4331.lib
@@ -1861,8 +1877,10 @@ bin/sdcpp
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f448.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f452.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f4520.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f4525.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f4550.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f458.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f4620.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f6520.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f6620.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/libio18f6680.lib
@@ -1882,8 +1900,10 @@ bin/sdcpp
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f2455.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f248.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f252.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f2525.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f2550.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f258.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f2620.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f4220.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f4320.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f4331.lib
@@ -1892,8 +1912,10 @@ bin/sdcpp
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f448.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f452.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f4520.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f4525.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f4550.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f458.lib
+%%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f4620.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f6520.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f6620.lib
 %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/pic18f6680.lib
@@ -2142,6 +2164,8 @@ bin/sdcpp
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small/printfl.rel
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small/puts.asm
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small/puts.rel
+%%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small/rand.asm
+%%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small/rand.rel
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small/realloc.asm
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small/realloc.rel
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small/ser_ir.asm
@@ -2410,6 +2434,8 @@ bin/sdcpp
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small-stack-auto/printfl.rel
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small-stack-auto/puts.asm
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small-stack-auto/puts.rel
+%%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small-stack-auto/rand.asm
+%%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small-stack-auto/rand.rel
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small-stack-auto/realloc.asm
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small-stack-auto/realloc.rel
 %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small-stack-auto/ser_ir.asm
@@ -2617,6 +2643,8 @@ bin/sdcpp
 %%DEVLIB%%%%Z80%%%%DATADIR%%/lib/z80/putchar.o
 %%DEVLIB%%%%Z80%%%%DATADIR%%/lib/z80/puts.asm
 %%DEVLIB%%%%Z80%%%%DATADIR%%/lib/z80/puts.o
+%%DEVLIB%%%%Z80%%%%DATADIR%%/lib/z80/rand.asm
+%%DEVLIB%%%%Z80%%%%DATADIR%%/lib/z80/rand.o
 %%DEVLIB%%%%Z80%%%%DATADIR%%/lib/z80/realloc.asm
 %%DEVLIB%%%%Z80%%%%DATADIR%%/lib/z80/realloc.o
 %%DEVLIB%%%%Z80%%%%DATADIR%%/lib/z80/shift.o