git: 16cdb8a0f330 - main - x11/tabbed: reduce patching

From: Baptiste Daroussin <bapt_at_FreeBSD.org>
Date: Thu, 11 Jan 2024 08:55:26 UTC
The branch main has been updated by bapt:

URL: https://cgit.FreeBSD.org/ports/commit/?id=16cdb8a0f3300848d4c1a5295cad9e68cd16d8f3

commit 16cdb8a0f3300848d4c1a5295cad9e68cd16d8f3
Author:     Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2024-01-11 08:54:35 +0000
Commit:     Baptiste Daroussin <bapt@FreeBSD.org>
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
-