aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--x11-wm/river/Makefile14
-rw-r--r--x11-wm/river/distinfo6
2 files changed, 7 insertions, 13 deletions
diff --git a/x11-wm/river/Makefile b/x11-wm/river/Makefile
index 6179b45824c7..75f50375b64f 100644
--- a/x11-wm/river/Makefile
+++ b/x11-wm/river/Makefile
@@ -1,5 +1,5 @@
PORTNAME= river
-PORTVERSION= s20210715
+PORTVERSION= s20210719
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= 28fc879
+GH_TAGNAME= 1fec079
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,6 @@ NO_INSTALL= yes # strip(1) breaks runtime
PLIST_FILES= bin/${PORTNAME} \
bin/${PORTNAME}ctl \
bin/${PORTNAME}tile \
- "@sample ${ETCDIR}/init.sample" \
share/bash-completion/completions/${PORTNAME}ctl \
share/fish/vendor_completions.d/${PORTNAME}ctl.fish \
share/zsh/site-functions/_${PORTNAME}ctl \
@@ -55,9 +54,8 @@ X11_CONFIGURE_ON= -Dxwayland=true
X11_CONFIGURE_OFF= -Dxwayland=false
post-patch:
-# Respect PREFIX for system-wide config (a la sysconfdir in Meson)
- @${REINPLACE_CMD} -e 's,/etc,${PREFIX}&,' \
- ${WRKSRC}/doc/${PORTNAME}.1.scd \
+# Respect PREFIX in path references
+ @${REINPLACE_CMD} -e 's,/usr,${LOCALBASE},' \
${WRKSRC}/doc/${PORTNAME}ctl.1.scd
do-build:
@@ -66,8 +64,4 @@ do-build:
do-test:
@(cd ${WRKSRC} && ${TEST_ENV} zig build test ${CONFIGURE_ARGS})
-post-install:
-# Let @sample handle default files under etc/
- @${MV} ${STAGEDIR}${ETCDIR}/init ${STAGEDIR}${ETCDIR}/init.sample
-
.include <bsd.port.mk>
diff --git a/x11-wm/river/distinfo b/x11-wm/river/distinfo
index 153a6a821be9..79d68557fff0 100644
--- a/x11-wm/river/distinfo
+++ b/x11-wm/river/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1626350422
-SHA256 (ifreund-river-s20210715-28fc879_GH0.tar.gz) = a356ceac9c8cc1f7a011243917c6351d6ea5a8db1992c6e5a02e3be8fba0a6c2
-SIZE (ifreund-river-s20210715-28fc879_GH0.tar.gz) = 117024
+TIMESTAMP = 1626696070
+SHA256 (ifreund-river-s20210719-1fec079_GH0.tar.gz) = 0cbdd222095d9e4f8af4c2b49f6cc4cc3b6d54d655e8e46923a12e2248c5f4f9
+SIZE (ifreund-river-s20210719-1fec079_GH0.tar.gz) = 116732
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