add node15

2026-04-10 02:21:15 +02:00 · 2022-02-23 14:08:22 +02:00
parent de71356408
commit 37c8197f09
6 changed files with 88 additions and 26 deletions
--- a/Mk/Uses/go.mk
+++ b/Mk/Uses/go.mk
@@ -1,5 +1,3 @@
-# $FreeBSD: head/Mk/Uses/go.mk 531678 2020-04-14 12:52:02Z dmgk $
-#
 # This file contains logic to ease porting of Go binaries using the
 # `go` command.
 #
@@ -19,6 +17,11 @@
 #
 # You can set the following variables to control the process.
 #
+# GO_MODULE
+#	The name of the module as specified by "module" directive in go.mod.
+#	In most cases, this is the only requred variable for ports that
+#	use Go modules.
+#
 # GO_PKGNAME
 #	The name of the package when building in GOPATH mode.  This
 #	is the directory that will be created in ${GOPATH}/src.  If not set
@@ -55,7 +58,7 @@
 #
 #	This variable must not be set by individual ports!
 #
-# MAINTAINER: dmgk@FreeBSD.org
+# MAINTAINER: ports@FreeBSD.org

 .if !defined(_INCLUDE_USES_GO_MK)
 _INCLUDE_USES_GO_MK=	yes
@@ -79,7 +82,7 @@ GO_PKGNAME=	${PORTNAME}
 GO_TARGET?=	${GO_PKGNAME}
 GO_TESTTARGET?=	./...

-GO_BUILDFLAGS+=	-v -buildmode=exe
+GO_BUILDFLAGS+=	-v -buildmode=exe -trimpath
 .if !defined(WITH_DEBUG) && empty(GO_BUILDFLAGS:M-ldflags*)
 GO_BUILDFLAGS+=	-ldflags=-s
 .endif
@@ -93,6 +96,9 @@ CGO_LDFLAGS+=	-L${LOCALBASE}/lib
 GOARM?=		${ARCH:C/armv//}
 .endif

+GO_GOPROXY?=	https://proxy.golang.org
+GO_GOSUMDB?=	sum.golang.org
+
 # Read-only variables

 GO_CMD=		${LOCALBASE}/bin/go
@@ -105,14 +111,35 @@ GO_ENV+=	CGO_ENABLED=${CGO_ENABLED} \
 .if ${go_ARGS:Mmodules}
 GO_BUILDFLAGS+=	-mod=vendor
 GO_TESTFLAGS+=	-mod=vendor
+GO_GOPATH=	${DISTDIR}/go/${PKGORIGIN:S,/,_,g}
 GO_WRKSRC=	${WRKSRC}
-GO_ENV+=	GOPATH="" \
+GO_ENV+=	GOPATH="${GO_GOPATH}" \
 		GOBIN="${GO_WRKDIR_BIN}" \
-		GO_NO_VENDOR_CHECKS=1
+		GO111MODULE=on \
+		GOFLAGS=-modcacherw \
+		GOSUMDB=${GO_GOSUMDB}
+.  if defined(GO_MODULE)
+GO_MODNAME=	${GO_MODULE:C/^([^@]*)(@([^@]*)?)/\1/}
+GO_MODVERSION=	${GO_MODULE:C/^([^@]*)(@([^@]*)?)/\2/:M@*:S/^@//:S/^$/${DISTVERSIONFULL}/}
+GO_MODFILE=	${GO_MODVERSION}.mod
+GO_DISTFILE=	${GO_MODVERSION}.zip
+DIST_SUBDIR=	go/${PKGORIGIN:S,/,_,g}/${DISTNAME}
+MASTER_SITES+=	${GO_GOPROXY}/${GO_MODNAME:C/([A-Z])/!\1/g:tl}/@v/
+DISTFILES+=	${GO_MODFILE} ${GO_DISTFILE}
+EXTRACT_ONLY+=	${GO_DISTFILE}
+WRKSRC=		${WRKDIR}/${GO_MODNAME}@${GO_MODVERSION}
+FETCH_DEPENDS+=	${GO_CMD}:${GO_PORT} 
+#		ca_root_nss>0:security/ca_root_nss
+USES+=		zip
+.  else
+GO_ENV+=	GO_NO_VENDOR_CHECKS=1
+.  endif
 .else
+GO_GOPATH=	${WRKDIR}
 GO_WRKSRC=	${WRKDIR}/src/${GO_PKGNAME}
-GO_ENV+=	GOPATH="${WRKDIR}" \
-		GOBIN=""
+GO_ENV+=	GOPATH="${GO_GOPATH}" \
+		GOBIN="" \
+		GO111MODULE=off
 .endif

 GO_PORT?=	lang/go
@@ -128,10 +155,23 @@ _USES_POST+=	go
 .if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_GO_POST_MK)
 _INCLUDE_USES_GO_POST_MK=	yes

-.if !target(post-extract) && empty(go_ARGS)
+.if !target(post-fetch) && ${go_ARGS:Mmodules} && defined(GO_MODULE)
+post-fetch:
+	@${ECHO_MSG} "===> Fetching ${GO_MODNAME} dependencies";
+	@(cd ${DISTDIR}/${DIST_SUBDIR}; \
+		[ -e go.mod ] || ${RLN} ${GO_MODFILE} go.mod; \
+		${SETENV} ${GO_ENV} GOPROXY=${GO_GOPROXY} ${GO_CMD} mod download -x)
+.endif
+
+.if !target(post-extract)
+.  if empty(go_ARGS)
 post-extract:
 	@${MKDIR} ${GO_WRKSRC:H}
 	@${LN} -sf ${WRKSRC} ${GO_WRKSRC}
+.  elif ${go_ARGS:Mmodules} && defined(GO_MODULE)
+post-extract:
+	@(cd ${GO_WRKSRC}; ${SETENV} ${GO_ENV} GOPROXY=off ${GO_CMD} mod vendor)
+.  endif 
 .endif

 .if !target(do-build) && empty(go_ARGS:Mno_targets)
@@ -143,7 +183,7 @@ do-build:
 		pkg=$$(${ECHO_CMD} $${t} | \
 			${SED} -Ee 's/^([^:]*).*$$/\1/' -e 's/^${PORTNAME}$$/./'); \
 		${ECHO_MSG} "===>  Building $${out} from $${pkg}"; \
-		${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} build ${GO_BUILDFLAGS} \
+		${SETENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=off ${GO_CMD} build ${GO_BUILDFLAGS} \
 			-o ${GO_WRKDIR_BIN}/$${out} \
 			$${pkg}; \
 	done)
@@ -169,13 +209,29 @@ do-test:
 	(cd ${GO_WRKSRC}; \
 	for t in ${GO_TESTTARGET}; do \
 		${ECHO_MSG} "===>  Testing $${t}"; \
-		${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} test ${GO_TESTFLAGS} $${t}; \
+		${SETENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=off ${GO_CMD} test ${GO_TESTFLAGS} $${t}; \
 	done)
 .endif

+.if ${go_ARGS:Mmodules} && defined(GO_MODULE)
+gomod-clean:
+.if exists(${GO_CMD})
+	@${ECHO_MSG} "===>  Cleaning Go module cache"
+	@${SETENV} ${GO_ENV} ${GO_CMD} clean -modcache
+.else
+	@${ECHO_MSG} "===>    Skipping since ${GO_CMD} is not installed"
+.endif
+
+# Hook up to distclean
+.if !target(post-clean) && !make(clean)
+post-clean: gomod-clean
+	@${RM} -r ${GO_GOPATH}
+.endif
+.endif
+
 # Helper targets for port maintainers

-.if ${go_ARGS:Mmodules}
+.if ${go_ARGS:Mmodules} && !defined(GO_MODULE)
 _MODULES2TUPLE_CMD=	modules2tuple
 gomod-vendor-deps:
 	@if ! type ${GO_CMD} > /dev/null 2>&1; then \
@@ -186,11 +242,11 @@ gomod-vendor-deps:
 	fi

 gomod-vendor: gomod-vendor-deps patch
-	@cd ${WRKSRC}; ${SETENV} GOPATH=${WRKDIR}/.gopath GOFLAGS=-modcacherw ${GO_CMD} mod vendor; \
+	@cd ${WRKSRC}; ${SETENV} ${GO_ENV} ${GO_CMD} mod vendor; \
 	[ -r vendor/modules.txt ] && ${_MODULES2TUPLE_CMD} vendor/modules.txt

 gomod-vendor-diff: gomod-vendor-deps patch
-	@cd ${WRKSRC}; ${SETENV} GOPATH=${WRKDIR}/.gopath GOFLAGS=-modcacherw ${GO_CMD} mod vendor; \
+	@cd ${WRKSRC}; ${SETENV} ${GO_ENV} ${GO_CMD} mod vendor; \
 	[ -r vendor/modules.txt ] && ${_MODULES2TUPLE_CMD} vendor/modules.txt | ${SED} 's|GH_TUPLE=|	|; s| \\$$||' | ${GREP} -v '		\\' > ${WRKDIR}/GH_TUPLE-new.txt && \
 	echo ${GH_TUPLE} | ${TR} -s " " "\n" | ${SED} "s|^|		|" > ${WRKDIR}/GH_TUPLE-old.txt && \
 	${DIFF} ${WRKDIR}/GH_TUPLE-old.txt ${WRKDIR}/GH_TUPLE-new.txt || exit 0
--- a/devel/libuv/Makefile
+++ b/devel/libuv/Makefile
@@ -2,7 +2,7 @@
 # $Id$
 #
 PORTNAME=	libuv
-PORTVERSION=	1.39.0
+PORTVERSION=	1.41.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel

--- a/devel/libuv/distinfo
+++ b/devel/libuv/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1601388766
-SHA256 (libuv-libuv-v1.39.0_GH0.tar.gz) = dc7b21f1bb7ef19f4b42c5ea058afabe51132d165da18812b70fb319659ba629
-SIZE (libuv-libuv-v1.39.0_GH0.tar.gz) = 1272565
+TIMESTAMP = 1645528664
+SHA256 (libuv-libuv-v1.41.0_GH0.tar.gz) = 6cfeb5f4bab271462b4a2cc77d4ecec847fdbdc26b72019c27ae21509e6f94fa
+SIZE (libuv-libuv-v1.41.0_GH0.tar.gz) = 1281268
--- a/net/libcares/Makefile
+++ b/net/libcares/Makefile
@@ -2,7 +2,7 @@
 # $Id$
 #
 PORTNAME=	libcares
-PORTVERSION=	1.14.0
+PORTVERSION=	1.17.1
 CATEGORIES=	dns
 DISTNAME=	c-ares-${PORTVERSION}

@@ -26,8 +26,11 @@ PROGRAMS=	acountry adig ahost

 MAKE_JOBS_UNSAFE=	yes

-post-install:
-	${INSTALL_PROGRAM} ${PROGRAMS:S@^@${WRKSRC}/.libs/@} ${STAGEDIR}${PREFIX}/bin/
+post-patch:
+	${REINPLACE_CMD} -e 's,6:2:4,4:2:4,g' ${WRKSRC}/configure
+
+#post-install:
+#	${INSTALL_PROGRAM} ${PROGRAMS:S@^@${WRKSRC}/.libs/@} ${STAGEDIR}${PREFIX}/bin/

 .include <bsd.port.mk>
 #EOF
--- a/net/libcares/distinfo
+++ b/net/libcares/distinfo
@@ -1,2 +1,3 @@
-SHA256 (c-ares-1.14.0.tar.gz) = 45d3c1fd29263ceec2afc8ff9cd06d5f8f889636eb4e80ce3cc7f0eaf7aadc6e
-SIZE (c-ares-1.14.0.tar.gz) = 1335940
+TIMESTAMP = 1645528943
+SHA256 (c-ares-1.17.1.tar.gz) = d73dd0f6de824afd407ce10750ea081af47eba52b8a6cb307d220131ad93fc40
+SIZE (c-ares-1.17.1.tar.gz) = 1518701
--- a/net/libcares/pkg-plist
+++ b/net/libcares/pkg-plist
@@ -1,6 +1,3 @@
-bin/acountry
-bin/adig
-bin/ahost
 include/ares_build.h
 include/ares_dns.h
 include/ares_rules.h
@@ -22,8 +19,10 @@ man/man3/ares_fds.3.gz
 man/man3/ares_free_data.3.gz
 man/man3/ares_free_hostent.3.gz
 man/man3/ares_free_string.3.gz
+man/man3/ares_freeaddrinfo.3.gz
 man/man3/ares_get_servers_ports.3.gz
 man/man3/ares_get_servers.3.gz
+man/man3/ares_getaddrinfo.3.gz
 man/man3/ares_gethostbyaddr.3.gz
 man/man3/ares_gethostbyname_file.3.gz
 man/man3/ares_gethostbyname.3.gz
@@ -34,11 +33,13 @@ man/man3/ares_inet_pton.3.gz
 man/man3/ares_init_options.3.gz
 man/man3/ares_init.3.gz
 man/man3/ares_library_cleanup.3.gz
+man/man3/ares_library_init_android.3.gz
 man/man3/ares_library_init.3.gz
 man/man3/ares_library_initialized.3.gz
 man/man3/ares_mkquery.3.gz
 man/man3/ares_parse_a_reply.3.gz
 man/man3/ares_parse_aaaa_reply.3.gz
+man/man3/ares_parse_caa_reply.3.gz
 man/man3/ares_parse_mx_reply.3.gz
 man/man3/ares_parse_naptr_reply.3.gz
 man/man3/ares_parse_ns_reply.3.gz
@@ -60,6 +61,7 @@ man/man3/ares_set_servers_ports.3.gz
 man/man3/ares_set_servers.3.gz
 man/man3/ares_set_socket_callback.3.gz
 man/man3/ares_set_socket_configure_callback.3.gz
+man/man3/ares_set_socket_functions.3.gz
 man/man3/ares_set_sortlist.3.gz
 man/man3/ares_strerror.3.gz
 man/man3/ares_timeout.3.gz