diff options
| author | swills <swills@FreeBSD.org> | 2017-05-02 05:38:05 +0800 |
|---|---|---|
| committer | swills <swills@FreeBSD.org> | 2017-05-02 05:38:05 +0800 |
| commit | a107e0d67c60eafc68eca469f18051f3c4c0d1bd (patch) | |
| tree | 35e7050cfcdd58de13d458d7326252ebc2a2aa57 /www/minio | |
| parent | 6049840052819b7d267744b07295c8ea3489e233 (diff) | |
| download | freebsd-ports-gnome-a107e0d67c60eafc68eca469f18051f3c4c0d1bd.tar.gz freebsd-ports-gnome-a107e0d67c60eafc68eca469f18051f3c4c0d1bd.tar.zst freebsd-ports-gnome-a107e0d67c60eafc68eca469f18051f3c4c0d1bd.zip | |
www/minio: update to 2017.04.29.00.40.27
While here, avoid patching and requiring bash and gmake by calling 'go build'
directly.
Diffstat (limited to 'www/minio')
| -rw-r--r-- | www/minio/Makefile | 16 | ||||
| -rw-r--r-- | www/minio/distinfo | 10 | ||||
| -rw-r--r-- | www/minio/files/patch-Makefile | 24 | ||||
| -rw-r--r-- | www/minio/files/patch-buildscripts_gen-ldflags.go | 29 |
4 files changed, 10 insertions, 69 deletions
diff --git a/www/minio/Makefile b/www/minio/Makefile index 5c212f9a9919..c00f5459942b 100644 --- a/www/minio/Makefile +++ b/www/minio/Makefile @@ -2,7 +2,6 @@ PORTNAME= minio PORTVERSION= ${GH_TAGNAME:S/RELEASE.//:S/Z//:S/T/-/:S/-/./g} -PORTREVISION= 2 CATEGORIES= www MAINTAINER= swills@FreeBSD.org @@ -10,18 +9,14 @@ COMMENT= Amazon S3 compatible object storage server LICENSE= APACHE20 -BUILD_DEPENDS= go>=1.7:lang/go \ - bash:shells/bash +BUILD_DEPENDS= go>=1.7:lang/go -USES= compiler gmake +USES= compiler USE_GITHUB= yes -GH_TAGNAME= RELEASE.2017-03-16T21-50-32Z +GH_TAGNAME= RELEASE.2017-04-29T00-40-27Z GH_SUBDIR= src/github.com/${PORTNAME}/${PORTNAME} -GH_TUPLE= \ - minio:mc:RELEASE.2017-02-06T20-16-19Z:mc/src/github.com/minio/mc \ - hashicorp:go-version:03c5bf6:go_version/src/github.com/hashicorp/go-version -MAKE_ENV= GOPATH=${WRKSRC} GOROOT=${LOCALBASE}/go +COMMIT_ID= eb50175ad911d496bf583a599de89547f0c9be89 PLIST_FILES= bin/minio @@ -33,6 +28,9 @@ GROUPS= minio SUB_LIST= USER="${USERS}" \ GROUP="${GROUPS}" +do-build: + cd ${WRKSRC}/${GH_SUBDIR} ; GOPATH=${WRKSRC} 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}/src/github.com/${GH_ACCOUNT}/${PORTNAME}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} diff --git a/www/minio/distinfo b/www/minio/distinfo index 600c43e59a6a..52247303d4b1 100644 --- a/www/minio/distinfo +++ b/www/minio/distinfo @@ -1,7 +1,3 @@ -TIMESTAMP = 1489708692 -SHA256 (minio-minio-2017.03.16.21.50.32-RELEASE.2017-03-16T21-50-32Z_GH0.tar.gz) = 6c808407f87e8e02727061ae507909071ca5c6ef097a76a00e5d88ec74a7618c -SIZE (minio-minio-2017.03.16.21.50.32-RELEASE.2017-03-16T21-50-32Z_GH0.tar.gz) = 3867329 -SHA256 (minio-mc-RELEASE.2017-02-06T20-16-19Z_GH0.tar.gz) = 2ee46a826ff961683d8ed25e18598576a68bdebe79dcce9adf3219d34f9ec64c -SIZE (minio-mc-RELEASE.2017-02-06T20-16-19Z_GH0.tar.gz) = 1009728 -SHA256 (hashicorp-go-version-03c5bf6_GH0.tar.gz) = be08ba50bf40d1039e850b79763383d5230a0cfc65c4689c4d404bf5a4f42451 -SIZE (hashicorp-go-version-03c5bf6_GH0.tar.gz) = 11619 +TIMESTAMP = 1493556754 +SHA256 (minio-minio-2017.04.29.00.40.27-RELEASE.2017-04-29T00-40-27Z_GH0.tar.gz) = c7e4bd6b9345650aae0fb690b7298421f8c1a8e0667950749afef22a649fc67e +SIZE (minio-minio-2017.04.29.00.40.27-RELEASE.2017-04-29T00-40-27Z_GH0.tar.gz) = 3869278 diff --git a/www/minio/files/patch-Makefile b/www/minio/files/patch-Makefile deleted file mode 100644 index 2411494ceebb..000000000000 --- a/www/minio/files/patch-Makefile +++ /dev/null @@ -1,24 +0,0 @@ ---- Makefile.orig 2016-10-24 20:34:01 UTC -+++ Makefile -@@ -95,7 +95,7 @@ cyclo: - @GO15VENDOREXPERIMENT=1 ${GOPATH}/bin/gocyclo -over 65 cmd - @GO15VENDOREXPERIMENT=1 ${GOPATH}/bin/gocyclo -over 65 pkg - --build: getdeps verifiers $(UI_ASSETS) -+build: $(UI_ASSETS) - - deadcode: - @GO15VENDOREXPERIMENT=1 ${GOPATH}/bin/deadcode -@@ -131,10 +131,10 @@ pkg-list: - - install: gomake-all - --release: verifiers -+release: - @MINIO_RELEASE=RELEASE ./buildscripts/build.sh - --experimental: verifiers -+experimental: - @MINIO_RELEASE=EXPERIMENTAL ./buildscripts/build.sh - - clean: diff --git a/www/minio/files/patch-buildscripts_gen-ldflags.go b/www/minio/files/patch-buildscripts_gen-ldflags.go deleted file mode 100644 index 2eab0fd6fb53..000000000000 --- a/www/minio/files/patch-buildscripts_gen-ldflags.go +++ /dev/null @@ -1,29 +0,0 @@ ---- buildscripts/gen-ldflags.go.orig 2017-02-22 14:17:45.000000000 -0500 -+++ buildscripts/gen-ldflags.go 2017-03-16 16:57:45.209088000 -0500 -@@ -23,15 +23,14 @@ import ( - "os" - "os/exec" - "strings" -- "time" - ) - - func genLDFlags(version string) string { - var ldflagsStr string -- ldflagsStr = "-X github.com/minio/minio/cmd.Version=" + version -- ldflagsStr += " -X github.com/minio/minio/cmd.ReleaseTag=" + releaseTag(version) -- ldflagsStr += " -X github.com/minio/minio/cmd.CommitID=" + commitID() -- ldflagsStr += " -X github.com/minio/minio/cmd.ShortCommitID=" + commitID()[:12] -+ ldflagsStr = "-X github.com/minio/minio/cmd.Version=2017-03-16T21:50:32Z" -+ ldflagsStr += " -X github.com/minio/minio/cmd.ReleaseTag=RELEASE.2017-03-16T21-50-32Z" -+ ldflagsStr += " -X github.com/minio/minio/cmd.CommitID=78dbb5bf141b4ff8003b7e5ef9b665a147c465bc" -+ ldflagsStr += " -X github.com/minio/minio/cmd.ShortCommitID=78dbb5bf141b4" - ldflagsStr += " -X github.com/minio/minio/cmd.GOPATH=" + os.Getenv("GOPATH") - return ldflagsStr - } -@@ -67,5 +66,5 @@ func commitID() string { - } - - func main() { -- fmt.Println(genLDFlags(time.Now().UTC().Format(time.RFC3339))) -+ fmt.Println(genLDFlags("2017-03-16T21-50-32Z")) - } |