Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 20 Nov 2020 09:19:29 +0000 (UTC)
From:      =?UTF-8?Q?Jean-S=c3=a9bastien_P=c3=a9dron?= <dumbbell@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r555753 - in head/net/concourse-fly: . files
Message-ID:  <202011200919.0AK9JTKw008514@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dumbbell
Date: Fri Nov 20 09:19:29 2020
New Revision: 555753
URL: https://svnweb.freebsd.org/changeset/ports/555753

Log:
  net/concourse-fly: Update to 6.7.1
  
  `patch-vendor_golang.org_x_sys_unix_ztypes__freebsd__arm64.go` is removed
  because it was integrated upstream.
  
  Thanks to dmgk@, the Makefile is switched to use USES=go:modules and cleaned up
  in preparation for the upcoming Go 1.16 release; see PR 251256 [1].
  
  PR:		251256
  Submitted by:	dmgk@ [1]

Deleted:
  head/net/concourse-fly/files/patch-vendor_golang.org_x_sys_unix_ztypes__freebsd__arm64.go
Modified:
  head/net/concourse-fly/Makefile
  head/net/concourse-fly/distinfo

Modified: head/net/concourse-fly/Makefile
==============================================================================
--- head/net/concourse-fly/Makefile	Fri Nov 20 08:57:10 2020	(r555752)
+++ head/net/concourse-fly/Makefile	Fri Nov 20 09:19:29 2020	(r555753)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	concourse
-PORTVERSION=	5.7.2
+PORTVERSION=	6.7.1
 CATEGORIES=	net sysutils
 MASTER_SITES=	LOCAL/dumbbell/concourse/
 PKGNAMESUFFIX=	-fly
@@ -11,11 +11,11 @@ COMMENT=	CLI for Concourse
 
 LICENSE=	APACHE20
 
-GO_PKGNAME=	github.com/concourse/fly
-GO_BUILDFLAGS+=	-mod=vendor \
-		-ldflags="-X github.com/concourse/concourse.Version=${PORTVERSION}"
+USES=		go:modules tar:xz
 
-USES=		go tar:xz
+GO_TARGET=	./cmd/concourse:fly
+GO_BUILDFLAGS=	-ldflags="-s -w -X github.com/concourse/concourse.Version=${PORTVERSION}"
+CGO_CFLAGS=	-I.
 
 CONFLICTS_INSTALL=	fly
 
@@ -42,22 +42,9 @@ PLIST_FILES=	bin/fly
 #
 #     make create-src-archive
 #
-# Because it doesn't match the project layout USES=go expects, we
-# override the post-extract and do-build targets to adapt the commands.
-#
-# In particular, we must pass `-mod=vendor` to go-install to be able to
-# use the third-party dependencies fetched with `go mod vendor`.
-
 # `fly` version is set by default to "0.0.0-dev" in version/Version.go.
 # Instead of patching the file, we use a linker flag to set the variable
 # to the port's version.
-
-post-extract:
-	@:
-
-do-build:
-	(cd ${WRKSRC}/fly; \
-		${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} 'install' ${GO_BUILDFLAGS})
 
 .PHONY: create-src-archive
 ARCHIVE_DIR=	${DISTDIR}/concourse-${PORTVERSION}

Modified: head/net/concourse-fly/distinfo
==============================================================================
--- head/net/concourse-fly/distinfo	Fri Nov 20 08:57:10 2020	(r555752)
+++ head/net/concourse-fly/distinfo	Fri Nov 20 09:19:29 2020	(r555753)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1575563043
-SHA256 (concourse-5.7.2.tar.xz) = 631bce5871a1656fad79d33c7f876265de2ced0a78b487f07d8b0039978bd7ab
-SIZE (concourse-5.7.2.tar.xz) = 7296208
+TIMESTAMP = 1605819756
+SHA256 (concourse-6.7.1.tar.xz) = 3fd2de566112b6822928197cffeebe9af4090159cebb22702313c2f9698d911d
+SIZE (concourse-6.7.1.tar.xz) = 8414876



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202011200919.0AK9JTKw008514>