git: 37f7a57509a1 - 2021Q2 - www/miniflux: Remove nop WANT_PGSQL=client

Kirill Ponomarev krion at FreeBSD.org
Mon May 10 06:43:27 UTC 2021


The branch 2021Q2 has been updated by krion:

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

commit 37f7a57509a1a955450404f8fb3165c7ab3924f9
Author:     Tobias Kortkamp <tobik at FreeBSD.org>
AuthorDate: 2021-04-30 16:20:47 +0000
Commit:     Kirill Ponomarev <krion at FreeBSD.org>
CommitDate: 2021-05-10 06:43:03 +0000

    www/miniflux: Remove nop WANT_PGSQL=client
    
    In 8f75e04cb888e86484843db9dca00e739e346e19 the pgsql dependency
    was dropped intentionally but WANT_PGSQL was left in place but it
    has no effect now.
    
    Fix the PGSQL_SERVER option by adding the required USES=pgsql for
    WANT_PGSQL.
    
    While here also fix opt_VARS usage.  Unlike opt_USE it does not
    support separating words with ,
    
    Reported by:    portscan (WANT_PGSQL without USES=pgsql)
    
    (cherry picked from commit a868d766d8b0bc897568c93a1ba3dbeeed3b4519)
---
 www/miniflux/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/www/miniflux/Makefile b/www/miniflux/Makefile
index 430e90a3f14f..a015cba2da04 100644
--- a/www/miniflux/Makefile
+++ b/www/miniflux/Makefile
@@ -1,6 +1,7 @@
 
 PORTNAME=	miniflux
 DISTVERSION=	2.0.29
+PORTREVISION=	1
 CATEGORIES=	www
 
 MAINTAINER=	krion at FreeBSD.org
@@ -13,8 +14,6 @@ RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
 USES=		go:modules
 
-WANT_PGSQL=	client
-
 USE_GITHUB=	yes
 GH_PROJECT=	v2
 GH_TUPLE=	PuerkitoBio:goquery:v1.6.1:puerkitobio_goquery/vendor/github.com/PuerkitoBio/goquery \
@@ -60,7 +59,8 @@ GROUPS=		miniflux
 
 OPTIONS_DEFINE=		PGSQL_SERVER
 PGSQL_SERVER_DESC=	Install the PostgreSQL Server Component
-PGSQL_SERVER_VARS=	WANT_PGSQL=server,contrib
+PGSQL_SERVER_USES=	pgsql
+PGSQL_SERVER_VARS=	WANT_PGSQL+="server contrib"
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/miniflux.1 ${STAGEDIR}${PREFIX}/man/man1/


More information about the dev-commits-ports-all mailing list