CVS commit: pkgsrc/lang/go

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sun Aug 30 11:52:19 UTC 2020

Modified Files:
        pkgsrc/lang/go: go-module.mk

Log Message:
go/go-module.mk: sort show-go-modules output


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/go/go-module.mk

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

Modified files:

Index: pkgsrc/lang/go/go-module.mk
diff -u pkgsrc/lang/go/go-module.mk:1.4 pkgsrc/lang/go/go-module.mk:1.5
--- pkgsrc/lang/go/go-module.mk:1.4     Thu Aug 20 06:50:49 2020
+++ pkgsrc/lang/go/go-module.mk Sun Aug 30 11:52:19 2020
@@ -1,4 +1,4 @@
-# $NetBSD: go-module.mk,v 1.4 2020/08/20 06:50:49 tnn Exp $
+# $NetBSD: go-module.mk,v 1.5 2020/08/30 11:52:19 tnn Exp $
 #
 # This file implements common logic for compiling Go programs in pkgsrc.
 #
@@ -56,8 +56,7 @@ do-install:
 .PHONY: show-go-modules
 show-go-modules: ${WRKDIR}/.extract_done
        ${RUN} cd ${WRKSRC} && ${PKGSRC_SETENV} ${MAKE_ENV} GOPROXY= ${GO} mod download -x
-       ${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+=     /'
+       ${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}
 .for i in ${GO_MODULE_FILES}