git: 54180921d03d - main - games/vcmi: the port had been updated to version 1.3.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 06 Aug 2023 05:34:36 UTC
The branch main has been updated by danfe:
URL: https://cgit.FreeBSD.org/ports/commit/?id=54180921d03d0310c47c7018c182b037f450ca86
commit 54180921d03d0310c47c7018c182b037f450ca86
Author: Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2023-08-06 05:32:40 +0000
Commit: Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2023-08-06 05:32:40 +0000
games/vcmi: the port had been updated to version 1.3.0
Drop now useless `post-configure' target and PATCH_ARGS.
Reported by: portscout
---
games/vcmi/Makefile | 11 +------
games/vcmi/distinfo | 8 ++---
games/vcmi/files/patch-lib_CModHandler.h | 11 -------
games/vcmi/files/patch-lib_CModVersion.h | 11 +++++++
games/vcmi/pkg-plist | 51 ++++++++++++++++++++++++++++----
5 files changed, 61 insertions(+), 31 deletions(-)
diff --git a/games/vcmi/Makefile b/games/vcmi/Makefile
index c37319564378..397cdade6208 100644
--- a/games/vcmi/Makefile
+++ b/games/vcmi/Makefile
@@ -1,10 +1,7 @@
PORTNAME= vcmi
-PORTVERSION= 1.2.1
+PORTVERSION= 1.3.0
CATEGORIES= games
-PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES= c7bee037d2c06c56893d631651288c33e.patch:-p1
-
MAINTAINER= danfe@FreeBSD.org
COMMENT= Open-source engine for Heroes of Might and Magic III
WWW= https://vcmi.eu/
@@ -39,14 +36,8 @@ 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-configure:
- ${SED} -e 's,@GIT_SHA1@,c125e04,' ${WRKSRC}/Version.cpp.in \
- > ${BUILD_WRKSRC}/Version.cpp
-
post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
.include <bsd.port.mk>
-
-PATCH_ARGS+= -l
diff --git a/games/vcmi/distinfo b/games/vcmi/distinfo
index 30d0e84a7ef4..88cde4484385 100644
--- a/games/vcmi/distinfo
+++ b/games/vcmi/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1682700427
-SHA256 (vcmi-vcmi-1.2.1_GH0.tar.gz) = 88ffc13da9b7d6ac8ed294b1b7719e5adc0cdc34a9f0d83d55b5b5c8d02e529a
-SIZE (vcmi-vcmi-1.2.1_GH0.tar.gz) = 7143981
-SHA256 (c7bee037d2c06c56893d631651288c33e.patch) = 128e6749191fb81c9432b4b40e838af5a942c3b42b051488c5675d5da2911a43
-SIZE (c7bee037d2c06c56893d631651288c33e.patch) = 1538
+TIMESTAMP = 1691137149
+SHA256 (vcmi-vcmi-1.3.0_GH0.tar.gz) = 358c4ed57af292ce334582a7c0db81892b4bedcea7ab173d18dbb1dcf9c041cc
+SIZE (vcmi-vcmi-1.3.0_GH0.tar.gz) = 7971172
diff --git a/games/vcmi/files/patch-lib_CModHandler.h b/games/vcmi/files/patch-lib_CModHandler.h
deleted file mode 100644
index ba043fb9066f..000000000000
--- a/games/vcmi/files/patch-lib_CModHandler.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/CModHandler.h.orig 2022-12-23 10:52:00 UTC
-+++ lib/CModHandler.h
-@@ -182,6 +182,8 @@ class DLL_LINKAGE CModInfo (public)
-
- struct Version
- {
-+#undef major
-+#undef minor
- int major = 0;
- int minor = 0;
- int patch = 0;
diff --git a/games/vcmi/files/patch-lib_CModVersion.h b/games/vcmi/files/patch-lib_CModVersion.h
new file mode 100644
index 000000000000..60c1574fc4d8
--- /dev/null
+++ b/games/vcmi/files/patch-lib_CModVersion.h
@@ -0,0 +1,11 @@
+--- 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 0aca293ac9db..d0e5c1eef574 100644
--- a/games/vcmi/pkg-plist
+++ b/games/vcmi/pkg-plist
@@ -12,10 +12,16 @@ lib/vcmi/libvcmi.so
share/applications/vcmiclient.desktop
%%QT%%share/applications/vcmieditor.desktop
%%QT%%share/applications/vcmilauncher.desktop
-share/icons/hicolor/256x256/apps/vcmiclient.png
+share/icons/hicolor/16x16/apps/vcmiclient.png
share/icons/hicolor/32x32/apps/vcmiclient.png
share/icons/hicolor/48x48/apps/vcmiclient.png
share/icons/hicolor/64x64/apps/vcmiclient.png
+share/icons/hicolor/128x128/apps/vcmiclient.png
+share/icons/hicolor/256x256/apps/vcmiclient.png
+share/icons/hicolor/512x512/apps/vcmiclient.png
+share/icons/hicolor/1024x1024/apps/vcmiclient.png
+share/icons/hicolor/2048x2048/apps/vcmiclient.png
+share/icons/hicolor/scalable/apps/vcmiclient.svg
%%QT%%share/icons/hicolor/128x128/apps/vcmieditor.png
%%QT%%share/icons/hicolor/256x256/apps/vcmieditor.png
%%QT%%share/icons/hicolor/32x32/apps/vcmieditor.png
@@ -25,11 +31,23 @@ share/icons/hicolor/64x64/apps/vcmiclient.png
%%DATADIR%%/Mods/vcmi/Data/QuickRecruitmentWindow/CreaturePurchaseCard.png
%%DATADIR%%/Mods/vcmi/Data/StackQueueLarge.png
%%DATADIR%%/Mods/vcmi/Data/StackQueueSmall.png
+%%DATADIR%%/Mods/vcmi/Data/UnitMaxMovementHighlight.png
+%%DATADIR%%/Mods/vcmi/Data/UnitMovementHighlight.png
%%DATADIR%%/Mods/vcmi/Data/debug/blocked.png
%%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/questDialog.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/itemInactive.png
+%%DATADIR%%/Mods/vcmi/Data/radialMenu/stackInfo.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/s/std.verm
%%DATADIR%%/Mods/vcmi/Data/s/testy.erm
%%DATADIR%%/Mods/vcmi/Data/settingsWindow/checkBoxEmpty.png
@@ -54,7 +72,6 @@ share/icons/hicolor/64x64/apps/vcmiclient.png
%%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/Maps/VCMI_Tests_2011b.h3m
%%DATADIR%%/Mods/vcmi/Sprites/PortraitsLarge.json
%%DATADIR%%/Mods/vcmi/Sprites/PortraitsSmall.json
%%DATADIR%%/Mods/vcmi/Sprites/QuickRecruitmentWindow/CreaturePurchaseCard.png
@@ -62,6 +79,24 @@ share/icons/hicolor/64x64/apps/vcmiclient.png
%%DATADIR%%/Mods/vcmi/Sprites/QuickRecruitmentWindow/QuickRecruitmentNoneButton.def
%%DATADIR%%/Mods/vcmi/Sprites/QuickRecruitmentWindow/costBackground.png
%%DATADIR%%/Mods/vcmi/Sprites/ScSelC.json
+%%DATADIR%%/Mods/vcmi/Sprites/battle/rangeHighlights/green/empty.png
+%%DATADIR%%/Mods/vcmi/Sprites/battle/rangeHighlights/green/fullHex.png
+%%DATADIR%%/Mods/vcmi/Sprites/battle/rangeHighlights/green/left.png
+%%DATADIR%%/Mods/vcmi/Sprites/battle/rangeHighlights/green/leftHalf.png
+%%DATADIR%%/Mods/vcmi/Sprites/battle/rangeHighlights/green/top.png
+%%DATADIR%%/Mods/vcmi/Sprites/battle/rangeHighlights/green/topLeft.png
+%%DATADIR%%/Mods/vcmi/Sprites/battle/rangeHighlights/green/topLeftCorner.png
+%%DATADIR%%/Mods/vcmi/Sprites/battle/rangeHighlights/green/topLeftHalfCorner.png
+%%DATADIR%%/Mods/vcmi/Sprites/battle/rangeHighlights/rangeHighlightsGreen.json
+%%DATADIR%%/Mods/vcmi/Sprites/battle/rangeHighlights/rangeHighlightsRed.json
+%%DATADIR%%/Mods/vcmi/Sprites/battle/rangeHighlights/red/empty.png
+%%DATADIR%%/Mods/vcmi/Sprites/battle/rangeHighlights/red/fullHex.png
+%%DATADIR%%/Mods/vcmi/Sprites/battle/rangeHighlights/red/left.png
+%%DATADIR%%/Mods/vcmi/Sprites/battle/rangeHighlights/red/leftHalf.png
+%%DATADIR%%/Mods/vcmi/Sprites/battle/rangeHighlights/red/top.png
+%%DATADIR%%/Mods/vcmi/Sprites/battle/rangeHighlights/red/topLeft.png
+%%DATADIR%%/Mods/vcmi/Sprites/battle/rangeHighlights/red/topLeftCorner.png
+%%DATADIR%%/Mods/vcmi/Sprites/battle/rangeHighlights/red/topLeftHalfCorner.png
%%DATADIR%%/Mods/vcmi/Sprites/buttons/commander.json
%%DATADIR%%/Mods/vcmi/Sprites/buttons/commanderNormal.png
%%DATADIR%%/Mods/vcmi/Sprites/buttons/commanderPressed.png
@@ -116,6 +151,7 @@ share/icons/hicolor/64x64/apps/vcmiclient.png
%%DATADIR%%/Mods/vcmi/Sprites/vcmi/creatureIcons/towerSmall.png
%%DATADIR%%/Mods/vcmi/config/vcmi/chinese.json
%%DATADIR%%/Mods/vcmi/config/vcmi/english.json
+%%DATADIR%%/Mods/vcmi/config/vcmi/french.json
%%DATADIR%%/Mods/vcmi/config/vcmi/german.json
%%DATADIR%%/Mods/vcmi/config/vcmi/polish.json
%%DATADIR%%/Mods/vcmi/config/vcmi/rmg/hdmod/aroundamarsh.JSON
@@ -242,7 +278,6 @@ share/icons/hicolor/64x64/apps/vcmiclient.png
%%DATADIR%%/config/battlefields.json
%%DATADIR%%/config/battles_graphics.json
%%DATADIR%%/config/bonuses.json
-%%DATADIR%%/config/buildings5.json
%%DATADIR%%/config/campaignMedia.json
%%DATADIR%%/config/campaignSets.json
%%DATADIR%%/config/campaign_regions.json
@@ -296,7 +331,6 @@ share/icons/hicolor/64x64/apps/vcmiclient.png
%%DATADIR%%/config/objects/rewardablePickable.json
%%DATADIR%%/config/obstacles.json
%%DATADIR%%/config/randomMap.json
-%%DATADIR%%/config/resolutions.json
%%DATADIR%%/config/resources.json
%%DATADIR%%/config/rivers.json
%%DATADIR%%/config/roads.json
@@ -327,6 +361,7 @@ share/icons/hicolor/64x64/apps/vcmiclient.png
%%DATADIR%%/config/skills.json
%%DATADIR%%/config/spells/ability.json
%%DATADIR%%/config/spells/adventure.json
+%%DATADIR%%/config/spells/moats.json
%%DATADIR%%/config/spells/offensive.json
%%DATADIR%%/config/spells/other.json
%%DATADIR%%/config/spells/timed.json
@@ -334,13 +369,16 @@ share/icons/hicolor/64x64/apps/vcmiclient.png
%%DATADIR%%/config/startres.json
%%DATADIR%%/config/terrainViewPatterns.json
%%DATADIR%%/config/terrains.json
-%%DATADIR%%/config/widgets/battleWindow.json
+%%DATADIR%%/config/widgets/adventureMap.json
+%%DATADIR%%/config/widgets/battleWindow2.json
%%DATADIR%%/config/widgets/randomMapTab.json
%%DATADIR%%/config/widgets/settings/adventureOptionsTab.json
%%DATADIR%%/config/widgets/settings/battleOptionsTab.json
%%DATADIR%%/config/widgets/settings/generalOptionsTab.json
+%%DATADIR%%/config/widgets/settings/library.json
%%DATADIR%%/config/widgets/settings/otherOptionsTab.json
%%DATADIR%%/config/widgets/settings/settingsMainContainer.json
+%%QT%%%%DATADIR%%/launcher/icons/about-project.png
%%QT%%%%DATADIR%%/launcher/icons/menu-editor.png
%%QT%%%%DATADIR%%/launcher/icons/menu-game.png
%%QT%%%%DATADIR%%/launcher/icons/menu-lobby.png
@@ -352,7 +390,9 @@ share/icons/hicolor/64x64/apps/vcmiclient.png
%%QT%%%%DATADIR%%/launcher/icons/mod-enabled.png
%%QT%%%%DATADIR%%/launcher/icons/mod-update.png
%%QT%%%%DATADIR%%/launcher/icons/room-private.png
+%%QT%%%%DATADIR%%/launcher/translation/chinese.qm
%%QT%%%%DATADIR%%/launcher/translation/english.qm
+%%QT%%%%DATADIR%%/launcher/translation/french.qm
%%QT%%%%DATADIR%%/launcher/translation/german.qm
%%QT%%%%DATADIR%%/launcher/translation/polish.qm
%%QT%%%%DATADIR%%/launcher/translation/russian.qm
@@ -390,6 +430,7 @@ share/icons/hicolor/64x64/apps/vcmiclient.png
%%QT%%%%DATADIR%%/mapeditor/icons/toggle-pass.png
%%QT%%%%DATADIR%%/mapeditor/icons/toggle-underground.png
%%QT%%%%DATADIR%%/mapeditor/translation/english.qm
+%%QT%%%%DATADIR%%/mapeditor/translation/french.qm
%%QT%%%%DATADIR%%/mapeditor/translation/german.qm
%%QT%%%%DATADIR%%/mapeditor/translation/polish.qm
%%QT%%%%DATADIR%%/mapeditor/translation/russian.qm