Hi ports@,
Here is a diff to update vice to 3.1.
Notable changes:
- Use the newly introduced --disable-portaudio configure option
- Avoid picking up mpg123
Comments? OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/emulators/vice/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile 1 Apr 2017 18:11:05 -0000 1.5
+++ Makefile 9 Apr 2017 13:37:34 -0000
@@ -2,8 +2,7 @@
COMMENT = versatile Commodore emulator
-DISTNAME = vice-3.0
-REVISION = 0
+DISTNAME = vice-3.1
CATEGORIES = emulators
@@ -31,9 +30,11 @@ CONFIGURE_ARGS += --without-oss \
--without-pulse \
--with-sdlsound \
--disable-lame \
+ --disable-portaudio \
--enable-sdlui
-CONFIGURE_ENV += ac_cv_header_portaudio_h=no
+CONFIGURE_ENV += ac_cv_header_mpg123_h=no
+
pre-configure:
${SUBST_CMD} ${WRKSRC}/man/vice.1
Index: distinfo
===================================================================
RCS file: /cvs/ports/emulators/vice/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 27 Mar 2017 10:08:16 -0000 1.2
+++ distinfo 9 Apr 2017 13:37:34 -0000
@@ -1,2 +1,2 @@
-SHA256 (vice-3.0.tar.gz) = vFaBE4GSDUOrXy+FpeCPIatb32GQ3V3+n1AKdF0Ulys=
-SIZE (vice-3.0.tar.gz) = 26513197
+SHA256 (vice-3.1.tar.gz) = PrgVljOBYJUAbew2xcPt0FWof9i9oZOhGUpoAWhdEkA=
+SIZE (vice-3.1.tar.gz) = 30714226
Index: patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/emulators/vice/patches/patch-configure_ac,v
retrieving revision 1.1
diff -u -p -r1.1 patch-configure_ac
--- patches/patch-configure_ac 27 Mar 2017 10:08:16 -0000 1.1
+++ patches/patch-configure_ac 9 Apr 2017 13:37:34 -0000
@@ -3,9 +3,9 @@ $OpenBSD: patch-configure_ac,v 1.1 2017/
Don't build a redundant copy of the documentation.
Don't run fc-cache on install.
---- configure.ac.orig Wed Mar 1 14:59:31 2017
-+++ configure.ac Wed Mar 1 15:01:35 2017
-@@ -643,12 +643,7 @@ fi
+--- configure.ac.orig Thu Mar 30 22:40:08 2017
++++ configure.ac Fri Apr 7 22:07:03 2017
+@@ -653,12 +653,7 @@ fi
AC_CHECK_PROGS(MAKEINFO, makeinfo, no)
AC_CHECK_PROGS(TEXI2DVI, texi2dvi, no)
@@ -19,7 +19,7 @@ Don't run fc-cache on install.
AC_CHECK_PROGS(DOS2UNIX, dos2unix, dos2unix)
-@@ -2998,12 +2993,7 @@ if test x"$enable_lame" != "xno" ; then
+@@ -3115,12 +3110,7 @@ if test x"$enable_lame" != "xno" ; then
fi
Index: patches/patch-doc_Makefile_in
===================================================================
RCS file: /cvs/ports/emulators/vice/patches/patch-doc_Makefile_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-doc_Makefile_in
--- patches/patch-doc_Makefile_in 27 Mar 2017 10:08:16 -0000 1.1
+++ patches/patch-doc_Makefile_in 9 Apr 2017 13:37:34 -0000
@@ -2,9 +2,9 @@ $OpenBSD: patch-doc_Makefile_in,v 1.1 20
Don't build a redundant copy of vice.info, it breaks the build.
---- doc/Makefile.in.orig Thu Dec 15 04:48:15 2016
-+++ doc/Makefile.in Thu Mar 23 22:47:12 2017
-@@ -1093,7 +1093,6 @@ $(builddir)/vice.inf: $(srcdir)/vice.texi
+--- 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
$(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.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 27 Mar 2017 10:08:16 -0000 1.3
+++ pkg/PLIST 9 Apr 2017 13:37:34 -0000
@@ -28,6 +28,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
@@ -60,6 +61,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
@@ -114,6 +116,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
@@ -193,6 +196,7 @@ lib/vice/PLUS4/3plus1hi
lib/vice/PLUS4/3plus1lo
lib/vice/PLUS4/basic
lib/vice/PLUS4/c2lo.364
+lib/vice/PLUS4/colodore_ted.vpl
lib/vice/PLUS4/default.vrs
lib/vice/PLUS4/kernal
lib/vice/PLUS4/kernal.005
@@ -214,6 +218,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
@@ -241,6 +246,7 @@ lib/vice/SCPU64/vice.vpl
lib/vice/VIC20/
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
@@ -255,20 +261,40 @@ lib/vice/doc/CIPS2008.png
lib/vice/doc/COPYING
lib/vice/doc/Documentation-Howto.txt
lib/vice/doc/Doxygen-Howto.txt
+lib/vice/doc/GTK3-Howto.txt
+lib/vice/doc/Lato-Bold.eot
+lib/vice/doc/Lato-Bold.ttf
+lib/vice/doc/Lato-Bold.woff
+lib/vice/doc/Lato-Bold.woff2
+lib/vice/doc/Lato-BoldItalic.eot
+lib/vice/doc/Lato-BoldItalic.ttf
+lib/vice/doc/Lato-BoldItalic.woff
+lib/vice/doc/Lato-BoldItalic.woff2
+lib/vice/doc/Lato-Italic.eot
+lib/vice/doc/Lato-Italic.ttf
+lib/vice/doc/Lato-Italic.woff
+lib/vice/doc/Lato-Italic.woff2
+lib/vice/doc/Lato-Regular.eot
+lib/vice/doc/Lato-Regular.ttf
+lib/vice/doc/Lato-Regular.woff
+lib/vice/doc/Lato-Regular.woff2
lib/vice/doc/Linux-Mingw32-Howto.txt
lib/vice/doc/Linux-Native-Howto.txt
lib/vice/doc/MSDOS-Ethernet-Howto.txt
lib/vice/doc/MSDOS-Howto.txt
+lib/vice/doc/MacOSX-Cocoa-Howto.txt
lib/vice/doc/MacOSX-Howto.txt
lib/vice/doc/MacOSX-ResourceTree.txt
lib/vice/doc/Minix-Howto.txt
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
@@ -296,6 +322,7 @@ lib/vice/doc/robots.txt
lib/vice/doc/sco.html
lib/vice/doc/sitemap.xml
lib/vice/doc/solaris.html
+lib/vice/doc/sortix.html
lib/vice/doc/vice-logo.svg
lib/vice/doc/vice.chm
lib/vice/doc/vice.css
@@ -327,6 +354,7 @@ lib/vice/doc/vice_7.html
lib/vice/doc/vice_8.html
lib/vice/doc/vice_9.html
lib/vice/doc/vice_toc.html
+lib/vice/doc/windows.html
lib/vice/fonts/
lib/vice/fonts/CBM.ttf
lib/vice/fonts/vice-cbm.bdf
