aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--x11-wm/river/Makefile10
-rw-r--r--x11-wm/river/distinfo6
2 files changed, 10 insertions, 6 deletions
diff --git a/x11-wm/river/Makefile b/x11-wm/river/Makefile
index 5aa2243aa9d8..89074b91069d 100644
--- a/x11-wm/river/Makefile
+++ b/x11-wm/river/Makefile
@@ -1,5 +1,5 @@
PORTNAME= river
-PORTVERSION= s20210726
+PORTVERSION= s20210728
CATEGORIES= x11-wm
MAINTAINER= jbeich@FreeBSD.org
@@ -21,7 +21,7 @@ USES= pkgconfig xorg
USE_GITHUB= yes
USE_XORG= pixman
GH_ACCOUNT= ifreund
-GH_TAGNAME= 90008cf
+GH_TAGNAME= f56c892
GH_TUPLE= ifreund:zig-pixman:135f223:zig_pixman/deps/zig-pixman \
ifreund:zig-wayland:a8e1efc:zig_wayland/deps/zig-wayland \
ifreund:zig-xkbcommon:10cdca6:zig_xkbcommon/deps/zig-xkbcommon \
@@ -34,7 +34,8 @@ NO_INSTALL= yes # strip(1) breaks runtime
PLIST_FILES= bin/${PORTNAME} \
bin/${PORTNAME}ctl \
bin/${PORTNAME}tile \
- ${DATADIR}/river-layout-v3.xml \
+ libdata/pkgconfig/${PORTNAME}-protocols.pc \
+ share/${PORTNAME}-protocols/${PORTNAME}-layout-v3.xml \
share/bash-completion/completions/${PORTNAME}ctl \
share/fish/vendor_completions.d/${PORTNAME}ctl.fish \
share/zsh/site-functions/_${PORTNAME}ctl \
@@ -55,6 +56,9 @@ X11_CONFIGURE_ON= -Dxwayland=true
X11_CONFIGURE_OFF= -Dxwayland=false
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
diff --git a/x11-wm/river/distinfo b/x11-wm/river/distinfo
index 2da1e8fb0222..d7ff9b23fb07 100644
--- a/x11-wm/river/distinfo
+++ b/x11-wm/river/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1627342294
-SHA256 (ifreund-river-s20210726-90008cf_GH0.tar.gz) = 6bce8fe77cd65801cac5602a6ba4ad381a9a7aa7b4b94cbb34773cc902a09829
-SIZE (ifreund-river-s20210726-90008cf_GH0.tar.gz) = 116924
+TIMESTAMP = 1627500650
+SHA256 (ifreund-river-s20210728-f56c892_GH0.tar.gz) = b5bd846205004c3bce0024d516a759d400f8695df8391a8cb373dcc9d5aba545
+SIZE (ifreund-river-s20210728-f56c892_GH0.tar.gz) = 117526
SHA256 (ifreund-zig-pixman-135f223_GH0.tar.gz) = a83a37ff55483f61db0d70f778ebb4cd149da5c427ab55c391478425f43f584d
SIZE (ifreund-zig-pixman-135f223_GH0.tar.gz) = 7155
SHA256 (ifreund-zig-wayland-a8e1efc_GH0.tar.gz) = 6320eb68e6cdf0f44720423c39db6dc831c64511b03ad9543654d284282f869e