From 704365d5e0f529aa4ee6915621d0d458316d668e Mon Sep 17 00:00:00 2001 From: tron Date: Sun, 26 Jul 2015 19:53:23 +0000 Subject: Pullup ticket #4781 - requested by bsiegert net/gcloud-golang-metadata: build fix Revisions pulled up: - net/gcloud-golang-metadata/Makefile 1.2 --- Module Name: pkgsrc Committed By: bsiegert Date: Sat Jul 25 14:23:58 UTC 2015 Modified Files: pkgsrc/net/gcloud-golang-metadata: Makefile Log Message: Fix build on NetBSD, PR pkg/49909. It turns out that [^a]* matches all files not beginning with a on Darwin and all files beginning with a on NetBSD. Work around this by crafting a for loop with a case expression. --- net/gcloud-golang-metadata/Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/net/gcloud-golang-metadata/Makefile b/net/gcloud-golang-metadata/Makefile index a6e180b8e85..d2678673fa9 100644 --- a/net/gcloud-golang-metadata/Makefile +++ b/net/gcloud-golang-metadata/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2015/05/11 13:02:21 bsiegert Exp $ +# $NetBSD: Makefile,v 1.1.2.1 2015/07/26 19:53:23 tron Exp $ # DISTNAME= gcloud-golang @@ -19,7 +19,13 @@ GO_DIST_BASE= ${DISTNAME}-${GITHUB_TAG}* # Remove all code except compute/metadata and internal pre-patch: - ${RM} -fr ${WRKSRC}/[^ci]* ${WRKSRC}/cloud*go + for i in ${WRKSRC}/*; do \ + case $$i in \ + c*|i*) ;; \ + default) ${RM} -fr $$i ;; \ + esac; \ + done + ${RM} -fr ${WRKSRC}/cloud*go ${RM} -fr ${WRKSRC}/internal/datastore ${RM} -fr ${WRKSRC}/internal/testutil -- cgit v1.2.3