From c8f54368050636da69783c73b736450ea816ca21 Mon Sep 17 00:00:00 2001 From: wiz Date: Thu, 30 Aug 2007 12:22:59 +0000 Subject: Update to 1.22: * Changes in VICE 1.22 ====================== ** C128 changes --------------- - Added 2 MHz mode support (experimental). - The cursor keys are mapped differently in C64-mode now. - Fixed C64-mode autostart support. ** VIC20 changes ---------------- - Improved the sound emulation where the 'volume change click' is concerned, and normalized the audio output level. ** VIC-II --------- - The VIC-II border mode can be selected now (normal, full, debug). - Some sprite fixes needed for Krestage 3 demo. ** Drive changes ---------------- - Improved drive LED emulation. ** Unix changes --------------- - Fixed the "black screen" bug caused by some X11 library security update. - Fixed the usb support for bsd based platforms. - Changed the preferred libdir and docdir for netbsd and freebsd. - Xaw/XRandR fullscreen mode is supposed to work. ** C1541 changes ---------------- - Fixed some unlynx bugs. --- emulators/vice/Makefile | 20 ++------------------ emulators/vice/PLIST | 14 +++++++++++++- emulators/vice/distinfo | 13 ++++--------- emulators/vice/patches/patch-aa | 13 ------------- emulators/vice/patches/patch-ab | 15 --------------- emulators/vice/patches/patch-ac | 13 ------------- emulators/vice/patches/patch-ad | 13 ------------- emulators/vice/patches/patch-ag | 13 ------------- 8 files changed, 19 insertions(+), 95 deletions(-) delete mode 100644 emulators/vice/patches/patch-aa delete mode 100644 emulators/vice/patches/patch-ab delete mode 100644 emulators/vice/patches/patch-ac delete mode 100644 emulators/vice/patches/patch-ad delete mode 100644 emulators/vice/patches/patch-ag (limited to 'emulators/vice') diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile index 8f28cb640f4..852b041f0d7 100644 --- a/emulators/vice/Makefile +++ b/emulators/vice/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.73 2007/04/15 19:13:08 wiz Exp $ +# $NetBSD: Makefile,v 1.74 2007/08/30 12:22:59 wiz Exp $ # -DISTNAME= vice-1.21 +DISTNAME= vice-1.22 CATEGORIES= emulators MASTER_SITES= ftp://ftp.zimmers.net/pub/cbm/crossplatform/emulators/VICE/ \ http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/ @@ -37,22 +37,6 @@ REQD_DIRS+= ${PREFIX}/share/vice CONFIGURE_ARGS+= --without-oss .endif -# These changes are rather common, so sed instead of patch: -post-patch: - set -e; \ - for file in `${FIND} ${WRKSRC} -name Makefile.in -print` \ - ${WRKSRC}/src/arch/unix/archdep.h; do \ - sed -e "s|/lib/vice/doc|/share/doc/vice|g" \ - -e "s|/lib/vice|/share/vice|g" \ - -e "/^pkglibdir/s|(libdir)|(datadir)|g" \ - "$$file" > "$$file".new; \ - if cmp -s "$$file" "$$file".new; then \ - rm -f "$$file".new; \ - else \ - mv -f "$$file".new "$$file"; \ - fi; \ - done - .include "../../devel/readline/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" diff --git a/emulators/vice/PLIST b/emulators/vice/PLIST index 7770f0314ff..f0077c9629d 100644 --- a/emulators/vice/PLIST +++ b/emulators/vice/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.19 2007/04/15 19:13:08 wiz Exp $ +@comment $NetBSD: PLIST,v 1.20 2007/08/30 12:22:59 wiz Exp $ bin/c1541 bin/cartconv bin/petcat @@ -35,6 +35,7 @@ share/doc/vice/cbm_basic_tokens.txt share/doc/vice/drive_info.txt share/doc/vice/iec-bus.txt share/doc/vice/index.html +share/doc/vice/macosx.html share/doc/vice/mon.txt share/doc/vice/new.gif share/doc/vice/openGLsync-howto.txt @@ -65,6 +66,7 @@ share/locale/it/LC_MESSAGES/vice.mo share/locale/nl/LC_MESSAGES/vice.mo share/locale/pl/LC_MESSAGES/vice.mo share/locale/sv/LC_MESSAGES/vice.mo +share/vice/C128/ROdflt.vkm share/vice/C128/amiga_pos.vkm share/vice/C128/amiga_sym.vkm share/vice/C128/basic64 @@ -94,6 +96,8 @@ share/vice/C128/kernalit share/vice/C128/kernalno share/vice/C128/kernalse share/vice/C128/os2.vkm +share/vice/C128/osx_pos.vkm +share/vice/C128/osx_sym.vkm share/vice/C128/pc64.vpl share/vice/C128/vdc_deft.vpl share/vice/C128/vice.vpl @@ -101,6 +105,7 @@ share/vice/C128/win_pos.vkm share/vice/C128/win_sym.vkm share/vice/C128/x11_pos.vkm share/vice/C128/x11_sym.vkm +share/vice/C64/ROdflt.vkm share/vice/C64/amiga_pos.vkm share/vice/C64/amiga_sym.vkm share/vice/C64/basic @@ -120,6 +125,8 @@ share/vice/C64/godot.vpl share/vice/C64/kernal share/vice/C64/os2.vkm share/vice/C64/os2_sym.vkm +share/vice/C64/osx_pos.vkm +share/vice/C64/osx_sym.vkm share/vice/C64/pc64.vpl share/vice/C64/vice.vpl share/vice/C64/win_pos.vkm @@ -127,6 +134,7 @@ share/vice/C64/win_sym_de.vkm share/vice/C64/win_sym_us.vkm share/vice/C64/x11_pos.vkm share/vice/C64/x11_sym.vkm +share/vice/CBM-II/ROdflt.vkm share/vice/CBM-II/amber.vpl share/vice/CBM-II/amiga_bukp.vkm share/vice/CBM-II/amiga_buks.vkm @@ -172,6 +180,8 @@ share/vice/DRIVES/dos2031 share/vice/DRIVES/dos2040 share/vice/DRIVES/dos3040 share/vice/DRIVES/dos4040 +share/vice/PET/RObusi.vkm +share/vice/PET/ROgrph.vkm share/vice/PET/amber.vpl share/vice/PET/amiga_bgrs.vkm share/vice/PET/amiga_buks.vkm @@ -211,6 +221,7 @@ share/vice/PET/x11_bgrs.vkm share/vice/PET/x11_buks.vkm share/vice/PLUS4/3plus1hi share/vice/PLUS4/3plus1lo +share/vice/PLUS4/ROdflt.vkm share/vice/PLUS4/amiga_pos.vkm share/vice/PLUS4/amiga_sym.vkm share/vice/PLUS4/basic @@ -232,6 +243,7 @@ share/vice/PRINTER/mps801 share/vice/PRINTER/mps803 share/vice/PRINTER/mps803.vpl share/vice/PRINTER/nl10-cbm +share/vice/VIC20/ROdflt.vkm share/vice/VIC20/amiga_pos.vkm share/vice/VIC20/amiga_sym.vkm share/vice/VIC20/basic diff --git a/emulators/vice/distinfo b/emulators/vice/distinfo index 94e6ab934b5..34a0d4d646a 100644 --- a/emulators/vice/distinfo +++ b/emulators/vice/distinfo @@ -1,11 +1,6 @@ -$NetBSD: distinfo,v 1.30 2007/04/15 19:13:08 wiz Exp $ +$NetBSD: distinfo,v 1.31 2007/08/30 12:23:00 wiz Exp $ -SHA1 (vice-1.21.tar.gz) = a4915ae85dc562208bed5766d2c17481244b157d -RMD160 (vice-1.21.tar.gz) = 1384cb4d80be6801de603c0424b3a5e5dd18de15 -Size (vice-1.21.tar.gz) = 5725833 bytes -SHA1 (patch-aa) = d773e84bef7bc735e765c8f0f8f086f5daee8493 -SHA1 (patch-ab) = 12657561998b724c39699c380290e7333365d300 -SHA1 (patch-ac) = 32d10e8d63e0031a099062e34cd918531aae5692 -SHA1 (patch-ad) = eb6cfb24cd81b15aeb0a9d3b75291aee6267beea +SHA1 (vice-1.22.tar.gz) = 55e0047824f64173539e03ddd2d5ab51cd581fbb +RMD160 (vice-1.22.tar.gz) = ca93fc424e617e38f27e288ebcdfbab2aa3659db +Size (vice-1.22.tar.gz) = 6088483 bytes SHA1 (patch-af) = 524913b7bc753dafde909bb26ace8f0500be14d5 -SHA1 (patch-ag) = 293114fe28b7b3832ad0087d89da1d1a37066bbc diff --git a/emulators/vice/patches/patch-aa b/emulators/vice/patches/patch-aa deleted file mode 100644 index cfb67194bee..00000000000 --- a/emulators/vice/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.7 2007/04/15 19:13:09 wiz Exp $ - ---- doc/Makefile.in.orig 2007-03-04 22:06:04.000000000 +0000 -+++ doc/Makefile.in -@@ -295,7 +295,7 @@ xcbm2_LDFLAGS = @xcbm2_LDFLAGS@ - xpet_LDFLAGS = @xpet_LDFLAGS@ - xplus4_LDFLAGS = @xplus4_LDFLAGS@ - xvic_LDFLAGS = @xvic_LDFLAGS@ --docdir = $(VICEDIR)/doc -+docdir = $(datadir)/doc/vice - doc_DATA = \ - Minix-Howto.txt \ - MSDOS-Ethernet-Howto.txt \ diff --git a/emulators/vice/patches/patch-ab b/emulators/vice/patches/patch-ab deleted file mode 100644 index ddcc51d6070..00000000000 --- a/emulators/vice/patches/patch-ab +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ab,v 1.7 2006/06/29 22:56:34 dillo Exp $ - ---- src/arch/unix/archdep.h.orig 2005-03-28 21:10:20.000000000 +0200 -+++ src/arch/unix/archdep.h -@@ -96,8 +96,8 @@ - extern const char *archdep_home_path(void); - - /* Define the default system directory (where the ROMs are). */ --#define LIBDIR PREFIX "/lib/vice" --#define DOCDIR LIBDIR "/doc" -+#define LIBDIR PREFIX "/share/vice" -+#define DOCDIR PREFIX "/share/doc/vice" - #define VICEUSERDIR ".vice" - - #endif diff --git a/emulators/vice/patches/patch-ac b/emulators/vice/patches/patch-ac deleted file mode 100644 index e16f33c264a..00000000000 --- a/emulators/vice/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.16 2007/02/07 19:43:29 wiz Exp $ - ---- src/sounddrv/soundsun.c.orig 2006-08-06 15:54:56.000000000 +0000 -+++ src/sounddrv/soundsun.c -@@ -204,7 +204,7 @@ static void sun_close(void) - sun_fd = -1; - sun_8bit = 0; - sun_bufsize = 0; --#if !defined(__NETBSD__) -+#if !defined(__NetBSD__) - sun_written = 0; - #endif - sun_channels = 1; diff --git a/emulators/vice/patches/patch-ad b/emulators/vice/patches/patch-ad deleted file mode 100644 index 3b61822a421..00000000000 --- a/emulators/vice/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.12 2007/04/15 19:13:09 wiz Exp $ - ---- doc/html/Makefile.in.orig 2007-03-04 22:06:04.000000000 +0000 -+++ doc/html/Makefile.in -@@ -274,7 +274,7 @@ xcbm2_LDFLAGS = @xcbm2_LDFLAGS@ - xpet_LDFLAGS = @xpet_LDFLAGS@ - xplus4_LDFLAGS = @xplus4_LDFLAGS@ - xvic_LDFLAGS = @xvic_LDFLAGS@ --docdir = $(VICEDIR)/doc -+docdir = $(datadir)/doc/vice - doc_DATA = \ - amigaos.html \ - beos.html \ diff --git a/emulators/vice/patches/patch-ag b/emulators/vice/patches/patch-ag deleted file mode 100644 index 685768f44cb..00000000000 --- a/emulators/vice/patches/patch-ag +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ag,v 1.8 2007/02/07 19:43:29 wiz Exp $ - ---- configure.orig 2007-01-21 01:44:51.000000000 +0000 -+++ configure -@@ -23531,7 +23531,7 @@ cat >>confdefs.h <<_ACEOF - _ACEOF - - --VICEDIR="$PREFIX/lib/vice"; -+VICEDIR="$PREFIX/share/vice"; - - - if false ; then -- cgit v1.2.3