git: 90985e1c2397 - main - games/vcmi: update the port to version 1.4.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Alexey Dokuchaev <danfe_at_FreeBSD.org>
Date: Mon, 11 Dec 2023 04:33:45 UTC
The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=90985e1c23973fa489cd9e2f2bcbe35dbbca8751

commit 90985e1c23973fa489cd9e2f2bcbe35dbbca8751
Author:     Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2023-12-11 04:28:18 +0000
Commit:     Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2023-12-11 04:28:18 +0000

    games/vcmi: update the port to version 1.4.0
    
    AUTHORS file had been converted to C++ header,
    keeping installing it would be a little weird.
    
    Reported by:    portscout
---
 games/vcmi/Makefile                      |  9 +++--
 games/vcmi/distinfo                      |  6 +--
 games/vcmi/files/patch-lib_CModVersion.h | 11 ------
 games/vcmi/pkg-plist                     | 64 +++++++++++++++++++++++++++++++-
 4 files changed, 72 insertions(+), 18 deletions(-)

diff --git a/games/vcmi/Makefile b/games/vcmi/Makefile
index 5557e758bd85..a668b5655ed0 100644
--- a/games/vcmi/Makefile
+++ b/games/vcmi/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	vcmi
-PORTVERSION=	1.3.2
-PORTREVISION=	1
+PORTVERSION=	1.4.0
 CATEGORIES=	games
 
 MAINTAINER=	danfe@FreeBSD.org
@@ -25,7 +24,7 @@ CMAKE_ARGS=	-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON \
 		-DENABLE_GITVERSION:BOOL=OFF -DENABLE_TEST:BOOL=OFF \
 		-DFORCE_BUNDLED_FL:BOOL=OFF
 
-PORTDOCS=	AUTHORS ChangeLog.md
+PORTDOCS=	ChangeLog.md
 
 OPTIONS_DEFINE=	DOCS QT
 OPTIONS_DEFAULT=	QT
@@ -37,6 +36,10 @@ QT_USE=		QT=buildtools:build,linguisttools:build,qmake:build \
 		QT=core,gui,network,widgets
 QT_CMAKE_OFF=	-DENABLE_LAUNCHER:BOOL=OFF -DENABLE_EDITOR:BOOL=OFF
 
+post-patch:
+	@${REINPLACE_CMD} -e '/^#ifdef /s,UCLIBC,${OPSYS},' \
+		${WRKSRC}/lib/modding/CModVersion.h
+
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
diff --git a/games/vcmi/distinfo b/games/vcmi/distinfo
index 17e2695d88cd..9086871ebbd8 100644
--- a/games/vcmi/distinfo
+++ b/games/vcmi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1694709133
-SHA256 (vcmi-vcmi-1.3.2_GH0.tar.gz) = 6faf23bbe11e58b12053d378baf2c633e962a26a491cd410e3fc6ab63724f9fc
-SIZE (vcmi-vcmi-1.3.2_GH0.tar.gz) = 8545532
+TIMESTAMP = 1702036755
+SHA256 (vcmi-vcmi-1.4.0_GH0.tar.gz) = 3a666ed4f8250029a1254394a8bcd4ac6df955c9736bc8733c69ec02e03d2f36
+SIZE (vcmi-vcmi-1.4.0_GH0.tar.gz) = 9632635
diff --git a/games/vcmi/files/patch-lib_CModVersion.h b/games/vcmi/files/patch-lib_CModVersion.h
deleted file mode 100644
index 60c1574fc4d8..000000000000
--- a/games/vcmi/files/patch-lib_CModVersion.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/CModVersion.h.orig	2023-08-04 08:19:09 UTC
-+++ lib/CModVersion.h
-@@ -14,6 +14,8 @@ VCMI_LIB_NAMESPACE_BEGIN
- 
- struct DLL_LINKAGE CModVersion
- {
-+#undef major
-+#undef minor
- 	int major = 0;
- 	int minor = 0;
- 	int patch = 0;
diff --git a/games/vcmi/pkg-plist b/games/vcmi/pkg-plist
index 5ac0999d2671..39ded9fa0e3e 100644
--- a/games/vcmi/pkg-plist
+++ b/games/vcmi/pkg-plist
@@ -38,17 +38,33 @@ share/icons/hicolor/scalable/apps/vcmiclient.svg
 %%DATADIR%%/Mods/vcmi/Data/debug/grid.png
 %%DATADIR%%/Mods/vcmi/Data/debug/spellRange.png
 %%DATADIR%%/Mods/vcmi/Data/debug/visitable.png
+%%DATADIR%%/Mods/vcmi/Data/lobby/iconFolder.png
+%%DATADIR%%/Mods/vcmi/Data/lobby/townBorderBig.png
+%%DATADIR%%/Mods/vcmi/Data/lobby/townBorderBigActivated.png
+%%DATADIR%%/Mods/vcmi/Data/lobby/townBorderBigGrayedOut.png
+%%DATADIR%%/Mods/vcmi/Data/lobby/townBorderSmallActivated.png
 %%DATADIR%%/Mods/vcmi/Data/questDialog.png
+%%DATADIR%%/Mods/vcmi/Data/radialMenu/altDown.png
+%%DATADIR%%/Mods/vcmi/Data/radialMenu/altDownBottom.png
+%%DATADIR%%/Mods/vcmi/Data/radialMenu/altUp.png
+%%DATADIR%%/Mods/vcmi/Data/radialMenu/altUpTop.png
+%%DATADIR%%/Mods/vcmi/Data/radialMenu/dismissHero.png
 %%DATADIR%%/Mods/vcmi/Data/radialMenu/heroMove.png
 %%DATADIR%%/Mods/vcmi/Data/radialMenu/heroSwap.png
 %%DATADIR%%/Mods/vcmi/Data/radialMenu/itemEmpty.png
+%%DATADIR%%/Mods/vcmi/Data/radialMenu/itemEmptyAlt.png
 %%DATADIR%%/Mods/vcmi/Data/radialMenu/itemInactive.png
+%%DATADIR%%/Mods/vcmi/Data/radialMenu/itemInactiveAlt.png
+%%DATADIR%%/Mods/vcmi/Data/radialMenu/moveArtifacts.png
+%%DATADIR%%/Mods/vcmi/Data/radialMenu/moveTroops.png
 %%DATADIR%%/Mods/vcmi/Data/radialMenu/stackFillOne.png
 %%DATADIR%%/Mods/vcmi/Data/radialMenu/stackMerge.png
 %%DATADIR%%/Mods/vcmi/Data/radialMenu/stackSplitDialog.png
 %%DATADIR%%/Mods/vcmi/Data/radialMenu/stackSplitEqual.png
 %%DATADIR%%/Mods/vcmi/Data/radialMenu/stackSplitOne.png
 %%DATADIR%%/Mods/vcmi/Data/radialMenu/statusBar.png
+%%DATADIR%%/Mods/vcmi/Data/radialMenu/swapArtifacts.png
+%%DATADIR%%/Mods/vcmi/Data/radialMenu/tradeHeroes.png
 %%DATADIR%%/Mods/vcmi/Data/s/std.verm
 %%DATADIR%%/Mods/vcmi/Data/s/testy.erm
 %%DATADIR%%/Mods/vcmi/Data/settingsWindow/checkBoxEmpty.png
@@ -73,6 +89,7 @@ share/icons/hicolor/scalable/apps/vcmiclient.svg
 %%DATADIR%%/Mods/vcmi/Data/stackWindow/info-panel-1.png
 %%DATADIR%%/Mods/vcmi/Data/stackWindow/info-panel-2.png
 %%DATADIR%%/Mods/vcmi/Data/stackWindow/spell-effects.png
+%%DATADIR%%/Mods/vcmi/Sounds/we5.wav
 %%DATADIR%%/Mods/vcmi/Sprites/PortraitsLarge.json
 %%DATADIR%%/Mods/vcmi/Sprites/PortraitsSmall.json
 %%DATADIR%%/Mods/vcmi/Sprites/QuickRecruitmentWindow/CreaturePurchaseCard.png
@@ -107,6 +124,14 @@ share/icons/hicolor/scalable/apps/vcmiclient.svg
 %%DATADIR%%/Mods/vcmi/Sprites/buttons/commanderPressed.png
 %%DATADIR%%/Mods/vcmi/Sprites/heroWindow/artifactSlotEmpty.png
 %%DATADIR%%/Mods/vcmi/Sprites/itpa.json
+%%DATADIR%%/Mods/vcmi/Sprites/lobby/checkbox.json
+%%DATADIR%%/Mods/vcmi/Sprites/lobby/checkboxBlueOff.png
+%%DATADIR%%/Mods/vcmi/Sprites/lobby/checkboxBlueOn.png
+%%DATADIR%%/Mods/vcmi/Sprites/lobby/checkboxOff.png
+%%DATADIR%%/Mods/vcmi/Sprites/lobby/checkboxOn.png
+%%DATADIR%%/Mods/vcmi/Sprites/lobby/dropdown.json
+%%DATADIR%%/Mods/vcmi/Sprites/lobby/dropdownNormal.png
+%%DATADIR%%/Mods/vcmi/Sprites/lobby/dropdownPressed.png
 %%DATADIR%%/Mods/vcmi/Sprites/mapFormatIcons/vcmi1.png
 %%DATADIR%%/Mods/vcmi/Sprites/settingsWindow/button190.json
 %%DATADIR%%/Mods/vcmi/Sprites/settingsWindow/button190Normal.png
@@ -155,6 +180,13 @@ share/icons/hicolor/scalable/apps/vcmiclient.svg
 %%DATADIR%%/Mods/vcmi/Sprites/vcmi/battleQueue/waitSmall.png
 %%DATADIR%%/Mods/vcmi/Sprites/vcmi/creatureIcons/towerLarge.png
 %%DATADIR%%/Mods/vcmi/Sprites/vcmi/creatureIcons/towerSmall.png
+%%DATADIR%%/Mods/vcmi/Video/tutorial/AbortSpell.webm
+%%DATADIR%%/Mods/vcmi/Video/tutorial/BattleDirection.webm
+%%DATADIR%%/Mods/vcmi/Video/tutorial/BattleDirectionAbort.webm
+%%DATADIR%%/Mods/vcmi/Video/tutorial/MapPanning.webm
+%%DATADIR%%/Mods/vcmi/Video/tutorial/MapZooming.webm
+%%DATADIR%%/Mods/vcmi/Video/tutorial/RadialWheel.webm
+%%DATADIR%%/Mods/vcmi/Video/tutorial/RightClick.webm
 %%DATADIR%%/Mods/vcmi/config/vcmi/chinese.json
 %%DATADIR%%/Mods/vcmi/config/vcmi/czech.json
 %%DATADIR%%/Mods/vcmi/config/vcmi/english.json
@@ -274,6 +306,7 @@ share/icons/hicolor/scalable/apps/vcmiclient.svg
 %%DATADIR%%/Mods/vcmi/config/vcmi/towerCreature.json
 %%DATADIR%%/Mods/vcmi/config/vcmi/towerFactions.json
 %%DATADIR%%/Mods/vcmi/config/vcmi/ukrainian.json
+%%DATADIR%%/Mods/vcmi/config/vcmi/vietnamese.json
 %%DATADIR%%/Mods/vcmi/mod.json
 %%DATADIR%%/config/ERMU_to_picture.json
 %%DATADIR%%/config/NEUTRAL.PAL
@@ -300,6 +333,7 @@ share/icons/hicolor/scalable/apps/vcmiclient.svg
 %%DATADIR%%/config/creatures/special.json
 %%DATADIR%%/config/creatures/stronghold.json
 %%DATADIR%%/config/creatures/tower.json
+%%DATADIR%%/config/difficulty.json
 %%DATADIR%%/config/factions/castle.json
 %%DATADIR%%/config/factions/conflux.json
 %%DATADIR%%/config/factions/dungeon.json
@@ -321,21 +355,31 @@ share/icons/hicolor/scalable/apps/vcmiclient.svg
 %%DATADIR%%/config/heroes/fortress.json
 %%DATADIR%%/config/heroes/inferno.json
 %%DATADIR%%/config/heroes/necropolis.json
+%%DATADIR%%/config/heroes/portraits.json
 %%DATADIR%%/config/heroes/rampart.json
 %%DATADIR%%/config/heroes/special.json
 %%DATADIR%%/config/heroes/stronghold.json
 %%DATADIR%%/config/heroes/tower.json
+%%DATADIR%%/config/highscoreCreatures.json
 %%DATADIR%%/config/mainmenu.json
 %%DATADIR%%/config/mapOverrides.json
+%%DATADIR%%/config/objects/cartographer.json
+%%DATADIR%%/config/objects/coverOfDarkness.json
 %%DATADIR%%/config/objects/creatureBanks.json
 %%DATADIR%%/config/objects/dwellings.json
 %%DATADIR%%/config/objects/generic.json
+%%DATADIR%%/config/objects/magicSpring.json
+%%DATADIR%%/config/objects/magicWell.json
 %%DATADIR%%/config/objects/moddables.json
+%%DATADIR%%/config/objects/observatory.json
 %%DATADIR%%/config/objects/rewardableBonusing.json
 %%DATADIR%%/config/objects/rewardableOncePerHero.json
 %%DATADIR%%/config/objects/rewardableOncePerWeek.json
 %%DATADIR%%/config/objects/rewardableOnceVisitable.json
 %%DATADIR%%/config/objects/rewardablePickable.json
+%%DATADIR%%/config/objects/scholar.json
+%%DATADIR%%/config/objects/shrine.json
+%%DATADIR%%/config/objects/witchHut.json
 %%DATADIR%%/config/obstacles.json
 %%DATADIR%%/config/randomMap.json
 %%DATADIR%%/config/resources.json
@@ -373,11 +417,14 @@ share/icons/hicolor/scalable/apps/vcmiclient.svg
 %%DATADIR%%/config/spells/other.json
 %%DATADIR%%/config/spells/timed.json
 %%DATADIR%%/config/spells/vcmiAbility.json
-%%DATADIR%%/config/startres.json
 %%DATADIR%%/config/terrainViewPatterns.json
 %%DATADIR%%/config/terrains.json
+%%DATADIR%%/config/textColors.json
+%%DATADIR%%/config/widgets/advancedOptionsTab.json
 %%DATADIR%%/config/widgets/adventureMap.json
 %%DATADIR%%/config/widgets/battleWindow2.json
+%%DATADIR%%/config/widgets/mapOverview.json
+%%DATADIR%%/config/widgets/playerOptionsTab.json
 %%DATADIR%%/config/widgets/randomMapTab.json
 %%DATADIR%%/config/widgets/settings/adventureOptionsTab.json
 %%DATADIR%%/config/widgets/settings/battleOptionsTab.json
@@ -385,6 +432,9 @@ share/icons/hicolor/scalable/apps/vcmiclient.svg
 %%DATADIR%%/config/widgets/settings/library.json
 %%DATADIR%%/config/widgets/settings/otherOptionsTab.json
 %%DATADIR%%/config/widgets/settings/settingsMainContainer.json
+%%DATADIR%%/config/widgets/turnOptionsDropdownLibrary.json
+%%DATADIR%%/config/widgets/turnOptionsTab.json
+%%DATADIR%%/config/widgets/turnTimer.json
 %%QT%%%%DATADIR%%/launcher/icons/about-project.png
 %%QT%%%%DATADIR%%/launcher/icons/menu-editor.png
 %%QT%%%%DATADIR%%/launcher/icons/menu-game.png
@@ -405,11 +455,15 @@ share/icons/hicolor/scalable/apps/vcmiclient.svg
 %%QT%%%%DATADIR%%/launcher/translation/russian.qm
 %%QT%%%%DATADIR%%/launcher/translation/spanish.qm
 %%QT%%%%DATADIR%%/launcher/translation/ukrainian.qm
+%%QT%%%%DATADIR%%/launcher/translation/vietnamese.qm
+%%QT%%%%DATADIR%%/mapeditor/icons/brush-0.png
 %%QT%%%%DATADIR%%/mapeditor/icons/brush-1.png
 %%QT%%%%DATADIR%%/mapeditor/icons/brush-2.png
 %%QT%%%%DATADIR%%/mapeditor/icons/brush-3.png
 %%QT%%%%DATADIR%%/mapeditor/icons/brush-4.png
 %%QT%%%%DATADIR%%/mapeditor/icons/brush-5.png
+%%QT%%%%DATADIR%%/mapeditor/icons/brush-6.png
+%%QT%%%%DATADIR%%/mapeditor/icons/brush-7.png
 %%QT%%%%DATADIR%%/mapeditor/icons/document-new.png
 %%QT%%%%DATADIR%%/mapeditor/icons/document-open.png
 %%QT%%%%DATADIR%%/mapeditor/icons/document-save.png
@@ -420,6 +474,8 @@ share/icons/hicolor/scalable/apps/vcmiclient.svg
 %%QT%%%%DATADIR%%/mapeditor/icons/edit-redo.png
 %%QT%%%%DATADIR%%/mapeditor/icons/edit-undo.png
 %%QT%%%%DATADIR%%/mapeditor/icons/fill-obstacles.png
+%%QT%%%%DATADIR%%/mapeditor/icons/lock-closed.png
+%%QT%%%%DATADIR%%/mapeditor/icons/lock-open.png
 %%QT%%%%DATADIR%%/mapeditor/icons/mapeditor.128x128.png
 %%QT%%%%DATADIR%%/mapeditor/icons/mapeditor.256x256.png
 %%QT%%%%DATADIR%%/mapeditor/icons/mapeditor.32x32.png
@@ -436,6 +492,11 @@ share/icons/hicolor/scalable/apps/vcmiclient.svg
 %%QT%%%%DATADIR%%/mapeditor/icons/toggle-grid.png
 %%QT%%%%DATADIR%%/mapeditor/icons/toggle-pass.png
 %%QT%%%%DATADIR%%/mapeditor/icons/toggle-underground.png
+%%QT%%%%DATADIR%%/mapeditor/icons/translations.png
+%%QT%%%%DATADIR%%/mapeditor/icons/zoom_base.png
+%%QT%%%%DATADIR%%/mapeditor/icons/zoom_minus.png
+%%QT%%%%DATADIR%%/mapeditor/icons/zoom_plus.png
+%%QT%%%%DATADIR%%/mapeditor/icons/zoom_zero.png
 %%QT%%%%DATADIR%%/mapeditor/translation/english.qm
 %%QT%%%%DATADIR%%/mapeditor/translation/french.qm
 %%QT%%%%DATADIR%%/mapeditor/translation/german.qm
@@ -443,3 +504,4 @@ share/icons/hicolor/scalable/apps/vcmiclient.svg
 %%QT%%%%DATADIR%%/mapeditor/translation/russian.qm
 %%QT%%%%DATADIR%%/mapeditor/translation/spanish.qm
 %%QT%%%%DATADIR%%/mapeditor/translation/ukrainian.qm
+%%QT%%%%DATADIR%%/mapeditor/translation/vietnamese.qm