git: 06216cd3cfbd - main - devel/app-builder: add CONFLICTS_INSTALL

From: Hiroki Tagato <tagattie_at_FreeBSD.org>
Date: Mon, 07 Oct 2024 21:23:26 UTC
The branch main has been updated by tagattie:

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

commit 06216cd3cfbdcaf324868c0f3bfab0051b5cf64f
Author:     Hiroki Tagato <tagattie@FreeBSD.org>
AuthorDate: 2024-10-07 21:21:42 +0000
Commit:     Hiroki Tagato <tagattie@FreeBSD.org>
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 <bsd.port.mk>