git: c8b2af7ca6de - main - sysutils/intel-pcm: Rework port

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Daniel Engberg <diizzy_at_FreeBSD.org>
Date: Sun, 13 Nov 2022 19:22:40 UTC
The branch main has been updated by diizzy:

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

commit c8b2af7ca6de49489a8bd36ac30d367657b2da5e
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2022-11-13 19:18:47 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2022-11-13 19:18:53 +0000

    sysutils/intel-pcm: Rework port
    
    - Update WWW and location of repo on GitHub
    - Add (lib)simdjson as dependency
    - Make DOCS optional
    - Install files in paths consistent with name of port
    - Fix paths in source files
    
    Reviewed by:    imp (maintainer) via IRC (previous version)
    Approved by:    imp (maintainer) via IRC
---
 sysutils/intel-pcm/Makefile  | 30 ++++++++++++++++++++++++++----
 sysutils/intel-pcm/distinfo  |  6 +++---
 sysutils/intel-pcm/pkg-plist | 30 ++++++++----------------------
 3 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/sysutils/intel-pcm/Makefile b/sysutils/intel-pcm/Makefile
index 44dd81df0da3..8d40c10cd80f 100644
--- a/sysutils/intel-pcm/Makefile
+++ b/sysutils/intel-pcm/Makefile
@@ -1,20 +1,42 @@
 PORTNAME=	intel-pcm
-PORTVERSION=	202210
+DISTVERSION=	202210
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	imp@FreeBSD.org
 COMMENT=	Process Count Monitor (PCM) for Intel processors
-WWW=		https://github.com/opcm/pcm
+WWW=		https://github.com/intel/pcm
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	amd64 i386
 
-USES=		cmake
+LIB_DEPENDS=	libsimdjson.so:devel/simdjson
+
+USES=		cmake compiler:c++11-lang
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	opcm
+GH_ACCOUNT=	intel
 GH_PROJECT=	pcm
 
+PORTDOCS=	*
+
+OPTIONS_DEFINE=	DOCS
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|-O3 -D_FORTIFY_SOURCE=1|-D_FORTIFY_SOURCE=1|g' \
+	    ${PATCH_WRKSRC}/CMakeLists.txt
+	@${REINPLACE_CMD} -e 's|$${CMAKE_INSTALL_DATADIR}/pcm|$${CMAKE_INSTALL_DATADIR}/${PORTNAME}|g' \
+	    ${PATCH_WRKSRC}/src/CMakeLists.txt
+	@${REINPLACE_CMD} -e 's|$${CMAKE_INSTALL_DOCDIR}|$${CMAKE_INSTALL_DATADIR}/doc/${PORTNAME}|g' \
+	    ${PATCH_WRKSRC}/src/CMakeLists.txt
+	@${REINPLACE_CMD} -e 's|/usr/share/pcm/|${DATADIR}/|g' \
+	     ${PATCH_WRKSRC}/src/pcm-iio.cpp
+	@${REINPLACE_CMD} -e 's|/usr/share/pcm/|${DATADIR}/|g' \
+	     ${PATCH_WRKSRC}/src/pcm-raw.cpp
+
+post-install:
+	${RM} -r ${STAGEDIR}${PREFIX}/share/licenses
+
 .include <bsd.port.mk>
diff --git a/sysutils/intel-pcm/distinfo b/sysutils/intel-pcm/distinfo
index 008a7d2ede27..41cf8c267507 100644
--- a/sysutils/intel-pcm/distinfo
+++ b/sysutils/intel-pcm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1667861314
-SHA256 (opcm-pcm-202210_GH0.tar.gz) = faec5b7923d0bc0018c090df594b1bf562428a08ab243cbb5c973e4b7ab6b126
-SIZE (opcm-pcm-202210_GH0.tar.gz) = 1088332
+TIMESTAMP = 1667933954
+SHA256 (intel-pcm-202210_GH0.tar.gz) = faec5b7923d0bc0018c090df594b1bf562428a08ab243cbb5c973e4b7ab6b126
+SIZE (intel-pcm-202210_GH0.tar.gz) = 1088332
diff --git a/sysutils/intel-pcm/pkg-plist b/sysutils/intel-pcm/pkg-plist
index 92392d3364cf..18c9d5b16031 100644
--- a/sysutils/intel-pcm/pkg-plist
+++ b/sysutils/intel-pcm/pkg-plist
@@ -14,25 +14,11 @@ sbin/pcm-power
 sbin/pcm-raw
 sbin/pcm-sensor
 sbin/pcm-tsx
-share/doc/PCM/CUSTOM-COMPILE-OPTIONS.md
-share/doc/PCM/DOCKER_README.md
-share/doc/PCM/ENVVAR_README.md
-share/doc/PCM/FAQ.md
-share/doc/PCM/FREEBSD_HOWTO.txt
-share/doc/PCM/LINUX_HOWTO.txt
-share/doc/PCM/MAC_HOWTO.txt
-share/doc/PCM/PCM-EXPORTER.md
-share/doc/PCM/PCM-SENSOR-SERVER-README.md
-share/doc/PCM/PCM_RAW_README.md
-share/doc/PCM/README.md
-share/doc/PCM/WINDOWS_HOWTO.md
-share/doc/PCM/license.txt
-share/licenses/pcm/LICENSE
-share/pcm/PMURegisterDeclarations/GenuineIntel-6-55-4.json
-share/pcm/PMURegisterDeclarations/GenuineIntel-6-55-7.json
-share/pcm/PMURegisterDeclarations/GenuineIntel-6-6A-6.json
-share/pcm/PMURegisterDeclarations/GenuineIntel-6-86-5.json
-share/pcm/PMURegisterDeclarations/GenuineIntel-6-8E-C.json
-share/pcm/opCode-106.txt
-share/pcm/opCode-134.txt
-share/pcm/opCode-85.txt
+%%DATADIR%%/PMURegisterDeclarations/GenuineIntel-6-55-4.json
+%%DATADIR%%/PMURegisterDeclarations/GenuineIntel-6-55-7.json
+%%DATADIR%%/PMURegisterDeclarations/GenuineIntel-6-6A-6.json
+%%DATADIR%%/PMURegisterDeclarations/GenuineIntel-6-86-5.json
+%%DATADIR%%/PMURegisterDeclarations/GenuineIntel-6-8E-C.json
+%%DATADIR%%/opCode-106.txt
+%%DATADIR%%/opCode-134.txt
+%%DATADIR%%/opCode-85.txt