git: 4d9d34e84388 - 2021Q4 - x11-wm/river: backport upstream manpage fix

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Sat, 13 Nov 2021 00:54:02 UTC
The branch 2021Q4 has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4d9d34e843880e7fd5d9ad62e3e4ed7f785717b5

commit 4d9d34e843880e7fd5d9ad62e3e4ed7f785717b5
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2021-11-13 00:50:49 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2021-11-13 00:53:56 +0000

    x11-wm/river: backport upstream manpage fix
    
    (cherry picked from commit 1d4d1fedb94d13283fc10fe7a433a99757a1e97f)
---
 x11-wm/river/Makefile | 7 ++++---
 x11-wm/river/distinfo | 2 ++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/x11-wm/river/Makefile b/x11-wm/river/Makefile
index 51f8a5bb378a..8de81e744f7f 100644
--- a/x11-wm/river/Makefile
+++ b/x11-wm/river/Makefile
@@ -1,8 +1,12 @@
 PORTNAME=	river
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.1.0
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+=	0cbe2b9fc34f.patch:-p1 # docs: remove reference to /etc/river/init
+
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Dynamic tiling Wayland compositor
 
@@ -59,9 +63,6 @@ post-patch:
 # Respect devel/pkgconf default search
 	@${REINPLACE_CMD} -e '/pkgconfig/s/share/libdata/' \
 		${WRKSRC}/build.zig
-# Respect PREFIX in path references
-	@${REINPLACE_CMD} -e 's,/usr,${LOCALBASE},' \
-		${WRKSRC}/doc/${PORTNAME}ctl.1.scd
 
 do-build:
 	@(cd ${WRKSRC} && ${MAKE_ENV} zig build ${CONFIGURE_ARGS})
diff --git a/x11-wm/river/distinfo b/x11-wm/river/distinfo
index 1fee741d316e..a4040ac134bc 100644
--- a/x11-wm/river/distinfo
+++ b/x11-wm/river/distinfo
@@ -9,3 +9,5 @@ SHA256 (ifreund-zig-xkbcommon-10cdca6_GH0.tar.gz) = 9fee1bef4d7886977578519a2f59
 SIZE (ifreund-zig-xkbcommon-10cdca6_GH0.tar.gz) = 19027
 SHA256 (swaywm-zig-wlroots-9bb6b03_GH0.tar.gz) = 504f888b75a54f79a7d677ca9d95ffb791369fa9326108e1307dc77c6c7df66e
 SIZE (swaywm-zig-wlroots-9bb6b03_GH0.tar.gz) = 46084
+SHA256 (0cbe2b9fc34f.patch) = 64b283e1033f3d320a411b6ac4994aa953747167b76f59ed8899a517f82378d4
+SIZE (0cbe2b9fc34f.patch) = 985