From 48e389b8e56353055bcca0e63645075b947334db Mon Sep 17 00:00:00 2001 From: Daniel Engberg Date: Sat, 12 Dec 2020 15:47:02 +0100 Subject: [PATCH] cpu-x-arm cpu-x-arm Signed-off-by: Daniel Engberg --- sysutils/cpu-x/Makefile | 29 ++++++++++++++----- sysutils/cpu-x/files/patch-CMakeLists.txt | 11 +++++++ sysutils/cpu-x/files/patch-src_CMakeLists.txt | 4 +-- 3 files changed, 34 insertions(+), 10 deletions(-) create mode 100644 sysutils/cpu-x/files/patch-CMakeLists.txt diff --git a/sysutils/cpu-x/Makefile b/sysutils/cpu-x/Makefile index 936f22faba3c..ca6ef61c6848 100644 --- a/sysutils/cpu-x/Makefile +++ b/sysutils/cpu-x/Makefile @@ -2,26 +2,28 @@ # $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 -BUILD_DEPENDS= nasm:devel/nasm -LIB_DEPENDS= libcpuid.so:sysutils/libcpuid \ - libpci.so:devel/libpci \ - libstatgrab.so:devel/libstatgrab +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 @@ -32,9 +34,20 @@ 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_CMAKE_BOOL= WITH_GTK X11_VARS= GLIB_SCHEMAS=org.cpu-x.gschema.xml INSTALLS_ICONS=yes +.include + +.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 ,' ${WRKSRC}/src/gui_gtk.c diff --git a/sysutils/cpu-x/files/patch-CMakeLists.txt b/sysutils/cpu-x/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..a0f0630e7ab4 --- /dev/null +++ b/sysutils/cpu-x/files/patch-CMakeLists.txt @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2020-12-12 14:52:38 UTC ++++ CMakeLists.txt +@@ -15,7 +15,7 @@ project(cpu-x + set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") + include(GNUInstallDirs) + if(NOT EXISTS ${CMAKE_INSTALL_FULL_LIBEXECDIR}) +- set(CMAKE_INSTALL_LIBEXECDIR lib/${CMAKE_PROJECT_NAME}) ++ set(CMAKE_INSTALL_LIBEXECDIR libexec) + set(CMAKE_INSTALL_FULL_LIBEXECDIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBEXECDIR}) + endif(NOT EXISTS ${CMAKE_INSTALL_FULL_LIBEXECDIR}) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/output/bin/) diff --git a/sysutils/cpu-x/files/patch-src_CMakeLists.txt b/sysutils/cpu-x/files/patch-src_CMakeLists.txt index 3ff3db466175..00ce795295c7 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 2020-06-13 17:49:15 UTC +++ src/CMakeLists.txt -@@ -37,7 +37,13 @@ endif(WITH_GTK) +@@ -23,7 +23,13 @@ endif(WITH_GTK) # NCurses if(WITH_NCURSES) -- 2.29.2