Date: Fri, 4 Aug 2023 15:24:10 GMT From: Dmitri Goutnik <dmgk@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: fedeb2272ac0 - main - lang/go118: Remove outdated port Message-ID: <202308041524.374FOACL025469@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by dmgk: URL: https://cgit.FreeBSD.org/ports/commit/?id=fedeb2272ac06eddf4ce3f6c757c278d2e2147c3 commit fedeb2272ac06eddf4ce3f6c757c278d2e2147c3 Author: Dmitri Goutnik <dmgk@FreeBSD.org> AuthorDate: 2023-08-04 15:19:47 +0000 Commit: Dmitri Goutnik <dmgk@FreeBSD.org> CommitDate: 2023-08-04 15:22:04 +0000 lang/go118: Remove outdated port go118 is unsupported by upstream since 2023-02-14. --- MOVED | 1 + Mk/Uses/go.mk | 2 +- lang/Makefile | 1 - lang/go118/Makefile | 20 -------------------- lang/go118/distinfo | 15 --------------- .../patch-src_cmd_go_internal_modload_vendor.go | 11 ----------- 6 files changed, 2 insertions(+), 48 deletions(-) diff --git a/MOVED b/MOVED index a90370b21abe..28b85d795d78 100644 --- a/MOVED +++ b/MOVED @@ -7778,3 +7778,4 @@ games/cockatrice||2023-07-31|Has expired: Upstream releases haven't occured for graphics/blender-lts29||2023-07-31|Has expired: Deprecated upstream x11-fm/wcmcommander||2023-07-31|Has expired: Abandoned upstream x11/cde-24|x11/cde-25|2023-08-01|Has expired: Desupported by upstream +lang/go118||2023-08-04|Upstream support ended diff --git a/Mk/Uses/go.mk b/Mk/Uses/go.mk index 863f375cfdf4..3e056ea26d84 100644 --- a/Mk/Uses/go.mk +++ b/Mk/Uses/go.mk @@ -60,7 +60,7 @@ _INCLUDE_USES_GO_MK= yes # When adding a version, please keep the comment in # Mk/bsd.default-versions.mk in sync. -GO_VALID_VERSIONS= 1.18 1.19 1.20 1.21-devel +GO_VALID_VERSIONS= 1.19 1.20 1.21-devel # Check arguments sanity . if !empty(go_ARGS:N[1-9].[0-9][0-9]:N*-devel:Nmodules:Nno_targets:Nrun) diff --git a/lang/Makefile b/lang/Makefile index 52282ac27e5f..cfe970787265 100644 --- a/lang/Makefile +++ b/lang/Makefile @@ -121,7 +121,6 @@ SUBDIR += gnustep-base SUBDIR += go SUBDIR += go-devel - SUBDIR += go118 SUBDIR += go119 SUBDIR += go120 SUBDIR += gomacro diff --git a/lang/go118/Makefile b/lang/go118/Makefile deleted file mode 100644 index 9931c66c6fa1..000000000000 --- a/lang/go118/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -DISTVERSION= 1.18.10 -# Always set PORTREVISION explicitly as otherwise they are inherited from lang/go-devel -PORTREVISION= 1 -MASTER_SITES= https://golang.org/dl/ \ - https://github.com/dmgk/go-bootstrap/releases/download/${BOOTSTRAP_TAG}/:bootstrap \ - LOCAL/dmgk:bootstrap -DISTFILES= go${DISTVERSION}.src.tar.gz \ - go-${OPSYS:tl}-${GOARCH_${ARCH}}${GOARM_${ARCH}}-${BOOTSTRAP_TAG}.tar.xz:bootstrap - -# Avoid conflicting patch files -PATCHFILES= - -COMMENT= Go programming language - -MASTERDIR= ${.CURDIR}/../go-devel -PATCHDIR= ${.CURDIR}/files -WRKSRC= ${WRKDIR}/go -DISTINFO_FILE= ${.CURDIR}/distinfo - -.include "${MASTERDIR}/Makefile" diff --git a/lang/go118/distinfo b/lang/go118/distinfo deleted file mode 100644 index f20d64d710f1..000000000000 --- a/lang/go118/distinfo +++ /dev/null @@ -1,15 +0,0 @@ -TIMESTAMP = 1675339561 -SHA256 (go1.18.10.src.tar.gz) = 9cedcca58845df0c9474ae00274c44a95c9dfaefb132fc59921c28c7c106f8e6 -SIZE (go1.18.10.src.tar.gz) = 22880022 -SHA256 (go-freebsd-arm64-go1.20.tar.xz) = 674e0a9bce8b64dcc085b000eb83ae880e96be1ee47dad6ec86c82dbe5550623 -SIZE (go-freebsd-arm64-go1.20.tar.xz) = 32640640 -SHA256 (go-freebsd-amd64-go1.20.tar.xz) = 170f612c4b8a59400f27d642aab37afa831fe2d6df3e7473dec2d4574a59a46c -SIZE (go-freebsd-amd64-go1.20.tar.xz) = 34684360 -SHA256 (go-freebsd-arm6-go1.20.tar.xz) = acf99dbb285c6d2b80e0abfe4bffd0d230516ea84d17be0d5bc1045809e3d33a -SIZE (go-freebsd-arm6-go1.20.tar.xz) = 33418476 -SHA256 (go-freebsd-arm7-go1.20.tar.xz) = 12dd61c802eada70380f0b4755656d82dbf228575c056775c682456380be5039 -SIZE (go-freebsd-arm7-go1.20.tar.xz) = 33346596 -SHA256 (go-freebsd-386-go1.20.tar.xz) = 34e888a37153270b33503a23885ea4c85ba4bd09849d2c937fc9d312c0f49983 -SIZE (go-freebsd-386-go1.20.tar.xz) = 35448892 -SHA256 (go-freebsd-riscv64-go1.20.tar.xz) = 010921013d24124ff31f4b1965456349547acf936572fc6e0bcf95a0542794bd -SIZE (go-freebsd-riscv64-go1.20.tar.xz) = 33807544 diff --git a/lang/go118/files/patch-src_cmd_go_internal_modload_vendor.go b/lang/go118/files/patch-src_cmd_go_internal_modload_vendor.go deleted file mode 100644 index 721bed32419f..000000000000 --- a/lang/go118/files/patch-src_cmd_go_internal_modload_vendor.go +++ /dev/null @@ -1,11 +0,0 @@ ---- src/cmd/go/internal/modload/vendor.go.orig 2020-12-17 16:03:19 UTC -+++ src/cmd/go/internal/modload/vendor.go -@@ -133,7 +133,7 @@ func checkVendorConsistency() { - readVendorList() - - pre114 := false -- if semver.Compare(index.goVersionV, "v1.14") < 0 { -+ if semver.Compare(index.goVersionV, "v1.14") < 0 || (os.Getenv("GO_NO_VENDOR_CHECKS") == "1" && len(vendorMeta) == 0) { - // Go versions before 1.14 did not include enough information in - // vendor/modules.txt to check for consistency. - // If we know that we're on an earlier version, relax the consistency check.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308041524.374FOACL025469>