From 693b599b014d147a7a1a511accc9ba1ac74d186c Mon Sep 17 00:00:00 2001 From: dinoex Date: Sun, 14 May 2017 17:17:42 +0000 Subject: - update to 3.1 --- emulators/vice/Makefile | 11 ++++----- emulators/vice/distinfo | 6 ++--- .../vice/files/patch-src_arch_unix_io-access.c | 20 ---------------- .../vice/files/patch-src_iodrv_io-unix-access.c | 20 ++++++++++++++++ emulators/vice/pkg-plist | 28 ++++++++++++++++++++++ 5 files changed, 56 insertions(+), 29 deletions(-) delete mode 100644 emulators/vice/files/patch-src_arch_unix_io-access.c create mode 100644 emulators/vice/files/patch-src_iodrv_io-unix-access.c diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile index 9600e5b..f844593 100644 --- a/emulators/vice/Makefile +++ b/emulators/vice/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= vice -PORTVERSION= 3.0 -PORTREVISION= 1 +PORTVERSION= 3.1 CATEGORIES= emulators MASTER_SITES= http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/ \ ftp://ftp.zimmers.net/pub/cbm/crossplatform/emulators/VICE/ @@ -26,14 +25,15 @@ LIB_DEPENDS= libpng.so:graphics/png \ libFLAC.so:audio/flac \ libpci.so:devel/libpci \ libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 + libfreetype.so:print/freetype2 \ + libpcre2-8.so:devel/pcre2 \ + libgnutls.so:security/gnutls RESTRICTED= ROMs are copyrighted by Commodore Business Machines -USES= dos2unix pkgconfig makeinfo gmake iconv jpeg +USES= pkgconfig makeinfo gmake iconv jpeg USE_XORG= xpm ice sm xext xv xt x11 xmu xxf86vm USE_XORG+= xrender xinerama xi xrandr xcursor xcomposite xdamage xfixes -DOS2UNIX_FILES= doc/vice.texi src/arch/unix/io-access.c GNU_CONFIGURE= yes MAKE_ENV+= MAKEINFOFLAGS="--no-split" CFLAGS+= -I${LOCALBASE}/include @@ -41,7 +41,6 @@ LDFLAGS+= -L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include CONFIGURE_ARGS+= --enable-fullscreen --enable-ipv6 \ --enable-external-ffmpeg \ - --with-uithreads \ --disable-dependency-tracking LMLINKS= vice.1 x64.1 \ diff --git a/emulators/vice/distinfo b/emulators/vice/distinfo index e0422fa..218753d 100644 --- a/emulators/vice/distinfo +++ b/emulators/vice/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1484124124 -SHA256 (vice-3.0.tar.gz) = bc56811381920d43ab5f2f85a5e08f21ab5bdf6190dd5dfe9f500a745d14972b -SIZE (vice-3.0.tar.gz) = 26513197 +TIMESTAMP = 1491688299 +SHA256 (vice-3.1.tar.gz) = d923635362a090010156eedf549e11603f7d9d9d2f2df005a4e36392de4f1529 +SIZE (vice-3.1.tar.gz) = 30714226 diff --git a/emulators/vice/files/patch-src_arch_unix_io-access.c b/emulators/vice/files/patch-src_arch_unix_io-access.c deleted file mode 100644 index d82199a..0000000 --- a/emulators/vice/files/patch-src_arch_unix_io-access.c +++ /dev/null @@ -1,20 +0,0 @@ ---- src/arch/unix/io-access.c.orig 2016-11-17 19:06:26 UTC -+++ src/arch/unix/io-access.c -@@ -77,7 +77,7 @@ - #include "log.h" - #include "types.h" - --#if defined(__linux) || defined(__FreeBSD__) || ((defined(sun) || defined(__sun)) && (defined(__SVR4) || defined(__svr4__))) -+#if defined(__linux) || ((defined(sun) || defined(__sun)) && (defined(__SVR4) || defined(__svr4__))) - - #define IO_PORT_ACCESS - -@@ -162,7 +162,7 @@ static void device_io_outb(WORD addr, BY - } - #endif - --#ifdef __FreeBSD__ -+#if 0 - static int device_io_open(void) - { - io_fd = open("/dev/io", O_RDWR); diff --git a/emulators/vice/files/patch-src_iodrv_io-unix-access.c b/emulators/vice/files/patch-src_iodrv_io-unix-access.c new file mode 100644 index 0000000..49bb774 --- /dev/null +++ b/emulators/vice/files/patch-src_iodrv_io-unix-access.c @@ -0,0 +1,20 @@ +--- src/iodrv/io-unix-access.c.orig 2016-11-17 19:06:26 UTC ++++ src/iodrv/io-unix-access.c +@@ -77,7 +77,7 @@ + #include "log.h" + #include "types.h" + +-#if defined(__linux) || defined(__FreeBSD__) || ((defined(sun) || defined(__sun)) && (defined(__SVR4) || defined(__svr4__))) ++#if defined(__linux) || ((defined(sun) || defined(__sun)) && (defined(__SVR4) || defined(__svr4__))) + + #define IO_PORT_ACCESS + +@@ -162,7 +162,7 @@ static void device_io_outb(WORD addr, BY + } + #endif + +-#ifdef __FreeBSD__ ++#if 0 + static int device_io_open(void) + { + io_fd = open("/dev/io", O_RDWR); diff --git a/emulators/vice/pkg-plist b/emulators/vice/pkg-plist index 48835d9..f091e89 100644 --- a/emulators/vice/pkg-plist +++ b/emulators/vice/pkg-plist @@ -36,6 +36,7 @@ lib/vice/C128/chargde lib/vice/C128/chargen lib/vice/C128/chargfr lib/vice/C128/chargse +lib/vice/C128/colodore.vpl lib/vice/C128/community-colors.vpl lib/vice/C128/deekay.vpl lib/vice/C128/default.vrs @@ -68,6 +69,7 @@ lib/vice/C64/c64mem.sym lib/vice/C64/c64s.vpl lib/vice/C64/ccs64.vpl lib/vice/C64/chargen +lib/vice/C64/colodore.vpl lib/vice/C64/community-colors.vpl lib/vice/C64/deekay.vpl lib/vice/C64/default.vrs @@ -116,6 +118,7 @@ lib/vice/CBM-II/ccs64.vpl lib/vice/CBM-II/chargen.500 lib/vice/CBM-II/chargen.600 lib/vice/CBM-II/chargen.700 +lib/vice/CBM-II/colodore.vpl lib/vice/CBM-II/community-colors.vpl lib/vice/CBM-II/deekay.vpl lib/vice/CBM-II/frodo.vpl @@ -208,6 +211,7 @@ lib/vice/PLUS4/kernal lib/vice/PLUS4/kernal.005 lib/vice/PLUS4/kernal.232 lib/vice/PLUS4/kernal.364 +lib/vice/PLUS4/colodore_ted.vpl lib/vice/PLUS4/yape-ntsc.vpl lib/vice/PLUS4/yape-pal.vpl lib/vice/PLUS4/x11_pos.vkm @@ -224,6 +228,7 @@ lib/vice/SCPU64/c64hq.vpl lib/vice/SCPU64/c64s.vpl lib/vice/SCPU64/ccs64.vpl lib/vice/SCPU64/chargen +lib/vice/SCPU64/colodore.vpl lib/vice/SCPU64/community-colors.vpl lib/vice/SCPU64/deekay.vpl lib/vice/SCPU64/default.vrs @@ -246,6 +251,7 @@ lib/vice/SCPU64/x11_sym.vkm lib/vice/SCPU64/x11_sym_de.vkm lib/vice/VIC20/basic lib/vice/VIC20/chargen +lib/vice/VIC20/colodore_vic.vpl lib/vice/VIC20/default.vrs lib/vice/VIC20/kernal lib/vice/VIC20/mike-ntsc.vpl @@ -273,20 +279,40 @@ lib/vice/fonts/vice-cbm.pcf %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/Documentation-Howto.txt %%PORTDOCS%%%%DOCSDIR%%/Doxygen-Howto.txt +%%PORTDOCS%%%%DOCSDIR%%/GTK3-Howto.txt +%%PORTDOCS%%%%DOCSDIR%%/Lato-Bold.eot +%%PORTDOCS%%%%DOCSDIR%%/Lato-Bold.ttf +%%PORTDOCS%%%%DOCSDIR%%/Lato-Bold.woff +%%PORTDOCS%%%%DOCSDIR%%/Lato-Bold.woff2 +%%PORTDOCS%%%%DOCSDIR%%/Lato-BoldItalic.eot +%%PORTDOCS%%%%DOCSDIR%%/Lato-BoldItalic.ttf +%%PORTDOCS%%%%DOCSDIR%%/Lato-BoldItalic.woff +%%PORTDOCS%%%%DOCSDIR%%/Lato-BoldItalic.woff2 +%%PORTDOCS%%%%DOCSDIR%%/Lato-Italic.eot +%%PORTDOCS%%%%DOCSDIR%%/Lato-Italic.ttf +%%PORTDOCS%%%%DOCSDIR%%/Lato-Italic.woff +%%PORTDOCS%%%%DOCSDIR%%/Lato-Italic.woff2 +%%PORTDOCS%%%%DOCSDIR%%/Lato-Regular.eot +%%PORTDOCS%%%%DOCSDIR%%/Lato-Regular.ttf +%%PORTDOCS%%%%DOCSDIR%%/Lato-Regular.woff +%%PORTDOCS%%%%DOCSDIR%%/Lato-Regular.woff2 %%PORTDOCS%%%%DOCSDIR%%/Linux-Mingw32-Howto.txt %%PORTDOCS%%%%DOCSDIR%%/Linux-Native-Howto.txt %%PORTDOCS%%%%DOCSDIR%%/MSDOS-Ethernet-Howto.txt %%PORTDOCS%%%%DOCSDIR%%/MSDOS-Howto.txt +%%PORTDOCS%%%%DOCSDIR%%/MacOSX-Cocoa-Howto.txt %%PORTDOCS%%%%DOCSDIR%%/MacOSX-Howto.txt %%PORTDOCS%%%%DOCSDIR%%/MacOSX-ResourceTree.txt %%PORTDOCS%%%%DOCSDIR%%/Minix-Howto.txt %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/NLS-Howto.txt +%%PORTDOCS%%%%DOCSDIR%%/OFL.txt %%PORTDOCS%%%%DOCSDIR%%/OpenVMS-Howto.txt %%PORTDOCS%%%%DOCSDIR%%/OpenWatcom-Howto.txt %%PORTDOCS%%%%DOCSDIR%%/Readme-Amiga.txt %%PORTDOCS%%%%DOCSDIR%%/Readme-BeOS.txt %%PORTDOCS%%%%DOCSDIR%%/Readme-DOS.txt +%%PORTDOCS%%%%DOCSDIR%%/Readme-GTK3.txt %%PORTDOCS%%%%DOCSDIR%%/Readme-MacOSX.txt %%PORTDOCS%%%%DOCSDIR%%/Readme-OS2.txt %%PORTDOCS%%%%DOCSDIR%%/Readme-SDL.txt @@ -314,6 +340,7 @@ lib/vice/fonts/vice-cbm.pcf %%PORTDOCS%%%%DOCSDIR%%/sco.html %%PORTDOCS%%%%DOCSDIR%%/sitemap.xml %%PORTDOCS%%%%DOCSDIR%%/solaris.html +%%PORTDOCS%%%%DOCSDIR%%/sortix.html %%PORTDOCS%%%%DOCSDIR%%/vice-logo.svg %%PORTDOCS%%%%DOCSDIR%%/vice.chm %%PORTDOCS%%%%DOCSDIR%%/vice.css @@ -346,3 +373,4 @@ lib/vice/fonts/vice-cbm.pcf %%PORTDOCS%%%%DOCSDIR%%/vice_8.html %%PORTDOCS%%%%DOCSDIR%%/vice_9.html %%PORTDOCS%%%%DOCSDIR%%/vice_toc.html +%%PORTDOCS%%%%DOCSDIR%%/windows.html -- cgit v1.1