Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1715727673207960"
MIME-Version: 1.0
Date: Tue, 14 May 2024 23:01:13 +0000
From: "Thomas Klausner" <wiz@netbsd.org>
Subject: CVS commit: pkgsrc
To: pkgsrc-changes@NetBSD.org
Reply-To: wiz@netbsd.org
Message-Id: <20240514230113.7695EFA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1715727673207960
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	wiz
Date:		Tue May 14 23:01:13 UTC 2024

Modified Files:
	pkgsrc/databases/influxdb: Makefile
	pkgsrc/databases/sqlc: Makefile
	pkgsrc/lang/go: go-module.mk
	pkgsrc/security/authelia: Makefile
	pkgsrc/sysutils/superfile: Makefile

Log Message:
go: do not unpack go modules by default

Before this change, they were unpacked into ${WRKDIR}, but the actual build
process started from the zip archives again, leading to two copies of the
files on disk; even worse, you could assume the extracted sources were
used and could be patched.

Now, only the main tar.gz will be extracted into ${WRKDIR} and other
files need to be added to GO_MODULE_EXTRACT to be extracted.

Adapt the couple packages that already patch go sources, or need other
files extracted.

With help from bsiegert, thanks!


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 pkgsrc/databases/influxdb/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/databases/sqlc/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/lang/go/go-module.mk
cvs rdiff -u -r1.43 -r1.44 pkgsrc/security/authelia/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/superfile/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1715727673207960
Content-Disposition: inline
Content-Length: 4117
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/databases/influxdb/Makefile
diff -u pkgsrc/databases/influxdb/Makefile:1.57 pkgsrc/databases/influxdb/Makefile:1.58
--- pkgsrc/databases/influxdb/Makefile:1.57	Fri Apr  5 19:13:55 2024
+++ pkgsrc/databases/influxdb/Makefile	Tue May 14 23:01:12 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2024/04/05 19:13:55 bsiegert Exp $
+# $NetBSD: Makefile,v 1.58 2024/05/14 23:01:12 wiz Exp $
 
 DISTNAME=	influxdb-1.8.4
 MASTER_SITES=	${MASTER_SITE_GITHUB:=influxdata/}
@@ -15,6 +15,9 @@ LICENSE=	mit
 TOOL_DEPENDS+=	asciidoc-[0-9]*:../../textproc/asciidoc
 TOOL_DEPENDS+=	xmlto-[0-9]*:../../textproc/xmlto
 
+GO_MODULE_EXTRACT+=	github.com_influxdata_flux_@v_v0.65.1.zip
+GO_MODULE_EXTRACT+=	github.com_influxdata_flux_@v_v0.65.1.mod
+
 USE_TOOLS+=	gmake
 
 DATADIR=	${VARBASE}/lib/influxdb

Index: pkgsrc/databases/sqlc/Makefile
diff -u pkgsrc/databases/sqlc/Makefile:1.14 pkgsrc/databases/sqlc/Makefile:1.15
--- pkgsrc/databases/sqlc/Makefile:1.14	Fri Apr  5 19:13:55 2024
+++ pkgsrc/databases/sqlc/Makefile	Tue May 14 23:01:12 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2024/04/05 19:13:55 bsiegert Exp $
+# $NetBSD: Makefile,v 1.15 2024/05/14 23:01:12 wiz Exp $
 
 DISTNAME=	sqlc-1.16.0
 GITHUB_TAG=	v${PKGVERSION_NOREV}
@@ -12,6 +12,9 @@ COMMENT=	Generate type-safe code from SQ
 LICENSE=	mit
 
 USE_LANGUAGES=		c # go
+
+GO_MODULE_EXTRACT+=	github.com_pganalyze_pg_query_go_v2_@v_v2.2.0.zip
+
 GO_BUILD_PATTERN=	./cmd/sqlc
 
 .include "go-modules.mk"

Index: pkgsrc/lang/go/go-module.mk
diff -u pkgsrc/lang/go/go-module.mk:1.15 pkgsrc/lang/go/go-module.mk:1.16
--- pkgsrc/lang/go/go-module.mk:1.15	Sun May 12 19:45:56 2024
+++ pkgsrc/lang/go/go-module.mk	Tue May 14 23:01:13 2024
@@ -1,4 +1,4 @@
-# $NetBSD: go-module.mk,v 1.15 2024/05/12 19:45:56 wiz Exp $
+# $NetBSD: go-module.mk,v 1.16 2024/05/14 23:01:13 wiz Exp $
 #
 # This file implements common logic for compiling Go programs in pkgsrc.
 #
@@ -21,6 +21,11 @@
 # 	List of additional directories in which to look for go.mod files for
 # 	the show-go-modules target.
 #
+# GO_MODULE_EXTRACT (optional)
+#
+#	List of modules that should be extracted. By default, modules are not
+#	extracted separately. This is needed if you want to patch them.
+#
 # Keywords: go golang
 #
 
@@ -71,6 +76,7 @@ print-go-modules show-go-modules: ${WRKD
 	${RUN} cd ${WRKDIR}/.gopath/pkg/mod/cache/download && ${FIND} . -type f -a \( -name "*.mod" -o -name "*.zip" \) | ${SED} -e 's/\.\//GO_MODULE_FILES+=	/' | ${SORT}
 
 DISTFILES?=	${DEFAULT_DISTFILES}
+EXTRACT_ONLY?=	${DEFAULT_DISTFILES} ${GO_MODULES_EXTRACT}
 .for i in ${GO_MODULE_FILES}
 DISTFILES+=	${i:C/[\/!]/_/g}
 SITES.${i:C/[\/!]/_/g}= -https://proxy.golang.org/${i}

Index: pkgsrc/security/authelia/Makefile
diff -u pkgsrc/security/authelia/Makefile:1.43 pkgsrc/security/authelia/Makefile:1.44
--- pkgsrc/security/authelia/Makefile:1.43	Fri Apr  5 19:14:07 2024
+++ pkgsrc/security/authelia/Makefile	Tue May 14 23:01:13 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2024/04/05 19:14:07 bsiegert Exp $
+# $NetBSD: Makefile,v 1.44 2024/05/14 23:01:13 wiz Exp $
 
 DISTNAME=	authelia-4.26.1
 PKGREVISION=	37
@@ -23,6 +23,8 @@ HOMEPAGE=	https://www.authelia.com/
 COMMENT=	Single Sign-On Multi-Factor portal for web apps
 LICENSE=	apache-2.0
 
+GO_MODULE_EXTRACT+=	broccoli-1.0.3.tar.gz authelia-4.26.1.public_html.tar.gz
+
 CHECK_PORTABILITY_SKIP+=	entrypoint.sh
 
 .include "go-modules.mk"

Index: pkgsrc/sysutils/superfile/Makefile
diff -u pkgsrc/sysutils/superfile/Makefile:1.1 pkgsrc/sysutils/superfile/Makefile:1.2
--- pkgsrc/sysutils/superfile/Makefile:1.1	Sat May 11 10:14:14 2024
+++ pkgsrc/sysutils/superfile/Makefile	Tue May 14 23:01:13 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2024/05/11 10:14:14 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2024/05/14 23:01:13 wiz Exp $
 
 DISTNAME=	superfile-1.1.2
 CATEGORIES=	sysutils
@@ -14,6 +14,8 @@ USE_LANGUAGES=	c
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
+GO_MODULES_EXTRACT+=	github.com_barasher_go-exiftool_@v_v1.10.0.zip
+
 .include "go-modules.mk"
 .include "../../lang/go/go-module.mk"
 .include "../../mk/bsd.pkg.mk"


--_----------=_1715727673207960--