From nobody Thu Sep 29 15:46:27 2022 X-Original-To: dev-commits-ports-main@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 4Mdd50085wz4d6m3; Thu, 29 Sep 2022 15:46:28 +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 4Mdd4z6jZPz3yRK; Thu, 29 Sep 2022 15:46:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664466387; 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=cir37qN3ZqlmN70nNYcg3o6xfikx5yw0s9tV//bjfT4=; b=Cboj4JqZM/smXVa6sunMdMELF5fwIX3MdlXstMVOXL0lELFrIb7vnAvIhQ1vEcivIoHrOx Rg6fR1C9p1ZpvWZpqCluoZG8lpwOmARIhRBqxoJlq3QhzjuZ2iHskJh4GkO63gk1UgCT4z F2SR1ekqxs90vY5oikT/h1YkW/3c79A3nK8gyRBejajcZISnhSHFwEfMqfq5kyhBygpXEW 5IcaXOwIixsh5dqO8qBh4dA06OEve3cw95D19roF2wawqPlxgj0rmxk0vi/bXWP8nnlJSK anci/eODX4t1B/MPgPJdifFpFuudg7g8KgsKnNw2dxyCRF4z6pz4H+Vj3TDvag== 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 4Mdd4z5mZdzs3G; Thu, 29 Sep 2022 15:46:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28TFkRom028117; Thu, 29 Sep 2022 15:46:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28TFkRVT028116; Thu, 29 Sep 2022 15:46:27 GMT (envelope-from git) Date: Thu, 29 Sep 2022 15:46:27 GMT Message-Id: <202209291546.28TFkRVT028116@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Felix Palmen Subject: git: 89f4f3f8101d - main - x11-wm/fvwm3: Update to 1.0.5 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zirias X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 89f4f3f8101dec473377d2ed6e0d4e63396a88aa Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664466387; 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=cir37qN3ZqlmN70nNYcg3o6xfikx5yw0s9tV//bjfT4=; b=uqsA2oLvqOrzzGaoc/VVEefwQqLw0PoJ4i6CD+FmHXkn8wreSp57UI/rGyx4YltYab1hXB sjFoyeekuWT6b9FRk/gpay9yv+lhVvEc2jeBcXUgavJIDK74ISyBNDbE7NhRazSVjkdG8L VriCJED8ZeYTmoeF6E356WUUS+NpOgPgrWYi3gCGPohITuLVsHvmidpefaSe6+fGfYDeql 0+Ci9+kF1VFU9TVAgDIiqcNtAXBfxGO/IGtO/yEIClji4PC7TXGdhC1XThQs0kc7DPA/4e Jj52qStmhMPe3/xUYSPGbdD1+mHwU8G7UgbiB8oq4r37TYbZby86XeQIS70pUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664466387; a=rsa-sha256; cv=none; b=khh1CzcHrgam4nwGRZtO7K3ewl4Z3quifOv25wQ++0zN9xzD4s0CwrWlAl5+DrNXjfSBaj fqilVMFbWHMQjUZ2OaXciiPoe9opEu68zm0Be55j/7GV53PxTs8THA/z0dioKH7SKa2mIM nNwUftn3uDSGZ7xgLs+C4iRLTYUjdlSP/RPrOK2ZuUTuef6FdWMzAxTzKx6KzagM+GsD0P 4zxONtW/7NNLRnz7ZPgmZX4tdlJ1HXgiRYDYdbxWD5Ad2CkeV5v7A4NXSuH7/mKkSYKd5m ZQfIQfyLBTpjBMdVJGvY1otVhBXFhZ4bOd5z/4RZ/mMBn0CXqUjbgOT7EVtTuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zirias: URL: https://cgit.FreeBSD.org/ports/commit/?id=89f4f3f8101dec473377d2ed6e0d4e63396a88aa commit 89f4f3f8101dec473377d2ed6e0d4e63396a88aa Author: Felix Palmen AuthorDate: 2022-09-29 15:04:07 +0000 Commit: Felix Palmen CommitDate: 2022-09-29 15:46:03 +0000 x11-wm/fvwm3: Update to 1.0.5 Also switch from PORTVERSION to preferred DISTVERSION. Changelog: https://github.com/fvwmorg/fvwm3/releases/tag/1.0.5 Approved by: tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D36796 --- x11-wm/fvwm3/Makefile | 10 ++++------ x11-wm/fvwm3/distinfo | 6 +++--- x11-wm/fvwm3/files/patch-pr265291 | 39 +++---------------------------------- x11-wm/fvwm3/pkg-plist | 41 ++++++++++++++++++++++----------------- 4 files changed, 33 insertions(+), 63 deletions(-) diff --git a/x11-wm/fvwm3/Makefile b/x11-wm/fvwm3/Makefile index 4627c1ec4979..266be27a8207 100644 --- a/x11-wm/fvwm3/Makefile +++ b/x11-wm/fvwm3/Makefile @@ -1,8 +1,7 @@ PORTNAME= fvwm3 -PORTVERSION= 1.0.4 -PORTREVISION= 8 +DISTVERSION= 1.0.5 CATEGORIES= x11-wm -MASTER_SITES= https://github.com/fvwmorg/fvwm3/releases/download/${PORTVERSION}/ \ +MASTER_SITES= https://github.com/fvwmorg/fvwm3/releases/download/${DISTVERSION}/ \ http://fvwm.sourceforge.net/generated/icon_download/:icons MAINTAINER= zirias@FreeBSD.org @@ -24,7 +23,7 @@ CONFLICTS_INSTALL= fvwm CPE_VENDOR= fvwm CPE_PRODUCT= fvwm -PLIST_SUB= PORTVERSION=${PORTVERSION} +PLIST_SUB= DISTVERSION=${DISTVERSION} GNU_CONFIGURE= yes CONFIGURE_ARGS= ac_cv_path_PYTHON=${PYTHON_CMD} @@ -40,7 +39,6 @@ FRIBIDI_CONFIGURE_ENABLE= bidi GO_DESC= Build and install modules written in Go GO_USES= go:no_targets GO_CONFIGURE_ENABLE= golang -GO_MAKE_ARGS= GOBUILD="go build -ldflags=\"-s -w\"" FVWM_ICONS= fvwm_icons-20070101 ICONS_DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${FVWM_ICONS}.tar.bz2:icons @@ -88,7 +86,7 @@ post-install-PERL-off: ${RM} ${STAGEDIR}${PREFIX}/bin/${script} .endfor .for script in FvwmConsoleC.pl FvwmPerl - ${RM} ${STAGEDIR}${PREFIX}/libexec/fvwm3/${PORTVERSION}/${script} + ${RM} ${STAGEDIR}${PREFIX}/libexec/fvwm3/${DISTVERSION}/${script} .endfor .include diff --git a/x11-wm/fvwm3/distinfo b/x11-wm/fvwm3/distinfo index 8e85bc9ef20c..6de2821c6726 100644 --- a/x11-wm/fvwm3/distinfo +++ b/x11-wm/fvwm3/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1632559997 -SHA256 (fvwm3-1.0.4.tar.gz) = 20877e20ae5ce39266e7d0ea48b013e822d600dd94f5b269955db05a3d50a63b -SIZE (fvwm3-1.0.4.tar.gz) = 4691719 +TIMESTAMP = 1664448220 +SHA256 (fvwm3-1.0.5.tar.gz) = c41a7eaf1cbdebcbcc7ffc773bb25cc07879fbce3429633dd0584e8ebc8b1014 +SIZE (fvwm3-1.0.5.tar.gz) = 4538262 SHA256 (fvwm_icons-20070101.tar.bz2) = 86b0164430a3087f5cb8d55eb43a8676bbce495814b30c6844eb127f952642ab SIZE (fvwm_icons-20070101.tar.bz2) = 330862 diff --git a/x11-wm/fvwm3/files/patch-pr265291 b/x11-wm/fvwm3/files/patch-pr265291 index 59fa97e71389..07dacc2d521e 100644 --- a/x11-wm/fvwm3/files/patch-pr265291 +++ b/x11-wm/fvwm3/files/patch-pr265291 @@ -6,46 +6,13 @@ fix. Upstream issue: https://github.com/fvwmorg/fvwm3/issues/659 ---- modules/FvwmIconMan/x.c.orig 2022-07-18 23:18:50 UTC +--- modules/FvwmIconMan/x.c.orig 2022-09-21 21:44:02 UTC +++ modules/FvwmIconMan/x.c -@@ -742,6 +742,7 @@ void X_init_manager (int man_id) - char *scr; +@@ -741,6 +741,7 @@ void X_init_manager (int man_id) + if (man->geometry_str) { fscreen_scr_arg arg; arg.mouse_ev = NULL; + arg.name = NULL; geometry_mask = FScreenParseGeometryWithScreen( man->geometry_str, &man->geometry.x, &man->geometry.y, ---- libs/FScreen.c.orig 2022-07-21 10:39:30 UTC -+++ libs/FScreen.c -@@ -186,6 +186,11 @@ monitor_resolve_name(const char *scr) - { - struct monitor *m = NULL; - -+ if (scr == NULL) -+ { -+ return NULL; -+ } -+ - /* Assume the monitor name is a literal RandR name (such as HDMI2) and - * look it up regardless. - */ -@@ -698,11 +703,14 @@ FindScreen(fscreen_scr_arg *arg, fscreen_scr_t screen) - m = FindScreenOfXY(arg->xypos.x, arg->xypos.y); - break; - case FSCREEN_BY_NAME: -- if (arg == NULL || arg->name == NULL) { -- /* XXX: Work out what to do. */ -- break; -+ if (arg == NULL || arg->name == NULL) -+ { -+ m = monitor_by_primary(); - } -- m = monitor_resolve_name(arg->name); -+ else -+ { -+ m = monitor_resolve_name(arg->name); -+ } - break; - default: - /* XXX: Possible error condition here? */ diff --git a/x11-wm/fvwm3/pkg-plist b/x11-wm/fvwm3/pkg-plist index a996eb27a1d6..2fbf4ac51aad 100644 --- a/x11-wm/fvwm3/pkg-plist +++ b/x11-wm/fvwm3/pkg-plist @@ -8,29 +8,29 @@ bin/fvwm-menu-desktop %%PERL%%bin/fvwm-perllib bin/fvwm-root bin/fvwm3 -libexec/fvwm3/%%PORTVERSION%%/FvwmAnimate -libexec/fvwm3/%%PORTVERSION%%/FvwmAuto -libexec/fvwm3/%%PORTVERSION%%/FvwmBacker -libexec/fvwm3/%%PORTVERSION%%/FvwmButtons -%%GO%%libexec/fvwm3/%%PORTVERSION%%/FvwmCommandS -%%NO_GO%%libexec/fvwm3/%%PORTVERSION%%/FvwmConsole -%%NO_GO%%libexec/fvwm3/%%PORTVERSION%%/FvwmConsoleC -libexec/fvwm3/%%PORTVERSION%%/FvwmEvent -libexec/fvwm3/%%PORTVERSION%%/FvwmForm -libexec/fvwm3/%%PORTVERSION%%/FvwmIconMan -libexec/fvwm3/%%PORTVERSION%%/FvwmIdent -libexec/fvwm3/%%PORTVERSION%%/FvwmMFL -libexec/fvwm3/%%PORTVERSION%%/FvwmPager -%%PERL%%libexec/fvwm3/%%PORTVERSION%%/FvwmPerl -libexec/fvwm3/%%PORTVERSION%%/FvwmRearrange -libexec/fvwm3/%%PORTVERSION%%/FvwmScript -libexec/fvwm3/%%PORTVERSION%%/FvwmTalk +libexec/fvwm3/%%DISTVERSION%%/FvwmAnimate +libexec/fvwm3/%%DISTVERSION%%/FvwmAuto +libexec/fvwm3/%%DISTVERSION%%/FvwmBacker +libexec/fvwm3/%%DISTVERSION%%/FvwmButtons +%%GO%%libexec/fvwm3/%%DISTVERSION%%/FvwmCommandS +%%NO_GO%%libexec/fvwm3/%%DISTVERSION%%/FvwmConsole +%%NO_GO%%libexec/fvwm3/%%DISTVERSION%%/FvwmConsoleC +libexec/fvwm3/%%DISTVERSION%%/FvwmEvent +libexec/fvwm3/%%DISTVERSION%%/FvwmForm +libexec/fvwm3/%%DISTVERSION%%/FvwmIconMan +libexec/fvwm3/%%DISTVERSION%%/FvwmIdent +libexec/fvwm3/%%DISTVERSION%%/FvwmMFL +libexec/fvwm3/%%DISTVERSION%%/FvwmPager +%%PERL%%libexec/fvwm3/%%DISTVERSION%%/FvwmPerl +libexec/fvwm3/%%DISTVERSION%%/FvwmRearrange +libexec/fvwm3/%%DISTVERSION%%/FvwmScript +libexec/fvwm3/%%DISTVERSION%%/FvwmTalk %%MANPAGES%%man/man1/FvwmAnimate.1.gz %%MANPAGES%%man/man1/FvwmAuto.1.gz %%MANPAGES%%man/man1/FvwmBacker.1.gz %%MANPAGES%%man/man1/FvwmButtons.1.gz %%MANPAGES%%%%GO%%man/man1/FvwmCommand.1.gz -%%MANPAGES%%man/man1/FvwmConsole.1.gz +%%NO_GO%%%%MANPAGES%%man/man1/FvwmConsole.1.gz %%MANPAGES%%man/man1/FvwmEvent.1.gz %%MANPAGES%%man/man1/FvwmForm.1.gz %%MANPAGES%%man/man1/FvwmIconMan.1.gz @@ -49,6 +49,11 @@ libexec/fvwm3/%%PORTVERSION%%/FvwmTalk %%MANPAGES%%man/man1/fvwm-perllib.1.gz %%MANPAGES%%man/man1/fvwm-root.1.gz %%MANPAGES%%man/man1/fvwm3.1.gz +%%MANPAGES%%man/man1/fvwm3_manpage_source.1.gz +%%MANPAGES%%man/man1/fvwm3all.1.gz +%%MANPAGES%%man/man1/fvwm3commands.1.gz +%%MANPAGES%%man/man1/fvwm3menus.1.gz +%%MANPAGES%%man/man1/fvwm3styles.1.gz %%DATADIR%%/ConfigFvwmBacker %%DATADIR%%/ConfigFvwmButtons %%DATADIR%%/ConfigFvwmDefaults