Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 14 Sep 2018 00:23:32 +0000 (UTC)
From:      Danilo Egea Gondolfo <danilo@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r479751 - head/sysutils/minikube
Message-ID:  <201809140023.w8E0NW33063734@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danilo
Date: Fri Sep 14 00:23:32 2018
New Revision: 479751
URL: https://svnweb.freebsd.org/changeset/ports/479751

Log:
  - Use GO_* variables to simplify the Makefile

Modified:
  head/sysutils/minikube/Makefile

Modified: head/sysutils/minikube/Makefile
==============================================================================
--- head/sysutils/minikube/Makefile	Thu Sep 13 23:58:35 2018	(r479750)
+++ head/sysutils/minikube/Makefile	Fri Sep 14 00:23:32 2018	(r479751)
@@ -18,36 +18,32 @@ USES=		go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	kubernetes
-GH_SUBDIR=	src/k8s.io/${PORTNAME}
 
+GO_PKGNAME=	k8s.io/${PORTNAME}
+GO_TARGET=	${GO_PKGNAME}/cmd/${PORTNAME}
+GO_BUILDFLAGS=	-ldflags="-X k8s.io/minikube/pkg/version.version=v${PORTVERSION} \
+		-X k8s.io/minikube/pkg/version.isoVersion=v0.28.1 \
+		-X k8s.io/minikube/pkg/version.isoPath=minikube/iso \
+		-X k8s.io/kubernetes/pkg/version.gitCommit=fc32d2f3698e36b93322a3465f63a14e9f0eaead \
+		-X k8s.io/kubernetes/pkg/version.gitTreeState=clean \
+		-X k8s.io/kubernetes/pkg/version.gitVersion=v1.10.0 \
+		-X k8s.io/kubernetes/pkg/version.gitMajor=1 \
+		-X k8s.io/kubernetes/pkg/version.gitMinor=10 \
+		-X k8s.io/kubernetes/pkg/version.buildDate=$$(date +'%Y-%m-%dT%H:%M:%SZ') \
+		-X k8s.io/client-go/pkg/version.gitCommit=fc32d2f3698e36b93322a3465f63a14e9f0eaead \
+		-X k8s.io/client-go/pkg/version.gitTreeState=clean \
+		-X k8s.io/client-go/pkg/version.gitVersion=v1.10.0 \
+		-X k8s.io/client-go/pkg/version.gitMajor=1 \
+		-X k8s.io/client-go/pkg/version.gitMinor=10 \
+		-X k8s.io/client-go/pkg/version.buildDate=$$(date +'%Y-%m-%dT%H:%M:%SZ')"
+
 PLIST_FILES=	bin/${PORTNAME}
 
 SUB_FILES=	pkg-message
 
-do-build:
-	(cd ${WRKSRC}; ${LOCALBASE}/bin/go-bindata -nomemcopy -o pkg/minikube/assets/assets.go -pkg assets deploy/addons/...)
-	cd ${WRKSRC}/${GH_SUBDIR} && \
-		GOPATH=${WRKSRC} go build \
-		-ldflags="-X k8s.io/minikube/pkg/version.version=v${PORTVERSION} \
-			-X k8s.io/minikube/pkg/version.isoVersion=v0.28.1 \
-			-X k8s.io/minikube/pkg/version.isoPath=minikube/iso \
-			-X k8s.io/kubernetes/pkg/version.gitCommit=fc32d2f3698e36b93322a3465f63a14e9f0eaead \
-			-X k8s.io/kubernetes/pkg/version.gitTreeState=clean \
-			-X k8s.io/kubernetes/pkg/version.gitVersion=v1.10.0 \
-			-X k8s.io/kubernetes/pkg/version.gitMajor=1 \
-			-X k8s.io/kubernetes/pkg/version.gitMinor=10 \
-			-X k8s.io/kubernetes/pkg/version.buildDate=$$(date +'%Y-%m-%dT%H:%M:%SZ') \
-			-X k8s.io/client-go/pkg/version.gitCommit=fc32d2f3698e36b93322a3465f63a14e9f0eaead \
-			-X k8s.io/client-go/pkg/version.gitTreeState=clean \
-			-X k8s.io/client-go/pkg/version.gitVersion=v1.10.0 \
-			-X k8s.io/client-go/pkg/version.gitMajor=1 \
-			-X k8s.io/client-go/pkg/version.gitMinor=10 \
-			-X k8s.io/client-go/pkg/version.buildDate=$$(date +'%Y-%m-%dT%H:%M:%SZ')" \
-			./cmd/${PORTNAME}
-
-do-install:
-	${INSTALL_PROGRAM} \
-		${WRKSRC}/${PORTNAME} \
-		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+pre-build:
+	cd ${WRKSRC} && \
+		${LOCALBASE}/bin/go-bindata -nomemcopy \
+		-o pkg/minikube/assets/assets.go -pkg assets deploy/addons/...
 
 .include <bsd.port.mk>



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