Re: update games/fheroes2 to 0.9.18
On Mon, Sep 05, 2022 at 06:40:42PM +0200, Paco Esteban wrote:
> On Sat, 27 Aug 2022, Paco Esteban wrote:
>
> > Hi ports@,
> >
> > This is an update of games/fheroes2 to its latest version 0.9.18
> > It builds and runs fine for me on amd64, not sure I did the right thing
> > with the right thing with the lang Makefile. They seem to have changed
> > things a bit in this area.
> >
> > Maintainer on cc.
> >
> > Comments ? Ok to commit ?
>
> ping ?
>
> diff here again for convenience
Thanks Paco! I went ahead and committed the update with some changes:
- Set PATCHORIG (otherwise, some .orig files in the distfiles get
picked up).
- Install helper script 'extract_homm2_resources.sh'. This makes
installation much simpler, esp. for videos ('ANIM') of the GOG.com
distribution.
- README adjusted to reflect the simpler install of game data.
See below about the change in translations.
Otherwise, I tested this again with a fresh install from the GOG.com
files and everything works as expected.
> --- games/fheroes2/pkg/PLIST
> +++ games/fheroes2/pkg/PLIST
> @@ -2,22 +2,20 @@
> share/doc/pkg-readmes/${PKGSTEM}
> share/fheroes2/
> share/fheroes2/download_demo_version.sh
> -share/fheroes2/fheroes2.key
> share/fheroes2/files/
> share/fheroes2/files/data/
> share/fheroes2/files/data/resurrection.h2d
> share/fheroes2/files/lang/
> +share/fheroes2/files/lang/be.mo
> +share/fheroes2/files/lang/bg.mo
> share/fheroes2/files/lang/cs.mo
> share/fheroes2/files/lang/de.mo
> share/fheroes2/files/lang/es.mo
> -share/fheroes2/files/lang/fr.mo
> -share/fheroes2/files/lang/hu.mo
> share/fheroes2/files/lang/it.mo
> -share/fheroes2/files/lang/lt.mo
> share/fheroes2/files/lang/nb.mo
> -share/fheroes2/files/lang/nl.mo
> share/fheroes2/files/lang/pl.mo
> share/fheroes2/files/lang/pt.mo
> +share/fheroes2/files/lang/ro.mo
> share/fheroes2/files/lang/ru.mo
> share/fheroes2/files/lang/sv.mo
> -share/fheroes2/files/lang/tr.mo
> +share/fheroes2/files/lang/uk.mo
A few languages have disappeared - fr, hu, nl, tr. This looks like an
upstream issue as we aren't doing anything manually in the port patches
anymore. Will keep an eye out.
Re: update games/fheroes2 to 0.9.18
On Sat, 27 Aug 2022, Paco Esteban wrote:
> Hi ports@,
>
> This is an update of games/fheroes2 to its latest version 0.9.18
> It builds and runs fine for me on amd64, not sure I did the right thing
> with the right thing with the lang Makefile. They seem to have changed
> things a bit in this area.
>
> Maintainer on cc.
>
> Comments ? Ok to commit ?
ping ?
diff here again for convenience
diff /usr/ports
commit - d831ba6400d1500e8b55926b20ca44816aa1d8c7
path + /usr/ports
blob - c45a60fc907c523c9fe249b68025fd7205d12b6c
file + games/fheroes2/Makefile
--- games/fheroes2/Makefile
+++ games/fheroes2/Makefile
@@ -2,11 +2,10 @@ COMMENT = engine recreation for Heroes of Might and Ma
GH_ACCOUNT = ihhub
GH_PROJECT = fheroes2
-GH_TAGNAME = 0.9.14
+GH_TAGNAME = 0.9.18
CATEGORIES = games
HOMEPAGE = https://ihhub.github.io/fheroes2/
MAINTAINER = Thomas Frohwein
-REVISION = 0
# GPLv2.0+, LGPLv2.1+ (src/thirdparty/libsmacker)
PERMIT_PACKAGE = Yes
@@ -30,7 +29,6 @@ do-gen:
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/fheroes2/files/data
- ${INSTALL_DATA} ${WRKSRC}/fheroes2.key ${PREFIX}/share/fheroes2/
${INSTALL_DATA} ${WRKSRC}/files/data/resurrection.h2d \
${PREFIX}/share/fheroes2/files/data/
${INSTALL_DATA_DIR} ${PREFIX}/share/fheroes2/files/lang
blob - fe69e1e68011d777d3004c15ca45a0fb6b4e89ea
file + games/fheroes2/distinfo
--- games/fheroes2/distinfo
+++ games/fheroes2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fheroes2-0.9.14.tar.gz) = VTL6hEO42PVPz8VmKPECBHCtIV4SKF14yEUOSeqZRL4=
-SIZE (fheroes2-0.9.14.tar.gz) = 3628240
+SHA256 (fheroes2-0.9.18.tar.gz) = vNmvznuGljD5fP23E2aPD33M9p/Gsx2xynSsL2NSSo0=
+SIZE (fheroes2-0.9.18.tar.gz) = 5117381
blob - 765221e1f24c22c250ab4e4e79020970626a7d68
file + /dev/null
--- games/fheroes2/patches/patch-files_lang_Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-used UTF-8 so that sed doesn't fail because of different string lengths
-add in missing instructions for languages (hu, lt, nl, sv, pt, tr)
-
-Index: files/lang/Makefile
files/lang/Makefile.orig
-+++ files/lang/Makefile
-@@ -31,14 +31,14 @@ merge:
- # Spanish: drop accents transliterated with `"` (which breaks translation
file format)
- # and transliterate the rest using the es_ES.UTF-8 locale
- es.mo: es.po
-- sed -e 'y/äëïöőüűÄËÏŐÖÜŰ/aeioouuAEIOOUU/' $< > $<.tmp
-+ LANG=es_ES.UTF-8 LC_CTYPE=es_ES.UTF-8 sed -e
'y/äëïöőüűÄËÏŐÖÜŰ/aeioouuAEIOOUU/' $< > $<.tmp
- LANG=es_ES.UTF-8 LC_ALL=es_ES.UTF-8 LC_CTYPE=es_ES.UTF-8 iconv -f utf-8
-t ascii//TRANSLIT $<.tmp > $<.2.tmp
- msgfmt $<.2.tmp -o $@
-
- # In French, accented characters are mapped to unused ASCII characters
- # Non-mapped characters are replaced by their non-accented equivalents
- fr.mo: fr.po
-- sed -e 'y/àâçéèêîïôùûüÉÊÀ/@*^~`|><#&$$uEEA/' $< > $<.tmp
-+ LANG=fr_FR.UTF-8 LC_CTYPE=fr_FR.UTF-8 sed -e
'y/àâçéèêîïôùûüÉÊÀ/@*^~`|><#&$$uEEA/' $< > $<.tmp
- sed -i~ -e 's/œ/oe/g' $<.tmp
- msgfmt $<.tmp -o $@
-
-@@ -78,6 +78,36 @@ nb.mo: nb.po
- it.mo: it.po
- iconv -f utf-8 -t CP1252 $< > $<.tmp
- LANG=it.CP1252 LC_ALL=it.CP1252 LC_CTYPE=it.CP1252 sed -e
's/UTF-8/CP1252/' $<.tmp > $<.2.tmp
-+ msgfmt $<.2.tmp -o $@
-+
-+hu.mo: hu.po
-+ LANG=hu_HU.UTF-8 LC_ALL=hu_HU.UTF-8 LC_CTYPE=hu_HU.UTF-8 sed -e
'y/äëïöőüűÄËÏŐÖÜŰ/aeioouuAEIOOUU/' $< > $<.tmp
-+ iconv -f utf-8 -t ascii//TRANSLIT $<.tmp > $<.2.tmp
-+ msgfmt $<.2.tmp -o $@
-+
-+lt.mo: lt.po
-+ LANG=lt_LT.UTF-8 LC_ALL=lt_LT.UTF-8 LC_CTYPE=lt_LT.UTF-8 sed -e
'y/äëïöőüűÄËÏŐÖÜŰ/aeioouuAEIOOUU/' $< > $<.tmp
-+ iconv -f utf-8 -t ascii//TRANSLIT $<.tmp > $<.2.tmp
-+ msgfmt $<.2.tmp -o $@
-+
-+nl.mo: nl.po
-+ LANG=nl_NL.UTF-8 LC_ALL=nl_NL.UTF-8 LC_CTYPE=nl_NL.UTF-8 sed -e
'y/äëïöőüűÄËÏŐÖÜŰ/aeioouuAEIOOUU/' $< > $<.tmp
-+ iconv -f utf-8 -t ascii//TRANSLIT $<.tmp > $<.2.tmp
-+ msgfmt $<.2.tmp -o $@
-+
-+sv.mo: sv.po
-+ LANG=sv_SV.UTF-8 LC_ALL=sv_SV.UTF-8 LC_CTYPE=sv_SV.UTF-8 sed -e
'y/äëïöőüűÄËÏŐÖÜŰ/aeioouuAEIOOUU/' $< > $<.tmp
-+ iconv -f utf-8 -t ascii//TRANSLIT $<.tmp > $<.2.tmp
-+ msgfmt $<.2.tmp -o $@
-+
-+pt.mo: pt.po
-+ LANG=pt_PT.UTF-8 LC_ALL=pt_PT.UTF-8 LC_CTYPE=pt_PT.UTF-8 sed -e
'y/äëïöőüűÄËÏŐÖÜŰ/aeioouuAEIOOUU/' $< > $<.tmp
-+ iconv -f utf-8 -t ascii//TRANSLIT $<.tmp > $<.2.tmp
-+ msgfmt $<.2.tmp -o $@
-+
-+tr.mo: tr.po
-+ LANG=tr_TR.UTF-8 LC_ALL=tr_TR.UTF-8 LC_CTYPE=tr_TR.UTF-8 sed -e
'y/äëïöőüűÄËÏŐÖÜŰ/aeioouuAEIOOUU/' $< > $<.tmp
-+ iconv -f utf-8 -t ascii//TRANSLIT $<.tmp > $<.2.tmp
- msgfmt $<.2.tmp -o $@
-
- # All other languages: drop accents transliterated with `"` (which breaks
translation file format)
blob - 89a33ef3e05b9aff8fdff3db84fe94b3d6dc5bd5
file + /dev/null
--- games/fheroes2/patches/patch-src_fheroes2_agg_agg_cpp
+++ /dev/null
@@ -1,163 +0,0 @@
-Fix failing music file search
-GH PR 5278
-
-Index: src/fheroes2/agg/agg.cpp
update games/fheroes2 to 0.9.18
Hi ports@,
This is an update of games/fheroes2 to its latest version 0.9.18
It builds and runs fine for me on amd64, not sure I did the right thing
with the right thing with the lang Makefile. They seem to have changed
things a bit in this area.
Maintainer on cc.
Comments ? Ok to commit ?
diff /usr/ports
commit - d831ba6400d1500e8b55926b20ca44816aa1d8c7
path + /usr/ports
blob - c45a60fc907c523c9fe249b68025fd7205d12b6c
file + games/fheroes2/Makefile
--- games/fheroes2/Makefile
+++ games/fheroes2/Makefile
@@ -2,11 +2,10 @@ COMMENT = engine recreation for Heroes of Might and Ma
GH_ACCOUNT = ihhub
GH_PROJECT = fheroes2
-GH_TAGNAME = 0.9.14
+GH_TAGNAME = 0.9.18
CATEGORIES = games
HOMEPAGE = https://ihhub.github.io/fheroes2/
MAINTAINER = Thomas Frohwein
-REVISION = 0
# GPLv2.0+, LGPLv2.1+ (src/thirdparty/libsmacker)
PERMIT_PACKAGE = Yes
@@ -30,7 +29,6 @@ do-gen:
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/fheroes2/files/data
- ${INSTALL_DATA} ${WRKSRC}/fheroes2.key ${PREFIX}/share/fheroes2/
${INSTALL_DATA} ${WRKSRC}/files/data/resurrection.h2d \
${PREFIX}/share/fheroes2/files/data/
${INSTALL_DATA_DIR} ${PREFIX}/share/fheroes2/files/lang
blob - fe69e1e68011d777d3004c15ca45a0fb6b4e89ea
file + games/fheroes2/distinfo
--- games/fheroes2/distinfo
+++ games/fheroes2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fheroes2-0.9.14.tar.gz) = VTL6hEO42PVPz8VmKPECBHCtIV4SKF14yEUOSeqZRL4=
-SIZE (fheroes2-0.9.14.tar.gz) = 3628240
+SHA256 (fheroes2-0.9.18.tar.gz) = vNmvznuGljD5fP23E2aPD33M9p/Gsx2xynSsL2NSSo0=
+SIZE (fheroes2-0.9.18.tar.gz) = 5117381
blob - 765221e1f24c22c250ab4e4e79020970626a7d68
file + /dev/null
--- games/fheroes2/patches/patch-files_lang_Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-used UTF-8 so that sed doesn't fail because of different string lengths
-add in missing instructions for languages (hu, lt, nl, sv, pt, tr)
-
-Index: files/lang/Makefile
files/lang/Makefile.orig
-+++ files/lang/Makefile
-@@ -31,14 +31,14 @@ merge:
- # Spanish: drop accents transliterated with `"` (which breaks translation
file format)
- # and transliterate the rest using the es_ES.UTF-8 locale
- es.mo: es.po
-- sed -e 'y/äëïöőüűÄËÏŐÖÜŰ/aeioouuAEIOOUU/' $< > $<.tmp
-+ LANG=es_ES.UTF-8 LC_CTYPE=es_ES.UTF-8 sed -e
'y/äëïöőüűÄËÏŐÖÜŰ/aeioouuAEIOOUU/' $< > $<.tmp
- LANG=es_ES.UTF-8 LC_ALL=es_ES.UTF-8 LC_CTYPE=es_ES.UTF-8 iconv -f utf-8
-t ascii//TRANSLIT $<.tmp > $<.2.tmp
- msgfmt $<.2.tmp -o $@
-
- # In French, accented characters are mapped to unused ASCII characters
- # Non-mapped characters are replaced by their non-accented equivalents
- fr.mo: fr.po
-- sed -e 'y/àâçéèêîïôùûüÉÊÀ/@*^~`|><#&$$uEEA/' $< > $<.tmp
-+ LANG=fr_FR.UTF-8 LC_CTYPE=fr_FR.UTF-8 sed -e
'y/àâçéèêîïôùûüÉÊÀ/@*^~`|><#&$$uEEA/' $< > $<.tmp
- sed -i~ -e 's/œ/oe/g' $<.tmp
- msgfmt $<.tmp -o $@
-
-@@ -78,6 +78,36 @@ nb.mo: nb.po
- it.mo: it.po
- iconv -f utf-8 -t CP1252 $< > $<.tmp
- LANG=it.CP1252 LC_ALL=it.CP1252 LC_CTYPE=it.CP1252 sed -e
's/UTF-8/CP1252/' $<.tmp > $<.2.tmp
-+ msgfmt $<.2.tmp -o $@
-+
-+hu.mo: hu.po
-+ LANG=hu_HU.UTF-8 LC_ALL=hu_HU.UTF-8 LC_CTYPE=hu_HU.UTF-8 sed -e
'y/äëïöőüűÄËÏŐÖÜŰ/aeioouuAEIOOUU/' $< > $<.tmp
-+ iconv -f utf-8 -t ascii//TRANSLIT $<.tmp > $<.2.tmp
-+ msgfmt $<.2.tmp -o $@
-+
-+lt.mo: lt.po
-+ LANG=lt_LT.UTF-8 LC_ALL=lt_LT.UTF-8 LC_CTYPE=lt_LT.UTF-8 sed -e
'y/äëïöőüűÄËÏŐÖÜŰ/aeioouuAEIOOUU/' $< > $<.tmp
-+ iconv -f utf-8 -t ascii//TRANSLIT $<.tmp > $<.2.tmp
-+ msgfmt $<.2.tmp -o $@
-+
-+nl.mo: nl.po
-+ LANG=nl_NL.UTF-8 LC_ALL=nl_NL.UTF-8 LC_CTYPE=nl_NL.UTF-8 sed -e
'y/äëïöőüűÄËÏŐÖÜŰ/aeioouuAEIOOUU/' $< > $<.tmp
-+ iconv -f utf-8 -t ascii//TRANSLIT $<.tmp > $<.2.tmp
-+ msgfmt $<.2.tmp -o $@
-+
-+sv.mo: sv.po
-+ LANG=sv_SV.UTF-8 LC_ALL=sv_SV.UTF-8 LC_CTYPE=sv_SV.UTF-8 sed -e
'y/äëïöőüűÄËÏŐÖÜŰ/aeioouuAEIOOUU/' $< > $<.tmp
-+ iconv -f utf-8 -t ascii//TRANSLIT $<.tmp > $<.2.tmp
-+ msgfmt $<.2.tmp -o $@
-+
-+pt.mo: pt.po
-+ LANG=pt_PT.UTF-8 LC_ALL=pt_PT.UTF-8 LC_CTYPE=pt_PT.UTF-8 sed -e
'y/äëïöőüűÄËÏŐÖÜŰ/aeioouuAEIOOUU/' $< > $<.tmp
-+ iconv -f utf-8 -t ascii//TRANSLIT $<.tmp > $<.2.tmp
-+ msgfmt $<.2.tmp -o $@
-+
-+tr.mo: tr.po
-+ LANG=tr_TR.UTF-8 LC_ALL=tr_TR.UTF-8 LC_CTYPE=tr_TR.UTF-8 sed -e
'y/äëïöőüűÄËÏŐÖÜŰ/aeioouuAEIOOUU/' $< > $<.tmp
-+ iconv -f utf-8 -t ascii//TRANSLIT $<.tmp > $<.2.tmp
- msgfmt $<.2.tmp -o $@
-
- # All other languages: drop accents transliterated with `"` (which breaks
translation file format)
blob - 89a33ef3e05b9aff8fdff3db84fe94b3d6dc5bd5
file + /dev/null
--- games/fheroes2/patches/patch-src_fheroes2_agg_agg_cpp
+++ /dev/null
@@ -1,163 +0,0 @@
-Fix failing music file search
-GH PR 5278
-
-Index: src/fheroes2/agg/agg.cpp
src/fheroes2/agg/agg.cpp.orig
-+++ src/fheroes2/agg/agg.cpp
-@@ -22,6 +22,7 @@
-
