Received: by mail.netbsd.org (Postfix, from userid 605) id 4A07284F6A; Sat, 14 Jul 2018 16:05:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 2977B84C8D for ; Sat, 14 Jul 2018 16:05:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id njxfF6xwLNmb for ; Sat, 14 Jul 2018 16:05:20 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id EC88084DEF for ; Sat, 14 Jul 2018 16:05:19 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id E5E71FBEC; Sat, 14 Jul 2018 16:05:19 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_153158431957500" MIME-Version: 1.0 Date: Sat, 14 Jul 2018 16:05:19 +0000 From: "Maya Rashish" Subject: CVS commit: pkgsrc/emulators/vice To: pkgsrc-changes@NetBSD.org Reply-To: maya@netbsd.org X-Mailer: log_accum Message-Id: <20180714160519.E5E71FBEC@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_153158431957500 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: maya Date: Sat Jul 14 16:05:19 UTC 2018 Modified Files: pkgsrc/emulators/vice: Makefile PLIST distinfo options.mk Log Message: vice: update to 3.2. From Rhialto (maintainer) in PR pkg/53449. I had to add DEPENDS on xa65. This might only be a BUILD_DEPENDS. To build on netbsd-current, I needed the hack in https://mail-index.netbsd.org/tech-kern/2018/07/14/msg023684.html (I hope to avoid needing to patch the package!) renamed the "gtk3" option to "gtk3wip", and removed it from PKG_SUGGESTED_OPTIONS because the gtk3 gui is a Work In Progress. See configure --help: --enable-native-gtk3ui enables WIP native GTK3 UI support --enable-debug-gtk3ui enables debugging for the WIP GTK3 port Notable changes in VICE 3.2 - New (experimental) GTK3 native port, this and the SDL(2) port will replace all other ports (which will get removed) in VICE 3.3 and onward. Full NEWS: https://sourceforge.net/p/vice-emu/code/HEAD/tree/tags/v3.2/vice/NEWS To generate a diff of this commit: cvs rdiff -u -r1.130 -r1.131 pkgsrc/emulators/vice/Makefile cvs rdiff -u -r1.25 -r1.26 pkgsrc/emulators/vice/PLIST cvs rdiff -u -r1.44 -r1.45 pkgsrc/emulators/vice/distinfo cvs rdiff -u -r1.8 -r1.9 pkgsrc/emulators/vice/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_153158431957500 Content-Disposition: inline Content-Length: 14286 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/emulators/vice/Makefile diff -u pkgsrc/emulators/vice/Makefile:1.130 pkgsrc/emulators/vice/Makefile:1.131 --- pkgsrc/emulators/vice/Makefile:1.130 Mon Apr 16 14:34:27 2018 +++ pkgsrc/emulators/vice/Makefile Sat Jul 14 16:05:19 2018 @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.130 2018/04/16 14:34:27 wiz Exp $ +# $NetBSD: Makefile,v 1.131 2018/07/14 16:05:19 maya Exp $ -DISTNAME= vice-3.1 -PKGREVISION= 4 +DISTNAME= vice-3.2 CATEGORIES= emulators 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/ +#MASTER_SITES+= ftp://ftp.zimmers.net/pub/cbm/crossplatform/emulators/VICE/ +#MASTER_SITES+= http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/ MAINTAINER= rhialto@falu.nl HOMEPAGE= http://vice-emu.sourceforge.net/ @@ -20,7 +19,7 @@ NO_SRC_ON_FTP= ${RESTRICTED} USE_PKGLOCALEDIR= yes USE_LANGUAGES= c c++ -USE_TOOLS+= gmake msgfmt pkg-config +USE_TOOLS+= gmake msgfmt pkg-config perl GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-ethernet CONFIGURE_ARGS+= --enable-fullscreen @@ -35,6 +34,8 @@ FONTS_DIRS.x11= ${PREFIX}/share/vice/fo REQD_DIRS+= ${PREFIX}/share/vice/fonts REQD_DIRS+= ${PREFIX}/share/vice +DEPENDS+= xa65-[0-9]*:../../devel/xa65 + .include "options.mk" .include "../../audio/flac/buildlink3.mk" Index: pkgsrc/emulators/vice/PLIST diff -u pkgsrc/emulators/vice/PLIST:1.25 pkgsrc/emulators/vice/PLIST:1.26 --- pkgsrc/emulators/vice/PLIST:1.25 Wed Aug 16 17:54:09 2017 +++ pkgsrc/emulators/vice/PLIST Sat Jul 14 16:05:19 2018 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.25 2017/08/16 17:54:09 adam Exp $ +@comment $NetBSD: PLIST,v 1.26 2018/07/14 16:05:19 maya Exp $ bin/c1541 bin/cartconv bin/petcat @@ -54,19 +54,17 @@ share/doc/vice/NEWS share/doc/vice/NLS-Howto.txt share/doc/vice/OFL.txt share/doc/vice/OpenVMS-Howto.txt -share/doc/vice/OpenWatcom-Howto.txt share/doc/vice/Readme-Amiga.txt share/doc/vice/Readme-BeOS.txt share/doc/vice/Readme-DOS.txt share/doc/vice/Readme-GTK3.txt share/doc/vice/Readme-MacOSX.txt -share/doc/vice/Readme-OS2.txt share/doc/vice/Readme-SDL.txt share/doc/vice/Readme-SDL2.txt share/doc/vice/Readme-Unix.txt share/doc/vice/SDL-Howto.txt +share/doc/vice/SDL-support.txt share/doc/vice/Win32-Cygwin-Howto.txt -share/doc/vice/Win32-MSVC-Howto.txt share/doc/vice/Win32-Mingw32-Howto.txt share/doc/vice/WinNT-Unicode.txt share/doc/vice/amigaos.html @@ -74,6 +72,7 @@ share/doc/vice/android.html share/doc/vice/beos.html share/doc/vice/coding-guidelines.txt share/doc/vice/darwin.html +share/doc/vice/ffmpeg-support.txt share/doc/vice/hardware-sids.txt share/doc/vice/iec-bus.txt share/doc/vice/index.html @@ -87,6 +86,7 @@ share/doc/vice/sco.html share/doc/vice/sitemap.xml share/doc/vice/solaris.html share/doc/vice/sortix.html +share/doc/vice/unix.html share/doc/vice/vice-logo.svg share/doc/vice/vice.chm share/doc/vice/vice.css @@ -120,18 +120,18 @@ share/doc/vice/vice_8.html share/doc/vice/vice_9.html share/doc/vice/vice_toc.html share/doc/vice/windows.html -${PLIST.x11}share/locale/da/LC_MESSAGES/vice.mo -${PLIST.x11}share/locale/de/LC_MESSAGES/vice.mo -${PLIST.x11}share/locale/es/LC_MESSAGES/vice.mo -${PLIST.x11}share/locale/fr/LC_MESSAGES/vice.mo -${PLIST.x11}share/locale/hu/LC_MESSAGES/vice.mo -${PLIST.x11}share/locale/it/LC_MESSAGES/vice.mo -${PLIST.x11}share/locale/ko/LC_MESSAGES/vice.mo -${PLIST.x11}share/locale/nl/LC_MESSAGES/vice.mo -${PLIST.x11}share/locale/pl/LC_MESSAGES/vice.mo -${PLIST.x11}share/locale/ru/LC_MESSAGES/vice.mo -${PLIST.x11}share/locale/sv/LC_MESSAGES/vice.mo -${PLIST.x11}share/locale/tr/LC_MESSAGES/vice.mo +${PLIST.mo}share/locale/da/LC_MESSAGES/vice.mo +${PLIST.mo}share/locale/de/LC_MESSAGES/vice.mo +${PLIST.mo}share/locale/es/LC_MESSAGES/vice.mo +${PLIST.mo}share/locale/fr/LC_MESSAGES/vice.mo +${PLIST.mo}share/locale/hu/LC_MESSAGES/vice.mo +${PLIST.mo}share/locale/it/LC_MESSAGES/vice.mo +${PLIST.mo}share/locale/ko/LC_MESSAGES/vice.mo +${PLIST.mo}share/locale/nl/LC_MESSAGES/vice.mo +${PLIST.mo}share/locale/pl/LC_MESSAGES/vice.mo +${PLIST.mo}share/locale/ru/LC_MESSAGES/vice.mo +${PLIST.mo}share/locale/sv/LC_MESSAGES/vice.mo +${PLIST.mo}share/locale/tr/LC_MESSAGES/vice.mo share/vice/C128/basic64 share/vice/C128/basichi share/vice/C128/basiclo @@ -165,7 +165,10 @@ share/vice/C128/pepto-pal.vpl share/vice/C128/pepto-palold.vpl share/vice/C128/ptoing.vpl share/vice/C128/rgb.vpl +${PLIST.sdl}share/vice/C128/sdl_hotkeys.vkm ${PLIST.sdl}share/vice/C128/sdl_pos.vkm +${PLIST.x11}share/vice/C128/gtk3_pos.vkm +${PLIST.x11}share/vice/C128/gtk3_sym.vkm share/vice/C128/vdc_comp.vpl share/vice/C128/vdc_deft.vpl share/vice/C128/vice.vpl @@ -195,16 +198,29 @@ share/vice/C64/pepto-pal.vpl share/vice/C64/pepto-palold.vpl share/vice/C64/ptoing.vpl share/vice/C64/rgb.vpl +${PLIST.sdl}share/vice/C64/sdl_hotkeys.vkm +${PLIST.sdl}share/vice/C64/sdl_hotkeys_vsid.vkm +${PLIST.sdl}share/vice/C64/sdl_joymap_ps3.vjm ${PLIST.sdl}share/vice/C64/sdl_keyrah.vkm +${PLIST.sdl}share/vice/C64/sdl_keyrah_combian.vkm ${PLIST.sdl}share/vice/C64/sdl_keyrah_de.vkm +${PLIST.sdl}share/vice/C64/sdl_keyrah_retropie.vkm +${PLIST.sdl}share/vice/C64/sdl_keyrah_retropie_de.vkm ${PLIST.sdl}share/vice/C64/sdl_pos.vkm ${PLIST.sdl}share/vice/C64/sdl_pos_da.vkm ${PLIST.sdl}share/vice/C64/sdl_pos_de.vkm ${PLIST.sdl}share/vice/C64/sdl_pos_fi.vkm ${PLIST.sdl}share/vice/C64/sdl_pos_no.vkm ${PLIST.sdl}share/vice/C64/sdl_sym.vkm +${PLIST.sdl}share/vice/C64/sdl_sym_de.vkm share/vice/C64/sxkernal share/vice/C64/vice.vpl +${PLIST.x11}share/vice/C64/gtk3_keyrah.vkm +${PLIST.x11}share/vice/C64/gtk3_keyrah_de.vkm +${PLIST.x11}share/vice/C64/gtk3_pos.vkm +${PLIST.x11}share/vice/C64/gtk3_pos_de.vkm +${PLIST.x11}share/vice/C64/gtk3_sym.vkm +${PLIST.x11}share/vice/C64/gtk3_sym_de.vkm ${PLIST.x11}share/vice/C64/x11_keyrah.vkm ${PLIST.x11}share/vice/C64/x11_keyrah_de.vkm ${PLIST.x11}share/vice/C64/x11_pos.vkm @@ -217,15 +233,26 @@ share/vice/C64DTV/chargen share/vice/C64DTV/default.vrs share/vice/C64DTV/dtvrom.bin share/vice/C64DTV/kernal +${PLIST.sdl}share/vice/C64DTV/sdl_hotkeys.vkm ${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 +${PLIST.sdl}share/vice/C64DTV/sdl_keyrah_retropie.vkm +${PLIST.sdl}share/vice/C64DTV/sdl_keyrah_retropie_de.vkm ${PLIST.sdl}share/vice/C64DTV/sdl_pos.vkm ${PLIST.sdl}share/vice/C64DTV/sdl_pos_da.vkm ${PLIST.sdl}share/vice/C64DTV/sdl_pos_de.vkm ${PLIST.sdl}share/vice/C64DTV/sdl_pos_fi.vkm ${PLIST.sdl}share/vice/C64DTV/sdl_pos_no.vkm ${PLIST.sdl}share/vice/C64DTV/sdl_sym.vkm +${PLIST.sdl}share/vice/C64DTV/sdl_sym_de.vkm share/vice/C64DTV/spiff.vpl +${PLIST.x11}share/vice/C64DTV/gtk3_keyrah.vkm +${PLIST.x11}share/vice/C64DTV/gtk3_keyrah_de.vkm +${PLIST.x11}share/vice/C64DTV/gtk3_pos.vkm +${PLIST.x11}share/vice/C64DTV/gtk3_pos_de.vkm +${PLIST.x11}share/vice/C64DTV/gtk3_sym.vkm +${PLIST.x11}share/vice/C64DTV/gtk3_sym_de.vkm ${PLIST.x11}share/vice/C64DTV/x11_keyrah.vkm ${PLIST.x11}share/vice/C64DTV/x11_keyrah_de.vkm ${PLIST.x11}share/vice/C64DTV/x11_pos.vkm @@ -262,9 +289,12 @@ 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.vkm ${PLIST.sdl}share/vice/CBM-II/sdl_sym.vkm share/vice/CBM-II/vice.vpl share/vice/CBM-II/white.vpl +${PLIST.x11}share/vice/CBM-II/gtk3_sym.vkm +${PLIST.x11}share/vice/CBM-II/gtk3_sym_de.vkm ${PLIST.x11}share/vice/CBM-II/x11_sym.vkm ${PLIST.x11}share/vice/CBM-II/x11_sym_de.vkm share/vice/DRIVES/d1541II @@ -309,6 +339,7 @@ share/vice/PET/rom4g40.vrs share/vice/PET/romsuperpet.vrs ${PLIST.sdl}share/vice/PET/sdl_buuk_sym.vkm ${PLIST.sdl}share/vice/PET/sdl_grus_sym.vkm +${PLIST.sdl}share/vice/PET/sdl_hotkeys.vkm ${PLIST.sdl}share/vice/PET/sdl_sym.vkm share/vice/PET/waterloo-a000.901898-01.bin share/vice/PET/waterloo-b000.901898-02.bin @@ -317,6 +348,19 @@ share/vice/PET/waterloo-d000.901898-04.b share/vice/PET/waterloo-e000.901897-01.bin share/vice/PET/waterloo-f000.901898-05.bin share/vice/PET/white.vpl +${PLIST.x11}share/vice/PET/gtk3_bude_pos.vkm +${PLIST.x11}share/vice/PET/gtk3_bude_pos_de.vkm +${PLIST.x11}share/vice/PET/gtk3_bude_sym.vkm +${PLIST.x11}share/vice/PET/gtk3_bude_sym_de.vkm +${PLIST.x11}share/vice/PET/gtk3_buuk_pos.vkm +${PLIST.x11}share/vice/PET/gtk3_buuk_pos_de.vkm +${PLIST.x11}share/vice/PET/gtk3_buuk_sym.vkm +${PLIST.x11}share/vice/PET/gtk3_buuk_sym_de.vkm +${PLIST.x11}share/vice/PET/gtk3_grus_pos.vkm +${PLIST.x11}share/vice/PET/gtk3_grus_pos_de.vkm +${PLIST.x11}share/vice/PET/gtk3_grus_sym.vkm +${PLIST.x11}share/vice/PET/gtk3_grus_sym_de.vkm +${PLIST.x11}share/vice/PET/gtk3_sym.vkm ${PLIST.x11}share/vice/PET/x11_bude_pos.vkm ${PLIST.x11}share/vice/PET/x11_bude_pos_de.vkm ${PLIST.x11}share/vice/PET/x11_bude_sym.vkm @@ -340,7 +384,11 @@ share/vice/PLUS4/kernal share/vice/PLUS4/kernal.005 share/vice/PLUS4/kernal.232 share/vice/PLUS4/kernal.364 +${PLIST.sdl}share/vice/PLUS4/sdl_hotkeys.vkm ${PLIST.sdl}share/vice/PLUS4/sdl_pos.vkm +${PLIST.x11}share/vice/PLUS4/gtk3_pos.vkm +${PLIST.x11}share/vice/PLUS4/gtk3_sym.vkm +${PLIST.x11}share/vice/PLUS4/gtk3_sym_de.vkm ${PLIST.x11}share/vice/PLUS4/x11_pos.vkm ${PLIST.x11}share/vice/PLUS4/x11_sym.vkm ${PLIST.x11}share/vice/PLUS4/x11_sym_de.vkm @@ -373,15 +421,24 @@ 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.vkm ${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 +${PLIST.sdl}share/vice/SCPU64/sdl_keyrah_retropie.vkm +${PLIST.sdl}share/vice/SCPU64/sdl_keyrah_retropie_de.vkm ${PLIST.sdl}share/vice/SCPU64/sdl_pos.vkm ${PLIST.sdl}share/vice/SCPU64/sdl_pos_da.vkm ${PLIST.sdl}share/vice/SCPU64/sdl_pos_de.vkm ${PLIST.sdl}share/vice/SCPU64/sdl_pos_fi.vkm ${PLIST.sdl}share/vice/SCPU64/sdl_pos_no.vkm ${PLIST.sdl}share/vice/SCPU64/sdl_sym.vkm +${PLIST.sdl}share/vice/SCPU64/sdl_sym_de.vkm share/vice/SCPU64/vice.vpl +${PLIST.x11}share/vice/SCPU64/gtk3_pos.vkm +${PLIST.x11}share/vice/SCPU64/gtk3_pos_de.vkm +${PLIST.x11}share/vice/SCPU64/gtk3_sym.vkm +${PLIST.x11}share/vice/SCPU64/gtk3_sym_de.vkm ${PLIST.x11}share/vice/SCPU64/x11_pos.vkm ${PLIST.x11}share/vice/SCPU64/x11_pos_de.vkm ${PLIST.x11}share/vice/SCPU64/x11_sym.vkm @@ -393,9 +450,12 @@ share/vice/VIC20/default.vrs share/vice/VIC20/kernal share/vice/VIC20/mike-ntsc.vpl share/vice/VIC20/mike-pal.vpl +${PLIST.sdl}share/vice/VIC20/sdl_hotkeys.vkm ${PLIST.sdl}share/vice/VIC20/sdl_pos.vkm ${PLIST.sdl}share/vice/VIC20/sdl_pos_fi.vkm share/vice/VIC20/vice.vpl +${PLIST.x11}share/vice/VIC20/gtk3_pos.vkm +${PLIST.x11}share/vice/VIC20/gtk3_sym.vkm ${PLIST.x11}share/vice/VIC20/x11_pos.vkm ${PLIST.x11}share/vice/VIC20/x11_sym.vkm share/vice/fonts/CBM.ttf Index: pkgsrc/emulators/vice/distinfo diff -u pkgsrc/emulators/vice/distinfo:1.44 pkgsrc/emulators/vice/distinfo:1.45 --- pkgsrc/emulators/vice/distinfo:1.44 Wed Aug 16 17:54:09 2017 +++ pkgsrc/emulators/vice/distinfo Sat Jul 14 16:05:19 2018 @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.44 2017/08/16 17:54:09 adam Exp $ +$NetBSD: distinfo,v 1.45 2018/07/14 16:05:19 maya Exp $ -SHA1 (vice-3.1.tar.gz) = ac9daeac550f26b6c66776448c0d34a00c913696 -RMD160 (vice-3.1.tar.gz) = 63ef44947f409702abe189d562d93e840eafc30f -SHA512 (vice-3.1.tar.gz) = bc02a3597a17dadb37c487e6942192c0e9dc1a7d4e440fbf0dc8a165dbb2dee60ddf157697a020d2780ddef56a0a67802768d5c6d117b9cf5cdc124de45bc579 -Size (vice-3.1.tar.gz) = 30714226 bytes +SHA1 (vice-3.2.tar.gz) = ab240eed57d4af1e215e4c9c23c437f45cedf6bf +RMD160 (vice-3.2.tar.gz) = 4e3fb04607dda7188d49fb5f68c3766925212cc2 +SHA512 (vice-3.2.tar.gz) = d05081db90e2ee85745ecdee0b692a5c485b76b21a56463b17639de29c29c6deda3c39504122d8440f1667156d11dad504cea76b9b0272fc770ccfe0da3df616 +Size (vice-3.2.tar.gz) = 30279589 bytes SHA1 (patch-configure) = f810d83265f5b8e7162c7ff6dbbca7d84e163de0 SHA1 (patch-data_fonts_Makefile.in) = 614a433448ec422108e5125c71d2e83fa3ecc21c SHA1 (patch-po_Makefile.in.in) = 6e028dde8a74f6c5d511057a19580285e3d506c7 Index: pkgsrc/emulators/vice/options.mk diff -u pkgsrc/emulators/vice/options.mk:1.8 pkgsrc/emulators/vice/options.mk:1.9 --- pkgsrc/emulators/vice/options.mk:1.8 Wed Aug 16 17:54:09 2017 +++ pkgsrc/emulators/vice/options.mk Sat Jul 14 16:05:19 2018 @@ -1,14 +1,14 @@ -# $NetBSD: options.mk,v 1.8 2017/08/16 17:54:09 adam Exp $ +# $NetBSD: options.mk,v 1.9 2018/07/14 16:05:19 maya Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.vice PKG_SUPPORTED_OPTIONS= ffmpeg vte PKG_OPTIONS_REQUIRED_GROUPS= gui -PKG_OPTIONS_GROUP.gui= gtk2 gtk3 sdl xaw -PKG_SUGGESTED_OPTIONS= gtk3 +PKG_OPTIONS_GROUP.gui= gtk2 gtk3wip sdl xaw +PKG_SUGGESTED_OPTIONS= gtk2 .include "../../mk/bsd.options.mk" -PLIST_VARS+= pcf sdl x11 +PLIST_VARS+= mo pcf sdl x11 # Cocoa user interface works only in application bundle. #.if !empty(PKG_OPTIONS:Mcocoa) @@ -22,13 +22,14 @@ USE_TOOLS+= bdftopcf .if !empty(PKG_OPTIONS:Mgtk2) CONFIGURE_ARGS+= --enable-gnomeui +PLIST.mo= yes PLIST.pcf= yes PLIST.x11= yes . include "../../x11/gtk2/buildlink3.mk" .endif -.if !empty(PKG_OPTIONS:Mgtk3) -CONFIGURE_ARGS+= --enable-gnomeui3 +.if !empty(PKG_OPTIONS:Mgtk3wip) +CONFIGURE_ARGS+= --enable-native-gtk3ui PLIST.pcf= yes PLIST.x11= yes . include "../../x11/gtk3/buildlink3.mk" @@ -36,7 +37,6 @@ PLIST.x11= yes .if !empty(PKG_OPTIONS:Msdl) CONFIGURE_ARGS+= --enable-sdlui2 -PLIST.pcf= yes PLIST.sdl= yes . include "../../devel/SDL2/buildlink3.mk" .endif @@ -50,10 +50,15 @@ CONFIGURE_ARGS+= --enable-external-ffmpe .endif .if !empty(PKG_OPTIONS:Mvte) -. include "../../x11/vte/buildlink3.mk" +. if !empty(PKG_OPTIONS:Mgtk2) || !empty(PKG_OPTIONS:Mgtk3wip) +. include "../../x11/vte/buildlink3.mk" +. else +# vte only makes sense with gtk* +. endif .endif .if !empty(PKG_OPTIONS:Mxaw) +PLIST.mo= yes PLIST.pcf= yes PLIST.x11= yes . include "../../x11/libXt/buildlink3.mk" --_----------=_153158431957500--