On 2017/09/24 19:41, Jérôme KASPER wrote:
> Hi ports,
>
> same thing , here is the stella update as inline diff
>
> index 67b05c6903b..f9099fa2076 100644
> --- Makefile
> +++ Makefile
> @@ -1,12 +1,11 @@
> -# $OpenBSD: Makefile,v 1.28 2017/07/26 22:45:20 sthen Exp $
> +# $OpenBSD: Makefile,v 1.29 2017/09/24 01:03:20 jkasper Exp $
>
> COMMENT = Atari 2600 VCS emulator
>
> -V = 3.9
> -DISTNAME = stella-${V}
> -REVISION = 2
> +GH_ACCOUNT= stella-emu
> +GH_PROJECT= stella
> +GH_TAGNAME= 5.0.2
> CATEGORIES = emulators
> -DISTFILES = ${DISTNAME}-src.tar.gz
>
> HOMEPAGE = https://stella-emu.github.io/
>
> @@ -15,11 +14,9 @@ MAINTAINER = Benoit Lecocq
> <[email protected]>
> # GPLv2
> PERMIT_PACKAGE_CDROM = Yes
>
> -WANTLIB = c ${COMPILER_LIBCXX} m z pthread SDL>=1.2 png
> +WANTLIB = c ${COMPILER_LIBCXX} m z pthread SDL2 png
>
> -MASTER_SITES =
> https://github.com/stella-emu/stella/releases/download/release-${V}/
As Makefile.template says,
# For github: traditional tarballs in /releases/download are normally
# preferred if available; use them with DISTNAME/MASTER_SITES lines as
# normal. For projects using auto-generated tarballs, set GH_ACCOUNT,
# GH_PROJECT, and *one* of GH_TAGNAME or GH_COMMIT. For GH_COMMIT, also
# set DISTNAME. For GH_TAGNAME, set DISTNAME if the default is no good.
-
> -LIB_DEPENDS = devel/sdl \
> +LIB_DEPENDS = devel/sdl2 \
> graphics/png
>
> CXXFLAGS += -I${X11BASE}/include -I${LOCALBASE}/include
> diff --git distinfo distinfo
> index a3d7f290ed1..c6415d7cafc 100644
> --- distinfo
> +++ distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (stella-3.9-src.tar.gz) = nrPpOacj+jwFjMBRdlaH3AcAi4nQSaFEji3yx3MHqUE=
> -SIZE (stella-3.9-src.tar.gz) = 2223230
> +SHA256 (stella-5.0.2.tar.gz) = oDwW8SCoAhmF+jVQfYrVDlblSKaZ9rvIgg+OO/4Le9w=
> +SIZE (stella-5.0.2.tar.gz) = 2392460
> diff --git patches/patch-Makefile patches/patch-Makefile
> deleted file mode 100644
> index fd6bd9cfdb4..00000000000
> --- patches/patch-Makefile
> +++ /dev/null
> @@ -1,23 +0,0 @@
> -$OpenBSD: patch-Makefile,v 1.1 2017/05/13 20:28:37 espie Exp $
> -
> -Index: Makefile
> ---- Makefile.orig
> -+++ Makefile
> -@@ -142,7 +142,7 @@ CXX_UPDATE_DEP_FLAG = -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).
> -
> - .c.o:
> - $(MKDIR) $(*D)/$(DEPDIR)
> -- $(CXX) $(CXX_UPDATE_DEP_FLAG) $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
> -+ $(CC) $(CXX_UPDATE_DEP_FLAG) $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
> - $(ECHO) "$(*D)/" > $(*D)/$(DEPDIR)/$(*F).d
> - $(CAT) "$(*D)/$(DEPDIR)/$(*F).d2" >> "$(*D)/$(DEPDIR)/$(*F).d"
> - $(RM) "$(*D)/$(DEPDIR)/$(*F).d2"
> -@@ -157,7 +157,7 @@ else
> -
> - .c.o:
> - $(MKDIR) $(*D)/$(DEPDIR)
> -- $(CXX) $(CXX_UPDATE_DEP_FLAG) $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
> -+ $(CC) $(CXX_UPDATE_DEP_FLAG) $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
> - endif
> -
> - # Include the dependency tracking files. We add /dev/null at the end
> diff --git patches/patch-configure patches/patch-configure
> deleted file mode 100644
> index 57fc6ef2ab9..00000000000
> --- patches/patch-configure
> +++ /dev/null
> @@ -1,12 +0,0 @@
> -$OpenBSD: patch-configure,v 1.3 2013/07/04 12:44:30 benoit Exp $
> ---- configure.orig Wed Apr 17 17:00:32 2013
> -+++ configure Thu Jul 4 11:49:38 2013
> -@@ -589,7 +589,7 @@ if test "$_libpng" = auto ; then
> - #include <png.h>
> - int main(void) { return printf("%s\n", PNG_HEADER_VERSION_STRING); }
> - EOF
> -- cc_check $LDFLAGS $CXXFLAGS $LIBPNG_CFLAGS $LIBPNG_LIBS -lpng &&
> _libpng=yes
> -+ cc_check $LDFLAGS $CXXFLAGS $LIBPNG_CFLAGS $LIBPNG_LIBS `pkg-config
> --libs libpng` && _libpng=yes
> - fi
> - if test "$_libpng" = yes ; then
> - echo "$_libpng"
> diff --git pkg/PLIST pkg/PLIST
> index d4261838384..9bd7850283a 100644
> --- pkg/PLIST
> +++ pkg/PLIST
> @@ -16,6 +16,8 @@ share/doc/stella/graphics/debugger_dataops.png
> share/doc/stella/graphics/debugger_globalbuttons.png
> share/doc/stella/graphics/debugger_iotab.png
> share/doc/stella/graphics/debugger_main.png
> +share/doc/stella/graphics/debugger_ram-dpc.png
> +share/doc/stella/graphics/debugger_ram-f8sc.png
> share/doc/stella/graphics/debugger_ram.png
> share/doc/stella/graphics/debugger_ramsearch.png
> share/doc/stella/graphics/debugger_rom.png
> @@ -40,10 +42,10 @@ share/doc/stella/graphics/options.png
> share/doc/stella/graphics/options_audio.png
> share/doc/stella/graphics/options_debugger.png
> share/doc/stella/graphics/options_gameinfo.png
> -share/doc/stella/graphics/options_input.png
> share/doc/stella/graphics/options_misc.png
> share/doc/stella/graphics/options_ui.png
> share/doc/stella/graphics/options_video.png
> +share/doc/stella/graphics/options_video_dbgcolors.png
> share/doc/stella/graphics/options_video_tv.png
> share/doc/stella/graphics/pacman.png
> share/doc/stella/graphics/rom_browser.png
