On 2017/10/09 03:34, Joel Sing wrote:
> Upstream is providing a tarball of the release-branch.go1.4 git branch,
> which contains minor fixes to keep Go 1.4 building on current platforms.
> Most of the patches that we currently have for lang/go-bootstrap have
> been committed upstream - one of these is already in the go1.4
> release tarball that is available, while some have been committed and
> will appear in the next tarball that's created:
>
> https://github.com/golang/go/issues/20672
>
> Switch to the go1.4 release tarball so that we can drop a patch now and
> in the future, drop most of the remaining patches.
>
> ok?
before, $ make show=PKGNAMES
go-bootstrap-1.4.3p4
after, $ make show=PKGNAMES
go-bootstrap-20170531
ok either way but I wonder if it would be better to keep 1.4 in the
package name (e.g. something like 1.4.20170531)?
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/lang/go-bootstrap/Makefile,v
> retrieving revision 1.6
> diff -u -p -u -p -r1.6 Makefile
> --- Makefile 8 Oct 2017 15:40:56 -0000 1.6
> +++ Makefile 8 Oct 2017 16:28:57 -0000
> @@ -4,11 +4,9 @@ ONLY_FOR_ARCHS = ${GO_ARCHS}
>
> COMMENT = Go programming language
>
> -VERSION = 1.4.3
> -EXTRACT_SUFX = .src.tar.gz
> -DISTNAME = go${VERSION}
> +VERSION = 20170531
> +DISTNAME = go1.4-bootstrap-${VERSION}
> PKGNAME = go-bootstrap-${VERSION}
> -REVISION = 4
> CATEGORIES = lang
>
> HOMEPAGE = https://golang.org/
> @@ -22,7 +20,7 @@ PERMIT_DISTFILES_FTP = bootstrap only
>
> WANTLIB = c m pthread
>
> -MASTER_SITES = https://golang.org/dl/
> +MASTER_SITES = https://storage.googleapis.com/golang/
>
> BUILD_DEPENDS = shells/bash
>
> @@ -84,7 +82,7 @@ do-install:
> ${INSTALL_PROGRAM} -p ${WRKDIST}/bin/go{,fmt} ${GOROOT}/bin
>
> @cd ${WRKDIST} && \
> - find . ! -name .hg\* -type f -maxdepth 1 \
> + find . ! -name .git\* ! -name .hg\* -type f -maxdepth 1 \
> -exec ${INSTALL_DATA} -p {} \
> ${GOROOT} \;
>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/lang/go-bootstrap/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 distinfo
> --- distinfo 4 Dec 2015 17:19:18 -0000 1.1.1.1
> +++ distinfo 8 Oct 2017 16:28:57 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (go1.4.3.src.tar.gz) = mUf8cFsLhBtZOMSLItwz6WR+wHUrrmblAnjfTyP2SVk=
> -SIZE (go1.4.3.src.tar.gz) = 10875170
> +SHA256 (go1.4-bootstrap-20170531.tar.gz) =
> SfgG9mdiB3hht95wgfWGmVlAdy0p1MRQaME0RBp0P6I=
> +SIZE (go1.4-bootstrap-20170531.tar.gz) = 11315348
> Index: patches/patch-src_time_time_test_go
> ===================================================================
> RCS file: patches/patch-src_time_time_test_go
> diff -N patches/patch-src_time_time_test_go
> --- patches/patch-src_time_time_test_go 8 Oct 2017 15:40:56 -0000
> 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,14 +0,0 @@
> -$OpenBSD: patch-src_time_time_test_go,v 1.1 2017/10/08 15:40:56 jsing Exp $
> -
> -Index: src/time/time_test.go
> ---- src/time/time_test.go.orig
> -+++ src/time/time_test.go
> -@@ -915,6 +915,8 @@ func TestCountMallocs(t *testing.T) {
> - }
> -
> - func TestLoadFixed(t *testing.T) {
> -+ t.Skip("skipping test for Go 1.4; Issue 17545")
> -+
> - // Issue 4064: handle locations without any zone transitions.
> - loc, err := LoadLocation("Etc/GMT+1")
> - if err != nil {
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/lang/go-bootstrap/pkg/PLIST,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 PLIST
> --- pkg/PLIST 4 Jun 2017 17:50:16 -0000 1.2
> +++ pkg/PLIST 8 Oct 2017 16:28:58 -0000
> @@ -375,11 +375,47 @@ go/bootstrap/misc/chrome/gophertool/goph
> go/bootstrap/misc/chrome/gophertool/manifest.json
> go/bootstrap/misc/chrome/gophertool/popup.html
> go/bootstrap/misc/chrome/gophertool/popup.js
> +go/bootstrap/misc/dashboard/
> +go/bootstrap/misc/dashboard/codereview/
> +go/bootstrap/misc/dashboard/codereview/app.yaml
> +go/bootstrap/misc/dashboard/codereview/cron.yaml
> +go/bootstrap/misc/dashboard/codereview/dashboard/
> +go/bootstrap/misc/dashboard/codereview/dashboard/cl.go
> +go/bootstrap/misc/dashboard/codereview/dashboard/front.go
> +go/bootstrap/misc/dashboard/codereview/dashboard/gc.go
> +go/bootstrap/misc/dashboard/codereview/dashboard/mail.go
> +go/bootstrap/misc/dashboard/codereview/dashboard/people.go
> +go/bootstrap/misc/dashboard/codereview/index.yaml
> +go/bootstrap/misc/dashboard/codereview/queue.yaml
> +go/bootstrap/misc/dashboard/codereview/static/
> +go/bootstrap/misc/dashboard/codereview/static/gopherstamp.jpg
> +go/bootstrap/misc/dashboard/codereview/static/icon.png
> go/bootstrap/misc/editors
> go/bootstrap/misc/git/
> go/bootstrap/misc/git/pre-commit
> go/bootstrap/misc/linkcheck/
> go/bootstrap/misc/linkcheck/linkcheck.go
> +go/bootstrap/misc/makerelease/
> +go/bootstrap/misc/makerelease/darwin/
> +go/bootstrap/misc/makerelease/darwin/Distribution
> +go/bootstrap/misc/makerelease/darwin/Resources/
> +go/bootstrap/misc/makerelease/darwin/Resources/bg.png
> +go/bootstrap/misc/makerelease/darwin/etc/
> +go/bootstrap/misc/makerelease/darwin/etc/paths.d/
> +go/bootstrap/misc/makerelease/darwin/etc/paths.d/go
> +go/bootstrap/misc/makerelease/darwin/scripts/
> +go/bootstrap/misc/makerelease/darwin/scripts/postinstall
> +go/bootstrap/misc/makerelease/darwin/scripts/preinstall
> +go/bootstrap/misc/makerelease/makerelease.go
> +go/bootstrap/misc/makerelease/windows/
> +go/bootstrap/misc/makerelease/windows/LICENSE.rtf
> +go/bootstrap/misc/makerelease/windows/README.txt
> +go/bootstrap/misc/makerelease/windows/images/
> +go/bootstrap/misc/makerelease/windows/images/Banner.jpg
> +go/bootstrap/misc/makerelease/windows/images/Dialog.jpg
> +go/bootstrap/misc/makerelease/windows/images/DialogLeft.jpg
> +go/bootstrap/misc/makerelease/windows/images/gopher.ico
> +go/bootstrap/misc/makerelease/windows/installer.wxs
> go/bootstrap/misc/nacl/
> go/bootstrap/misc/nacl/README
> go/bootstrap/misc/nacl/go_nacl_386_exec
> @@ -3446,6 +3482,7 @@ go/bootstrap/src/syscall/syscall_bsd_tes
> go/bootstrap/src/syscall/syscall_darwin.go
> go/bootstrap/src/syscall/syscall_darwin_386.go
> go/bootstrap/src/syscall/syscall_darwin_amd64.go
> +go/bootstrap/src/syscall/syscall_darwin_test.go
> go/bootstrap/src/syscall/syscall_dragonfly.go
> go/bootstrap/src/syscall/syscall_dragonfly_386.go
> go/bootstrap/src/syscall/syscall_dragonfly_amd64.go
>
