Attachment 217209 Details for Bug 248587 – Stendhal Update to 1.35

[patch] Stendhal Update to 1.35

stendhal_update1.35.diff (text/plain), 11.12 KB, created by Gian-Simon Purkert on 2020-08-14 10:20:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gian-Simon Purkert

Created: 2020-08-14 10:20:22 UTC

Size: 11.12 KB

patch

obsolete

>diff -ruN /usr/ports/games/stendhal/Makefile /usr/ports/games/stendhal/Makefile
>--- /usr/ports/games/stendhal/Makefile	2019-11-26 22:46:12.000000000 +0100
>+++ /usr/ports/games/stendhal/Makefile	2020-08-14 11:15:52.011263000 +0200
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/games/stendhal/Makefile 518482 2019-11-26 21:46:12Z jkim $
> 
> PORTNAME=		stendhal
>-PORTVERSION=		1.19
>+PORTVERSION=		1.35
> DISTVERSIONSUFFIX=	-src
> CATEGORIES=		games java
> MASTER_SITES=		SF/arianne/${PORTNAME}/${PORTVERSION}/
>@@ -13,12 +13,12 @@
> LICENSE=		BSD2CLAUSE GPLv2
> LICENSE_COMB=		multi
> 
>-WRKSRC=			${WRKDIR}/${PORTNAME}-${PORTVERSION}
>-
>+USES=			shebangfix
> USE_JAVA=		yes
> USE_ANT=		yes
>-USES=			shebangfix
> 
>+WRKSRC=			${WRKDIR}/${PORTNAME}-${PORTVERSION}
>+
> OPTIONS_MULTI=		COMPONENTS
> OPTIONS_MULTI_COMPONENTS=	\
> 			CLIENT SERVER
>@@ -57,7 +57,7 @@
> 		${COPYTREE_SHARE} lib ${STAGEDIR}${DATADIR}
> 	${INSTALL_DATA} ${WRKSRC}/libs/log4j.jar ${STAGEDIR}${DATADIR}/lib
> 	${INSTALL_DATA} ${WRKSRC}/libs/marauroa.jar ${STAGEDIR}${DATADIR}/lib
>-	${INSTALL_DATA}	${WRKSRC}/README.txt ${STAGEDIR}${DATADIR}
>+	${INSTALL_DATA}	${WRKSRC}/README.md ${STAGEDIR}${DATADIR}
> 
> 	# CLIENT
> .if ${PORT_OPTIONS:MCLIENT}
>@@ -73,7 +73,6 @@
> 	${INSTALL_DATA} ${WRKSRC}/build/lib/${CLIENTSTARTER}-${PORTVERSION}.jar \
> 		${STAGEDIR}${DATADIR}/${CLIENTSTARTER}.jar
> 	${INSTALL} ${FILESDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
>-	${INSTALL_DATA}	${WRKSRC}/.hotspotrc ${STAGEDIR}${DATADIR}
> 	${INSTALL_DATA} ${WRKSRC}/${CLIENTICON}.png \
> 		${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
> 	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.desktop ${STAGEDIR}${PREFIX}/share/applications
>diff -ruN /usr/ports/games/stendhal/distinfo /usr/ports/games/stendhal/distinfo
>--- /usr/ports/games/stendhal/distinfo	2016-01-22 09:39:10.000000000 +0100
>+++ /usr/ports/games/stendhal/distinfo	2020-08-14 10:56:47.751335000 +0200
>@@ -1,2 +1,3 @@
>-SHA256 (stendhal-1.19-src.tar.gz) = c50328ceb3eaa5c1f934614e01428fd844df70f0df77deffe398866ad1e9b4e7
>-SIZE (stendhal-1.19-src.tar.gz) = 107346502
>+TIMESTAMP = 1597395407
>+SHA256 (stendhal-1.35-src.tar.gz) = 276208fcd76e67f052d87bef9791363d1100e0c96c9e9b67b92ffc7d661b92b5
>+SIZE (stendhal-1.35-src.tar.gz) = 244829901
>diff -ruN /usr/ports/games/stendhal/pkg-plist /usr/ports/games/stendhal/pkg-plist
>--- /usr/ports/games/stendhal/pkg-plist	2016-01-22 09:39:10.000000000 +0100
>+++ /usr/ports/games/stendhal/pkg-plist	2020-08-14 12:12:21.123423000 +0200
>@@ -1,24 +1,32 @@
>-share/stendhal/README.txt
> share/stendhal/doc/AUTHORS.txt
>-share/stendhal/doc/BUGS.txt
> share/stendhal/doc/CHANGES.txt
> share/stendhal/doc/LICENSE.txt
>-share/stendhal/doc/LICENSE-audio.txt
>-share/stendhal/doc/LICENSE-images.txt
> share/stendhal/doc/Licenses/BSD.txt
>-share/stendhal/doc/Licenses/CC0-1.0.txt
> share/stendhal/doc/Licenses/CC-BY-3.0.txt
>+share/stendhal/doc/Licenses/CC-BY-4.0.txt
>+share/stendhal/doc/Licenses/CC-BY-SA-3.0.txt
>+share/stendhal/doc/Licenses/CC-BY-SA-4.0.txt
>+share/stendhal/doc/Licenses/CC0-1.0.txt
> share/stendhal/doc/Licenses/GPL-3.0.txt
> share/stendhal/doc/Licenses/MIT.txt
>+share/stendhal/doc/Licenses/OGA-BY-3.0.txt
>+share/stendhal/doc/contributors.md
>+share/stendhal/doc/contributors/contributors.json
>+share/stendhal/doc/contributors/contributors.png
>+share/stendhal/doc/manual/lua.md
>+share/stendhal/doc/sources/audio-loop.txt
>+share/stendhal/doc/sources/audio-music.txt
>+share/stendhal/doc/sources/audio-sfx.txt
>+share/stendhal/doc/sources/audio-weather.txt
>+share/stendhal/doc/sources/graphics-corpse.txt
>+share/stendhal/doc/sources/graphics-enemy.txt
>+share/stendhal/doc/sources/graphics-item.txt
>+share/stendhal/doc/sources/graphics-misc.txt
>+share/stendhal/doc/sources/graphics-npc.txt
>+share/stendhal/doc/sources/graphics-outfit.txt
>+share/stendhal/doc/sources/graphics-pet.txt
>+share/stendhal/doc/sources/graphics-tileset.txt
> share/stendhal/lib/EasyMockLicense.html
>-share/stendhal/lib/license-apache-2.0.txt
>-share/stendhal/lib/license-bsd.txt
>-share/stendhal/lib/license-cpl.html
>-share/stendhal/lib/license-gpl.txt
>-share/stendhal/lib/license-h2.html
>-share/stendhal/lib/license-lgpl.txt
>-share/stendhal/lib/log4j.jar
>-share/stendhal/lib/marauroa.jar
> share/stendhal/lib/LICENSES.txt
> share/stendhal/lib/NOTICE.txt
> share/stendhal/lib/h2-license.html
>@@ -28,24 +36,40 @@
> share/stendhal/lib/json-simple-license.txt
> share/stendhal/lib/junit-license.html
> share/stendhal/lib/jython-license.txt
>+share/stendhal/lib/license-apache-2.0.txt
>+share/stendhal/lib/license-bsd.txt
>+share/stendhal/lib/license-cpl.html
>+share/stendhal/lib/license-gpl.txt
>+share/stendhal/lib/license-h2.html
>+share/stendhal/lib/license-lgpl.txt
> share/stendhal/lib/log4j-license.txt
>+share/stendhal/lib/log4j.jar
>+share/stendhal/lib/marauroa.jar
> share/stendhal/lib/servlet-api-license.txt
>+share/stendhal/lib/setdragimage-ie-license.txt
> share/stendhal/lib/sha512crypt-license.txt
> share/stendhal/lib/websocket-license.txt
> @dir share/stendhal/log
> %%CLIENT%%bin/stendhal
> %%CLIENT%%man/man1/stendhal.1.gz
>-%%CLIENT%%share/pixmaps/stendhal.png
> %%CLIENT%%share/applications/stendhal.desktop
>-%%CLIENT%%share/stendhal/.hotspotrc
>+%%CLIENT%%share/pixmaps/stendhal.png
> %%CLIENT%%share/stendhal/stendhal-starter.jar
>-%%CLIENT%%share/stendhal/lib/jorbis.jar
>-%%CLIENT%%share/stendhal/lib/stendhal-data.jar
>-%%CLIENT%%share/stendhal/lib/stendhal-music-data.jar
>-%%CLIENT%%share/stendhal/lib/stendhal-sound-data.jar
> %%CLIENT%%share/stendhal/lib/stendhal.jar
>+%%CLIENT%%share/stendhal/lib/stendhal-sound-data.jar
>+%%CLIENT%%share/stendhal/lib/stendhal-music-data.jar
>+%%CLIENT%%share/stendhal/lib/stendhal-data.jar
>+%%CLIENT%%share/stendhal/lib/jorbis.jar
> %%SERVER%%bin/stendhal-server
> %%SERVER%%man/man1/stendhal-server.1.gz
>+%%SERVER%%share/stendhal/lib/groovy.jar
>+%%SERVER%%share/stendhal/lib/guava.jar
>+%%SERVER%%share/stendhal/lib/h2.jar
>+%%SERVER%%share/stendhal/lib/simple.jar
>+%%SERVER%%share/stendhal/lib/stendhal-maps.jar
>+%%SERVER%%share/stendhal/lib/stendhal-server.jar
>+%%SERVER%%share/stendhal/lib/stendhal-xmlconf.jar
>+%%SERVER%%share/stendhal/README.md
> %%SERVER%%share/stendhal/data/conf/admins.txt
> %%SERVER%%share/stendhal/data/script/games/stendhal/server/script/AbstractOfflineAction.class
> %%SERVER%%share/stendhal/data/script/games/stendhal/server/script/AdminMaker$TeleportAction$Destination.class
>@@ -55,6 +79,7 @@
> %%SERVER%%share/stendhal/data/script/games/stendhal/server/script/AdminPortal.class
> %%SERVER%%share/stendhal/data/script/games/stendhal/server/script/AdminSign.class
> %%SERVER%%share/stendhal/data/script/games/stendhal/server/script/AdosWildlifeRaid.class
>+%%SERVER%%share/stendhal/data/script/games/stendhal/server/script/AlterLoot.class
> %%SERVER%%share/stendhal/data/script/games/stendhal/server/script/AlterQuest.class
> %%SERVER%%share/stendhal/data/script/games/stendhal/server/script/AngelRaid.class
> %%SERVER%%share/stendhal/data/script/games/stendhal/server/script/AnimalRaid.class
>@@ -74,14 +99,21 @@
> %%SERVER%%share/stendhal/data/script/games/stendhal/server/script/ContMoveAndStrengthenOnlinePlayers$ContMoveAndStrengthenPlayersTurnListener.class
> %%SERVER%%share/stendhal/data/script/games/stendhal/server/script/ContMoveAndStrengthenOnlinePlayers.class
> %%SERVER%%share/stendhal/data/script/games/stendhal/server/script/CountObjects.class
>+%%SERVER%%share/stendhal/data/script/games/stendhal/server/script/CountUnusedSprites$1.class
>+%%SERVER%%share/stendhal/data/script/games/stendhal/server/script/CountUnusedSprites$2.class
>+%%SERVER%%share/stendhal/data/script/games/stendhal/server/script/CountUnusedSprites$3.class
>+%%SERVER%%share/stendhal/data/script/games/stendhal/server/script/CountUnusedSprites$4.class
>+%%SERVER%%share/stendhal/data/script/games/stendhal/server/script/CountUnusedSprites.class
> %%SERVER%%share/stendhal/data/script/games/stendhal/server/script/CreateRaid.class
> %%SERVER%%share/stendhal/data/script/games/stendhal/server/script/CreaturesRatioCalculator$CountCreature.class
> %%SERVER%%share/stendhal/data/script/games/stendhal/server/script/CreaturesRatioCalculator.class
>+%%SERVER%%share/stendhal/data/script/games/stendhal/server/script/DBLogging.class
> %%SERVER%%share/stendhal/data/script/games/stendhal/server/script/Debuggera$QuestsAction.class
> %%SERVER%%share/stendhal/data/script/games/stendhal/server/script/Debuggera$SightseeingAction.class
> %%SERVER%%share/stendhal/data/script/games/stendhal/server/script/Debuggera$TeleportNPCAction.class
> %%SERVER%%share/stendhal/data/script/games/stendhal/server/script/Debuggera$TeleportScriptAction.class
> %%SERVER%%share/stendhal/data/script/games/stendhal/server/script/Debuggera.class
>+%%SERVER%%share/stendhal/data/script/games/stendhal/server/script/DeepInspect$1.class
> %%SERVER%%share/stendhal/data/script/games/stendhal/server/script/DeepInspect.class
> %%SERVER%%share/stendhal/data/script/games/stendhal/server/script/DisableFeature.class
> %%SERVER%%share/stendhal/data/script/games/stendhal/server/script/DragonRaid.class
>@@ -103,6 +135,7 @@
> %%SERVER%%share/stendhal/data/script/games/stendhal/server/script/Enchant.class
> %%SERVER%%share/stendhal/data/script/games/stendhal/server/script/EntitySearch.class
> %%SERVER%%share/stendhal/data/script/games/stendhal/server/script/EventTest.class
>+%%SERVER%%share/stendhal/data/script/games/stendhal/server/script/ExecuteLua.class
> %%SERVER%%share/stendhal/data/script/games/stendhal/server/script/ExecuteSQL.class
> %%SERVER%%share/stendhal/data/script/games/stendhal/server/script/FairyRaid.class
> %%SERVER%%share/stendhal/data/script/games/stendhal/server/script/FarmRaid.class
>@@ -135,6 +168,7 @@
> %%SERVER%%share/stendhal/data/script/games/stendhal/server/script/ListNPCs.class
> %%SERVER%%share/stendhal/data/script/games/stendhal/server/script/ListRaids$1.class
> %%SERVER%%share/stendhal/data/script/games/stendhal/server/script/ListRaids.class
>+%%SERVER%%share/stendhal/data/script/games/stendhal/server/script/ListZones.class
> %%SERVER%%share/stendhal/data/script/games/stendhal/server/script/Log4J.class
> %%SERVER%%share/stendhal/data/script/games/stendhal/server/script/LogoutPlayer.class
> %%SERVER%%share/stendhal/data/script/games/stendhal/server/script/Maria$1.class
>@@ -158,6 +192,7 @@
> %%SERVER%%share/stendhal/data/script/games/stendhal/server/script/PlayerPositionMonitoring$PlayerPositionListener.class
> %%SERVER%%share/stendhal/data/script/games/stendhal/server/script/PlayerPositionMonitoring.class
> %%SERVER%%share/stendhal/data/script/games/stendhal/server/script/RemoveClient.class
>+%%SERVER%%share/stendhal/data/script/games/stendhal/server/script/RemoveZone.class
> %%SERVER%%share/stendhal/data/script/games/stendhal/server/script/ResetSlot.class
> %%SERVER%%share/stendhal/data/script/games/stendhal/server/script/ResetTutorial.class
> %%SERVER%%share/stendhal/data/script/games/stendhal/server/script/Santa.class
>@@ -196,10 +231,3 @@
> %%SERVER%%share/stendhal/data/script/games/stendhal/server/script/ZoneCollisionCheck.class
> %%SERVER%%share/stendhal/data/script/games/stendhal/server/script/ZoneStatistics.class
> %%SERVER%%share/stendhal/data/script/games/stendhal/server/script/package-info.class
>-%%SERVER%%share/stendhal/lib/groovy.jar
>-%%SERVER%%share/stendhal/lib/guava.jar
>-%%SERVER%%share/stendhal/lib/h2.jar
>-%%SERVER%%share/stendhal/lib/simple.jar
>-%%SERVER%%share/stendhal/lib/stendhal-maps.jar
>-%%SERVER%%share/stendhal/lib/stendhal-server.jar
>-%%SERVER%%share/stendhal/lib/stendhal-xmlconf.jar

Actions: View | Diff

Attachments on bug 248587: 217208 | 217209