diff options
| -rw-r--r-- | emulators/vice/Makefile | 25 | ||||
| -rw-r--r-- | emulators/vice/PLIST | 167 | ||||
| -rw-r--r-- | emulators/vice/distinfo | 15 | ||||
| -rw-r--r-- | emulators/vice/options.mk | 58 | ||||
| -rw-r--r-- | emulators/vice/patches/patch-configure | 56 | ||||
| -rw-r--r-- | emulators/vice/patches/patch-data_fonts_Makefile.in | 13 | ||||
| -rw-r--r-- | emulators/vice/patches/patch-po_Makefile.in.in | 17 |
7 files changed, 143 insertions, 208 deletions
diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile index c19d8338d1e..29f7c8aec9b 100644 --- a/emulators/vice/Makefile +++ b/emulators/vice/Makefile @@ -1,13 +1,10 @@ -# $NetBSD: Makefile,v 1.135 2018/11/23 08:06:30 ryoon Exp $ +# $NetBSD: Makefile,v 1.136 2018/12/31 15:38:55 rhialto Exp $ -DISTNAME= vice-3.2 -PKGREVISION= 4 +DISTNAME= vice-3.3 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/ -MAINTAINER= rhialto@falu.nl +MAINTAINER= rhialto@NetBSD.org HOMEPAGE= http://vice-emu.sourceforge.net/ COMMENT= Emulator for C64, C128, CBM-II, PET, VIC20, Plus4 and C16 LICENSE= gnu-gpl-v2 @@ -19,11 +16,10 @@ NO_BIN_ON_FTP= ${RESTRICTED} NO_SRC_ON_FTP= ${RESTRICTED} USE_PKGLOCALEDIR= yes -USE_LANGUAGES= c c++ -USE_TOOLS+= gmake msgfmt pkg-config perl +USE_LANGUAGES= c c++11 +USE_TOOLS+= gmake pkg-config perl GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-ethernet -CONFIGURE_ARGS+= --enable-fullscreen CONFIGURE_ARGS.NetBSD+= --without-oss # Avoid PLIST mismatch if these programs are installed @@ -35,7 +31,15 @@ FONTS_DIRS.x11= ${PREFIX}/share/vice/fonts REQD_DIRS+= ${PREFIX}/share/vice/fonts REQD_DIRS+= ${PREFIX}/share/vice -DEPENDS+= xa65-[0-9]*:../../devel/xa65 +BUILD_DEPENDS+= xa65-[0-9]*:../../devel/xa65 + +SUBST_CLASSES+= prefix +SUBST_STAGE.prefix= post-configure +SUBST_FILES.prefix= man/vice.1 +SUBST_FILES.prefix+= doc/html/vice_4.html +SUBST_FILES.prefix+= doc/vice.info +SUBST_FILES.prefix+= doc/vice.txt +SUBST_SED.prefix= -e 's|/usr/local|${PREFIX}|g' .include "options.mk" @@ -43,7 +47,6 @@ DEPENDS+= xa65-[0-9]*:../../devel/xa65 .include "../../audio/lame/buildlink3.mk" .include "../../audio/libvorbis/buildlink3.mk" .include "../../audio/mpg123/buildlink3.mk" -.include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/giflib/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" diff --git a/emulators/vice/PLIST b/emulators/vice/PLIST index 1820ba299bf..dc2adb49620 100644 --- a/emulators/vice/PLIST +++ b/emulators/vice/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.26 2018/07/14 16:05:19 maya Exp $ +@comment $NetBSD: PLIST,v 1.27 2018/12/31 15:38:55 rhialto Exp $ bin/c1541 bin/cartconv bin/petcat @@ -25,7 +25,8 @@ share/doc/vice/CIPS2008.png share/doc/vice/COPYING share/doc/vice/Documentation-Howto.txt share/doc/vice/Doxygen-Howto.txt -share/doc/vice/GTK3-Howto.txt +share/doc/vice/FreeBSD-GTK3-Howto.txt +share/doc/vice/GTK3-macOS.txt share/doc/vice/Lato-Bold.eot share/doc/vice/Lato-Bold.ttf share/doc/vice/Lato-Bold.woff @@ -42,31 +43,17 @@ share/doc/vice/Lato-Regular.eot share/doc/vice/Lato-Regular.ttf share/doc/vice/Lato-Regular.woff share/doc/vice/Lato-Regular.woff2 -share/doc/vice/Linux-Mingw32-Howto.txt -share/doc/vice/Linux-Native-Howto.txt -share/doc/vice/MSDOS-Ethernet-Howto.txt -share/doc/vice/MSDOS-Howto.txt -share/doc/vice/MacOSX-Cocoa-Howto.txt -share/doc/vice/MacOSX-Howto.txt -share/doc/vice/MacOSX-ResourceTree.txt -share/doc/vice/Minix-Howto.txt +share/doc/vice/Linux-GTK3-Howto.txt share/doc/vice/NEWS -share/doc/vice/NLS-Howto.txt +share/doc/vice/NetBSD-howto.txt share/doc/vice/OFL.txt -share/doc/vice/OpenVMS-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-SDL.txt share/doc/vice/Readme-SDL2.txt -share/doc/vice/Readme-Unix.txt +share/doc/vice/Release-Howto.txt share/doc/vice/SDL-Howto.txt share/doc/vice/SDL-support.txt -share/doc/vice/Win32-Cygwin-Howto.txt -share/doc/vice/Win32-Mingw32-Howto.txt -share/doc/vice/WinNT-Unicode.txt +share/doc/vice/Windows-MinGW-GTK3-Howto.txt share/doc/vice/amigaos.html share/doc/vice/android.html share/doc/vice/beos.html @@ -79,7 +66,6 @@ share/doc/vice/index.html share/doc/vice/macosx.html share/doc/vice/new.gif share/doc/vice/nsosrh.html -share/doc/vice/ports-status.txt share/doc/vice/qnx.html share/doc/vice/robots.txt share/doc/vice/sco.html @@ -87,6 +73,7 @@ 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-black.svg share/doc/vice/vice-logo.svg share/doc/vice/vice.chm share/doc/vice/vice.css @@ -120,18 +107,6 @@ share/doc/vice/vice_8.html share/doc/vice/vice_9.html share/doc/vice/vice_toc.html share/doc/vice/windows.html -${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 @@ -142,13 +117,17 @@ share/vice/C128/chargch share/vice/C128/chargde share/vice/C128/chargen share/vice/C128/chargfr +share/vice/C128/chargno share/vice/C128/chargse +share/vice/C128/cjam.vpl share/vice/C128/colodore.vpl share/vice/C128/community-colors.vpl share/vice/C128/deekay.vpl share/vice/C128/default.vrs share/vice/C128/frodo.vpl share/vice/C128/godot.vpl +${PLIST.x11}share/vice/C128/gtk3_pos.vkm +${PLIST.x11}share/vice/C128/gtk3_sym.vkm share/vice/C128/kernal share/vice/C128/kernal64 share/vice/C128/kernalch @@ -167,19 +146,16 @@ 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 -${PLIST.x11}share/vice/C128/x11_pos.vkm -${PLIST.x11}share/vice/C128/x11_sym.vkm share/vice/C64/basic share/vice/C64/c64hq.vpl share/vice/C64/c64mem.sym share/vice/C64/c64s.vpl share/vice/C64/ccs64.vpl share/vice/C64/chargen +share/vice/C64/cjam.vpl share/vice/C64/colodore.vpl share/vice/C64/community-colors.vpl share/vice/C64/deekay.vpl @@ -188,6 +164,13 @@ share/vice/C64/edkernal share/vice/C64/frodo.vpl share/vice/C64/godot.vpl share/vice/C64/gskernal +${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/gtk3_sym_nl.vkm share/vice/C64/jpchrgen share/vice/C64/jpkernal share/vice/C64/kernal @@ -213,25 +196,21 @@ ${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 +${PLIST.sdl}share/vice/C64/sdl_sym_nl.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 -${PLIST.x11}share/vice/C64/x11_pos_de.vkm -${PLIST.x11}share/vice/C64/x11_sym.vkm -${PLIST.x11}share/vice/C64/x11_sym_de.vkm share/vice/C64DTV/basic share/vice/C64DTV/c64mem.sym share/vice/C64DTV/chargen share/vice/C64DTV/default.vrs share/vice/C64DTV/dtvrom.bin +${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/gtk3_sym_nl.vkm share/vice/C64DTV/kernal ${PLIST.sdl}share/vice/C64DTV/sdl_hotkeys.vkm ${PLIST.sdl}share/vice/C64DTV/sdl_keyrah.vkm @@ -246,19 +225,8 @@ ${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 +${PLIST.sdl}share/vice/C64DTV/sdl_sym_nl.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 -${PLIST.x11}share/vice/C64DTV/x11_pos_de.vkm -${PLIST.x11}share/vice/C64DTV/x11_sym.vkm -${PLIST.x11}share/vice/C64DTV/x11_sym_de.vkm share/vice/CBM-II/amber.vpl share/vice/CBM-II/basic.128 share/vice/CBM-II/basic.256 @@ -269,12 +237,15 @@ share/vice/CBM-II/ccs64.vpl share/vice/CBM-II/chargen.500 share/vice/CBM-II/chargen.600 share/vice/CBM-II/chargen.700 +share/vice/CBM-II/cjam.vpl share/vice/CBM-II/colodore.vpl share/vice/CBM-II/community-colors.vpl 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.x11}share/vice/CBM-II/gtk3_sym.vkm +${PLIST.x11}share/vice/CBM-II/gtk3_sym_de.vkm share/vice/CBM-II/kernal share/vice/CBM-II/kernal.500 share/vice/CBM-II/pc64.vpl @@ -293,10 +264,6 @@ ${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 share/vice/DRIVES/d1571cr share/vice/DRIVES/dos1001 @@ -324,6 +291,19 @@ share/vice/PET/edit4b40 share/vice/PET/edit4b80 share/vice/PET/edit4g40 share/vice/PET/green.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 share/vice/PET/hre-9000.324992-02.bin share/vice/PET/hre-a000.324993-02.bin share/vice/PET/hre.vrs @@ -348,50 +328,21 @@ share/vice/PET/waterloo-d000.901898-04.bin 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 -${PLIST.x11}share/vice/PET/x11_bude_sym_de.vkm -${PLIST.x11}share/vice/PET/x11_buuk_pos.vkm -${PLIST.x11}share/vice/PET/x11_buuk_pos_de.vkm -${PLIST.x11}share/vice/PET/x11_buuk_sym.vkm -${PLIST.x11}share/vice/PET/x11_buuk_sym_de.vkm -${PLIST.x11}share/vice/PET/x11_grus_pos.vkm -${PLIST.x11}share/vice/PET/x11_grus_pos_de.vkm -${PLIST.x11}share/vice/PET/x11_grus_sym.vkm -${PLIST.x11}share/vice/PET/x11_grus_sym_de.vkm -${PLIST.x11}share/vice/PET/x11_sym.vkm share/vice/PLUS4/3plus1hi share/vice/PLUS4/3plus1lo share/vice/PLUS4/basic share/vice/PLUS4/c2lo.364 share/vice/PLUS4/colodore_ted.vpl share/vice/PLUS4/default.vrs +${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 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 share/vice/PLUS4/yape-ntsc.vpl share/vice/PLUS4/yape-pal.vpl share/vice/PRINTER/1520.vpl @@ -405,12 +356,18 @@ share/vice/SCPU64/c64hq.vpl share/vice/SCPU64/c64s.vpl share/vice/SCPU64/ccs64.vpl share/vice/SCPU64/chargen +share/vice/SCPU64/cjam.vpl share/vice/SCPU64/colodore.vpl share/vice/SCPU64/community-colors.vpl share/vice/SCPU64/deekay.vpl share/vice/SCPU64/default.vrs share/vice/SCPU64/frodo.vpl share/vice/SCPU64/godot.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/gtk3_sym_nl.vkm share/vice/SCPU64/jpchrgen share/vice/SCPU64/pc64.vpl share/vice/SCPU64/pepto-ntsc-sony.vpl @@ -434,19 +391,14 @@ ${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 +${PLIST.sdl}share/vice/SCPU64/sdl_sym_nl.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 -${PLIST.x11}share/vice/SCPU64/x11_sym_de.vkm share/vice/VIC20/basic share/vice/VIC20/chargen share/vice/VIC20/colodore_vic.vpl share/vice/VIC20/default.vrs +${PLIST.x11}share/vice/VIC20/gtk3_pos.vkm +${PLIST.x11}share/vice/VIC20/gtk3_sym.vkm share/vice/VIC20/kernal share/vice/VIC20/mike-ntsc.vpl share/vice/VIC20/mike-pal.vpl @@ -454,10 +406,7 @@ ${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 share/vice/fonts/vice-cbm.bdf ${PLIST.pcf}share/vice/fonts/vice-cbm.pcf +${PLIST.x11}share/vice/gui/vice.gresource diff --git a/emulators/vice/distinfo b/emulators/vice/distinfo index 9dafa867e55..a044cb1a779 100644 --- a/emulators/vice/distinfo +++ b/emulators/vice/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.45 2018/07/14 16:05:19 maya Exp $ +$NetBSD: distinfo,v 1.46 2018/12/31 15:38:55 rhialto Exp $ -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 +SHA1 (vice-3.3.tar.gz) = 55a34feb29955da40067ee5a5171278ed0191c93 +RMD160 (vice-3.3.tar.gz) = 7b014f2b3ed1287e74ba93c1e30a547fe40582ce +SHA512 (vice-3.3.tar.gz) = 702942e33b6e3d7e29ca6ed483242319ed5f6be26831def88a282cf7dce25d4c34dbf3651fcf8b583492fcb280ce5f4304c6eda3712088a73db24772c7a2bb3a +Size (vice-3.3.tar.gz) = 22742913 bytes +SHA1 (patch-configure) = fd17525277067aa8aee3e2ea85d4c59c7f52a969 +SHA1 (patch-data_fonts_Makefile.in) = ed5b427acb6c6a20ff9e69fa9863b108e1d1675d diff --git a/emulators/vice/options.mk b/emulators/vice/options.mk index f32d585cc48..4d1ffd598cc 100644 --- a/emulators/vice/options.mk +++ b/emulators/vice/options.mk @@ -1,41 +1,30 @@ -# $NetBSD: options.mk,v 1.9 2018/07/14 16:05:19 maya Exp $ +# $NetBSD: options.mk,v 1.10 2018/12/31 15:38:55 rhialto Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.vice -PKG_SUPPORTED_OPTIONS= ffmpeg vte +PKG_SUPPORTED_OPTIONS= ffmpeg PKG_OPTIONS_REQUIRED_GROUPS= gui -PKG_OPTIONS_GROUP.gui= gtk2 gtk3wip sdl xaw -PKG_SUGGESTED_OPTIONS= gtk2 +PKG_OPTIONS_GROUP.gui= gtk3 sdl sdl2 +PKG_SUGGESTED_OPTIONS= gtk3 ffmpeg .include "../../mk/bsd.options.mk" -PLIST_VARS+= mo pcf sdl x11 +PLIST_VARS+= pcf sdl x11 -# Cocoa user interface works only in application bundle. -#.if !empty(PKG_OPTIONS:Mcocoa) -#CONFIGURE_ARGS+= --disable-bundle -#CONFIGURE_ARGS+= --with-cocoa -#PLIST.x11= yes -#INSTALL_TARGET= bindist -#.else -USE_TOOLS+= bdftopcf -#.endif - -.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:Mgtk3wip) +.if !empty(PKG_OPTIONS:Mgtk3) CONFIGURE_ARGS+= --enable-native-gtk3ui PLIST.pcf= yes PLIST.x11= yes . include "../../x11/gtk3/buildlink3.mk" +TOOL_DEPENDS+= glib2-tools>=2.56:../../devel/glib2-tools .endif .if !empty(PKG_OPTIONS:Msdl) +CONFIGURE_ARGS+= --enable-sdlui +PLIST.sdl= yes +. include "../../devel/SDL/buildlink3.mk" +.endif + +.if !empty(PKG_OPTIONS:Msdl2) CONFIGURE_ARGS+= --enable-sdlui2 PLIST.sdl= yes . include "../../devel/SDL2/buildlink3.mk" @@ -48,24 +37,3 @@ PLIST.sdl= yes CONFIGURE_ARGS+= --enable-external-ffmpeg . include "../../multimedia/ffmpeg3/buildlink3.mk" .endif - -.if !empty(PKG_OPTIONS:Mvte) -. 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" -. include "../../x11/libXmu/buildlink3.mk" -. include "../../x11/libXaw/buildlink3.mk" -. include "../../x11/libXpm/buildlink3.mk" -. include "../../x11/libXrandr/buildlink3.mk" -. include "../../x11/libXv/buildlink3.mk" -. include "../../x11/libXxf86vm/buildlink3.mk" -.endif diff --git a/emulators/vice/patches/patch-configure b/emulators/vice/patches/patch-configure index c221f024ca5..543a0fca469 100644 --- a/emulators/vice/patches/patch-configure +++ b/emulators/vice/patches/patch-configure @@ -1,27 +1,58 @@ -$NetBSD: patch-configure,v 1.1 2017/08/16 17:54:09 adam Exp $ +$NetBSD: patch-configure,v 1.2 2018/12/31 15:38:55 rhialto Exp $ -1. Portability problem with "text xx == yy" - (in a section for some other OS, so not too relevant). -2. Use the NetBSD configuration for every OS since the PLIST is +1. Use the NetBSD configuration for every OS since the PLIST is hardcoded for that. Should fix every non-NetBSD platform. ---- configure.orig 2012-11-02 21:06:04.000000000 +0000 +--- configure.orig 2018-12-19 21:25:02.000000000 +0000 +++ configure -@@ -20158,7 +20158,7 @@ fi +@@ -8782,34 +8782,6 @@ case "$host_os" in esac + +-case "$host_os" in +- freebsd*) +- CPPFLAGS="$CPPFLAGS -I/usr/local/include" +- fbsdrtp=`${CONFIG_SHELL-/bin/sh} "$srcdir/config.rpath" "$CC" "$GCC" "$LDFLAGS" "$LD" "$with_gnu_ld" "$host" "/usr/local/lib"` +- LDFLAGS="$LDFLAGS $fbsdrtp -L/usr/local/lib" +- ;; +- netbsd*) +- CPPFLAGS="$CPPFLAGS -I/usr/pkg/include -I/usr/include" +- nbsdrtp=`${CONFIG_SHELL-/bin/sh} "$srcdir/config.rpath" "$CC" "$GCC" "$LDFLAGS" "$LD" "$with_gnu_ld" "$host" "/usr/pkg/lib"` +- LDFLAGS="$LDFLAGS $nbsdrtp -L/usr/pkg/lib" +- if test -d "/usr/X11R7/lib"; then +- rtp=`${CONFIG_SHELL-/bin/sh} "$srcdir/config.rpath" "$CC" "$GCC" "$LDFLAGS" "$LD" "$with_gnu_ld" "$host" "/usr/X11R7/lib"` +- LDFLAGS="$LDFLAGS $rtp" +- else +- if test -d "/usr/X11R6/lib"; then +- rtp=`${CONFIG_SHELL-/bin/sh} "$srcdir/config.rpath" "$CC" "$GCC" "$LDFLAGS" "$LD" "$with_gnu_ld" "$host" "/usr/X11R6/lib"` +- LDFLAGS="$LDFLAGS $rtp" +- fi +- fi +- ;; +- dragonfly*) +- CPPFLAGS="$CPPFLAGS -I/usr/local/include" +- dfbsdrtp=`${CONFIG_SHELL-/bin/sh} "$srcdir/config.rpath" "$CC" "$GCC" "$LDFLAGS" "$LD" "$with_gnu_ld" "$host" "/usr/local/lib"` +- LDFLAGS="$LDFLAGS $dfbsdrtp -L/usr/local/lib" +- ;; +- *) +- ;; +-esac + + + if test x"$enable_shared_ffmpeg" = "xyes" -o x"$enable_static_ffmpeg" = "xyes"; then +@@ -21894,7 +21866,7 @@ _ACEOF + + case "$host_os" in - netbsd*) + *) VICEDIR="$PREFIX/share/vice" if true; then ALTERNATE_DOCDIR_TRUE= -@@ -20167,52 +20167,6 @@ else - ALTERNATE_DOCDIR_TRUE='#' - ALTERNATE_DOCDIR_FALSE= +@@ -21905,51 +21877,6 @@ else fi -- -- ;; + + ;; - freebsd*) - VICEDIR="$PREFIX/lib/vice" - if true; then @@ -66,6 +97,7 @@ $NetBSD: patch-configure,v 1.1 2017/08/16 17:54:09 adam Exp $ - ALTERNATE_DOCDIR_FALSE= -fi - - ;; +- ;; esac + diff --git a/emulators/vice/patches/patch-data_fonts_Makefile.in b/emulators/vice/patches/patch-data_fonts_Makefile.in index d3318668582..0729a9c7706 100644 --- a/emulators/vice/patches/patch-data_fonts_Makefile.in +++ b/emulators/vice/patches/patch-data_fonts_Makefile.in @@ -1,12 +1,12 @@ -$NetBSD: patch-data_fonts_Makefile.in,v 1.2 2017/08/16 17:54:09 adam Exp $ +$NetBSD: patch-data_fonts_Makefile.in,v 1.3 2018/12/31 15:38:55 rhialto Exp $ Don't try to mess in ${HOME}. Don't try mkfontdir (that is done at pkg_add time). Don't use bdftopcf on Darwin. ---- data/fonts/Makefile.in.orig 2017-03-30 20:40:42.000000000 +0000 +--- data/fonts/Makefile.in.orig 2018-12-19 21:25:03.000000000 +0000 +++ data/fonts/Makefile.in -@@ -555,22 +555,9 @@ uninstall-am: uninstall-fontsDATA +@@ -589,22 +589,10 @@ uninstall-am: uninstall-fontsDATA install: install-data-am @@ -26,9 +26,10 @@ Don't use bdftopcf on Darwin. -@SDL_COMPILE_FALSE@ cd $(DESTDIR)$(fontsdir) ; \ -@SDL_COMPILE_FALSE@ bdftopcf -o vice-cbm.pcf vice-cbm.bdf ; \ -@SDL_COMPILE_FALSE@ ${MKFONTDIR_BIN} . -+@MACOSX_COCOA_FALSE@@SDL_COMPILE_FALSE@ @echo "Preparing fontdir..." ; \ -+@MACOSX_COCOA_FALSE@@SDL_COMPILE_FALSE@ cd $(DESTDIR)$(fontsdir) ; \ -+@MACOSX_COCOA_FALSE@@SDL_COMPILE_FALSE@ bdftopcf -o vice-cbm.pcf vice-cbm.bdf ++@UNIX_MACOSX_COMPILE_FALSE@@SDL_COMPILE_FALSE@ @echo "Preparing fontdir..." ; \ ++@UNIX_MACOSX_COMPILE_FALSE@@SDL_COMPILE_FALSE@ cd $(DESTDIR)$(fontsdir) ; \ ++@UNIX_MACOSX_COMPILE_FALSE@@SDL_COMPILE_FALSE@ bdftopcf -o vice-cbm.pcf vice-cbm.bdf ; \ ++@UNIX_MACOSX_COMPILE_FALSE@@SDL_COMPILE_FALSE@ ${MKFONTDIR_BIN} . # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/emulators/vice/patches/patch-po_Makefile.in.in b/emulators/vice/patches/patch-po_Makefile.in.in deleted file mode 100644 index 6ec9ca8beed..00000000000 --- a/emulators/vice/patches/patch-po_Makefile.in.in +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-po_Makefile.in.in,v 1.1 2017/08/16 17:54:09 adam Exp $ - -Bring back DESTDIR support which is somehow patched out by pkgsrc. - ---- po/Makefile.in.in.orig 2011-02-27 00:39:47.000000000 +0100 -+++ po/Makefile.in.in 2011-02-27 01:11:12.000000000 +0100 -@@ -128,8 +128,8 @@ - for cat in $$catalogs; do \ - cat=`basename $$cat`; \ - case "$$cat" in \ -- *.gmo) destdir=$(gnulocaledir);; \ -- *) destdir=$(localedir);; \ -+ *.gmo) destdir=$(DESTDIR)$(gnulocaledir);; \ -+ *) destdir=$(DESTDIR)$(localedir);; \ - esac; \ - lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ - dir=$$destdir/$$lang/LC_MESSAGES; \ |