svn commit: r451644 - in head: graphics/fly net/concourse-fly

[Jean-Sébastien Pédron]

Author: dumbbell
Date: Mon Oct  9 21:15:29 2017
New Revision: 451644
URL: https://svnweb.freebsd.org/changeset/ports/451644

Log:
  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)

Modified:
  head/graphics/fly/Makefile
  head/net/concourse-fly/Makefile

Modified: head/graphics/fly/Makefile
==============================================================================
--- head/graphics/fly/Makefile	Mon Oct  9 20:40:54 2017	(r451643)
+++ head/graphics/fly/Makefile	Mon Oct  9 21:15:29 2017	(r451644)
@@ -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

Modified: head/net/concourse-fly/Makefile
==============================================================================
--- head/net/concourse-fly/Makefile	Mon Oct  9 20:40:54 2017	(r451643)
+++ head/net/concourse-fly/Makefile	Mon Oct  9 21:15:29 2017	(r451644)
@@ -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,10 +53,8 @@ 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})
+		'install' -v -ldflags="-X github.com/concourse/fly/version.Version=${PORTVERSION}" ${GO_TARGET})
 
-.include <bsd.port.mk>
-
 .PHONY: create-src-archive
 ARCHIVE_DIR=	${DISTDIR}/concourse-${PORTVERSION}
 create-src-archive:
@@ -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>