Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 30 Aug 2019 13:08:19 +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: r510271 - head/www/minio
Message-ID:  <201908301308.x7UD8JaF022288@repo.freebsd.org>

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

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

Modified:
  head/www/minio/Makefile

Modified: head/www/minio/Makefile
==============================================================================
--- head/www/minio/Makefile	Fri Aug 30 13:02:05 2019	(r510270)
+++ head/www/minio/Makefile	Fri Aug 30 13:08:19 2019	(r510271)
@@ -9,12 +9,12 @@ COMMENT=	Amazon S3 compatible object storage server
 
 LICENSE=	APACHE20
 
-USES=		compiler go
+USES=		compiler go:modules
 
 USE_GITHUB=	yes
 GHTAG=		RELEASE.2019-06-15T23-07-18Z
 COMMIT_ID=	99bf4d0c429f04dbd013ba98840d07b759ae1702
-GH_TUPLE=	${PORTNAME}:${PORTNAME}:${GHTAG}:DEFAULT/src/github.com/${PORTNAME}/${PORTNAME} \
+GH_TUPLE=	${PORTNAME}:${PORTNAME}:${GHTAG}:DEFAULT \
 		Azure:azure-sdk-for-go:v27.0.0:azure_azure_sdk_for_go/vendor/github.com/Azure/azure-sdk-for-go \
 		Azure:go-autorest:v11.7.0:azure_go_autorest/vendor/github.com/Azure/go-autorest \
 		DataDog:zstd:v1.4.0:datadog_zstd/vendor/github.com/DataDog/zstd \
@@ -140,6 +140,13 @@ GH_TUPLE=	${PORTNAME}:${PORTNAME}:${GHTAG}:DEFAULT/src
 		tidwall:sjson:v1.0.4:tidwall_sjson/vendor/github.com/tidwall/sjson \
 		uber-go:atomic:v1.3.2:uber_go_atomic/vendor/go.uber.org/atomic \
 		valyala:tcplisten:ceec8f93295a:valyala_tcplisten/vendor/github.com/valyala/tcplisten
+
+GO_BUILDFLAGS=	-ldflags='\
+		-X github.com/minio/minio/cmd.Version=${GH_TAGNAME:C/RELEASE\.//:C|(..)-(..)-(..)Z|\1:\2:\3Z|} \
+		-X github.com/minio/minio/cmd.ReleaseTag=${GH_TAGNAME} \
+		-X github.com/minio/minio/cmd.CommitID=${COMMIT_ID} \
+		-X github.com/minio/minio/cmd.GOPATH=${WRKSRC} -s -w'
+
 PLIST_FILES=	bin/${PORTNAME}
 USE_RC_SUBR=	minio
 
@@ -148,13 +155,5 @@ GROUPS=		minio
 
 SUB_LIST=	GROUP="${GROUPS}" \
 		USER="${USERS}"
-
-do-build:
-	cd ${WRKSRC}/${GH_SUBDIR} ; \
-	${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} CGO_ENABLED=0 go build \
-		--ldflags '-X github.com/minio/minio/cmd.Version=${GH_TAGNAME:C/RELEASE\.//:C|(..)-(..)-(..)Z|\1:\2:\3Z|} -X github.com/minio/minio/cmd.ReleaseTag=${GH_TAGNAME} -X github.com/minio/minio/cmd.CommitID=${COMMIT_ID} -X github.com/minio/minio/cmd.GOPATH=${WRKSRC} -s -w' -o ${WRKSRC}/bin/minio
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>



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