pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Some bugfixes for go-module.mk.



Module Name:	pkgsrc-wip
Committed By:	Benny Siegert <bsiegert%gmail.com@localhost>
Pushed By:	bsiegert
Date:		Fri Apr 10 10:49:10 2020 +0200
Changeset:	e99e3895e08407a85d08525f3189a60cd75e25ce

Modified Files:
	go/go-module.mk

Log Message:
Some bugfixes for go-module.mk.

- Also replace exclamation marks in paths
- Fix show-go-modules target

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e99e3895e08407a85d08525f3189a60cd75e25ce

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

diffstat:
 go/go-module.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diffs:
diff --git a/go/go-module.mk b/go/go-module.mk
index 8bc8f89c85..2d061ace07 100644
--- a/go/go-module.mk
+++ b/go/go-module.mk
@@ -65,20 +65,20 @@ do-install:
 
 .PHONY: show-go-modules
 show-go-modules: ${WRKDIR}/.extract_done
-	${RUN} cd ${WRKSRC} && ${PKGSRC_SETENV} ${MAKE_ENV} ${GO} get -d
+	${RUN} cd ${WRKSRC} && ${PKGSRC_SETENV} ${MAKE_ENV} GOPROXY= ${GO} get -d
 	${RUN} cd ${WRKDIR}/.gopath/pkg/mod/cache/download && ${FIND} . -type f -name "*.mod" | ${SED} -e 's/\.\//GO_MODULE_FILES+=	/'
 	${RUN} cd ${WRKDIR}/.gopath/pkg/mod/cache/download && ${FIND} . -type f -name "*.zip" | ${SED} -e 's/\.\//GO_MODULE_FILES+=	/'
 
 DISTFILES?=	${DEFAULT_DISTFILES}
 .for i in ${GO_MODULE_FILES}
-DISTFILES+=	${i:S/\//_/g}
-SITES.${i:S/\//_/g}= -https://proxy.golang.org/${i}
+DISTFILES+=	${i:C/[\/!]/_/g}
+SITES.${i:C/[\/!]/_/g}= -https://proxy.golang.org/${i}
 .endfor
 
 post-extract:
 .for i in ${GO_MODULE_FILES}
 	${MKDIR} ${WRKDIR}/.goproxy/${i:H}
-	cp ${DISTDIR}/${DIST_SUBDIR}/${i:S/\//_/g} ${WRKDIR}/.goproxy/${i}
+	cp ${DISTDIR}/${DIST_SUBDIR}/${i:C/[\/!]/_/g} ${WRKDIR}/.goproxy/${i}
 .endfor
 
 _VARGROUPS+=		go


Home | Main Index | Thread Index | Old Index