Update to 2.4, provided by Olaf 'Rhialto' Seibert in PR/47223.

While here, add missing tex-pdftex build dependency (for vice.pdf) and
fix ffmpeg option build.

Changes: Lots of extra hardware is emulated (including the long
awaited SuperPET 6809 parts), and several new host platforms are
added.

7 files changed, 149 insertions, 75 deletions

diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index cda77df1c5f..8bd6840e5dd 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.102 2012/10/08 23:01:32 adam Exp $
+# $NetBSD: Makefile,v 1.103 2012/12/12 09:58:03 wiz Exp $
 
-DISTNAME=		vice-2.3
-PKGREVISION=		11
+DISTNAME=		vice-2.4
 CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=vice-emu:Q}/
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=vice-emu/}
 MASTER_SITES+=		ftp://ftp.zimmers.net/pub/cbm/crossplatform/emulators/VICE/
 MASTER_SITES+=		http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/
 
@@ -12,6 +11,8 @@ HOMEPAGE=		http://vice-emu.sourceforge.net/
 COMMENT=		Emulator for C64, C128, CBM-II, PET, VIC20, Plus4 and C16
 LICENSE=		gnu-gpl-v2
 
+BUILD_DEPENDS+=		tex-pdftex-[0-9]*:../../print/tex-pdftex
+
 RESTRICTED=		ROM image copyright is questionable.
 NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_SRC_ON_CDROM=	${RESTRICTED}
@@ -21,10 +22,11 @@ NO_SRC_ON_FTP=		${RESTRICTED}
 EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
 
 USE_PKGLOCALEDIR=	YES
-USE_TOOLS+=		bdftopcf gmake mkfontdir msgfmt
+USE_TOOLS+=		bdftopcf gmake msgfmt
 USE_TOOLS+=		pkg-config
 USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		YES
+CONFIGURE_ENV+=		toolchain_check=no
 
 INFO_FILES=		YES
 FONTS_DIRS.x11=		${PREFIX}/share/vice/fonts
@@ -49,7 +51,7 @@ CPPFLAGS+=		-DHAVE_STDINT_H
 .include "../../devel/readline/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../mk/giflib.buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/vice/PLIST b/emulators/vice/PLIST
index 41c5e6912af..3ffc84f6feb 100644
--- a/emulators/vice/PLIST
+++ b/emulators/vice/PLIST
@@ -1,12 +1,14 @@
-@comment $NetBSD: PLIST,v 1.23 2011/04/04 13:42:08 wiz Exp $
+@comment $NetBSD: PLIST,v 1.24 2012/12/12 09:58:03 wiz Exp $
 bin/c1541
 bin/cartconv
 bin/petcat
+bin/vsid
 bin/x128
 bin/x64
 bin/x64dtv
 bin/x64sc
 bin/xcbm2
+bin/xcbm5x0
 bin/xpet
 bin/xplus4
 bin/xvic
@@ -17,31 +19,37 @@ man/man1/c1541.1
 man/man1/petcat.1
 man/man1/vice.1
 share/doc/vice/64doc.txt
+share/doc/vice/65C02.txt
 share/doc/vice/BUGS
 share/doc/vice/CIA-README.txt
 share/doc/vice/COPYING
 share/doc/vice/CommodoreInnovationPriceSoftware2008.jpg
+share/doc/vice/Documentation-Howto.txt
+share/doc/vice/Doxygen-Howto.txt
 share/doc/vice/GP2X-Howto.txt
+share/doc/vice/Linux-Mingw32-Howto.txt
 share/doc/vice/MSDOS-Ethernet-Howto.txt
 share/doc/vice/MSDOS-Howto.txt
-share/doc/vice/MacOSX-Build.txt
+share/doc/vice/MacOSX-Howto.txt
 share/doc/vice/MacOSX-ResourceTree.txt
 share/doc/vice/Minix-Howto.txt
 share/doc/vice/NEWS
 share/doc/vice/NLS-Howto.txt
 share/doc/vice/OpenVMS-Howto.txt
 share/doc/vice/PETdoc.txt
-share/doc/vice/Readme.beos
-share/doc/vice/Readme.dos
-share/doc/vice/ReadmeMacOSX.txt
-share/doc/vice/ReadmeSDL.txt
+share/doc/vice/Readme-Amiga.txt
+share/doc/vice/Readme-BeOS.txt
+share/doc/vice/Readme-DOS.txt
+share/doc/vice/Readme-MacOSX.txt
+share/doc/vice/Readme-OS2.txt
+share/doc/vice/Readme-SDL.txt
+share/doc/vice/SDL-Howto.txt
 share/doc/vice/TODO
 share/doc/vice/VIC-Addendum.txt
 share/doc/vice/VIC-Article.txt
 share/doc/vice/VIC-Artikel.txt
-share/doc/vice/Walkthrough-Howto.txt
-share/doc/vice/Win32-Cygwin-HOWTO.txt
-share/doc/vice/Win32-Howto.txt
+share/doc/vice/Win32-Cygwin-Howto.txt
+share/doc/vice/Win32-Mingw32-Howto.txt
 share/doc/vice/amigaos.html
 share/doc/vice/beos.html
 share/doc/vice/cbm_basic_tokens.txt
@@ -51,12 +59,21 @@ share/doc/vice/iec-bus.txt
 share/doc/vice/index.html
 share/doc/vice/macosx.html
 share/doc/vice/new.gif
-share/doc/vice/openGLsync-howto.txt
+share/doc/vice/pixel_aspect.txt
 share/doc/vice/qnx.html
 share/doc/vice/sco.html
 share/doc/vice/serial.txt
 share/doc/vice/solaris.html
+share/doc/vice/vice-logo-small.png
 share/doc/vice/vice-logo.jpg
+share/doc/vice/vice.chm
+share/doc/vice/vice.css
+share/doc/vice/vice.guide
+share/doc/vice/vice.hlp
+share/doc/vice/vice.inf
+share/doc/vice/vice.info
+share/doc/vice/vice.pdf
+share/doc/vice/vice.txt
 share/doc/vice/vice_1.html
 share/doc/vice/vice_10.html
 share/doc/vice/vice_11.html
@@ -65,7 +82,11 @@ 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_17.html
+share/doc/vice/vice_18.html
+share/doc/vice/vice_19.html
 share/doc/vice/vice_2.html
+share/doc/vice/vice_20.html
 share/doc/vice/vice_3.html
 share/doc/vice/vice_4.html
 share/doc/vice/vice_5.html
@@ -150,14 +171,17 @@ share/vice/DRIVES/dos1551
 share/vice/DRIVES/dos1570
 share/vice/DRIVES/dos1571
 share/vice/DRIVES/dos1581
+share/vice/DRIVES/dos2000
 share/vice/DRIVES/dos2031
 share/vice/DRIVES/dos2040
 share/vice/DRIVES/dos3040
+share/vice/DRIVES/dos4000
 share/vice/DRIVES/dos4040
 share/vice/PET/amber.vpl
 share/vice/PET/basic1
 share/vice/PET/basic2
 share/vice/PET/basic4
+share/vice/PET/characters.901640-01.bin
 share/vice/PET/chargen
 share/vice/PET/chargen.de
 share/vice/PET/edit1g
@@ -176,13 +200,23 @@ share/vice/PET/rom2g.vrs
 share/vice/PET/rom4b40.vrs
 share/vice/PET/rom4b80.vrs
 share/vice/PET/rom4g40.vrs
+share/vice/PET/romsuperpet.vrs
+share/vice/PET/waterloo-a000.901898-01.bin
+share/vice/PET/waterloo-b000.901898-02.bin
+share/vice/PET/waterloo-c000.901898-03.bin
+share/vice/PET/waterloo-d000.901898-04.bin
+share/vice/PET/waterloo-e000.901897-01.bin
+share/vice/PET/waterloo-f000.901898-05.bin
 share/vice/PET/white.vpl
 share/vice/PLUS4/3plus1hi
 share/vice/PLUS4/3plus1lo
 share/vice/PLUS4/basic
+share/vice/PLUS4/c2lo.364
 share/vice/PLUS4/default.vpl
 share/vice/PLUS4/default.vrs
 share/vice/PLUS4/kernal
+share/vice/PLUS4/kernal.232
+share/vice/PLUS4/kernal.364
 share/vice/PLUS4/vice.vpl
 share/vice/PRINTER/cbm1526
 share/vice/PRINTER/mps801
diff --git a/emulators/vice/PLIST.x11 b/emulators/vice/PLIST.x11
index 47b27cbae75..f5f41d8ad0f 100644
--- a/emulators/vice/PLIST.x11
+++ b/emulators/vice/PLIST.x11
@@ -1,12 +1,14 @@
-@comment $NetBSD: PLIST.x11,v 1.1 2011/04/04 13:42:08 wiz Exp $
-bin/vsid
+@comment $NetBSD: PLIST.x11,v 1.2 2012/12/12 09:58:03 wiz Exp $
 share/locale/da/LC_MESSAGES/vice.mo
 share/locale/de/LC_MESSAGES/vice.mo
+share/locale/es/LC_MESSAGES/vice.mo
 share/locale/fr/LC_MESSAGES/vice.mo
 share/locale/hu/LC_MESSAGES/vice.mo
 share/locale/it/LC_MESSAGES/vice.mo
+share/locale/ko/LC_MESSAGES/vice.mo
 share/locale/nl/LC_MESSAGES/vice.mo
 share/locale/pl/LC_MESSAGES/vice.mo
+share/locale/ru/LC_MESSAGES/vice.mo
 share/locale/sv/LC_MESSAGES/vice.mo
 share/locale/tr/LC_MESSAGES/vice.mo
 share/vice/C128/x11_pos.vkm
@@ -36,3 +38,4 @@ share/vice/PLUS4/x11_sym.vkm
 share/vice/PLUS4/x11_sym_de.vkm
 share/vice/VIC20/x11_pos.vkm
 share/vice/VIC20/x11_sym.vkm
+share/vice/fonts/vice-cbm.pcf
diff --git a/emulators/vice/distinfo b/emulators/vice/distinfo
index 59fb8a8f260..f742dd14334 100644
--- a/emulators/vice/distinfo
+++ b/emulators/vice/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.40 2012/10/10 13:40:06 drochner Exp $
+$NetBSD: distinfo,v 1.41 2012/12/12 09:58:03 wiz Exp $
 
-SHA1 (vice-2.3.tar.gz) = 5e7e1a375a4ca8c4895dc1552162955fdffce296
-RMD160 (vice-2.3.tar.gz) = 056e48ffedfaecd470892c73b97af89c1e002ff9
-Size (vice-2.3.tar.gz) = 11602378 bytes
+SHA1 (vice-2.4.tar.gz) = 719aa96cc72e7578983fadea1a31c21898362bc7
+RMD160 (vice-2.4.tar.gz) = 6ff3b4a410ef70aa135e2245e6855cfa63373e2c
+Size (vice-2.4.tar.gz) = 13656511 bytes
 SHA1 (patch-aa) = 7ecda5911a2dd0e7ef8676959d9dc021323d393f
-SHA1 (patch-ab) = dada25dfd5c40db040b1b99fd7071986db5b50cc
-SHA1 (patch-src_gfxoutputdrv_ffmpegdrv.c) = 6abceb628c86a401a79090edfedcc645fcc15c6d
+SHA1 (patch-ab) = ab982bb762bebf56eb54859a38fe47b58d31ac67
+SHA1 (patch-data_fonts_Makefile.in) = 89b2a57822f58242d8d325d467b54353cf230906
diff --git a/emulators/vice/options.mk b/emulators/vice/options.mk
index 879dbfb20af..0c19db72b3e 100644
--- a/emulators/vice/options.mk
+++ b/emulators/vice/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2011/04/04 13:42:08 wiz Exp $
+# $NetBSD: options.mk,v 1.7 2012/12/12 09:58:03 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.vice
 PKG_SUPPORTED_OPTIONS=	ffmpeg lame vice-fullscreen vice-hwscaling vice-ethernet
@@ -21,6 +21,7 @@ PLIST_SRC += PLIST.x11
 CONFIGURE_ARGS+=	--enable-gnomeui
 PLIST_SRC+=		PLIST.x11
 .  include "../../x11/gtk2/buildlink3.mk"
+.  include "../../x11/vte/buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Msdl)
@@ -64,7 +65,7 @@ CONFIGURE_ARGS+=	--enable-ethernet
 .if !empty(PKG_OPTIONS:Mffmpeg)
 #BUILDLINK_DEPMETHOD.ffmpeg?=	build
 CONFIGURE_ARGS+=	--enable-ffmpeg
-.  include "../../multimedia/ffmpeg/buildlink3.mk"
+.  include "../../multimedia/ffmpeg010/buildlink3.mk"
 .endif
 .if !empty(PKG_OPTIONS:Mlame)
 #BUILDLINK_DEPMETHOD.lame?=	build
diff --git a/emulators/vice/patches/patch-ab b/emulators/vice/patches/patch-ab
index 75b8b635f7c..ac46abe20ac 100644
--- a/emulators/vice/patches/patch-ab
+++ b/emulators/vice/patches/patch-ab
@@ -1,66 +1,51 @@
-$NetBSD: patch-ab,v 1.12 2012/08/14 18:49:44 marino Exp $
+$NetBSD: patch-ab,v 1.13 2012/12/12 09:58:03 wiz Exp $
 
-1. dynamic lib support does not depend on the existence of libdl
-2. patch out error message about --without-iconv-base
-3. Use the NetBSD configuration for every OS since the PLIST is
+1. Portability problem with "text xx == yy"
+   (in a section for some other OS, so not too relevant).
+2. Use the NetBSD configuration for every OS since the PLIST is
    hardcoded for that.  Should fix every non-NetBSD platform.
 
---- configure.orig	2011-02-26 18:07:06.000000000 +0000
+--- configure.orig	2012-11-02 21:06:04.000000000 +0000
 +++ configure
-@@ -3381,7 +3381,7 @@ do
-       ;;
-   esac
-   if test x"$argvalid" = "xno"; then
--    as_fn_error $? "invalid option: $argcheck" "$LINENO" 5
-+    echo "WARNING: invalid option: $argcheck"
-   fi
- done
+@@ -14123,7 +14123,7 @@ fi
  
-@@ -10381,13 +10381,13 @@ fi
  
  
-   if test x"$ac_cv_header_dlfcn_h" = "xyes" ; then
--    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
--$as_echo_n "checking for dlopen in -ldl... " >&6; }
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen" >&5
-+$as_echo_n "checking for dlopen... " >&6; }
- if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldl  $LIBS"
-+#LIBS="-ldl  $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -10418,7 +10418,7 @@ fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
- $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
- if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
--   DYNLIB_LIBS="-ldl";
-+   DYNLIB_LIBS="";
- 
- $as_echo "#define HAVE_DYNLIB_SUPPORT /**/" >>confdefs.h
- 
-@@ -19664,34 +19664,12 @@ _ACEOF
- 
+-        if test x"$dsound_header_no_lib" == "xyes" -o x"$dinput_header_no_lib" == "xyes"; then
++        if test x"$dsound_header_no_lib" = "xyes" -o x"$dinput_header_no_lib" = "xyes"; then
+               { $as_echo "$as_me:${as_lineno-$LINENO}: checking if CoInitialize can be linked" >&5
+ $as_echo_n "checking if CoInitialize can be linked... " >&6; }
+               LIBS="$LIBS -lole32"
+@@ -20158,7 +20158,7 @@ fi
+ esac
  
  case "$host_os" in
 -  netbsd*)
 +  *)
-     VICEDIR="$PREFIX/share/vice";
+     VICEDIR="$PREFIX/share/vice"
       if true; then
    ALTERNATE_DOCDIR_TRUE=
-   ALTERNATE_DOCDIR_FALSE='#'
- else
+@@ -20167,52 +20167,6 @@ else
+   ALTERNATE_DOCDIR_TRUE='#'
+   ALTERNATE_DOCDIR_FALSE=
+ fi
+-
+-    ;;
+-  freebsd*)
+-    VICEDIR="$PREFIX/lib/vice"
+-     if true; then
+-  ALTERNATE_DOCDIR_TRUE=
+-  ALTERNATE_DOCDIR_FALSE='#'
+-else
 -  ALTERNATE_DOCDIR_TRUE='#'
 -  ALTERNATE_DOCDIR_FALSE=
 -fi
 -
 -    ;;
--  freebsd*)
--    VICEDIR="$PREFIX/lib/vice";
--     if true; then
+-  linux*)
+-    if test x"$host_cpu" = "xx86_64"; then
+-      VICEDIR="$PREFIX/lib64/vice"
+-       if false; then
 -  ALTERNATE_DOCDIR_TRUE=
 -  ALTERNATE_DOCDIR_FALSE='#'
 -else
@@ -68,13 +53,28 @@ $NetBSD: patch-ab,v 1.12 2012/08/14 18:49:44 marino Exp $
 -  ALTERNATE_DOCDIR_FALSE=
 -fi
 -
+-    else
+-      VICEDIR="$PREFIX/lib/vice"
+-       if false; then
+-  ALTERNATE_DOCDIR_TRUE=
+-  ALTERNATE_DOCDIR_FALSE='#'
+-else
+-  ALTERNATE_DOCDIR_TRUE='#'
+-  ALTERNATE_DOCDIR_FALSE=
+-fi
+-
+-    fi
 -    ;;
 -  *)
--    VICEDIR="$PREFIX/lib/vice";
+-    VICEDIR="$PREFIX/lib/vice"
 -     if false; then
 -  ALTERNATE_DOCDIR_TRUE=
 -  ALTERNATE_DOCDIR_FALSE='#'
 -else
-   ALTERNATE_DOCDIR_TRUE='#'
-   ALTERNATE_DOCDIR_FALSE=
- fi
+-  ALTERNATE_DOCDIR_TRUE='#'
+-  ALTERNATE_DOCDIR_FALSE=
+-fi
+-
+     ;;
+ esac
+ 
diff --git a/emulators/vice/patches/patch-data_fonts_Makefile.in b/emulators/vice/patches/patch-data_fonts_Makefile.in
new file mode 100644
index 00000000000..b1785bcd3ce
--- /dev/null
+++ b/emulators/vice/patches/patch-data_fonts_Makefile.in
@@ -0,0 +1,34 @@
+$NetBSD: patch-data_fonts_Makefile.in,v 1.1 2012/12/12 09:58:03 wiz Exp $
+
+- Don't try to mess in ${HOME}.
+- Don't erase vice-cbm.bdf or try mkfontdir (that is done at pkg_add time).
+
+--- data/fonts/Makefile.in.orig	2012-11-02 21:06:50.000000000 +0000
++++ data/fonts/Makefile.in
+@@ -528,23 +528,9 @@ uninstall-am: uninstall-fontsDATA
+ 
+ 
+ install: install-data-am
+-@HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@	@echo "Preparing fontdir, please wait..." ; \
+-@HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@	if [ ! `fc-cache --list > /dev/null 2>&1` ] ; then \
+-@HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@	  if test "x${HOME}" != "x" ; then \
+-@HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@	    mkdir ${HOME}/.fonts > /dev/null 2>&1 ; \
+-@HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@	    cp $(fontsdir)/CBM.ttf ${HOME}/.fonts ; \
+-@HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@	    fc-cache ; \
+-@HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@	  else \
+-@HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@	    echo '$$HOME not set... giving up.' ; \
+-@HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@	  fi \
+-@HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@	else \
+-@HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@	  echo 'fc-cache not available... giving up.' ; \
+-@HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@	fi
+-@HAVE_FC_CACHE_FALSE@@SDL_COMPILE_FALSE@	@echo "Preparing fontdir..." ; \
+-@HAVE_FC_CACHE_FALSE@@SDL_COMPILE_FALSE@	cd $(DESTDIR)$(fontsdir) ; \
+-@HAVE_FC_CACHE_FALSE@@SDL_COMPILE_FALSE@	bdftopcf -o vice-cbm.pcf vice-cbm.bdf ; \
+-@HAVE_FC_CACHE_FALSE@@SDL_COMPILE_FALSE@	rm vice-cbm.bdf ; \
+-@HAVE_FC_CACHE_FALSE@@SDL_COMPILE_FALSE@	mkfontdir .
++@SDL_COMPILE_FALSE@	@echo "Preparing fontdir..." ; \
++@SDL_COMPILE_FALSE@	cd $(DESTDIR)$(fontsdir) ; \
++@SDL_COMPILE_FALSE@	bdftopcf -o vice-cbm.pcf vice-cbm.bdf 
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.