Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 11 Jan 2024 09:04:20 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: a221529ab037 - main - x11/wmutils-opt: reduce patching
Message-ID:  <202401110904.40B94K2N064339@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=a221529ab037dcb43bc417a735b4d088b03ba1e8

commit a221529ab037dcb43bc417a735b4d088b03ba1e8
Author:     Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2024-01-11 09:03:38 +0000
Commit:     Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2024-01-11 09:03:45 +0000

    x11/wmutils-opt: reduce patching
    
    Respect PREFIX and CC via MAKE_ARGS, while here move manpages to
    share/man
---
 x11/wmutils-opt/Makefile              | 3 +++
 x11/wmutils-opt/files/patch-config.mk | 7 +------
 x11/wmutils-opt/pkg-plist             | 8 ++++----
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/x11/wmutils-opt/Makefile b/x11/wmutils-opt/Makefile
index 0c91bded1104..0b8491bd6081 100644
--- a/x11/wmutils-opt/Makefile
+++ b/x11/wmutils-opt/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	wmutils-opt
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	x11
 
 MAINTAINER=	dmgk@FreeBSD.org
@@ -17,6 +18,8 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	wmutils
 GH_PROJECT=	opt
 
+MAKE_ARGS=	PREFIX="${PREFIX}" CC="${CC}"
+
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
 
diff --git a/x11/wmutils-opt/files/patch-config.mk b/x11/wmutils-opt/files/patch-config.mk
index afbe953bc84f..98a3476d3a2d 100644
--- a/x11/wmutils-opt/files/patch-config.mk
+++ b/x11/wmutils-opt/files/patch-config.mk
@@ -1,11 +1,6 @@
 --- config.mk.orig	2016-10-04 08:01:36 UTC
 +++ config.mk
-@@ -1,8 +1,8 @@
--PREFIX = /usr
--MANPREFIX = $(PREFIX)/share/man
-+PREFIX ?= /usr/local
-+MANPREFIX = $(PREFIX)/man
- 
+@@ -4,5 +4,5 @@ LD = $(CC)
  CC = cc
  LD = $(CC)
  
diff --git a/x11/wmutils-opt/pkg-plist b/x11/wmutils-opt/pkg-plist
index e7a6cefd9870..5df09f696ec9 100644
--- a/x11/wmutils-opt/pkg-plist
+++ b/x11/wmutils-opt/pkg-plist
@@ -2,7 +2,7 @@ bin/chwb2
 bin/wew
 bin/wname
 bin/xmmv
-man/man1/chwb2.1.gz
-man/man1/wew.1.gz
-man/man1/wname.1.gz
-man/man1/xmmv.1.gz
+share/man/man1/chwb2.1.gz
+share/man/man1/wew.1.gz
+share/man/man1/wname.1.gz
+share/man/man1/xmmv.1.gz



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