CVS commit: pkgsrc/www/curl

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Feb  6 14:42:51 UTC 2025

Modified Files:
        pkgsrc/www/curl: Makefile distinfo
Removed Files:
        pkgsrc/www/curl/patches: patch-curl-config.in

Log Message:
curl: do not leak build LDFLAGS into curl-config

Just do what the patch originally intended to do -- add the necessary
rpath flag to the --libs output.

Bump PKGREVISION.

Ok leot@


To generate a diff of this commit:
cvs rdiff -u -r1.292 -r1.293 pkgsrc/www/curl/Makefile
cvs rdiff -u -r1.212 -r1.213 pkgsrc/www/curl/distinfo
cvs rdiff -u -r1.14 -r0 pkgsrc/www/curl/patches/patch-curl-config.in

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

Modified files:

Index: pkgsrc/www/curl/Makefile
diff -u pkgsrc/www/curl/Makefile:1.292 pkgsrc/www/curl/Makefile:1.293
--- pkgsrc/www/curl/Makefile:1.292      Wed Feb  5 08:51:31 2025
+++ pkgsrc/www/curl/Makefile    Thu Feb  6 14:42:51 2025
@@ -1,9 +1,17 @@
-# $NetBSD: Makefile,v 1.292 2025/02/05 08:51:31 wiz Exp $
+# $NetBSD: Makefile,v 1.293 2025/02/06 14:42:51 wiz Exp $
+
+PKGREVISION=           1
 
 .include "Makefile.common"
 
 CONFIGURE_ARGS+=       --with-ssl=${BUILDLINK_PREFIX.openssl}
 
+SUBST_CLASSES+=                rpath
+SUBST_FILES.rpath+=    curl-config.in
+SUBST_SED.rpath+=      -e 's!-L@libdir@!${COMPILER_RPATH_FLAG}@libdir@ -L@libdir@!'
+SUBST_STAGE.rpath=     pre-configure
+SUBST_MESSAGE.rpath=   Adding rpath to curl-config.
+
 .include "options.mk"
 
 .include "../../security/openssl/buildlink3.mk"

Index: pkgsrc/www/curl/distinfo
diff -u pkgsrc/www/curl/distinfo:1.212 pkgsrc/www/curl/distinfo:1.213
--- pkgsrc/www/curl/distinfo:1.212      Wed Feb  5 08:51:31 2025
+++ pkgsrc/www/curl/distinfo    Thu Feb  6 14:42:51 2025
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.212 2025/02/05 08:51:31 wiz Exp $
+$NetBSD: distinfo,v 1.213 2025/02/06 14:42:51 wiz Exp $
 
 BLAKE2s (curl-8.12.0.tar.xz) = 8ad736d92568a050f55a5ddc640b4d04d338e72b66d4e46f858569037284065a
 SHA512 (curl-8.12.0.tar.xz) = ed35f0020541050ce387f4ba80f9e87562ececd99082da1bae85840dee81c49b86a4a55909e15fcbf4eb116106a796c29a9b2678dee11326f80db75992c6edc5
 Size (curl-8.12.0.tar.xz) = 2777552 bytes
-SHA1 (patch-curl-config.in) = abc985fab71738206e87b65f0371350bf04f588f