Index | Thread | Search

From:
Stuart Henderson <stu@spacehopper.org>
Subject:
Re: quiche: add pkgconfig file
To:
Otto Moerbeek <otto@drijf.net>
Cc:
ports@openbsd.org
Date:
Fri, 28 Jun 2024 12:07:29 +0100

Download raw body.

Thread
On 2024/06/28 12:52, Otto Moerbeek wrote:
> Hi,
> 
> libs witout pkgconfig are a nuisance, so add one.
> 
> There's also a new quiche release (0.22.0), but I wanted this as a
> separate commit to make it stand out. Update will follow later.
> 
> OK?
> 
> 	-Otto
> 
> Index: Makefile
> ===================================================================
> RCS file: /home/cvs/ports/net/quiche/Makefile,v
> diff -u -p -r1.4 Makefile
> --- Makefile	8 May 2024 05:30:14 -0000	1.4
> +++ Makefile	28 Jun 2024 10:42:10 -0000
> @@ -3,10 +3,11 @@ COMMENT	=		library implementing QUIC and
>  # ring-v0.17 does not support this arch
>  NOT_FOR_ARCHS =		sparc64
>  
> -V =			0.21.0
> -PKG_NAME =		quiche-${V}
> +VERSION =		0.21.0
> +PKG_NAME =		quiche-${VERSION}

PKG_NAME isn't a thing; PKGNAME is getting set automatically based
on the GH_* variables.

I'd suggest moving GH_* up as well, and removing the variables which are
set to defaults (EXTRACT_SUFX defaults to .tar.gz; HOMEPAGE defaults to
the github page for ports using GH_*), e.g. this for the Makefile part
of the diff (then it's OK sthen@):

Index: Makefile
===================================================================
RCS file: /cvs/ports/net/quiche/Makefile,v
diff -u -p -r1.4 Makefile
--- Makefile	8 May 2024 05:30:14 -0000	1.4
+++ Makefile	28 Jun 2024 11:06:22 -0000
@@ -3,21 +3,18 @@ COMMENT	=		library implementing QUIC and
 # ring-v0.17 does not support this arch
 NOT_FOR_ARCHS =		sparc64
 
-V =			0.21.0
-PKG_NAME =		quiche-${V}
+VERSION =		0.21.0
+GH_ACCOUNT =		cloudflare
+GH_PROJECT =		quiche
+GH_TAGNAME =		${VERSION}
 CATEGORIES =		net
-HOMEPAGE =		https://github.com/cloudflare/quiche
+REVISION =		0
 
 MAINTAINER =		Otto Moerbeek <otto@drijf.net>
 
 # BSD-2-Clause
 PERMIT_PACKAGE =	Yes
 
-GH_ACCOUNT =		cloudflare
-GH_PROJECT =		quiche
-GH_TAGNAME =		${V}
-EXTRACT_SUFX =		.tar.gz
-
 MODCARGO_BUILD_ARGS +=	--no-default-features --features ffi --package quiche
 
 MODULES +=		devel/cargo
@@ -31,6 +28,13 @@ MODCARGO_INSTALL =	No
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/quiche/include/quiche.h ${PREFIX}/include
 	${INSTALL_DATA} ${WRKBUILD}/target/release/libquiche.a  ${PREFIX}/lib
+
+
+SUBST_VARS +=	VERSION
+
+post-install:
+	${SUBST_CMD} -c -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE} \
+	    ${FILESDIR}/quiche.pc.in ${PREFIX}/lib/pkgconfig/quiche.pc
 
 .include "crates.inc"