git: 6773d3b87179 - main - x11/nvidia-settings: the port had been updated and improved (+)

[Alexey Dokuchaev]

The branch main has been updated by danfe:

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

commit 6773d3b871799ce8a93fd37643434be28e7d3107
Author:     Alexey Dokuchaev <danfe at FreeBSD.org>
AuthorDate: 2021-09-24 10:09:42 +0000
Commit:     Alexey Dokuchaev <danfe at FreeBSD.org>
CommitDate: 2021-09-24 10:09:42 +0000

    x11/nvidia-settings: the port had been updated and improved (+)
    
    - Update to version 470.74 to match the driver port itself
    - Add dependency on `print/harfbuzz', per stage Q/A report
    - Fix patching of `nvidia-settings.desktop', particularly,
      squish that ugly double space in the `Categories' line
    - When passing NV_VERBOSE for our usual verbose build, set
      it explicitly to 1 (one) to indicate the intention better
---
 x11/nvidia-settings/Makefile | 10 +++++-----
 x11/nvidia-settings/distinfo |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/x11/nvidia-settings/Makefile b/x11/nvidia-settings/Makefile
index c302535c8490..32c79195edee 100644
--- a/x11/nvidia-settings/Makefile
+++ b/x11/nvidia-settings/Makefile
@@ -1,7 +1,7 @@
 # Created by: Alexander Nedotsukov <bland at FreeBSD.org>
 
 PORTNAME=	nvidia-settings
-PORTVERSION=	470.63.01
+PORTVERSION=	470.74
 CATEGORIES=	x11
 
 MAINTAINER=	x11 at FreeBSD.org
@@ -15,6 +15,7 @@ ONLY_FOR_ARCHS_REASON=	Nvidia driver is only available on x86
 BUILD_DEPENDS=	${LOCALBASE}/include/dbus-1.0/dbus/dbus.h:devel/dbus
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
+		libharfbuzz.so:print/harfbuzz \
 		libjansson.so:devel/jansson \
 		libvdpau.so:multimedia/libvdpau
 
@@ -38,17 +39,16 @@ SUB_FILES=	nvidia-settings
 LDFLAGS+=	-pthread
 LLD_UNSAFE=	yes
 MAKE_ENV=	NV_USE_BUNDLED_LIBJANSSON=0 \
-		NV_VERBOSE= \
+		NV_VERBOSE=1 \
 		GTK3_AVAILABLE=0 \
 		INSTALL_DOC_ARGS="${INSTALL_MAN:Ninstall}" \
 		XNVCTRL_CFLAGS=-I${LOCALBASE}/include \
 		XNVCTRL_LDFLAGS=-L${LOCALBASE}/lib
 
 post-patch:	.SILENT
-	${REINPLACE_CMD} \
-		 -e '/^MANDIR/s|share/||' ${WRKSRC}/utils.mk
+	${REINPLACE_CMD} -e '/^MANDIR/s|share/||' ${WRKSRC}/utils.mk
 	${REINPLACE_CMD} -E -e 's,__(PIXMAP|UTILS)_PATH__/,,' \
-		-e '/^Categories/ s,=.*,=  Settings;HardwareSettings;,' \
+		-e 's|__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__|Settings;HardwareSettings;|' \
 		${WRKSRC}/doc/nvidia-settings.desktop
 	${REINPLACE_CMD} -e 's|/usr/share/nvidia/|${LOCALBASE}/share/doc/NVIDIA_GLX-1.0/|' \
 		${WRKSRC}/src/gtk+-2.x/ctkappprofile.c
diff --git a/x11/nvidia-settings/distinfo b/x11/nvidia-settings/distinfo
index 846dbf87ae37..d1f6fc5c956a 100644
--- a/x11/nvidia-settings/distinfo
+++ b/x11/nvidia-settings/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1628613930
-SHA256 (NVIDIA-nvidia-settings-470.63.01_GH0.tar.gz) = 4cca3f3a25e4c84458839337b18b5d41738e87fea58e68936ea7ef43658f7cb9
-SIZE (NVIDIA-nvidia-settings-470.63.01_GH0.tar.gz) = 1235088
+TIMESTAMP = 1632153091
+SHA256 (NVIDIA-nvidia-settings-470.74_GH0.tar.gz) = 73e9d42ff7a419c21682342a9f4fca645497a1c251d51dc8f65eadb7b40abd58
+SIZE (NVIDIA-nvidia-settings-470.74_GH0.tar.gz) = 1234988