8 files changed, 104 insertions, 125 deletions

diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index b10d1b995a15..ce1b3e9fad49 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	vice
-PORTVERSION=	1.11
-PORTREVISION=	1
+PORTVERSION=	1.12
 CATEGORIES=	emulators
 MASTER_SITES=	ftp://ftp.funet.fi/pub/cbm/crossplatform/emulators/VICE/
 .if defined(VICE_WITH_GNOME)
@@ -26,6 +25,7 @@ NO_PACKAGE=	${RESTRICTED}
 
 USE_XPM=	yes
 GNU_CONFIGURE=	yes
+MAKE_ENV+=	MAKEINFOFLAGS="--no-split"
 
 .if defined(VICE_WITH_GNOME)
 USE_GNOME=	gnomelibs
@@ -57,7 +57,9 @@ post-patch:
 		${WRKSRC}/man/vice.1.sed > ${WRKSRC}/man/vice.1
 
 pre-install:
-	@${MKDIR} ${DOCSDIR}/images ${DOCSDIR}/plain
+	${MKDIR} ${DOCSDIR} ${PREFIX}/lib/vice/fonts
+	${INSTALL_DATA} ${WRKSRC}/data/fonts/vice-cbm.bdf \
+		${PREFIX}/lib/vice/fonts/
 
 post-install:
 	@${LN} -sf vice_toc.html ${DOCSDIR}/index.html
diff --git a/emulators/vice/distinfo b/emulators/vice/distinfo
index 34c842ad28bc..9eaf006575b6 100644
--- a/emulators/vice/distinfo
+++ b/emulators/vice/distinfo
@@ -1 +1 @@
-MD5 (vice-1.11.tar.gz) = 580817b28097b0897e48463d4fc510aa
+MD5 (vice-1.12.tar.gz) = 2d761503025a84758b289564e390c7c8
diff --git a/emulators/vice/files/patch-ad b/emulators/vice/files/patch-ad
deleted file mode 100644
index f1cec2dd2511..000000000000
--- a/emulators/vice/files/patch-ad
+++ /dev/null
@@ -1,20 +0,0 @@
---- doc/Makefile.in.orig	Tue Jul 24 03:09:37 2001
-+++ doc/Makefile.in	Fri Nov 23 02:15:32 2001
-@@ -128,7 +128,7 @@
- xpet_LDFLAGS = @xpet_LDFLAGS@
- xvic_LDFLAGS = @xvic_LDFLAGS@
- 
--docdir = $(prefix)/lib/vice/doc
-+docdir = $(prefix)/share/doc/vice
- 
- doc_DATA =  	64doc.txt 	Evaluation 	PETdoc.txt 	Readme.beos 	Readme.dos 	Win32-Howto.txt 	cbm_basic_tokens.txt 	drive_info.txt 	mon.txt 	serial.txt
- 
-@@ -176,7 +176,7 @@
- .texi.info:
- 	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
- 	cd $(srcdir) \
--	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
-+	  && $(MAKEINFO) --no-split `echo $< | sed 's,.*/,,'`
- 
- .texi.dvi:
- 	TEXINPUTS=.:$$TEXINPUTS \
diff --git a/emulators/vice/files/patch-ae b/emulators/vice/files/patch-ae
deleted file mode 100644
index 97caf9b562e0..000000000000
--- a/emulators/vice/files/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/html/Makefile.in.orig	Tue Nov 23 18:42:38 1999
-+++ doc/html/Makefile.in	Wed Feb  2 14:35:59 2000
-@@ -108,7 +108,7 @@
- xpet_LDFLAGS = @xpet_LDFLAGS@
- xvic_LDFLAGS = @xvic_LDFLAGS@
- 
--docdir = $(prefix)/lib/vice/doc
-+docdir = $(prefix)/share/doc/vice
- 
- doc_DATA =  	vice_1.html 	vice_2.html 	vice_3.html 	vice_4.html 	vice_5.html 	vice_6.html 	vice_7.html 	vice_8.html 	vice_9.html 	vice_10.html 	vice_11.html 	vice_12.html 	vice_13.html 	vice_14.html 	vice_15.html 	vice_16.html 	vice_toc.html
- 
diff --git a/emulators/vice/files/patch-doc-Makefile.in b/emulators/vice/files/patch-doc-Makefile.in
new file mode 100644
index 000000000000..a81b32fc1d90
--- /dev/null
+++ b/emulators/vice/files/patch-doc-Makefile.in
@@ -0,0 +1,11 @@
+--- doc/Makefile.in.orig	Mon Jun  9 00:09:03 2003
++++ doc/Makefile.in	Sun Jun 15 09:24:28 2003
+@@ -216,7 +216,7 @@
+ xpet_LDFLAGS = @xpet_LDFLAGS@
+ xplus4_LDFLAGS = @xplus4_LDFLAGS@
+ xvic_LDFLAGS = @xvic_LDFLAGS@
+-docdir = $(prefix)/lib/vice/doc
++docdir = $(prefix)/share/doc/vice
+ 
+ doc_DATA = \
+ 	NLS-Howto.txt \
diff --git a/emulators/vice/files/patch-doc-html-Makefile.in b/emulators/vice/files/patch-doc-html-Makefile.in
new file mode 100644
index 000000000000..227f493a5ee0
--- /dev/null
+++ b/emulators/vice/files/patch-doc-html-Makefile.in
@@ -0,0 +1,11 @@
+--- doc/html/Makefile.in.orig	Mon Jun  9 00:09:03 2003
++++ doc/html/Makefile.in	Sun Jun 15 09:31:57 2003
+@@ -216,7 +216,7 @@
+ xpet_LDFLAGS = @xpet_LDFLAGS@
+ xplus4_LDFLAGS = @xplus4_LDFLAGS@
+ xvic_LDFLAGS = @xvic_LDFLAGS@
+-docdir = $(prefix)/lib/vice/doc
++docdir = $(prefix)/share/doc/vice
+ 
+ doc_DATA = \
+ 	images/navbarlogo.gif \
diff --git a/emulators/vice/files/patch-sound b/emulators/vice/files/patch-sound
index b9fda5f9b5cc..ad9c2774df87 100644
--- a/emulators/vice/files/patch-sound
+++ b/emulators/vice/files/patch-sound
@@ -1,108 +1,89 @@
---- configure.orig	Mon Jan 20 19:45:51 2003
-+++ configure	Fri Feb 14 03:16:36 2003
-@@ -2587,7 +2587,7 @@
+--- configure.orig	Mon Jun  9 00:09:09 2003
++++ configure	Sun Jun 15 09:49:49 2003
+@@ -5504,7 +5504,7 @@
  fi
  
  if test x"$with_sdl" = "xyes"; then
 -	for ac_prog in sdl-config
 +	for ac_prog in sdl11-config
  do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
-@@ -3906,7 +3906,7 @@
- 	SOUND_DRIVERS="$SOUND_DRIVERS soundsdl.o"
- fi
+@@ -9255,7 +9255,7 @@
+ 
  
--for ac_hdr in linux/soundcard.h machine/soundcard.h
-+for ac_hdr in linux/soundcard.h machine/soundcard.h sys/soundcard.h
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-@@ -4039,7 +4039,7 @@
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+ac_try="$ac_cpp `esd-config --cflags` conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:4044: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-@@ -4068,7 +4068,7 @@
  
+-for ac_header in linux/soundcard.h machine/soundcard.h
++for ac_header in linux/soundcard.h machine/soundcard.h sys/soundcard.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+@@ -9825,7 +9825,7 @@
  
  if test x"$with_sdl" = "xyes"; then
--  for ac_hdr in SDL/SDL_audio.h
-+  for ac_hdr in SDL_audio.h
+ 
+-for ac_header in SDL/SDL_audio.h
++for ac_header in SDL_audio.h
  do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-@@ -4081,7 +4081,7 @@
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+ac_try="$ac_cpp `sdl11-config --cflags` conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:4086: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-@@ -4342,7 +4342,7 @@
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+@@ -10625,7 +10625,6 @@
  fi
  
  if test x"$with_sdl" = "xyes"; then
 -	LIBS="$LIBS `sdl-config --libs`"
-+	LIBS="$LIBS `sdl11-config --libs`"
- 	echo $ac_n "checking for SDL_OpenAudio in -lSDL""... $ac_c" 1>&6
- echo "configure:4348: checking for SDL_OpenAudio in -lSDL" >&5
- ac_lib_var=`echo SDL'_'SDL_OpenAudio | sed 'y%./+-%__p_%'`
-@@ -4350,7 +4350,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
+ 
+ echo "$as_me:$LINENO: checking for SDL_OpenAudio in -lSDL" >&5
+ echo $ECHO_N "checking for SDL_OpenAudio in -lSDL... $ECHO_C" >&6
+@@ -10633,7 +10632,8 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-   ac_save_LIBS="$LIBS"
+   ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lSDL $SOUND_LIBS $LIBS"
-+LIBS="$SOUND_LIBS $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 4356 "configure"
- #include "confdefs.h"
-@@ -4384,7 +4384,8 @@
- #define $ac_tr_lib 1
- EOF
++LIBS="`sdl11-config --libs` $SOUND_LIBS $LIBS"
++CPPFLAGS="`sld11-config --cflags` $CPPFLAGS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h.  */
+@@ -10686,7 +10686,7 @@
+ #define HAVE_LIBSDL 1
+ _ACEOF
  
 -  LIBS="-lSDL $LIBS"
 +  LIBS="`sdl11-config --libs` $LIBS"
-+  CPPFLAGS="`sdl11-config --cflags` $CPPFLAGS"
  
+ fi
+ 
+@@ -10827,7 +10827,8 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-   echo "$ac_t""no" 1>&6
-@@ -4493,7 +4494,8 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
+   ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lesd $SOUND_LIBS $LIBS"
 +LIBS="`esd-config --libs` $SOUND_LIBS $LIBS"
 +CPPFLAGS="`esd-config --cflags` $CPPFLAGS"
- cat > conftest.$ac_ext <<EOF
- #line 4499 "configure"
- #include "confdefs.h"
-@@ -4527,7 +4529,7 @@
- #define $ac_tr_lib 1
- EOF
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h.  */
+@@ -10880,7 +10881,7 @@
+ #define HAVE_LIBESD 1
+ _ACEOF
  
 -  LIBS="-lesd $LIBS"
 +  LIBS="`esd-config --libs` $LIBS"
  
- else
-   echo "$ac_t""no" 1>&6
---- src/config.h.in.orig	Sat Jan 18 13:12:15 2003
-+++ src/config.h.in	Fri Feb 14 03:24:18 2003
-@@ -229,6 +229,9 @@
- /* Define if you have the <machine/soundcard.h> header file.  */
+ fi
+ 
+--- src/config.h.in.orig	Mon Jun  9 00:09:47 2003
++++ src/config.h.in	Sun Jun 15 09:35:16 2003
+@@ -200,6 +200,9 @@
+ /* Define to 1 if you have the <machine/soundcard.h> header file. */
  #undef HAVE_MACHINE_SOUNDCARD_H
  
-+/* Define if you have the <sys/soundcard.h> header file.  */
++/* Define to 1 if you have the <sys/soundcard.h> header file.  */
 +#undef HAVE_SYS_SOUNDCARD_H
 +
- /* Define if you have the <midasdll.h> header file.  */
- #undef HAVE_MIDASDLL_H
+ /* Define to 1 if you have the `memmove' function. */
+ #undef HAVE_MEMMOVE
  
 --- src/sound.c.orig	Sat Jan 11 16:38:57 2003
 +++ src/sound.c	Fri Feb 14 03:21:39 2003
diff --git a/emulators/vice/pkg-plist b/emulators/vice/pkg-plist
index b0d8208a7365..e18489f16fb3 100644
--- a/emulators/vice/pkg-plist
+++ b/emulators/vice/pkg-plist
@@ -10,14 +10,23 @@ bin/xvic
 @unexec install-info --delete %D/info/vice.info %D/info/dir
 info/vice.info
 @exec install-info %D/info/vice.info %D/info/dir
-lib/vice/C128/basic
 lib/vice/C128/basic64
+lib/vice/C128/basichi
+lib/vice/C128/basiclo
 lib/vice/C128/beos_pos.vkm
 lib/vice/C128/beos_sym.vkm
 lib/vice/C128/c64s.vpl
 lib/vice/C128/ccs64.vpl
-lib/vice/C128/charg64
+lib/vice/C128/chargde
 lib/vice/C128/chargen
+lib/vice/C128/chargfr
+lib/vice/C128/chargse
+lib/vice/C128/kernalde
+lib/vice/C128/kernalfi
+lib/vice/C128/kernalfr
+lib/vice/C128/kernalit
+lib/vice/C128/kernalno
+lib/vice/C128/kernalse
 lib/vice/C128/default.vpl
 lib/vice/C128/default.vrs
 lib/vice/C128/dos_pos.vkm
@@ -34,7 +43,6 @@ lib/vice/C128/win_pos.vkm
 lib/vice/C128/win_sym.vkm
 lib/vice/C128/x11_pos.vkm
 lib/vice/C128/x11_sym.vkm
-lib/vice/C128/z80bios
 lib/vice/C64/basic
 lib/vice/C64/beos_pos.vkm
 lib/vice/C64/beos_sym.vkm
@@ -163,15 +171,25 @@ lib/vice/VIC20/win_pos.vkm
 lib/vice/VIC20/win_sym.vkm
 lib/vice/VIC20/x11_pos.vkm
 lib/vice/VIC20/x11_sym.vkm
-lib/vice/fonts/cbm-directory-charset.fon
 lib/vice/fonts/fonts.dir
 lib/vice/fonts/vice-cbm.pcf
+share/doc/vice/64doc.txt
+share/doc/vice/BUGS
+share/doc/vice/COPYING
+share/doc/vice/NEWS
 share/doc/vice/NLS-Howto.txt
+share/doc/vice/PETdoc.txt
 share/doc/vice/Readme.beos
 share/doc/vice/Readme.dos
+share/doc/vice/TODO
 share/doc/vice/Win32-Howto.txt
+share/doc/vice/cbm_basic_tokens.txt
+share/doc/vice/drive_info.txt
 share/doc/vice/index.html
 share/doc/vice/mon.txt
+share/doc/vice/navbarlogo.gif
+share/doc/vice/new.gif
+share/doc/vice/serial.txt
 share/doc/vice/vice_1.html
 share/doc/vice/vice_10.html
 share/doc/vice/vice_11.html
@@ -189,21 +207,8 @@ share/doc/vice/vice_7.html
 share/doc/vice/vice_8.html
 share/doc/vice/vice_9.html
 share/doc/vice/vice_toc.html
-share/doc/vice/images/navbarlogo.gif
-share/doc/vice/images/new.gif
-share/doc/vice/images/vice-logo.jpg
-share/doc/vice/images/vice-sublogo.jpg
-share/doc/vice/plain/64doc.txt
-share/doc/vice/plain/BUGS
-share/doc/vice/plain/COPYING
-share/doc/vice/plain/NEWS
-share/doc/vice/plain/PETdoc.txt
-share/doc/vice/plain/TODO
-share/doc/vice/plain/cbm_basic_tokens.txt
-share/doc/vice/plain/drive_info.txt
-share/doc/vice/plain/serial.txt
-@dirrm share/doc/vice/plain
-@dirrm share/doc/vice/images
+share/doc/vice/vice-logo.jpg
+share/doc/vice/vice-sublogo.jpg
 @dirrm share/doc/vice
 @dirrm lib/vice/VIC20
 @dirrm lib/vice/PLUS4