git: 3f44b1f472c1 - 2021Q4 - x11-wm/river: restore /usr fix accidentally removed in 1d4d1fedb94d

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Sat, 13 Nov 2021 00:58:30 UTC

The branch 2021Q4 has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3f44b1f472c12a703dd589ccb37547a09ed43a6b

commit 3f44b1f472c12a703dd589ccb37547a09ed43a6b
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2021-11-13 00:55:59 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2021-11-13 00:58:27 +0000

    x11-wm/river: restore /usr fix accidentally removed in 1d4d1fedb94d
    
    The manpage still has /usr refernces e.g.,
    
      /usr/include/xkbcommon/xkbcommon-keysyms.h
      /usr/include/linux/input-event-codes.h
    
    (cherry picked from commit 0bef5c19453e3ed661f845a20fd1c4979112642c)
---
 x11-wm/river/Makefile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/x11-wm/river/Makefile b/x11-wm/river/Makefile
index 8de81e744f7f..12567a4058bf 100644
--- a/x11-wm/river/Makefile
+++ b/x11-wm/river/Makefile
@@ -63,6 +63,9 @@ 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})