Source-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/lang/go go/go-module.mk: sort show-go-modules output



details:   https://anonhg.NetBSD.org/pkgsrc/rev/a336985baac4
branches:  trunk
changeset: 437712:a336985baac4
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sun Aug 30 11:52:19 2020 +0000

description:
go/go-module.mk: sort show-go-modules output

diffstat:

 lang/go/go-module.mk |  5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diffs (19 lines):

diff -r 8c8413154e74 -r a336985baac4 lang/go/go-module.mk
--- a/lang/go/go-module.mk      Sun Aug 30 11:04:48 2020 +0000
+++ b/lang/go/go-module.mk      Sun Aug 30 11:52:19 2020 +0000
@@ -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 @@
 .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}



Home | Main Index | Thread Index | Old Index