Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 30 Aug 2019 13:19:15 +0000 (UTC)
From:      Tobias Kortkamp <tobik@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r510273 - head/devel/lab
Message-ID:  <201908301319.x7UDJFQF028174@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tobik
Date: Fri Aug 30 13:19:15 2019
New Revision: 510273
URL: https://svnweb.freebsd.org/changeset/ports/510273

Log:
  devel/lab: Switch to USES=go:modules, fix build with go1.13
  
  - Remove custom targets
  
  ===>  Building for lab-0.16.0
  $GOPATH/go.mod exists but should not
  *** Error code 1
  
  PR:		239877
  Submitted by:	Dmitri Goutnik <dg@syrec.org>
  Approved by:	swills (maintainer timeout, 15 days)

Modified:
  head/devel/lab/Makefile

Modified: head/devel/lab/Makefile
==============================================================================
--- head/devel/lab/Makefile	Fri Aug 30 13:15:43 2019	(r510272)
+++ head/devel/lab/Makefile	Fri Aug 30 13:19:15 2019	(r510273)
@@ -11,7 +11,7 @@ COMMENT=	Lab makes it simple to work with repositories
 LICENSE=	UNLICENSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		go
+USES=		go:modules
 
 OPTIONS_DEFINE=	GIT_SUBVERSION
 
@@ -21,7 +21,7 @@ GIT_SUBVERSION_RUN_DEPENDS_OFF=	git:devel/git
 
 USE_GITHUB=	yes
 
-GH_TUPLE=	zaquestion:${PORTNAME}:${DISTVERSIONPREFIX}${PORTVERSION}:DEFAULT/src/github.com/zaquestion/${PORTNAME} \
+GH_TUPLE=	zaquestion:${PORTNAME}:${DISTVERSIONPREFIX}${PORTVERSION}:DEFAULT \
 		avast:retry-go:5469272a8171:avast_retry_go/vendor/github.com/avast/retry-go \
 		cpuguy83:go-md2man:v1.0.8:cpuguy83_go_md2man/vendor/github.com/cpuguy83/go-md2man \
 		davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
@@ -58,15 +58,9 @@ GH_TUPLE=	zaquestion:${PORTNAME}:${DISTVERSIONPREFIX}$
 		stretchr:testify:v1.2.2:stretchr_testify/vendor/github.com/stretchr/testify \
 		tcnksm:go-gitconfig:v0.1.2:tcnksm_go_gitconfig/vendor/github.com/tcnksm/go-gitconfig \
 		xanzy:go-gitlab:7bc4155e8bf8:xanzy_go_gitlab/vendor/github.com/xanzy/go-gitlab
-PLIST_FILES=	bin/lab
 
-do-build:
-	@cd ${WRKSRC}/src/github.com/zaquestion/${PORTNAME}; \
-		${SETENV} ${MAKE_ENV} CGO_ENABLED=0 ${BUILD_ENV} \
-		GOPATH=${WRKSRC} go build \
-		-ldflags "-X \"main.version=${PORTVERSION}\""
+GO_BUILDFLAGS=	-ldflags="-X main.version=${PORTVERSION}"
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
+PLIST_FILES=	bin/lab
 
 .include <bsd.port.mk>



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