graphics/fly, net/concourse-fly: Mark both ports as conflicting
They both install `bin/fly`. While here, fix errors reported by portlint(1) in net/concourse-fly: * Quote `install` to hint that the port is not using install(1) * Replace `rm` by ${RM} * Move `bsd.port.mk` include to the last line Reported by: rodrigo@ (ports conflicting)
This commit is contained in:
parent
0ca334a759
commit
aaf7a324d7
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=451644
@ -19,6 +19,8 @@ PLIST_FILES= bin/fly
|
||||
|
||||
OPTIONS_DEFINE= DOCS EXAMPLES
|
||||
|
||||
CONFLICTS_INSTALL= concourse-fly
|
||||
|
||||
do-build:
|
||||
cd ${WRKSRC} && ${CC} ${CFLAGS} -I${LOCALBASE}/include fly.c -o fly \
|
||||
-L${LOCALBASE}/lib -lgd
|
||||
|
@ -18,6 +18,8 @@ GO_PKGNAME= github.com/concourse/fly
|
||||
|
||||
USES= go tar:xz
|
||||
|
||||
CONFLICTS_INSTALL= fly
|
||||
|
||||
PLIST_FILES= bin/fly
|
||||
|
||||
STRIP= # stripping can break go binaries
|
||||
@ -51,9 +53,7 @@ post-extract:
|
||||
do-build:
|
||||
(cd ${WRKDIR}; \
|
||||
${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} \
|
||||
install -v -ldflags="-X github.com/concourse/fly/version.Version=${PORTVERSION}" ${GO_TARGET})
|
||||
|
||||
.include <bsd.port.mk>
|
||||
'install' -v -ldflags="-X github.com/concourse/fly/version.Version=${PORTVERSION}" ${GO_TARGET})
|
||||
|
||||
.PHONY: create-src-archive
|
||||
ARCHIVE_DIR= ${DISTDIR}/concourse-${PORTVERSION}
|
||||
@ -62,7 +62,9 @@ create-src-archive:
|
||||
git clone --recursive -b v${PORTVERSION} \
|
||||
https://github.com/concourse/concourse.git \
|
||||
${ARCHIVE_DIR}
|
||||
${FIND} ${ARCHIVE_DIR} \( -name ".git*" -o -name "testdata" \) -depth -exec rm -rf {} \;
|
||||
${FIND} ${ARCHIVE_DIR} \( -name ".git*" -o -name "testdata" \) -depth -exec ${RM} -rf {} \;
|
||||
${TAR} -cf - -C ${ARCHIVE_DIR:H} ${ARCHIVE_DIR:T} | ${XZ_CMD} > ${ARCHIVE_DIR}.tar.xz
|
||||
${RM} -rf ${ARCHIVE_DIR}
|
||||
${MAKE} makesum
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
Loading…
Reference in New Issue
Block a user