9 files changed, 35 insertions, 103 deletions

diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index fbc0cfc7598d..997d2c5c3307 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -5,11 +5,10 @@
 # $FreeBSD$
 
 PORTNAME=	vice
-PORTVERSION=	1.21
-PORTREVISION=	2
+PORTVERSION=	1.22
 CATEGORIES=	emulators
-MASTER_SITES=	http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/ \
-		http://fresh.t-systems-sfr.com/linux/src/ \
+MASTER_SITES=	http://www.viceteam.org/online/ \
+		http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/ \
 		ftp://ftp.zimmers.net/pub/cbm/crossplatform/emulators/VICE/
 PKGNAMESUFFIX?=	${GNOME_SUFFIX}${PKGNAMESUFFIX2}
 
@@ -79,13 +78,12 @@ PLIST_SUB+=		NLS="@comment "
 .if !defined(WITHOUT_SDL)
 USE_SDL=		sdl
 CONFIGURE_ARGS+=	--with-sdl
-CFLAGS+=		-DHAVE_LIBSDL=1 -DHAVE_SDL_SDL_AUDIO_H=1
-CPPFLAGS+=		-I${LOCALBASE}/include/SDL11
+CPPFLAGS+=		-I${LOCALBASE}/include/SDL
 .endif
 
 .if defined(WITH_ESOUND)
 LIB_DEPENDS+=		esd.2:${PORTSDIR}/audio/esound
-CFLAGS+=		-DHAVE_LIBESD=1 -DHAVE_SDL_SDL_AUDIO_H=1
+CONFIGURE_ARGS+=	--with-esd
 .else
 CONFIGURE_ARGS+=	--without-esd
 .endif
@@ -101,8 +99,6 @@ post-extract:
 post-patch:
 	${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \
 		${WRKSRC}/man/vice.1
-	${REINPLACE_CMD} -e "s|machine/joystick.h|sys/joystick.h|g" \
-		${WRKSRC}/configure
 .if defined(NOPORTDOCS)
 	${REINPLACE_CMD} -e 's| doc||' ${WRKSRC}/Makefile.in
 .endif
diff --git a/emulators/vice/distinfo b/emulators/vice/distinfo
index af18f24dcd06..7cc1f3a43e38 100644
--- a/emulators/vice/distinfo
+++ b/emulators/vice/distinfo
@@ -1,3 +1,3 @@
-MD5 (vice-1.21.tar.gz) = 913bdee9d59d154ed33ef4e037d8a12c
-SHA256 (vice-1.21.tar.gz) = 511ed35e6692f68e8b58ea3d040af6428239859e31eef9d99b6187a166373389
-SIZE (vice-1.21.tar.gz) = 5725833
+MD5 (vice-1.22.tar.gz) = 33204acbb74bafb12594d39b55888626
+SHA256 (vice-1.22.tar.gz) = cd45ce3eea98ce70ae03002a4d02bb3188c982ee7fb7435ac8777bc8a780ef01
+SIZE (vice-1.22.tar.gz) = 6088483
diff --git a/emulators/vice/files/patch-af b/emulators/vice/files/patch-af
deleted file mode 100644
index 6a69c94aa23c..000000000000
--- a/emulators/vice/files/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/arch/unix/archdep.h.orig	Tue Nov 16 10:19:50 1999
-+++ src/arch/unix/archdep.h	Wed Feb  2 15:17:12 2000
-@@ -52,7 +52,7 @@
- 
- /* Define the default system directory (where the ROMs are).  */
- #define LIBDIR          PREFIX "/lib/vice"
--#define DOCDIR          LIBDIR "/doc"
-+#define DOCDIR          PREFIX "/share/doc/vice"
- #define VICEUSERDIR     ".vice"
- 
- extern const char *archdep_home_path(void);
diff --git a/emulators/vice/files/patch-doc-Makefile.in b/emulators/vice/files/patch-doc-Makefile.in
deleted file mode 100644
index 57ec9747d874..000000000000
--- a/emulators/vice/files/patch-doc-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/Makefile.in.orig	Sun Mar  4 23:06:04 2007
-+++ doc/Makefile.in	Tue Mar 13 12:54:27 2007
-@@ -295,7 +295,7 @@
- xpet_LDFLAGS = @xpet_LDFLAGS@
- xplus4_LDFLAGS = @xplus4_LDFLAGS@
- xvic_LDFLAGS = @xvic_LDFLAGS@
--docdir = $(VICEDIR)/doc
-+docdir = $(prefix)/share/doc/vice
- doc_DATA = \
- 	Minix-Howto.txt \
- 	MSDOS-Ethernet-Howto.txt \
diff --git a/emulators/vice/files/patch-doc-html-Makefile.in b/emulators/vice/files/patch-doc-html-Makefile.in
deleted file mode 100644
index 62e2d5da4361..000000000000
--- a/emulators/vice/files/patch-doc-html-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/html/Makefile.in.orig	Sun Mar  4 23:06:04 2007
-+++ doc/html/Makefile.in	Tue Mar 13 12:55:43 2007
-@@ -274,7 +274,7 @@
- xpet_LDFLAGS = @xpet_LDFLAGS@
- xplus4_LDFLAGS = @xplus4_LDFLAGS@
- xvic_LDFLAGS = @xvic_LDFLAGS@
--docdir = $(VICEDIR)/doc
-+docdir = $(prefix)/share/doc/vice
- doc_DATA = \
- 	amigaos.html \
- 	beos.html \
diff --git a/emulators/vice/files/patch-joy.c b/emulators/vice/files/patch-joy.c
deleted file mode 100644
index a6dbfc692f59..000000000000
--- a/emulators/vice/files/patch-joy.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/arch/unix/joy.c.orig	Tue Feb 20 10:11:02 2007
-+++ src/arch/unix/joy.c	Tue Feb 20 10:11:13 2007
-@@ -117,7 +117,7 @@
- #endif
- 
- #elif defined(BSD_JOYSTICK)
--#include <machine/joystick.h>
-+#include <sys/joystick.h>
- #define JS_DATA_TYPE joystick
- #define JS_RETURN    sizeof(struct joystick)
- int     use_old_api=1;
diff --git a/emulators/vice/files/patch-joy_usb.c b/emulators/vice/files/patch-joy_usb.c
deleted file mode 100644
index 49f4327cdd7c..000000000000
--- a/emulators/vice/files/patch-joy_usb.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/arch/unix/joy_usb.c.orig	Tue Feb 20 10:11:57 2007
-+++ src/arch/unix/joy_usb.c	Tue Feb 20 10:12:37 2007
-@@ -50,6 +50,7 @@
- 
- extern log_t joystick_log;
- 
-+#include <sys/ioccom.h>
- #include <dev/usb/usb.h>
- #include <dev/usb/usbhid.h>
- #include <errno.h>
diff --git a/emulators/vice/files/patch-xorg b/emulators/vice/files/patch-xorg
deleted file mode 100644
index 6ced0d1e1e33..000000000000
--- a/emulators/vice/files/patch-xorg
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/arch/unix/x11/xaw/uicolor.c  2003-06-24 15:17:32.000000000 +0200
-+++ vice-1.20.pigi4/src/arch/unix/x11/xaw/uicolor.c       2007-04-08 22:58:25.000000000 +0200
-@@ -121,7 +121,7 @@
-     /* This is a kludge to map pixels to zimage values. Is there a better
-        way to do this? //tvr */
-     im = XCreateImage(display, visual, x11ui_get_display_depth(),
--                      ZPixmap, 0, (char *)data, 1, 1, 8, 1);
-+                      ZPixmap, 0, (char *)data, 1, 1, 8, 0);
-     if (!im) {
-         log_error(LOG_DEFAULT, _("XCreateImage failed."));
-         free(data);
---- src/arch/unix/x11/gnome/uicolor.c        2006-07-22 18:28:40.000000000 +0200
-+++ vice-1.20.pigi4/src/arch/unix/x11/gnome/uicolor.c     2007-04-08 22:58:26.000000000 +0200
-@@ -167,7 +167,7 @@
-        way to do this? //tvr */
-     im = XCreateImage(display, GDK_VISUAL_XVISUAL(visual),
-                       x11ui_get_display_depth(),
--                      ZPixmap, 0, (char *)data, 1, 1, 8, 1);
-+                      ZPixmap, 0, (char *)data, 1, 1, 8, 0);
-     if (!im) {
-         log_error(LOG_DEFAULT, _("XCreateImage failed."));
-         free(data);
diff --git a/emulators/vice/pkg-plist b/emulators/vice/pkg-plist
index aec78b1f38ff..f9c74748028b 100644
--- a/emulators/vice/pkg-plist
+++ b/emulators/vice/pkg-plist
@@ -15,8 +15,9 @@ bin/xvic
 %%NLS%%share/locale/nl/LC_MESSAGES/vice.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/vice.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/vice.mo
-lib/vice/C128/amiga_sym.vkm
+lib/vice/C128/ROdflt.vkm
 lib/vice/C128/amiga_pos.vkm
+lib/vice/C128/amiga_sym.vkm
 lib/vice/C128/basic64
 lib/vice/C128/basichi
 lib/vice/C128/basiclo
@@ -29,12 +30,6 @@ 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
@@ -43,7 +38,15 @@ lib/vice/C128/frodo.vpl
 lib/vice/C128/godot.vpl
 lib/vice/C128/kernal
 lib/vice/C128/kernal64
+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/os2.vkm
+lib/vice/C128/osx_pos.vkm
+lib/vice/C128/osx_sym.vkm
 lib/vice/C128/pc64.vpl
 lib/vice/C128/vdc_deft.vpl
 lib/vice/C128/vice.vpl
@@ -51,8 +54,9 @@ 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/C64/amiga_sym.vkm
+lib/vice/C64/ROdflt.vkm
 lib/vice/C64/amiga_pos.vkm
+lib/vice/C64/amiga_sym.vkm
 lib/vice/C64/basic
 lib/vice/C64/beos_pos.vkm
 lib/vice/C64/beos_sym.vkm
@@ -70,6 +74,8 @@ lib/vice/C64/godot.vpl
 lib/vice/C64/kernal
 lib/vice/C64/os2.vkm
 lib/vice/C64/os2_sym.vkm
+lib/vice/C64/osx_pos.vkm
+lib/vice/C64/osx_sym.vkm
 lib/vice/C64/pc64.vpl
 lib/vice/C64/vice.vpl
 lib/vice/C64/win_pos.vkm
@@ -77,6 +83,7 @@ lib/vice/C64/win_sym_de.vkm
 lib/vice/C64/win_sym_us.vkm
 lib/vice/C64/x11_pos.vkm
 lib/vice/C64/x11_sym.vkm
+lib/vice/CBM-II/ROdflt.vkm
 lib/vice/CBM-II/amber.vpl
 lib/vice/CBM-II/amiga_bukp.vkm
 lib/vice/CBM-II/amiga_buks.vkm
@@ -85,8 +92,8 @@ lib/vice/CBM-II/basic.256
 lib/vice/CBM-II/basic.500
 lib/vice/CBM-II/beos_bukp.vkm
 lib/vice/CBM-II/beos_buks.vkm
-lib/vice/CBM-II/c64s.vpl
 lib/vice/CBM-II/c64hq.vpl
+lib/vice/CBM-II/c64s.vpl
 lib/vice/CBM-II/ccs64.vpl
 lib/vice/CBM-II/chargen.500
 lib/vice/CBM-II/chargen.600
@@ -111,17 +118,19 @@ lib/vice/CBM-II/win_pos_uk.vkm
 lib/vice/CBM-II/win_sym_uk.vkm
 lib/vice/CBM-II/x11_buks.vkm
 lib/vice/DRIVES/d1541II
+lib/vice/DRIVES/d1571cr
 lib/vice/DRIVES/dos1001
 lib/vice/DRIVES/dos1541
 lib/vice/DRIVES/dos1551
 lib/vice/DRIVES/dos1570
 lib/vice/DRIVES/dos1571
-lib/vice/DRIVES/d1571cr
 lib/vice/DRIVES/dos1581
 lib/vice/DRIVES/dos2031
 lib/vice/DRIVES/dos2040
 lib/vice/DRIVES/dos3040
 lib/vice/DRIVES/dos4040
+lib/vice/PET/RObusi.vkm
+lib/vice/PET/ROgrph.vkm
 lib/vice/PET/amber.vpl
 lib/vice/PET/amiga_bgrs.vkm
 lib/vice/PET/amiga_buks.vkm
@@ -159,10 +168,11 @@ lib/vice/PET/x11_bdep.vkm
 lib/vice/PET/x11_bdes.vkm
 lib/vice/PET/x11_bgrs.vkm
 lib/vice/PET/x11_buks.vkm
+lib/vice/PLUS4/ROdflt.vkm
 lib/vice/PLUS4/3plus1hi
 lib/vice/PLUS4/3plus1lo
-lib/vice/PLUS4/amiga_sym.vkm
 lib/vice/PLUS4/amiga_pos.vkm
+lib/vice/PLUS4/amiga_sym.vkm
 lib/vice/PLUS4/basic
 lib/vice/PLUS4/beos_pos.vkm
 lib/vice/PLUS4/beos_sym.vkm
@@ -178,12 +188,13 @@ lib/vice/PLUS4/win_sym.vkm
 lib/vice/PLUS4/x11_pos.vkm
 lib/vice/PLUS4/x11_sym.vkm
 lib/vice/PRINTER/cbm1526
-lib/vice/PRINTER/nl10-cbm
 lib/vice/PRINTER/mps801
 lib/vice/PRINTER/mps803
 lib/vice/PRINTER/mps803.vpl
-lib/vice/VIC20/amiga_sym.vkm
+lib/vice/PRINTER/nl10-cbm
+lib/vice/VIC20/ROdflt.vkm
 lib/vice/VIC20/amiga_pos.vkm
+lib/vice/VIC20/amiga_sym.vkm
 lib/vice/VIC20/basic
 lib/vice/VIC20/beos_pos.vkm
 lib/vice/VIC20/beos_sym.vkm
@@ -222,6 +233,7 @@ lib/vice/fonts/vice-cbm.pcf
 %%PORTDOCS%%%%DOCSDIR%%/drive_info.txt
 %%PORTDOCS%%%%DOCSDIR%%/iec-bus.txt
 %%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/macosx.html
 %%PORTDOCS%%%%DOCSDIR%%/mon.txt
 %%PORTDOCS%%%%DOCSDIR%%/new.gif
 %%PORTDOCS%%%%DOCSDIR%%/openGLsync-howto.txt
@@ -246,13 +258,13 @@ lib/vice/fonts/vice-cbm.pcf
 %%PORTDOCS%%%%DOCSDIR%%/vice_toc.html
 %%PORTDOCS%%%%DOCSDIR%%/vice-logo.jpg
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm lib/vice/fonts
 @dirrm lib/vice/VIC20
-@dirrm lib/vice/PLUS4
 @dirrm lib/vice/PRINTER
+@dirrm lib/vice/PLUS4
 @dirrm lib/vice/PET
 @dirrm lib/vice/DRIVES
 @dirrm lib/vice/CBM-II
 @dirrm lib/vice/C64
 @dirrm lib/vice/C128
-@dirrm lib/vice/fonts
 @dirrm lib/vice