Revert "Reapply "Reapply "curl: updated to 8.12.1."""

This reverts commit b08374b.

Author: jperkin

www/curl/Makefile

@@ -1,15 +1,9 @@
-# $NetBSD: Makefile,v 1.294 2025/02/13 18:24:34 adam Exp $
+# $NetBSD: Makefile,v 1.292 2025/02/05 08:51:31 wiz Exp $
 
 .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"

www/curl/Makefile.common

@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.22 2025/02/13 18:24:34 adam Exp $
+# $NetBSD: Makefile.common,v 1.20 2025/02/05 08:51:31 wiz Exp $
 # used by www/libcurl-gnutls/Makefile
 
-DISTNAME=	curl-8.12.1
+DISTNAME=	curl-8.12.0
 CATEGORIES=	www
 MASTER_SITES=	https://curl.se/download/
 EXTRACT_SUFX=	.tar.xz
@@ -22,7 +22,6 @@ TEST_DEPENDS+=	${PYPKGPREFIX}-impacket-[0-9]*:../../net/py-impacket
 USE_TOOLS+=		nroff perl
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
-GNU_CONFIGURE_ICONV=	no
 # Some systems use bundles instead of directories; this needs configuring
 # because curl doesn't use default validation.
 .if !empty(SSLCERTBUNDLE)

www/curl/distinfo

@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.214 2025/02/13 18:24:34 adam Exp $
+$NetBSD: distinfo,v 1.212 2025/02/05 08:51:31 wiz Exp $
 
-BLAKE2s (curl-8.12.1.tar.xz) = 1e8e7f356b1d72753f58d51f6c21cfc58f3de9e59041f405e88f5c0557270090
-SHA512 (curl-8.12.1.tar.xz) = 88915468fa1bb7256e3dd6c9d058ada6894faa1e3e7800c7d9bfee3e8be4081ae57e7f2bf260c5342b709499fc4302ddc2d7864e25bfa3300fa07f118a3de603
-Size (curl-8.12.1.tar.xz) = 2768160 bytes
+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

www/curl/patches/patch-curl-config.in

@@ -0,0 +1,18 @@
+$NetBSD: patch-curl-config.in,v 1.14 2025/02/05 08:51:32 wiz Exp $
+
+Make "curl-config --libs" return proper ldflags for shared libraries.
+
+--- curl-config.in.orig	2025-02-05 08:05:05.000000000 +0000
++++ curl-config.in
+@@ -155,9 +155,9 @@ while test "$#" -gt 0; do
+       curllibdir=''
+     fi
+     if test 'X@ENABLE_SHARED@' = 'Xno'; then
+-      echo "${curllibdir}-lcurl @LIBCURL_PC_LIBS_PRIVATE@"
++      echo "@LDFLAGS@ ${curllibdir}-lcurl @LIBCURL_PC_LIBS_PRIVATE@"
+     else
+-      echo "${curllibdir}-lcurl"
++      echo "@LDFLAGS@ ${curllibdir}-lcurl"
+     fi
+     ;;
+