Attachment 187034 Details for Bug 222886 – Minio port diff

[patch] Minio port diff

minio.diff (text/plain), 5.32 KB, created by John Hixson on 2017-10-10 00:07:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Hixson

Created: 2017-10-10 00:07:29 UTC

Size: 5.32 KB

patch

obsolete

>diff -urN www/minio/Makefile www/minio/Makefile
>--- www/minio/Makefile	2017-05-05 04:49:33.000000000 -0700
>+++ www/minio/Makefile	2017-10-09 17:01:52.044163000 -0700
>@@ -1,4 +1,4 @@
>-# $FreeBSD: head/www/minio/Makefile 440149 2017-05-05 11:49:33Z swills $
>+# $FreeBSD: head/www/minio/Makefile 437792 2017-04-05 15:12:19Z swills $
> 
> PORTNAME=	minio
> PORTVERSION=	${GH_TAGNAME:S/RELEASE.//:S/Z//:S/T/-/:S/-/./g}
>@@ -9,14 +9,17 @@
> 
> LICENSE=	APACHE20
> 
>-BUILD_DEPENDS=	go>=1.7:lang/go
>+BUILD_DEPENDS=	go>=1.7:lang/go \
>+		bash:shells/bash
> 
> USES=		compiler
> 
> USE_GITHUB=	yes
>-GH_TAGNAME=	RELEASE.2017-05-05T01-14-51Z
>+GH_TAGNAME=	RELEASE.2017-09-29T19-16-56Z
> GH_SUBDIR=	src/github.com/${PORTNAME}/${PORTNAME}
>-COMMIT_ID=	40985cc4e3eec06b7ea82dc34c8d907fd2e7aa12
>+GH_TUPLE=	minio:mc:RELEASE.2017-06-15T03-38-43Z: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
> 
> PLIST_FILES=	bin/minio
> 
>@@ -29,10 +32,12 @@
> 		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
>+	@cd ${WRKSRC}/src/github.com/minio/minio; \
>+	${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -v -x \
>+		-ldflags "-X main.GitDescribe=${DISTVERSIONFULL}" -o bin/minio
> 
> do-install:
>-	${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
>+	${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
> 
> .include <bsd.port.pre.mk>
> 
>diff -urN www/minio/distinfo www/minio/distinfo
>--- www/minio/distinfo	2017-05-05 04:49:33.000000000 -0700
>+++ www/minio/distinfo	2017-10-09 16:53:27.314684000 -0700
>@@ -1,3 +1,7 @@
>-TIMESTAMP = 1493952231
>-SHA256 (minio-minio-2017.05.05.01.14.51-RELEASE.2017-05-05T01-14-51Z_GH0.tar.gz) = 6f36a82f075ffbaf2a69b0e3f42820d9576a871160aa4484d6323945a6bc84a1
>-SIZE (minio-minio-2017.05.05.01.14.51-RELEASE.2017-05-05T01-14-51Z_GH0.tar.gz) = 4576742
>+TIMESTAMP = 1507593207
>+SHA256 (minio-minio-2017.09.29.19.16.56-RELEASE.2017-09-29T19-16-56Z_GH0.tar.gz) = 9d8bdb8c7cf177bb8ed07b1a4b9f3c1effa789d1446a47a6e905faedfc4302c0
>+SIZE (minio-minio-2017.09.29.19.16.56-RELEASE.2017-09-29T19-16-56Z_GH0.tar.gz) = 6977013
>+SHA256 (minio-mc-RELEASE.2017-06-15T03-38-43Z_GH0.tar.gz) = 5639b780e1cfbc11d70ed41c74008232d830185fc55edbe53e349496320829f5
>+SIZE (minio-mc-RELEASE.2017-06-15T03-38-43Z_GH0.tar.gz) = 1037132
>+SHA256 (hashicorp-go-version-03c5bf6_GH0.tar.gz) = be08ba50bf40d1039e850b79763383d5230a0cfc65c4689c4d404bf5a4f42451
>+SIZE (hashicorp-go-version-03c5bf6_GH0.tar.gz) = 11619
>diff -urN www/minio/files/minio.in www/minio/files/minio.in
>--- www/minio/files/minio.in	2017-05-05 04:49:33.000000000 -0700
>+++ www/minio/files/minio.in	2017-08-28 17:36:20.693386000 -0700
>@@ -19,8 +19,7 @@
> # minio_group (str):            Set to "minio" by default.
> #                               Set it to group to run minio under
> # minio_logfile (str):          Set to "/var/log/minio.log" by default.
>-#                               Set it to file where stdout/stderr are logged.
>-#
>+#                          
> 
> . /etc/rc.subr
> 
>@@ -54,9 +53,9 @@
> 		install -d -o "${minio_user}" -g "${minio_group}" "${minio_config}"
> 	fi
> 
>-        if [ ! -e "${minio_logfile}" ]; then
>-                install -o "${minio_user}" -g "${minio_group}" "/dev/null" "${minio_logfile}"
>-        fi
>+	if [ ! -e "${minio_logfile}" ]; then
>+		install -o "${minio_user}" -g "${minio_group}" "/dev/null" "${minio_logfile}"
>+	fi
> 
> 	for disk in "${minio_disks}"; do
> 		if [ ! -d "${disk}" ]; then
>diff -urN www/minio/files/patch-Makefile www/minio/files/patch-Makefile
>--- www/minio/files/patch-Makefile	1969-12-31 16:00:00.000000000 -0800
>+++ www/minio/files/patch-Makefile	2017-10-09 17:00:41.511288000 -0700
>@@ -0,0 +1,15 @@
>+--- Makefile.orig	2017-09-29 19:08:23 UTC
>++++ Makefile
>+@@ -93,10 +93,10 @@ install: build
>+ 	@cp $(PWD)/minio $(GOPATH)/bin/minio
>+ 	@echo "Check 'minio -h' for help."
>+ 
>+-release: verifiers
>++release:
>+ 	@MINIO_RELEASE=RELEASE ./buildscripts/build.sh
>+ 
>+-experimental: verifiers
>++experimental:
>+ 	@MINIO_RELEASE=EXPERIMENTAL ./buildscripts/build.sh
>+ 
>+ clean:
>diff -urN www/minio/files/patch-cmd_build-constants.go www/minio/files/patch-cmd_build-constants.go
>--- www/minio/files/patch-cmd_build-constants.go	1969-12-31 16:00:00.000000000 -0800
>+++ www/minio/files/patch-cmd_build-constants.go	2017-10-09 17:00:41.514633000 -0700
>@@ -0,0 +1,21 @@
>+--- cmd/build-constants.go.orig	2017-09-29 19:08:23 UTC
>++++ cmd/build-constants.go
>+@@ -23,14 +23,14 @@ var (
>+ 	GOPATH = ""
>+ 
>+ 	// Go get development tag.
>+-	goGetTag = "DEVELOPMENT.GOGET"
>++	goGetTag = "RELEASE.2017-09-29T19-16-56Z"
>+ 
>+ 	// Version - version time.RFC3339.
>+-	Version = goGetTag
>++	Version = "2017-09-29T19:16:56Z"
>+ 	// ReleaseTag - release tag in TAG.%Y-%m-%dT%H-%M-%SZ.
>+-	ReleaseTag = goGetTag
>++	ReleaseTag = "RELEASE.2017-09-29T19-16-56Z"
>+ 	// CommitID - latest commit id.
>+-	CommitID = goGetTag
>++	CommitID = "aeafe668d8b6d25caac671d59e2b0f0473ce35d0"
>+ 	// ShortCommitID - first 12 characters from CommitID.
>+ 	ShortCommitID = CommitID[:12]
>+ )

Actions: View | Diff

Attachments on bug 222886: 187034