Update to 1.0, clean up, remove xpm dependency and check (...only used for

window icon when iconified), and add third party configs for 4064, SX-64,
and C64 Game System.

15 files changed, 226 insertions, 170 deletions

diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index cd0d07c1226..fc599be13af 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -1,30 +1,55 @@
-# $NetBSD: Makefile,v 1.5 1999/01/30 23:18:46 agc Exp $
+# $NetBSD: Makefile,v 1.6 1999/05/18 08:45:48 tv Exp $
 
-DISTNAME=		vice-0.15.0
+DISTNAME=		vice-1.0
 CATEGORIES=		emulators
-MASTER_SITES=		http://www.tu-chemnitz.de/~fachat/vice/
+MASTER_SITES=		ftp://ftp.funet.fi/pub/cbm/firmware/computers/c64/ \
+			ftp://ftp.funet.fi/pub/cbm/crossplatform/emulators/VICE/
+DISTFILES=		${DISTNAME}${EXTRACT_SUFX} \
+			64gs.390852-01.bin \
+			kernal.4064.901246-01.bin \
+			kernal.sx.251104-04.bin
+EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=		root@garbled.net
-HOMEPAGE=		http://www.tu-chemnitz.de/~fachat/vice/
-
-BUILD_DEPENDS+= 	bison:../../devel/bison
-DEPENDS+=		xpm-3.4k:../../graphics/xpm
+HOMEPAGE=		http://www.cs.cmu.edu/~dsladic/vice/vice.html
 
+RESTRICTED=		"ROM image copyright is questionable"
+NO_PACKAGE=		${RESTRICTED}
 MIRROR_DISTFILE=	no
+
 GNU_CONFIGURE=		yes
-CONFIGURE_ENV+=		LDFLAGS="-Wl,-R${X11BASE}/lib"
-USE_GMAKE=		yes
-USE_X11BASE=		yes
-INFO_FILES=		vice.info
+USE_X11=		yes
+USE_GTEXINFO=		yes
 
-post-install:
-	for ii in C64 C128 VIC20; do \
-		for xx in basic chargen dos1541 kernal; do \
-			${INSTALL_DATA} ${WRKSRC}/data/$$ii/$$xx ${PREFIX}/share/vice/$$ii; \
-		done; \
-	done
-	for ii in chargen edit2.b edit4.b40 edit4.b80 pet2001 pet3032 pet4032; do \
-		${INSTALL_DATA} ${WRKSRC}/data/PET/$$ii ${PREFIX}/share/vice/PET; \
+# These changes are rather common, so sed instead of patch:
+post-patch:
+	@for file in `find ${WRKSRC} -name Makefile.in -print` \
+			${WRKSRC}/src/arch/unix/archdep.h; do \
+		${MV} -f $$file $$file.orig && \
+		${SED}  -e s,/lib/vice/doc,/share/doc/vice, \
+			-e s,/lib/vice,/share/vice, \
+			-e '/^pkglibdir/s,(libdir),(datadir),' $$file.orig >$$file; \
 	done
 
+post-build:
+	@dd if=${_DISTDIR}/64gs.390852-01.bin of=${WRKDIR}/basic.64gs bs=8k count=1 2>/dev/null
+	@dd if=${_DISTDIR}/64gs.390852-01.bin of=${WRKDIR}/kernal.64gs bs=8k skip=1 2>/dev/null
+	@${SED} -e 's,kernal,kernal.64gs,' -e 's,basic,basic.64gs,' \
+		${WRKSRC}/data/C64/default.vrs >${WRKDIR}/64gs.vrs
+	@${SED} -e 's,kernal,kernal.4064,' \
+		${WRKSRC}/data/C64/default.vrs >${WRKDIR}/4064.vrs
+	@${SED} -e 's,kernal,kernal.sx64,' \
+		${WRKSRC}/data/C64/default.vrs >${WRKDIR}/sx64.vrs
+
+post-install:
+	${INSTALL_DATA} ${WRKDIR}/basic.64gs ${PREFIX}/share/vice/C64/
+	${INSTALL_DATA} ${WRKDIR}/kernal.64gs ${PREFIX}/share/vice/C64/
+	${INSTALL_DATA} ${_DISTDIR}/kernal.4064.901246-01.bin ${PREFIX}/share/vice/C64/kernal.4064
+	${INSTALL_DATA} ${_DISTDIR}/kernal.sx.251104-04.bin ${PREFIX}/share/vice/C64/kernal.sx64
+	cd ${WRKDIR} && ${INSTALL_DATA} 64gs.vrs 4064.vrs sx64.vrs \
+		${PREFIX}/share/vice/C64/
+
 .include "../../mk/bsd.pkg.mk"
+
+# this is the emulator's recommended setting
+CFLAGS:=		-O5 -finline-functions
diff --git a/emulators/vice/files/md5 b/emulators/vice/files/md5
index f9e25885687..03471858dc4 100644
--- a/emulators/vice/files/md5
+++ b/emulators/vice/files/md5
@@ -1,3 +1,6 @@
-$NetBSD: md5,v 1.2 1998/09/12 17:47:03 garbled Exp $
+$NetBSD: md5,v 1.3 1999/05/18 08:45:48 tv Exp $
 
-MD5 (vice-0.15.0.tar.gz) = efe3336519932d067dceca8760897438
+MD5 (vice-1.0.tar.gz) = ac0302262270fec358a1c89bfb008e82
+MD5 (64gs.390852-01.bin) = 049e657afafbdd802e8c6a4f88f3d730
+MD5 (kernal.4064.901246-01.bin) = da92801e3a03b005b746a4dd0b639c7c
+MD5 (kernal.sx.251104-04.bin) = 187b8c713b51931e070872bd390b472a
diff --git a/emulators/vice/patches/patch-aa b/emulators/vice/patches/patch-aa
index 08f95b7a532..3cf4a667924 100644
--- a/emulators/vice/patches/patch-aa
+++ b/emulators/vice/patches/patch-aa
@@ -1,12 +1,13 @@
-$NetBSD: patch-aa,v 1.1 1998/09/06 23:47:27 garbled Exp $
---- src/sounddrv/soundsun.c.orig	Sun Sep  6 11:01:10 1998
-+++ src/sounddrv/soundsun.c	Sun Sep  6 11:05:09 1998
-@@ -32,7 +32,7 @@
- #include <fcntl.h>
- #include <sys/uio.h>
- #include <unistd.h>
--
-+#include <sys/ioctl.h>
- #include <sys/audioio.h>
+$NetBSD: patch-aa,v 1.2 1999/05/18 08:45:48 tv Exp $
+
+--- src/resid/Makefile.in.orig	Mon May 17 17:51:36 1999
++++ src/resid/Makefile.in	Mon May 17 17:51:46 1999
+@@ -290,7 +290,7 @@
+ install-data: install-pkgincludeHEADERS
+ 	@$(NORMAL_INSTALL)
  
- #include "vice.h"
+-install: install-exec install-data all
++install: all
+ 	@:
+ 
+ uninstall: uninstall-libLIBRARIES uninstall-pkgincludeHEADERS
diff --git a/emulators/vice/patches/patch-ab b/emulators/vice/patches/patch-ab
index 4171f0613ae..86f87672574 100644
--- a/emulators/vice/patches/patch-ab
+++ b/emulators/vice/patches/patch-ab
@@ -1,14 +1,15 @@
-$NetBSD: patch-ab,v 1.1 1998/09/06 23:47:28 garbled Exp $
---- src/vice.h.orig	Sun Sep  6 11:29:44 1998
-+++ src/vice.h	Sun Sep  6 11:30:14 1998
-@@ -48,8 +48,8 @@
+$NetBSD: patch-ab,v 1.2 1999/05/18 08:45:48 tv Exp $
+
+--- src/arch/unix/archdep.h.orig	Sun Mar 14 09:19:29 1999
++++ src/arch/unix/archdep.h	Tue May 18 02:28:26 1999
+@@ -43,8 +43,8 @@
+ #define MODE_APPEND "w+"
  
- /* Define the default system directory (where the ROMs are). */
- 
--#define LIBDIR		PREFIX "/lib/vice"
+ /* Define the default system directory (where the ROMs are).  */
+-#define LIBDIR          PREFIX "/lib/vice"
 -#define DOCDIR          LIBDIR "/doc"
-+#define LIBDIR		PREFIX "/share/vice"
++#define LIBDIR          PREFIX "/share/vice"
 +#define DOCDIR          PREFIX "/share/doc/vice"
+ #define VICEUSERDIR     ".vice"
  
- /* Sound defaults.  */
- #define SOUND_SAMPLE_RATE 22050
+ int archdep_startup(int *argc, char **argv);
diff --git a/emulators/vice/patches/patch-ac b/emulators/vice/patches/patch-ac
index 5c0b4e88b1c..71b6598c2fe 100644
--- a/emulators/vice/patches/patch-ac
+++ b/emulators/vice/patches/patch-ac
@@ -1,12 +1,49 @@
-$NetBSD: patch-ac,v 1.1 1998/09/06 23:47:29 garbled Exp $
---- Makefile.in.orig	Sun Sep  6 11:36:17 1998
-+++ Makefile.in	Sun Sep  6 11:37:05 1998
-@@ -37,7 +37,7 @@
- DISTDIR =
+$NetBSD: patch-ac,v 1.2 1999/05/18 08:45:49 tv Exp $
+
+--- configure.orig	Sat Apr 24 14:11:32 1999
++++ configure	Tue May 18 01:55:08 1999
+@@ -4841,14 +4841,14 @@
+   if test x"$with_readline" != "xno" ; then
+     READLINE=""
+     unset ac_cv_lib_readline_readline
+-    echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6
+-echo "configure:4846: checking for readline in -lreadline" >&5
++    echo $ac_n "checking for readline in -ledit""... $ac_c" 1>&6
++echo "configure:4846: checking for readline in -ledit" >&5
+ ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-lreadline  $LIBS"
++LIBS="-ledit -ltermcap $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 4854 "configure"
+ #include "confdefs.h"
+@@ -4876,7 +4876,7 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-   READLINE="" LIBS="-lreadline $LIBS"
++   READLINE="" LIBS="-ledit -ltermcap $LIBS"
+ else
+   echo "$ac_t""no" 1>&6
+  
+@@ -6295,7 +6295,7 @@
  
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
-+pkglibdir = $(datadir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
+   fi
  
- top_builddir = .
+-
++if false; then
+   echo $ac_n "checking for XpmCreatePixmapFromData in -lXpm""... $ac_c" 1>&6
+ echo "configure:6301: checking for XpmCreatePixmapFromData in -lXpm" >&5
+ ac_lib_var=`echo Xpm'_'XpmCreatePixmapFromData | sed 'y%./+-%__p_%'`
+@@ -6340,7 +6340,7 @@
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+-
++fi
+ 
+   if test x"$MISSING_X_LIBS" != "x"; then
+     echo
diff --git a/emulators/vice/patches/patch-ad b/emulators/vice/patches/patch-ad
index 80a65e9df8a..0200b6671a0 100644
--- a/emulators/vice/patches/patch-ad
+++ b/emulators/vice/patches/patch-ad
@@ -1,12 +1,20 @@
-$NetBSD: patch-ad,v 1.1 1998/09/06 23:47:30 garbled Exp $
---- src/Makefile.in.orig	Sun Sep  6 11:37:38 1998
-+++ src/Makefile.in	Sun Sep  6 11:38:26 1998
-@@ -35,7 +35,7 @@
- DISTDIR =
+$NetBSD: patch-ad,v 1.2 1999/05/18 08:45:49 tv Exp $
+
+--- src/arch/unix/xaw/c64ui.c.orig	Tue May 18 04:31:52 1999
++++ src/arch/unix/xaw/c64ui.c	Tue May 18 04:33:17 1999
+@@ -342,8 +342,14 @@
+ /* ------------------------------------------------------------------------- */
  
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
-+pkglibdir = $(datadir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- 
- top_builddir = ..
+ static ui_menu_entry_t c64_romset_submenu[] = {
+-    { "default ROMs",
++    { "Default ROMs",
+       (ui_callback_t) ui_set_romset, (ui_callback_data_t)"default.vrs", NULL },
++    { "C64 Game System (GS)",
++      (ui_callback_t) ui_set_romset, (ui_callback_data_t)"64gs.vrs", NULL },
++    { "Educator 64 (4064)",
++      (ui_callback_t) ui_set_romset, (ui_callback_data_t)"4064.vrs", NULL },
++    { "SX-64",
++      (ui_callback_t) ui_set_romset, (ui_callback_data_t)"sx64.vrs", NULL },
+     { "--" },
+     { "Load new kernal ROM",
+       (ui_callback_t) ui_load_rom_file, (ui_callback_data_t)"KernalName", NULL },
diff --git a/emulators/vice/patches/patch-ae b/emulators/vice/patches/patch-ae
deleted file mode 100644
index 2a450d952ca..00000000000
--- a/emulators/vice/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.1 1998/09/06 23:47:30 garbled Exp $
---- doc/Makefile.in.orig	Sun Sep  6 11:39:08 1998
-+++ doc/Makefile.in	Sun Sep  6 11:39:20 1998
-@@ -93,7 +93,7 @@
- VERSION = @VERSION@
- YACC = @YACC@
- 
--docdir = $(prefix)/lib/vice/doc
-+docdir = $(prefix)/share/doc/vice/
- 
- doc_DATA = \
- 	64doc.txt \
diff --git a/emulators/vice/patches/patch-af b/emulators/vice/patches/patch-af
deleted file mode 100644
index e9017d63e78..00000000000
--- a/emulators/vice/patches/patch-af
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-af,v 1.1 1998/09/06 23:47:31 garbled Exp $
---- data/C128/Makefile.in.orig	Sun Sep  6 11:56:23 1998
-+++ data/C128/Makefile.in	Sun Sep  6 11:56:37 1998
-@@ -94,7 +94,7 @@
- VERSION = @VERSION@
- YACC = @YACC@
- 
--c128dir = $(prefix)/lib/vice/C128
-+c128dir = $(prefix)/share/vice/C128
- 
- c128_DATA = \
- 	basic \
diff --git a/emulators/vice/patches/patch-ag b/emulators/vice/patches/patch-ag
deleted file mode 100644
index 44f5b119972..00000000000
--- a/emulators/vice/patches/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ag,v 1.1 1998/09/06 23:47:32 garbled Exp $
---- data/C64/Makefile.in.orig	Sun Sep  6 11:56:49 1998
-+++ data/C64/Makefile.in	Sun Sep  6 11:57:02 1998
-@@ -94,7 +94,7 @@
- VERSION = @VERSION@
- YACC = @YACC@
- 
--c64dir = $(prefix)/lib/vice/C64
-+c64dir = $(prefix)/share/vice/C64
- 
- c64_DATA = \
- 	basic \
diff --git a/emulators/vice/patches/patch-ah b/emulators/vice/patches/patch-ah
deleted file mode 100644
index b557ffff40c..00000000000
--- a/emulators/vice/patches/patch-ah
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ah,v 1.1 1998/09/06 23:47:33 garbled Exp $
---- data/PET/Makefile.in.orig	Sun Sep  6 11:57:11 1998
-+++ data/PET/Makefile.in	Sun Sep  6 11:57:23 1998
-@@ -113,7 +113,7 @@
- 	graphics.vkm \
- 	posg_de.vkm
- 
--petdir = $(prefix)/lib/vice/PET
-+petdir = $(prefix)/share/vice/PET
- 
- pet_DATA = $(keymaps) $(roms) $(palettes)
- 
diff --git a/emulators/vice/patches/patch-ai b/emulators/vice/patches/patch-ai
deleted file mode 100644
index 9a8aeecdf74..00000000000
--- a/emulators/vice/patches/patch-ai
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ai,v 1.1 1998/09/06 23:47:34 garbled Exp $
---- data/VIC20/Makefile.in.orig	Sun Sep  6 11:57:34 1998
-+++ data/VIC20/Makefile.in	Sun Sep  6 11:57:44 1998
-@@ -94,7 +94,7 @@
- VERSION = @VERSION@
- YACC = @YACC@
- 
--vic20dir = $(prefix)/lib/vice/VIC20
-+vic20dir = $(prefix)/share/vice/VIC20
- 
- vic20_DATA = \
- 	basic \
diff --git a/emulators/vice/patches/patch-aj b/emulators/vice/patches/patch-aj
deleted file mode 100644
index 7ab9e3d1e2d..00000000000
--- a/emulators/vice/patches/patch-aj
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aj,v 1.1 1998/09/06 23:47:35 garbled Exp $
---- doc/html/Makefile.in.orig	Sun Sep  6 12:09:45 1998
-+++ doc/html/Makefile.in	Sun Sep  6 12:10:03 1998
-@@ -94,7 +94,7 @@
- VERSION = @VERSION@
- YACC = @YACC@
- 
--docdir = $(prefix)/lib/vice/doc
-+docdir = $(prefix)/share/doc/vice
- 
- doc_DATA = \
- 	vice_1.html \
diff --git a/emulators/vice/pkg/COMMENT b/emulators/vice/pkg/COMMENT
index 3ca14a26a8c..7c536c6a5bc 100644
--- a/emulators/vice/pkg/COMMENT
+++ b/emulators/vice/pkg/COMMENT
@@ -1 +1 @@
-an emulator for C64, C128, PET and VIC20's
+An emulator for C64, C128, CBM-II, PET, and VIC-20
diff --git a/emulators/vice/pkg/DESCR b/emulators/vice/pkg/DESCR
index 318e23b0ba9..dfa023f4723 100644
--- a/emulators/vice/pkg/DESCR
+++ b/emulators/vice/pkg/DESCR
@@ -1,5 +1,6 @@
 VICE is a Versatile Commodore Emulator, i.e. a program that runs on a Unix
 or MS-DOS/Windows 95 machine and executes programs intended for the old
 8-bit Commodore computers. The current version emulates the C64, the C128
-(save the 80 columns screen), the VIC20 and all the PET models (except the
-SuperPET 9000, which is out of line anyway).
+(save the 80 columns screen), the VIC20, the CBM-II line (B128, B256), and
+all the PET models (except the SuperPET 9000, which is out of line
+anyway).
diff --git a/emulators/vice/pkg/PLIST b/emulators/vice/pkg/PLIST
index e5c3c547dc9..ec7b86093e6 100644
--- a/emulators/vice/pkg/PLIST
+++ b/emulators/vice/pkg/PLIST
@@ -1,16 +1,18 @@
-@comment $NetBSD: PLIST,v 1.3 1998/09/07 10:17:19 garbled Exp $
-bin/x64
-bin/x128
-bin/xvic
-bin/xpet
+@comment $NetBSD: PLIST,v 1.4 1999/05/18 08:45:51 tv Exp $
 bin/c1541
 bin/petcat
+bin/x128
+bin/x64
+bin/xcbm2
+bin/xpet
+bin/xvic
 @unexec install-info --delete %D/info/vice.info %D/info/dir
 info/vice.info
 info/vice.info-1
 info/vice.info-2
 info/vice.info-3
 info/vice.info-4
+info/vice.info-5
 @exec install-info %D/info/vice.info %D/info/dir
 man/man1/c1541.1
 man/man1/petcat.1
@@ -18,6 +20,7 @@ man/man1/vice.1
 share/doc/vice/64doc.txt
 share/doc/vice/Evaluation
 share/doc/vice/PETdoc.txt
+share/doc/vice/Readme.dos
 share/doc/vice/cbm_basic_tokens.txt
 share/doc/vice/drive_info.txt
 share/doc/vice/mnemonics.txt
@@ -37,48 +40,97 @@ share/doc/vice/vice_11.html
 share/doc/vice/vice_12.html
 share/doc/vice/vice_13.html
 share/doc/vice/vice_14.html
+share/doc/vice/vice_15.html
+share/doc/vice/vice_16.html
 share/doc/vice/vice_toc.html
-share/vice/C64/basic
-share/vice/C64/chargen
-share/vice/C64/ccs64.vpl
-share/vice/C64/frodo.vpl
-share/vice/C64/godot.vpl
-share/vice/C64/default.vkm
-share/vice/C64/position.vkm
-share/vice/C64/default.vpl
-share/vice/C64/dos1541
-share/vice/C64/kernal
 share/vice/C128/basic
 share/vice/C128/chargen
+share/vice/C128/c64s.vpl
 share/vice/C128/ccs64.vpl
 share/vice/C128/frodo.vpl
 share/vice/C128/default.vkm
 share/vice/C128/default.vpl
-share/vice/C128/dos1541
+share/vice/C128/default.vrs
+share/vice/C128/godot.vpl
 share/vice/C128/kernal
+share/vice/C128/pc64.vpl
+share/vice/C128/position.vkm
+share/vice/C64/4064.vrs
+share/vice/C64/64gs.vrs
+share/vice/C64/basic
+share/vice/C64/basic.64gs
+share/vice/C64/c64s.vpl
+share/vice/C64/chargen
+share/vice/C64/ccs64.vpl
+share/vice/C64/default.vkm
+share/vice/C64/default.vpl
+share/vice/C64/default.vrs
+share/vice/C64/frodo.vpl
+share/vice/C64/godot.vpl
+share/vice/C64/kernal
+share/vice/C64/kernal.4064
+share/vice/C64/kernal.64gs
+share/vice/C64/kernal.sx64
+share/vice/C64/pc64.vpl
+share/vice/C64/position.vkm
+share/vice/C64/sx64.vrs
+share/vice/CBM-II/amber.vpl
+share/vice/CBM-II/basic.128
+share/vice/CBM-II/basic.256
+share/vice/CBM-II/busi_uk.vkm
+share/vice/CBM-II/chargen.600
+share/vice/CBM-II/chargen.700
+share/vice/CBM-II/default.vpl
+share/vice/CBM-II/kernal
+share/vice/CBM-II/rom128h.vrs
+share/vice/CBM-II/rom128l.vrs
+share/vice/CBM-II/rom256h.vrs
+share/vice/CBM-II/rom256l.vrs
+share/vice/CBM-II/white.vpl
+share/vice/DRIVES/dos1541
+share/vice/DRIVES/dos1541II
+share/vice/DRIVES/dos1571
+share/vice/DRIVES/dos1581
+share/vice/DRIVES/dos2031
+share/vice/PET/amber.vpl
+share/vice/PET/basic1
+share/vice/PET/basic2
+share/vice/PET/basic4
+share/vice/PET/busi_de.vkm
+share/vice/PET/busi_uk.vkm
+share/vice/PET/chargen
+share/vice/PET/chargen.de
+share/vice/PET/default.vpl
+share/vice/PET/edit1g
+share/vice/PET/edit2b
+share/vice/PET/edit2g
+share/vice/PET/edit4b40
+share/vice/PET/edit4b80
+share/vice/PET/edit4g40
+share/vice/PET/graphics.vkm
+share/vice/PET/kernal1
+share/vice/PET/kernal2
+share/vice/PET/kernal4
+share/vice/PET/posg_de.vkm
+share/vice/PET/rom1g.vrs
+share/vice/PET/rom2b.vrs
+share/vice/PET/rom2g.vrs
+share/vice/PET/rom4b40.vrs
+share/vice/PET/rom4b80.vrs
+share/vice/PET/rom4g40.vrs
+share/vice/PET/white.vpl
 share/vice/VIC20/basic
 share/vice/VIC20/chargen
 share/vice/VIC20/default.vkm
 share/vice/VIC20/default.vpl
-share/vice/VIC20/dos1541
+share/vice/VIC20/default.vrs
 share/vice/VIC20/kernal
 share/vice/VIC20/position.vkm
-share/vice/PET/busi_uk.vkm
-share/vice/PET/graphics.vkm
-share/vice/PET/posg_de.vkm
-share/vice/PET/edit2.b
-share/vice/PET/edit4.b80
-share/vice/PET/pet2001
-share/vice/PET/pet4032
-share/vice/PET/chargen
-share/vice/PET/edit4.b40
-share/vice/PET/pet3032
-share/vice/PET/amber.vpl
-share/vice/PET/default.vpl
-share/vice/PET/white.vpl
 @dirrm share/doc/vice
-@dirrm share/vice/C64
 @dirrm share/vice/C128
-@dirrm share/vice/VIC20
+@dirrm share/vice/C64
+@dirrm share/vice/CBM-II
+@dirrm share/vice/DRIVES
 @dirrm share/vice/PET
+@dirrm share/vice/VIC20
 @dirrm share/vice