CVS commit: pkgsrc/devel/cvsd

["Hauke Fath" <hauke%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   hauke
Date:           Wed Jan 31 12:02:23 UTC 2024

Modified Files:
        pkgsrc/devel/cvsd: Makefile distinfo
Added Files:
        pkgsrc/devel/cvsd/patches: patch-cvsd-buildroot.in

Log Message:
Add PREFIX/{,s}bin to PATH

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


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/devel/cvsd/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/cvsd/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/cvsd/patches/patch-cvsd-buildroot.in

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

Modified files:

Index: pkgsrc/devel/cvsd/Makefile
diff -u pkgsrc/devel/cvsd/Makefile:1.25 pkgsrc/devel/cvsd/Makefile:1.26
--- pkgsrc/devel/cvsd/Makefile:1.25     Tue Jun 28 11:31:42 2022
+++ pkgsrc/devel/cvsd/Makefile  Wed Jan 31 12:02:23 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2022/06/28 11:31:42 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2024/01/31 12:02:23 hauke Exp $
 
 DISTNAME=              cvsd-1.0.23
-PKGREVISION=           12
+PKGREVISION=           13
 CATEGORIES=            devel scm
 MASTER_SITES=          https://arthurdejong.org/cvsd/
 

Index: pkgsrc/devel/cvsd/distinfo
diff -u pkgsrc/devel/cvsd/distinfo:1.10 pkgsrc/devel/cvsd/distinfo:1.11
--- pkgsrc/devel/cvsd/distinfo:1.10     Tue Oct 26 10:14:29 2021
+++ pkgsrc/devel/cvsd/distinfo  Wed Jan 31 12:02:23 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2021/10/26 10:14:29 nia Exp $
+$NetBSD: distinfo,v 1.11 2024/01/31 12:02:23 hauke Exp $
 
 BLAKE2s (cvsd-1.0.23.tar.gz) = 3f38d6a67917a160cc2e1b052d5fa617ce57e91dc4d08076a07f816094badf24
 SHA512 (cvsd-1.0.23.tar.gz) = a5bce42a25f9330450da938edd22b5cc49171e003eba613ab502d65a2c2b1ad921c57e991d1be4230128a9026b528f0f47b7b80590b4e4e24e511df15da0347b
@@ -6,3 +6,4 @@ Size (cvsd-1.0.23.tar.gz) = 257638 bytes
 SHA1 (patch-aa) = cb94ebd244d6a354935cc76e30bd28d98ad30312
 SHA1 (patch-ab) = 72a2538252ed24e2af1a6f4d950fc7a9bd5d90c9
 SHA1 (patch-ac) = 107d6b3584f10c7a9411b6b7684cf228f33c880f
+SHA1 (patch-cvsd-buildroot.in) = 6f639d63a9c0cb76e0fae46f8f890bced51cd905

Added files:

Index: pkgsrc/devel/cvsd/patches/patch-cvsd-buildroot.in
diff -u /dev/null pkgsrc/devel/cvsd/patches/patch-cvsd-buildroot.in:1.1
--- /dev/null   Wed Jan 31 12:02:23 2024
+++ pkgsrc/devel/cvsd/patches/patch-cvsd-buildroot.in   Wed Jan 31 12:02:23 2024
@@ -0,0 +1,31 @@
+$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)