From nobody Thu Jan 11 08:55:26 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 4T9dmG71Cxz56vlk; Thu, 11 Jan 2024 08:55:26 +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 4T9dmG3RTjz4bGT; Thu, 11 Jan 2024 08:55:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704963326; 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=eipzJvvJ/nRaTeenCNg2KwsVyM3huyZn2VcWz14ua2E=; b=NSx9SM6QuaUnT6BqrRN7KpdkhPt8t76p4cBzRoiMoQNKi610egSoGCI7sJEmQr2n86dMru YY3XX8tEUAX96eiqmvYjJ1iNCY3qFzodtMhY9A2tlx3G97s+xy6+Ijc2d5WqF+KXrDPo5n Ahce1m6orSIHGSjsWwVTqPqH8i0LIxHWgphEvMg5w1zmdgkjlBI2cBFyaAsB2s7bt31kr+ hq/EI3rFI0FxQYvqgV5nk9rm4Kclp6xbIG2gy8OewCnP0/8f6UG9fppBx2UFB30Plc+uHA HuisAQ1Hlos9QCXLqfSb/Cj9cV35FQ9yTEEibVDVzJ94S9umBClpeYaFBebg6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704963326; 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=eipzJvvJ/nRaTeenCNg2KwsVyM3huyZn2VcWz14ua2E=; b=YbhlLMaAobUUSSUrQs76Si1YjgycXq0PDaC9NJxdSfrmt8A1UYXNV8Fds6ypNRzqgJyewt 8HWCtbTEJ7xKESB4jBICErDXc2hkqlZxrTj3+LGcVzS0uCyK4oEkYZSuALnpzr0d3gOHuA F5IXxB5TLEc18QHPMMGMwGQuXYjlIGsMkmBomXYhHlBmBaNZ9szaTULx61oJ0dsq6VogfM AcDNEiXA1gHGRuAIGtva3tM5/ncd6J2WDNnCrK94IQK8W2S6zLQhR5ip5+MpzbpO3EB0uQ mtMTY+JL7gszmhm9yXktFe14dMEMT9QG7GFko6QKj2f9gbcU+c4u9Lhj5Q0daQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704963326; a=rsa-sha256; cv=none; b=qETqTimFD3CrrMc4Hf0fRk/mqT0lbcWiIB6e64deBc/X+id7q+bXHCeQuH/dvaVywmCm6x 2hRTDXuEBx2Dvs9K9HcFGEo/WSzXOBotiFIU6xbCf/Ef+fxUBaE93CzY9d7KaYwIQ/Pa/I hcmnCDwQCpOxJIYPGulsQ/V31Fpzs9hhaGe2vCovI8oXZ8fYLeMYlgNgV1ov+H6M0Kxy2H eqIHufHEFDfh3qgc9YNoV7wLemSQHhdl0oOZ1j1A63llM/n14ucfghN/dhPhpM4CWOAHxL Zm4w5OWZ4d8c3Vel/PSASG1DJ7eseSCK14PgQ28y3hQrirOYRb3McNyrklWfJg== 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 4T9dmG2Qw4z1B8f; Thu, 11 Jan 2024 08:55:26 +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 40B8tQFW045599; Thu, 11 Jan 2024 08:55:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40B8tQjx045596; Thu, 11 Jan 2024 08:55:26 GMT (envelope-from git) Date: Thu, 11 Jan 2024 08:55:26 GMT Message-Id: <202401110855.40B8tQjx045596@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: 16cdb8a0f330 - main - x11/tabbed: 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: 16cdb8a0f3300848d4c1a5295cad9e68cd16d8f3 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=16cdb8a0f3300848d4c1a5295cad9e68cd16d8f3 commit 16cdb8a0f3300848d4c1a5295cad9e68cd16d8f3 Author: Baptiste Daroussin AuthorDate: 2024-01-11 08:54:35 +0000 Commit: Baptiste Daroussin CommitDate: 2024-01-11 08:55:24 +0000 x11/tabbed: reduce patching Repect PREFIX and CC by using MAKE_ARGS instead of patching While here move manpages to share/man --- x11/tabbed/Makefile | 4 +++- x11/tabbed/files/patch-config.mk | 15 ++------------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/x11/tabbed/Makefile b/x11/tabbed/Makefile index 4de5ec968f5e..be06d5f9b8a2 100644 --- a/x11/tabbed/Makefile +++ b/x11/tabbed/Makefile @@ -1,5 +1,6 @@ PORTNAME= tabbed PORTVERSION= 0.6 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= http://dl.suckless.org/tools/ @@ -15,8 +16,9 @@ USE_XORG= x11 OPTIONS_DEFINE= DOCS PLIST_FILES= bin/tabbed \ - man/man1/tabbed.1.gz + share/man/man1/tabbed.1.gz PORTDOCS= LICENSE README +MAKE_ARGS= PREFIX="${PREFIX}" CC="${CC}" pre-everything:: @${ECHO_MSG} "You can build tabbed with your own config.h using the TABBED_CONF knob:" diff --git a/x11/tabbed/files/patch-config.mk b/x11/tabbed/files/patch-config.mk index f1fdf2681a36..14333c2b76bd 100644 --- a/x11/tabbed/files/patch-config.mk +++ b/x11/tabbed/files/patch-config.mk @@ -1,11 +1,7 @@ --- config.mk.orig 2014-01-21 18:22:03 UTC +++ config.mk -@@ -5,15 +5,15 @@ VERSION = 0.6 - - # paths - PREFIX = /usr/local --MANPREFIX = ${PREFIX}/share/man -+MANPREFIX = ${PREFIX}/man +@@ -8,12 +8,12 @@ MANPREFIX = ${PREFIX}/share/man + MANPREFIX = ${PREFIX}/share/man # includes and libs -INCS = -I. -I/usr/include @@ -20,10 +16,3 @@ LDFLAGS = -s ${LIBS} # Solaris -@@ -21,5 +21,5 @@ LDFLAGS = -s ${LIBS} - #LDFLAGS = ${LIBS} - - # compiler and linker --CC = cc -+CC?= cc -