diff options
author | Rene Ladan <rene@FreeBSD.org> | 2010-04-28 10:38:00 +0000 |
---|---|---|
committer | Rene Ladan <rene@FreeBSD.org> | 2010-04-28 10:38:00 +0000 |
commit | f8d9cbf6584fcab68d9dc6eb555b7d03c44f1da7 (patch) | |
tree | 4c6d3c0a8cab60a335469938335be3351ad6281a /lang/sdcc-devel | |
parent | Fix problems caused by the recent bumps in port revision (diff) |
Update to 2.9.7.2010.04.20
PR: ports/145892
Submitted by: maintainer
Approved by: tabthorpe (mentor)
Notes
Notes:
svn path=/head/; revision=253376
Diffstat (limited to 'lang/sdcc-devel')
-rw-r--r-- | lang/sdcc-devel/Makefile | 9 | ||||
-rw-r--r-- | lang/sdcc-devel/distinfo | 6 | ||||
-rw-r--r-- | lang/sdcc-devel/files/patch-Makefile.in | 12 | ||||
-rw-r--r-- | lang/sdcc-devel/files/patch-configure.in | 43 | ||||
-rw-r--r-- | lang/sdcc-devel/files/patch-sdas-linksrc-Makefile.in | 20 | ||||
-rw-r--r-- | lang/sdcc-devel/pkg-plist | 16 |
6 files changed, 66 insertions, 40 deletions
diff --git a/lang/sdcc-devel/Makefile b/lang/sdcc-devel/Makefile index 23e11171fbd9..3cdd71c6018b 100644 --- a/lang/sdcc-devel/Makefile +++ b/lang/sdcc-devel/Makefile @@ -6,11 +6,11 @@ # PORTNAME= sdcc -PORTVERSION= 2.9.4.2009.12.15 +PORTVERSION= 2.9.7.2010.04.20 CATEGORIES= lang MASTER_SITES= http://sdcc.sourceforge.net/snapshots/sdcc-src/ \ http://tijl.fastmail.fm/mirror/ -DISTNAME= ${PORTNAME}-src-20091215-5595 +DISTNAME= ${PORTNAME}-src-20100420-5813 MAINTAINER= tijl@coosemans.org COMMENT= Small Device C Compiler @@ -71,9 +71,10 @@ PLIST_SUB+= Z80="" .endif .if defined(WITHOUT_AVR) -CONFIGURE_ARGS+= --disable-avr-port --disable-avr +CONFIGURE_ARGS+= --disable-avr PLIST_SUB+= AVR="@comment " .else +CONFIGURE_ARGS+= --enable-avr-port PLIST_SUB+= AVR="" .endif @@ -101,9 +102,9 @@ PLIST_SUB+= PIC16="" .endif .if defined(WITHOUT_XA51) -CONFIGURE_ARGS+= --disable-xa51-port PLIST_SUB+= XA51="@comment " .else +CONFIGURE_ARGS+= --enable-xa51-port --enable-xa PLIST_SUB+= XA51="" .endif diff --git a/lang/sdcc-devel/distinfo b/lang/sdcc-devel/distinfo index 5882394c60a6..e2a727973431 100644 --- a/lang/sdcc-devel/distinfo +++ b/lang/sdcc-devel/distinfo @@ -1,3 +1,3 @@ -MD5 (sdcc-src-20091215-5595.tar.bz2) = bb8486e8648047bfc108b3d4e54b33d5 -SHA256 (sdcc-src-20091215-5595.tar.bz2) = b6a0254e9ff4dbcc761637e16e5df8d3b98192b601e63ef768afea091c0aaa50 -SIZE (sdcc-src-20091215-5595.tar.bz2) = 3823441 +MD5 (sdcc-src-20100420-5813.tar.bz2) = 307f1fa032054dd2aa19cab2c2452970 +SHA256 (sdcc-src-20100420-5813.tar.bz2) = 253dbd79917f739745f64b22749265519bbdcfd718ca70cd30a36454138066fe +SIZE (sdcc-src-20100420-5813.tar.bz2) = 3849237 diff --git a/lang/sdcc-devel/files/patch-Makefile.in b/lang/sdcc-devel/files/patch-Makefile.in index a79de740e438..2bfb0aa8586d 100644 --- a/lang/sdcc-devel/files/patch-Makefile.in +++ b/lang/sdcc-devel/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-devel/files/patch-configure.in b/lang/sdcc-devel/files/patch-configure.in index 3138ab8cd5c6..41f6ffa154f5 100644 --- a/lang/sdcc-devel/files/patch-configure.in +++ b/lang/sdcc-devel/files/patch-configure.in @@ -1,25 +1,26 @@ ---- configure.in.orig Tue Nov 21 16:27:08 2006 -+++ configure.in Wed Dec 13 16:32:58 2006 -@@ -629,6 +629,11 @@ +--- configure.in.orig 2010-03-25 00:36:28.000000000 +0100 ++++ configure.in 2010-04-20 17:38:29.000000000 +0200 +@@ -93,13 +93,12 @@ + # ----------------------- + # Shell function body for _AC_EXECUTE_IFELSE. + m4_define([_bor_EXECUTE_IFELSE_BODY], +-[ AS_LINENO_PUSH([$[]1]) ++[ + AS_IF([_AC_DO_STDERR([$1 $2]) > conftest.out && { + test ! -s conftest.err + }], + [ac_retval=0], + [ac_retval=1]) +- AS_LINENO_POP + ])# _bor_EXECUTE_IFELSE_BODY - 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 @@ + # bor_EXECUTE_IFELSE(COMMAND[ACTION-IF-TRUE], [ACTION-IF-FALSE]) +@@ -836,7 +835,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-devel/files/patch-sdas-linksrc-Makefile.in b/lang/sdcc-devel/files/patch-sdas-linksrc-Makefile.in new file mode 100644 index 000000000000..346c16610028 --- /dev/null +++ b/lang/sdcc-devel/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)'`; \ diff --git a/lang/sdcc-devel/pkg-plist b/lang/sdcc-devel/pkg-plist index 5bea78cee961..849827a43a05 100644 --- a/lang/sdcc-devel/pkg-plist +++ b/lang/sdcc-devel/pkg-plist @@ -1,3 +1,4 @@ +bin/as2gbmap bin/asranlib bin/makebin %%PACKIHX%%bin/packihx @@ -13,11 +14,9 @@ bin/sdcclib %%UCSIM%%%%MCS51%%bin/sdcdb.el %%UCSIM%%%%MCS51%%bin/sdcdbsrc.el bin/sdcpp -%%MCS51DS390%%bin/sdld -%%HC08%%bin/sdld6808 -%%Z80%%bin/sdldgb -%%Z80%%bin/sdldz80 +bin/sdld %%UCSIM%%%%HC08%%bin/shc08 +%%UCSIM%%%%XA51%%bin/sxa %%UCSIM%%%%Z80%%bin/sz80 %%PORTDOCS%%%%DOCSDIR%%/INSTALL.txt %%PORTDOCS%%%%DOCSDIR%%/README.txt @@ -168,6 +167,7 @@ bin/sdcpp %%MCS51%%%%DATADIR%%/include/mcs51/serial_IO.h %%MCS51%%%%DATADIR%%/include/mcs51/uPSD32xx.h %%MCS51%%%%DATADIR%%/include/mcs51/uPSD33xx.h +%%MCS51%%%%DATADIR%%/include/mcs51/w7100.h %%PIC%%%%DATADIR%%/include/pic/errno.h %%PIC%%%%DATADIR%%/include/pic/float.h %%PIC%%%%DATADIR%%/include/pic/limits.h @@ -211,6 +211,7 @@ bin/sdcpp %%PIC%%%%DATADIR%%/include/pic/pic16c782.h %%PIC%%%%DATADIR%%/include/pic/pic16c925.h %%PIC%%%%DATADIR%%/include/pic/pic16c926.h +%%PIC%%%%DATADIR%%/include/pic/pic16f616.h %%PIC%%%%DATADIR%%/include/pic/pic16f627.h %%PIC%%%%DATADIR%%/include/pic/pic16f627a.h %%PIC%%%%DATADIR%%/include/pic/pic16f628.h @@ -259,6 +260,7 @@ bin/sdcpp %%PIC%%%%DATADIR%%/include/pic/pic16f914.h %%PIC%%%%DATADIR%%/include/pic/pic16f916.h %%PIC%%%%DATADIR%%/include/pic/pic16f917.h +%%PIC%%%%DATADIR%%/include/pic/pic16hv616.h %%PIC%%%%DATADIR%%/include/pic/sdcc-lib.h %%PIC16%%%%DATADIR%%/include/pic16/adc.h %%PIC16%%%%DATADIR%%/include/pic16/ctype.h @@ -421,7 +423,7 @@ bin/sdcpp %%DEVLIB%%%%DS390%%%%DATADIR%%/lib/ds400/libint.lib %%DEVLIB%%%%DS390%%%%DATADIR%%/lib/ds400/liblong.lib %%DEVLIB%%%%DS390%%%%DATADIR%%/lib/ds400/libsdcc.lib -%%DEVLIB%%%%Z80%%%%DATADIR%%/lib/gbz80/crt0.o +%%DEVLIB%%%%Z80%%%%DATADIR%%/lib/gbz80/crt0.rel %%DEVLIB%%%%Z80%%%%DATADIR%%/lib/gbz80/gbz80.lib %%DEVLIB%%%%HC08%%%%DATADIR%%/lib/hc08/hc08.lib %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/large/libfloat.lib @@ -472,6 +474,7 @@ bin/sdcpp %%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic16c782.lib %%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic16c925.lib %%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic16c926.lib +%%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic16f616.lib %%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic16f627.lib %%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic16f627a.lib %%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic16f628.lib @@ -520,6 +523,7 @@ bin/sdcpp %%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic16f914.lib %%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic16f916.lib %%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic16f917.lib +%%DEVLIB%%%%PIC%%%%DATADIR%%/lib/pic/pic16hv616.lib %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/crt0.o %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/crt0i.o %%DEVLIB%%%%PIC16%%%%DATADIR%%/lib/pic16/crt0iz.o @@ -770,7 +774,7 @@ bin/sdcpp %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small-stack-auto/liblong.lib %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small-stack-auto/libsdcc.lib %%DEVLIB%%%%MCS51%%%%DATADIR%%/lib/small-stack-auto/mcs51.lib -%%DEVLIB%%%%Z80%%%%DATADIR%%/lib/z80/crt0.o +%%DEVLIB%%%%Z80%%%%DATADIR%%/lib/z80/crt0.rel %%DEVLIB%%%%Z80%%%%DATADIR%%/lib/z80/z80.lib %%DEVLIB%%%%Z80%%@dirrm %%DATADIR%%/lib/z80 %%DEVLIB%%%%MCS51%%@dirrm %%DATADIR%%/lib/small-stack-auto |