8 files changed, 99 insertions, 34 deletions

diff --git a/lang/sdcc-devel/Makefile b/lang/sdcc-devel/Makefile
index a2aae3717f3c..50b35e5e2d49 100644
--- a/lang/sdcc-devel/Makefile
+++ b/lang/sdcc-devel/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	sdcc
-PORTVERSION=	2.5.1.2005.07.09
+PORTVERSION=	2.5.2.2005.09.03
 CATEGORIES=	lang
 MASTER_SITES=	http://sdcc.sourceforge.net/snapshots/sdcc-src/ \
 		http://www.kalimero.be/mirror/
-DISTNAME=	${PORTNAME}-src-20050709
+DISTNAME=	${PORTNAME}-src-20050903
 
 MAINTAINER=	tijl@ulyssis.org
 COMMENT=	Small Device C Compiler
@@ -68,7 +68,6 @@ CONFIGURE_ARGS+=	--disable-pic16-port
 PLIST_SUB+=		PIC16="@comment "
 .else
 BUILD_DEPENDS+=		gpasm:${PORTSDIR}/devel/gputils
-USE_AUTOCONF_VER=	259
 PLIST_SUB+=		PIC16=""
 .endif
 
diff --git a/lang/sdcc-devel/distinfo b/lang/sdcc-devel/distinfo
index fb6e69f4babe..f28244390dd1 100644
--- a/lang/sdcc-devel/distinfo
+++ b/lang/sdcc-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (sdcc-src-20050709.tar.gz) = 19167837892d6789588d2057de1591a8
-SIZE (sdcc-src-20050709.tar.gz) = 3739031
+MD5 (sdcc-src-20050903.tar.gz) = 6e1fd698052780ad9a42600f3a03f94c
+SIZE (sdcc-src-20050903.tar.gz) = 3776416
diff --git a/lang/sdcc-devel/files/patch-configure.in b/lang/sdcc-devel/files/patch-configure.in
deleted file mode 100644
index 9248c65a82df..000000000000
--- a/lang/sdcc-devel/files/patch-configure.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig	Fri Apr  8 15:58:08 2005
-+++ configure.in	Fri Apr  8 15:58:22 2005
-@@ -650,7 +650,7 @@
- AC_CONFIG_SUBDIRS(support/cpp2)
- AC_CONFIG_SUBDIRS(packihx)
- AC_CONFIG_SUBDIRS(sim/ucsim)
--#AC_CONFIG_SUBDIRS(device/lib/pic16)
-+AC_CONFIG_SUBDIRS(device/lib/pic16)
- 
- AC_CONFIG_FILES([main.mk:main_in.mk
- src/Makefile
diff --git a/lang/sdcc-devel/files/patch-device-lib-Makefile.in b/lang/sdcc-devel/files/patch-device-lib-Makefile.in
index 2027a0643657..b064a18f50fb 100644
--- a/lang/sdcc-devel/files/patch-device-lib-Makefile.in
+++ b/lang/sdcc-devel/files/patch-device-lib-Makefile.in
@@ -1,26 +1,15 @@
---- device/lib/Makefile.in.orig	Sat Mar 19 19:47:47 2005
-+++ device/lib/Makefile.in	Fri Apr  8 16:44:43 2005
-@@ -167,7 +167,7 @@
- 
- # Compiling entire program or any subproject
- # ------------------------------------------
--all: checkconf models model-ds390 model-ds400 model-z80 model-gbz80 model-hc08
-+all: checkconf models model-ds390 model-ds400 model-z80 model-gbz80 model-hc08 model-pic16
- 
- # model-pic16
- # (needs gputils curently not available of sourceforge's compile farm)
-@@ -272,9 +272,7 @@
- # Compiling and installing everything and runing test
+--- device/lib/Makefile.in.orig	Sat Sep  3 21:35:14 2005
++++ device/lib/Makefile.in	Sat Sep  3 21:35:45 2005
+@@ -280,8 +280,6 @@
  # ---------------------------------------------------
  install: all installdirs
--	cp -r -u $(BUILDDIR)/* $(sdcc_libdir)
--	cp -r -u ds390 ds400 gbz80 z80 hc08 *.c $(sdcc_libdir)/src
--	rm -r `find $(sdcc_libdir)/src -name '*.rel' -or -name '*.dump*' -or -name '*.sym' -or -name '*.o' -or -name '*.lst' -or -name '*.asm' -or -name 'CVS'`
-+	-cp -r $(BUILDDIR)/* $(sdcc_libdir)
+ 	$(CP_U) -r $(BUILDDIR)/* $(sdcc_libdir)
+-	$(CP_U) -r ds390 ds400 gbz80 z80 hc08 *.c $(sdcc_libdir)/src
+-	rm -r `find $(sdcc_libdir)/src -name '*.rel' -o -name '*.dump*' -o -name '*.sym' -o -name '*.o' -o -name '*.lst' -o -name '*.asm' -o -name 'CVS'`
  
  # Deleting all the installed files
  # --------------------------------
-@@ -295,15 +293,6 @@
+@@ -302,15 +300,6 @@
  # ---------------------------------
  installdirs:
  	[ -d $(sdcc_libdir) ] || mkdir -p $(sdcc_libdir)
diff --git a/lang/sdcc-devel/files/patch-device-lib-pic16-Makefile.common.in b/lang/sdcc-devel/files/patch-device-lib-pic16-Makefile.common.in
new file mode 100644
index 000000000000..4cb675160346
--- /dev/null
+++ b/lang/sdcc-devel/files/patch-device-lib-pic16-Makefile.common.in
@@ -0,0 +1,32 @@
+--- device/lib/pic16/Makefile.common.in.orig	Sat Aug 20 12:27:03 2005
++++ device/lib/pic16/Makefile.common.in	Sat Sep  3 20:21:43 2005
+@@ -16,7 +16,6 @@
+ ### $Id: Makefile.common.in,v 1.10 2005/08/20 10:27:03 sdcc-builder Exp $
+ ###
+ 
+-SHELL = bash
+ 
+ #################################################
+ ### verboseness
+@@ -27,10 +26,10 @@
+ 
+ #################################################
+ ### compiler switches
+-ARCH   ?= 452		# might be overwritten in libio
++PICARCH   ?= 452		# might be overwritten in libio
+ 
+ CFLAGS ?=
+-CFLAGS += -mpic16 -p18f$(ARCH)
++CFLAGS += -mpic16 -p18f$(PICARCH)
+ CFLAGS += --std-c99
+ CFLAGS += -I. -I$(topsrcdir)/../../include/pic16
+ 
+@@ -63,7 +62,7 @@
+ #################################################
+ ### assembler switches
+ ASFLAGS ?=
+-ASFLAGS += -pp18f$(ARCH)
++ASFLAGS += -pp18f$(PICARCH)
+ ASFLAGS += -I$(topsrcdir)/../../include/pic16
+ 
+ #################################################
diff --git a/lang/sdcc-devel/files/patch-device-lib-pic16-Makefile.rules b/lang/sdcc-devel/files/patch-device-lib-pic16-Makefile.rules
new file mode 100644
index 000000000000..d834c2d9e0dc
--- /dev/null
+++ b/lang/sdcc-devel/files/patch-device-lib-pic16-Makefile.rules
@@ -0,0 +1,11 @@
+--- device/lib/pic16/Makefile.rules.orig	Sat Sep  3 20:19:06 2005
++++ device/lib/pic16/Makefile.rules	Sat Sep  3 20:19:50 2005
+@@ -48,7 +48,7 @@
+ ifneq (,$(strip $(SUBDIRS)))
+ recurse : force
+ 	$(Q)+for DIR in $(SUBDIRS) ; do \
+-		$(GREP) "^$${ARCH}$$" "$${DIR}.ignore" &> /dev/null || ( \
++		$(GREP) "^$${PICARCH}$$" "$${DIR}.ignore" 2>&1 > /dev/null || ( \
+ 			[ -d "$(topsrcdir)/$(builddir)/$${DIR}" ] || $(MKDIR) "$(topsrcdir)/$(builddir)/$${DIR}"; \
+ 			$(MAKE) -C "$${DIR}" builddir="$(builddir)/$${DIR}" $(MAKECMDGOALS); \
+ 		) || exit 1; \
diff --git a/lang/sdcc-devel/files/patch-device-lib-pic16-libio-Makefile b/lang/sdcc-devel/files/patch-device-lib-pic16-libio-Makefile
new file mode 100644
index 000000000000..74ae3ed7a3c7
--- /dev/null
+++ b/lang/sdcc-devel/files/patch-device-lib-pic16-libio-Makefile
@@ -0,0 +1,11 @@
+--- device/lib/pic16/libio/Makefile.orig	Sat Sep  3 20:23:48 2005
++++ device/lib/pic16/libio/Makefile	Sat Sep  3 20:22:58 2005
+@@ -35,7 +35,7 @@
+ 		| while read arch; do \
+ 			[ "x$${arch}" = "x" ] \
+ 			|| ( [ -d "$(builddir)/$${arch}" ] || $(MKDIR) "$(builddir)/$${arch}"; \
+-				$(MAKE) MKLIB=libio18f$${arch}.lib builddir=$(builddir)/$${arch} ARCH=$${arch} IO_ARCH=$${arch} $(MAKECMDGOALS); ) \
++				$(MAKE) MKLIB=libio18f$${arch}.lib builddir=$(builddir)/$${arch} PICARCH=$${arch} IO_ARCH=$${arch} $(MAKECMDGOALS); ) \
+ 			|| exit 1; \
+ 	done
+ 
diff --git a/lang/sdcc-devel/pkg-plist b/lang/sdcc-devel/pkg-plist
index 91a02a703fac..d362806bc2f8 100644
--- a/lang/sdcc-devel/pkg-plist
+++ b/lang/sdcc-devel/pkg-plist
@@ -105,6 +105,7 @@ share/sdcc/include/math.h
 %%MCS51%%share/sdcc/include/mcs51/8051.h
 %%MCS51%%share/sdcc/include/mcs51/8052.h
 %%MCS51%%share/sdcc/include/mcs51/at89S8252.h
+%%MCS51%%share/sdcc/include/mcs51/at89c51ed2.h
 %%MCS51%%share/sdcc/include/mcs51/at89c55.h
 %%MCS51%%share/sdcc/include/mcs51/at89s53.h
 %%MCS51%%share/sdcc/include/mcs51/at89x051.h
@@ -123,6 +124,7 @@ share/sdcc/include/math.h
 %%MCS51%%share/sdcc/include/mcs51/c8051f350.h
 %%MCS51%%share/sdcc/include/mcs51/lint.h
 %%MCS51%%share/sdcc/include/mcs51/mcs51reg.h
+%%MCS51%%share/sdcc/include/mcs51/msm8xc154s.h
 %%MCS51%%share/sdcc/include/mcs51/p89v51rd2.h
 %%MCS51%%share/sdcc/include/mcs51/reg51.h
 %%MCS51%%share/sdcc/include/mcs51/reg764.h
@@ -146,6 +148,7 @@ share/sdcc/include/math.h
 %%PIC16%%share/sdcc/include/pic16/pic18f252.h
 %%PIC16%%share/sdcc/include/pic16/pic18f2550.h
 %%PIC16%%share/sdcc/include/pic16/pic18f258.h
+%%PIC16%%share/sdcc/include/pic16/pic18f4220.h
 %%PIC16%%share/sdcc/include/pic16/pic18f4331.h
 %%PIC16%%share/sdcc/include/pic16/pic18f442.h
 %%PIC16%%share/sdcc/include/pic16/pic18f4455.h
@@ -1249,6 +1252,7 @@ share/sdcc/include/z180.h
 %%MCS51%%share/sdcc/lib/large/coshf.rel
 %%MCS51%%share/sdcc/lib/large/cotf.asm
 %%MCS51%%share/sdcc/lib/large/cotf.rel
+%%MCS51%%share/sdcc/lib/large/crtbank.rel
 %%MCS51%%share/sdcc/lib/large/crtclear.rel
 %%MCS51%%share/sdcc/lib/large/crtpagesfr.rel
 %%MCS51%%share/sdcc/lib/large/crtstart.rel
@@ -1335,17 +1339,46 @@ share/sdcc/include/z180.h
 %%PIC16%%share/sdcc/lib/pic16/crt0iz.o
 %%PIC16%%share/sdcc/lib/pic16/libc18f.lib
 %%PIC16%%share/sdcc/lib/pic16/libdebug.lib
+%%PIC16%%share/sdcc/lib/pic16/libio18f1220.lib
+%%PIC16%%share/sdcc/lib/pic16/libio18f2220.lib
+%%PIC16%%share/sdcc/lib/pic16/libio18f2320.lib
+%%PIC16%%share/sdcc/lib/pic16/libio18f242.lib
+%%PIC16%%share/sdcc/lib/pic16/libio18f2455.lib
+%%PIC16%%share/sdcc/lib/pic16/libio18f248.lib
+%%PIC16%%share/sdcc/lib/pic16/libio18f252.lib
+%%PIC16%%share/sdcc/lib/pic16/libio18f2550.lib
+%%PIC16%%share/sdcc/lib/pic16/libio18f258.lib
+%%PIC16%%share/sdcc/lib/pic16/libio18f4220.lib
+%%PIC16%%share/sdcc/lib/pic16/libio18f4320.lib
+%%PIC16%%share/sdcc/lib/pic16/libio18f4331.lib
+%%PIC16%%share/sdcc/lib/pic16/libio18f442.lib
+%%PIC16%%share/sdcc/lib/pic16/libio18f4455.lib
+%%PIC16%%share/sdcc/lib/pic16/libio18f448.lib
+%%PIC16%%share/sdcc/lib/pic16/libio18f452.lib
+%%PIC16%%share/sdcc/lib/pic16/libio18f4520.lib
+%%PIC16%%share/sdcc/lib/pic16/libio18f458.lib
+%%PIC16%%share/sdcc/lib/pic16/libio18f6520.lib
+%%PIC16%%share/sdcc/lib/pic16/libio18f6620.lib
+%%PIC16%%share/sdcc/lib/pic16/libio18f6680.lib
+%%PIC16%%share/sdcc/lib/pic16/libio18f6720.lib
+%%PIC16%%share/sdcc/lib/pic16/libio18f8520.lib
+%%PIC16%%share/sdcc/lib/pic16/libio18f8620.lib
+%%PIC16%%share/sdcc/lib/pic16/libio18f8680.lib
+%%PIC16%%share/sdcc/lib/pic16/libio18f8720.lib
 %%PIC16%%share/sdcc/lib/pic16/libm18f.lib
 %%PIC16%%share/sdcc/lib/pic16/libsdcc.lib
 %%PIC16%%share/sdcc/lib/pic16/pic16.lib
 %%PIC16%%share/sdcc/lib/pic16/pic18f1220.lib
 %%PIC16%%share/sdcc/lib/pic16/pic18f2220.lib
+%%PIC16%%share/sdcc/lib/pic16/pic18f2320.lib
 %%PIC16%%share/sdcc/lib/pic16/pic18f242.lib
 %%PIC16%%share/sdcc/lib/pic16/pic18f2455.lib
 %%PIC16%%share/sdcc/lib/pic16/pic18f248.lib
 %%PIC16%%share/sdcc/lib/pic16/pic18f252.lib
 %%PIC16%%share/sdcc/lib/pic16/pic18f2550.lib
 %%PIC16%%share/sdcc/lib/pic16/pic18f258.lib
+%%PIC16%%share/sdcc/lib/pic16/pic18f4220.lib
+%%PIC16%%share/sdcc/lib/pic16/pic18f4320.lib
 %%PIC16%%share/sdcc/lib/pic16/pic18f4331.lib
 %%PIC16%%share/sdcc/lib/pic16/pic18f442.lib
 %%PIC16%%share/sdcc/lib/pic16/pic18f4455.lib
@@ -1547,6 +1580,7 @@ share/sdcc/include/z180.h
 %%MCS51%%share/sdcc/lib/small/coshf.rel
 %%MCS51%%share/sdcc/lib/small/cotf.asm
 %%MCS51%%share/sdcc/lib/small/cotf.rel
+%%MCS51%%share/sdcc/lib/small/crtbank.rel
 %%MCS51%%share/sdcc/lib/small/crtclear.rel
 %%MCS51%%share/sdcc/lib/small/crtpagesfr.rel
 %%MCS51%%share/sdcc/lib/small/crtstart.rel