From nobody Mon Oct 07 21:23:26 2024 X-Original-To: dev-commits-ports-main@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 4XMsZk4Pgyz5YTqw; Mon, 07 Oct 2024 21:23:26 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XMsZk3BhXz57HC; Mon, 7 Oct 2024 21:23:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728336206; 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=9+ejRVOsxRZ8aCWDHp2BsibWnU/hT8fF/ujbJnnqCCE=; b=j1+z6hriMftSbBy1pNPggGepiV8nYSJKtOSLpEqoZvXouQjdsEDBxk8UGaaHjFGOmIoF1T PfGxlF9W827rNqrd30m+T+KJP93+zEwmtQ0KY9HDFJYifBlLuZj5dCo5fzL5WlsCf+pvKo TkfBhM/OOofGpksEaT/7tHHELAHx5f71ML0fZBxxSVoKnN8fA3CsZLpEgeNbGoOWAuEVb1 77Zqhp9+bsSlpcWc5wTiO3EM/qRXN9Poi1vhKW7/R0FyBgyT+hfEt1kAuRsIgQoEb0m30q 2dPRTwCKaYtCaZXjtnr8UK3QNIPjcgeH1EQwR08wNigEmQrEtpebsimUknXwWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728336206; 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=9+ejRVOsxRZ8aCWDHp2BsibWnU/hT8fF/ujbJnnqCCE=; b=KxYqbLv+7xr3oAcAqv+xkP9qoVB7eIktNRZYuwDrbeGQCGpE33giFLyORv4VydpOVeQtqf T1J611z1nSCh/qwNdo6JW535YVMwT9xcoWrs46mN7bAcdZ4ViyZMU3sj9sCxPpSCYp6Uma pEvMs0+ZHoSO8BfMt7N6LbdwCZG4eX9rtovIK8/EmeYoOPIHmpDRqosiJZE8IwetExe2yd Pqsjr3Avb31g0q/nDedgR4M/KY4OID+XrNiPpTRmbd9ocxHbPfUUHvYI9rcrr6EbsaDW9K VDdYvGKJR9vqvckNgTQpBI7wol1wFhQYt2k0fThIYLT0gCxoVQxCT4Km3VYrgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728336206; a=rsa-sha256; cv=none; b=BhCSLW+yqwpt5tpWuKXBRqqidaVBEylQXSJouYXkDdGrMj5SSheBECtLLsE52wZFy4TlQO roUuJcaYm5sjM3zM6S8+eW8PfmvPn+FrE9XdiguP/2VsavMSHjdWCUFarQFxLjCFCsEVyd 6Kd/PFcQw7tr+gElyEVBDuJG/53txIDo6ocKUYPK33xa9OsBL0OvAJE7uQmU5U7bezTZdB L4QNucypvZB8XY+7+erDXsY4aQvIgLGXt8pVC106+FcVLgn4JbidOESvCEJdApbioQTlJ1 Wufkxkv0pDHGkgB5QhR7Jeqgb26g3bv/7QfKXAnJQ/TgM+jHk/gFI4mkEzunUQ== 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 4XMsZk2QcPz12l2; Mon, 7 Oct 2024 21:23:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 497LNQqh064000; Mon, 7 Oct 2024 21:23:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 497LNQOB063997; Mon, 7 Oct 2024 21:23:26 GMT (envelope-from git) Date: Mon, 7 Oct 2024 21:23:26 GMT Message-Id: <202410072123.497LNQOB063997@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Hiroki Tagato Subject: git: 06216cd3cfbd - main - devel/app-builder: add CONFLICTS_INSTALL List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tagattie X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 06216cd3cfbdcaf324868c0f3bfab0051b5cf64f Auto-Submitted: auto-generated The branch main has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=06216cd3cfbdcaf324868c0f3bfab0051b5cf64f commit 06216cd3cfbdcaf324868c0f3bfab0051b5cf64f Author: Hiroki Tagato AuthorDate: 2024-10-07 21:21:42 +0000 Commit: Hiroki Tagato CommitDate: 2024-10-07 21:23:16 +0000 devel/app-builder: add CONFLICTS_INSTALL While here, make portclippy happy. --- devel/app-builder/Makefile | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/devel/app-builder/Makefile b/devel/app-builder/Makefile index d276dd6562f9..afd1eff84640 100644 --- a/devel/app-builder/Makefile +++ b/devel/app-builder/Makefile @@ -17,10 +17,9 @@ RUN_DEPENDS= opj_decompress:graphics/openjpeg USES= gmake go:modules USE_GITHUB= yes -USE_GITLAB= nodefault - GH_ACCOUNT= develar -GH_TUPLE= aclements:go-rabin:d0b643ea1a4c:aclements_go_rabin/vendor/github.com/aclements/go-rabin \ +GH_TUPLE= \ + aclements:go-rabin:d0b643ea1a4c:aclements_go_rabin/vendor/github.com/aclements/go-rabin \ alecthomas:kingpin:v2.2.6:alecthomas_kingpin/vendor/github.com/alecthomas/kingpin \ alecthomas:template:fb15b899a751:alecthomas_template/vendor/github.com/alecthomas/template \ alecthomas:units:c3de453c63f4:alecthomas_units/vendor/github.com/alecthomas/units \ @@ -62,10 +61,14 @@ GH_TUPLE= aclements:go-rabin:d0b643ea1a4c:aclements_go_rabin/vendor/github.com/a uber-go:zap:v1.10.0:uber_go_zap/vendor/go.uber.org/zap \ zieckey:goini:0da17d361d26:zieckey_goini/vendor/github.com/zieckey/goini +USE_GITLAB= nodefault GL_TUPLE= https://gitlab.howett.net:go:plist:591f970eefbbeb04d7b37f334a0c4c3256e32876:go_plist/vendor/howett.net/plist -PLIST_FILES= bin/${PORTNAME} +GO_BUILDFLAGS+= -ldflags="-s -w" + +CONFLICTS_INSTALL= ${PORTNAME}-devel +PLIST_FILES= bin/${PORTNAME} PORTDOCS= readme.md OPTIONS_DEFINE= DOCS @@ -74,7 +77,7 @@ pre-build: cd ${WRKSRC} && ${MAKE_CMD} assets post-install: - ${MKDIR} ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_MAN} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include