From owner-svn-ports-head@freebsd.org Mon Oct 9 21:15:30 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D4DD4E3C318; Mon, 9 Oct 2017 21:15:30 +0000 (UTC) (envelope-from dumbbell@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9B9C980374; Mon, 9 Oct 2017 21:15:30 +0000 (UTC) (envelope-from dumbbell@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v99LFT6a085935; Mon, 9 Oct 2017 21:15:29 GMT (envelope-from dumbbell@FreeBSD.org) Received: (from dumbbell@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v99LFTiu085933; Mon, 9 Oct 2017 21:15:29 GMT (envelope-from dumbbell@FreeBSD.org) Message-Id: <201710092115.v99LFTiu085933@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dumbbell set sender to dumbbell@FreeBSD.org using -f From: =?UTF-8?Q?Jean-S=c3=a9bastien_P=c3=a9dron?= Date: Mon, 9 Oct 2017 21:15:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r451644 - in head: graphics/fly net/concourse-fly X-SVN-Group: ports-head X-SVN-Commit-Author: dumbbell X-SVN-Commit-Paths: in head: graphics/fly net/concourse-fly X-SVN-Commit-Revision: 451644 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Oct 2017 21:15:31 -0000 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 - .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