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: adam
Date: Wed Aug 16 17:54:09 UTC 2017
Modified Files:
pkgsrc/emulators/vice: Makefile PLIST distinfo options.mk
pkgsrc/emulators/vice/patches: patch-data_fonts_Makefile.in
Added Files:
pkgsrc/emulators/vice/patches: patch-configure patch-po_Makefile.in.in
Removed Files:
pkgsrc/emulators/vice: PLIST.sdl PLIST.x11
pkgsrc/emulators/vice/patches: patch-aa patch-ab
patch-src_gfxoutputdrv_gifdrv.c
Log Message:
Changes in VICE 3.1
General
- New support for double sided 1571 g64 and p64 images.
- SID filter improvements.
C64(SC)/SCPU64/C64DTV/C128 changes
- New joyport script64 dongle emulation.
- New joyport vizawrite64 dongle emulation.
- Fixed joyport paperclip64 dongle emulation.
- Fixed StarDOS emulation.
XVIC
- Fixed VIA emulation.
C1541
- Fixed commands and added new commands.
BeOS/Haiku changes
- New drag & drop support: dragging a file from Tracker into the window
now autostarts it, and dragging text into the window pastes it.
To generate a diff of this commit:
cvs rdiff -u -r1.124 -r1.125 pkgsrc/emulators/vice/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/emulators/vice/PLIST
cvs rdiff -u -r1.1 -r0 pkgsrc/emulators/vice/PLIST.sdl
cvs rdiff -u -r1.2 -r0 pkgsrc/emulators/vice/PLIST.x11
cvs rdiff -u -r1.43 -r1.44 pkgsrc/emulators/vice/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/emulators/vice/options.mk
cvs rdiff -u -r1.11 -r0 pkgsrc/emulators/vice/patches/patch-aa
cvs rdiff -u -r1.13 -r0 pkgsrc/emulators/vice/patches/patch-ab
cvs rdiff -u -r0 -r1.1 pkgsrc/emulators/vice/patches/patch-configure \
pkgsrc/emulators/vice/patches/patch-po_Makefile.in.in
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/emulators/vice/patches/patch-data_fonts_Makefile.in
cvs rdiff -u -r1.1 -r0 \
pkgsrc/emulators/vice/patches/patch-src_gfxoutputdrv_gifdrv.c
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.124 pkgsrc/emulators/vice/Makefile:1.125
--- pkgsrc/emulators/vice/Makefile:1.124 Sun Feb 12 06:25:18 2017
+++ pkgsrc/emulators/vice/Makefile Wed Aug 16 17:54:09 2017
@@ -1,18 +1,15 @@
-# $NetBSD: Makefile,v 1.124 2017/02/12 06:25:18 ryoon Exp $
+# $NetBSD: Makefile,v 1.125 2017/08/16 17:54:09 adam Exp $
-DISTNAME= vice-2.4
-PKGREVISION= 19
-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@localhost
-HOMEPAGE= http://vice-emu.sourceforge.net/
-COMMENT= Emulator for C64, C128, CBM-II, PET, VIC20, Plus4 and C16
-LICENSE= gnu-gpl-v2
-
-BUILD_DEPENDS+= tex-pdftex-[0-9]*:../../print/tex-pdftex
+DISTNAME= vice-3.1
+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@localhost
+HOMEPAGE= http://vice-emu.sourceforge.net/
+COMMENT= Emulator for C64, C128, CBM-II, PET, VIC20, Plus4 and C16
+LICENSE= gnu-gpl-v2
RESTRICTED= ROM image copyright is questionable.
NO_BIN_ON_CDROM= ${RESTRICTED}
@@ -20,32 +17,30 @@ NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
NO_SRC_ON_FTP= ${RESTRICTED}
-EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
-
-USE_PKGLOCALEDIR= YES
-USE_TOOLS+= bdftopcf gmake msgfmt
-USE_TOOLS+= pkg-config
+USE_PKGLOCALEDIR= yes
USE_LANGUAGES= c c++
-GNU_CONFIGURE= YES
-CONFIGURE_ENV+= toolchain_check=no
+USE_TOOLS+= gmake msgfmt pkg-config
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --enable-ethernet
+CONFIGURE_ARGS+= --enable-fullscreen
+CONFIGURE_ARGS.NetBSD+= --without-oss
-INFO_FILES= YES
+INFO_FILES= yes
FONTS_DIRS.x11= ${PREFIX}/share/vice/fonts
REQD_DIRS+= ${PREFIX}/share/vice/fonts
REQD_DIRS+= ${PREFIX}/share/vice
-PLIST_SRC+= PLIST
-
.include "options.mk"
-CONFIGURE_ARGS.NetBSD+= --without-oss
-CPPFLAGS.NetBSD+= -DHAVE_STDINT_H
-CPPFLAGS.DragonFly+= -DHAVE_STDINT_H
-
-.include "../../mk/readline.buildlink3.mk"
+.include "../../audio/flac/buildlink3.mk"
+.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/png/buildlink3.mk"
.include "../../graphics/giflib/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../net/libpcap/buildlink3.mk"
.include "../../mk/jpeg.buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/emulators/vice/PLIST
diff -u pkgsrc/emulators/vice/PLIST:1.24 pkgsrc/emulators/vice/PLIST:1.25
--- pkgsrc/emulators/vice/PLIST:1.24 Wed Dec 12 09:58:03 2012
+++ pkgsrc/emulators/vice/PLIST Wed Aug 16 17:54:09 2017
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2012/12/12 09:58:03 wiz Exp $
+@comment $NetBSD: PLIST,v 1.25 2017/08/16 17:54:09 adam Exp $
bin/c1541
bin/cartconv
bin/petcat
@@ -11,61 +11,83 @@ bin/xcbm2
bin/xcbm5x0
bin/xpet
bin/xplus4
+bin/xscpu64
bin/xvic
info/vice.info
-info/vice.pdf
info/vice.txt
man/man1/c1541.1
+man/man1/cartconv.1
man/man1/petcat.1
man/man1/vice.1
-share/doc/vice/64doc.txt
-share/doc/vice/65C02.txt
-share/doc/vice/BUGS
+share/doc/vice/Android-Howto.txt
share/doc/vice/CIA-README.txt
+share/doc/vice/CIPS2008.png
share/doc/vice/COPYING
-share/doc/vice/CommodoreInnovationPriceSoftware2008.jpg
share/doc/vice/Documentation-Howto.txt
share/doc/vice/Doxygen-Howto.txt
-share/doc/vice/GP2X-Howto.txt
+share/doc/vice/GTK3-Howto.txt
+share/doc/vice/Lato-Bold.eot
+share/doc/vice/Lato-Bold.ttf
+share/doc/vice/Lato-Bold.woff
+share/doc/vice/Lato-Bold.woff2
+share/doc/vice/Lato-BoldItalic.eot
+share/doc/vice/Lato-BoldItalic.ttf
+share/doc/vice/Lato-BoldItalic.woff
+share/doc/vice/Lato-BoldItalic.woff2
+share/doc/vice/Lato-Italic.eot
+share/doc/vice/Lato-Italic.ttf
+share/doc/vice/Lato-Italic.woff
+share/doc/vice/Lato-Italic.woff2
+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/NEWS
share/doc/vice/NLS-Howto.txt
+share/doc/vice/OFL.txt
share/doc/vice/OpenVMS-Howto.txt
-share/doc/vice/PETdoc.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/TODO
-share/doc/vice/VIC-Addendum.txt
-share/doc/vice/VIC-Article.txt
-share/doc/vice/VIC-Artikel.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
+share/doc/vice/android.html
share/doc/vice/beos.html
-share/doc/vice/cbm_basic_tokens.txt
share/doc/vice/coding-guidelines.txt
-share/doc/vice/drive_info.txt
+share/doc/vice/darwin.html
+share/doc/vice/hardware-sids.txt
share/doc/vice/iec-bus.txt
share/doc/vice/index.html
share/doc/vice/macosx.html
share/doc/vice/new.gif
-share/doc/vice/pixel_aspect.txt
+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
-share/doc/vice/serial.txt
+share/doc/vice/sitemap.xml
share/doc/vice/solaris.html
-share/doc/vice/vice-logo-small.png
-share/doc/vice/vice-logo.jpg
+share/doc/vice/sortix.html
+share/doc/vice/vice-logo.svg
share/doc/vice/vice.chm
share/doc/vice/vice.css
share/doc/vice/vice.guide
@@ -87,6 +109,8 @@ share/doc/vice/vice_18.html
share/doc/vice/vice_19.html
share/doc/vice/vice_2.html
share/doc/vice/vice_20.html
+share/doc/vice/vice_21.html
+share/doc/vice/vice_22.html
share/doc/vice/vice_3.html
share/doc/vice/vice_4.html
share/doc/vice/vice_5.html
@@ -95,22 +119,39 @@ share/doc/vice/vice_7.html
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
share/vice/C128/basic64
share/vice/C128/basichi
share/vice/C128/basiclo
share/vice/C128/c64hq.vpl
share/vice/C128/c64s.vpl
share/vice/C128/ccs64.vpl
+share/vice/C128/chargch
share/vice/C128/chargde
share/vice/C128/chargen
share/vice/C128/chargfr
share/vice/C128/chargse
-share/vice/C128/default.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
share/vice/C128/kernal
share/vice/C128/kernal64
+share/vice/C128/kernalch
share/vice/C128/kernalde
share/vice/C128/kernalfi
share/vice/C128/kernalfr
@@ -118,28 +159,79 @@ share/vice/C128/kernalit
share/vice/C128/kernalno
share/vice/C128/kernalse
share/vice/C128/pc64.vpl
+share/vice/C128/pepto-ntsc-sony.vpl
+share/vice/C128/pepto-ntsc.vpl
+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_pos.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/default.vpl
+share/vice/C64/colodore.vpl
+share/vice/C64/community-colors.vpl
+share/vice/C64/deekay.vpl
share/vice/C64/default.vrs
+share/vice/C64/edkernal
share/vice/C64/frodo.vpl
share/vice/C64/godot.vpl
+share/vice/C64/gskernal
+share/vice/C64/jpchrgen
+share/vice/C64/jpkernal
share/vice/C64/kernal
share/vice/C64/pc64.vpl
+share/vice/C64/pepto-ntsc-sony.vpl
+share/vice/C64/pepto-ntsc.vpl
+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_keyrah.vkm
+${PLIST.sdl}share/vice/C64/sdl_keyrah_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
+share/vice/C64/sxkernal
share/vice/C64/vice.vpl
+${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
share/vice/C64DTV/kernal
+${PLIST.sdl}share/vice/C64DTV/sdl_keyrah.vkm
+${PLIST.sdl}share/vice/C64DTV/sdl_keyrah_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
+share/vice/C64DTV/spiff.vpl
+${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
@@ -150,32 +242,43 @@ 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/default.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
share/vice/CBM-II/kernal
share/vice/CBM-II/kernal.500
share/vice/CBM-II/pc64.vpl
+share/vice/CBM-II/pepto-ntsc-sony.vpl
+share/vice/CBM-II/pepto-ntsc.vpl
+share/vice/CBM-II/pepto-pal.vpl
+share/vice/CBM-II/pepto-palold.vpl
+share/vice/CBM-II/ptoing.vpl
+share/vice/CBM-II/rgb.vpl
share/vice/CBM-II/rom128h.vrs
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_sym.vkm
+share/vice/CBM-II/vice.vpl
share/vice/CBM-II/white.vpl
+${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
+share/vice/DRIVES/dos1540
share/vice/DRIVES/dos1541
share/vice/DRIVES/dos1551
share/vice/DRIVES/dos1570
share/vice/DRIVES/dos1571
share/vice/DRIVES/dos1581
-share/vice/DRIVES/dos2000
share/vice/DRIVES/dos2031
share/vice/DRIVES/dos2040
share/vice/DRIVES/dos3040
-share/vice/DRIVES/dos4000
share/vice/DRIVES/dos4040
share/vice/PET/amber.vpl
share/vice/PET/basic1
@@ -191,6 +294,9 @@ share/vice/PET/edit4b40
share/vice/PET/edit4b80
share/vice/PET/edit4g40
share/vice/PET/green.vpl
+share/vice/PET/hre-9000.324992-02.bin
+share/vice/PET/hre-a000.324993-02.bin
+share/vice/PET/hre.vrs
share/vice/PET/kernal1
share/vice/PET/kernal2
share/vice/PET/kernal4
@@ -201,6 +307,9 @@ 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_buuk_sym.vkm
+${PLIST.sdl}share/vice/PET/sdl_grus_sym.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
share/vice/PET/waterloo-c000.901898-03.bin
@@ -208,25 +317,87 @@ 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/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/default.vpl
+share/vice/PLUS4/colodore_ted.vpl
share/vice/PLUS4/default.vrs
share/vice/PLUS4/kernal
+share/vice/PLUS4/kernal.005
share/vice/PLUS4/kernal.232
share/vice/PLUS4/kernal.364
-share/vice/PLUS4/vice.vpl
+${PLIST.sdl}share/vice/PLUS4/sdl_pos.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
share/vice/PRINTER/cbm1526
share/vice/PRINTER/mps801
share/vice/PRINTER/mps803
share/vice/PRINTER/mps803.vpl
share/vice/PRINTER/nl10-cbm
+share/vice/PRINTER/nl10.vpl
+share/vice/SCPU64/c64hq.vpl
+share/vice/SCPU64/c64s.vpl
+share/vice/SCPU64/ccs64.vpl
+share/vice/SCPU64/chargen
+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
+share/vice/SCPU64/jpchrgen
+share/vice/SCPU64/pc64.vpl
+share/vice/SCPU64/pepto-ntsc-sony.vpl
+share/vice/SCPU64/pepto-ntsc.vpl
+share/vice/SCPU64/pepto-pal.vpl
+share/vice/SCPU64/pepto-palold.vpl
+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_keyrah.vkm
+${PLIST.sdl}share/vice/SCPU64/sdl_keyrah_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
+share/vice/SCPU64/vice.vpl
+${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/default.vpl
+share/vice/VIC20/colodore_vic.vpl
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_pos.vkm
+${PLIST.sdl}share/vice/VIC20/sdl_pos_fi.vkm
+share/vice/VIC20/vice.vpl
+${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
Index: pkgsrc/emulators/vice/distinfo
diff -u pkgsrc/emulators/vice/distinfo:1.43 pkgsrc/emulators/vice/distinfo:1.44
--- pkgsrc/emulators/vice/distinfo:1.43 Thu Mar 23 17:06:50 2017
+++ pkgsrc/emulators/vice/distinfo Wed Aug 16 17:54:09 2017
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.43 2017/03/23 17:06:50 joerg Exp $
+$NetBSD: distinfo,v 1.44 2017/08/16 17:54:09 adam Exp $
-SHA1 (vice-2.4.tar.gz) = 719aa96cc72e7578983fadea1a31c21898362bc7
-RMD160 (vice-2.4.tar.gz) = 6ff3b4a410ef70aa135e2245e6855cfa63373e2c
-SHA512 (vice-2.4.tar.gz) = ad197fc35eb80c9738b7f4f551d350dbb4440c7c8103e5d472b7f7ea5106c1356e9d6e3f481552a028a313129ef233833d3147e03f6f00b9890229d5708e3ebb
-Size (vice-2.4.tar.gz) = 13656511 bytes
-SHA1 (patch-aa) = 7ecda5911a2dd0e7ef8676959d9dc021323d393f
-SHA1 (patch-ab) = ab982bb762bebf56eb54859a38fe47b58d31ac67
-SHA1 (patch-data_fonts_Makefile.in) = 89b2a57822f58242d8d325d467b54353cf230906
-SHA1 (patch-src_gfxoutputdrv_gifdrv.c) = 5c48a3c897ead6e28302ada42163cc35e63b6488
+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 (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.7 pkgsrc/emulators/vice/options.mk:1.8
--- pkgsrc/emulators/vice/options.mk:1.7 Wed Dec 12 09:58:03 2012
+++ pkgsrc/emulators/vice/options.mk Wed Aug 16 17:54:09 2017
@@ -1,73 +1,66 @@
-# $NetBSD: options.mk,v 1.7 2012/12/12 09:58:03 wiz Exp $
+# $NetBSD: options.mk,v 1.8 2017/08/16 17:54:09 adam Exp $
-PKG_OPTIONS_VAR= PKG_OPTIONS.vice
-PKG_SUPPORTED_OPTIONS= ffmpeg lame vice-fullscreen vice-hwscaling vice-ethernet
-PKG_OPTIONS_REQUIRED_GROUPS = gui
-PKG_OPTIONS_GROUP.gui = xaw gnome sdl
-PKG_SUGGESTED_OPTIONS= ffmpeg lame vice-fullscreen vice-hwscaling vice-ethernet
-PKG_SUGGESTED_OPTIONS+= xaw
+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
.include "../../mk/bsd.options.mk"
-.if !empty(PKG_OPTIONS:Mxaw)
-. include "../../x11/libXt/buildlink3.mk"
-. include "../../x11/libXmu/buildlink3.mk"
-. include "../../x11/libXaw/buildlink3.mk"
-. include "../../x11/libXpm/buildlink3.mk"
-PLIST_SRC += PLIST.x11
-.endif
+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:Mgnome)
+.if !empty(PKG_OPTIONS:Mgtk2)
CONFIGURE_ARGS+= --enable-gnomeui
-PLIST_SRC+= PLIST.x11
+PLIST.pcf= yes
+PLIST.x11= yes
. include "../../x11/gtk2/buildlink3.mk"
-. include "../../x11/vte/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mgtk3)
+CONFIGURE_ARGS+= --enable-gnomeui3
+PLIST.pcf= yes
+PLIST.x11= yes
+. include "../../x11/gtk3/buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Msdl)
-CONFIGURE_ARGS+= --enable-sdlui
-PLIST_SRC+= PLIST.sdl
-. include "../../devel/SDL/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mvice-fullscreen)
-CONFIGURE_ARGS+= --enable-fullscreen
-. if !empty(PKG_OPTIONS:Mxaw)
-. include "../../x11/libXrandr/buildlink3.mk"
-. include "../../x11/libXxf86vm/buildlink3.mk"
-. endif
-. if !empty(PKG_OPTIONS:Mgnome)
-. include "../../x11/libXrandr/buildlink3.mk"
-. include "../../x11/libXxf86vm/buildlink3.mk"
-. endif
-. if !empty(PKG_OPTIONS:Msdl)
-. endif
-.endif
-
-.if !empty(PKG_OPTIONS:Mvice-hwscaling)
-. if !empty(PKG_OPTIONS:Mxaw)
-. include "../../x11/libXv/buildlink3.mk"
-. endif
-. if !empty(PKG_OPTIONS:Mgnome)
-. include "../../graphics/gtkglext/buildlink3.mk"
-. endif
-. if !empty(PKG_OPTIONS:Msdl)
-. endif
-.endif
-
-.if !empty(PKG_OPTIONS:Mvice-ethernet)
-CONFIGURE_ARGS+= --enable-ethernet
-. include "../../net/libpcap/buildlink3.mk"
+CONFIGURE_ARGS+= --enable-sdlui2
+PLIST.pcf= yes
+PLIST.sdl= yes
+. include "../../devel/SDL2/buildlink3.mk"
.endif
# If desired, ffmpeg and lame can be build-time-only dependencies,
# since they are loaded dynamically only.
.if !empty(PKG_OPTIONS:Mffmpeg)
#BUILDLINK_DEPMETHOD.ffmpeg?= build
-CONFIGURE_ARGS+= --enable-ffmpeg
-. include "../../multimedia/ffmpeg010/buildlink3.mk"
+CONFIGURE_ARGS+= --enable-external-ffmpeg
+. include "../../multimedia/ffmpeg3/buildlink3.mk"
.endif
-.if !empty(PKG_OPTIONS:Mlame)
-#BUILDLINK_DEPMETHOD.lame?= build
-. include "../../audio/lame/buildlink3.mk"
+
+.if !empty(PKG_OPTIONS:Mvte)
+. include "../../x11/vte/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mxaw)
+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
Index: pkgsrc/emulators/vice/patches/patch-data_fonts_Makefile.in
diff -u pkgsrc/emulators/vice/patches/patch-data_fonts_Makefile.in:1.1 pkgsrc/emulators/vice/patches/patch-data_fonts_Makefile.in:1.2
--- pkgsrc/emulators/vice/patches/patch-data_fonts_Makefile.in:1.1 Wed Dec 12 09:58:03 2012
+++ pkgsrc/emulators/vice/patches/patch-data_fonts_Makefile.in Wed Aug 16 17:54:09 2017
@@ -1,11 +1,12 @@
-$NetBSD: patch-data_fonts_Makefile.in,v 1.1 2012/12/12 09:58:03 wiz Exp $
+$NetBSD: patch-data_fonts_Makefile.in,v 1.2 2017/08/16 17:54:09 adam Exp $
-- Don't try to mess in ${HOME}.
-- Don't erase vice-cbm.bdf or try mkfontdir (that is done at pkg_add time).
+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 2012-11-02 21:06:50.000000000 +0000
+--- data/fonts/Makefile.in.orig 2017-03-30 20:40:42.000000000 +0000
+++ data/fonts/Makefile.in
-@@ -528,23 +528,9 @@ uninstall-am: uninstall-fontsDATA
+@@ -555,22 +555,9 @@ uninstall-am: uninstall-fontsDATA
install: install-data-am
@@ -21,14 +22,13 @@ $NetBSD: patch-data_fonts_Makefile.in,v
-@HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@ else \
-@HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@ echo 'fc-cache not available... giving up.' ; \
-@HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@ fi
--@HAVE_FC_CACHE_FALSE@@SDL_COMPILE_FALSE@ @echo "Preparing fontdir..." ; \
--@HAVE_FC_CACHE_FALSE@@SDL_COMPILE_FALSE@ cd $(DESTDIR)$(fontsdir) ; \
--@HAVE_FC_CACHE_FALSE@@SDL_COMPILE_FALSE@ bdftopcf -o vice-cbm.pcf vice-cbm.bdf ; \
--@HAVE_FC_CACHE_FALSE@@SDL_COMPILE_FALSE@ rm vice-cbm.bdf ; \
--@HAVE_FC_CACHE_FALSE@@SDL_COMPILE_FALSE@ mkfontdir .
-+@SDL_COMPILE_FALSE@ @echo "Preparing fontdir..." ; \
-+@SDL_COMPILE_FALSE@ cd $(DESTDIR)$(fontsdir) ; \
-+@SDL_COMPILE_FALSE@ bdftopcf -o vice-cbm.pcf vice-cbm.bdf
+-@SDL_COMPILE_FALSE@ @echo "Preparing fontdir..." ; \
+-@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
# 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.
Added files:
Index: pkgsrc/emulators/vice/patches/patch-configure
diff -u /dev/null pkgsrc/emulators/vice/patches/patch-configure:1.1
--- /dev/null Wed Aug 16 17:54:09 2017
+++ pkgsrc/emulators/vice/patches/patch-configure Wed Aug 16 17:54:09 2017
@@ -0,0 +1,71 @@
+$NetBSD: patch-configure,v 1.1 2017/08/16 17:54:09 adam 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
+ hardcoded for that. Should fix every non-NetBSD platform.
+
+--- configure.orig 2012-11-02 21:06:04.000000000 +0000
++++ configure
+@@ -20158,7 +20158,7 @@ fi
+ esac
+
+ 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=
+ fi
+-
+- ;;
+- freebsd*)
+- VICEDIR="$PREFIX/lib/vice"
+- if true; then
+- ALTERNATE_DOCDIR_TRUE=
+- ALTERNATE_DOCDIR_FALSE='#'
+-else
+- ALTERNATE_DOCDIR_TRUE='#'
+- ALTERNATE_DOCDIR_FALSE=
+-fi
+-
+- ;;
+- linux*)
+- if test x"$host_cpu" = "xx86_64"; then
+- VICEDIR="$PREFIX/lib64/vice"
+- if false; then
+- ALTERNATE_DOCDIR_TRUE=
+- ALTERNATE_DOCDIR_FALSE='#'
+-else
+- ALTERNATE_DOCDIR_TRUE='#'
+- ALTERNATE_DOCDIR_FALSE=
+-fi
+-
+- else
+- VICEDIR="$PREFIX/lib/vice"
+- if false; then
+- ALTERNATE_DOCDIR_TRUE=
+- ALTERNATE_DOCDIR_FALSE='#'
+-else
+- ALTERNATE_DOCDIR_TRUE='#'
+- ALTERNATE_DOCDIR_FALSE=
+-fi
+-
+- fi
+- ;;
+- *)
+- VICEDIR="$PREFIX/lib/vice"
+- if false; then
+- ALTERNATE_DOCDIR_TRUE=
+- ALTERNATE_DOCDIR_FALSE='#'
+-else
+- ALTERNATE_DOCDIR_TRUE='#'
+- ALTERNATE_DOCDIR_FALSE=
+-fi
+-
+ ;;
+ esac
+
Index: pkgsrc/emulators/vice/patches/patch-po_Makefile.in.in
diff -u /dev/null pkgsrc/emulators/vice/patches/patch-po_Makefile.in.in:1.1
--- /dev/null Wed Aug 16 17:54:09 2017
+++ pkgsrc/emulators/vice/patches/patch-po_Makefile.in.in Wed Aug 16 17:54:09 2017
@@ -0,0 +1,17 @@
+$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; \
Home |
Main Index |
Thread Index |
Old Index