Update to 2.13.3

Upstream changes:
(only for release 2.13.3)
This version is a bugfix release against 2.13.2. It includes about 40 bug
and documentation fixes and some minor improvements:

  * Fixed some macro issues (cc65).

  * Static const local data goes into RODATA, not DATA (cc65).

  * Fix error handling in .LEFT (ca65)

  * Fixed problems with 80 column mode (C128 library).

  * Fix problem when converting function to void pointer (cc65).

  * Fix register info for several runtime functions. Result was invalid code
    (cc65).

  * Fix smbx and rmbx instructions (da65).

  * Fix problem with .REPEAT (ca65).

  * Fix an error in the runtime division routine (cc65).

  * Fix problem with alignments >= 256 bytes (ca65).

  * The LINE function mistakenly enabled the BASIC ROM (TGI driver for C64).

  * Fix internal error caused by error recovery (or lack of) (cc65).

  * Fix invalid handling of signed int types in some cases (cc65).

  * Fix some issues with conio scrolling (C128 library).

  * Fix and improve the code for compares (cc65).

  * Fix some macro issues (ca65).

  * Fixed/improved several error messages (all tools).

  * Disallow __asm__ on global level (cc65).

  * Remove final jump to RESTOR for all CBM platforms (cc65 libraries).

  * Add missing export for CBM510 platform (cbm510 library).

  * Fix problem with access to structs returned by functions (cc65).

  * Fix an internal error in the code generator (cc65).

  * Merge back POSIX directory routines for the Atari (atari library).

  * Merge back Olivers C interrupt handling code (cc65 libraries).

  * Several documentation changes.

  * Several documentation fixes and improvements.

5 files changed, 77 insertions, 110 deletions

diff --git a/cross/cc65/Makefile b/cross/cc65/Makefile
index 5fd6c12e703..a8f1c7001b8 100644
--- a/cross/cc65/Makefile
+++ b/cross/cc65/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2012/10/03 21:54:11 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2012/12/03 14:36:39 wen Exp $
 #
 
-DISTNAME=	cc65-sources-2.12.0
+DISTNAME=	cc65-sources-2.13.3
 PKGNAME=	${DISTNAME:S/-sources//}
-PKGREVISION=	1
 CATEGORIES=	cross lang
 MASTER_SITES=	ftp://ftp.musoftware.de/pub/uz/cc65/
 EXTRACT_SUFX=	.tar.bz2
@@ -21,4 +20,10 @@ REPLACE_PERL=	src/ca65html/ca65html
 
 INSTALL_MAKE_FLAGS+=	PREFIX=${DESTDIR}${PREFIX}
 
+SUBST_CLASSES+=		perl
+SUBST_MESSAGE.perl=	Fixing the path of perl.
+SUBST_STAGE.perl=	post-patch
+SUBST_FILES.perl=	src/ca65/macpack/cvt-mac.pl src/ld65/cfg/cvt-cfg.pl
+SUBST_SED.perl=		-e "s,/usr/bin/perl,${PREFIX}/bin/perl,g"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/cross/cc65/PLIST b/cross/cc65/PLIST
index 11984d7975f..bfbdc75a080 100644
--- a/cross/cc65/PLIST
+++ b/cross/cc65/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:39:53 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2012/12/03 14:36:39 wen Exp $
 bin/ar65
 bin/ca65
 bin/ca65html
@@ -9,42 +9,67 @@ bin/da65
 bin/grc
 bin/ld65
 bin/od65
+lib/cc65/asminc/_file.inc
+lib/cc65/asminc/_heap.inc
+lib/cc65/asminc/apple2.inc
 lib/cc65/asminc/atari.inc
+lib/cc65/asminc/atmos.inc
+lib/cc65/asminc/c128.inc
+lib/cc65/asminc/c16.inc
+lib/cc65/asminc/c64.inc
+lib/cc65/asminc/cbm510.inc
+lib/cc65/asminc/cbm610.inc
 lib/cc65/asminc/ctype.inc
 lib/cc65/asminc/em-error.inc
 lib/cc65/asminc/em-kernel.inc
 lib/cc65/asminc/errno.inc
 lib/cc65/asminc/fcntl.inc
-lib/cc65/asminc/_file.inc
 lib/cc65/asminc/get_tv.inc
-lib/cc65/asminc/_heap.inc
 lib/cc65/asminc/joy-error.inc
 lib/cc65/asminc/joy-kernel.inc
 lib/cc65/asminc/lynx.inc
 lib/cc65/asminc/modload.inc
 lib/cc65/asminc/mouse-kernel.inc
+lib/cc65/asminc/nes.inc
 lib/cc65/asminc/o65.inc
+lib/cc65/asminc/pet.inc
+lib/cc65/asminc/plus4.inc
 lib/cc65/asminc/rs232.inc
 lib/cc65/asminc/ser-error.inc
 lib/cc65/asminc/ser-kernel.inc
 lib/cc65/asminc/signal.inc
 lib/cc65/asminc/stdio.inc
+lib/cc65/asminc/supervision.inc
 lib/cc65/asminc/tgi-error.inc
 lib/cc65/asminc/tgi-kernel.inc
 lib/cc65/asminc/tgi-mode.inc
+lib/cc65/asminc/time.inc
 lib/cc65/asminc/utsname.inc
+lib/cc65/asminc/vic20.inc
 lib/cc65/asminc/zeropage.inc
+lib/cc65/cfg/apple2-dos33.cfg
+lib/cc65/cfg/apple2-loader.cfg
+lib/cc65/cfg/apple2-reboot.cfg
+lib/cc65/cfg/apple2-system.cfg
+lib/cc65/cfg/apple2enh-dos33.cfg
+lib/cc65/cfg/apple2enh-loader.cfg
+lib/cc65/cfg/apple2enh-reboot.cfg
+lib/cc65/cfg/apple2enh-system.cfg
+lib/cc65/cfg/supervision-128k.cfg
+lib/cc65/cfg/supervision-16k.cfg
+lib/cc65/cfg/supervision-64k.cfg
+lib/cc65/cfg/vic20-32k.cfg
 lib/cc65/emd/a2.auxmem.emd
 lib/cc65/emd/a2e.auxmem.emd
 lib/cc65/emd/c128-georam.emd
-lib/cc65/emd/c128-ramcart.emd
 lib/cc65/emd/c128-ram.emd
+lib/cc65/emd/c128-ramcart.emd
 lib/cc65/emd/c128-reu.emd
 lib/cc65/emd/c128-vdc.emd
 lib/cc65/emd/c16-ram.emd
 lib/cc65/emd/c64-georam.emd
-lib/cc65/emd/c64-ramcart.emd
 lib/cc65/emd/c64-ram.emd
+lib/cc65/emd/c64-ramcart.emd
 lib/cc65/emd/c64-reu.emd
 lib/cc65/emd/c64-vdc.emd
 lib/cc65/emd/cbm510-ram.emd
@@ -57,29 +82,40 @@ lib/cc65/include/_6525.h
 lib/cc65/include/_6526.h
 lib/cc65/include/_6545.h
 lib/cc65/include/_6551.h
-lib/cc65/include/ace.h
 lib/cc65/include/_antic.h
-lib/cc65/include/apple2enh.h
+lib/cc65/include/_gtia.h
+lib/cc65/include/_heap.h
+lib/cc65/include/_pbi.h
+lib/cc65/include/_pia.h
+lib/cc65/include/_pokey.h
+lib/cc65/include/_sid.h
+lib/cc65/include/_ted.h
+lib/cc65/include/_vdc.h
+lib/cc65/include/_vic.h
+lib/cc65/include/_vic2.h
+lib/cc65/include/ace.h
 lib/cc65/include/apple2.h
+lib/cc65/include/apple2enh.h
 lib/cc65/include/assert.h
 lib/cc65/include/atari.h
 lib/cc65/include/atmos.h
 lib/cc65/include/c128.h
 lib/cc65/include/c16.h
 lib/cc65/include/c64.h
+lib/cc65/include/cbm.h
 lib/cc65/include/cbm264.h
 lib/cc65/include/cbm510.h
 lib/cc65/include/cbm610.h
-lib/cc65/include/cbm.h
 lib/cc65/include/conio.h
 lib/cc65/include/ctype.h
 lib/cc65/include/dbg.h
 lib/cc65/include/dio.h
 lib/cc65/include/dirent.h
-lib/cc65/include/em/em-kernel.h
 lib/cc65/include/em.h
+lib/cc65/include/em/em-kernel.h
 lib/cc65/include/errno.h
 lib/cc65/include/fcntl.h
+lib/cc65/include/geos.h
 lib/cc65/include/geos/gconst.h
 lib/cc65/include/geos/gdisk.h
 lib/cc65/include/geos/gdlgbox.h
@@ -92,9 +128,7 @@ lib/cc65/include/geos/gsprite.h
 lib/cc65/include/geos/gstruct.h
 lib/cc65/include/geos/gsym.h
 lib/cc65/include/geos/gsys.h
-lib/cc65/include/geos.h
-lib/cc65/include/_gtia.h
-lib/cc65/include/_heap.h
+lib/cc65/include/inttypes.h
 lib/cc65/include/iso646.h
 lib/cc65/include/joystick.h
 lib/cc65/include/joystick/joy-kernel.h
@@ -106,16 +140,12 @@ lib/cc65/include/mouse.h
 lib/cc65/include/mouse/mouse-kernel.h
 lib/cc65/include/nes.h
 lib/cc65/include/o65.h
-lib/cc65/include/_pbi.h
 lib/cc65/include/peekpoke.h
 lib/cc65/include/pet.h
-lib/cc65/include/_pia.h
 lib/cc65/include/plus4.h
-lib/cc65/include/_pokey.h
 lib/cc65/include/rs232.h
 lib/cc65/include/serial.h
 lib/cc65/include/setjmp.h
-lib/cc65/include/_sid.h
 lib/cc65/include/signal.h
 lib/cc65/include/stdarg.h
 lib/cc65/include/stdbool.h
@@ -127,20 +157,17 @@ lib/cc65/include/string.h
 lib/cc65/include/supervision.h
 lib/cc65/include/sys/types.h
 lib/cc65/include/sys/utsname.h
-lib/cc65/include/_ted.h
 lib/cc65/include/tgi.h
 lib/cc65/include/tgi/tgi-error.h
 lib/cc65/include/tgi/tgi-kernel.h
 lib/cc65/include/tgi/tgi-mode.h
 lib/cc65/include/time.h
 lib/cc65/include/unistd.h
-lib/cc65/include/_vdc.h
 lib/cc65/include/vic20.h
-lib/cc65/include/_vic2.h
-lib/cc65/include/_vic.h
 lib/cc65/include/zlib.h
-lib/cc65/joy/a2e.stdjoy.joy
 lib/cc65/joy/a2.stdjoy.joy
+lib/cc65/joy/a2e.stdjoy.joy
+lib/cc65/joy/atarimj8.joy
 lib/cc65/joy/ataristd.joy
 lib/cc65/joy/c128-ptvjoy.joy
 lib/cc65/joy/c128-stdjoy.joy
@@ -157,92 +184,49 @@ lib/cc65/joy/pet-ptvjoy.joy
 lib/cc65/joy/plus4-stdjoy.joy
 lib/cc65/joy/vic20-ptvjoy.joy
 lib/cc65/joy/vic20-stdjoy.joy
-lib/cc65/lib/apple2enh.lib
-lib/cc65/lib/apple2enh.o
 lib/cc65/lib/apple2.lib
-lib/cc65/lib/apple2.o
+lib/cc65/lib/apple2enh.lib
 lib/cc65/lib/atari.lib
-lib/cc65/lib/atari.o
 lib/cc65/lib/atmos.lib
-lib/cc65/lib/atmos.o
 lib/cc65/lib/c128.lib
-lib/cc65/lib/c128.o
 lib/cc65/lib/c16.lib
-lib/cc65/lib/c16.o
 lib/cc65/lib/c64.lib
-lib/cc65/lib/c64.o
 lib/cc65/lib/cbm510.lib
-lib/cc65/lib/cbm510.o
 lib/cc65/lib/cbm610.lib
-lib/cc65/lib/cbm610.o
 lib/cc65/lib/geos.lib
-lib/cc65/lib/geos.o
 lib/cc65/lib/lynx.lib
-lib/cc65/lib/lynx.o
 lib/cc65/lib/nes.lib
-lib/cc65/lib/nes.o
 lib/cc65/lib/pet.lib
-lib/cc65/lib/pet.o
 lib/cc65/lib/plus4.lib
-lib/cc65/lib/plus4.o
 lib/cc65/lib/supervision.lib
-lib/cc65/lib/supervision.o
 lib/cc65/lib/vic20.lib
-lib/cc65/lib/vic20.o
-lib/cc65/mou/a2e.stdmou.mou
 lib/cc65/mou/a2.stdmou.mou
+lib/cc65/mou/a2e.stdmou.mou
 lib/cc65/mou/c128-1351.mou
 lib/cc65/mou/c128-joy.mou
+lib/cc65/mou/c128-pot.mou
 lib/cc65/mou/c64-1351.mou
 lib/cc65/mou/c64-joy.mou
-lib/cc65/ser/a2e.ssc.ser
+lib/cc65/mou/c64-pot.mou
+lib/cc65/obj/apple2-iobuf-0800.o
+lib/cc65/obj/apple2enh-iobuf-0800.o
 lib/cc65/ser/a2.ssc.ser
+lib/cc65/ser/a2e.ssc.ser
 lib/cc65/ser/c128-swlink.ser
 lib/cc65/ser/c64-swlink.ser
 lib/cc65/ser/cbm510-std.ser
 lib/cc65/ser/cbm610-std.ser
+lib/cc65/ser/lynx-comlynx.ser
 lib/cc65/ser/plus4-stdser.ser
-lib/cc65/tgi/a2e.hi.tgi
-lib/cc65/tgi/a2e.lo.tgi
-lib/cc65/tgi/a2.hi.tgi
-lib/cc65/tgi/a2.lo.tgi
-lib/cc65/tgi/atmos-240-200-2.tgi
-lib/cc65/tgi/c128-vdc2.tgi
-lib/cc65/tgi/c128-vdc.tgi
-lib/cc65/tgi/c64-hi.tgi
-lib/cc65/tgi/geos-tgi.tgi
-lib/cc65/tgi/lynx-160-102-16.tgi
-share/doc/cc65/apple2.cfg
-share/doc/cc65/atari.cfg
-share/doc/cc65/atari.mac
-share/doc/cc65/atmos.cfg
-share/doc/cc65/bbc.cfg
+lib/cc65/tgi
 share/doc/cc65/BUGS
-share/doc/cc65/c128.cfg
-share/doc/cc65/c16.cfg
-share/doc/cc65/c64.cfg
-share/doc/cc65/cbm510.cfg
-share/doc/cc65/cbm610.cfg
+share/doc/cc65/CREDITS
+share/doc/cc65/atari.mac
 share/doc/cc65/cbm.mac
 share/doc/cc65/compile.txt
 share/doc/cc65/cpu.mac
-share/doc/cc65/CREDITS
 share/doc/cc65/generic.mac
-share/doc/cc65/geos.cfg
 share/doc/cc65/internal.txt
 share/doc/cc65/longbranch.mac
-share/doc/cc65/lunix.cfg
-share/doc/cc65/lynx.cfg
-share/doc/cc65/module.cfg
-share/doc/cc65/nes.cfg
 share/doc/cc65/newvers.txt
-share/doc/cc65/none.cfg
-share/doc/cc65/osa65.cfg
-share/doc/cc65/pet.cfg
-share/doc/cc65/plus4.cfg
 share/doc/cc65/readme.1st
-share/doc/cc65/supervision128.cfg
-share/doc/cc65/supervision16.cfg
-share/doc/cc65/supervision64.cfg
-share/doc/cc65/supervision.cfg
-share/doc/cc65/vic20.cfg
diff --git a/cross/cc65/distinfo b/cross/cc65/distinfo
index aff99c1f91f..e8634fb8f7c 100644
--- a/cross/cc65/distinfo
+++ b/cross/cc65/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/10/08 19:53:47 wiz Exp $
+$NetBSD: distinfo,v 1.2 2012/12/03 14:36:39 wen Exp $
 
-SHA1 (cc65-sources-2.12.0.tar.bz2) = e009060fda9fbec9fcfa01761abdb1b5aaa01b34
-RMD160 (cc65-sources-2.12.0.tar.bz2) = 579e4877f5f129f8bdff8ce3ad4f15a44c57f25c
-Size (cc65-sources-2.12.0.tar.bz2) = 1051755 bytes
-SHA1 (patch-aa) = 90cb89e3ab42744532a4b57f7f9671b3812770a4
-SHA1 (patch-ab) = 493fd3b61eee5fea407f0c767ebaa0cb0ef7d49f
+SHA1 (cc65-sources-2.13.3.tar.bz2) = 925c6edfcef7057e24ecb0704fa07210faec07bc
+RMD160 (cc65-sources-2.13.3.tar.bz2) = ad728cb61113af4592460bce7d42ca57f6a2fb1a
+Size (cc65-sources-2.13.3.tar.bz2) = 1103245 bytes
+SHA1 (patch-aa) = b78b62ea09c2c61221cae93d2d71588eca51b149
diff --git a/cross/cc65/patches/patch-aa b/cross/cc65/patches/patch-aa
index 211ebc58574..de764ee426a 100644
--- a/cross/cc65/patches/patch-aa
+++ b/cross/cc65/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/10/08 19:53:47 wiz Exp $
-
---- make/gcc.mak.orig	2007-06-21 15:40:27.000000000 -0500
+$NetBSD: patch-aa,v 1.2 2012/12/03 14:36:39 wen Exp $
+Fix ${PREFIX}
+--- make/gcc.mak.orig	2012-12-03 21:01:07.000000000 +0000
 +++ make/gcc.mak
-@@ -14,7 +14,7 @@
- MAKEOVERRIDES=
+@@ -15,7 +15,7 @@
+ # (That trick has been disabled.)
  
  # The install prefix and directories
 -prefix		= /usr/local
diff --git a/cross/cc65/patches/patch-ab b/cross/cc65/patches/patch-ab
deleted file mode 100644
index 1777a82cae3..00000000000
--- a/cross/cc65/patches/patch-ab
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2008/10/08 19:53:47 wiz Exp $
-
---- src/common/va_copy.h.orig	2007-06-28 10:28:34.000000000 +0000
-+++ src/common/va_copy.h
-@@ -45,8 +45,6 @@
- 
- /* va_copy is not allowed to be defined */
- #if defined(va_copy)
--#error "The compiler is broken!"
--#endif
- 
- /* The watcom compiler doesn't have va_copy and a problematic va_list definition */
- #if defined(__WATCOMC__)
-@@ -65,6 +63,7 @@
- 
- 
- 
-+#endif
- #endif  /* #if (__STDC_VERSION__ < 199901) */
- 
-