CVS commit: pkgsrc/sysutils/macchina

["pin" <pin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pin
Date:           Tue Jun  8 10:21:55 UTC 2021

Modified Files:
        pkgsrc/sysutils/macchina: Makefile cargo-depends.mk distinfo

Log Message:
sysutils/macchina: update to 0.9.2

-NetBSD: Finally fixed resolution readout failing, due to linkage mistakes.
-NetBSD: Set a fallback, that tries to fetch resolution through the ACPIVGA
driver.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/sysutils/macchina/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/sysutils/macchina/cargo-depends.mk
cvs rdiff -u -r1.23 -r1.24 pkgsrc/sysutils/macchina/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/macchina/Makefile
diff -u pkgsrc/sysutils/macchina/Makefile:1.24 pkgsrc/sysutils/macchina/Makefile:1.25
--- pkgsrc/sysutils/macchina/Makefile:1.24      Sun Jun  6 16:01:15 2021
+++ pkgsrc/sysutils/macchina/Makefile   Tue Jun  8 10:21:55 2021
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2021/06/06 16:01:15 pin Exp $
+# $NetBSD: Makefile,v 1.25 2021/06/08 10:21:55 pin Exp $
 
-DISTNAME=      macchina-0.9.1
+DISTNAME=      macchina-0.9.2
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=Macchina-CLI/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -13,9 +13,16 @@ LICENSE=     mit
 .include "cargo-depends.mk"
 
 USE_LANGUAGES+=        c c++
+USE_TOOLS+=    pkg-config
 
 INSTALLATION_DIRS=     bin share/examples/macchina
 
+RUSTFLAGS+=    -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libX11}/lib
+RUSTFLAGS+=    -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libxcb}/lib
+RUSTFLAGS+=    -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libXdmcp}/lib
+RUSTFLAGS+=    -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libXau}/lib
+MAKE_ENV+=     RUSTFLAGS=${RUSTFLAGS:Q}
+
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/target/release/macchina ${DESTDIR}${PREFIX}/bin
        ${INSTALL_DATA} ${WRKSRC}/macchina.toml ${DESTDIR}${PREFIX}/share/examples/macchina
@@ -23,4 +30,8 @@ do-install:
 DEPENDS+=      wmctrl-[0-9]*:../../wm/wmctrl
 
 .include "../../lang/rust/cargo.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libxcb/buildlink3.mk"
+.include "../../x11/libXdmcp/buildlink3.mk"
+.include "../../x11/libXau/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/sysutils/macchina/cargo-depends.mk
diff -u pkgsrc/sysutils/macchina/cargo-depends.mk:1.16 pkgsrc/sysutils/macchina/cargo-depends.mk:1.17
--- pkgsrc/sysutils/macchina/cargo-depends.mk:1.16      Sun Jun  6 16:01:15 2021
+++ pkgsrc/sysutils/macchina/cargo-depends.mk   Tue Jun  8 10:21:55 2021
@@ -1,4 +1,4 @@
-# $NetBSD: cargo-depends.mk,v 1.16 2021/06/06 16:01:15 pin Exp $
+# $NetBSD: cargo-depends.mk,v 1.17 2021/06/08 10:21:55 pin Exp $
 
 CARGO_CRATE_DEPENDS+=  aho-corasick-0.7.18
 CARGO_CRATE_DEPENDS+=  ansi-to-tui-0.1.9
@@ -28,7 +28,7 @@ CARGO_CRATE_DEPENDS+= itertools-0.10.0
 CARGO_CRATE_DEPENDS+=  itoa-0.4.7
 CARGO_CRATE_DEPENDS+=  lazy_static-1.4.0
 CARGO_CRATE_DEPENDS+=  libc-0.2.94
-CARGO_CRATE_DEPENDS+=  libmacchina-0.4.8
+CARGO_CRATE_DEPENDS+=  libmacchina-0.4.10
 CARGO_CRATE_DEPENDS+=  local_ipaddress-0.1.3
 CARGO_CRATE_DEPENDS+=  lock_api-0.4.4
 CARGO_CRATE_DEPENDS+=  log-0.4.14

Index: pkgsrc/sysutils/macchina/distinfo
diff -u pkgsrc/sysutils/macchina/distinfo:1.23 pkgsrc/sysutils/macchina/distinfo:1.24
--- pkgsrc/sysutils/macchina/distinfo:1.23      Sun Jun  6 16:01:15 2021
+++ pkgsrc/sysutils/macchina/distinfo   Tue Jun  8 10:21:55 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2021/06/06 16:01:15 pin Exp $
+$NetBSD: distinfo,v 1.24 2021/06/08 10:21:55 pin Exp $
 
 SHA1 (aho-corasick-0.7.18.crate) = 0e3f242614a732b703e12fc3c4456c53b0536fb8
 RMD160 (aho-corasick-0.7.18.crate) = b0dc4b0030152d0db9483ea816548ec9c330b211
@@ -112,10 +112,10 @@ SHA1 (libc-0.2.94.crate) = 27ac5fa704072
 RMD160 (libc-0.2.94.crate) = 15179d9bd17b7e0de5c89eec9dcdc78000b5354f
 SHA512 (libc-0.2.94.crate) = 316717d2e46b57c200d67d0ebb4fb162cb1f0b688895b9eb6075924cda3be8ba7fae85319692682178b6fc5cb2764e8b3a9d3e7ce234fd8a21a0a9c453ca174c
 Size (libc-0.2.94.crate) = 511713 bytes
-SHA1 (libmacchina-0.4.8.crate) = 458b55311f9ace3ce582638dce7a29e460be1dee
-RMD160 (libmacchina-0.4.8.crate) = 79e645ddbc4355426ebd1a0ae6ba24ab563aa091
-SHA512 (libmacchina-0.4.8.crate) = 9fad51be911cf68667bde30339310b19806fd702c3e87cf89441c92de25b705b48038e0ed5c770edeef39cf83a502e78931256165edcf4100ed8ab4df3c48dcb
-Size (libmacchina-0.4.8.crate) = 67929 bytes
+SHA1 (libmacchina-0.4.10.crate) = a65b4c872d27240576858ff71a49767e77b271a8
+RMD160 (libmacchina-0.4.10.crate) = 202d19b2e9cc2c0b630cc52fd8bc552f4983443f
+SHA512 (libmacchina-0.4.10.crate) = 77c7e902d42fc38ffb57a6f62ae780355bcb47535b5fc6ece87e917b120e264cb892fefe80fda055cfb62dec28d7ff87618d7d829ffba1f2f9d1a7ad27578af3
+Size (libmacchina-0.4.10.crate) = 67966 bytes
 SHA1 (local_ipaddress-0.1.3.crate) = 2bc5ff74983a6ec9a896665f71ec379d637d839f
 RMD160 (local_ipaddress-0.1.3.crate) = 0d17ad819fa36006eed033a6398f0ac5c61e8967
 SHA512 (local_ipaddress-0.1.3.crate) = b63dac8a36821c1eceebfd05019f277c29e40c0bd06f7cf4ea275b5b34710ca9c15b36cb47c02b02e49621d6de813849f6acc104e0ac24acbcefd89b290b8869
@@ -128,10 +128,10 @@ SHA1 (log-0.4.14.crate) = 5e8f22c07bd48b
 RMD160 (log-0.4.14.crate) = 91b8b87a9386f54c92b4625d69722c8871eb8b3a
 SHA512 (log-0.4.14.crate) = 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
 Size (log-0.4.14.crate) = 34582 bytes
-SHA1 (macchina-0.9.1.tar.gz) = 4f801dc0b66280ce1dc4cc82ec7e138cfa6b8b37
-RMD160 (macchina-0.9.1.tar.gz) = 239730abaf1940d5f30cbc8f4edd6d6f82f79f1a
-SHA512 (macchina-0.9.1.tar.gz) = 5afaf19b7e9f7f2076b1326840b872a8d20af11b095a767a728043e10b417bd65680439b7ba1dc6009c205993a585b56fa5cefc493ec4323ebdf0b1f86e7b9d0
-Size (macchina-0.9.1.tar.gz) = 96126 bytes
+SHA1 (macchina-0.9.2.tar.gz) = 044180b96c7465145ab6d1539667b02bfdb22b62
+RMD160 (macchina-0.9.2.tar.gz) = 64d63289f48a3bd88e8bfe7a1202158863ae4fd2
+SHA512 (macchina-0.9.2.tar.gz) = f72d429faae60a853dd97fde2f7f9a91064e07adbc85d3258c59d2b882eda60118b1cf31455170bf111883b99ccc8b7e784b1d5a027fd878f8fcd4c1055149f3
+Size (macchina-0.9.2.tar.gz) = 96217 bytes
 SHA1 (mach-0.3.2.crate) = f7d5c12da3c8d17d1c86544e4e22320b2ab338b8
 RMD160 (mach-0.3.2.crate) = d15fae9a578ec70b31f078b450c2b645404b5ff0
 SHA512 (mach-0.3.2.crate) = 73622b37915f3445a57cbac5eb378bfee61f5a2383c0dd8bd7c29b5e46447405ebaeb706f3a3274e5afe37b0506afaf1511836cb8897d9d480a3abd41f18fa26