Date: Sat, 1 Jun 2024 09:07:58 GMT From: Nuno Teixeira <eduardo@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 27cff1895db0 - main - games/exult-devel: Update to 1.9.0.20240531 Message-ID: <202406010907.45197wEE037443@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=27cff1895db0fbc2f611ac91d382d4cf7c3fcf17 commit 27cff1895db0fbc2f611ac91d382d4cf7c3fcf17 Author: Nuno Teixeira <eduardo@FreeBSD.org> AuthorDate: 2024-06-01 09:02:36 +0000 Commit: Nuno Teixeira <eduardo@FreeBSD.org> CommitDate: 2024-06-01 09:07:32 +0000 games/exult-devel: Update to 1.9.0.20240531 - While I'm here use separated PATCHDIRs for master and slave ports for easier updates ChangeLog: https://github.com/exult/exult/compare/snapshot-v1.9.0.20240325...snapshot-v1.9.0.20240531 --- games/exult-devel/Makefile | 3 ++- games/exult-devel/distinfo | 6 ++--- games/exult-devel/files/patch-mapedit_Makefile.am | 13 ++++++++++ games/exult-devel/files/patch-tools_Makefile.am | 29 ++++++++++++++++++++++ games/exult-devel/files/pkg-message.in | 7 ++++++ games/exult/Makefile | 2 -- ...extra-patch-configure.ac => patch-configure.ac} | 0 .../{extra-patch-version.cc => patch-version.cc} | 0 8 files changed, 54 insertions(+), 6 deletions(-) diff --git a/games/exult-devel/Makefile b/games/exult-devel/Makefile index 1a908375dc9d..92ff65fd1b4b 100644 --- a/games/exult-devel/Makefile +++ b/games/exult-devel/Makefile @@ -1,5 +1,5 @@ DISTVERSIONPREFIX= snapshot-v -DISTVERSION= 1.9.0.20240325 +DISTVERSION= 1.9.0.20240531 PORTREVISION= 0 # Always set PORTREVISION explicitly as otherwise it is inherited from games/exult PKGNAMESUFFIX= -devel @@ -10,6 +10,7 @@ STUDIO_LIB_DEPENDS= libfreetype.so:print/freetype2 \ libicuuc.so:devel/icu MASTERDIR= ${.CURDIR}/../exult +PATCHDIR= ${.CURDIR}/files DISTINFO_FILE= ${.CURDIR}/distinfo .include "${MASTERDIR}/Makefile" diff --git a/games/exult-devel/distinfo b/games/exult-devel/distinfo index fb8b8d9c95d8..aca1ed06e02f 100644 --- a/games/exult-devel/distinfo +++ b/games/exult-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1711374672 -SHA256 (exult-exult-snapshot-v1.9.0.20240325_GH0.tar.gz) = 19e4d7658c23a3a89d53f625c12afb7a2f47aac94484fbe8a0325eec0b4938d8 -SIZE (exult-exult-snapshot-v1.9.0.20240325_GH0.tar.gz) = 19374526 +TIMESTAMP = 1717230197 +SHA256 (exult-exult-snapshot-v1.9.0.20240531_GH0.tar.gz) = 01a263fe14a222576bcc9af7c2b9bb4c1c679af5443bff1af9f898350b4e95d3 +SIZE (exult-exult-snapshot-v1.9.0.20240531_GH0.tar.gz) = 19385217 diff --git a/games/exult-devel/files/patch-mapedit_Makefile.am b/games/exult-devel/files/patch-mapedit_Makefile.am new file mode 100644 index 000000000000..a05690e7520e --- /dev/null +++ b/games/exult-devel/files/patch-mapedit_Makefile.am @@ -0,0 +1,13 @@ +--- mapedit/Makefile.am.orig 2024-05-30 10:27:11 UTC ++++ mapedit/Makefile.am +@@ -103,8 +103,8 @@ install-exec-local: + + if GIMP_PLUGIN + install-exec-local: +- install -d $(DESTDIR)$(GIMP_PLUGIN_PREFIX) +- install -c $(GIMP_PLUGINS) $(DESTDIR)$(GIMP_PLUGIN_PREFIX) ++ $(MKDIR_P) $(DESTDIR)$(GIMP_PLUGIN_PREFIX) ++ $(INSTALL_PROGRAM) $(GIMP_PLUGINS) $(DESTDIR)$(GIMP_PLUGIN_PREFIX) + else + install-exec-local: + endif diff --git a/games/exult-devel/files/patch-tools_Makefile.am b/games/exult-devel/files/patch-tools_Makefile.am new file mode 100644 index 000000000000..5c4f64ac46d2 --- /dev/null +++ b/games/exult-devel/files/patch-tools_Makefile.am @@ -0,0 +1,29 @@ +--- tools/Makefile.am.orig 2024-05-30 10:27:11 UTC ++++ tools/Makefile.am +@@ -68,11 +68,11 @@ if BUILD_GTHUMB + ## Does not work: + #thumbnailerdir=$(datadir)/thumbnailers + ## Needs to be in /usr/share/thumbnailers +-thumbnailerdir=/usr/share/thumbnailers ++thumbnailerdir=$(datadir)/thumbnailers + thumbnailer_in_files=$(top_srcdir)/tools/gnome_u7shapes.thumbnailer.in + thumbnailer_DATA=$(thumbnailer_in_files:.thumbnailer.in=.thumbnailer) + gnome_shp_thumbnailer_DATA=x-shapefile.xml +-gnome_shp_thumbnailerdir=$(DESTDIR)$(datadir)/mime/packages ++gnome_shp_thumbnailerdir=$(datadir)/mime/packages + + # Rule to make the service file with bindir expanded + $(thumbnailer_DATA): $(thumbnailer_in_files) +@@ -117,10 +117,10 @@ install-data-hook: + + if BUILD_GTHUMB + install-data-hook: +- update-mime-database $(DESTDIR)$(datadir)/mime || : ++ : + + uninstall-hook: +- update-mime-database $(DESTDIR)$(datadir)/mime || : ++ : + else + install-data-hook: + uninstall-hook: diff --git a/games/exult-devel/files/pkg-message.in b/games/exult-devel/files/pkg-message.in new file mode 100644 index 000000000000..6a5d128a9a77 --- /dev/null +++ b/games/exult-devel/files/pkg-message.in @@ -0,0 +1,7 @@ +[ +{ type: install + message: <<EOM + Please, read %%DOCSDIR%%/README for additional information. +EOM +} +] diff --git a/games/exult/Makefile b/games/exult/Makefile index 57ad1c1e8c0e..131a9868b4a4 100644 --- a/games/exult/Makefile +++ b/games/exult/Makefile @@ -32,8 +32,6 @@ PLIST?= ${.CURDIR}/pkg-plist .if !defined(MASTERDIR) MASTER_SITES= http://prdownloads.sourceforge.net/exult/ -EXTRA_PATCHES= ${PATCHDIR}/extra-patch-version.cc \ - ${PATCHDIR}/extra-patch-configure.ac .else USE_GITHUB= yes .endif diff --git a/games/exult/files/extra-patch-configure.ac b/games/exult/files/patch-configure.ac similarity index 100% rename from games/exult/files/extra-patch-configure.ac rename to games/exult/files/patch-configure.ac diff --git a/games/exult/files/extra-patch-version.cc b/games/exult/files/patch-version.cc similarity index 100% rename from games/exult/files/extra-patch-version.cc rename to games/exult/files/patch-version.cc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202406010907.45197wEE037443>