From nobody Mon Jul 17 09:11:59 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4R4GYW4DlXz4n6h0; Mon, 17 Jul 2023 09:11:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R4GYW1ZrLz423H; Mon, 17 Jul 2023 09:11:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689585119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gAj9OcqwZLg7x7h5EM3yudlhlglPfWm4k4VnuSID3o8=; b=emBNPFTz5LPPIV2m2GqZykjjQsKzshDYSgeFC7TZ+jM/HyqETMx6ymmyCnoD7yevD2vonk 191p6JvkEj9CPYsJogAOQECHor7MOu3+6cB4ln0PvGOE+Clvu3EqrPsoZQo0+d/wFD0ZAh KzGbcndkaKuDoITl02oYkV8ffJ/keoTffKDDoEzLXG/ra3t1WM5B6nQYRygcpNxK8oLnPg gOo/MEqDfYU6EWwF6Uo3O23gm4dQunAEzJIF27OuWuB1+F5IsvfPdKG56h50DLyMbdhmPD sNlc6ll14fra5vquobx2OUcqwGw+PfeHekYJxi9FSWeuRa6o6sMh6Gl6eXpXWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689585119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gAj9OcqwZLg7x7h5EM3yudlhlglPfWm4k4VnuSID3o8=; b=AnxuM8MKcCVI7rvKJPc4iXhtsRQsg7qr+zr1wA3SjWPqirdOihfUFNfKwpodHQkwpUI49r Hg1x6x2d8uIE12SoM+07I/nRm/eBe+pnvEbsEAteaoc30h8ftwke/5slFQ+0LnvxipXbCv +IZQ1DD0pmfDwk5Fbs0Vqy0imqIuCUF+p54c6PkfPuqObB6MAdhG+bCFzRrXhmtfo7GhIb G9gK8L1BVY5L6m9V0nkPXR82MQlVAyZOS2XYuXkFzeO2NrXtdonpAusZD2Nos4QFYo3K2I mzn0kU4a/UOfE1pOWzsrn8ps6o7XugLfIkLQRCVPUMgw33pauFIvFrth3x4nJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689585119; a=rsa-sha256; cv=none; b=awC9rQ6EOqaV8kp+wmXOmwqvjuOftsZuNRsIviMKJa+XNOQT8k0bDmHoMUJ5NewXQKeZIk NbS3tYPAVcrdlOWuU0TwLdMRaTdjLjlSBgtL8k3pxEDXlS8Sz7hD0eOVL7+uBUVUEhs3Cn dKKM2BD3V5AtFIzsEovUSlW1wx4FBB8/LXzuqlY2UuHBMew1e94s6NAlAPi7bP78ea+32t WGnetYo/760NxKcxbwOTky+528alAktPtvRKGM2N8UoBcm7HB5GLCY1qqc3UQltY62gCjT Rpfynhamn0Lg45gVlx/vS7l5CuJzHuALEl87OLWbpCzwiahkYJ2LlfmeErsAuw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R4GYW0hHDzJNH; Mon, 17 Jul 2023 09:11:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36H9BxYO033893; Mon, 17 Jul 2023 09:11:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36H9Bxwb033892; Mon, 17 Jul 2023 09:11:59 GMT (envelope-from git) Date: Mon, 17 Jul 2023 09:11:59 GMT Message-Id: <202307170911.36H9Bxwb033892@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 99da75e7dbda - main - devel/capstone3: Fix pkgbase conflict List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 99da75e7dbda4a7905f910f6e99122f6a1b0512a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=99da75e7dbda4a7905f910f6e99122f6a1b0512a commit 99da75e7dbda4a7905f910f6e99122f6a1b0512a Author: Muhammad Moinur Rahman AuthorDate: 2023-07-17 08:28:58 +0000 Commit: Muhammad Moinur Rahman 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