Attachment 242856 Details for Bug 272059 – Patch

[patch] Patch

0001-games-naev-Update-to-0.10.5.patch (text/plain), 6.92 KB, created by Kevin Zheng on 2023-06-18 06:52:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kevin Zheng

Created: 2023-06-18 06:52:43 UTC

Size: 6.92 KB

patch

obsolete

>From a00d7f95da08c89fb80cf9c156eca6f5a8e720a9 Mon Sep 17 00:00:00 2001
>From: Kevin Zheng <kevinz5000@gmail.com>
>Date: Sat, 17 Jun 2023 23:21:22 -0700
>Subject: [PATCH] games/naev: Update to 0.10.5
>
>While here, remove games/naev-data. Naev now ships data in the release
>tarball.
>---
> games/Makefile            |  1 -
> games/naev-data/Makefile  | 26 -----------
> games/naev-data/distinfo  |  3 --
> games/naev-data/pkg-descr |  2 -
> games/naev/Makefile       | 91 ++++++++++++++-------------------------
> games/naev/distinfo       |  6 +--
> games/naev/pkg-plist      |  9 ++++
> 7 files changed, 44 insertions(+), 94 deletions(-)
> delete mode 100644 games/naev-data/Makefile
> delete mode 100644 games/naev-data/distinfo
> delete mode 100644 games/naev-data/pkg-descr
> create mode 100644 games/naev/pkg-plist
>
>diff --git a/games/Makefile b/games/Makefile
>index aa42db7b7ec8..88e4ecf2433c 100644
>--- a/games/Makefile
>+++ b/games/Makefile
>@@ -648,7 +648,6 @@
>     SUBDIR += mvdsv
>     SUBDIR += nInvaders
>     SUBDIR += naev
>-    SUBDIR += naev-data
>     SUBDIR += narcissu2
>     SUBDIR += nazghul
>     SUBDIR += nbsdgames
>diff --git a/games/naev-data/Makefile b/games/naev-data/Makefile
>deleted file mode 100644
>index 5c4d4f323f59..000000000000
>--- a/games/naev-data/Makefile
>+++ /dev/null
>@@ -1,26 +0,0 @@
>-PORTNAME=	naev
>-PORTVERSION=	0.7.0
>-DISTVERSIONSUFFIX=	-ndata
>-CATEGORIES=	games
>-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}/
>-PKGNAMESUFFIX=	-data
>-EXTRACT_ONLY=	# empty
>-
>-MAINTAINER=	acm@FreeBSD.org
>-COMMENT=	Naev game data file
>-WWW=		http://blog.naev.org/
>-
>-LICENSE=	GPLv2 GPLv3 CC-BY-3.0 CC-BY-SA-3.0 PD
>-LICENSE_COMB=	multi
>-
>-USES=		zip
>-NO_ARCH=	yes
>-NO_BUILD=	yes
>-
>-PORTDATA=	*
>-
>-do-install:
>-	@${MKDIR} ${STAGEDIR}${DATADIR}
>-	${INSTALL_DATA} ${DISTDIR}/${DISTFILES} ${STAGEDIR}${DATADIR}/
>-
>-.include <bsd.port.mk>
>diff --git a/games/naev-data/distinfo b/games/naev-data/distinfo
>deleted file mode 100644
>index 9ed6de246f93..000000000000
>--- a/games/naev-data/distinfo
>+++ /dev/null
>@@ -1,3 +0,0 @@
>-TIMESTAMP = 1501801746
>-SHA256 (naev-0.7.0-ndata.zip) = 98039d0c4f671128a1b8fba7937f2e8d272dc71322f42c18778fc1a89f45f295
>-SIZE (naev-0.7.0-ndata.zip) = 319608404
>diff --git a/games/naev-data/pkg-descr b/games/naev-data/pkg-descr
>deleted file mode 100644
>index 6099c67e0f3c..000000000000
>--- a/games/naev-data/pkg-descr
>+++ /dev/null
>@@ -1,2 +0,0 @@
>-Naev is a 2D space trading and combat game, in a similar vein to
>-Escape Velocity (data files).
>diff --git a/games/naev/Makefile b/games/naev/Makefile
>index 0cf3232173b0..0480d4a37c40 100644
>--- a/games/naev/Makefile
>+++ b/games/naev/Makefile
>@@ -1,8 +1,8 @@
> PORTNAME=	naev
>-PORTVERSION=	0.7.0
>-PORTREVISION=	12
>+PORTVERSION=	0.10.5
>+DISTVERSIONSUFFIX=	-source
> CATEGORIES=	games
>-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}/
>+MASTER_SITES=	https://github.com/naev/naev/releases/download/v${PORTVERSION}/
> 
> MAINTAINER=	acm@FreeBSD.org
> COMMENT=	2D action/RPG space game
>@@ -11,69 +11,42 @@ WWW=		https://naev.org/
> LICENSE=	GPLv3
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-BROKEN_FreeBSD_13=	ld: error: duplicate symbol: nglActiveTexture
>-BROKEN_FreeBSD_14=	ld: error: duplicate symbol: nglActiveTexture
>-
>-LIB_DEPENDS=	libpng.so:graphics/png \
>+MY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mutagen>0:audio/py-mutagen@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
>+BUILD_DEPENDS=	${MY_DEPENDS}
>+LIB_DEPENDS=	libamd.so:math/suitesparse-amd \
>+		libbacktrace.so:devel/libbacktrace \
>+		libblas.so:math/blas \
>+		libcholmod.so:math/suitesparse-cholmod \
>+		libcolamd.so:math/suitesparse-colamd \
>+		libcxsparse.so:math/suitesparse-cxsparse \
>+		libenet.so:net/enet \
> 		libfreetype.so:print/freetype2 \
>+		libglpk.so:math/glpk \
>+		libopenblas.so:math/openblas \
>+		libpcre2-8.so:devel/pcre2 \
>+		libphysfs.so:devel/physfs \
>+		libpng.so:graphics/png \
>+		libunibreak.so:textproc/libunibreak \
> 		libvorbisfile.so:audio/libvorbis \
>+		libwebp.so:graphics/webp \
> 		libzip.so:archivers/libzip
>-RUN_DEPENDS=	${LOCALBASE}/${DATADIR_REL}/${DISTNAME}-ndata.zip:games/naev-data
>+RUN_DEPENDS=	${DEPENDS}
> 
>-USES=		autoreconf:build compiler:features gl gmake gnome pkgconfig sdl \
>-		tar:bzip2
>-GNU_CONFIGURE=	yes
>+USES=		desktop-file-utils gettext gl gnome luajit:luajit-openresty \
>+		meson openal pkgconfig python sdl tar:xz
> USE_GL=		gl glu
>-USE_GNOME=	libxml2
>-
>-CONFIGURE_ARGS=	--with-ndata-path="${DATADIR}/${DISTNAME}-ndata.zip" \
>-		--enable-debug=no
>-CPPFLAGS+=	-I${LOCALBASE}/include
>-LIBS+=		-L${LOCALBASE}/lib -lm
>-
>-PORTDATA=	*
>-PORTDOCS=	*
>+USE_GNOME=	intltool libxml2
>+USE_SDL=	sdl2 image2
> 
>-PLIST_FILES=	bin/${PORTNAME} man/man6/${PORTNAME}.6.gz \
>-		share/applications/${PORTNAME}.desktop \
>-		share/appdata/${PORTNAME}.appdata.xml \
>-		share/pixmaps/${PORTNAME}.png
>+MESON_ARGS=	-Ddocs_c=disabled -Ddocs_lua=disabled
> 
>-OPTIONS_DEFINE=	DOCS OPENAL SDL2 SDL_MIXER
>-OPTIONS_DEFAULT=	LUA_JIT OPENAL SDL2 SDL_MIXER
>-OPTIONS_DEFAULT_powerpc64=	LUA_SHARED
>-OPTIONS_EXCLUDE_powerpc64=	LUA_JIT
>-OPTIONS_SINGLE=		LUA
>-OPTIONS_SINGLE_LUA=	LUA_INTERNAL LUA_SHARED LUA_JIT
>+# work around meson not looking for headers/libs in /usr/local
>+CFLAGS+=	-I${LOCALBASE}/include
>+LDFLAGS+=	-L${LOCALBASE}/lib
> 
>-LUA_INTERNAL_DESC=	Use bundled Lua
>-LUA_INTERNAL_CONFIGURE_ON=	--enable-lua=internal
>-LUA_SHARED_DESC=	Use Lua from lang/lua51
>-LUA_SHARED_CONFIGURE_ON=	--enable-lua=shared
>-LUA_SHARED_USES=	lua:51
>-LUA_JIT_DESC=		Use LuaJIT from lang/luajit
>-LUA_JIT_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit
>-OPENAL_USES=	openal
>-OPENAL_CONFIGURE_WITH=	openal
>-SDL_MIXER_DESC=	SDL_mixer sound backend
>-SDL_MIXER_CONFIGURE_WITH=	sdlmixer
>-SDL2_DESC=	Use SDL2 instead of SDL
>-SDL2_CONFIGURE_WITH=	sdl2
>-SDL2_USE=	SDL=sdl2
>-SDL2_USE_OFF=	SDL=sdl
>+WRKSRC=		work/${PORTNAME}-${DISTVERSION}
> 
>-.include <bsd.port.pre.mk>
>-
>-.if ${COMPILER_TYPE} == "gcc"
>-USE_GCC=	yes
>-.endif
>-
>-.if ${PORT_OPTIONS:MSDL_MIXER}
>-.	if ${PORT_OPTIONS:MSDL2}
>-USE_SDL+=	mixer2
>-.	else
>-USE_SDL+=	mixer
>-.	endif
>-.endif
>+PORTDATA=	*
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff --git a/games/naev/distinfo b/games/naev/distinfo
>index 2f397e2a8a66..a387c44dd7ae 100644
>--- a/games/naev/distinfo
>+++ b/games/naev/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1501802079
>-SHA256 (naev-0.7.0.tar.bz2) = 30c1ea58ce0b314048d629df196b2eec908a627f9c98395b0fc95417305b008a
>-SIZE (naev-0.7.0.tar.bz2) = 1076658
>+TIMESTAMP = 1687065303
>+SHA256 (naev-0.10.5-source.tar.xz) = a0b3a497bd43f47ee313f69a02348cfcb489d3216aa9992f2fefd6ae51b84c86
>+SIZE (naev-0.10.5-source.tar.xz) = 444950676
>diff --git a/games/naev/pkg-plist b/games/naev/pkg-plist
>new file mode 100644
>index 000000000000..af31d914f542
>--- /dev/null
>+++ b/games/naev/pkg-plist
>@@ -0,0 +1,9 @@
>+bin/naev
>+man/man6/naev.6.gz
>+share/applications/org.naev.Naev.desktop
>+share/icons/hicolor/128x128/apps/org.naev.Naev.png
>+share/icons/hicolor/16x16/apps/org.naev.Naev.png
>+share/icons/hicolor/256x256/apps/org.naev.Naev.png
>+share/icons/hicolor/32x32/apps/org.naev.Naev.png
>+share/icons/hicolor/64x64/apps/org.naev.Naev.png
>+share/metainfo/org.naev.Naev.metainfo.xml
>-- 
>2.41.0
>

Actions: View | Diff

Attachments on bug 272059: 242856