Attachment 230263 Details for Bug 260562 – stratagus-3.1.2.patch

[patch] stratagus-3.1.2.patch

stratagus-3.1.2.patch (text/plain), 7.92 KB, created by Alastair Hogge on 2021-12-20 08:06:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alastair Hogge

Created: 2021-12-20 08:06:46 UTC

Size: 7.92 KB

patch

obsolete

>diff --git a/games/stratagus/Makefile b/games/stratagus/Makefile
>index 7908620c9c26..deeddc6d2477 100644
>--- a/games/stratagus/Makefile
>+++ b/games/stratagus/Makefile
>@@ -1,9 +1,8 @@
> # Created by: Travis Poppe <tlp@liquidx.org>
> 
> PORTNAME=	stratagus
>-PORTVERSION=	2.4.2
>+PORTVERSION=	3.1.2
> DISTVERSIONPREFIX=	v
>-PORTREVISION=	3
> CATEGORIES=	games
> 
> MAINTAINER=	amdmi3@FreeBSD.org
>@@ -15,22 +14,25 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> LIB_DEPENDS=	libpng.so:graphics/png \
> 		libtolua++-${LUA_VER}.so:lang/tolua++
> 
>-USE_GITHUB=	yes
>-GH_ACCOUNT=	Wargus
>+USES=		cmake compiler:gcc-c++11-lib gl lua:51 ninja pkgconfig \
>+		python:run sdl sqlite
> 
>-USES=		cmake compiler:c++11-lang gl lua:51 pkgconfig sdl sqlite python:run
> USE_GL=		gl glu
>-USE_SDL=	sdl
>+USE_GITHUB=	yes
>+USE_SDL=	image2 mixer2
> CMAKE_ARGS=	-DGAMEDIR:STRING="bin" \
> 		-DTOLUA++_APP:STRING="tolua++-${LUA_VER}" \
> 		-DTOLUA++_INCLUDE_DIR:STRING="${LUA_INCDIR}" \
> 		-DTOLUA++_LIBRARY:STRING="${LUA_LIBDIR}/libtolua++.so"
> CMAKE_ON=	ENABLE_DEV
> 
>-PORTDOCS=	*
>+GH_ACCOUNT=	Wargus
> 
>-OPTIONS_DEFINE=	MIKMOD MNG THEORA VORBIS X11 FLUIDSYNTH DOCS
>-OPTIONS_DEFAULT=MIKMOD MNG THEORA VORBIS X11 FLUIDSYNTH
>+OPTIONS_DEFINE=		DOCS FLUIDSYNTH MIKMOD MNG THEORA VORBIS X11
>+OPTIONS_DEFAULT=	FLUIDSYNTH MIKMOD MNG THEORA VORBIS X11
>+
>+FLUIDSYNTH_LIB_DEPENDS=	libfluidsynth.so:audio/fluidsynth
>+FLUIDSYNTH_CMAKE_BOOL=	WITH_FLUIDSYNTH
> 
> MIKMOD_LIB_DEPENDS=	libmikmod.so:audio/libmikmod
> MIKMOD_CMAKE_BOOL=	WITH_MIKMOD
>@@ -42,28 +44,27 @@ MNG_CMAKE_BOOL=		WITH_MNG
> THEORA_LIB_DEPENDS=	libtheora.so:multimedia/libtheora
> THEORA_CMAKE_BOOL=	WITH_THEORA
> 
>-VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
>-			libogg.so:audio/libogg
>+VORBIS_LIB_DEPENDS=	libogg.so:audio/libogg \
>+			libvorbis.so:audio/libvorbis
> VORBIS_CMAKE_BOOL=	WITH_OGGVORBIS
> 
>-X11_DESC=		X11 clipboard pasting support
>-X11_USES=		xorg
>-X11_USE=		XORG=x11
>-X11_CMAKE_BOOL=		WITH_X11
>-
>-FLUIDSYNTH_LIB_DEPENDS=	libfluidsynth.so:audio/fluidsynth
>-FLUIDSYNTH_CMAKE_BOOL=	WITH_FLUIDSYNTH
>+X11_DESC=	X11 clipboard pasting support
>+X11_USES=	xorg
>+X11_USE=	XORG=x11
>+X11_CMAKE_BOOL=	WITH_X11
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's|"python"|"${PYTHON_CMD}"|' \
> 		${WRKSRC}/gameheaders/stratagus-tinyfiledialogs.h
> 
>-post-install:
>-	${INSTALL_DATA} ${WRKSRC}/doc/stratagus.6 ${STAGEDIR}${MAN6PREFIX}/man/man6
>-
> post-install-DOCS-on:
>-	@cd ${WRKSRC}/doc && ${COPYTREE_SHARE} "[a-z]*.html *.txt graphics scripts" \
>-		${STAGEDIR}${DOCSDIR}
>+	${MKDIR} ${STAGEDIR}${DOCSDIR}
>+	${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.6 \
>+		${STAGEDIR}${MAN6PREFIX}/man/man6
>+	${INSTALL_MAN} ${WRKSRC}/README.md ${STAGEDIR}${MAN6PREFIX}
>+	(cd ${WRKSRC}/doc && \
>+		${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \
>+		"! -name ${PORTNAME}.6")
> 
> .include <bsd.port.pre.mk>
> 
>diff --git a/games/stratagus/distinfo b/games/stratagus/distinfo
>index 037e96ccb24b..466efb1039b8 100644
>--- a/games/stratagus/distinfo
>+++ b/games/stratagus/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1538587339
>-SHA256 (Wargus-stratagus-v2.4.2_GH0.tar.gz) = 366be8255c7e7cb694661b5db08b81908885a8ff89007d6e24769bf619235b89
>-SIZE (Wargus-stratagus-v2.4.2_GH0.tar.gz) = 1114717
>+TIMESTAMP = 1639882984
>+SHA256 (Wargus-stratagus-v3.1.2_GH0.tar.gz) = e88dbf5e9136329d5fbba403224465633c0b06c307dd1abef4073d58f34464e5
>+SIZE (Wargus-stratagus-v3.1.2_GH0.tar.gz) = 1190124
>diff --git a/games/stratagus/pkg-descr b/games/stratagus/pkg-descr
>index 8a86c3e7d9af..4eaff988c0e7 100644
>--- a/games/stratagus/pkg-descr
>+++ b/games/stratagus/pkg-descr
>@@ -2,6 +2,6 @@ Stratagus is a free cross-platform real-time strategy gaming engine. It
> includes support for playing over the internet/LAN, or playing a computer
> opponent. The engine is configurable and can be used to create games with
> a wide-range of features specific to your needs. See the data sets page
>-for a list of current games using the stratagus engine.
>+for a list of current games using the Stratagus engine.
> 
>-WWW: https://launchpad.net/stratagus
>+WWW: https://stratagus.com/stratagus.html
>diff --git a/games/stratagus/pkg-message b/games/stratagus/pkg-message
>index 24330fad15cf..feba75931ffd 100644
>--- a/games/stratagus/pkg-message
>+++ b/games/stratagus/pkg-message
>@@ -1,16 +1,15 @@
> [
> { type: install
>   message: <<EOM
>-NOTE: This is only the engine. If you wish to play a game that uses the
>-Stratagus engine, you must manually download the Stratagus game data.
>+NOTE: This is the engine only. If you would like to play a game that uses the
>+Stratagus engine, you must install supporting games of the engine.
> 
>-You can use the 'games/wargus' port to extract data from a legal copy of
>-Warcraft 2 (original DOS version required, won't work with the battle.net
>-edition).
>+wartool, available in 'games/wargus' allows the user to extract game data
>+from legitimate copies of Warcraft 2, for use by Stratagus.
> 
>-For more information, please take a look at the following URL:
>+For more information, visit the following URL:
> 
>-http://stratagus.sourceforge.net/games.shtml
>+https://stratagus.com/
> 
> Enjoy!
> EOM
>diff --git a/games/stratagus/pkg-plist b/games/stratagus/pkg-plist
>index 324b896e8ecf..7f685d5593d2 100644
>--- a/games/stratagus/pkg-plist
>+++ b/games/stratagus/pkg-plist
>@@ -1,9 +1,62 @@
> bin/png2stratagus
>-bin/metaserver
> bin/stratagus
>-@comment include/stratagus-game-installer.nsi
>+include/stratagus-game-installer.nsi
> include/stratagus-game-launcher.h
> include/stratagus-gameutils.h
> include/stratagus-tinyfiledialogs.h
>-@comment include/stratagus-maemo-extract.h
> man/man6/stratagus.6.gz
>+%%PORTDOCS%%%%DOCSDIR%%/Doxyfile-footer.html
>+%%PORTDOCS%%%%DOCSDIR%%/Doxyfile-header.html
>+%%PORTDOCS%%%%DOCSDIR%%/Doxyfile.in
>+%%PORTDOCS%%%%DOCSDIR%%/README-SDL.txt
>+%%PORTDOCS%%%%DOCSDIR%%/changelog.html
>+%%PORTDOCS%%%%DOCSDIR%%/development.html
>+%%PORTDOCS%%%%DOCSDIR%%/faq.html
>+%%PORTDOCS%%%%DOCSDIR%%/gpl.html
>+%%PORTDOCS%%%%DOCSDIR%%/graphics/coast_and_ground.png
>+%%PORTDOCS%%%%DOCSDIR%%/graphics/dark_coast.png
>+%%PORTDOCS%%%%DOCSDIR%%/graphics/dark_ground.png
>+%%PORTDOCS%%%%DOCSDIR%%/graphics/defect_human_wall.png
>+%%PORTDOCS%%%%DOCSDIR%%/graphics/defect_orc_wall.png
>+%%PORTDOCS%%%%DOCSDIR%%/graphics/destroyed_wall.png
>+%%PORTDOCS%%%%DOCSDIR%%/graphics/farm.png
>+%%PORTDOCS%%%%DOCSDIR%%/graphics/fog_of_war.png
>+%%PORTDOCS%%%%DOCSDIR%%/graphics/forest_and_ground.png
>+%%PORTDOCS%%%%DOCSDIR%%/graphics/human_wall.png
>+%%PORTDOCS%%%%DOCSDIR%%/graphics/light_and_dark_coast.png
>+%%PORTDOCS%%%%DOCSDIR%%/graphics/light_and_dark_ground.png
>+%%PORTDOCS%%%%DOCSDIR%%/graphics/light_and_dark_water.png
>+%%PORTDOCS%%%%DOCSDIR%%/graphics/light_coast.png
>+%%PORTDOCS%%%%DOCSDIR%%/graphics/light_ground.png
>+%%PORTDOCS%%%%DOCSDIR%%/graphics/orc_wall.png
>+%%PORTDOCS%%%%DOCSDIR%%/graphics/palette.html
>+%%PORTDOCS%%%%DOCSDIR%%/graphics/peasant.png
>+%%PORTDOCS%%%%DOCSDIR%%/graphics/rocks_and_coast.png
>+%%PORTDOCS%%%%DOCSDIR%%/graphics/stratagus.gimp
>+%%PORTDOCS%%%%DOCSDIR%%/graphics/summer.png
>+%%PORTDOCS%%%%DOCSDIR%%/graphics/summer_klein.png
>+%%PORTDOCS%%%%DOCSDIR%%/graphics/tileset.html
>+%%PORTDOCS%%%%DOCSDIR%%/graphics/water_and_coast.png
>+%%PORTDOCS%%%%DOCSDIR%%/guichan-copyright.txt
>+%%PORTDOCS%%%%DOCSDIR%%/index.html
>+%%PORTDOCS%%%%DOCSDIR%%/install.html
>+%%PORTDOCS%%%%DOCSDIR%%/lua/generate_index.py
>+%%PORTDOCS%%%%DOCSDIR%%/media.html
>+%%PORTDOCS%%%%DOCSDIR%%/metaserver_protocol.txt
>+%%PORTDOCS%%%%DOCSDIR%%/scripts/ai.html
>+%%PORTDOCS%%%%DOCSDIR%%/scripts/config.html
>+%%PORTDOCS%%%%DOCSDIR%%/scripts/findlua.py
>+%%PORTDOCS%%%%DOCSDIR%%/scripts/game.html
>+%%PORTDOCS%%%%DOCSDIR%%/scripts/index.html
>+%%PORTDOCS%%%%DOCSDIR%%/scripts/magic.html
>+%%PORTDOCS%%%%DOCSDIR%%/scripts/makeindex.py
>+%%PORTDOCS%%%%DOCSDIR%%/scripts/mappresentation.html
>+%%PORTDOCS%%%%DOCSDIR%%/scripts/mapsetup.html
>+%%PORTDOCS%%%%DOCSDIR%%/scripts/research.html
>+%%PORTDOCS%%%%DOCSDIR%%/scripts/savegame.html
>+%%PORTDOCS%%%%DOCSDIR%%/scripts/showindex.py
>+%%PORTDOCS%%%%DOCSDIR%%/scripts/sound.html
>+%%PORTDOCS%%%%DOCSDIR%%/scripts/tileset.html
>+%%PORTDOCS%%%%DOCSDIR%%/scripts/triggers.html
>+%%PORTDOCS%%%%DOCSDIR%%/scripts/ui.html
>+%%PORTDOCS%%%%DOCSDIR%%/scripts/unittype.html

Actions: View | Diff

Attachments on bug 260562: 230263