Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 17 Jul 2023 09:11:59 GMT
From:      Muhammad Moinur Rahman <bofh@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 99da75e7dbda - main - devel/capstone3: Fix pkgbase conflict
Message-ID:  <202307170911.36H9Bxwb033892@gitrepo.freebsd.org>

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

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

commit 99da75e7dbda4a7905f910f6e99122f6a1b0512a
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-07-17 08:28:58 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-07-17 09:11:46 +0000

    devel/capstone3: Fix pkgbase conflict
    
    - After moving capstone5 to capstone there is a pkgbase conflict with
      capstone3 which is fixed here.
    - While I am here pet portclippy
    
    Approved by:    portmgr (blanket)
    Reported by:    antoine
---
 devel/capstone3/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/devel/capstone3/Makefile b/devel/capstone3/Makefile
index 3c48d41c660f..30f3811bd777 100644
--- a/devel/capstone3/Makefile
+++ b/devel/capstone3/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	capstone
 PORTVERSION=	3.0.5
 CATEGORIES=	devel
+PKGNAMESUFFIX=	3
 
 MAINTAINER=	oliver.pntr@gmail.com
 COMMENT=	Multi-platform, multi-architecture disassembly framework
@@ -9,19 +10,18 @@ WWW=		http://capstone-engine.org/
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 
-CONFLICTS=	capstone4
-
 USES=		cpe gmake
 CPE_VENDOR=	${PORTNAME}-engine
-USE_LDCONFIG=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	aquynh
+USE_LDCONFIG=	yes
 
 MAKE_ENV+=	INSTALL_BIN="${INSTALL_PROGRAM}" \
 		INSTALL_DATA="${INSTALL_DATA}" \
 		INSTALL_LIB="${INSTALL_LIB}"
-
 TEST_ENV=	${MAKE_ENV} LD_LIBRARY_PATH=${STAGEDIR}${PREFIX}/lib
 TEST_TARGET=	check
 
+CONFLICTS=	capstone capstone4
+
 .include <bsd.port.mk>



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