Fix a few issues with go-module.mk.

[Benny Siegert <bsiegert%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Benny Siegert <bsiegert%gmail.com@localhost>
Pushed By:	bsiegert
Date:		Thu Apr 9 17:37:08 2020 +0200
Changeset:	080e895f81ac58fa314a9ff31ff745f8728b04f5

Modified Files:
	go/go-module.mk
	lf/Makefile

Log Message:
Fix a few issues with go-module.mk.

- Quell pkglint warnings
- Add correct BUILD_DEPENDS

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

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

diffstat:
 go/go-module.mk | 16 ++++++++--------
 lf/Makefile     |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diffs:
diff --git a/go/go-module.mk b/go/go-module.mk
index c64cf75ccd..5f5bd35758 100644
--- a/go/go-module.mk
+++ b/go/go-module.mk
@@ -42,6 +42,7 @@ MAKE_JOBS_SAFE=		no
 INSTALLATION_DIRS+=	bin
 USE_TOOLS+=		pax
 
+BUILD_DEPENDS+=		${GO_PACKAGE_DEP}
 PRINT_PLIST_AWK+=	/^@pkgdir bin$$/ { next; }
 
 MAKE_ENV+=	GO111MODULE=on GOPATH=${WRKDIR}/.gopath GOPROXY=file://${WRKDIR}/.goproxy
@@ -49,12 +50,12 @@ MAKE_ENV+=	GOCACHE=${WRKDIR}/.cache/go-build
 
 .if !target(do-build)
 do-build:
-	${RUN} cd ${WRKSRC} && ${PKGSRC_SETENV} ${MAKE_ENV} ${GO} install -v ${GO_BUILD_PATTERN}
+	${RUN} cd ${WRKSRC} && ${_ULIMIT_CMD} ${PKGSRC_SETENV} ${MAKE_ENV} ${GO} install -v ${GO_BUILD_PATTERN}
 .endif
 
 .if !target(do-test)
 do-test:
-	${RUN} cd ${WRKSRC} && ${PKGSRC_SETENV} ${TEST_ENV} ${MAKE_ENV} ${GO} test -v ${GO_BUILD_PATTERN}
+	${RUN} cd ${WRKSRC} && ${_ULIMIT_CMD} ${PKGSRC_SETENV} ${TEST_ENV} ${MAKE_ENV} ${GO} test -v ${GO_BUILD_PATTERN}
 .endif
 
 .if !target(do-install)
@@ -64,22 +65,21 @@ do-install:
 
 # FIXME This needs to depend on extract
 .PHONY: show-go-modules
-show-go-modules:
-	# cd ${WRKSRC} && ${PKGSRC_SETENV} ${MAKE_ENV} ${GO} env
+show-go-modules: ${WRKDIR}/.extract_done
 	${RUN} cd ${WRKSRC} && ${PKGSRC_SETENV} ${MAKE_ENV} ${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:!basename $i!}
-SITES.${i:!basename $i!}= https://proxy.golang.org/${i:!dirname $i!}/
+DISTFILES+=	${${i}:!basename ${i}!}
+SITES.${${i}:!basename ${i}!}= https://proxy.golang.org/${${i}:!dirname ${i}!}/
 .endfor
 
 post-extract:
 .for i in ${GO_MODULE_FILES}
-	${MKDIR} ${WRKDIR}/.goproxy/${i:!dirname $i!}
-	cp ${DISTDIR}/${DIST_SUBDIR}/${i:!basename $i!} ${WRKDIR}/.goproxy/$i
+	${MKDIR} ${WRKDIR}/.goproxy/${${i}:!dirname ${i}!}
+	cp ${DISTDIR}/${DIST_SUBDIR}/${${i}:!basename ${i}!} ${WRKDIR}/.goproxy/${i}
 .endfor
 
 _VARGROUPS+=		go
diff --git a/lf/Makefile b/lf/Makefile
index 670640270f..28990339d4 100644
--- a/lf/Makefile
+++ b/lf/Makefile
@@ -12,10 +12,10 @@ LICENSE=		2-clause-bsd
 
 DIST_SUBDIR=		${PKGNAME_NOREV}
 
-GO_MODULE_FILES+=       github.com/mattn/go-runewidth/@v/v0.0.4.mod
-GO_MODULE_FILES+=       github.com/mattn/go-runewidth/@v/v0.0.4.zip
-GO_MODULE_FILES+=       github.com/nsf/termbox-go/@v/v0.0.0-20190325093121-288510b9734e.zip
-GO_MODULE_FILES+=       github.com/nsf/termbox-go/@v/v0.0.0-20190325093121-288510b9734e.mod
+GO_MODULE_FILES+=	github.com/mattn/go-runewidth/@v/v0.0.4.mod
+GO_MODULE_FILES+=	github.com/mattn/go-runewidth/@v/v0.0.4.zip
+GO_MODULE_FILES+=	github.com/nsf/termbox-go/@v/v0.0.0-20190325093121-288510b9734e.zip
+GO_MODULE_FILES+=	github.com/nsf/termbox-go/@v/v0.0.0-20190325093121-288510b9734e.mod
 
 
 .include "../../wip/go/go-module.mk"