From nobody Sat Jun 1 09:07:58 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VrvKC0tR5z5MWqQ; Sat, 01 Jun 2024 09:07:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VrvKC0MYgz4l0g; Sat, 1 Jun 2024 09:07:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717232879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MmyOmghK6ynb/Yre7rI7ZItCO7wS+5JvT+Gw5kNjdjo=; b=ezDLOs97kMM9PyH8IcPpRBSDRete8Lc9NvMpiBYW6H1u0FcRPQqkl2IPuLEGijtKF+VmqN v6EvfHrZ4Mw9vX8PlXqB8pLSXhM8Fhigk41AaVku/SStWiVhtUFLQ2hSKHohNOssN7v1D6 PHSJr1eLRniTXvXJJ+wpx3DODSQsQRM05GOY5fYQ+GLHiRtSU5SizhcVbU5wceYpOVnv6/ QStTRdPrKmZjlJJp7y8tt/WaOdox37kxT+y7mJ/TPVhTsKQdQSXFqZaaLU8wy+euvil5T+ x+c4yc5qfyc5X2tXw5lSCZMd/I5GQFKbWn2FcNsqVKQ07L60xjsj32XbA/t9Xg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717232879; a=rsa-sha256; cv=none; b=RA2wS7k6DUGUlOaXidAVKONHYVbmkDo9hqHU00dBRk5bw1qtIA0pRkfUYWwCzYXboFbBY+ aOf+ShvJcPGNf8FU/qp0ocQmJ/IaWqEj7s7xhXzLut2cUsHTWmEYQI/bWwA5KcaYYpnGwT g6AwpUGZBE9WvBU0Upea5BohWe+V0LI1i1oS7jQz+zzJgz7xNFQpw3zlz+W3PIOTOEn7o0 H0uvqmcYVdxiwjSTb1arwEgSd6jJMvjGqjXyn2JG4xT835zlaENBxZm9a2KhtdISewM94l MoMuIWRDAIXPSTPD2eJhP2c20GoAFIWu9Imm06heuhZVAsLXz1kSVVnYgsIKJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717232879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MmyOmghK6ynb/Yre7rI7ZItCO7wS+5JvT+Gw5kNjdjo=; b=r9yY+ETrTOoPYDbMpQNgf/0hmW27obtnI0RzDqKEdirIu15gilc1qf7VPj2G0vRWh5GWCp H7SXPlJoVnfTcgXqdOqYLltKxmpIAsmLycKsMknbTbXe7NW6fEEbamkmjpIL4f+VsLn1zb 0KsQu/51S8Bz6ZunKFymzssZuk+C0NX/EWH6wglsbi5Jdc6XmOubmMUUmQxAachYS+6Sxk fCz5FX7CYZf3B/AAaEMl2jsmDfHbO0zyDocCHwqXYDVt8lfexQButHmJ/ndI6P7ErNFjl0 5NEwgPUMQCLGRGXk2nCyd4acdj1QVYDETA1Q8wCkSjCwWMRqv9WGHlu3wiEyYA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VrvKB6zpLz121k; Sat, 1 Jun 2024 09:07:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45197wgU037446; Sat, 1 Jun 2024 09:07:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45197wEE037443; Sat, 1 Jun 2024 09:07:58 GMT (envelope-from git) Date: Sat, 1 Jun 2024 09:07:58 GMT Message-Id: <202406010907.45197wEE037443@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: 27cff1895db0 - main - games/exult-devel: Update to 1.9.0.20240531 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 27cff1895db0fbc2f611ac91d382d4cf7c3fcf17 Auto-Submitted: auto-generated The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=27cff1895db0fbc2f611ac91d382d4cf7c3fcf17 commit 27cff1895db0fbc2f611ac91d382d4cf7c3fcf17 Author: Nuno Teixeira AuthorDate: 2024-06-01 09:02:36 +0000 Commit: Nuno Teixeira 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: <