x11-wm/leftwm: bring in upstream fixes

- mark i386 as unsupported
- add DOCS option

4 files changed, 23 insertions, 21 deletions

diff --git a/x11-wm/leftwm/Makefile b/x11-wm/leftwm/Makefile
index 5dcc1c47e841..679872d7257f 100644
--- a/x11-wm/leftwm/Makefile
+++ b/x11-wm/leftwm/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	leftwm
-DISTVERSION=	0.2.7-37
-DISTVERSIONSUFFIX=	-gb0b14f0
+DISTVERSION=	0.2.7-40
+DISTVERSIONSUFFIX=	-g09ef955
 CATEGORIES=	x11-wm
 
 MAINTAINER=	rigoletto@FreeBSD.org
@@ -9,11 +9,14 @@ COMMENT=	Tiling window manager for Adventurers
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
+NOT_FOR_ARCHS=	i386
+NOT_FOR_ARCHS_REASON=	is currently 64-bit only
+
 USES=		cargo xorg
 USE_XORG=	xinerama xrandr
 
 USE_GITHUB=	yes
-GH_TAGNAME=	b0b14f0cf3e575a9d5c36e13fc5c34204688a8e9
+GH_TAGNAME=	09ef95517b3bd2acef2c91886f92f81b910b8d22
 
 CARGO_CRATES=	aho-corasick-0.7.18 \
 		ansi_term-0.11.0 \
@@ -140,23 +143,30 @@ CARGO_CRATES=	aho-corasick-0.7.18 \
 		x11-dl-2.18.5 \
 		xdg-2.2.0
 
-OPTIONS_DEFINE=	THEMES
-OPTIONS_DEFAULT= THEMES
+OPTIONS_DEFINE=	DOCS THEMES
+OPTIONS_DEFAULT=	THEMES
 OPTIONS_SUB=	yes
 
 THEMES_DESC=	LeftWM Basic Themes
 
+post-install-DOCS-on:
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for l in CHANGELOG CONTRIBUTING.md README.md
+	${INSTALL_MAN} ${WRKSRC}/${l} ${STAGEDIR}${DOCSDIR}
+.endfor
+
 post-install-THEMES-on:
 	cd ${WRKSRC} && ${COPYTREE_SHARE} themes \
 		${STAGEDIR}${DATADIR}
 
 post-install:
-.for l in leftwm-state leftwm-worker leftwm-check leftwm
+.for l in leftwm-state leftwm-worker leftwm-check \
+	leftwm-command leftwm
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${l}
 .endfor
 
 	${MKDIR} ${STAGEDIR}${LOCALBASE}/share/xsessions
-	(cd ${WRKSRC} && ${COPYTREE_SHARE} leftwm.desktop \
+	(cd ${WRKSRC} && ${INSTALL_DATA} leftwm.desktop \
 		${STAGEDIR}${LOCALBASE}/share/xsessions/)
 
 .include <bsd.port.mk>
diff --git a/x11-wm/leftwm/distinfo b/x11-wm/leftwm/distinfo
index 9b51388a6d2a..1c6b4df38aef 100644
--- a/x11-wm/leftwm/distinfo
+++ b/x11-wm/leftwm/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1621284003
+TIMESTAMP = 1621743865
 SHA256 (rust/crates/aho-corasick-0.7.18.crate) = 1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f
 SIZE (rust/crates/aho-corasick-0.7.18.crate) = 112923
 SHA256 (rust/crates/ansi_term-0.11.0.crate) = ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b
@@ -247,5 +247,5 @@ SHA256 (rust/crates/x11-dl-2.18.5.crate) = 2bf981e3a5b3301209754218f962052d4d9ee
 SIZE (rust/crates/x11-dl-2.18.5.crate) = 62951
 SHA256 (rust/crates/xdg-2.2.0.crate) = d089681aa106a86fade1b0128fb5daf07d5867a509ab036d99988dec80429a57
 SIZE (rust/crates/xdg-2.2.0.crate) = 13387
-SHA256 (leftwm-leftwm-0.2.7-37-gb0b14f0-b0b14f0cf3e575a9d5c36e13fc5c34204688a8e9_GH0.tar.gz) = 065eae185bc3685dd55846cbed5a868112151838444153380574201cb65d08e0
-SIZE (leftwm-leftwm-0.2.7-37-gb0b14f0-b0b14f0cf3e575a9d5c36e13fc5c34204688a8e9_GH0.tar.gz) = 8452208
+SHA256 (leftwm-leftwm-0.2.7-40-g09ef955-09ef95517b3bd2acef2c91886f92f81b910b8d22_GH0.tar.gz) = f1761b7a71cc7d832a63a06b679a36fb688717e3d1064cb992133eb3ce7575b1
+SIZE (leftwm-leftwm-0.2.7-40-g09ef955-09ef95517b3bd2acef2c91886f92f81b910b8d22_GH0.tar.gz) = 8453707
diff --git a/x11-wm/leftwm/files/patch-src_bin_leftwm-check.rs b/x11-wm/leftwm/files/patch-src_bin_leftwm-check.rs
deleted file mode 100644
index fb08eaaac730..000000000000
--- a/x11-wm/leftwm/files/patch-src_bin_leftwm-check.rs
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/bin/leftwm-check.rs.orig	2021-05-19 07:15:38 UTC
-+++ src/bin/leftwm-check.rs
-@@ -37,7 +37,7 @@ async fn main() -> Result<()> {
-     );
-     println!(
-         "\x1b[0;94m::\x1b[0m LeftWM git hash: {}",
--        git_version::git_version!()
-+        git_version::git_version!(fallback = "NONE")
-     );
-     println!("\x1b[0;94m::\x1b[0m Loading configuration . . .");
-     match load_from_file(config_file, verbose) {
diff --git a/x11-wm/leftwm/pkg-plist b/x11-wm/leftwm/pkg-plist
index b75fc6060944..9fb5dc4acc4a 100644
--- a/x11-wm/leftwm/pkg-plist
+++ b/x11-wm/leftwm/pkg-plist
@@ -3,6 +3,9 @@ bin/leftwm-check
 bin/leftwm-command
 bin/leftwm-state
 bin/leftwm-worker
+%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
+%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTING.md
+%%PORTDOCS%%%%DOCSDIR%%/README.md
 %%THEMES%%%%DATADIR%%/themes/README.md
 %%THEMES%%%%DATADIR%%/themes/basic_lemonbar/background.jpg
 %%THEMES%%%%DATADIR%%/themes/basic_lemonbar/change_to_tag