git: d7c44e871bfd - main - www/deforaos-surfer: clean up the port

The branch main has been updated by olivier:

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

commit d7c44e871bfd257509f87caf1f4630458a1ddb70
Author:     Pierre Pronchery <khorben@defora.org>
AuthorDate: 2024-10-14 15:29:20 +0000
Commit:     Olivier Cochard <olivier@FreeBSD.org>
CommitDate: 2024-10-21 23:20:12 +0000

    www/deforaos-surfer: clean up the port
    
    This lets the deforaos-surfer port pass the plist, portclippy, portfmt,
    and portlint tests. This notably adds an "NLS" option, and bumps the
    PORTREVISION as a consequence as well.
    
    Sponsored by:   The FreeBSD Foundation
---
 www/deforaos-surfer/Makefile  | 28 +++++++++++++++++-----------
 www/deforaos-surfer/pkg-plist | 12 ++++++------
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/www/deforaos-surfer/Makefile b/www/deforaos-surfer/Makefile
index 5a5b3b31cad5..46b2560d1c45 100644
--- a/www/deforaos-surfer/Makefile
+++ b/www/deforaos-surfer/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	surfer
 PORTVERSION=	0.3.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	https://ftp.defora.org/pub/DeforaOS/Apps/Desktop/src/Surfer/
 PKGNAMEPREFIX=	deforaos-
@@ -13,28 +13,34 @@ WWW=		https://www.defora.org/
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libSystem.so:devel/deforaos-libsystem \
-		libDesktop.so:x11/deforaos-libdesktop \
-		libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
+LIB_DEPENDS=	libDesktop.so:x11/deforaos-libdesktop \
 		libharfbuzz.so:print/harfbuzz \
-		libsoup-2.4.so:devel/libsoup
+		libsoup-2.4.so:devel/libsoup \
+		libSystem.so:devel/deforaos-libsystem \
+		libwebkit2gtk-4.0.so:www/webkit2-gtk3
 
-USES=		gnome desktop-file-utils pkgconfig gettext
+USES=		desktop-file-utils gnome pkgconfig xorg
+USE_GNOME=	cairo gdkpixbuf2 gtk30
 USE_XORG=	x11
-USE_GNOME=	gtk30 cairo gdkpixbuf2
 
 MAKE_ARGS=	PREFIX=${PREFIX}
 MAKE_ENV+=	MANDIR=${STAGEDIR}${PREFIX}/share/man
 
-OPTIONS_DEFINE=	DOCS
-OPTIONS_SUB=	yes
-DOCS_BUILD_DEPENDS=	xsltproc:textproc/libxslt \
-	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl
+OPTIONS_DEFINE=		DOCS NLS
+OPTIONS_SUB=		yes
+DOCS_BUILD_DEPENDS=	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \
+			xsltproc:textproc/libxslt
+
+NLS_USES=		gettext
 
 post-patch-DOCS-off:
 	${REINPLACE_CMD} 's|= data doc|= data|' \
 		${WRKSRC}/Makefile
 
+post-patch-NLS-off:
+	${REINPLACE_CMD} 's|data po src|data src|' \
+		${WRKSRC}/Makefile
+
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
 
diff --git a/www/deforaos-surfer/pkg-plist b/www/deforaos-surfer/pkg-plist
index db4f71fd426d..8d9241ce3ac8 100644
--- a/www/deforaos-surfer/pkg-plist
+++ b/www/deforaos-surfer/pkg-plist
@@ -9,9 +9,9 @@ share/applications/org.defora.htmlapp.desktop
 share/applications/org.defora.surfer.desktop
 share/icons/hicolor/16x16/apps/surfer-view-html-source.png
 share/icons/hicolor/24x24/apps/surfer-view-html-source.png
-share/doc/Surfer/COPYING
-share/doc/Surfer/README.md
-share/locale/de/LC_MESSAGES/Surfer.mo
-share/locale/es/LC_MESSAGES/Surfer.mo
-share/locale/fr/LC_MESSAGES/Surfer.mo
-share/locale/it/LC_MESSAGES/Surfer.mo
+%%PORTDOCS%%share/doc/Surfer/COPYING
+%%PORTDOCS%%share/doc/Surfer/README.md
+%%NLS%%share/locale/de/LC_MESSAGES/Surfer.mo
+%%NLS%%share/locale/es/LC_MESSAGES/Surfer.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/Surfer.mo
+%%NLS%%share/locale/it/LC_MESSAGES/Surfer.mo