small tweaks;

- set --with-system-libdir and --with-system-includedir, otherwise it
strips /usr/local/{lib,include} from returned flags. (I'm trying a rust
build with this replacing /usr/bin/pkg-config now).

- fix running tests, not quite sure what happened (they run ok with
the old version despite no .sh suffix in Kyuafile), but it seems
to be needed now.

Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/pkgconf/Makefile,v
diff -u -p -r1.7 Makefile
--- Makefile    21 Sep 2023 09:50:02 -0000      1.7
+++ Makefile    8 Jan 2025 15:55:04 -0000
@@ -1,12 +1,13 @@
 COMMENT =              package compiler and linker metadata toolkit

-DISTNAME =             pkgconf-1.6.3
+DISTNAME =             pkgconf-2.3.0
+EXTRACT_SUFX =         .tar.xz

-SHARED_LIBS +=         pkgconf 0.0     # 3.0
+SHARED_LIBS +=         pkgconf 1.0     # 5.0

 CATEGORIES =           devel

-HOMEPAGE =             https://git.dereferenced.org/pkgconf/pkgconf
+HOMEPAGE =             https://gitea.treehouse.systems/ariadne/pkgconf

 MAINTAINER =           Adam Steen <a...@adamsteen.com.au>

@@ -15,14 +16,18 @@ PERMIT_PACKAGE =    Yes

 WANTLIB =              c

-SITES =                        https://distfiles.dereferenced.org/pkgconf/
+SITES =                        https://distfiles.ariadne.space/pkgconf/

 TEST_DEPENDS =         devel/kyua-cli

-SEPARATE_BUILD =       Yes
 CONFIGURE_STYLE =      gnu
-CONFIGURE_ARGS =       
--with-pkg-config-dir=/usr/lib/pkgconfig:${LOCALBASE}/lib/pkgconfig:${LOCALBASE}/share/pkgconfig:${X11BASE}/lib/pkgconfig:${X11BASE}/share/pkgconfig
+CONFIGURE_ARGS =       
--with-pkg-config-dir=/usr/lib/pkgconfig:${LOCALBASE}/lib/pkgconfig:${LOCALBASE}/share/pkgconfig:${X11BASE}/lib/pkgconfig:${X11BASE}/share/pkgconfig
 \
+                       --with-system-libdir=/usr/lib \
+                       --with-system-includedir=/usr/include

 PORTHOME =             ${WRKDIR}
+
+post-extract:
+       sed -i "s,'},.sh'}," ${WRKSRC}/tests/Kyuafile.in

 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/pkgconf/distinfo,v
diff -u -p -r1.3 distinfo
--- distinfo    6 Aug 2019 10:20:09 -0000       1.3
+++ distinfo    8 Jan 2025 15:55:04 -0000
@@ -1,2 +1,2 @@
-SHA256 (pkgconf-1.6.3.tar.gz) = Ap4UP8JlxN+F0WgPqmNEyuBnUIx03Hxiu/NPHCvZFYg=
-SIZE (pkgconf-1.6.3.tar.gz) = 425296
+SHA256 (pkgconf-2.3.0.tar.xz) = OpCArFHQNhXnwZEKCiqN8IQkiStfE7BiiiBNP8zg6os=
+SIZE (pkgconf-2.3.0.tar.xz) = 316160
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/pkgconf/pkg/PLIST,v
diff -u -p -r1.2 PLIST
--- pkg/PLIST   11 Mar 2022 18:52:29 -0000      1.2
+++ pkg/PLIST   8 Jan 2025 15:55:04 -0000
@@ -1,3 +1,4 @@
+@bin bin/bomtool
 @bin bin/pkgconf
 include/pkgconf/
 include/pkgconf/libpkgconf/
@@ -6,12 +7,13 @@ include/pkgconf/libpkgconf/iter.h
 include/pkgconf/libpkgconf/libpkgconf-api.h
 include/pkgconf/libpkgconf/libpkgconf.h
 include/pkgconf/libpkgconf/stdinc.h
-lib/libpkgconf.a
+@static-lib lib/libpkgconf.a
 lib/libpkgconf.la
 @lib lib/libpkgconf.so.${LIBpkgconf_VERSION}
 lib/pkgconfig/libpkgconf.pc
 @man man/man1/pkgconf.1
 @man man/man5/pc.5
+@man man/man5/pkgconf-personality.5
 @man man/man7/pkg.m4.7
 @comment share/aclocal/
 @comment share/aclocal/pkg.m4

Reply via email to