From nobody Thu Jan 11 10:31:08 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 4T9gth4YTSz576hB; Thu, 11 Jan 2024 10:31:08 +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 4T9gth40bbz4pQh; Thu, 11 Jan 2024 10:31:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704969068; 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=Ad25VR+tIaTXy5UwAxMhqwPGysj+RF5Vis7ox06SWqI=; b=GXhJO3xCkruzv2n+y7q2butwmEqTBA278aIc0mlPOjq1PmULTqDKO/lJxfx3JJJnXOOadc bY/v/DKTN7kGPAc4W5mUhkOh+IODK1ZqAgShw5k6kUQm8ZeUDa8hHQ9LrPhQ5u8CyIxEPE U3Rmcbv6ubKfz1jagemLKQqxoq6YkBWPFQvzOwbZSwqoiAs09dLqmriFL9EuTWyg1ThzgK IWO/2qoitAeehJ2gZWc0kmfeXTbHY0wk3qGSJNdeSM5Z2yMHAb4ERdioYLw+BS/9E+uPEn dOIlKVeFC6tZV5njXWyWSz76AJqFQxArZSbsKNUibZGBLEt4B7AzsaOwMceWxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704969068; 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=Ad25VR+tIaTXy5UwAxMhqwPGysj+RF5Vis7ox06SWqI=; b=Z/DDbxg6BITjrrOfpRutR+83+FcJb+8r9CyHu7Jwe6K1dYH8BW/K0t9JUue1yErPbsfbKa JQ6N7EchQRpb3s76nYP8J+Bjs5Fx3dNwkbQnu1Oi2q1hXryWoR/CbFTMbcLOol2xrYNARK fXoCyHjXrxr8HuFltFvlbkcgPz2Hv+OGwLmyAzyyUnYMa2R7/kJD8OV3hdAPLG8eMK+r7i jj2XLMHRf0/nwoscJ7CowPgu1wke0DUuFdl+61oRIV5oqyZATsM6Rb23suAQOitzddJw0d Jyrc6dnpxUr35mvwp3+sia8dsJMGbdHJVzZ4e7nSXrVwHzxaM/Z2+5cnzaN1Uw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704969068; a=rsa-sha256; cv=none; b=IcEy+Jnno8S9p15UF3DIITKisQiwr6l3hYsxYeD9qOZv8IzM1dcViAvRCf+F7k3R4u0KP6 1zqt0jTIdRrldLA5oVpWjueOW27uNG9nPqxyM5Tj/LGNlUrdmr52RM4hh7XihC64z+GNV4 scqXeSoYOXCOmmPS5mtd6aK2Cn42IRnwxVgTG2oRy/tx3JI6D1TZEIXSHFNmZJu3yWugZ5 61VYxt2MX4DP7Nu9eV5MT1zjAaTLtGx7sV/fFhDjyMbsFW2aJs9SEpVaVwK2Y94zHxLcJG 2V2kwJaSJ0PAGgC/R6LxcDaJrElXarjKgVAj2ONXfXcZ/xEtmG+5rJiRSpGaGg== 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 4T9gth34rWzFmQ; Thu, 11 Jan 2024 10:31:08 +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 40BAV8Bv013749; Thu, 11 Jan 2024 10:31:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40BAV8mA013747; Thu, 11 Jan 2024 10:31:08 GMT (envelope-from git) Date: Thu, 11 Jan 2024 10:31:08 GMT Message-Id: <202401111031.40BAV8mA013747@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: 8ab6cbe60e19 - main - x11-wm/wmname: use MAKE_ARGS instead of patching 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 8ab6cbe60e1954261f2129b24e32ed8ac147c9f6 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=8ab6cbe60e1954261f2129b24e32ed8ac147c9f6 commit 8ab6cbe60e1954261f2129b24e32ed8ac147c9f6 Author: Baptiste Daroussin AuthorDate: 2024-01-11 09:31:06 +0000 Commit: Baptiste Daroussin CommitDate: 2024-01-11 10:31:03 +0000 x11-wm/wmname: use MAKE_ARGS instead of patching --- x11-wm/wmname/Makefile | 2 ++ x11-wm/wmname/files/patch-config.mk | 18 ------------------ 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/x11-wm/wmname/Makefile b/x11-wm/wmname/Makefile index 8381d6cf5248..7276459422b1 100644 --- a/x11-wm/wmname/Makefile +++ b/x11-wm/wmname/Makefile @@ -12,5 +12,7 @@ USES= xorg USE_XORG= x11 xorgproto PLIST_FILES= bin/wmname +MAKE_ARGS= PREFIX="${PREFIX}" CC="${CC}" \ + X11LIB="${PREFIX}/lib" X11INC="${PREFIX}/include" .include diff --git a/x11-wm/wmname/files/patch-config.mk b/x11-wm/wmname/files/patch-config.mk deleted file mode 100644 index 16fb2fc58cb6..000000000000 --- a/x11-wm/wmname/files/patch-config.mk +++ /dev/null @@ -1,18 +0,0 @@ ---- config.mk.orig 2009-08-08 00:44:35.000000000 +0200 -+++ config.mk 2009-08-08 00:45:45.000000000 +0200 -@@ -4,11 +4,11 @@ - # Customize below to fit your system - - # paths --PREFIX = /usr/local --MANPREFIX = ${PREFIX}/share/man -+PREFIX?= /usr/local -+MANPREFIX = ${PREFIX}/man - --X11INC = /usr/X11R6/include --X11LIB = /usr/X11R6/lib -+X11INC = $(LOCALBASE)/include -+X11LIB = $(LOCALBASE)/lib - - # includes and libs - INCS = -I. -I/usr/include -I${X11INC}