Date: Thu, 11 Jan 2024 08:59:05 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: 3f210b79f147 - main - x11/wmutils-core: reduce patching Message-ID: <202401110859.40B8x5Q3046536@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=3f210b79f147ae7bb8d1e196d4602c96f501191a commit 3f210b79f147ae7bb8d1e196d4602c96f501191a Author: Baptiste Daroussin <bapt@FreeBSD.org> AuthorDate: 2024-01-11 08:58:29 +0000 Commit: Baptiste Daroussin <bapt@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401110859.40B8x5Q3046536>