Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 11 Jan 2024 08:31:18 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: 7c999aa2c8ff - main - x11/xdo: do not patch to handle manpages
Message-ID:  <202401110831.40B8VI1o007367@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=7c999aa2c8fff4ae016f17ecb9ac93217f74d6c9

commit 7c999aa2c8fff4ae016f17ecb9ac93217f74d6c9
Author:     Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2024-01-11 08:30:47 +0000
Commit:     Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2024-01-11 08:31:16 +0000

    x11/xdo: do not patch to handle manpages
    
    While here move manpages to share/man
---
 x11/xdo/Makefile             |  3 ++-
 x11/xdo/files/patch-Makefile | 13 -------------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/x11/xdo/Makefile b/x11/xdo/Makefile
index 2de38a6f66b1..153a42d6f18b 100644
--- a/x11/xdo/Makefile
+++ b/x11/xdo/Makefile
@@ -16,7 +16,8 @@ USES=		gmake localbase:ldflags xorg
 USE_XORG=	xcb
 USE_GITHUB=	yes
 GH_ACCOUNT=	baskerville
+MAKE_ARGS=	MANPREFIX="${PREFIX}/share/man"
 
-PLIST_FILES=	bin/xdo man/man1/xdo.1.gz
+PLIST_FILES=	bin/xdo share/man/man1/xdo.1.gz
 
 .include <bsd.port.mk>
diff --git a/x11/xdo/files/patch-Makefile b/x11/xdo/files/patch-Makefile
index a3927dd599ac..1ca74e437d75 100644
--- a/x11/xdo/files/patch-Makefile
+++ b/x11/xdo/files/patch-Makefile
@@ -9,16 +9,3 @@
  CFLAGS   += -std=c99 -pedantic -Wall -Wextra
  LDLIBS   := -lxcb -lxcb-util -lxcb-icccm -lxcb-ewmh -lxcb-xtest
  
-@@ -26,9 +26,9 @@ $(NAME): $(OBJ)
- 
- install:
- 	mkdir -p "$(DESTDIR)$(BINPREFIX)"
--	cp -p $(NAME) "$(DESTDIR)$(BINPREFIX)"
--	mkdir -p "$(DESTDIR)$(MANPREFIX)/man1"
--	cp -p doc/$(NAME).1 "$(DESTDIR)$(MANPREFIX)/man1"
-+	$(BSD_INSTALL_PROGRAM) $(NAME) "$(DESTDIR)$(BINPREFIX)"
-+	mkdir -p "$(DESTDIR)$(MANPREFIX)/man/man1"
-+	$(BSD_INSTALL_MAN) doc/$(NAME).1 "$(DESTDIR)$(MANPREFIX)/man/man1"
- 
- uninstall:
- 	rm -f "$(DESTDIR)$(BINPREFIX)/$(NAME)"



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