Hi,

Here's an update to residualvm-0.3.1.

Release notes:
https://github.com/residualvm/residualvm/blob/branch-0-3-1/NEWS

I also enabled sndio and switched from SDL to SDL2 (the default).
The PowerPC chunks of the configure patch were integrated upstream.

Index: Makefile
===================================================================
RCS file: /cvs/ports/games/residualvm/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile    16 Nov 2017 23:20:38 -0000      1.12
+++ Makefile    26 Jun 2018 06:35:45 -0000
@@ -2,8 +2,7 @@
 
 COMMENT =              interpreter for some LucasArts 3D games
 
-V =                    0.2.1
-REVISION =             3
+V =                    0.3.1
 DISTNAME =             residualvm-${V}-sources
 PKGNAME =              residualvm-${V}
 
@@ -14,15 +13,17 @@ HOMEPAGE =          http://residualvm.org/
 # GPLv2+
 PERMIT_PACKAGE_CDROM = Yes
 
-WANTLIB += GL SDL c freetype iconv jpeg m mad mpeg2 ogg png pthread 
${COMPILER_LIBCXX}
-WANTLIB += theoradec vorbis vorbisfile z
+WANTLIB += ${COMPILER_LIBCXX}
+WANTLIB += GL GLEW GLU SDL2 c freetype iconv jpeg m mad mpeg2
+WANTLIB += ogg png sndio theoradec vorbis vorbisfile z
 
-MASTER_SITES =         ${MASTER_SITE_SOURCEFORGE:=residualvm/}
+MASTER_SITES =         http://www.residualvm.org/downloads/release/${V}/
 
 LIB_DEPENDS =          audio/libmad \
                        audio/libvorbis \
                        converters/libiconv \
-                       devel/sdl \
+                       devel/sdl2 \
+                       graphics/glew \
                        graphics/jpeg \
                        graphics/libmpeg2 \
                        graphics/png \
@@ -38,6 +39,7 @@ SEPARATE_BUILD =      Yes
 USE_GMAKE =            Yes
 CONFIGURE_STYLE =      simple
 CONFIGURE_ARGS +=      --enable-verbose-build \
+                       --enable-sndio \
                        --mandir=${PREFIX}/man
 CONFIGURE_ENV =                CPPFLAGS="-I${LOCALBASE}/include 
-I${X11BASE}/include" \
                        LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/residualvm/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo    8 Apr 2015 14:38:11 -0000       1.2
+++ distinfo    26 Jun 2018 06:35:45 -0000
@@ -1,2 +1,2 @@
-SHA256 (residualvm-0.2.1-sources.tar.gz) = 
Hz/zY9APeZ447gj5hbZeBxNHgvY/8GWlvsaPyrTVeOQ=
-SIZE (residualvm-0.2.1-sources.tar.gz) = 5938687
+SHA256 (residualvm-0.3.1-sources.tar.gz) = 
UVsCEp3TdLycC3Mt3qqqOjQswl6g6jxMzxkUG102Lh0=
+SIZE (residualvm-0.3.1-sources.tar.gz) = 7642746
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/games/residualvm/patches/patch-configure,v
retrieving revision 1.3
diff -u -p -r1.3 patch-configure
--- patches/patch-configure     8 Apr 2015 14:38:11 -0000       1.3
+++ patches/patch-configure     26 Jun 2018 06:35:45 -0000
@@ -1,31 +1,14 @@
-$OpenBSD: patch-configure,v 1.3 2015/04/08 14:38:11 kirby Exp $
+$OpenBSD$
 Freetype's headers conflict with -pedantic.
---- configure.orig     Wed Dec 31 14:06:05 2014
-+++ configure  Sun Jan 11 23:07:37 2015
-@@ -1818,7 +1818,7 @@ echo $_use_cxx11
+Index: configure
+--- configure.orig
++++ configure
+@@ -2002,7 +2002,7 @@ echo $_use_cxx11
  # However, some platforms use GNU extensions in system header files, so
  # for these we must not use -pedantic.
  case $_host_os in
--android | gamecube | psp | tizen | wii | webos)
-+android | gamecube | psp | tizen | wii | webos | openbsd* )
+-android | androidsdl | gamecube | psp | tizen | wii | webos)
++android | androidsdl | gamecube | psp | tizen | wii | webos | openbsd* )
        ;;
  *)
        # ICC does not support pedantic, while GCC and clang do.
-@@ -2002,7 +2002,7 @@ cc_check_clean tmp_find_type_with_size.cpp
- # for the smaller sizes.
- echo_n "Alignment required... "
- case $_host_cpu in
--      i[3-6]86 | amd64 | x86_64 | ppc*)
-+      i[3-6]86 | amd64 | x86_64 | powerpc* | ppc*)
-               # Unaligned access should work
-               _need_memalign=no
-               ;;
-@@ -2045,7 +2045,7 @@ case $_host_cpu in
-               echo "MIPS"
-               DEFINES="$DEFINES -DMIPS_TARGET"
-               ;;
--      ppc*)
-+      powerpc* | ppc*)
-               echo "PowerPC"
-               DEFINES="$DEFINES -DPPC_TARGET"
-               ;;
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/residualvm/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST   8 Apr 2015 14:38:11 -0000       1.2
+++ pkg/PLIST   26 Jun 2018 06:35:45 -0000
@@ -21,7 +21,38 @@ share/pixmaps/
 share/pixmaps/residualvm.xpm
 share/residualvm/
 share/residualvm/modern.zip
+share/residualvm/myst3.dat
 share/residualvm/residualvm-grim-patch.lab
+share/residualvm/shaders/
+share/residualvm/shaders/dim.fragment
+share/residualvm/shaders/dim.vertex
+share/residualvm/shaders/emerg.fragment
+share/residualvm/shaders/emerg.vertex
+share/residualvm/shaders/emi_actor.fragment
+share/residualvm/shaders/emi_actor.vertex
+share/residualvm/shaders/emi_background.fragment
+share/residualvm/shaders/emi_background.vertex
+share/residualvm/shaders/emi_dimplane.fragment
+share/residualvm/shaders/emi_dimplane.vertex
+share/residualvm/shaders/grim_actor.fragment
+share/residualvm/shaders/grim_actor.vertex
+share/residualvm/shaders/grim_background.fragment
+share/residualvm/shaders/grim_background.vertex
+share/residualvm/shaders/grim_primitive.fragment
+share/residualvm/shaders/grim_primitive.vertex
+share/residualvm/shaders/myst3_box.fragment
+share/residualvm/shaders/myst3_box.vertex
+share/residualvm/shaders/myst3_cube.fragment
+share/residualvm/shaders/myst3_cube.vertex
+share/residualvm/shaders/myst3_text.fragment
+share/residualvm/shaders/myst3_text.vertex
+share/residualvm/shaders/shadowplane.fragment
+share/residualvm/shaders/shadowplane.vertex
+share/residualvm/shaders/smush.fragment
+share/residualvm/shaders/smush.vertex
+share/residualvm/shaders/text.fragment
+share/residualvm/shaders/text.vertex
+share/residualvm/translations.dat
 @exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
 @unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
 @exec %D/bin/update-desktop-database

Reply via email to