Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 27 Apr 2023 12:37:03 GMT
From:      Michael Zhilin <mizhka@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 802567d7f842 - main - sysutils/flashrom: change buildtool to meson
Message-ID:  <202304271237.33RCb356096359@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by mizhka:

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

commit 802567d7f842ae4470c64988a72e51948b133657
Author:     Michael Zhilin <mizhka@FreeBSD.org>
AuthorDate: 2023-04-27 11:36:07 +0000
Commit:     Michael Zhilin <mizhka@FreeBSD.org>
CommitDate: 2023-04-27 12:35:56 +0000

    sysutils/flashrom: change buildtool to meson
    
    Change buildtool to meson and remove redundant bits
    
    This commit is caused by ticket 271092 "update to 1.3 caused missing
    INTERNAL_CONFIG option". The aim is to involve meson tool for configure
    and installation parts.
    
    Reported by: franco@opnsense.org
    PR: 271092
---
 sysutils/flashrom/Makefile  | 15 +++++----------
 sysutils/flashrom/pkg-plist |  8 ++++++++
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/sysutils/flashrom/Makefile b/sysutils/flashrom/Makefile
index d0114685cead..1c0177093126 100644
--- a/sysutils/flashrom/Makefile
+++ b/sysutils/flashrom/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	flashrom
 PORTVERSION=	1.3.0
 DISTVERSIONPREFIX=	v
+PORTREVISION=   1
 CATEGORIES=	sysutils
 MASTER_SITES=	https://download.flashrom.org/releases/
 
@@ -14,17 +15,14 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 NOT_FOR_ARCHS=	aarch64 riscv64
 NOT_FOR_ARCHS_REASON=	Unable to determine endianness.
 
+BUILD_DEPENDS+=	cmocka>=0:sysutils/cmocka
 LIB_DEPENDS=	libpci.so:devel/libpci
 
-USES=		gmake tar:bzip2
+USES=		meson pkgconfig tar:bzip2
 
-MAKE_ENV=	WARNERROR=no
-
-PLIST_FILES=	bin/flashrom \
-		man/man8/flashrom.8.gz
 PORTDOCS=	*
 
-OPTIONS_DEFINE=	BUSPIRATE DOCS FTDI
+OPTIONS_DEFINE= DOCS FTDI
 OPTIONS_DEFINE_amd64=	DMIDECODE
 OPTIONS_DEFINE_i386=	DMIDECODE
 OPTIONS_DEFAULT_amd64=	DMIDECODE
@@ -36,11 +34,8 @@ FTDI_DESC=	Enable external FT2232SPI flasher support
 DMIDECODE_RUN_DEPENDS=	dmidecode:sysutils/dmidecode
 
 FTDI_LIB_DEPENDS=	libftdi1.so:devel/libftdi1
-FTDI_USES=		pkgconfig
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/flashrom ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/flashrom.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
+post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/Documentation && ${INSTALL_DATA} *.txt ${STAGEDIR}${DOCSDIR}
diff --git a/sysutils/flashrom/pkg-plist b/sysutils/flashrom/pkg-plist
new file mode 100644
index 000000000000..d282fb496e86
--- /dev/null
+++ b/sysutils/flashrom/pkg-plist
@@ -0,0 +1,8 @@
+include/libflashrom.h
+lib/libflashrom.a
+lib/libflashrom.so
+lib/libflashrom.so.1
+lib/libflashrom.so.1.0.0
+libdata/pkgconfig/flashrom.pc
+man/man8/flashrom.8.gz
+sbin/flashrom



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304271237.33RCb356096359>