Pullup to the pkgsrc-2003Q4 branch a change necessitated by master-site

distfile changes, requested by Krister Walfridsson.

	Module Name:    pkgsrc
	Committed By:   kristerw
	Date:           Thu Dec  4 00:42:04 UTC 2003

	Modified Files:
		pkgsrc/emulators/vice: Makefile PLIST distinfo
	Removed Files:
		pkgsrc/emulators/vice/patches: patch-ad

	Log Message:
	The 4064, SX-64, and C64 Game System dist files have been removed
	from the FTP.  Remove them from the package too.

	PKGREVISION++

4 files changed, 5 insertions, 63 deletions

diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index f033d62ffde..38b9fce9ae8 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -1,15 +1,11 @@
-# $NetBSD: Makefile,v 1.37 2003/11/06 18:54:34 gavan Exp $
+# $NetBSD: Makefile,v 1.37.2.1 2003/12/07 12:24:55 agc Exp $
 #
 
 DISTNAME=		vice-1.13
+PKGREVISION=		1
 CATEGORIES=		emulators
-MASTER_SITES=		ftp://ftp.funet.fi/pub/cbm/firmware/computers/c64/ \
-			ftp://ftp.funet.fi/pub/cbm/crossplatform/emulators/VICE/ \
+MASTER_SITES=		ftp://ftp.funet.fi/pub/cbm/crossplatform/emulators/VICE/ \
 			http://www.nic.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
 
 MAINTAINER=		kristerw@NetBSD.org
 HOMEPAGE=		http://viceteam.bei.t-online.de/
@@ -45,27 +41,7 @@ post-patch:
 			$$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|g" -e "s|basic|basic.64gs|g"	\
-		${WRKSRC}/data/C64/default.vrs > ${WRKDIR}/64gs.vrs
-	${SED}	-e "s|kernal|kernal.4064|g"				\
-		${WRKSRC}/data/C64/default.vrs > ${WRKDIR}/4064.vrs
-	${SED}	-e "s|kernal|kernal.sx64|g"				\
-		${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/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/vice
 	${MV} ${PREFIX}/share/doc/vice/*.html ${PREFIX}/share/doc/html/vice
 
diff --git a/emulators/vice/PLIST b/emulators/vice/PLIST
index 211afd682be..c825b68b746 100644
--- a/emulators/vice/PLIST
+++ b/emulators/vice/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2003/09/28 10:41:21 kristerw Exp $
+@comment $NetBSD: PLIST,v 1.8.2.1 2003/12/07 12:24:55 agc Exp $
 bin/c1541
 bin/petcat
 bin/vsid
@@ -91,10 +91,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/4064.vrs
-share/vice/C64/64gs.vrs
 share/vice/C64/basic
-share/vice/C64/basic.64gs
 share/vice/C64/beos_pos.vkm
 share/vice/C64/beos_sym.vkm
 share/vice/C64/c64hq.vpl
@@ -109,13 +106,9 @@ share/vice/C64/dos_sym.vkm
 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/os2.vkm
 share/vice/C64/os2_sym.vkm
 share/vice/C64/pc64.vpl
-share/vice/C64/sx64.vrs
 share/vice/C64/vice.vpl
 share/vice/C64/win_pos.vkm
 share/vice/C64/win_sym.vkm
diff --git a/emulators/vice/distinfo b/emulators/vice/distinfo
index 057169105c5..1a029f6fbf2 100644
--- a/emulators/vice/distinfo
+++ b/emulators/vice/distinfo
@@ -1,14 +1,7 @@
-$NetBSD: distinfo,v 1.10 2003/09/28 10:41:21 kristerw Exp $
+$NetBSD: distinfo,v 1.10.2.1 2003/12/07 12:24:55 agc Exp $
 
 SHA1 (vice-1.13.tar.gz) = 0d6e92860afd8854680af7cbb3445ed0352fd692
 Size (vice-1.13.tar.gz) = 3599738 bytes
-SHA1 (64gs.390852-01.bin) = 21940ef5f1bfe67d7537164f7ca130a1095b067a
-Size (64gs.390852-01.bin) = 16384 bytes
-SHA1 (kernal.4064.901246-01.bin) = 6c4fa9465f6091b174df27dfe679499df447503c
-Size (kernal.4064.901246-01.bin) = 8192 bytes
-SHA1 (kernal.sx.251104-04.bin) = aa136e91ecf3c5ac64f696b3dbcbfc5ba0871c98
-Size (kernal.sx.251104-04.bin) = 8192 bytes
 SHA1 (patch-aa) = fa152c1d14aad31c0b50fe96c83b4e5cfa06de5f
 SHA1 (patch-ab) = 0be2ec8b98a50e5c879095b1d0327c802b7740e2
-SHA1 (patch-ad) = 6b934d8101bd2b88994115975fd87c3c20d0852e
 SHA1 (patch-ae) = c2ede31953ebaf033c9ae1aa1985012fb0e5f3b6
diff --git a/emulators/vice/patches/patch-ad b/emulators/vice/patches/patch-ad
deleted file mode 100644
index ba86496bfb4..00000000000
--- a/emulators/vice/patches/patch-ad
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ad,v 1.7 2003/02/21 14:25:15 wiz Exp $
-
---- src/arch/unix/c64ui.c.orig	Tue Dec 31 18:29:18 2002
-+++ src/arch/unix/c64ui.c
-@@ -278,6 +278,15 @@
-     { N_("Load default ROMs"),
-       (ui_callback_t)ui_set_romset,
-       (ui_callback_data_t)"default.vrs", NULL },
-+    { N_("C64 Game System (GS)"),
-+      (ui_callback_t)ui_set_romset,
-+      (ui_callback_data_t)"64gs.vrs", NULL },
-+    { N_("Educator 64 (4064)"),
-+      (ui_callback_t)ui_set_romset,
-+      (ui_callback_data_t)"4064.vrs", NULL },
-+    { N_("SX-64"),
-+      (ui_callback_t)ui_set_romset,
-+      (ui_callback_data_t)"sx64.vrs", NULL },
-     { "--" },
-     { N_("Load new kernal ROM"),
-       (ui_callback_t)ui_load_rom_file,