On Thu, Jul 12, 2018 at 12:40:04PM +0200, Frederic Cambus wrote: > On Sun, Jul 08, 2018 at 04:27:54PM +0200, Frederic Cambus wrote: > > > Here is a diff to update vice to 3.2. > > > > This update requires the previously submitted devel/xa port. > > For info, devel/xa has been in the ports tree since a few days already, > making it easier to test this update.
As I did update vice to 3.0 and then to 3.1, I will take maintainership for this port. Here is an updated diff with the MAINTAINER line in. Notable changes: - Add a BUILD_DEPENDS on devel/xa, which is now required - Switch to using SDL2 Comments? OK? Index: Makefile =================================================================== RCS file: /cvs/ports/emulators/vice/Makefile,v retrieving revision 1.9 diff -u -p -r1.9 Makefile --- Makefile 26 Jul 2017 22:45:20 -0000 1.9 +++ Makefile 26 Jul 2018 16:43:22 -0000 @@ -2,37 +2,40 @@ COMMENT = versatile Commodore emulator -DISTNAME = vice-3.1 -REVISION = 0 +DISTNAME = vice-3.2 CATEGORIES = emulators HOMEPAGE = http://vice-emu.sourceforge.net/ +MAINTAINER = Frederic Cambus <fcam...@openbsd.org> + # GPLv2+ PERMIT_PACKAGE_CDROM = Yes -WANTLIB += FLAC GL SDL c gif jpeg m ogg png pthread readline ${COMPILER_LIBCXX} -WANTLIB += termcap vorbis vorbisenc vorbisfile z +WANTLIB += ${COMPILER_LIBCXX} FLAC SDL2 c curses gif jpeg m ogg +WANTLIB += png readline vorbis vorbisenc vorbisfile z MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=vice-emu/} +BUILD_DEPENDS = devel/xa + LIB_DEPENDS = audio/flac \ audio/libvorbis \ - devel/sdl \ + devel/sdl2 \ graphics/giflib \ graphics/jpeg \ graphics/png CONFIGURE_STYLE = autoconf -AUTOCONF_VERSION = 2.68 +AUTOCONF_VERSION = 2.69 CONFIGURE_ARGS += --without-oss \ --without-pulse \ --with-sdlsound \ --disable-lame \ --disable-portaudio \ - --enable-sdlui + --enable-sdlui2 CONFIGURE_ENV += ac_cv_header_mpg123_h=no Index: distinfo =================================================================== RCS file: /cvs/ports/emulators/vice/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- distinfo 10 Apr 2017 10:47:28 -0000 1.3 +++ distinfo 26 Jul 2018 16:43:22 -0000 @@ -1,2 +1,2 @@ -SHA256 (vice-3.1.tar.gz) = PrgVljOBYJUAbew2xcPt0FWof9i9oZOhGUpoAWhdEkA= -SIZE (vice-3.1.tar.gz) = 30714226 +SHA256 (vice-3.2.tar.gz) = KNmfXhEHIMl+8W2N1CGc+aZ2YdWIGYNdGTeBQ2l7pSM= +SIZE (vice-3.2.tar.gz) = 30279589 Index: patches/patch-configure_ac =================================================================== RCS file: /cvs/ports/emulators/vice/patches/patch-configure_ac,v retrieving revision 1.2 diff -u -p -r1.2 patch-configure_ac --- patches/patch-configure_ac 10 Apr 2017 10:47:28 -0000 1.2 +++ patches/patch-configure_ac 26 Jul 2018 16:43:22 -0000 @@ -3,9 +3,10 @@ $OpenBSD: patch-configure_ac,v 1.2 2017/ Don't build a redundant copy of the documentation. Don't run fc-cache on install. ---- configure.ac.orig Thu Mar 30 22:40:08 2017 -+++ configure.ac Fri Apr 7 22:07:03 2017 -@@ -653,12 +653,7 @@ fi +Index: configure.ac +--- configure.ac.orig ++++ configure.ac +@@ -675,12 +675,7 @@ fi AC_CHECK_PROGS(MAKEINFO, makeinfo, no) AC_CHECK_PROGS(TEXI2DVI, texi2dvi, no) @@ -19,8 +20,8 @@ Don't run fc-cache on install. AC_CHECK_PROGS(DOS2UNIX, dos2unix, dos2unix) -@@ -3115,12 +3110,7 @@ if test x"$enable_lame" != "xno" ; then - +@@ -3252,12 +3247,7 @@ if test x"$enable_lame" != "xno" ; then + fi fi -AC_PATH_PROGS(FCCACHE, fc-cache, false) Index: patches/patch-doc_Makefile_in =================================================================== RCS file: /cvs/ports/emulators/vice/patches/patch-doc_Makefile_in,v retrieving revision 1.2 diff -u -p -r1.2 patch-doc_Makefile_in --- patches/patch-doc_Makefile_in 10 Apr 2017 10:47:28 -0000 1.2 +++ patches/patch-doc_Makefile_in 26 Jul 2018 16:43:22 -0000 @@ -2,9 +2,10 @@ $OpenBSD: patch-doc_Makefile_in,v 1.2 20 Don't build a redundant copy of vice.info, it breaks the build. ---- doc/Makefile.in.orig Thu Mar 30 22:40:43 2017 -+++ doc/Makefile.in Fri Apr 7 22:07:04 2017 -@@ -1097,7 +1097,6 @@ $(builddir)/vice.inf: $(srcdir)/vice.texi +Index: doc/Makefile.in +--- doc/Makefile.in.orig ++++ doc/Makefile.in +@@ -1190,7 +1190,6 @@ $(builddir)/vice.inf: $(srcdir)/vice.texi $(builddir)/vice.info: $(srcdir)/vice.texi touch $(builddir)/vice.info Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/emulators/vice/pkg/PLIST,v retrieving revision 1.4 diff -u -p -r1.4 PLIST --- pkg/PLIST 10 Apr 2017 10:47:28 -0000 1.4 +++ pkg/PLIST 26 Jul 2018 16:43:22 -0000 @@ -50,6 +50,7 @@ lib/vice/C128/pepto-pal.vpl lib/vice/C128/pepto-palold.vpl lib/vice/C128/ptoing.vpl lib/vice/C128/rgb.vpl +lib/vice/C128/sdl_hotkeys.vkm lib/vice/C128/sdl_pos.vkm lib/vice/C128/vdc_comp.vpl lib/vice/C128/vdc_deft.vpl @@ -79,14 +80,21 @@ lib/vice/C64/pepto-pal.vpl lib/vice/C64/pepto-palold.vpl lib/vice/C64/ptoing.vpl lib/vice/C64/rgb.vpl +lib/vice/C64/sdl_hotkeys.vkm +lib/vice/C64/sdl_hotkeys_vsid.vkm +lib/vice/C64/sdl_joymap_ps3.vjm lib/vice/C64/sdl_keyrah.vkm +lib/vice/C64/sdl_keyrah_combian.vkm lib/vice/C64/sdl_keyrah_de.vkm +lib/vice/C64/sdl_keyrah_retropie.vkm +lib/vice/C64/sdl_keyrah_retropie_de.vkm lib/vice/C64/sdl_pos.vkm lib/vice/C64/sdl_pos_da.vkm lib/vice/C64/sdl_pos_de.vkm lib/vice/C64/sdl_pos_fi.vkm lib/vice/C64/sdl_pos_no.vkm lib/vice/C64/sdl_sym.vkm +lib/vice/C64/sdl_sym_de.vkm lib/vice/C64/sxkernal lib/vice/C64/vice.vpl lib/vice/C64DTV/ @@ -96,14 +104,19 @@ lib/vice/C64DTV/chargen lib/vice/C64DTV/default.vrs lib/vice/C64DTV/dtvrom.bin lib/vice/C64DTV/kernal +lib/vice/C64DTV/sdl_hotkeys.vkm lib/vice/C64DTV/sdl_keyrah.vkm +lib/vice/C64DTV/sdl_keyrah_combian.vkm lib/vice/C64DTV/sdl_keyrah_de.vkm +lib/vice/C64DTV/sdl_keyrah_retropie.vkm +lib/vice/C64DTV/sdl_keyrah_retropie_de.vkm lib/vice/C64DTV/sdl_pos.vkm lib/vice/C64DTV/sdl_pos_da.vkm lib/vice/C64DTV/sdl_pos_de.vkm lib/vice/C64DTV/sdl_pos_fi.vkm lib/vice/C64DTV/sdl_pos_no.vkm lib/vice/C64DTV/sdl_sym.vkm +lib/vice/C64DTV/sdl_sym_de.vkm lib/vice/C64DTV/spiff.vpl lib/vice/CBM-II/ lib/vice/CBM-II/amber.vpl @@ -136,6 +149,7 @@ lib/vice/CBM-II/rom128l.vrs lib/vice/CBM-II/rom256h.vrs lib/vice/CBM-II/rom256l.vrs lib/vice/CBM-II/rom500.vrs +lib/vice/CBM-II/sdl_hotkeys.vkm lib/vice/CBM-II/sdl_sym.vkm lib/vice/CBM-II/vice.vpl lib/vice/CBM-II/white.vpl @@ -183,6 +197,7 @@ lib/vice/PET/rom4g40.vrs lib/vice/PET/romsuperpet.vrs lib/vice/PET/sdl_buuk_sym.vkm lib/vice/PET/sdl_grus_sym.vkm +lib/vice/PET/sdl_hotkeys.vkm lib/vice/PET/sdl_sym.vkm lib/vice/PET/waterloo-a000.901898-01.bin lib/vice/PET/waterloo-b000.901898-02.bin @@ -202,6 +217,7 @@ lib/vice/PLUS4/kernal lib/vice/PLUS4/kernal.005 lib/vice/PLUS4/kernal.232 lib/vice/PLUS4/kernal.364 +lib/vice/PLUS4/sdl_hotkeys.vkm lib/vice/PLUS4/sdl_pos.vkm lib/vice/PLUS4/yape-ntsc.vpl lib/vice/PLUS4/yape-pal.vpl @@ -234,14 +250,19 @@ lib/vice/SCPU64/ptoing.vpl lib/vice/SCPU64/rgb.vpl lib/vice/SCPU64/scpu64 lib/vice/SCPU64/scpu64mem.sym +lib/vice/SCPU64/sdl_hotkeys.vkm lib/vice/SCPU64/sdl_keyrah.vkm +lib/vice/SCPU64/sdl_keyrah_combian.vkm lib/vice/SCPU64/sdl_keyrah_de.vkm +lib/vice/SCPU64/sdl_keyrah_retropie.vkm +lib/vice/SCPU64/sdl_keyrah_retropie_de.vkm lib/vice/SCPU64/sdl_pos.vkm lib/vice/SCPU64/sdl_pos_da.vkm lib/vice/SCPU64/sdl_pos_de.vkm lib/vice/SCPU64/sdl_pos_fi.vkm lib/vice/SCPU64/sdl_pos_no.vkm lib/vice/SCPU64/sdl_sym.vkm +lib/vice/SCPU64/sdl_sym_de.vkm lib/vice/SCPU64/vice.vpl lib/vice/VIC20/ lib/vice/VIC20/basic @@ -251,6 +272,7 @@ lib/vice/VIC20/default.vrs lib/vice/VIC20/kernal lib/vice/VIC20/mike-ntsc.vpl lib/vice/VIC20/mike-pal.vpl +lib/vice/VIC20/sdl_hotkeys.vkm lib/vice/VIC20/sdl_pos.vkm lib/vice/VIC20/sdl_pos_fi.vkm lib/vice/VIC20/vice.vpl @@ -290,19 +312,17 @@ lib/vice/doc/NEWS lib/vice/doc/NLS-Howto.txt lib/vice/doc/OFL.txt lib/vice/doc/OpenVMS-Howto.txt -lib/vice/doc/OpenWatcom-Howto.txt lib/vice/doc/Readme-Amiga.txt lib/vice/doc/Readme-BeOS.txt lib/vice/doc/Readme-DOS.txt lib/vice/doc/Readme-GTK3.txt lib/vice/doc/Readme-MacOSX.txt -lib/vice/doc/Readme-OS2.txt lib/vice/doc/Readme-SDL.txt lib/vice/doc/Readme-SDL2.txt lib/vice/doc/Readme-Unix.txt lib/vice/doc/SDL-Howto.txt +lib/vice/doc/SDL-support.txt lib/vice/doc/Win32-Cygwin-Howto.txt -lib/vice/doc/Win32-MSVC-Howto.txt lib/vice/doc/Win32-Mingw32-Howto.txt lib/vice/doc/WinNT-Unicode.txt lib/vice/doc/amigaos.html @@ -310,6 +330,7 @@ lib/vice/doc/android.html lib/vice/doc/beos.html lib/vice/doc/coding-guidelines.txt lib/vice/doc/darwin.html +lib/vice/doc/ffmpeg-support.txt lib/vice/doc/hardware-sids.txt lib/vice/doc/iec-bus.txt lib/vice/doc/index.html @@ -323,6 +344,7 @@ lib/vice/doc/sco.html lib/vice/doc/sitemap.xml lib/vice/doc/solaris.html lib/vice/doc/sortix.html +lib/vice/doc/unix.html lib/vice/doc/vice-logo.svg lib/vice/doc/vice.chm lib/vice/doc/vice.css
