From nobody Thu Jan 11 08:59:05 2024 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 4T9drV2Q9nz56wHR; Thu, 11 Jan 2024 08:59:06 +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 4T9drV1Bxhz4bbH; Thu, 11 Jan 2024 08:59:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704963546; 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=ioP0CwzTyOivRNtUYaqGLv5a13UuEHcqUBWUxx8hF8s=; b=jyGqh/4xbuI9Z8SttVtoug+KbkhPfYK1kVoR7PMaf0hwiUO4iYaXVTYlQwHCaduM3nJheG rrFA4RqZ6xgg7r6a+HYy/k8Ey0+782qutOQyUCJ0VCYggmRR3bAY2yhonHZ8NNFtv1ezvS GflBbJYEzSWJga5ljorn/GcaeyK1sYnHqSROh23/+nJPwHlF4Xd5M1p5nPwR3rrsSoLy5g UxDfdkqpmf7+pDjXJSFnL/0AwceMiCi/pKE1PorV/NeOIjzyhEbfWj1euc1IrrswB44b1y tb2t0dMmthC8nZJ3BnRIJzPywidLiGvIpAbc+AC+84OV5p8BDgV36NWY9tk6Kw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704963546; 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=ioP0CwzTyOivRNtUYaqGLv5a13UuEHcqUBWUxx8hF8s=; b=dYpKiNZuOxDPXUJDAaC9UREKSAZCR1LcVi+8FvXcPVaLmK9WZ4eed/99CulA8y5YzdzRfe mooALZY58gkTfxrRMZ6FsizuS3679+Fyh+R+DnDpmDqL2ICtxwV6sd8MZxASBGscUJezUp t8irxwY+xypMBSf5I19ga+tuofBxc9oqNGwpJWzSD3uzBDQLE+o+4za1ZfCIzQgo2Q7Qc1 d+bXOweZic9noL3c42gIwV8mzvBeZuetrBI6N+LWm0kQldcJ+alR/KY8BsNSMhJLpX4g4+ VZkUSOEqa7t/Kk1Yp5w3kSQ75CRTORAwIxXrKCbtAh1pXDGMPt2lhow65S9NQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704963546; a=rsa-sha256; cv=none; b=snIEhOAjWQaZUJcEJbkeXAmGTU4b88B43IQYNpSQ+qDDGAiyAphArsDEywaB+qbOq0OGxS t7dwdE8aGxOTY7pF+QxtlATvWT7acVbH/gb/ttdmLtboOe1at1HERvFBZY0u3Ls39KXBtQ V4l2bK7mWDQLVZVGrpEjyfRm4fRknhOAw5nsGETR2i6fI3H0sJYZCchgcyhkKWwzGxFKAs dH486ssN7VPX2S8TPrbQoWN9LhSiPkU7Bsv/tX5uq+J8tUXH+8K2uP4RBnjlmIaf2kzN/x 5lX4E8ad0T5aoRaOkfyLKro+SNdUE8R+whC5dQZLZXtQCYBRYN4//sxVQaDYYQ== 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 4T9drT6yJHz1Bgf; Thu, 11 Jan 2024 08:59:05 +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 40B8x5l4046539; Thu, 11 Jan 2024 08:59:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40B8x5Q3046536; Thu, 11 Jan 2024 08:59:05 GMT (envelope-from git) Date: Thu, 11 Jan 2024 08:59:05 GMT Message-Id: <202401110859.40B8x5Q3046536@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 3f210b79f147 - main - x11/wmutils-core: reduce patching 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: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3f210b79f147ae7bb8d1e196d4602c96f501191a Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=3f210b79f147ae7bb8d1e196d4602c96f501191a commit 3f210b79f147ae7bb8d1e196d4602c96f501191a Author: Baptiste Daroussin AuthorDate: 2024-01-11 08:58:29 +0000 Commit: Baptiste Daroussin CommitDate: 2024-01-11 08:59:04 +0000 x11/wmutils-core: reduce patching Repect CC and PREFIX via MAKE_ARGS move manpages to share/man --- x11/wmutils-core/Makefile | 3 +++ x11/wmutils-core/files/patch-config.mk | 8 ++------ x11/wmutils-core/pkg-plist | 32 ++++++++++++++++---------------- 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/x11/wmutils-core/Makefile b/x11/wmutils-core/Makefile index c26fc7f3447a..a2ed036b8f57 100644 --- a/x11/wmutils-core/Makefile +++ b/x11/wmutils-core/Makefile @@ -1,6 +1,7 @@ PORTNAME= wmutils-core DISTVERSIONPREFIX= v DISTVERSION= 1.7 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= dmgk@FreeBSD.org @@ -19,6 +20,8 @@ USE_GITHUB= yes GH_ACCOUNT= wmutils GH_PROJECT= core +MAKE_ARGS= PREFIX="${PREFIX}" CC="${CC}" MANPREFIX="${PREFIX}/share/man" + USE_XORG= xcb CONFLICTS= wtf # games/wtf diff --git a/x11/wmutils-core/files/patch-config.mk b/x11/wmutils-core/files/patch-config.mk index fd109106f939..d656368ed536 100644 --- a/x11/wmutils-core/files/patch-config.mk +++ b/x11/wmutils-core/files/patch-config.mk @@ -1,10 +1,6 @@ ---- config.mk.orig 2019-10-16 17:08:21 UTC +--- config.mk.orig 2022-07-01 20:47:48 UTC +++ config.mk -@@ -1,9 +1,9 @@ --PREFIX = /usr -+PREFIX ?= /usr/local - MANPREFIX = $(PREFIX)/man - +@@ -4,6 +4,6 @@ LD = $(CC) CC = cc LD = $(CC) diff --git a/x11/wmutils-core/pkg-plist b/x11/wmutils-core/pkg-plist index e429175f5657..54eeec5c0384 100644 --- a/x11/wmutils-core/pkg-plist +++ b/x11/wmutils-core/pkg-plist @@ -14,19 +14,19 @@ bin/wmv bin/wrs bin/wtf bin/wtp -man/man1/atomx.1.gz -man/man1/chwb.1.gz -man/man1/chwso.1.gz -man/man1/ignw.1.gz -man/man1/killw.1.gz -man/man1/lsw.1.gz -man/man1/mapw.1.gz -man/man1/pfw.1.gz -man/man1/slw.1.gz -man/man1/wattr.1.gz -man/man1/wmp.1.gz -man/man1/wmutils.1.gz -man/man1/wmv.1.gz -man/man1/wrs.1.gz -man/man1/wtf.1.gz -man/man1/wtp.1.gz +share/man/man1/atomx.1.gz +share/man/man1/chwb.1.gz +share/man/man1/chwso.1.gz +share/man/man1/ignw.1.gz +share/man/man1/killw.1.gz +share/man/man1/lsw.1.gz +share/man/man1/mapw.1.gz +share/man/man1/pfw.1.gz +share/man/man1/slw.1.gz +share/man/man1/wattr.1.gz +share/man/man1/wmp.1.gz +share/man/man1/wmutils.1.gz +share/man/man1/wmv.1.gz +share/man/man1/wrs.1.gz +share/man/man1/wtf.1.gz +share/man/man1/wtp.1.gz