- Update to 3.0.0

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

5 files changed, 74 insertions, 36 deletions

diff --git a/lang/sdcc/files/patch-Makefile.in b/lang/sdcc/files/patch-Makefile.in
index a79de740e438..2bfb0aa8586d 100644
--- a/lang/sdcc/files/patch-Makefile.in
+++ b/lang/sdcc/files/patch-Makefile.in
@@ -1,12 +1,12 @@
---- 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 as/link/mcs51
+--- Makefile.in.orig	2010-04-20 19:05:59.000000000 +0200
++++ Makefile.in	2010-04-20 19:06:47.000000000 +0200
+@@ -33,6 +33,10 @@
+ SDCC_AS         += sdas/as8051
+ SDCC_LD         += sdcc-ld8051
  SDCC_MISC       += debugger/mcs51
 +else
 +ifeq ($(OPT_DISABLE_DS390), 0)
-+SDCC_ASLINK     += as/mcs51 as/link/mcs51
++SDCC_AS         += sdas/as8051
 +endif
  endif
  
diff --git a/lang/sdcc/files/patch-configure.in b/lang/sdcc/files/patch-configure.in
index 3138ab8cd5c6..8172feede30a 100644
--- a/lang/sdcc/files/patch-configure.in
+++ b/lang/sdcc/files/patch-configure.in
@@ -1,25 +1,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])
- 
-+if test $OPT_DISABLE_DS390 = 0 -o $OPT_DISABLE_MCS51 = 0; then
-+  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])
-@@ -647,9 +652,7 @@
+--- configure.in.orig	2010-09-13 11:23:59.000000000 +0200
++++ configure.in	2010-09-26 12:37:08.000000000 +0200
+@@ -842,7 +842,7 @@
+   test $OPT_DISABLE_DEVICE_LIB = 0 && AC_CONFIG_FILES([device/lib/hc08/Makefile])
  fi
  
- if test $OPT_DISABLE_MCS51 = 0; then
--  AC_CONFIG_FILES([src/mcs51/Makefile
--                   as/mcs51/Makefile
--                   as/link/mcs51/Makefile])
-+  AC_CONFIG_FILES([src/mcs51/Makefile])
+-if test $OPT_DISABLE_MCS51 = 0; then
++if test $OPT_DISABLE_DS390 = 0 -o $OPT_DISABLE_MCS51 = 0; then
+   AC_CONFIG_FILES([src/mcs51/Makefile
+                    sdas/as8051/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/files/patch-device-lib-Makefile.in b/lang/sdcc/files/patch-device-lib-Makefile.in
index 82fbbbea226b..5b4e61436d69 100644
--- a/lang/sdcc/files/patch-device-lib-Makefile.in
+++ b/lang/sdcc/files/patch-device-lib-Makefile.in
@@ -1,9 +1,9 @@
---- device/lib/Makefile.in.orig	2008-08-24 22:30:52.000000000 +0200
-+++ device/lib/Makefile.in	2008-12-06 14:39:15.000000000 +0100
-@@ -355,25 +355,6 @@
+--- device/lib/Makefile.in.orig	2010-10-16 22:24:44.000000000 +0200
++++ device/lib/Makefile.in	2010-11-06 17:37:50.000000000 +0100
+@@ -422,25 +422,6 @@
  # ---------------------------------------------------
  install: all installdirs
- 	$(CP_U) -r $(BUILDDIR)/* $(sdcc_libdir)
+ 	[ ! -d "$(BUILDDIR)" ] || $(CP_U) -r $(BUILDDIR)/* $(sdcc_libdir)
 -	$(CP_U) -r $(MODELS) $(srcdir)/mcs51 $(srcdir)/ds390 $(srcdir)/ds400 \
 -	                     $(srcdir)/gbz80 $(srcdir)/z80 $(srcdir)/hc08 \
 -	                     $(srcdir)/pic $(srcdir)/pic16 $(srcdir)/*.c $(sdcc_libdir)/src
@@ -26,18 +26,18 @@
  
  # Deleting all the installed files
  # --------------------------------
-@@ -382,14 +365,6 @@
+@@ -460,13 +441,7 @@
+ # Creating installation directories
  # ---------------------------------
  installdirs:
- 	[ -d $(sdcc_libdir) ] || mkdir -p $(sdcc_libdir)
 -	for model in $(MODELS); do \
--	  [ -d $(sdcc_libdir)/$$model ] || \
 -	  mkdir -p $(sdcc_libdir)/$$model; \
 -	done
 -	for libdir in small-stack-auto ds390 ds400 hc08 pic16 pic; do \
--	  [ -d $(sdcc_libdir)/$$libdir ] || mkdir -p $(sdcc_libdir)/$$libdir; \
+-	  mkdir -p $(sdcc_libdir)/$$libdir; \
 -	done
 -	mkdir -p $(sdcc_libdir)/src
++	mkdir -p $(sdcc_libdir)
  
  # Creating dependencies
  # ---------------------
diff --git a/lang/sdcc/files/patch-device-non-free-lib-Makefile.in b/lang/sdcc/files/patch-device-non-free-lib-Makefile.in
new file mode 100644
index 000000000000..be2ed25f69ab
--- /dev/null
+++ b/lang/sdcc/files/patch-device-non-free-lib-Makefile.in
@@ -0,0 +1,32 @@
+--- device/non-free/lib/Makefile.in.orig	2010-11-06 18:13:16.000000000 +0100
++++ device/non-free/lib/Makefile.in	2010-11-06 18:17:52.000000000 +0100
+@@ -397,17 +397,6 @@
+ # ---------------------------------------------------
+ install: all installdirs
+ 	[ ! -d "$(BUILDDIR)" ] || $(CP_U) -r $(BUILDDIR)/* $(sdcc_libdir)
+-	$(CP_U) -r $(srcdir)/pic $(srcdir)/pic16 $(sdcc_libdir)/src
+-
+-	for src in pic 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 'build' -o -name 'bin' -o -name 'Makefile*' -o -name 'config*' -o \
+-	    -name 'depcomp' -o -name 'missing' -o -name 'install-sh' -o \
+-	    -name 'bootstrap.sh' \) \
+-	    -exec rm -rf {} + ; \
+-	done
+ 
+ # Deleting all the installed files
+ # --------------------------------
+@@ -427,10 +416,7 @@
+ # Creating installation directories
+ # ---------------------------------
+ installdirs:
+-	for libdir in pic16 pic; do \
+-	  mkdir -p $(sdcc_libdir)/$$libdir; \
+-	done
+-	mkdir -p $(sdcc_libdir)/src
++	mkdir -p $(sdcc_libdir)
+ 
+ # Creating dependencies
+ # ---------------------
diff --git a/lang/sdcc/files/patch-sdas-linksrc-Makefile.in b/lang/sdcc/files/patch-sdas-linksrc-Makefile.in
new file mode 100644
index 000000000000..346c16610028
--- /dev/null
+++ b/lang/sdcc/files/patch-sdas-linksrc-Makefile.in
@@ -0,0 +1,20 @@
+--- sdas/linksrc/Makefile.in.orig	2010-04-20 19:07:51.000000000 +0200
++++ sdas/linksrc/Makefile.in	2010-04-20 19:08:24.000000000 +0200
+@@ -63,7 +63,7 @@
+ 
+ # Compiling entire program or any subproject
+ # ------------------------------------------
+-all: sdcc-ld8051 sdcc-ldz80 sdcc-ldgb sdcc-ld6808
++all: sdcc-ld8051
+ 
+ sdcc-ld8051: checkconf $(ASLINK)
+ 
+@@ -82,7 +82,7 @@
+ # Compiling and installing everything and running test
+ # ----------------------------------------------------
+ install: all installdirs
+-	for ld in $(ASLINK) $(top_builddir)/bin/sdldz80$(EXEEXT) $(top_builddir)/bin/sdldgb$(EXEEXT) $(top_builddir)/bin/sdld6808$(EXEEXT); \
++	for ld in $(ASLINK); \
+ 	do \
+ 	  $(INSTALL) $$ld `echo $(DESTDIR)$(bindir)/\`basename $$ld\` | sed '$(transform)'`; \
+ 	  $(STRIP) `echo $(DESTDIR)$(bindir)/\`basename $$ld\` | sed '$(transform)'`; \