pkglint

[nikita <nikita%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	nikita <nikita%NetBSD.org@localhost>
Pushed By:	nikita
Date:		Tue Dec 13 22:47:01 2022 +0100
Changeset:	54b3059f85021678694c8fb16aba169894cd4995

Modified Files:
	pijul/Makefile
	pijul/distinfo
Added Files:
	pijul/patches/patch-..vendor_pager-0.16.0_src_utils.rs
Removed Files:
	pijul/patches/patch-cargo-crates_pager-0.16.0_src_utils.rs

Log Message:
pkglint

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=54b3059f85021678694c8fb16aba169894cd4995

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

diffstat:
 pijul/Makefile                                            |  9 ++++-----
 pijul/distinfo                                            |  2 +-
 pijul/patches/patch-..vendor_pager-0.16.0_src_utils.rs    | 15 +++++++++++++++
 .../patches/patch-cargo-crates_pager-0.16.0_src_utils.rs  | 15 ---------------
 4 files changed, 20 insertions(+), 21 deletions(-)

diffs:
diff --git a/pijul/Makefile b/pijul/Makefile
index d8e99cab8e..f770850e85 100644
--- a/pijul/Makefile
+++ b/pijul/Makefile
@@ -1,11 +1,12 @@
 # $NetBSD$
 
 DISTNAME=	pijul-1.0.0-beta.2
+PKGNAME=	pijul-1.0.0.beta2
 CATEGORIES=	devel
 MASTER_SITES=	https://static.crates.io/crates/pijul/
 DISTFILES=	pijul-1.0.0-beta.2.crate
 
-MAINTAINER=	nikita%NetBSD.org@localhost
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://pijul.org/
 COMMENT=	Distributed version control system
 LICENSE=	gnu-gpl-v2
@@ -16,12 +17,10 @@ INSTALLATION_DIRS=	bin
 USE_LANGUAGES+=		c c++
 USE_TOOLS+=		pkg-config
 
-MAKE_ENV+=		OPENSSL_DIR=${BUILDLINK_PREFIX.openssl:Q}
+MAKE_ENV+=		OPENSSL_DIR=${BUILDLINK_PREFIX.openssl}
 MAKE_ENV+=		DEP_SODIUM_INCLUDE=${BUILDLINK_PREFIX.libsodium}/include
 MAKE_ENV+=		DEP_SODIUM_LIB=${BUILDLINK_PREFIX.libsodium}/lib
-# \TODO: Not picked up, but DEP_SODIUM_ is picked up, why?
-#MAKE_ENV+=		SODIUM_LIB_DIR=${BUILDLINK_PREFIX.libsodium:Q}
-RUSTFLAGS+=             -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.zstd}/lib
+RUSTFLAGS+=		-C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.zstd}/lib
 RUSTFLAGS+=		-C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.xxhash}/lib
 
 do-install:
diff --git a/pijul/distinfo b/pijul/distinfo
index c9517da39a..7239b8d7ad 100644
--- a/pijul/distinfo
+++ b/pijul/distinfo
@@ -801,4 +801,4 @@ Size (zeroize_derive-1.3.2.crate) = 10299 bytes
 BLAKE2s (zstd-seekable-0.1.7.crate) = 99afb3fcf14b502057ee808e8678d2b262cd6f867d65c257a6a8ec4c42e47b3a
 SHA512 (zstd-seekable-0.1.7.crate) = 319ea7c5651dd544ed4c43afb71abc9ee43d9a6fa881210bd24aa90211ba16c1450f961bd89fd70e9cb28582a31d5d49887da2eb81669d61617099165fdc742d
 Size (zstd-seekable-0.1.7.crate) = 65103 bytes
-SHA1 (patch-cargo-crates_pager-0.16.0_src_utils.rs) = 79c716a32fde87355e3cb6f874c14555d25fc50c
+SHA1 (patch-..vendor_pager-0.16.0_src_utils.rs) = 79c716a32fde87355e3cb6f874c14555d25fc50c
diff --git a/pijul/patches/patch-..vendor_pager-0.16.0_src_utils.rs b/pijul/patches/patch-..vendor_pager-0.16.0_src_utils.rs
new file mode 100644
index 0000000000..f663f255fa
--- /dev/null
+++ b/pijul/patches/patch-..vendor_pager-0.16.0_src_utils.rs
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Original author: cs%FreeBSD.org@localhost
+
+--- ../vendor/pager-0.16.0/src/utils.rs.orig	2021-07-20 20:40:27 UTC
++++ ../vendor/pager-0.16.0/src/utils.rs
+@@ -66,7 +66,7 @@ pub(crate) fn execvpe(cmd: &OsString, envs: &[OsString
+     };
+     #[cfg(not(target_os = "macos"))]
+     unsafe {
+-        libc::execvpe(args[0], args.as_ptr(), envs.as_ptr())
++        libc::execve(args[0], args.as_ptr(), envs.as_ptr())
+     };
+ }
+ 
diff --git a/pijul/patches/patch-cargo-crates_pager-0.16.0_src_utils.rs b/pijul/patches/patch-cargo-crates_pager-0.16.0_src_utils.rs
deleted file mode 100644
index f663f255fa..0000000000
--- a/pijul/patches/patch-cargo-crates_pager-0.16.0_src_utils.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Original author: cs%FreeBSD.org@localhost
-
---- ../vendor/pager-0.16.0/src/utils.rs.orig	2021-07-20 20:40:27 UTC
-+++ ../vendor/pager-0.16.0/src/utils.rs
-@@ -66,7 +66,7 @@ pub(crate) fn execvpe(cmd: &OsString, envs: &[OsString
-     };
-     #[cfg(not(target_os = "macos"))]
-     unsafe {
--        libc::execvpe(args[0], args.as_ptr(), envs.as_ptr())
-+        libc::execve(args[0], args.as_ptr(), envs.as_ptr())
-     };
- }
-