pkgconf: add 2.4.1 upgrade candidate

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: pkgconf: add 2.4.1 upgrade candidate
From: Thomas Klausner (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Thu, 6 Mar 2025 22:56:56 +0000
Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Thu Mar 6 23:46:40 2025 +0100
Changeset:	89d9a9775a4442cfa9ccedb10934e718c87b90d7

Modified Files:
	Makefile
Added Files:
	pkgconf/DESCR
	pkgconf/Makefile
	pkgconf/PLIST
	pkgconf/TODO
	pkgconf/buildlink3.mk
	pkgconf/distinfo
	pkgconf/patches/patch-tests_Kyuafile.in

Log Message:
pkgconf: add 2.4.1 upgrade candidate

for after https://github.com/pkgconf/pkgconf/issues/383 is resolved

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=89d9a9775a4442cfa9ccedb10934e718c87b90d7

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

diffstat:
 Makefile                                |  2 ++
 pkgconf/DESCR                           |  5 ++++
 pkgconf/Makefile                        | 50 +++++++++++++++++++++++++++++++++
 pkgconf/PLIST                           | 19 +++++++++++++
 pkgconf/TODO                            |  2 ++
 pkgconf/buildlink3.mk                   | 12 ++++++++
 pkgconf/distinfo                        |  6 ++++
 pkgconf/patches/patch-tests_Kyuafile.in | 31 ++++++++++++++++++++
 8 files changed, 127 insertions(+)

diffs:
diff --git a/Makefile b/Makefile
index a81e452b0e..d83a267fa0 100644
--- a/Makefile
+++ b/Makefile
@@ -1374,6 +1374,7 @@ SUBDIR+=	golly
 SUBDIR+=	gonepass-git
 SUBDIR+=	google-perftools
 SUBDIR+=	googlecl
+SUBDIR+=	goon-linux
 SUBDIR+=	gopass-jsonapi
 SUBDIR+=	gopher-validator-git
 SUBDIR+=	gorilla-audio
@@ -3204,6 +3205,7 @@ SUBDIR+=	pkg_conflicts
 SUBDIR+=	pkg_fake
 SUBDIR+=	pkg_rmleaves
 SUBDIR+=	pkg_summary-utils
+SUBDIR+=	pkgconf
 SUBDIR+=	pkgmanager
 SUBDIR+=	plank
 SUBDIR+=	plantri
diff --git a/pkgconf/DESCR b/pkgconf/DESCR
new file mode 100644
index 0000000000..3b1e2adb43
--- /dev/null
+++ b/pkgconf/DESCR
@@ -0,0 +1,5 @@
+pkgconf is a program which helps to configure compiler and linker flags for
+development frameworks. It is similar to pkg-config, but was written from
+scratch in the summer of 2011 to replace pkg-config, which now needs itself
+to build itself (or you can set a bunch of environment variables, both are
+pretty ugly).
diff --git a/pkgconf/Makefile b/pkgconf/Makefile
new file mode 100644
index 0000000000..464850633a
--- /dev/null
+++ b/pkgconf/Makefile
@@ -0,0 +1,50 @@
+# $NetBSD: Makefile,v 1.32 2025/03/06 22:40:56 wiz Exp $
+
+DISTNAME=	pkgconf-2.4.1
+CATEGORIES=	devel
+MASTER_SITES=	https://distfiles.dereferenced.org/pkgconf/
+
+MAINTAINER=	nico%orgrim.net@localhost
+HOMEPAGE=	https://github.com/pkgconf/pkgconf
+COMMENT=	API-driven pkg-config replacement
+LICENSE=	modified-bsd
+
+TEST_DEPENDS+=	kyua-[0-9]*:../../devel/kyua
+
+CONFLICTS+=	pkg-config-[0-9]*
+
+USE_LIBTOOL=		yes
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--with-system-libdir=/usr/lib
+CONFIGURE_ARGS+=	--with-system-includedir=/usr/include
+
+MAKE_FLAGS+=	MANDIR=${PREFIX}/${PKGMANDIR}/man1
+
+PKGCONFIG_PATHS=	${PREFIX}/lib/pkgconfig
+PKGCONFIG_PATHS+=	${PREFIX}/share/pkgconfig
+PKGCONFIG_PATHS+=	/usr/lib/pkgconfig
+
+# as of 2.4.1
+# 119/160 passed (41 failed)
+TEST_TARGET=	check
+
+# for reallocarray
+# https://github.com/pkgconf/pkgconf/issues/285
+CPPFLAGS.NetBSD+=	-D_OPENBSD_SOURCE
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${LOCALBASE} != ${X11BASE}
+PKGCONFIG_PATHS+=	${X11BASE}/lib/pkgconfig
+.endif
+
+CONFIGURE_ARGS+=	--with-pkg-config-dir=${PKGCONFIG_PATHS:ts::Q}
+
+# configure script incorrectly sets only _FILE_OFFSET_BITS=64
+CPPFLAGS.SunOS+=	-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+
+post-install:
+	${LN} -s pkgconf ${DESTDIR}${PREFIX}/bin/pkg-config
+	${LN} -s pkgconf.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/pkg-config.1
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/pkgconf/PLIST b/pkgconf/PLIST
new file mode 100644
index 0000000000..92101b48d8
--- /dev/null
+++ b/pkgconf/PLIST
@@ -0,0 +1,19 @@
+@comment $NetBSD: PLIST,v 1.9 2023/02/04 14:08:03 wiz Exp $
+bin/bomtool
+bin/pkg-config
+bin/pkgconf
+include/pkgconf/libpkgconf/bsdstubs.h
+include/pkgconf/libpkgconf/iter.h
+include/pkgconf/libpkgconf/libpkgconf-api.h
+include/pkgconf/libpkgconf/libpkgconf.h
+include/pkgconf/libpkgconf/stdinc.h
+lib/libpkgconf.la
+lib/pkgconfig/libpkgconf.pc
+man/man1/pkg-config.1
+man/man1/pkgconf.1
+man/man5/pc.5
+man/man5/pkgconf-personality.5
+man/man7/pkg.m4.7
+share/aclocal/pkg.m4
+share/doc/pkgconf/AUTHORS
+share/doc/pkgconf/README.md
diff --git a/pkgconf/TODO b/pkgconf/TODO
new file mode 100644
index 0000000000..30fec5f079
--- /dev/null
+++ b/pkgconf/TODO
@@ -0,0 +1,2 @@
+2.4.x eats letters
+https://github.com/pkgconf/pkgconf/issues/383
diff --git a/pkgconf/buildlink3.mk b/pkgconf/buildlink3.mk
new file mode 100644
index 0000000000..0a988fc2da
--- /dev/null
+++ b/pkgconf/buildlink3.mk
@@ -0,0 +1,12 @@
+# $NetBSD: buildlink3.mk,v 1.1 2023/02/22 15:51:41 micha Exp $
+
+BUILDLINK_TREE+=	pkgconf
+
+.if !defined(PKGCONF_BUILDLINK3_MK)
+PKGCONF_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.pkgconf+=		pkgconf>=1.9.4
+BUILDLINK_PKGSRCDIR.pkgconf?=		../../devel/pkgconf
+.endif	# PKGCONF_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-pkgconf
diff --git a/pkgconf/distinfo b/pkgconf/distinfo
new file mode 100644
index 0000000000..dc75cfbfe4
--- /dev/null
+++ b/pkgconf/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.28 2025/03/06 22:40:56 wiz Exp $
+
+BLAKE2s (pkgconf-2.4.1.tar.gz) = c65cd28f1cc77a8cd919b64e645f7060a619bce9d631696abe346f25de91eaf8
+SHA512 (pkgconf-2.4.1.tar.gz) = 443575d3205d84a4730f78d9aeb12a6e5d0489655cf97206ca25eff3adbfe651fd8ac0cbea2927c0f7e66b7864e98cf86f4f90d3eb0e53215e6be0167941c252
+Size (pkgconf-2.4.1.tar.gz) = 468195 bytes
+SHA1 (patch-tests_Kyuafile.in) = 918082a6f1f2aa313f4affd3ca49dfbe0d8c3f03
diff --git a/pkgconf/patches/patch-tests_Kyuafile.in b/pkgconf/patches/patch-tests_Kyuafile.in
new file mode 100644
index 0000000000..3cd0065f60
--- /dev/null
+++ b/pkgconf/patches/patch-tests_Kyuafile.in
@@ -0,0 +1,31 @@
+$NetBSD: patch-tests_Kyuafile.in,v 1.2 2025/03/06 22:40:56 wiz Exp $
+
+Fix "basic not found" etc.
+https://github.com/pkgconf/pkgconf/issues/382
+
+--- tests/Kyuafile.in.orig	2024-12-10 03:28:55.000000000 +0000
++++ tests/Kyuafile.in
+@@ -2,13 +2,13 @@ syntax(2)
+ 
+ test_suite('pkgconf')
+ 
+-atf_test_program{name='basic'}
+-atf_test_program{name='requires'}
+-atf_test_program{name='regress'}
+-atf_test_program{name='parser'}
+-atf_test_program{name='sysroot'}
+-atf_test_program{name='conflicts'}
+-atf_test_program{name='version'}
+-atf_test_program{name='framework'}
+-atf_test_program{name='provides'}
+-atf_test_program{name='symlink'}
++atf_test_program{name='basic.sh'}
++atf_test_program{name='requires.sh'}
++atf_test_program{name='regress.sh'}
++atf_test_program{name='parser.sh'}
++atf_test_program{name='sysroot.sh'}
++atf_test_program{name='conflicts.sh'}
++atf_test_program{name='version.sh'}
++atf_test_program{name='framework.sh'}
++atf_test_program{name='provides.sh'}
++atf_test_program{name='symlink.sh'}
Prev by Date: qemu-guest-agent: update to 9.2.2
Next by Date: *: remove pkgconf 2.4.x workarounds
Previous by Thread: qemu-guest-agent: update to 9.2.2
Next by Thread: *: remove pkgconf 2.4.x workarounds
Indexes:
Home | Main Index | Thread Index | Old Index