git: 1e2e95f6d6bc - main - net-mgmt/bandwhich: generalize char handling

From: Piotr Kubaj <pkubaj_at_FreeBSD.org>
Date: Mon, 25 Apr 2022 14:28:22 UTC
The branch main has been updated by pkubaj:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1e2e95f6d6bc5a63c899f0f6e4db8966c1cd3acb

commit 1e2e95f6d6bc5a63c899f0f6e4db8966c1cd3acb
Author:     Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2022-04-25 14:12:42 +0000
Commit:     Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2022-04-25 14:12:42 +0000

    net-mgmt/bandwhich: generalize char handling
---
 net-mgmt/bandwhich/Makefile                                         | 6 ------
 ...c_bpf.rs => patch-cargo-crates_pnet__datalink-0.26.0_src_bpf.rs} | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/net-mgmt/bandwhich/Makefile b/net-mgmt/bandwhich/Makefile
index ae014bc5e2cb..3b721e5270b1 100644
--- a/net-mgmt/bandwhich/Makefile
+++ b/net-mgmt/bandwhich/Makefile
@@ -262,12 +262,6 @@ CARGO_CRATES=	adler-0.2.3 \
 PLIST_FILES=	bin/bandwhich \
 		man/man1/bandwhich.1.gz
 
-.include <bsd.port.options.mk>
-
-.if ${ARCH} == aarch64 || ${ARCH:Marmv*} || ${ARCH:Mpowerpc*}
-EXTRA_PATCHES=	${FILESDIR}/extra-patch-cargo-crates_pnet__datalink-0.26.0_src_bpf.rs
-.endif
-
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/bandwhich
 	${INSTALL_MAN} ${WRKSRC}/docs/bandwhich.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
diff --git a/net-mgmt/bandwhich/files/extra-patch-cargo-crates_pnet__datalink-0.26.0_src_bpf.rs b/net-mgmt/bandwhich/files/patch-cargo-crates_pnet__datalink-0.26.0_src_bpf.rs
similarity index 90%
rename from net-mgmt/bandwhich/files/extra-patch-cargo-crates_pnet__datalink-0.26.0_src_bpf.rs
rename to net-mgmt/bandwhich/files/patch-cargo-crates_pnet__datalink-0.26.0_src_bpf.rs
index 847c2c135bf9..a3543ac3e33a 100644
--- a/net-mgmt/bandwhich/files/extra-patch-cargo-crates_pnet__datalink-0.26.0_src_bpf.rs
+++ b/net-mgmt/bandwhich/files/patch-cargo-crates_pnet__datalink-0.26.0_src_bpf.rs
@@ -5,7 +5,7 @@
      let mut iface: bpf::ifreq = unsafe { mem::zeroed() };
      for (i, c) in network_interface.name.bytes().enumerate() {
 -        iface.ifr_name[i] = c as i8;
-+        iface.ifr_name[i] = c as u8;
++        iface.ifr_name[i] = c as libc::c_char;
      }
  
      let buflen = config.read_buffer_size as libc::c_uint;