Wed Jan 31 12:02:23 2024 UTC (116d)
Add PREFIX/{,s}bin to PATH

Not having an /etc/ld.so.conf is not an error (on some platforms)


(hauke)
diff -r1.25 -r1.26 pkgsrc/devel/cvsd/Makefile
diff -r1.10 -r1.11 pkgsrc/devel/cvsd/distinfo
diff -r0 -r1.1 pkgsrc/devel/cvsd/patches/patch-cvsd-buildroot.in
cvs diff -r1.25 -r1.26 pkgsrc/devel/cvsd/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/cvsd/Makefile 2022/06/28 11:31:42 1.25
+++ pkgsrc/devel/cvsd/Makefile 2024/01/31 12:02:23 1.26
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.25 2022/06/28 11:31:42 wiz Exp $ 1# $NetBSD: Makefile,v 1.26 2024/01/31 12:02:23 hauke Exp $
2 2
3DISTNAME= cvsd-1.0.23 3DISTNAME= cvsd-1.0.23
4PKGREVISION= 12 4PKGREVISION= 13
5CATEGORIES= devel scm 5CATEGORIES= devel scm
6MASTER_SITES= https://arthurdejong.org/cvsd/ 6MASTER_SITES= https://arthurdejong.org/cvsd/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://arthurdejong.org/cvsd/ 9HOMEPAGE= https://arthurdejong.org/cvsd/
10COMMENT= Run CVS pserver in a chroot-ed environment 10COMMENT= Run CVS pserver in a chroot-ed environment
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13.if !exists(/usr/bin/cvs) 13.if !exists(/usr/bin/cvs)
14DEPENDS+= cvs>=1.11:../../devel/scmcvs 14DEPENDS+= cvs>=1.11:../../devel/scmcvs
15.endif 15.endif
16 16
17USE_TOOLS+= gmake perl 17USE_TOOLS+= gmake perl
cvs diff -r1.10 -r1.11 pkgsrc/devel/cvsd/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/cvsd/distinfo 2021/10/26 10:14:29 1.10
+++ pkgsrc/devel/cvsd/distinfo 2024/01/31 12:02:23 1.11
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.10 2021/10/26 10:14:29 nia Exp $ 1$NetBSD: distinfo,v 1.11 2024/01/31 12:02:23 hauke Exp $
2 2
3BLAKE2s (cvsd-1.0.23.tar.gz) = 3f38d6a67917a160cc2e1b052d5fa617ce57e91dc4d08076a07f816094badf24 3BLAKE2s (cvsd-1.0.23.tar.gz) = 3f38d6a67917a160cc2e1b052d5fa617ce57e91dc4d08076a07f816094badf24
4SHA512 (cvsd-1.0.23.tar.gz) = a5bce42a25f9330450da938edd22b5cc49171e003eba613ab502d65a2c2b1ad921c57e991d1be4230128a9026b528f0f47b7b80590b4e4e24e511df15da0347b 4SHA512 (cvsd-1.0.23.tar.gz) = a5bce42a25f9330450da938edd22b5cc49171e003eba613ab502d65a2c2b1ad921c57e991d1be4230128a9026b528f0f47b7b80590b4e4e24e511df15da0347b
5Size (cvsd-1.0.23.tar.gz) = 257638 bytes 5Size (cvsd-1.0.23.tar.gz) = 257638 bytes
6SHA1 (patch-aa) = cb94ebd244d6a354935cc76e30bd28d98ad30312 6SHA1 (patch-aa) = cb94ebd244d6a354935cc76e30bd28d98ad30312
7SHA1 (patch-ab) = 72a2538252ed24e2af1a6f4d950fc7a9bd5d90c9 7SHA1 (patch-ab) = 72a2538252ed24e2af1a6f4d950fc7a9bd5d90c9
8SHA1 (patch-ac) = 107d6b3584f10c7a9411b6b7684cf228f33c880f 8SHA1 (patch-ac) = 107d6b3584f10c7a9411b6b7684cf228f33c880f
 9SHA1 (patch-cvsd-buildroot.in) = 6f639d63a9c0cb76e0fae46f8f890bced51cd905
File Added: pkgsrc/devel/cvsd/patches/patch-cvsd-buildroot.in
$NetBSD: patch-cvsd-buildroot.in,v 1.1 2024/01/31 12:02:23 hauke Exp $

Add PREFIX/{,s}bin to PATH

Not having an /etc/ld.so.conf is not an error (on some platforms)

--- cvsd-buildroot.in.orig	2024-01-31 11:46:17.170421429 +0000
+++ cvsd-buildroot.in
@@ -35,7 +35,7 @@ set -e
 set -u
 
 # use hardcoded path to avoid trojans
-PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:@prefix@/bin:@prefix@/sbin
 export PATH
 
 # which binaries to install (use spaces as separator)
@@ -47,8 +47,11 @@ CONFIGFILE="@CONFIGFILE@"
 # path to use when looking for extra libraries
 LIBPATH="/lib /usr/lib /usr/local/lib /usr/X11R6/lib /usr/lib/libc5-compat /lib/libc5-compat /usr/libexec"
 
-# add paths from /etc/ld.so.conf to LIBPATH
-LIBPATH="$LIBPATH `find /etc/ld.so.conf* -type f | xargs cat | grep '^/'`"
+if [ -f "/etc/ld.so.conf" ]
+then
+    # add paths from /etc/ld.so.conf to LIBPATH
+    LIBPATH="$LIBPATH `find /etc/ld.so.conf* -type f | xargs cat | grep '^/'`"
+fi
 
 # which libraries to install (aside from the libraries needed by
 # the specified libraries)