On Thu, Jul 12, 2018 at 12:40:04PM +0200, Frederic Cambus wrote:
> On Sun, Jul 08, 2018 at 04:27:54PM +0200, Frederic Cambus wrote:
>
> > Here is a diff to update vice to 3.2.
> >
> > This update requires the previously submitted devel/xa port.
>
> For info, devel/xa has been in the ports tree since a few days already,
> making it easier to test this update.
As I did update vice to 3.0 and then to 3.1, I will take maintainership
for this port.
Here is an updated diff with the MAINTAINER line in.
Notable changes:
- Add a BUILD_DEPENDS on devel/xa, which is now required
- Switch to using SDL2
Comments? OK?
Index: Makefile
===
RCS file: /cvs/ports/emulators/vice/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile26 Jul 2017 22:45:20 - 1.9
+++ Makefile26 Jul 2018 16:43:22 -
@@ -2,37 +2,40 @@
COMMENT = versatile Commodore emulator
-DISTNAME = vice-3.1
-REVISION = 0
+DISTNAME = vice-3.2
CATEGORIES = emulators
HOMEPAGE = http://vice-emu.sourceforge.net/
+MAINTAINER = Frederic Cambus
+
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB += FLAC GL SDL c gif jpeg m ogg png pthread readline ${COMPILER_LIBCXX}
-WANTLIB += termcap vorbis vorbisenc vorbisfile z
+WANTLIB += ${COMPILER_LIBCXX} FLAC SDL2 c curses gif jpeg m ogg
+WANTLIB += png readline vorbis vorbisenc vorbisfile z
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=vice-emu/}
+BUILD_DEPENDS =devel/xa
+
LIB_DEPENDS = audio/flac \
audio/libvorbis \
- devel/sdl \
+ devel/sdl2 \
graphics/giflib \
graphics/jpeg \
graphics/png
CONFIGURE_STYLE = autoconf
-AUTOCONF_VERSION = 2.68
+AUTOCONF_VERSION = 2.69
CONFIGURE_ARGS += --without-oss \
--without-pulse \
--with-sdlsound \
--disable-lame \
--disable-portaudio \
- --enable-sdlui
+ --enable-sdlui2
CONFIGURE_ENV += ac_cv_header_mpg123_h=no
Index: distinfo
===
RCS file: /cvs/ports/emulators/vice/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo10 Apr 2017 10:47:28 - 1.3
+++ distinfo26 Jul 2018 16:43:22 -
@@ -1,2 +1,2 @@
-SHA256 (vice-3.1.tar.gz) = PrgVljOBYJUAbew2xcPt0FWof9i9oZOhGUpoAWhdEkA=
-SIZE (vice-3.1.tar.gz) = 30714226
+SHA256 (vice-3.2.tar.gz) = KNmfXhEHIMl+8W2N1CGc+aZ2YdWIGYNdGTeBQ2l7pSM=
+SIZE (vice-3.2.tar.gz) = 30279589
Index: patches/patch-configure_ac
===
RCS file: /cvs/ports/emulators/vice/patches/patch-configure_ac,v
retrieving revision 1.2
diff -u -p -r1.2 patch-configure_ac
--- patches/patch-configure_ac 10 Apr 2017 10:47:28 - 1.2
+++ patches/patch-configure_ac 26 Jul 2018 16:43:22 -
@@ -3,9 +3,10 @@ $OpenBSD: patch-configure_ac,v 1.2 2017/
Don't build a redundant copy of the documentation.
Don't run fc-cache on install.
configure.ac.orig Thu Mar 30 22:40:08 2017
-+++ configure.ac Fri Apr 7 22:07:03 2017
-@@ -653,12 +653,7 @@ fi
+Index: configure.ac
+--- configure.ac.orig
configure.ac
+@@ -675,12 +675,7 @@ fi
AC_CHECK_PROGS(MAKEINFO, makeinfo, no)
AC_CHECK_PROGS(TEXI2DVI, texi2dvi, no)
@@ -19,8 +20,8 @@ Don't run fc-cache on install.
AC_CHECK_PROGS(DOS2UNIX, dos2unix, dos2unix)
-@@ -3115,12 +3110,7 @@ if test x"$enable_lame" != "xno" ; then
-
+@@ -3252,12 +3247,7 @@ if test x"$enable_lame" != "xno" ; then
+ fi
fi
-AC_PATH_PROGS(FCCACHE, fc-cache, false)
Index: patches/patch-doc_Makefile_in
===
RCS file: /cvs/ports/emulators/vice/patches/patch-doc_Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-doc_Makefile_in
--- patches/patch-doc_Makefile_in 10 Apr 2017 10:47:28 - 1.2
+++ patches/patch-doc_Makefile_in 26 Jul 2018 16:43:22 -
@@ -2,9 +2,10 @@ $OpenBSD: patch-doc_Makefile_in,v 1.2 20
Don't build a redundant copy of vice.info, it breaks the build.
doc/Makefile.in.orig Thu Mar 30 22:40:43 2017
-+++ doc/Makefile.inFri Apr 7 22:07:04 2017
-@@ -1097,7 +1097,6 @@ $(builddir)/vice.inf:$(srcdir)/vice.texi
+Index: doc/Makefile.in
+--- doc/Makefile.in.orig
doc/Makefile.in
+@@ -1190,7 +1190,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.4
diff -u -p -r1.4 PLIST
---
