git: 5d0d0f023e25 - main - sysutils/cpu-x: the port had been updated and improved (+)

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Alexey Dokuchaev <danfe_at_FreeBSD.org>
Date: Fri, 17 Mar 2023 10:26:38 UTC
The branch main has been updated by danfe:

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

commit 5d0d0f023e25dd8a4b8a3b7b68e156d71657d574
Author:     Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2023-03-17 10:25:48 +0000
Commit:     Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2023-03-17 10:25:48 +0000

    sysutils/cpu-x: the port had been updated and improved (+)
    
    - Update to the latest version 4.5.2 and chase that very long
      new upstream name; adjust LICENSE (it's GPLv3 or later)
    - Garbage-collect no longer needed `post-patch' target
    - Allow to disable NLS due to low quality of some translations
      and unbreak the port's build in this case
    - Disable GLFW, Vulkan, and OpenCL for now: on FreeBSD, they
      only provide those components' version numbers because the
      adjacent support code is Linux-specific
    
    PR:             269981
    Reported by:    portscout
---
 sysutils/cpu-x/Makefile                       | 23 +++++-----
 sysutils/cpu-x/distinfo                       |  6 +--
 sysutils/cpu-x/files/patch-src_CMakeLists.txt | 13 +++++-
 sysutils/cpu-x/pkg-plist                      | 60 +++++++++++++++++----------
 4 files changed, 62 insertions(+), 40 deletions(-)

diff --git a/sysutils/cpu-x/Makefile b/sysutils/cpu-x/Makefile
index 8bf9632cca42..bae6e848301d 100644
--- a/sysutils/cpu-x/Makefile
+++ b/sysutils/cpu-x/Makefile
@@ -1,43 +1,40 @@
 PORTNAME=	cpu-x
-PORTVERSION=	4.0.1
+PORTVERSION=	4.5.2
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Gathers information about CPU, motherboard, and more
-WWW=		https://x0rg.github.io/CPU-X/
+WWW=		https://thetumultuousunicornofdarkness.github.io/CPU-X/
 
-LICENSE=	GPLv3
+LICENSE=	GPLv3+
 
 BUILD_DEPENDS=	nasm:devel/nasm
 LIB_DEPENDS=	libcpuid.so:sysutils/libcpuid \
 		libpci.so:devel/libpci \
 		libstatgrab.so:devel/libstatgrab
 
+USES=		cmake ncurses pkgconfig
 USE_GITHUB=	yes
-GH_ACCOUNT=	X0rg
+GH_ACCOUNT=	TheTumultuousUnicornOfDarkness
 GH_PROJECT=	${PORTNAME:tu}
-
-USES=		cmake gettext ncurses pkgconfig
+CMAKE_OFF=	WITH_LIBGLFW WITH_VULKAN WITH_OPENCL
 
 PORTDOCS=	ChangeLog.md README.md
 
-OPTIONS_DEFINE=	DOCS X11
+OPTIONS_DEFINE=	DOCS NLS X11
 OPTIONS_DEFAULT=	X11
 OPTIONS_SUB=	yes
 
-X11_DESC=	Build GTK+3 frontend in addition to ncurses one
+NLS_USES=	gettext
+NLS_CMAKE_OFF=	-DWITH_GETTEXT:BOOL=OFF
 
+X11_DESC=	Build GTK+3 frontend in addition to ncurses one
 X11_USES=	gnome
 X11_USE=	GNOME=gtk30
 X11_CMAKE_OFF=	-DWITH_GTK:BOOL=OFF
 X11_VARS=	GLIB_SCHEMAS=org.cpu-x.gschema.xml
 
-post-patch:
-	@${REINPLACE_CMD} -e 's, -Wno-unused-result,,' ${WRKSRC}/CMakeLists.txt
-	@${REINPLACE_CMD} -e '23s,^,#include <sys/wait.h>,' ${WRKSRC}/src/gui_gtk.c
-
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
diff --git a/sysutils/cpu-x/distinfo b/sysutils/cpu-x/distinfo
index 7b380c427348..a3b2022735ad 100644
--- a/sysutils/cpu-x/distinfo
+++ b/sysutils/cpu-x/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1592070555
-SHA256 (X0rg-CPU-X-v4.0.1_GH0.tar.gz) = c41fbb3000e3e6f79e5228aa0237fde4f98b11df8ccb4c9a46f7e63a4a7011bf
-SIZE (X0rg-CPU-X-v4.0.1_GH0.tar.gz) = 1719474
+TIMESTAMP = 1668274060
+SHA256 (TheTumultuousUnicornOfDarkness-CPU-X-v4.5.2_GH0.tar.gz) = 6cdab38928ca5684b22f7b8d868d42a25a48be6da813743b6b59a88d6e9f25d1
+SIZE (TheTumultuousUnicornOfDarkness-CPU-X-v4.5.2_GH0.tar.gz) = 1919087
diff --git a/sysutils/cpu-x/files/patch-src_CMakeLists.txt b/sysutils/cpu-x/files/patch-src_CMakeLists.txt
index 3ff3db466175..9817c5d8f8a7 100644
--- a/sysutils/cpu-x/files/patch-src_CMakeLists.txt
+++ b/sysutils/cpu-x/files/patch-src_CMakeLists.txt
@@ -1,6 +1,6 @@
---- src/CMakeLists.txt.orig	2016-10-25 18:42:03 UTC
+--- src/CMakeLists.txt.orig	2022-11-12 17:27:40 UTC
 +++ src/CMakeLists.txt
-@@ -37,7 +37,13 @@ endif(WITH_GTK)
+@@ -23,7 +23,13 @@ endif(WITH_GTK)
  
  # NCurses
  if(WITH_NCURSES)
@@ -15,3 +15,12 @@
  	if(NCURSES_FOUND)
  		include_directories(${NCURSES_INCLUDE_DIRS})
  		link_directories(${NCURSES_LIBRARY_DIRS})
+@@ -37,7 +43,7 @@ endif(WITH_NCURSES)
+ 
+ # Gettext
+ if(Intl_FOUND)
+-	include_directories(${CMAKE_BINARY_DIR}/po)
++	include_directories(${Intl_INCLUDE_DIRS})
+ endif(Intl_FOUND)
+ 
+ # Libcpuid
diff --git a/sysutils/cpu-x/pkg-plist b/sysutils/cpu-x/pkg-plist
index 29c4a6a50852..607b19ecdb4c 100644
--- a/sysutils/cpu-x/pkg-plist
+++ b/sysutils/cpu-x/pkg-plist
@@ -17,28 +17,44 @@ share/fish/vendor_completions.d/cpu-x.fish
 %%X11%%share/icons/hicolor/256x256/apps/cpu-x.png
 %%X11%%share/icons/hicolor/384x384/apps/cpu-x.png
 %%X11%%share/icons/hicolor/512x512/apps/cpu-x.png
-share/locale/ar/LC_MESSAGES/cpu-x.mo
-share/locale/cs_CZ/LC_MESSAGES/cpu-x.mo
-share/locale/de/LC_MESSAGES/cpu-x.mo
-share/locale/el/LC_MESSAGES/cpu-x.mo
-share/locale/es/LC_MESSAGES/cpu-x.mo
-share/locale/fr/LC_MESSAGES/cpu-x.mo
-share/locale/id/LC_MESSAGES/cpu-x.mo
-share/locale/it/LC_MESSAGES/cpu-x.mo
-share/locale/ja/LC_MESSAGES/cpu-x.mo
-share/locale/ko/LC_MESSAGES/cpu-x.mo
-share/locale/lv/LC_MESSAGES/cpu-x.mo
-share/locale/mr/LC_MESSAGES/cpu-x.mo
-share/locale/ms/LC_MESSAGES/cpu-x.mo
-share/locale/nb_NO/LC_MESSAGES/cpu-x.mo
-share/locale/pl/LC_MESSAGES/cpu-x.mo
-share/locale/pt/LC_MESSAGES/cpu-x.mo
-share/locale/pt_BR/LC_MESSAGES/cpu-x.mo
-share/locale/ru/LC_MESSAGES/cpu-x.mo
-share/locale/tr/LC_MESSAGES/cpu-x.mo
-share/locale/uk/LC_MESSAGES/cpu-x.mo
-share/locale/zh/LC_MESSAGES/cpu-x.mo
-share/locale/zh_Hant/LC_MESSAGES/cpu-x.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/cpu-x.mo
+%%NLS%%share/locale/ber/LC_MESSAGES/cpu-x.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/cpu-x.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/cpu-x.mo
+%%NLS%%share/locale/cs_CZ/LC_MESSAGES/cpu-x.mo
+%%NLS%%share/locale/da/LC_MESSAGES/cpu-x.mo
+%%NLS%%share/locale/de/LC_MESSAGES/cpu-x.mo
+%%NLS%%share/locale/el/LC_MESSAGES/cpu-x.mo
+%%NLS%%share/locale/es/LC_MESSAGES/cpu-x.mo
+%%NLS%%share/locale/fa/LC_MESSAGES/cpu-x.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/cpu-x.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/cpu-x.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/cpu-x.mo
+%%NLS%%share/locale/id/LC_MESSAGES/cpu-x.mo
+%%NLS%%share/locale/it/LC_MESSAGES/cpu-x.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/cpu-x.mo
+%%NLS%%share/locale/kmr/LC_MESSAGES/cpu-x.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/cpu-x.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/cpu-x.mo
+%%NLS%%share/locale/ml/LC_MESSAGES/cpu-x.mo
+%%NLS%%share/locale/mr/LC_MESSAGES/cpu-x.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/cpu-x.mo
+%%NLS%%share/locale/nb_NO/LC_MESSAGES/cpu-x.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/cpu-x.mo
+%%NLS%%share/locale/pa/LC_MESSAGES/cpu-x.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/cpu-x.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/cpu-x.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/cpu-x.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/cpu-x.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/cpu-x.mo
+%%NLS%%share/locale/si/LC_MESSAGES/cpu-x.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/cpu-x.mo
+%%NLS%%share/locale/ta/LC_MESSAGES/cpu-x.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/cpu-x.mo
+%%NLS%%share/locale/tzm/LC_MESSAGES/cpu-x.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/cpu-x.mo
+%%NLS%%share/locale/zh/LC_MESSAGES/cpu-x.mo
+%%NLS%%share/locale/zh_Hant/LC_MESSAGES/cpu-x.mo
 %%X11%%share/metainfo/org.cpu-x.appdata.xml
 %%X11%%share/polkit-1/actions/org.cpu-x-daemon.policy
 share/zsh/site-functions/_cpu-x