pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/emulators/vice



Module Name:    pkgsrc
Committed By:   rhialto
Date:           Sat Jan  6 15:35:26 UTC 2024

Modified Files:
        pkgsrc/emulators/vice: Makefile PLIST distinfo options.mk
        pkgsrc/emulators/vice/patches:
            patch-src_arch_gtk3_data_unix_Makefile.in

Log Message:
emulators/vice: update to 3.8

Changes: too many to list; see https://vice-emu.sourceforge.io/NEWS


To generate a diff of this commit:
cvs rdiff -u -r1.178 -r1.179 pkgsrc/emulators/vice/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/emulators/vice/PLIST
cvs rdiff -u -r1.54 -r1.55 pkgsrc/emulators/vice/distinfo
cvs rdiff -u -r1.16 -r1.17 pkgsrc/emulators/vice/options.mk
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/emulators/vice/patches/patch-src_arch_gtk3_data_unix_Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/emulators/vice/Makefile
diff -u pkgsrc/emulators/vice/Makefile:1.178 pkgsrc/emulators/vice/Makefile:1.179
--- pkgsrc/emulators/vice/Makefile:1.178        Tue Nov 14 14:01:48 2023
+++ pkgsrc/emulators/vice/Makefile      Sat Jan  6 15:35:26 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.178 2023/11/14 14:01:48 wiz Exp $
+# $NetBSD: Makefile,v 1.179 2024/01/06 15:35:26 rhialto Exp $
 
-DISTNAME=      vice-3.7.1
-PKGREVISION=   6
+DISTNAME=      vice-3.8
 CATEGORIES=    emulators
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=vice-emu/}
 
@@ -21,7 +20,7 @@ USE_LANGUAGES=                c c++11
 USE_TOOLS+=            bash gmake pkg-config perl flex yacc
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --enable-ethernet
-CONFIGURE_ARGS+=       --enable-lame
+CONFIGURE_ARGS+=       --with-lame
 CONFIGURE_ARGS+=       --with-fastsid
 CONFIGURE_ARGS+=       --with-flac
 CONFIGURE_ARGS+=       --with-gif
@@ -29,6 +28,13 @@ CONFIGURE_ARGS+=     --with-mpg123
 CONFIGURE_ARGS+=       --with-png
 CONFIGURE_ARGS+=       --with-vorbis
 CONFIGURE_ARGS+=       --with-zlib
+CONFIGURE_ARGS+=       --with-fastsid
+CONFIGURE_ARGS+=       --with-libcurl
+CONFIGURE_ARGS+=       --without-libieee1284
+CONFIGURE_ARGS+=       --disable-hardsid
+CONFIGURE_ARGS+=       --disable-parsid
+CONFIGURE_ARGS+=       --disable-catweasel
+CONFIGURE_ARGS+=       --disable-midi
 CONFIGURE_ARGS.NetBSD+=        --with-sun
 CONFIGURE_ARGS.NetBSD+=        --without-oss
 
@@ -72,5 +78,6 @@ post-install:
 .include "../../graphics/giflib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../net/libpcap/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
 .include "../../mk/readline.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/emulators/vice/PLIST
diff -u pkgsrc/emulators/vice/PLIST:1.34 pkgsrc/emulators/vice/PLIST:1.35
--- pkgsrc/emulators/vice/PLIST:1.34    Sat Dec 31 18:30:00 2022
+++ pkgsrc/emulators/vice/PLIST Sat Jan  6 15:35:26 2024
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.34 2022/12/31 18:30:00 rhialto Exp $
+@comment $NetBSD: PLIST,v 1.35 2024/01/06 15:35:26 rhialto Exp $
 bin/c1541
 bin/cartconv
 bin/petcat
 bin/vsid
 bin/x128
-${PLIST.x64}bin/x64
+bin/x64
 bin/x64dtv
 bin/x64sc
 bin/xcbm2
@@ -25,23 +25,8 @@ ${PLIST.desktop}share/applications/vice-
 ${PLIST.desktop}share/applications/vice-org-xscpu64.desktop
 ${PLIST.desktop}share/applications/vice-org-xvic.desktop
 ${PLIST.desktop}share/desktop-directories/vice-org-vice-org.directory
-share/doc/vice/CIA-README.txt
-share/doc/vice/Documentation-Howto.txt
-share/doc/vice/Doxygen-Howto.txt
-share/doc/vice/FreeBSD-GTK3-Howto.txt
-share/doc/vice/GTK3-Fedora-cross-build-setup.md
-share/doc/vice/GTK3-cross-build-setup.md
-share/doc/vice/GTK3-debian-frankenvice.md
-share/doc/vice/Linux-GTK3-Howto.txt
-share/doc/vice/NetBSD-GTK3-Howto.txt
-share/doc/vice/NetBSD-howto.txt
-share/doc/vice/OpenBSD-GTK3-Howto.txt
-share/doc/vice/Readme-SDL.txt
-share/doc/vice/Readme-SDL2.txt
-share/doc/vice/Release-Howto.txt
-share/doc/vice/SDL-Howto.txt
-share/doc/vice/Windows-MinGW-GTK3-Howto.txt
-share/doc/vice/coding-guidelines.txt
+${PLIST.sdl1}share/doc/vice/Readme-SDL.txt
+${PLIST.sdl2}share/doc/vice/Readme-SDL2.txt
 share/doc/vice/html/COPYING
 share/doc/vice/html/fonts/Lato-Bold.eot
 share/doc/vice/html/fonts/Lato-Bold.ttf
@@ -61,51 +46,42 @@ share/doc/vice/html/fonts/Lato-Regular.w
 share/doc/vice/html/fonts/Lato-Regular.woff2
 share/doc/vice/html/fonts/OFL.txt
 share/doc/vice/html/images/CIPS2008.png
-share/doc/vice/html/images/c128-layout-small.png
+share/doc/vice/html/images/c116-layout.png
 share/doc/vice/html/images/c128-layout.png
-share/doc/vice/html/images/c64-layout-small.png
+share/doc/vice/html/images/c16-layout.png
 share/doc/vice/html/images/c64-layout.png
+share/doc/vice/html/images/cbm2-layout.png
 share/doc/vice/html/images/new.gif
-share/doc/vice/html/images/pet-business-uk-layout-small.png
 share/doc/vice/html/images/pet-business-uk-layout.png
-share/doc/vice/html/images/pet-chiclet-layout-small.png
 share/doc/vice/html/images/pet-chiclet-layout.png
-share/doc/vice/html/images/pet-graphical-layout-small.png
 share/doc/vice/html/images/pet-graphical-layout.png
-share/doc/vice/html/images/vice-c128-positional-keymap-de-small.png
+share/doc/vice/html/images/plus4-layout.png
 share/doc/vice/html/images/vice-c128-positional-keymap-de.png
-share/doc/vice/html/images/vice-c128-positional-keymap-us-small.png
 share/doc/vice/html/images/vice-c128-positional-keymap-us.png
-share/doc/vice/html/images/vice-c128-symbolic-keymap-de-small.png
 share/doc/vice/html/images/vice-c128-symbolic-keymap-de.png
-share/doc/vice/html/images/vice-c128-symbolic-keymap-us-small.png
 share/doc/vice/html/images/vice-c128-symbolic-keymap-us.png
-share/doc/vice/html/images/vice-c64-positional-keymap-de-small.png
 share/doc/vice/html/images/vice-c64-positional-keymap-de.png
-share/doc/vice/html/images/vice-c64-positional-keymap-us-small.png
 share/doc/vice/html/images/vice-c64-positional-keymap-us.png
-share/doc/vice/html/images/vice-c64-symbolic-keymap-de-small.png
 share/doc/vice/html/images/vice-c64-symbolic-keymap-de.png
-share/doc/vice/html/images/vice-c64-symbolic-keymap-us-small.png
 share/doc/vice/html/images/vice-c64-symbolic-keymap-us.png
+share/doc/vice/html/images/vice-cbm2-positional-keymap-de.png
+share/doc/vice/html/images/vice-cbm2-positional-keymap-us.png
+share/doc/vice/html/images/vice-cbm2-symbolic-keymap-de.png
+share/doc/vice/html/images/vice-cbm2-symbolic-keymap-us.png
 share/doc/vice/html/images/vice-logo-black.png
 share/doc/vice/html/images/vice-logo.svg
-share/doc/vice/html/images/vice-pet-business-uk-positional-keymap-de-small.png
 share/doc/vice/html/images/vice-pet-business-uk-positional-keymap-de.png
-share/doc/vice/html/images/vice-pet-business-uk-positional-keymap-us-small.png
 share/doc/vice/html/images/vice-pet-business-uk-positional-keymap-us.png
-share/doc/vice/html/images/vice-pet-business-uk-symbolic-keymap-de-small.png
 share/doc/vice/html/images/vice-pet-business-uk-symbolic-keymap-de.png
-share/doc/vice/html/images/vice-pet-business-uk-symbolic-keymap-us-small.png
 share/doc/vice/html/images/vice-pet-business-uk-symbolic-keymap-us.png
-share/doc/vice/html/images/vice-pet-graphical-positional-keymap-de-small.png
 share/doc/vice/html/images/vice-pet-graphical-positional-keymap-de.png
-share/doc/vice/html/images/vice-pet-graphical-positional-keymap-us-small.png
 share/doc/vice/html/images/vice-pet-graphical-positional-keymap-us.png
-share/doc/vice/html/images/vice-pet-graphical-symbolic-keymap-de-small.png
 share/doc/vice/html/images/vice-pet-graphical-symbolic-keymap-de.png
-share/doc/vice/html/images/vice-pet-graphical-symbolic-keymap-us-small.png
 share/doc/vice/html/images/vice-pet-graphical-symbolic-keymap-us.png
+share/doc/vice/html/images/vice-plus4-positional-keymap-de.png
+share/doc/vice/html/images/vice-plus4-positional-keymap-us.png
+share/doc/vice/html/images/vice-plus4-symbolic-keymap-de.png
+share/doc/vice/html/images/vice-plus4-symbolic-keymap-us.png
 share/doc/vice/html/latofonts.css
 share/doc/vice/html/vice.css
 share/doc/vice/html/vice_1.html
@@ -133,11 +109,6 @@ share/doc/vice/html/vice_8.html
 share/doc/vice/html/vice_9.html
 share/doc/vice/html/vice_foot.html
 share/doc/vice/html/vice_toc.html
-share/doc/vice/iec-bus.txt
-share/doc/vice/macOS-Distribution-Howto.txt
-share/doc/vice/macOS-Howto.txt
-share/doc/vice/macOS-Xcode-Howto.txt
-share/doc/vice/vice.texi
 share/vice/C128/basic64-901226-01.bin
 share/vice/C128/basichi-318019-04.bin
 share/vice/C128/basiclo-318018-04.bin
@@ -147,6 +118,7 @@ share/vice/C128/ccs64.vpl
 share/vice/C128/chargen-315079-01.bin
 share/vice/C128/chargen-325078-02.bin
 share/vice/C128/chargen-325167-01.bin
+share/vice/C128/chargen-325167-02.bin
 share/vice/C128/chargen-325173-01D.bin
 share/vice/C128/chargen-325181-01.bin
 share/vice/C128/chargen-390059-01.bin
@@ -157,8 +129,8 @@ share/vice/C128/deekay.vpl
 share/vice/C128/default.vrs
 share/vice/C128/frodo.vpl
 share/vice/C128/godot.vpl
-${PLIST.gtk}share/vice/C128/gtk3-hotkeys-mac.vhk
-${PLIST.gtk}share/vice/C128/gtk3-hotkeys.vhk
+${PLIST.gtk}share/vice/C128/gtk3_keyrahv3.vkm
+${PLIST.gtk}share/vice/C128/gtk3_keyrahv3_de.vkm
 ${PLIST.gtk}share/vice/C128/gtk3_pos.vkm
 ${PLIST.gtk}share/vice/C128/gtk3_pos_de.vkm
 ${PLIST.gtk}share/vice/C128/gtk3_pos_se.vkm
@@ -170,12 +142,20 @@ share/vice/C128/kernal-315078-03.bin
 share/vice/C128/kernal-318020-05.bin
 share/vice/C128/kernal-318034-01.bin
 share/vice/C128/kernal-325172-01.bin
+share/vice/C128/kernal64-325179-01.bin
+share/vice/C128/kernal64-325182-01.bin
 share/vice/C128/kernal64-901227-03.bin
 share/vice/C128/kernalfi
 share/vice/C128/kernalfr
 share/vice/C128/kernalit
 share/vice/C128/kernalno
 share/vice/C128/palette.vpl
+share/vice/C128/palette_6569R1_v1r.vpl
+share/vice/C128/palette_6569R5_v1r.vpl
+share/vice/C128/palette_8565R2_v1r.vpl
+share/vice/C128/palette_C64_amber.vpl
+share/vice/C128/palette_C64_cyan.vpl
+share/vice/C128/palette_C64_green.vpl
 share/vice/C128/pc64.vpl
 share/vice/C128/pepto-ntsc-sony.vpl
 share/vice/C128/pepto-ntsc.vpl
@@ -184,15 +164,16 @@ share/vice/C128/pepto-palold.vpl
 share/vice/C128/pixcen.vpl
 share/vice/C128/ptoing.vpl
 share/vice/C128/rgb.vpl
-${PLIST.sdl}share/vice/C128/sdl-hotkeys.vhk
 ${PLIST.sdl}share/vice/C128/sdl_pos.vkm
 ${PLIST.sdl}share/vice/C128/sdl_pos_de.vkm
 ${PLIST.sdl}share/vice/C128/sdl_sym.vkm
 ${PLIST.sdl}share/vice/C128/sdl_sym_de.vkm
 ${PLIST.sdl}share/vice/C128/sdl_sym_fr.vkm
 ${PLIST.sdl}share/vice/C128/sdl_v128.vkm
+share/vice/C128/the64.vpl
 share/vice/C128/vdc_comp.vpl
 share/vice/C128/vdc_deft.vpl
+share/vice/C128/vdc_scart.vpl
 share/vice/C128/vice.vpl
 share/vice/C64/basic-901226-01.bin
 share/vice/C64/c64hq.vpl
@@ -208,11 +189,6 @@ share/vice/C64/deekay.vpl
 share/vice/C64/default.vrs
 share/vice/C64/frodo.vpl
 share/vice/C64/godot.vpl
-${PLIST.gtk}share/vice/C64/gtk3-hotkeys-mac.vhk
-${PLIST.gtk}share/vice/C64/gtk3-hotkeys.vhk
-${PLIST.gtk}share/vice/C64/gtk3-vsid-hotkeys-mac.vhk
-${PLIST.gtk}share/vice/C64/gtk3-vsid-hotkeys.vhk
-${PLIST.gtk}share/vice/C64/gtk3-winvice-legacy.vhk
 ${PLIST.gtk}share/vice/C64/gtk3_keyrah.vkm
 ${PLIST.gtk}share/vice/C64/gtk3_keyrah_de.vkm
 ${PLIST.gtk}share/vice/C64/gtk3_pos.vkm
@@ -242,6 +218,12 @@ share/vice/C64/kernal-901227-03.bin
 share/vice/C64/kernal-901246-01.bin
 share/vice/C64/kernal-906145-02.bin
 share/vice/C64/palette.vpl
+share/vice/C64/palette_6569R1_v1r.vpl
+share/vice/C64/palette_6569R5_v1r.vpl
+share/vice/C64/palette_8565R2_v1r.vpl
+share/vice/C64/palette_C64_amber.vpl
+share/vice/C64/palette_C64_cyan.vpl
+share/vice/C64/palette_C64_green.vpl
 share/vice/C64/pc64.vpl
 share/vice/C64/pepto-ntsc-sony.vpl
 share/vice/C64/pepto-ntsc.vpl
@@ -250,8 +232,6 @@ share/vice/C64/pepto-palold.vpl
 share/vice/C64/pixcen.vpl
 share/vice/C64/ptoing.vpl
 share/vice/C64/rgb.vpl
-${PLIST.sdl}share/vice/C64/sdl-hotkeys-vsid.vhk
-${PLIST.sdl}share/vice/C64/sdl-hotkeys.vhk
 ${PLIST.sdl}share/vice/C64/sdl_joymap_ps3.vjm
 ${PLIST.sdl}share/vice/C64/sdl_joymap_thec64.vjm
 ${PLIST.sdl}share/vice/C64/sdl_keyrah.vkm
@@ -275,14 +255,13 @@ ${PLIST.sdl}share/vice/C64/sdl_sym_it.vk
 ${PLIST.sdl}share/vice/C64/sdl_sym_nl.vkm
 ${PLIST.sdl}share/vice/C64/sdl_sym_tr.vkm
 ${PLIST.sdl}share/vice/C64/sdl_sym_uk.vkm
+share/vice/C64/the64.vpl
 share/vice/C64/vice.vpl
 share/vice/C64DTV/basic-901226-01.bin
 share/vice/C64DTV/c64mem.sym
 share/vice/C64DTV/chargen-901225-01.bin
 share/vice/C64DTV/default.vrs
 share/vice/C64DTV/dtvrom.bin
-${PLIST.gtk}share/vice/C64DTV/gtk3-hotkeys-mac.vhk
-${PLIST.gtk}share/vice/C64DTV/gtk3-hotkeys.vhk
 ${PLIST.gtk}share/vice/C64DTV/gtk3_keyrah.vkm
 ${PLIST.gtk}share/vice/C64DTV/gtk3_keyrah_de.vkm
 ${PLIST.gtk}share/vice/C64DTV/gtk3_pos.vkm
@@ -305,7 +284,6 @@ ${PLIST.gtk}share/vice/C64DTV/gtk3_sym_t
 ${PLIST.gtk}share/vice/C64DTV/gtk3_sym_uk.vkm
 ${PLIST.gtk}share/vice/C64DTV/gtk3_the64_de.vkm
 share/vice/C64DTV/kernal-901227-03.bin
-${PLIST.sdl}share/vice/C64DTV/sdl-hotkeys.vhk
 ${PLIST.sdl}share/vice/C64DTV/sdl_keyrah.vkm
 ${PLIST.sdl}share/vice/C64DTV/sdl_keyrah_combian.vkm
 ${PLIST.sdl}share/vice/C64DTV/sdl_keyrah_de.vkm
@@ -344,14 +322,19 @@ share/vice/CBM-II/deekay.vpl
 share/vice/CBM-II/frodo.vpl
 share/vice/CBM-II/godot.vpl
 share/vice/CBM-II/green.vpl
-${PLIST.gtk}share/vice/CBM-II/gtk3-hotkeys-mac.vhk
-${PLIST.gtk}share/vice/CBM-II/gtk3-hotkeys.vhk
 ${PLIST.gtk}share/vice/CBM-II/gtk3_pos.vkm
+${PLIST.gtk}share/vice/CBM-II/gtk3_pos_de.vkm
 ${PLIST.gtk}share/vice/CBM-II/gtk3_sym.vkm
 ${PLIST.gtk}share/vice/CBM-II/gtk3_sym_de.vkm
 share/vice/CBM-II/kernal-901234-02.bin
 share/vice/CBM-II/kernal-901244-04a.bin
 share/vice/CBM-II/palette.vpl
+share/vice/CBM-II/palette_6569R1_v1r.vpl
+share/vice/CBM-II/palette_6569R5_v1r.vpl
+share/vice/CBM-II/palette_8565R2_v1r.vpl
+share/vice/CBM-II/palette_C64_amber.vpl
+share/vice/CBM-II/palette_C64_cyan.vpl
+share/vice/CBM-II/palette_C64_green.vpl
 share/vice/CBM-II/pc64.vpl
 share/vice/CBM-II/pepto-ntsc-sony.vpl
 share/vice/CBM-II/pepto-ntsc.vpl
@@ -365,9 +348,9 @@ share/vice/CBM-II/rom128l.vrs
 share/vice/CBM-II/rom256h.vrs
 share/vice/CBM-II/rom256l.vrs
 share/vice/CBM-II/rom500.vrs
-${PLIST.sdl}share/vice/CBM-II/sdl-hotkeys.vhk
 ${PLIST.sdl}share/vice/CBM-II/sdl_pos.vkm
 ${PLIST.sdl}share/vice/CBM-II/sdl_sym.vkm
+share/vice/CBM-II/the64.vpl
 share/vice/CBM-II/vice.vpl
 share/vice/CBM-II/white.vpl
 share/vice/DRIVES/dos1001-901887+8-01.bin
@@ -389,6 +372,7 @@ share/vice/GLSL/bicubic.frag
 share/vice/GLSL/builtin-interlaced.frag
 share/vice/GLSL/builtin.frag
 share/vice/GLSL/viewport.vert
+share/vice/PET/2001-blueish.vpl
 share/vice/PET/amber.vpl
 share/vice/PET/basic-1.901439-09-05-02-06.bin
 share/vice/PET/basic-2.901465-01-02.bin
@@ -409,8 +393,6 @@ share/vice/PET/edit-4-80-b-50Hz.901474-0
 share/vice/PET/edit-4-80-b-60Hz.901474-03.bin
 share/vice/PET/edit-4-b-noCRTC.901474-02.bin
 share/vice/PET/green.vpl
-${PLIST.gtk}share/vice/PET/gtk3-hotkeys-mac.vhk
-${PLIST.gtk}share/vice/PET/gtk3-hotkeys.vhk
 ${PLIST.gtk}share/vice/PET/gtk3_bude_pos.vkm
 ${PLIST.gtk}share/vice/PET/gtk3_bude_pos_de.vkm
 ${PLIST.gtk}share/vice/PET/gtk3_bude_sym.vkm
@@ -438,7 +420,6 @@ share/vice/PET/rom4b40.vrs
 share/vice/PET/rom4b80.vrs
 share/vice/PET/rom4g40.vrs
 share/vice/PET/romsuperpet.vrs
-${PLIST.sdl}share/vice/PET/sdl-hotkeys.vhk
 ${PLIST.sdl}share/vice/PET/sdl_buuk_pos.vkm
 ${PLIST.sdl}share/vice/PET/sdl_buuk_pos_de.vkm
 ${PLIST.sdl}share/vice/PET/sdl_buuk_sym.vkm
@@ -458,15 +439,18 @@ share/vice/PET/waterloo-f000.901898-05.b
 share/vice/PET/white.vpl
 share/vice/PLUS4/3plus1-317053-01.bin
 share/vice/PLUS4/3plus1-317054-01.bin
+share/vice/PLUS4/ITU-R_BT2020.vpl
+share/vice/PLUS4/ITU-R_BT601_CRT.vpl
+share/vice/PLUS4/ITU-R_BT709_HDTV.vpl
 share/vice/PLUS4/basic-318006-01.bin
 share/vice/PLUS4/c2lo-364.bin
 share/vice/PLUS4/colodore_ted.vpl
 share/vice/PLUS4/default.vrs
-${PLIST.gtk}share/vice/PLUS4/gtk3-hotkeys-mac.vhk
-${PLIST.gtk}share/vice/PLUS4/gtk3-hotkeys.vhk
 ${PLIST.gtk}share/vice/PLUS4/gtk3_c116_pos_it.vkm
 ${PLIST.gtk}share/vice/PLUS4/gtk3_c16_pos_it.vkm
 ${PLIST.gtk}share/vice/PLUS4/gtk3_pos.vkm
+${PLIST.gtk}share/vice/PLUS4/gtk3_pos_de.vkm
+${PLIST.gtk}share/vice/PLUS4/gtk3_pos_es.vkm
 ${PLIST.gtk}share/vice/PLUS4/gtk3_pos_it.vkm
 ${PLIST.gtk}share/vice/PLUS4/gtk3_sym.vkm
 ${PLIST.gtk}share/vice/PLUS4/gtk3_sym_de.vkm
@@ -476,7 +460,6 @@ share/vice/PLUS4/kernal-318004-01.bin
 share/vice/PLUS4/kernal-318004-05.bin
 share/vice/PLUS4/kernal-318005-05.bin
 share/vice/PLUS4/kernal-364.bin
-${PLIST.sdl}share/vice/PLUS4/sdl-hotkeys.vhk
 ${PLIST.sdl}share/vice/PLUS4/sdl_pos.vkm
 ${PLIST.sdl}share/vice/PLUS4/sdl_pos_fr.vkm
 ${PLIST.sdl}share/vice/PLUS4/sdl_sym.vkm
@@ -484,9 +467,13 @@ ${PLIST.sdl}share/vice/PLUS4/sdl_sym_de.
 share/vice/PLUS4/yape-ntsc.vpl
 share/vice/PLUS4/yape-pal.vpl
 share/vice/PRINTER/1520.vpl
+share/vice/PRINTER/2022-901472-04.bin
+share/vice/PRINTER/3022-901472-06.bin
+share/vice/PRINTER/4023-325360-02.bin
+share/vice/PRINTER/8023-325320-02.bin
 share/vice/PRINTER/cbm1526-325341-08.bin
 share/vice/PRINTER/mps801.bin
-share/vice/PRINTER/mps803.bin
+share/vice/PRINTER/mps803-D7811G-111-U32053A.bin
 share/vice/PRINTER/mps803.vpl
 share/vice/PRINTER/nl10.bin
 share/vice/PRINTER/nl10.vpl
@@ -502,8 +489,6 @@ share/vice/SCPU64/deekay.vpl
 share/vice/SCPU64/default.vrs
 share/vice/SCPU64/frodo.vpl
 share/vice/SCPU64/godot.vpl
-${PLIST.gtk}share/vice/SCPU64/gtk3-hotkeys-mac.vhk
-${PLIST.gtk}share/vice/SCPU64/gtk3-hotkeys.vhk
 ${PLIST.gtk}share/vice/SCPU64/gtk3_keyrah.vkm
 ${PLIST.gtk}share/vice/SCPU64/gtk3_keyrah_de.vkm
 ${PLIST.gtk}share/vice/SCPU64/gtk3_pos.vkm
@@ -526,6 +511,12 @@ ${PLIST.gtk}share/vice/SCPU64/gtk3_sym_t
 ${PLIST.gtk}share/vice/SCPU64/gtk3_sym_uk.vkm
 ${PLIST.gtk}share/vice/SCPU64/gtk3_the64_de.vkm
 share/vice/SCPU64/palette.vpl
+share/vice/SCPU64/palette_6569R1_v1r.vpl
+share/vice/SCPU64/palette_6569R5_v1r.vpl
+share/vice/SCPU64/palette_8565R2_v1r.vpl
+share/vice/SCPU64/palette_C64_amber.vpl
+share/vice/SCPU64/palette_C64_cyan.vpl
+share/vice/SCPU64/palette_C64_green.vpl
 share/vice/SCPU64/pc64.vpl
 share/vice/SCPU64/pepto-ntsc-sony.vpl
 share/vice/SCPU64/pepto-ntsc.vpl
@@ -536,7 +527,6 @@ share/vice/SCPU64/ptoing.vpl
 share/vice/SCPU64/rgb.vpl
 share/vice/SCPU64/scpu64
 share/vice/SCPU64/scpu64mem.sym
-${PLIST.sdl}share/vice/SCPU64/sdl-hotkeys.vhk
 ${PLIST.sdl}share/vice/SCPU64/sdl_keyrah.vkm
 ${PLIST.sdl}share/vice/SCPU64/sdl_keyrah_combian.vkm
 ${PLIST.sdl}share/vice/SCPU64/sdl_keyrah_de.vkm
@@ -557,6 +547,7 @@ ${PLIST.sdl}share/vice/SCPU64/sdl_sym_fr
 ${PLIST.sdl}share/vice/SCPU64/sdl_sym_nl.vkm
 ${PLIST.sdl}share/vice/SCPU64/sdl_sym_tr.vkm
 ${PLIST.sdl}share/vice/SCPU64/sdl_sym_uk.vkm
+share/vice/SCPU64/the64.vpl
 share/vice/SCPU64/vice.vpl
 share/vice/VIC20/PALette.vpl
 share/vice/VIC20/basic-901486-01.bin
@@ -564,8 +555,6 @@ share/vice/VIC20/chargen-901460-02.bin
 share/vice/VIC20/chargen-901460-03.bin
 share/vice/VIC20/colodore_vic.vpl
 share/vice/VIC20/default.vrs
-${PLIST.gtk}share/vice/VIC20/gtk3-hotkeys-mac.vhk
-${PLIST.gtk}share/vice/VIC20/gtk3-hotkeys.vhk
 ${PLIST.gtk}share/vice/VIC20/gtk3_pos.vkm
 ${PLIST.gtk}share/vice/VIC20/gtk3_pos_de.vkm
 ${PLIST.gtk}share/vice/VIC20/gtk3_pos_it.vkm
@@ -578,7 +567,6 @@ share/vice/VIC20/kernal.901486-06.bin
 share/vice/VIC20/kernal.901486-07.bin
 share/vice/VIC20/mike-ntsc.vpl
 share/vice/VIC20/mike-pal.vpl
-${PLIST.sdl}share/vice/VIC20/sdl-hotkeys.vhk
 ${PLIST.sdl}share/vice/VIC20/sdl_pos.vkm
 ${PLIST.sdl}share/vice/VIC20/sdl_pos_fi.vkm
 ${PLIST.sdl}share/vice/VIC20/sdl_pos_fr.vkm
@@ -652,26 +640,19 @@ share/vice/common/VIC20_256.png
 share/vice/common/VIC20_32.png
 share/vice/common/VIC20_48.png
 share/vice/common/VIC20_64.png
-${PLIST.gtk}share/vice/common/gtk3-hotkeys-cartridge-mac.vhk
-${PLIST.gtk}share/vice/common/gtk3-hotkeys-cartridge.vhk
-${PLIST.gtk}share/vice/common/gtk3-hotkeys-datasette1-mac.vhk
-${PLIST.gtk}share/vice/common/gtk3-hotkeys-datasette1.vhk
-${PLIST.gtk}share/vice/common/gtk3-hotkeys-datasette2-mac.vhk
-${PLIST.gtk}share/vice/common/gtk3-hotkeys-datasette2.vhk
-${PLIST.gtk}share/vice/common/gtk3-hotkeys-debug-mac.vhk
-${PLIST.gtk}share/vice/common/gtk3-hotkeys-debug.vhk
-${PLIST.gtk}share/vice/common/gtk3-hotkeys-drive-mac.vhk
-${PLIST.gtk}share/vice/common/gtk3-hotkeys-drive.vhk
-${PLIST.gtk}share/vice/common/gtk3-hotkeys-fliplist-mac.vhk
-${PLIST.gtk}share/vice/common/gtk3-hotkeys-fliplist.vhk
-${PLIST.gtk}share/vice/common/gtk3-hotkeys-help-mac.vhk
-${PLIST.gtk}share/vice/common/gtk3-hotkeys-help.vhk
-${PLIST.gtk}share/vice/common/gtk3-hotkeys-settings-mac.vhk
-${PLIST.gtk}share/vice/common/gtk3-hotkeys-settings.vhk
-${PLIST.gtk}share/vice/common/gtk3-hotkeys-snapshot-mac.vhk
-${PLIST.gtk}share/vice/common/gtk3-hotkeys-snapshot.vhk
 share/vice/common/icon1024x1024.png
 share/vice/common/vice-logo-black.svg
 ${PLIST.gtk}share/vice/common/vice.gresource
+share/vice/hotkeys/hotkeys-cartridge.vhk
+share/vice/hotkeys/hotkeys-datasette.vhk
+share/vice/hotkeys/hotkeys-debug.vhk
+share/vice/hotkeys/hotkeys-drive.vhk
+share/vice/hotkeys/hotkeys-fliplist.vhk
+share/vice/hotkeys/hotkeys-help.vhk
+share/vice/hotkeys/hotkeys-settings.vhk
+share/vice/hotkeys/hotkeys-snapshot.vhk
+share/vice/hotkeys/hotkeys-vsid.vhk
+share/vice/hotkeys/hotkeys-winvice-legacy.vhk
+share/vice/hotkeys/hotkeys.vhk
 ${PLIST.desktop}share/vice/vice-org-vice-org.menu
 ${PLIST.gtk}@pkgdir etc/xdg/menus/applications-merged

Index: pkgsrc/emulators/vice/distinfo
diff -u pkgsrc/emulators/vice/distinfo:1.54 pkgsrc/emulators/vice/distinfo:1.55
--- pkgsrc/emulators/vice/distinfo:1.54 Sat Dec 31 18:30:00 2022
+++ pkgsrc/emulators/vice/distinfo      Sat Jan  6 15:35:26 2024
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.54 2022/12/31 18:30:00 rhialto Exp $
+$NetBSD: distinfo,v 1.55 2024/01/06 15:35:26 rhialto Exp $
 
-BLAKE2s (vice-3.7.1.tar.gz) = 68829aa834902e6914cb09ec95732e14251dfa468f14dc79e67923ed2791060c
-SHA512 (vice-3.7.1.tar.gz) = 80f81dd4d163cc5030eee2908b274bce4f3f21a3adb6d01559f4695d58b27ebc7b7570d8896718dfe74b2f2e4983ed3f9c4919b6e81934063d344b543b081f30
-Size (vice-3.7.1.tar.gz) = 13444946 bytes
+BLAKE2s (vice-3.8.tar.gz) = bf92bbeaa67bd633bb5a0b85f63b571b241e3c53ab9aebb0db0d43590dfff441
+SHA512 (vice-3.8.tar.gz) = fe644667736c32386b62af53314a95bf510c75d476eaab14b4c37693f2f57d6815126ab3db2f0cb11300c1a4a07c29b3f25210800ce97a673a0460ab59d0ebba
+Size (vice-3.8.tar.gz) = 13564021 bytes
 SHA1 (patch-configure) = afa9b0022985c5828dea1496e84117c4866e8d3a
 SHA1 (patch-src_arch_gtk3_actions-help.c) = 136fa108e999dbb98362a2e80a5389710f60290e
-SHA1 (patch-src_arch_gtk3_data_unix_Makefile.in) = 40ec2748090222fe95b54ea2266e48fc07363bd3
+SHA1 (patch-src_arch_gtk3_data_unix_Makefile.in) = c233ac070f00d0210f469466c4250c8b2cdfdc5c

Index: pkgsrc/emulators/vice/options.mk
diff -u pkgsrc/emulators/vice/options.mk:1.16 pkgsrc/emulators/vice/options.mk:1.17
--- pkgsrc/emulators/vice/options.mk:1.16       Sat Dec 31 18:30:00 2022
+++ pkgsrc/emulators/vice/options.mk    Sat Jan  6 15:35:26 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.16 2022/12/31 18:30:00 rhialto Exp $
+# $NetBSD: options.mk,v 1.17 2024/01/06 15:35:26 rhialto Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.vice
 PKG_SUPPORTED_OPTIONS=         ffmpeg vice-x64 vice-cpuhistory pulseaudio alsa
@@ -8,7 +8,7 @@ PKG_SUGGESTED_OPTIONS=          gtk3 ffmpeg
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=   gtk sdl x64 desktop
+PLIST_VARS+=   gtk sdl sdl1 sdl2 x64 desktop
 
 .if !empty(PKG_OPTIONS:Mgtk3)
 CONFIGURE_ARGS+=       --enable-gtk3ui
@@ -45,6 +45,7 @@ BUILD_DEFS+=  PKG_SYSCONFBASE
 .if !empty(PKG_OPTIONS:Msdl)
 CONFIGURE_ARGS+=       --enable-sdl1ui
 PLIST.sdl=             yes
+PLIST.sdl1=            yes
 .  include "../../devel/SDL/buildlink3.mk"
 .  include "../../graphics/SDL_image/buildlink3.mk"
 .endif
@@ -52,6 +53,7 @@ PLIST.sdl=            yes
 .if !empty(PKG_OPTIONS:Msdl2)
 CONFIGURE_ARGS+=       --enable-sdl2ui
 PLIST.sdl=             yes
+PLIST.sdl2=            yes
 .  include "../../devel/SDL2/buildlink3.mk"
 .  include "../../graphics/SDL2_image/buildlink3.mk"
 .endif

Index: pkgsrc/emulators/vice/patches/patch-src_arch_gtk3_data_unix_Makefile.in
diff -u pkgsrc/emulators/vice/patches/patch-src_arch_gtk3_data_unix_Makefile.in:1.2 pkgsrc/emulators/vice/patches/patch-src_arch_gtk3_data_unix_Makefile.in:1.3
--- pkgsrc/emulators/vice/patches/patch-src_arch_gtk3_data_unix_Makefile.in:1.2 Sat Dec 31 18:30:00 2022
+++ pkgsrc/emulators/vice/patches/patch-src_arch_gtk3_data_unix_Makefile.in     Sat Jan  6 15:35:26 2024
@@ -1,22 +1,25 @@
-$NetBSD: patch-src_arch_gtk3_data_unix_Makefile.in,v 1.2 2022/12/31 18:30:00 rhialto Exp $
+$NetBSD: patch-src_arch_gtk3_data_unix_Makefile.in,v 1.3 2024/01/06 15:35:26 rhialto Exp $
 
 Install .desktop files in the system location instead of
 the (fake) home directory.
 
---- src/arch/gtk3/data/unix/Makefile.in.orig   2022-12-27 23:57:18.000000000 +0000
+--- src/arch/gtk3/data/unix/Makefile.in.orig   2023-12-24 17:42:17.000000000 +0000
 +++ src/arch/gtk3/data/unix/Makefile.in
-@@ -735,12 +735,12 @@ uninstall-am:
+@@ -732,7 +732,7 @@ uninstall-am:
  @INSTALL_DESKTOP_FILES_TRUE@@MACOS_COMPILE_FALSE@@UNIX_COMPILE_TRUE@          "SID_1024.svg"
  
  @INSTALL_DESKTOP_FILES_TRUE@@MACOS_COMPILE_FALSE@@UNIX_COMPILE_TRUE@install-data-hook: $(VICE_DIR_FILE) $(VICE_DESKTOP_FILES)
 -@INSTALL_DESKTOP_FILES_TRUE@@MACOS_COMPILE_FALSE@@UNIX_COMPILE_TRUE@  $(XDG_DESKTOP_MENU) install "$(VICE_DIR_FILE)" $(VICE_DESKTOP_FILES)
 +@INSTALL_DESKTOP_FILES_TRUE@@MACOS_COMPILE_FALSE@@UNIX_COMPILE_TRUE@  $(XDG_DESKTOP_MENU) install --mode system "$(VICE_DIR_FILE)" $(VICE_DESKTOP_FILES)
- 
+ @INSTALL_DESKTOP_FILES_TRUE@@MACOS_COMPILE_FALSE@@UNIX_COMPILE_TRUE@  $(XDG_DESKTOP_MENU) forceupdate
+ @INSTALL_DESKTOP_FILES_TRUE@@MACOS_COMPILE_FALSE@@UNIX_COMPILE_TRUE@  @echo " "
+ @INSTALL_DESKTOP_FILES_TRUE@@MACOS_COMPILE_FALSE@@UNIX_COMPILE_TRUE@  @echo "* Remember that for desktop updates to show up, you may have to log off and on,"
+@@ -745,7 +745,7 @@ uninstall-am:
  # Seems GNU disapproves of this, but it works to uninstall the .desktop/.directory
  # files.
  @INSTALL_DESKTOP_FILES_TRUE@@MACOS_COMPILE_FALSE@@UNIX_COMPILE_TRUE@uninstall-hook:
 -@INSTALL_DESKTOP_FILES_TRUE@@MACOS_COMPILE_FALSE@@UNIX_COMPILE_TRUE@  $(XDG_DESKTOP_MENU) uninstall "$(VICE_DIR_FILE)" $(VICE_DESKTOP_FILES)
 +@INSTALL_DESKTOP_FILES_TRUE@@MACOS_COMPILE_FALSE@@UNIX_COMPILE_TRUE@  $(XDG_DESKTOP_MENU) uninstall --mode system "$(VICE_DIR_FILE)" $(VICE_DESKTOP_FILES)
- 
- # if INSTALL_DESKTOP_FILES
- # if !MACOS_COMPILE
+ @INSTALL_DESKTOP_FILES_TRUE@@MACOS_COMPILE_FALSE@@UNIX_COMPILE_TRUE@  $(XDG_DESKTOP_MENU) forceupdate
+ @INSTALL_DESKTOP_FILES_TRUE@@MACOS_COMPILE_FALSE@@UNIX_COMPILE_TRUE@  @echo " "
+ @INSTALL_DESKTOP_FILES_TRUE@@MACOS_COMPILE_FALSE@@UNIX_COMPILE_TRUE@  @echo "* Remember that for desktop updates to show up, you may have to log off and on,"



Home | Main Index | Thread Index | Old Index