- Make GTK+3 frontend optional (but enabled by default)

- Adjust USES and LIB_DEPENDS as reported by `stage-qa'

2 files changed, 46 insertions, 39 deletions

diff --git a/sysutils/cpu-x/Makefile b/sysutils/cpu-x/Makefile
index 5eb2b7bf6b31..1f295d1a9eb4 100644
--- a/sysutils/cpu-x/Makefile
+++ b/sysutils/cpu-x/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	cpu-x
 PORTVERSION=	3.1.3
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 
 MAINTAINER=	danfe@FreeBSD.org
@@ -15,19 +15,26 @@ LICENSE=	GPLv3
 BUILD_DEPENDS=	nasm:devel/nasm
 LIB_DEPENDS=	libcpuid.so:sysutils/libcpuid \
 		libpci.so:devel/libpci \
-		libstatgrab.so:devel/libstatgrab
+		libstatgrab.so:devel/libstatgrab \
+		libcurl.so:ftp/curl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	X0rg
 GH_PROJECT=	${PORTNAME:tu}
 
-USES=		cmake execinfo gettext-tools ncurses pkgconfig
-USE_GNOME=	gtk30
-INSTALLS_ICONS=	yes
+USES=		cmake execinfo gettext ncurses pkgconfig
 
 PORTDOCS=	ChangeLog README.md
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS X11
+OPTIONS_DEFAULT=	X11
+OPTIONS_SUB=	yes
+
+X11_DESC=	Build GTK+3 frontend in addition to ncurses one
+
+X11_USE=	GNOME=gtk30
+X11_CMAKE_OFF=	-DWITH_GTK:BOOL=OFF
+X11_VARS=	INSTALLS_ICONS=yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's, -Wno-unused-result,,' ${WRKSRC}/CMakeLists.txt
diff --git a/sysutils/cpu-x/pkg-plist b/sysutils/cpu-x/pkg-plist
index 41b614a96dcb..4ab23c59cef7 100644
--- a/sysutils/cpu-x/pkg-plist
+++ b/sysutils/cpu-x/pkg-plist
@@ -1,36 +1,36 @@
 bin/cpu-x
-bin/cpu-x_polkit
-share/applications/cpu-x.desktop
-share/applications/cpu-x-root.desktop
-share/icons/hicolor/16x16/apps/cpu-x.png
-share/icons/hicolor/22x22/apps/cpu-x.png
-share/icons/hicolor/24x24/apps/cpu-x.png
-share/icons/hicolor/32x32/apps/cpu-x.png
-share/icons/hicolor/36x36/apps/cpu-x.png
-share/icons/hicolor/48x48/apps/cpu-x.png
-share/icons/hicolor/64x64/apps/cpu-x.png
-share/icons/hicolor/72x72/apps/cpu-x.png
-share/icons/hicolor/96x96/apps/cpu-x.png
-share/icons/hicolor/128x128/apps/cpu-x.png
-share/icons/hicolor/192x192/apps/cpu-x.png
-share/icons/hicolor/256x256/apps/cpu-x.png
-share/icons/hicolor/384x384/apps/cpu-x.png
-share/icons/hicolor/512x512/apps/cpu-x.png
+%%X11%%bin/cpu-x_polkit
+%%X11%%share/applications/cpu-x.desktop
+%%X11%%share/applications/cpu-x-root.desktop
+%%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
+%%X11%%share/icons/hicolor/32x32/apps/cpu-x.png
+%%X11%%share/icons/hicolor/36x36/apps/cpu-x.png
+%%X11%%share/icons/hicolor/48x48/apps/cpu-x.png
+%%X11%%share/icons/hicolor/64x64/apps/cpu-x.png
+%%X11%%share/icons/hicolor/72x72/apps/cpu-x.png
+%%X11%%share/icons/hicolor/96x96/apps/cpu-x.png
+%%X11%%share/icons/hicolor/128x128/apps/cpu-x.png
+%%X11%%share/icons/hicolor/192x192/apps/cpu-x.png
+%%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/fr/LC_MESSAGES/cpu-x.mo
 share/locale/pt_BR/LC_MESSAGES/cpu-x.mo
-share/polkit-1/actions/org.pkexec.cpu-x.policy
-%%DATADIR%%/AMD.png
-%%DATADIR%%/CPU-X.png
-%%DATADIR%%/Centaur.png
-%%DATADIR%%/Cyrix.png
-%%DATADIR%%/Intel.png
-%%DATADIR%%/NSC.png
-%%DATADIR%%/NexGen.png
-%%DATADIR%%/Rise.png
-%%DATADIR%%/SiS.png
-%%DATADIR%%/Transmeta.png
-%%DATADIR%%/UMC.png
-%%DATADIR%%/Unknown.png
-%%DATADIR%%/cpu-x-gtk-3.12.css
-%%DATADIR%%/cpu-x-gtk-3.12.ui
-%%DATADIR%%/cpu-x-gtk-3.20.css
+%%X11%%share/polkit-1/actions/org.pkexec.cpu-x.policy
+%%X11%%%%DATADIR%%/AMD.png
+%%X11%%%%DATADIR%%/CPU-X.png
+%%X11%%%%DATADIR%%/Centaur.png
+%%X11%%%%DATADIR%%/Cyrix.png
+%%X11%%%%DATADIR%%/Intel.png
+%%X11%%%%DATADIR%%/NSC.png
+%%X11%%%%DATADIR%%/NexGen.png
+%%X11%%%%DATADIR%%/Rise.png
+%%X11%%%%DATADIR%%/SiS.png
+%%X11%%%%DATADIR%%/Transmeta.png
+%%X11%%%%DATADIR%%/UMC.png
+%%X11%%%%DATADIR%%/Unknown.png
+%%X11%%%%DATADIR%%/cpu-x-gtk-3.12.css
+%%X11%%%%DATADIR%%/cpu-x-gtk-3.12.ui
+%%X11%%%%DATADIR%%/cpu-x-gtk-3.20.css