- Update CPU-X to version 4.0.0

- No longer uses libcurl or libjson-c
- Add basic completions for Bash/Fish/Zsh
- Retrieve CPU temperature on FreeBSD
- All privileged access moved to `cpu-x-daemon'
- Remove "CPU-X (root)" desktop launcher

Reported by:	portscout

3 files changed, 28 insertions, 13 deletions

diff --git a/sysutils/cpu-x/Makefile b/sysutils/cpu-x/Makefile
index 9321feb5b51f..31ce0a4042b7 100644
--- a/sysutils/cpu-x/Makefile
+++ b/sysutils/cpu-x/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cpu-x
-PORTVERSION=	3.2.4
+PORTVERSION=	4.0.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 
@@ -14,17 +14,15 @@ LICENSE=	GPLv3
 BUILD_DEPENDS=	nasm:devel/nasm
 LIB_DEPENDS=	libcpuid.so:sysutils/libcpuid \
 		libpci.so:devel/libpci \
-		libstatgrab.so:devel/libstatgrab \
-		libcurl.so:ftp/curl
+		libstatgrab.so:devel/libstatgrab
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	X0rg
 GH_PROJECT=	${PORTNAME:tu}
 
 USES=		cmake gettext ncurses pkgconfig
-CMAKE_ARGS=	-DWITH_LIBJSONC:BOOL=OFF
 
-PORTDOCS=	ChangeLog README.md
+PORTDOCS=	ChangeLog.md README.md
 
 OPTIONS_DEFINE=	DOCS X11
 OPTIONS_DEFAULT=	X11
@@ -35,10 +33,11 @@ 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=	INSTALLS_ICONS=yes
+X11_VARS=	GLIB_SCHEMAS=org.cpu-x.gschema.xml INSTALLS_ICONS=yes
 
 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}
diff --git a/sysutils/cpu-x/distinfo b/sysutils/cpu-x/distinfo
index 67ddb15feb55..d42934c06130 100644
--- a/sysutils/cpu-x/distinfo
+++ b/sysutils/cpu-x/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1547409869
-SHA256 (X0rg-CPU-X-v3.2.4_GH0.tar.gz) = f266388e13c527a5d1d98ec70957b1284f67aa89470cf71bc98ecb41c21542eb
-SIZE (X0rg-CPU-X-v3.2.4_GH0.tar.gz) = 1834895
+TIMESTAMP = 1589731977
+SHA256 (X0rg-CPU-X-v4.0.0_GH0.tar.gz) = 01deaa34f9fef5e6b5783cf7c633621b56374edc3ece0608a1b80e1a5435cf4c
+SIZE (X0rg-CPU-X-v4.0.0_GH0.tar.gz) = 1981378
diff --git a/sysutils/cpu-x/pkg-plist b/sysutils/cpu-x/pkg-plist
index 37f73af1406e..7ac1103bd42b 100644
--- a/sysutils/cpu-x/pkg-plist
+++ b/sysutils/cpu-x/pkg-plist
@@ -1,7 +1,8 @@
 bin/cpu-x
-%%X11%%bin/cpu-x_polkit
+libexec/cpu-x-daemon
 %%X11%%share/applications/cpu-x.desktop
-%%X11%%share/applications/cpu-x-root.desktop
+share/bash-completion/completions/cpu-x
+share/fish/vendor_completions.d/cpu-x.fish
 %%X11%%share/icons/hicolor/16x16/apps/cpu-x.png
 %%X11%%share/icons/hicolor/22x22/apps/cpu-x.png
 %%X11%%share/icons/hicolor/24x24/apps/cpu-x.png
@@ -16,15 +17,30 @@ bin/cpu-x
 %%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/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
-%%X11%%share/metainfo/cpu-x.appdata.xml
-%%X11%%share/polkit-1/actions/org.pkexec.cpu-x.policy
+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
 %%X11%%%%DATADIR%%/AMD.png
 %%X11%%%%DATADIR%%/CPU-X.png
 %%X11%%%%DATADIR%%/Centaur.png