Date: Tue, 16 Aug 2022 21:06:32 GMT From: Adriaan de Groot <adridg@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 1edbd06c6fac - main - devel/libsoup: add a DOCS option Message-ID: <202208162106.27GL6WWO058261@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=1edbd06c6facd29a14635928395323aa3d6ae4a1 commit 1edbd06c6facd29a14635928395323aa3d6ae4a1 Author: Adriaan de Groot <adridg@FreeBSD.org> AuthorDate: 2022-08-16 21:04:24 +0000 Commit: Adriaan de Groot <adridg@FreeBSD.org> CommitDate: 2022-08-16 21:06:30 +0000 devel/libsoup: add a DOCS option Add DOCS, which just uses gtk_doc to do the work. The change was suggested by Sean Champ in the linked PR, but I reworked it substantially to be explicit about the files, and to use the simplest tooling. Other changes suggested by the way devel/libical and devel/json/glib do DOCS with gtk_doc. PR: 265568 Reported by: Sean Champ --- devel/libsoup/Makefile | 14 +++++++++-- devel/libsoup/pkg-plist | 65 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 2 deletions(-) diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile index 78238c4915c6..eac43a2a6177 100644 --- a/devel/libsoup/Makefile +++ b/devel/libsoup/Makefile @@ -1,5 +1,6 @@ PORTNAME= libsoup DISTVERSION= 2.74.2 +PORTREVISION= 1 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome @@ -22,11 +23,15 @@ USE_GNOME= glib20 intlhack introspection:build \ USE_LDCONFIG= yes CPE_VENDOR= gnome -OPTIONS_DEFINE= SMB +OPTIONS_DEFINE= DOCS SMB OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE OPTIONS_DEFAULT= SMB GSSAPI_${${SSL_DEFAULT} == base :?BASE :NONE} +DOCS_MESON_TRUE= gtk_doc +DOCS_BUILD_DEPENDS= gtkdoc-scan:textproc/gtk-doc +DOCSDIR= ${PREFIX}/share/gtk-doc/html/${PORTNAME}-${RELVERSION} + # Circular dependency samba -> tracker -> libsoup if the SPOTLIGHT # option is turned on in samba. Since samba is a **runtime** only # dependency, we can just tell it to be used. However, the Meson @@ -56,8 +61,10 @@ MESON_ARGS= -Dvapi=disabled \ -Dgnome=true \ -Dbrotli=disabled +# RELVERSION also used in DOCSDIR, above +RELVERSION= 2.4 LIBVERSION= 1.11.2 -PLIST_SUB= VERSION="2.4" LIBVERSION=${LIBVERSION} +PLIST_SUB= VERSION=${RELVERSION} LIBVERSION=${LIBVERSION} PORTSCOUT= limit:^2\.[0-9]?[02468]\. @@ -66,4 +73,7 @@ post-patch: -e 's+@@NTLM_AUTH@@+${LOCALBASE}/bin/ntlm_auth+' \ ${WRKSRC}/meson.build +post-install-DOCS-on: + ${INSTALL_MAN} ${WRKSRC}/NEWS ${STAGEDIR}${DOCSDIR}/NEWS + .include <bsd.port.mk> diff --git a/devel/libsoup/pkg-plist b/devel/libsoup/pkg-plist index b495ce9e3eb2..d3755b8fca57 100644 --- a/devel/libsoup/pkg-plist +++ b/devel/libsoup/pkg-plist @@ -70,6 +70,71 @@ lib/libsoup-gnome-%%VERSION%%.so.1 lib/libsoup-gnome-%%VERSION%%.so.%%LIBVERSION%% libdata/pkgconfig/libsoup-%%VERSION%%.pc libdata/pkgconfig/libsoup-gnome-%%VERSION%%.pc +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/SoupAddress.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/SoupAuth.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/SoupAuthDomain.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/SoupAuthDomainBasic.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/SoupAuthDomainDigest.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/SoupAuthManager.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/SoupCache.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/SoupContentDecoder.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/SoupContentSniffer.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/SoupCookie.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/SoupCookieJar.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/SoupCookieJarDB.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/SoupCookieJarText.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/SoupHSTSEnforcer.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/SoupHSTSEnforcerDB.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/SoupLogger.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/SoupMessage.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/SoupMessageBody.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/SoupMessageHeaders.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/SoupMultipart.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/SoupMultipartInputStream.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/SoupProxyResolverDefault.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/SoupRequest.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/SoupRequestData.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/SoupRequestFile.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/SoupRequestHTTP.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/SoupServer.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/SoupSession.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/SoupSessionAsync.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/SoupSessionFeature.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/SoupSessionSync.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/SoupSocket.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/SoupURI.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/annotation-glossary.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/ch01.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/ch02.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/ch03.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/ch04.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/ch05.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/home.png +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/index.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/ix01.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/left-insensitive.png +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/left.png +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-HTML-Form-Support.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-Soup-Miscellaneous-Utilities.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-SoupServer-deprecated-API.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-Top-Level-Domain-utils.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-Version-Information.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-WebSockets.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-XMLRPC-Support.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-soup-method.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-soup-status.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%.devhelp2 +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-build-howto.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-client-howto.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-request-howto.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-server-howto.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-session-porting.html +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/right-insensitive.png +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/right.png +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/style.css +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/up-insensitive.png +%%PORTDOCS%%share/gtk-doc/html/libsoup-%%VERSION%%/up.png share/gir-1.0/Soup-%%VERSION%%.gir share/gir-1.0/SoupGNOME-%%VERSION%%.gir share/locale/an/LC_MESSAGES/libsoup.mo
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202208162106.27GL6WWO058261>