Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 17 Dec 2025 20:38:23 +0000
From:      Daniel Engberg <diizzy@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: d6e40714df25 - main - net/uriparser: Improve and simplify port
Message-ID:  <694314bf.3c6f8.7a3a8476@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by diizzy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=d6e40714df25c0528c82b38e537646fb333d0d9e

commit d6e40714df25c0528c82b38e537646fb333d0d9e
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2025-12-17 20:25:06 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2025-12-17 20:38:15 +0000

    net/uriparser: Improve and simplify port
    
    * Simplify DOCS option and move DOCS_DISTFILES to main port
      (this also prevents unintentional mismatches during updates)
    * Align port Makefile layout with majority of ports in tree
    * Remove unneeded build dependency of bash
    * Don't install docs from main release archive,
      RFCs should be fetched and txt file is unprocessed
    * Replace cmake:noninja with cmake as it builds fine
    
    PR:             291703
    Reviewed by:    Sergei Vyshenski <svysh.fbsd@gmail.com> (maintainer)
---
 net/uriparser/Makefile | 31 ++++++++++++-------------------
 net/uriparser/distinfo |  2 +-
 2 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/net/uriparser/Makefile b/net/uriparser/Makefile
index de5ca5bdf6e5..d5521497000e 100644
--- a/net/uriparser/Makefile
+++ b/net/uriparser/Makefile
@@ -1,9 +1,13 @@
 PORTNAME=	uriparser
 DISTVERSION=	1.0.0
+PORTREVISION=	1
 CATEGORIES=	net
-MASTER_SITES=	https://github.com/uriparser/uriparser/releases/download/uriparser-${DISTVERSION}/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${PORTNAME}-${DISTVERSION}/
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		${DISTNAME}-doc.zip \
+		${DISTNAME}-doc.qch
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} \
+		${DISTNAME}-doc.zip
 
 MAINTAINER=	svysh.fbsd@gmail.com
 COMMENT=	URI parsing library
@@ -16,35 +20,24 @@ LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/COPYING.BSD-3-Clause
 LICENSE_FILE_LGPL21+ =		${WRKSRC}/COPYING.LGPL-2.1
 LICENSE_FILE=			${WRKSRC}/README.md
 
-BUILD_DEPENDS=	bash:shells/bash
 TEST_DEPENDS=	googletest>=1.10.0:devel/googletest
 
-USES=		cmake:noninja,testing cpe pathfix tar:xz
+USES=		cmake:testing cpe pathfix tar:xz
 CPE_VENDOR=	uriparser_project
-
 USE_LDCONFIG=	yes
 
 CMAKE_OFF=	URIPARSER_BUILD_TESTS \
-		URIPARSER_BUILD_DOCS # will fetch prebuilds from the upstream, if DOCS is selected
+		URIPARSER_BUILD_DOCS
 CMAKE_TESTING_ON=	URIPARSER_BUILD_TESTS
 
 PLIST_SUB=	DISTVERSION=${DISTVERSION}
 PORTDOCS=	*
 
-OPTIONS_DEFINE=		DOCS
-DOCS_DISTFILES=		${_DISTDOCSFILE} \
-			${_DISTDOCSNAME}.qch
-DOCS_EXTRACT_ONLY=	${_DISTDOCSFILE}
-
-_DISTDOCSFILE=	${_DISTDOCSNAME}.zip
-_DISTDOCSNAME=	${DISTNAME}-doc
+OPTIONS_DEFINE=	DOCS
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/qch
-	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC}/../${_DISTDOCSNAME} && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
-	${INSTALL_MAN} ${DISTDIR}/${_DISTDOCSNAME}.qch ${STAGEDIR}${DOCSDIR}/qch
-	( ${ECHO} "QCH file is a QT Compressed Help file, generated by doxygen, cf:"; \
-	${ECHO} "https://doc.qt.io/qt-5/assistant-details.html"; ) > ${STAGEDIR}${DOCSDIR}/qch/readme-qch
+	(cd ${WRKDIR}/${DISTNAME}-doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
+	${INSTALL_MAN} ${DISTDIR}/${DISTNAME}-doc.qch ${STAGEDIR}${DOCSDIR}/qch
 
 .include <bsd.port.mk>
diff --git a/net/uriparser/distinfo b/net/uriparser/distinfo
index 2689d362b06a..e12f068203ac 100644
--- a/net/uriparser/distinfo
+++ b/net/uriparser/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1765827435
+TIMESTAMP = 1765831847
 SHA256 (uriparser-1.0.0.tar.xz) = 154a3f649d80a78d5095fc461ec032ffb45f5ed3619edec923ac68cff29a088d
 SIZE (uriparser-1.0.0.tar.xz) = 200048
 SHA256 (uriparser-1.0.0-doc.zip) = 089de452fe185cf79523c93f5692a88029fd19d1f6953557363f145a1fc6a711


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?694314bf.3c6f8.7a3a8476>