- update to 2.4

3 files changed, 60 insertions, 20 deletions

diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index 87d6e0dae18b..ca4f0d9d7ab1 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	vice
-# Date created:		Mar 28, 1998
-# Whom:			dchapes@ddm.on.ca
-#
+# Created by: dchapes@ddm.on.ca
 # $FreeBSD$
 
 PORTNAME=	vice
-PORTVERSION=	2.3
-PORTREVISION=	4
+PORTVERSION=	2.4
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/ \
 		ftp://ftp.zimmers.net/pub/cbm/crossplatform/emulators/VICE/
@@ -42,7 +38,7 @@ CONFLICTS?=	vice-gnome-1.* vice-1.*
 .else
 .if !defined(VICE_WITHOUT_GNOME)
 GNOME_SUFFIX=	-gnome
-USE_GNOME=	gtk20
+USE_GNOME=	gtk20 vte
 CONFIGURE_ARGS=	--enable-gnomeui
 CONFLICTS?=	vice-1.* vice-xaw3d-1.*
 .else
@@ -56,6 +52,17 @@ CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS+=	--enable-fullscreen --enable-ipv6 --disable-dependency-tracking
+#CONFIGURE_ARGS+=	--enable-ethernet
+# libpcap or libnet
+#CONFIGURE_ARGS+=	--enable-sdlui
+#CONFIGURE_ARGS+=	--enable-gp2x
+#CONFIGURE_ARGS+=	--enable-wiz
+#CONFIGURE_ARGS+=	--enable-parsid
+#CONFIGURE_ARGS+=	--enable-memmap
+
+Optional Features:
+
+
 MAN1=		vice.1 c1541.1 petcat.1
 MLINKS=		vice.1 x64.1 \
 		vice.1 x128.1 \
@@ -97,7 +104,7 @@ PLIST_SUB+=		NOFCCACHE=""
 
 # will be picked up by configure
 .if exists(${LOCALBASE}/include/ffmpeg/avformat.h)
-LIB_DEPENDS+=		avcodec.1:${PORTSDIR}/multimedia/ffmpeg
+LIB_DEPENDS+=		avcodec:${PORTSDIR}/multimedia/ffmpeg
 .endif
 
 .if !defined(WITHOUT_NLS)
@@ -119,7 +126,7 @@ CPPFLAGS+=		-I${LOCALBASE}/include/SDL
 .endif
 
 .if defined(VICE_WITH_ASOUND)
-LIB_DEPENDS+=	asound.2:${PORTSDIR}/audio/alsa-lib
+LIB_DEPENDS+=	asound:${PORTSDIR}/audio/alsa-lib
 .endif
 
 post-extract:
diff --git a/emulators/vice/distinfo b/emulators/vice/distinfo
index 1e25737e3c07..b080b96bbcf6 100644
--- a/emulators/vice/distinfo
+++ b/emulators/vice/distinfo
@@ -1,2 +1,2 @@
-SHA256 (vice-2.3.tar.gz) = b1817c8dce023069d5c15234c2b4da0a152d297ee8ed01f0b361795c4beeb50e
-SIZE (vice-2.3.tar.gz) = 11602378
+SHA256 (vice-2.4.tar.gz) = ff8b8d5f0f497d1f8e75b95bbc4204993a789284a08a8a59ba727ad81dcace10
+SIZE (vice-2.4.tar.gz) = 13656511
diff --git a/emulators/vice/pkg-plist b/emulators/vice/pkg-plist
index 9c4248650d39..b88721cfbe12 100644
--- a/emulators/vice/pkg-plist
+++ b/emulators/vice/pkg-plist
@@ -7,6 +7,7 @@ bin/x64
 bin/x64dtv
 bin/x64sc
 bin/xcbm2
+bin/xcbm5x0
 bin/xpet
 bin/xplus4
 bin/xvic
@@ -106,14 +107,17 @@ lib/vice/DRIVES/dos1551
 lib/vice/DRIVES/dos1570
 lib/vice/DRIVES/dos1571
 lib/vice/DRIVES/dos1581
+lib/vice/DRIVES/dos2000
 lib/vice/DRIVES/dos2031
 lib/vice/DRIVES/dos2040
 lib/vice/DRIVES/dos3040
+lib/vice/DRIVES/dos4000
 lib/vice/DRIVES/dos4040
 lib/vice/PET/amber.vpl
 lib/vice/PET/basic1
 lib/vice/PET/basic2
 lib/vice/PET/basic4
+lib/vice/PET/characters.901640-01.bin
 lib/vice/PET/chargen
 lib/vice/PET/chargen.de
 lib/vice/PET/edit1g
@@ -132,6 +136,13 @@ lib/vice/PET/rom2g.vrs
 lib/vice/PET/rom4b40.vrs
 lib/vice/PET/rom4b80.vrs
 lib/vice/PET/rom4g40.vrs
+lib/vice/PET/romsuperpet.vrs
+lib/vice/PET/waterloo-a000.901898-01.bin
+lib/vice/PET/waterloo-b000.901898-02.bin
+lib/vice/PET/waterloo-c000.901898-03.bin
+lib/vice/PET/waterloo-d000.901898-04.bin
+lib/vice/PET/waterloo-e000.901897-01.bin
+lib/vice/PET/waterloo-f000.901898-05.bin
 lib/vice/PET/white.vpl
 lib/vice/PET/x11_bdep.vkm
 lib/vice/PET/x11_bdep_de.vkm
@@ -148,9 +159,12 @@ lib/vice/PET/x11_bukp_de.vkm
 lib/vice/PLUS4/3plus1hi
 lib/vice/PLUS4/3plus1lo
 lib/vice/PLUS4/basic
+lib/vice/PLUS4/c2lo.364
 lib/vice/PLUS4/default.vpl
 lib/vice/PLUS4/default.vrs
 lib/vice/PLUS4/kernal
+lib/vice/PLUS4/kernal.232
+lib/vice/PLUS4/kernal.364
 lib/vice/PLUS4/vice.vpl
 lib/vice/PLUS4/x11_pos.vkm
 lib/vice/PLUS4/x11_sym.vkm
@@ -172,31 +186,37 @@ lib/vice/fonts/CBM.ttf
 %%NOFCCACHE%%lib/vice/fonts/vice-cbm.pcf
 %%NOFCCACHE%%lib/vice/fonts/fonts.dir
 %%PORTDOCS%%%%DOCSDIR%%/64doc.txt
+%%PORTDOCS%%%%DOCSDIR%%/65C02.txt
 %%PORTDOCS%%%%DOCSDIR%%/BUGS
 %%PORTDOCS%%%%DOCSDIR%%/CIA-README.txt
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/CommodoreInnovationPriceSoftware2008.jpg
+%%PORTDOCS%%%%DOCSDIR%%/Documentation-Howto.txt
+%%PORTDOCS%%%%DOCSDIR%%/Doxygen-Howto.txt
 %%PORTDOCS%%%%DOCSDIR%%/GP2X-Howto.txt
+%%PORTDOCS%%%%DOCSDIR%%/Linux-Mingw32-Howto.txt
 %%PORTDOCS%%%%DOCSDIR%%/MSDOS-Ethernet-Howto.txt
 %%PORTDOCS%%%%DOCSDIR%%/MSDOS-Howto.txt
-%%PORTDOCS%%%%DOCSDIR%%/MacOSX-Build.txt
+%%PORTDOCS%%%%DOCSDIR%%/MacOSX-Howto.txt
 %%PORTDOCS%%%%DOCSDIR%%/MacOSX-ResourceTree.txt
 %%PORTDOCS%%%%DOCSDIR%%/Minix-Howto.txt
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/NLS-Howto.txt
 %%PORTDOCS%%%%DOCSDIR%%/OpenVMS-Howto.txt
 %%PORTDOCS%%%%DOCSDIR%%/PETdoc.txt
-%%PORTDOCS%%%%DOCSDIR%%/Readme.beos
-%%PORTDOCS%%%%DOCSDIR%%/Readme.dos
-%%PORTDOCS%%%%DOCSDIR%%/ReadmeMacOSX.txt
-%%PORTDOCS%%%%DOCSDIR%%/ReadmeSDL.txt
+%%PORTDOCS%%%%DOCSDIR%%/Readme-Amiga.txt
+%%PORTDOCS%%%%DOCSDIR%%/Readme-BeOS.txt
+%%PORTDOCS%%%%DOCSDIR%%/Readme-DOS.txt
+%%PORTDOCS%%%%DOCSDIR%%/Readme-MacOSX.txt
+%%PORTDOCS%%%%DOCSDIR%%/Readme-OS2.txt
+%%PORTDOCS%%%%DOCSDIR%%/Readme-SDL.txt
+%%PORTDOCS%%%%DOCSDIR%%/SDL-Howto.txt
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/VIC-Addendum.txt
 %%PORTDOCS%%%%DOCSDIR%%/VIC-Article.txt
 %%PORTDOCS%%%%DOCSDIR%%/VIC-Artikel.txt
-%%PORTDOCS%%%%DOCSDIR%%/Walkthrough-Howto.txt
-%%PORTDOCS%%%%DOCSDIR%%/Win32-Cygwin-HOWTO.txt
-%%PORTDOCS%%%%DOCSDIR%%/Win32-Howto.txt
+%%PORTDOCS%%%%DOCSDIR%%/Win32-Cygwin-Howto.txt
+%%PORTDOCS%%%%DOCSDIR%%/Win32-Mingw32-Howto.txt
 %%PORTDOCS%%%%DOCSDIR%%/amigaos.html
 %%PORTDOCS%%%%DOCSDIR%%/beos.html
 %%PORTDOCS%%%%DOCSDIR%%/cbm_basic_tokens.txt
@@ -206,11 +226,20 @@ lib/vice/fonts/CBM.ttf
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/macosx.html
 %%PORTDOCS%%%%DOCSDIR%%/new.gif
-%%PORTDOCS%%%%DOCSDIR%%/openGLsync-howto.txt
+%%PORTDOCS%%%%DOCSDIR%%/pixel_aspect.txt
 %%PORTDOCS%%%%DOCSDIR%%/qnx.html
 %%PORTDOCS%%%%DOCSDIR%%/sco.html
 %%PORTDOCS%%%%DOCSDIR%%/serial.txt
 %%PORTDOCS%%%%DOCSDIR%%/solaris.html
+%%PORTDOCS%%%%DOCSDIR%%/vice-logo-small.png
+%%PORTDOCS%%%%DOCSDIR%%/vice.chm
+%%PORTDOCS%%%%DOCSDIR%%/vice.css
+%%PORTDOCS%%%%DOCSDIR%%/vice.guide
+%%PORTDOCS%%%%DOCSDIR%%/vice.hlp
+%%PORTDOCS%%%%DOCSDIR%%/vice.inf
+%%PORTDOCS%%%%DOCSDIR%%/vice.info
+%%PORTDOCS%%%%DOCSDIR%%/vice.pdf
+%%PORTDOCS%%%%DOCSDIR%%/vice.txt
 %%PORTDOCS%%%%DOCSDIR%%/vice_1.html
 %%PORTDOCS%%%%DOCSDIR%%/vice_10.html
 %%PORTDOCS%%%%DOCSDIR%%/vice_11.html
@@ -219,6 +248,10 @@ lib/vice/fonts/CBM.ttf
 %%PORTDOCS%%%%DOCSDIR%%/vice_14.html
 %%PORTDOCS%%%%DOCSDIR%%/vice_15.html
 %%PORTDOCS%%%%DOCSDIR%%/vice_16.html
+%%PORTDOCS%%%%DOCSDIR%%/vice_17.html
+%%PORTDOCS%%%%DOCSDIR%%/vice_18.html
+%%PORTDOCS%%%%DOCSDIR%%/vice_19.html
+%%PORTDOCS%%%%DOCSDIR%%/vice_20.html
 %%PORTDOCS%%%%DOCSDIR%%/vice_2.html
 %%PORTDOCS%%%%DOCSDIR%%/vice_3.html
 %%PORTDOCS%%%%DOCSDIR%%/vice_4.html