Attachment #220493 for bug #251785

View | Details | Raw Unified | Return to bug 251785
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	cpu-x
PORTVERSION=	4.0.1
DISTVERSIONPREFIX=	v
DISTVERSION=	4.0.1
PORTREVISION=	1
CATEGORIES=	sysutils

MAINTAINER=	danfe@FreeBSD.org
COMMENT=	Gathers information about CPU, motherboard, and more

LICENSE=	GPLv3
LICENSE_FILES=	${WRKSRC}/COPYING

ONLY_FOR_ARCHS=	aarch64 amd64 armv6 armv7 i386

LIB_DEPENDS=	libstatgrab.so:devel/libstatgrab \
		libpci.so:devel/libpci

USES=		cmake gettext localbase ncurses pkgconfig

USE_GITHUB=	yes
GH_ACCOUNT=	X0rg
GH_PROJECT=	${PORTNAME:tu}

USES=		cmake gettext ncurses pkgconfig

PORTDOCS=	ChangeLog.md README.md

OPTIONS_DEFINE=	DOCS X11


X11_USES=	gnome
X11_USE=	GNOME=gtk30
X11_CMAKE_BOOL=	WITH_GTK
X11_VARS=	GLIB_SCHEMAS=org.cpu-x.gschema.xml INSTALLS_ICONS=yes

.include <bsd.port.options.mk>

.if ${ARCH} == i386 || ${ARCH} == amd64
BUILD_DEPENDS=	nasm:devel/nasm
LIB_DEPENDS+=	libcpuid.so:sysutils/libcpuid
.endif

.if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7
CMAKE_OFF=	WITH_LIBCPUID WITH_BANDWIDTH
.endif

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

Added Link Here

(-)b/sysutils/cpu-x/files/patch-CMakeLists.txt (+11 lines)
1	--- CMakeLists.txt.orig 2020-12-12 14:52:38 UTC
2	+++ CMakeLists.txt
3	@@ -15,7 +15,7 @@ project(cpu-x
4	set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
5	include(GNUInstallDirs)
6	if(NOT EXISTS ${CMAKE_INSTALL_FULL_LIBEXECDIR})
7	- set(CMAKE_INSTALL_LIBEXECDIR lib/${CMAKE_PROJECT_NAME})
8	+ set(CMAKE_INSTALL_LIBEXECDIR libexec)
9	set(CMAKE_INSTALL_FULL_LIBEXECDIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBEXECDIR})
10	endif(NOT EXISTS ${CMAKE_INSTALL_FULL_LIBEXECDIR})
11	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/output/bin/)

Lines 1-6 Link Here

(-)b/sysutils/cpu-x/files/patch-src_CMakeLists.txt (-3 / +2 lines)
1	--- src/CMakeLists.txt.orig 2016-10-25 18:42:03 UTC	1	--- src/CMakeLists.txt.orig 2020-06-13 17:49:15 UTC
2	+++ src/CMakeLists.txt	2	+++ src/CMakeLists.txt
3	@@ -37,7 +37,13 @@ endif(WITH_GTK)	3	@@ -23,7 +23,13 @@ endif(WITH_GTK)
4		4
5	# NCurses	5	# NCurses
6	if(WITH_NCURSES)	6	if(WITH_NCURSES)
7	-

Return to bug 251785

Lines 2-27 Link Here

(-)b/sysutils/cpu-x/Makefile (-8 / +21 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= cpu-x	4	PORTNAME= cpu-x
5	PORTVERSION= 4.0.1
6	DISTVERSIONPREFIX= v	5	DISTVERSIONPREFIX= v
		6	DISTVERSION= 4.0.1
		7	PORTREVISION= 1
7	CATEGORIES= sysutils	8	CATEGORIES= sysutils
8		9
9	MAINTAINER= danfe@FreeBSD.org	10	MAINTAINER= danfe@FreeBSD.org
10	COMMENT= Gathers information about CPU, motherboard, and more	11	COMMENT= Gathers information about CPU, motherboard, and more
11		12
12	LICENSE= GPLv3	13	LICENSE= GPLv3
		14	LICENSE_FILES= ${WRKSRC}/COPYING
13		15
14	BUILD_DEPENDS= nasm:devel/nasm	16	ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386
15	LIB_DEPENDS= libcpuid.so:sysutils/libcpuid \	17
16	libpci.so:devel/libpci \	18	LIB_DEPENDS= libstatgrab.so:devel/libstatgrab \
17	libstatgrab.so:devel/libstatgrab	19	libpci.so:devel/libpci
		20
		21	USES= cmake gettext localbase ncurses pkgconfig
18		22
19	USE_GITHUB= yes	23	USE_GITHUB= yes
20	GH_ACCOUNT= X0rg	24	GH_ACCOUNT= X0rg
21	GH_PROJECT= ${PORTNAME:tu}	25	GH_PROJECT= ${PORTNAME:tu}
22		26
23	USES= cmake gettext ncurses pkgconfig
24
25	PORTDOCS= ChangeLog.md README.md	27	PORTDOCS= ChangeLog.md README.md
26		28
27	OPTIONS_DEFINE= DOCS X11	29	OPTIONS_DEFINE= DOCS X11
Lines 32-40 X11_DESC= Build GTK+3 frontend in addition to ncurses one Link Here
32		34
33	X11_USES= gnome	35	X11_USES= gnome
34	X11_USE= GNOME=gtk30	36	X11_USE= GNOME=gtk30
35	X11_CMAKE_OFF= -DWITH_GTK:BOOL=OFF	37	X11_CMAKE_BOOL= WITH_GTK
36	X11_VARS= GLIB_SCHEMAS=org.cpu-x.gschema.xml INSTALLS_ICONS=yes	38	X11_VARS= GLIB_SCHEMAS=org.cpu-x.gschema.xml INSTALLS_ICONS=yes
37		39
		40	.include <bsd.port.options.mk>
		41
		42	.if ${ARCH} == i386 \|\| ${ARCH} == amd64
		43	BUILD_DEPENDS= nasm:devel/nasm
		44	LIB_DEPENDS+= libcpuid.so:sysutils/libcpuid
		45	.endif
		46
		47	.if ${ARCH} == aarch64 \|\| ${ARCH} == armv6 \|\| ${ARCH} == armv7
		48	CMAKE_OFF= WITH_LIBCPUID WITH_BANDWIDTH
		49	.endif
		50
38	post-patch:	51	post-patch:
39	@${REINPLACE_CMD} -e 's, -Wno-unused-result,,' ${WRKSRC}/CMakeLists.txt	52	@${REINPLACE_CMD} -e 's, -Wno-unused-result,,' ${WRKSRC}/CMakeLists.txt
40	@${REINPLACE_CMD} -e '23s,^,#include <sys/wait.h>,' ${WRKSRC}/src/gui_gtk.c	53	@${REINPLACE_CMD} -e '23s,^,#include <sys/wait.h>,' ${WRKSRC}/src/gui_gtk.c