Received: from localhost (localhost [127.0.0.1])
	by mail.netbsd.org (Postfix) with ESMTP id A061584FC6
	for <pkgsrc-changes@NetBSD.org>; Tue, 21 Nov 2023 18:26:31 +0000 (UTC)
X-Virus-Scanned: amavisd-new at netbsd.org
Received: from mail.netbsd.org ([127.0.0.1])
	by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025)
	with ESMTP id 19uRvtXOjuk3 for <pkgsrc-changes@netbsd.org>;
	Tue, 21 Nov 2023 18:26:31 +0000 (UTC)
Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197])
	by mail.netbsd.org (Postfix) with ESMTP id 21C4A84D6A
	for <pkgsrc-changes@NetBSD.org>; Tue, 21 Nov 2023 18:26:31 +0000 (UTC)
Received: by cvs.NetBSD.org (Postfix, from userid 500)
	id 1AEFAFA3F; Tue, 21 Nov 2023 18:26:31 +0000 (UTC)
Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1700591191154860"
MIME-Version: 1.0
Date: Tue, 21 Nov 2023 18:26:31 +0000
From: "Niclas Rosenvik" <nros@netbsd.org>
Subject: CVS commit: pkgsrc/devel/abseil
To: pkgsrc-changes@NetBSD.org
Approved: commit_and_comment
Reply-To: nros@netbsd.org
X-Mailer: log_accum
Message-Id: <20231121182631.1AEFAFA3F@cvs.NetBSD.org>

This is a multi-part message in MIME format.

--_----------=_1700591191154860
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	nros
Date:		Tue Nov 21 18:26:31 UTC 2023

Modified Files:
	pkgsrc/devel/abseil: Makefile
Removed Files:
	pkgsrc/devel/abseil: pkgconfig-overrides.mk

Log Message:
abseil: Revert last commit and use *.pc instead
As pointed out by wiz, *.pc can be used. This
makes the list useless and handling of pc files
even easier.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/devel/abseil/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/devel/abseil/pkgconfig-overrides.mk

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


--_----------=_1700591191154860
Content-Disposition: inline
Content-Length: 1460
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/devel/abseil/Makefile
diff -u pkgsrc/devel/abseil/Makefile:1.21 pkgsrc/devel/abseil/Makefile:1.22
--- pkgsrc/devel/abseil/Makefile:1.21	Tue Nov 21 17:57:18 2023
+++ pkgsrc/devel/abseil/Makefile	Tue Nov 21 18:26:30 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2023/11/21 17:57:18 nros Exp $
+# $NetBSD: Makefile,v 1.22 2023/11/21 18:26:30 nros Exp $
 
 DISTNAME=	abseil-20230802.1
 CATEGORIES=	devel
@@ -27,26 +27,8 @@ BUILDLINK_TRANSFORM+=	rm:-lexecinfo
 .  endif
 .endif
 
-ABSLPC_DIR=			${WRKSRC}/${CMAKE_BUILD_DIR}/lib/pkgconfig
 PKGCONFIG_OVERRIDE_STAGE=	post-build
-
-.include "pkgconfig-overrides.mk"
-
-
-# abseil installs a lot of pkg-config files so maintaining a list of
-# pkgconfig overrides whould take a lot of time. Below is a target to
-# ease this work.
-# The target can be run when updating the package to update the list of
-# pkgconfig files that need an override.
-.PHONY: update-pkgconfig-overrides
-update-pkgconfig-overrides: all
-	${RUN} ${HEAD} -n 1 pkgconfig-overrides.mk > pkgconfig-overrides.mk.tmp
-	${RUN} ${MV} pkgconfig-overrides.mk.tmp pkgconfig-overrides.mk
-	${RUN} cd ${ABSLPC_DIR} && \
-		${GREP} "\-l[ 	]*absl" * | ${SED} 's/:[ 	]*Libs:.*//g' | \
-		${SED} 's,^,PKGCONFIG_OVERRIDE+=\	\$$\{ABSLPC_DIR\}/,g' \
-		>> ${.CURDIR}/pkgconfig-overrides.mk
-
+PKGCONFIG_OVERRIDE=		${CMAKE_BUILD_DIR}/lib/pkgconfig/*.pc
 
 .include "../../devel/cmake/build.mk"
 .include "../../mk/atomic64.mk"


--_----------=_1700591191154860--