Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 11 Jan 2024 10:31:08 GMT
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 8ab6cbe60e19 - main - x11-wm/wmname: use MAKE_ARGS instead of patching
Message-ID:  <202401111031.40BAV8mA013747@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by bapt:

URL: https://cgit.FreeBSD.org/ports/commit/?id=8ab6cbe60e1954261f2129b24e32ed8ac147c9f6

commit 8ab6cbe60e1954261f2129b24e32ed8ac147c9f6
Author:     Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2024-01-11 09:31:06 +0000
Commit:     Baptiste Daroussin <bapt@FreeBSD.org>
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 <bsd.port.mk>
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}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401111031.40BAV8mA013747>