Sat Aug 20 09:21:46 2016 UTC ()
Revbump packages using Go for Go 1.7 release.


(bsiegert)
diff -r1.5 -r1.6 pkgsrc/databases/mongo-tools/Makefile
diff -r1.2 -r1.3 pkgsrc/devel/go-check/Makefile
diff -r1.2 -r1.3 pkgsrc/devel/go-flags-svent/Makefile
diff -r1.1 -r1.2 pkgsrc/devel/go-ini/Makefile
diff -r1.1 -r1.2 pkgsrc/devel/go-mow-cli/Makefile
diff -r1.2 -r1.3 pkgsrc/devel/go-nbreader/Makefile
diff -r1.2 -r1.3 pkgsrc/devel/go-ratelimit/Makefile
diff -r1.2 -r1.3 pkgsrc/devel/go-review/Makefile
diff -r1.1 -r1.2 pkgsrc/devel/go-testify/Makefile
diff -r1.7 -r1.8 pkgsrc/devel/go-tools/Makefile
diff -r1.2 -r1.3 pkgsrc/devel/golint/Makefile
diff -r1.5 -r1.6 pkgsrc/devel/google-api-go-client/Makefile
diff -r1.6 -r1.7 pkgsrc/net/gcloud-golang-metadata/Makefile
diff -r1.1 -r1.2 pkgsrc/net/go-dns/Makefile
diff -r1.6 -r1.7 pkgsrc/net/go-net/Makefile
diff -r1.1 -r1.2 pkgsrc/net/go-vultr/Makefile
diff -r1.25 -r1.26 pkgsrc/net/syncthing/Makefile
diff -r1.492 -r1.493 pkgsrc/pkgtools/pkglint/Makefile
diff -r1.2 -r1.3 pkgsrc/security/go-crypto/Makefile
diff -r1.5 -r1.6 pkgsrc/security/go-oauth2/Makefile
diff -r1.1 -r1.2 pkgsrc/security/vault/Makefile
diff -r1.2 -r1.3 pkgsrc/sysutils/consul/Makefile
diff -r1.6 -r1.7 pkgsrc/sysutils/facette/Makefile
diff -r1.1 -r1.2 pkgsrc/textproc/go-runewidth/Makefile
diff -r1.7 -r1.8 pkgsrc/textproc/go-text/Makefile
diff -r1.3 -r1.4 pkgsrc/textproc/sift/Makefile
cvs diff -r1.5 -r1.6 pkgsrc/databases/mongo-tools/Makefile (switch to unified diff)

--- pkgsrc/databases/mongo-tools/Makefile 2016/03/13 21:05:34 1.5
+++ pkgsrc/databases/mongo-tools/Makefile 2016/08/20 09:21:44 1.6
@@ -1,48 +1,49 @@ @@ -1,48 +1,49 @@
1# $NetBSD: Makefile,v 1.5 2016/03/13 21:05:34 fhajny Exp $ 1# $NetBSD: Makefile,v 1.6 2016/08/20 09:21:44 bsiegert Exp $
2 2
3DISTNAME= mongo-tools-3.2.4 3DISTNAME= mongo-tools-3.2.4
 4PKGREVISION= 1
4CATEGORIES= databases 5CATEGORIES= databases
5MASTER_SITES= ${MASTER_SITE_GITHUB:=mongodb/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=mongodb/}
6 7
7MAINTAINER= filip@joyent.com 8MAINTAINER= filip@joyent.com
8HOMEPAGE= http://github.com/mongodb/mongo-tools/ 9HOMEPAGE= http://github.com/mongodb/mongo-tools/
9COMMENT= MongoDB CLI tools 10COMMENT= MongoDB CLI tools
10LICENSE= apache-2.0 11LICENSE= apache-2.0
11 12
12GITHUB_TAG= r${PKGVERSION_NOREV} 13GITHUB_TAG= r${PKGVERSION_NOREV}
13 14
14BUILD_DEPENDS+= go-${GO_VERSION}*:../../lang/go 15BUILD_DEPENDS+= go-${GO_VERSION}*:../../lang/go
15 16
16EXTRACT_USING= bsdtar 17EXTRACT_USING= bsdtar
17USE_TOOLS+= pkg-config 18USE_TOOLS+= pkg-config
18 19
19.include "options.mk" 20.include "options.mk"
20 21
21MONGO_TOOLS= bsondump mongostat mongofiles mongoexport mongoimport \ 22MONGO_TOOLS= bsondump mongostat mongofiles mongoexport mongoimport \
22 mongorestore mongodump mongotop mongooplog 23 mongorestore mongodump mongotop mongooplog
23 24
24# go uses volatile /tmp dirs that contain required includes files too 25# go uses volatile /tmp dirs that contain required includes files too
25BUILDLINK_PASSTHRU_DIRS+= /tmp 26BUILDLINK_PASSTHRU_DIRS+= /tmp
26 27
27INSTALLATION_DIRS+= bin 28INSTALLATION_DIRS+= bin
28 29
29post-extract: 30post-extract:
30 ${MKDIR} -p ${WRKSRC}/vendor/src/github.com/mongodb/mongo-tools 31 ${MKDIR} -p ${WRKSRC}/vendor/src/github.com/mongodb/mongo-tools
31.for tool in common ${MONGO_TOOLS} 32.for tool in common ${MONGO_TOOLS}
32 ${LN} -s ${WRKSRC}/${tool} ${WRKSRC}/vendor/src/github.com/mongodb/mongo-tools/${tool} 33 ${LN} -s ${WRKSRC}/${tool} ${WRKSRC}/vendor/src/github.com/mongodb/mongo-tools/${tool}
33.endfor 34.endfor
34 35
35do-build: 36do-build:
36.for tool in ${MONGO_TOOLS} 37.for tool in ${MONGO_TOOLS}
37 cd ${WRKSRC} && \ 38 cd ${WRKSRC} && \
38 ${SETENV} GOPATH=${WRKSRC}:${WRKSRC}/vendor:${PREFIX}/gopkg \ 39 ${SETENV} GOPATH=${WRKSRC}:${WRKSRC}/vendor:${PREFIX}/gopkg \
39 go build -tags "${MONGO_TAGS}" -o bin/${tool} ${tool}/main/${tool}.go 40 go build -tags "${MONGO_TAGS}" -o bin/${tool} ${tool}/main/${tool}.go
40.endfor 41.endfor
41 42
42do-install: 43do-install:
43.for tool in ${MONGO_TOOLS} 44.for tool in ${MONGO_TOOLS}
44 ${INSTALL_PROGRAM} ${WRKSRC}/bin/${tool} ${DESTDIR}${PREFIX}/bin/${tool} 45 ${INSTALL_PROGRAM} ${WRKSRC}/bin/${tool} ${DESTDIR}${PREFIX}/bin/${tool}
45.endfor 46.endfor
46 47
47.include "../../lang/go/version.mk" 48.include "../../lang/go/version.mk"
48.include "../../mk/bsd.pkg.mk" 49.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/devel/go-check/Attic/Makefile (switch to unified diff)

--- pkgsrc/devel/go-check/Attic/Makefile 2016/02/23 20:18:12 1.2
+++ pkgsrc/devel/go-check/Attic/Makefile 2016/08/20 09:21:44 1.3
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.2 2016/02/23 20:18:12 bsiegert Exp $ 1# $NetBSD: Makefile,v 1.3 2016/08/20 09:21:44 bsiegert Exp $
2# 2#
3 3
4DISTNAME= go-check-1 4DISTNAME= go-check-1
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= devel 6CATEGORIES= devel
7MASTER_SITES= ${MASTER_SITE_GITHUB:=go-check/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=go-check/}
8GITHUB_PROJECT= check 8GITHUB_PROJECT= check
9GITHUB_TAG= 4f90aea 9GITHUB_TAG= 4f90aea
10 10
11MAINTAINER= rillig@NetBSD.org 11MAINTAINER= rillig@NetBSD.org
12HOMEPAGE= http://labix.org/gocheck 12HOMEPAGE= http://labix.org/gocheck
13COMMENT= Rich testing for the Go language 13COMMENT= Rich testing for the Go language
14LICENSE= 2-clause-bsd 14LICENSE= 2-clause-bsd
15 15
16GO_SRCPATH= gopkg.in/check.v1 16GO_SRCPATH= gopkg.in/check.v1
17GO_DIST_BASE= ${GITHUB_PROJECT}-${GITHUB_TAG}* 17GO_DIST_BASE= ${GITHUB_PROJECT}-${GITHUB_TAG}*
18 18
19.include "../../lang/go/go-package.mk" 19.include "../../lang/go/go-package.mk"
20.include "../../mk/bsd.pkg.mk" 20.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/devel/go-flags-svent/Makefile (switch to unified diff)

--- pkgsrc/devel/go-flags-svent/Makefile 2016/02/23 20:18:12 1.2
+++ pkgsrc/devel/go-flags-svent/Makefile 2016/08/20 09:21:45 1.3
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1# $NetBSD: Makefile,v 1.2 2016/02/23 20:18:12 bsiegert Exp $ 1# $NetBSD: Makefile,v 1.3 2016/08/20 09:21:45 bsiegert Exp $
2 2
3DISTNAME= go-flags-svent-0.0.20141123 3DISTNAME= go-flags-svent-0.0.20141123
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= devel 5CATEGORIES= devel
6MASTER_SITES= ${MASTER_SITE_GITHUB:=svent/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=svent/}
7GITHUB_PROJECT= go-flags 7GITHUB_PROJECT= go-flags
8GITHUB_TAG= 4bcbad344f0318adaf7aabc16929701459009aa3 8GITHUB_TAG= 4bcbad344f0318adaf7aabc16929701459009aa3
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://github.com/svent/go-flags/ 11HOMEPAGE= https://github.com/svent/go-flags/
12COMMENT= Go command line option parser (svent fork) 12COMMENT= Go command line option parser (svent fork)
13LICENSE= modified-bsd 13LICENSE= modified-bsd
14 14
15WRKSRC= ${WRKDIR} 15WRKSRC= ${WRKDIR}
16GO_DIST_BASE= ${GITHUB_PROJECT}-${GITHUB_TAG} 16GO_DIST_BASE= ${GITHUB_PROJECT}-${GITHUB_TAG}
17GO_SRCPATH= github.com/svent/go-flags 17GO_SRCPATH= github.com/svent/go-flags
18 18
19REPLACE_SH= check_crosscompile.sh 19REPLACE_SH= check_crosscompile.sh
20 20
21pre-configure: 21pre-configure:
22 ${RM} -rf ${WRKSRC}/examples 22 ${RM} -rf ${WRKSRC}/examples
23 23
24.include "../../lang/go/go-package.mk" 24.include "../../lang/go/go-package.mk"
25.include "../../mk/bsd.pkg.mk" 25.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/devel/go-ini/Attic/Makefile (switch to unified diff)

--- pkgsrc/devel/go-ini/Attic/Makefile 2016/08/09 20:53:51 1.1
+++ pkgsrc/devel/go-ini/Attic/Makefile 2016/08/20 09:21:45 1.2
@@ -1,20 +1,21 @@ @@ -1,20 +1,21 @@
1# $NetBSD: Makefile,v 1.1 2016/08/09 20:53:51 bsiegert Exp $ 1# $NetBSD: Makefile,v 1.2 2016/08/20 09:21:45 bsiegert Exp $
2 2
3GITHUB_TAG= v1.19.1 3GITHUB_TAG= v1.19.1
4DISTNAME= go-ini-${GITHUB_TAG:S/v//} 4DISTNAME= go-ini-${GITHUB_TAG:S/v//}
 5PKGREVISION= 1
5CATEGORIES= devel 6CATEGORIES= devel
6MASTER_SITES= ${MASTER_SITE_GITHUB:=go-ini/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=go-ini/}
7GITHUB_PROJECT= ini 8GITHUB_PROJECT= ini
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://go-ini.github.io/ini 11HOMEPAGE= https://go-ini.github.io/ini
11COMMENT= INI file read and write functionality in Go 12COMMENT= INI file read and write functionality in Go
12LICENSE= apache-2.0 13LICENSE= apache-2.0
13 14
14WRKSRC= ${WRKDIR} 15WRKSRC= ${WRKDIR}
15GO_DIST_BASE= ${GITHUB_PROJECT}-${GITHUB_TAG:S/v//} 16GO_DIST_BASE= ${GITHUB_PROJECT}-${GITHUB_TAG:S/v//}
16GO_SRCPATH= gopkg.in/ini.v1 17GO_SRCPATH= gopkg.in/ini.v1
17 18
18.include "../../devel/go-check/buildlink3.mk" 19.include "../../devel/go-check/buildlink3.mk"
19.include "../../lang/go/go-package.mk" 20.include "../../lang/go/go-package.mk"
20.include "../../mk/bsd.pkg.mk" 21.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/devel/go-mow-cli/Attic/Makefile (switch to unified diff)

--- pkgsrc/devel/go-mow-cli/Attic/Makefile 2016/07/16 13:03:42 1.1
+++ pkgsrc/devel/go-mow-cli/Attic/Makefile 2016/08/20 09:21:45 1.2
@@ -1,19 +1,20 @@ @@ -1,19 +1,20 @@
1# $NetBSD: Makefile,v 1.1 2016/07/16 13:03:42 bsiegert Exp $ 1# $NetBSD: Makefile,v 1.2 2016/08/20 09:21:45 bsiegert Exp $
2 2
3DISTNAME= go-mow-cli-0.0.20160221 3DISTNAME= go-mow-cli-0.0.20160221
 4PKGREVISION= 1
4CATEGORIES= devel 5CATEGORIES= devel
5MASTER_SITES= ${MASTER_SITE_GITHUB:=jawher/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=jawher/}
6GITHUB_PROJECT= mow.cli 7GITHUB_PROJECT= mow.cli
7GITHUB_TAG= 772320464101e904cd51198160eb4d489be9cc49 8GITHUB_TAG= 772320464101e904cd51198160eb4d489be9cc49
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://github.com/jawher/mow.cli 11HOMEPAGE= https://github.com/jawher/mow.cli
11COMMENT= versatile library for building CLI applications in Go 12COMMENT= versatile library for building CLI applications in Go
12LICENSE= mit 13LICENSE= mit
13 14
14WRKSRC= ${WRKDIR} 15WRKSRC= ${WRKDIR}
15GO_DIST_BASE= ${GITHUB_PROJECT}-${GITHUB_TAG} 16GO_DIST_BASE= ${GITHUB_PROJECT}-${GITHUB_TAG}
16GO_SRCPATH= github.com/jawher/mow.cli 17GO_SRCPATH= github.com/jawher/mow.cli
17 18
18.include "../../lang/go/go-package.mk" 19.include "../../lang/go/go-package.mk"
19.include "../../mk/bsd.pkg.mk" 20.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/devel/go-nbreader/Makefile (switch to unified diff)

--- pkgsrc/devel/go-nbreader/Makefile 2016/02/23 20:18:11 1.2
+++ pkgsrc/devel/go-nbreader/Makefile 2016/08/20 09:21:45 1.3
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.2 2016/02/23 20:18:11 bsiegert Exp $ 1# $NetBSD: Makefile,v 1.3 2016/08/20 09:21:45 bsiegert Exp $
2 2
3DISTNAME= go-nbreader-0.0.20150201 3DISTNAME= go-nbreader-0.0.20150201
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= devel 5CATEGORIES= devel
6MASTER_SITES= ${MASTER_SITE_GITHUB:=svent/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=svent/}
7GITHUB_PROJECT= go-nbreader 7GITHUB_PROJECT= go-nbreader
8GITHUB_TAG= 7cef48da76dca6a496faa7fe63e39ed665cbd219 8GITHUB_TAG= 7cef48da76dca6a496faa7fe63e39ed665cbd219
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://github.com/svent/go-nbreader/ 11HOMEPAGE= https://github.com/svent/go-nbreader/
12COMMENT= Go library providing a non-blocking reader 12COMMENT= Go library providing a non-blocking reader
13LICENSE= modified-bsd 13LICENSE= modified-bsd
14 14
15WRKSRC= ${WRKDIR} 15WRKSRC= ${WRKDIR}
16GO_DIST_BASE= ${GITHUB_PROJECT}-${GITHUB_TAG} 16GO_DIST_BASE= ${GITHUB_PROJECT}-${GITHUB_TAG}
17GO_SRCPATH= github.com/svent/go-nbreader 17GO_SRCPATH= github.com/svent/go-nbreader
18 18
19.include "../../lang/go/go-package.mk" 19.include "../../lang/go/go-package.mk"
20.include "../../mk/bsd.pkg.mk" 20.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/devel/go-ratelimit/Attic/Makefile (switch to unified diff)

--- pkgsrc/devel/go-ratelimit/Attic/Makefile 2016/07/15 19:53:45 1.2
+++ pkgsrc/devel/go-ratelimit/Attic/Makefile 2016/08/20 09:21:45 1.3
@@ -1,20 +1,21 @@ @@ -1,20 +1,21 @@
1# $NetBSD: Makefile,v 1.2 2016/07/15 19:53:45 bsiegert Exp $ 1# $NetBSD: Makefile,v 1.3 2016/08/20 09:21:45 bsiegert Exp $
2 2
3DISTNAME= go-ratelimit-0.0.20151125 3DISTNAME= go-ratelimit-0.0.20151125
 4PKGREVISION= 1
4CATEGORIES= devel 5CATEGORIES= devel
5MASTER_SITES= ${MASTER_SITE_GITHUB:=juju/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=juju/}
6GITHUB_PROJECT= ratelimit 7GITHUB_PROJECT= ratelimit
7GITHUB_TAG= 77ed1c8a01217656d2080ad51981f6e99adaa177 8GITHUB_TAG= 77ed1c8a01217656d2080ad51981f6e99adaa177
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://github.com/juju/ratelimit 11HOMEPAGE= https://github.com/juju/ratelimit
11COMMENT= Efficient token-bucket-based rate limiter package 12COMMENT= Efficient token-bucket-based rate limiter package
12LICENSE= gnu-lgpl-v3 13LICENSE= gnu-lgpl-v3
13 14
14WRKSRC= ${WRKDIR} 15WRKSRC= ${WRKDIR}
15GO_DIST_BASE= ${GITHUB_PROJECT}-${GITHUB_TAG} 16GO_DIST_BASE= ${GITHUB_PROJECT}-${GITHUB_TAG}
16GO_SRCPATH= github.com/juju/ratelimit 17GO_SRCPATH= github.com/juju/ratelimit
17 18
18.include "../../devel/go-check/buildlink3.mk" 19.include "../../devel/go-check/buildlink3.mk"
19.include "../../lang/go/go-package.mk" 20.include "../../lang/go/go-package.mk"
20.include "../../mk/bsd.pkg.mk" 21.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/devel/go-review/Makefile (switch to unified diff)

--- pkgsrc/devel/go-review/Makefile 2016/02/23 20:18:12 1.2
+++ pkgsrc/devel/go-review/Makefile 2016/08/20 09:21:45 1.3
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1# $NetBSD: Makefile,v 1.2 2016/02/23 20:18:12 bsiegert Exp $ 1# $NetBSD: Makefile,v 1.3 2016/08/20 09:21:45 bsiegert Exp $
2# 2#
3 3
4DISTNAME= review 4DISTNAME= review
5PKGNAME= go-review-20160213 5PKGNAME= go-review-20160213
6PKGREVISION= 1 6PKGREVISION= 2
7CATEGORIES= devel 7CATEGORIES= devel
8MASTER_SITES= ${MASTER_SITE_GITHUB:=golang/} 8MASTER_SITES= ${MASTER_SITE_GITHUB:=golang/}
9GITHUB_PROJECT= ${DISTNAME} 9GITHUB_PROJECT= ${DISTNAME}
10GITHUB_TAG= 36fe892ba0 10GITHUB_TAG= 36fe892ba0
11 11
12MAINTAINER= bsiegert@NetBSD.org 12MAINTAINER= bsiegert@NetBSD.org
13HOMEPAGE= http://golang.org/ 13HOMEPAGE= http://golang.org/
14COMMENT= Git Codereview plugin used by the Go project 14COMMENT= Git Codereview plugin used by the Go project
15LICENSE= modified-bsd 15LICENSE= modified-bsd
16 16
17GO_SRCPATH= golang.org/x/review 17GO_SRCPATH= golang.org/x/review
18GO_DIST_BASE= ${DISTNAME}-${GITHUB_TAG}* 18GO_DIST_BASE= ${DISTNAME}-${GITHUB_TAG}*
19 19
20.include "../../lang/go/go-package.mk" 20.include "../../lang/go/go-package.mk"
21.include "../../mk/bsd.pkg.mk" 21.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/devel/go-testify/Attic/Makefile (switch to unified diff)

--- pkgsrc/devel/go-testify/Attic/Makefile 2016/07/16 13:21:41 1.1
+++ pkgsrc/devel/go-testify/Attic/Makefile 2016/08/20 09:21:45 1.2
@@ -1,19 +1,20 @@ @@ -1,19 +1,20 @@
1# $NetBSD: Makefile,v 1.1 2016/07/16 13:21:41 bsiegert Exp $ 1# $NetBSD: Makefile,v 1.2 2016/08/20 09:21:45 bsiegert Exp $
2 2
3DISTNAME= go-testify-1.1.3 3DISTNAME= go-testify-1.1.3
 4PKGREVISION= 1
4CATEGORIES= devel 5CATEGORIES= devel
5MASTER_SITES= ${MASTER_SITE_GITHUB:=stretchr/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=stretchr/}
6GITHUB_PROJECT= testify 7GITHUB_PROJECT= testify
7GITHUB_TAG= v1.1.3 8GITHUB_TAG= v1.1.3
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://github.com/stretchr/testify 11HOMEPAGE= https://github.com/stretchr/testify
11COMMENT= Extension to the standard Go testing package 12COMMENT= Extension to the standard Go testing package
12LICENSE= modified-bsd 13LICENSE= modified-bsd
13 14
14WRKSRC= ${WRKDIR} 15WRKSRC= ${WRKDIR}
15GO_DIST_BASE= ${GITHUB_PROJECT}-${GITHUB_TAG:S/v//} 16GO_DIST_BASE= ${GITHUB_PROJECT}-${GITHUB_TAG:S/v//}
16GO_SRCPATH= github.com/stretchr/testify 17GO_SRCPATH= github.com/stretchr/testify
17 18
18.include "../../lang/go/go-package.mk" 19.include "../../lang/go/go-package.mk"
19.include "../../mk/bsd.pkg.mk" 20.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.8 pkgsrc/devel/go-tools/Makefile (switch to unified diff)

--- pkgsrc/devel/go-tools/Makefile 2016/02/23 20:18:12 1.7
+++ pkgsrc/devel/go-tools/Makefile 2016/08/20 09:21:45 1.8
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1# $NetBSD: Makefile,v 1.7 2016/02/23 20:18:12 bsiegert Exp $ 1# $NetBSD: Makefile,v 1.8 2016/08/20 09:21:45 bsiegert Exp $
2# 2#
3 3
4DISTNAME= tools 4DISTNAME= tools
5PKGNAME= go-tools-1.5 5PKGNAME= go-tools-1.5
6PKGREVISION= 3 6PKGREVISION= 4
7CATEGORIES= devel 7CATEGORIES= devel
8MASTER_SITES= ${MASTER_SITE_GITHUB:=golang/} 8MASTER_SITES= ${MASTER_SITE_GITHUB:=golang/}
9GITHUB_PROJECT= ${DISTNAME} 9GITHUB_PROJECT= ${DISTNAME}
10GITHUB_TAG= d02228d 10GITHUB_TAG= d02228d
11 11
12MAINTAINER= bsiegert@NetBSD.org 12MAINTAINER= bsiegert@NetBSD.org
13HOMEPAGE= http://golang.org/ 13HOMEPAGE= http://golang.org/
14COMMENT= Tools for use with Go, including godoc 14COMMENT= Tools for use with Go, including godoc
15LICENSE= modified-bsd 15LICENSE= modified-bsd
16 16
17GO_SRCPATH= golang.org/x/tools 17GO_SRCPATH= golang.org/x/tools
18GO_DIST_BASE= ${DISTNAME}-${GITHUB_TAG}* 18GO_DIST_BASE= ${DISTNAME}-${GITHUB_TAG}*
19 19
20USE_TOOLS+= bash 20USE_TOOLS+= bash
21REPLACE_BASH+= cmd/godoc/setup-godoc-app.bash 21REPLACE_BASH+= cmd/godoc/setup-godoc-app.bash
22REPLACE_BASH+= cmd/oracle/emacs-test.bash 22REPLACE_BASH+= cmd/oracle/emacs-test.bash
23 23
24.include "../../lang/go/go-package.mk" 24.include "../../lang/go/go-package.mk"
25.include "../../devel/google-api-go-client/buildlink3.mk" 25.include "../../devel/google-api-go-client/buildlink3.mk"
26.include "../../mk/bsd.pkg.mk" 26.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/devel/golint/Makefile (switch to unified diff)

--- pkgsrc/devel/golint/Makefile 2016/02/23 20:18:11 1.2
+++ pkgsrc/devel/golint/Makefile 2016/08/20 09:21:45 1.3
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.2 2016/02/23 20:18:11 bsiegert Exp $ 1# $NetBSD: Makefile,v 1.3 2016/08/20 09:21:45 bsiegert Exp $
2 2
3DISTNAME= golint-20151230 3DISTNAME= golint-20151230
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= devel 5CATEGORIES= devel
6MASTER_SITES= ${MASTER_SITE_GITHUB:=golang/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=golang/}
7GITHUB_PROJECT= lint 7GITHUB_PROJECT= lint
8GITHUB_TAG= 32a8716 8GITHUB_TAG= 32a8716
9 9
10MAINTAINER= bsiegert@NetBSD.org 10MAINTAINER= bsiegert@NetBSD.org
11HOMEPAGE= https://golang.org/ 11HOMEPAGE= https://golang.org/
12COMMENT= Linter for Go source files 12COMMENT= Linter for Go source files
13LICENSE= modified-bsd 13LICENSE= modified-bsd
14 14
15GO_SRCPATH= github.com/golang/lint 15GO_SRCPATH= github.com/golang/lint
16GO_DIST_BASE= ${GITHUB_PROJECT}-${GITHUB_TAG}* 16GO_DIST_BASE= ${GITHUB_PROJECT}-${GITHUB_TAG}*
17 17
18.include "../../lang/go/go-package.mk" 18.include "../../lang/go/go-package.mk"
19.include "../../devel/go-tools/buildlink3.mk" 19.include "../../devel/go-tools/buildlink3.mk"
20.include "../../mk/bsd.pkg.mk" 20.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/devel/google-api-go-client/Attic/Makefile (switch to unified diff)

--- pkgsrc/devel/google-api-go-client/Attic/Makefile 2016/02/23 20:18:12 1.5
+++ pkgsrc/devel/google-api-go-client/Attic/Makefile 2016/08/20 09:21:45 1.6
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1# $NetBSD: Makefile,v 1.5 2016/02/23 20:18:12 bsiegert Exp $ 1# $NetBSD: Makefile,v 1.6 2016/08/20 09:21:45 bsiegert Exp $
2# 2#
3 3
4DISTNAME= google-api-go-client 4DISTNAME= google-api-go-client
5PKGNAME= google-api-go-client-20151217 5PKGNAME= google-api-go-client-20151217
6PKGREVISION= 2 6PKGREVISION= 3
7CATEGORIES= devel 7CATEGORIES= devel
8MASTER_SITES= ${MASTER_SITE_GITHUB:=google/} 8MASTER_SITES= ${MASTER_SITE_GITHUB:=google/}
9GITHUB_PROJECT= ${DISTNAME} 9GITHUB_PROJECT= ${DISTNAME}
10GITHUB_TAG= dc6d2353af 10GITHUB_TAG= dc6d2353af
11 11
12MAINTAINER= bsiegert@NetBSD.org 12MAINTAINER= bsiegert@NetBSD.org
13HOMEPAGE= http://google.golang.org/api/ 13HOMEPAGE= http://google.golang.org/api/
14COMMENT= Go client library for various Google APIs 14COMMENT= Go client library for various Google APIs
15LICENSE= modified-bsd 15LICENSE= modified-bsd
16 16
17GO_SRCPATH= google.golang.org/api 17GO_SRCPATH= google.golang.org/api
18GO_DIST_BASE= ${DISTNAME}-${GITHUB_TAG}* 18GO_DIST_BASE= ${DISTNAME}-${GITHUB_TAG}*
19 19
20.include "../../security/go-oauth2/buildlink3.mk" 20.include "../../security/go-oauth2/buildlink3.mk"
21.include "../../lang/go/go-package.mk" 21.include "../../lang/go/go-package.mk"
22.include "../../mk/bsd.pkg.mk" 22.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/net/gcloud-golang-metadata/Attic/Makefile (switch to unified diff)

--- pkgsrc/net/gcloud-golang-metadata/Attic/Makefile 2016/02/23 20:18:11 1.6
+++ pkgsrc/net/gcloud-golang-metadata/Attic/Makefile 2016/08/20 09:21:45 1.7
@@ -1,35 +1,35 @@ @@ -1,35 +1,35 @@
1# $NetBSD: Makefile,v 1.6 2016/02/23 20:18:11 bsiegert Exp $ 1# $NetBSD: Makefile,v 1.7 2016/08/20 09:21:45 bsiegert Exp $
2# 2#
3 3
4DISTNAME= gcloud-golang 4DISTNAME= gcloud-golang
5PKGNAME= gcloud-golang-metadata-20150310 5PKGNAME= gcloud-golang-metadata-20150310
6PKGREVISION= 3 6PKGREVISION= 4
7GITHUB_PROJECT= ${DISTNAME} 7GITHUB_PROJECT= ${DISTNAME}
8CATEGORIES= net 8CATEGORIES= net
9MASTER_SITES= ${MASTER_SITE_GITHUB:=GoogleCloudPlatform/} 9MASTER_SITES= ${MASTER_SITE_GITHUB:=GoogleCloudPlatform/}
10GITHUB_TAG= 9e1852f597 10GITHUB_TAG= 9e1852f597
11 11
12MAINTAINER= bsiegert@NetBSD.org 12MAINTAINER= bsiegert@NetBSD.org
13HOMEPAGE= http://golang.org/ 13HOMEPAGE= http://golang.org/
14COMMENT= Google Compute Engine metadata package 14COMMENT= Google Compute Engine metadata package
15LICENSE= modified-bsd 15LICENSE= modified-bsd
16 16
17GO_SRCPATH= google.golang.org/cloud 17GO_SRCPATH= google.golang.org/cloud
18GO_BUILD_PATTERN= ${GO_SRCPATH}/compute/metadata 18GO_BUILD_PATTERN= ${GO_SRCPATH}/compute/metadata
19GO_DIST_BASE= ${DISTNAME}-${GITHUB_TAG}* 19GO_DIST_BASE= ${DISTNAME}-${GITHUB_TAG}*
20 20
21# Remove all code except compute/metadata and internal 21# Remove all code except compute/metadata and internal
22pre-patch: 22pre-patch:
23 cd ${WRKSRC} && for i in *; do \ 23 cd ${WRKSRC} && for i in *; do \
24 case $$i in \ 24 case $$i in \
25 c*|i*) ;; \ 25 c*|i*) ;; \
26 *) ${RM} -fr $$i ;; \ 26 *) ${RM} -fr $$i ;; \
27 esac; \ 27 esac; \
28 done 28 done
29 ${RM} -fr ${WRKSRC}/cloud*go 29 ${RM} -fr ${WRKSRC}/cloud*go
30 ${RM} -fr ${WRKSRC}/internal/datastore 30 ${RM} -fr ${WRKSRC}/internal/datastore
31 ${RM} -fr ${WRKSRC}/internal/testutil 31 ${RM} -fr ${WRKSRC}/internal/testutil
32 32
33.include "../../net/go-net/buildlink3.mk" 33.include "../../net/go-net/buildlink3.mk"
34.include "../../lang/go/go-package.mk" 34.include "../../lang/go/go-package.mk"
35.include "../../mk/bsd.pkg.mk" 35.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/net/go-dns/Attic/Makefile (switch to unified diff)

--- pkgsrc/net/go-dns/Attic/Makefile 2016/07/15 19:58:09 1.1
+++ pkgsrc/net/go-dns/Attic/Makefile 2016/08/20 09:21:45 1.2
@@ -1,19 +1,20 @@ @@ -1,19 +1,20 @@
1# $NetBSD: Makefile,v 1.1 2016/07/15 19:58:09 bsiegert Exp $ 1# $NetBSD: Makefile,v 1.2 2016/08/20 09:21:45 bsiegert Exp $
2 2
3DISTNAME= go-dns-0.0.20160614 3DISTNAME= go-dns-0.0.20160614
 4PKGREVISION= 1
4CATEGORIES= net 5CATEGORIES= net
5MASTER_SITES= ${MASTER_SITE_GITHUB:=miekg/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=miekg/}
6GITHUB_PROJECT= dns 7GITHUB_PROJECT= dns
7GITHUB_TAG= 5d001d020961ae1c184f9f8152fdc73810481677 8GITHUB_TAG= 5d001d020961ae1c184f9f8152fdc73810481677
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://github.com/miekg/dns 11HOMEPAGE= https://github.com/miekg/dns
11COMMENT= Complete DNS library for Go. 12COMMENT= Complete DNS library for Go.
12LICENSE= modified-bsd 13LICENSE= modified-bsd
13 14
14WRKSRC= ${WRKDIR} 15WRKSRC= ${WRKDIR}
15GO_DIST_BASE= ${GITHUB_PROJECT}-${GITHUB_TAG} 16GO_DIST_BASE= ${GITHUB_PROJECT}-${GITHUB_TAG}
16GO_SRCPATH= github.com/miekg/dns 17GO_SRCPATH= github.com/miekg/dns
17 18
18.include "../../lang/go/go-package.mk" 19.include "../../lang/go/go-package.mk"
19.include "../../mk/bsd.pkg.mk" 20.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/net/go-net/Makefile (switch to unified diff)

--- pkgsrc/net/go-net/Makefile 2016/02/23 20:18:11 1.6
+++ pkgsrc/net/go-net/Makefile 2016/08/20 09:21:45 1.7
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1# $NetBSD: Makefile,v 1.6 2016/02/23 20:18:11 bsiegert Exp $ 1# $NetBSD: Makefile,v 1.7 2016/08/20 09:21:45 bsiegert Exp $
2# 2#
3 3
4DISTNAME= go-net-20151229 4DISTNAME= go-net-20151229
5PKGREVISION= 2 5PKGREVISION= 3
6CATEGORIES= net 6CATEGORIES= net
7MASTER_SITES= ${MASTER_SITE_GITHUB:=golang/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=golang/}
8GITHUB_PROJECT= net 8GITHUB_PROJECT= net
9GITHUB_TAG= 0cb26f788d 9GITHUB_TAG= 0cb26f788d
10 10
11MAINTAINER= bsiegert@NetBSD.org 11MAINTAINER= bsiegert@NetBSD.org
12HOMEPAGE= http://golang.org/ 12HOMEPAGE= http://golang.org/
13COMMENT= Supplementary network libraries for Go 13COMMENT= Supplementary network libraries for Go
14LICENSE= modified-bsd 14LICENSE= modified-bsd
15 15
16GO_SRCPATH= golang.org/x/net 16GO_SRCPATH= golang.org/x/net
17GO_DIST_BASE= ${GITHUB_PROJECT}-${GITHUB_TAG}* 17GO_DIST_BASE= ${GITHUB_PROJECT}-${GITHUB_TAG}*
18 18
19.include "../../textproc/go-text/buildlink3.mk" 19.include "../../textproc/go-text/buildlink3.mk"
20.include "../../security/go-crypto/buildlink3.mk" 20.include "../../security/go-crypto/buildlink3.mk"
21.include "../../lang/go/go-package.mk" 21.include "../../lang/go/go-package.mk"
22.include "../../mk/bsd.pkg.mk" 22.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/net/go-vultr/Attic/Makefile (switch to unified diff)

--- pkgsrc/net/go-vultr/Attic/Makefile 2016/07/16 13:31:20 1.1
+++ pkgsrc/net/go-vultr/Attic/Makefile 2016/08/20 09:21:46 1.2
@@ -1,26 +1,27 @@ @@ -1,26 +1,27 @@
1# $NetBSD: Makefile,v 1.1 2016/07/16 13:31:20 bsiegert Exp $ 1# $NetBSD: Makefile,v 1.2 2016/08/20 09:21:46 bsiegert Exp $
2 2
3DISTNAME= go-vultr-1.8 3DISTNAME= go-vultr-1.8
 4PKGREVISION= 1
4CATEGORIES= net 5CATEGORIES= net
5MASTER_SITES= ${MASTER_SITE_GITHUB:=JamesClonk/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=JamesClonk/}
6GITHUB_PROJECT= vultr 7GITHUB_PROJECT= vultr
7GITHUB_TAG= v1.8 8GITHUB_TAG= v1.8
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://jamesclonk.github.io/vultr/ 11HOMEPAGE= https://jamesclonk.github.io/vultr/
11COMMENT= Vultr CLI and API client library 12COMMENT= Vultr CLI and API client library
12LICENSE= mit 13LICENSE= mit
13 14
14WRKSRC= ${WRKDIR} 15WRKSRC= ${WRKDIR}
15GO_DIST_BASE= ${GITHUB_PROJECT}-${GITHUB_TAG:S/v//} 16GO_DIST_BASE= ${GITHUB_PROJECT}-${GITHUB_TAG:S/v//}
16GO_SRCPATH= github.com/JamesClonk/vultr 17GO_SRCPATH= github.com/JamesClonk/vultr
17 18
18post-patch: 19post-patch:
19 ${RM} -rf ${WRKSRC}/Godeps 20 ${RM} -rf ${WRKSRC}/Godeps
20 21
21.include "../../devel/go-mow-cli/buildlink3.mk" 22.include "../../devel/go-mow-cli/buildlink3.mk"
22.include "../../devel/go-ratelimit/buildlink3.mk" 23.include "../../devel/go-ratelimit/buildlink3.mk"
23.include "../../devel/go-testify/buildlink3.mk" 24.include "../../devel/go-testify/buildlink3.mk"
24.include "../../security/go-crypto/buildlink3.mk" 25.include "../../security/go-crypto/buildlink3.mk"
25.include "../../lang/go/go-package.mk" 26.include "../../lang/go/go-package.mk"
26.include "../../mk/bsd.pkg.mk" 27.include "../../mk/bsd.pkg.mk"
cvs diff -r1.25 -r1.26 pkgsrc/net/syncthing/Makefile (switch to unified diff)

--- pkgsrc/net/syncthing/Makefile 2016/08/16 09:06:56 1.25
+++ pkgsrc/net/syncthing/Makefile 2016/08/20 09:21:46 1.26
@@ -1,89 +1,90 @@ @@ -1,89 +1,90 @@
1# $NetBSD: Makefile,v 1.25 2016/08/16 09:06:56 abs Exp $ 1# $NetBSD: Makefile,v 1.26 2016/08/20 09:21:46 bsiegert Exp $
2 2
3# Upstream regularly breaks protocol compatibility. While users of 3# Upstream regularly breaks protocol compatibility. While users of
4# pkgsrc syncthing on multiple systems can update synchronously, an 4# pkgsrc syncthing on multiple systems can update synchronously, an
5# important use case is interoperating with syncthing-android. 5# important use case is interoperating with syncthing-android.
6# Therefore, pkgsrc will update to a new major version (e.g. 0.12.x vs 6# Therefore, pkgsrc will update to a new major version (e.g. 0.12.x vs
7# 0.11.x) when a corresponding syncthing-android version becomes 7# 0.11.x) when a corresponding syncthing-android version becomes
8# available in the f-droid.org repository: 8# available in the f-droid.org repository:
9# https://f-droid.org/repository/browse/?fdid=com.nutomic.syncthingandroid 9# https://f-droid.org/repository/browse/?fdid=com.nutomic.syncthingandroid
10# Updates to new major versions must be tested against the android 10# Updates to new major versions must be tested against the android
11# version from f-droid prior to commiting. (This is an attempt to 11# version from f-droid prior to commiting. (This is an attempt to
12# avoid having to version syncthing in pkgsrc.) 12# avoid having to version syncthing in pkgsrc.)
13# Note that the android versioning is disconnected from syncthing versioning; 13# Note that the android versioning is disconnected from syncthing versioning;
14# see https://github.com/syncthing/syncthing-android/issues/652 for 14# see https://github.com/syncthing/syncthing-android/issues/652 for
15# a fuller explanation. 15# a fuller explanation.
16DISTNAME= syncthing-0.14.4 16DISTNAME= syncthing-0.14.4
 17PKGREVISION= 1
17CATEGORIES= net 18CATEGORIES= net
18MASTER_SITES= ${MASTER_SITE_GITHUB:=syncthing/} 19MASTER_SITES= ${MASTER_SITE_GITHUB:=syncthing/}
19 20
20# Minor version updates may be committed without asking. Major 21# Minor version updates may be committed without asking. Major
21# updates not following the above policy will be reverted. 22# updates not following the above policy will be reverted.
22COMMENT= Keeps directories in sync across hosts 23COMMENT= Keeps directories in sync across hosts
23HOMEPAGE= http://syncthing.net/ 24HOMEPAGE= http://syncthing.net/
24MAINTAINER= gdt@NetBSD.org 25MAINTAINER= gdt@NetBSD.org
25LICENSE= mpl-2.0 26LICENSE= mpl-2.0
26 27
27# System pax fails on NetBSD 6. Just use gtar until this is understood. 28# System pax fails on NetBSD 6. Just use gtar until this is understood.
28EXTRACT_USING= gtar 29EXTRACT_USING= gtar
29 30
30GITHUB_TAG= v${PKGVERSION_NOREV} 31GITHUB_TAG= v${PKGVERSION_NOREV}
31 32
32BUILD_DEPENDS+= go-[0-9]*:../../lang/go 33BUILD_DEPENDS+= go-[0-9]*:../../lang/go
33 34
34USE_LANGUAGES= # go 35USE_LANGUAGES= # go
35NO_CONFIGURE= yes 36NO_CONFIGURE= yes
36 37
37INSTALLATION_DIRS= bin 38INSTALLATION_DIRS= bin
38 39
39# Go has very strong notions of how building is supposed to work, and 40# Go has very strong notions of how building is supposed to work, and
40# paths. Until 0.14, syncthing had symlink workarounds to have 41# paths. Until 0.14, syncthing had symlink workarounds to have
41# sources be found via a gopath directory. Then, building failed 42# sources be found via a gopath directory. Then, building failed
42# because the sources are not a subdirectory of a component of GOPATH.. 43# because the sources are not a subdirectory of a component of GOPATH..
43# See the following discussion for some hints. 44# See the following discussion for some hints.
44# http://stackoverflow.com/questions/18149601/go-install-always-fails-no-install-directory-outside-gopath#18164310 45# http://stackoverflow.com/questions/18149601/go-install-always-fails-no-install-directory-outside-gopath#18164310
45 46
46# Upstream's build instructions say to place tarball contents under a 47# Upstream's build instructions say to place tarball contents under a
47# particular named subdirectory of gopath: 48# particular named subdirectory of gopath:
48# https://docs.syncthing.net/dev/building.html 49# https://docs.syncthing.net/dev/building.html
49# We attempt to follow their instructions as closely as possible. 50# We attempt to follow their instructions as closely as possible.
50 51
51# We set up a gopath directory, and a directory where we will place 52# We set up a gopath directory, and a directory where we will place
52# the tarball contents. We use the non-standard variable name 53# the tarball contents. We use the non-standard variable name
53# WRKPLACE so that we can let WRKSRC refer to where pkgsrc naturally 54# WRKPLACE so that we can let WRKSRC refer to where pkgsrc naturally
54# unpacked the tarball. 55# unpacked the tarball.
55GOPATH= ${WRKDIR}/gopath 56GOPATH= ${WRKDIR}/gopath
56WRKPLACEP= ${GOPATH}/src/github.com/syncthing 57WRKPLACEP= ${GOPATH}/src/github.com/syncthing
57WRKPLACE= ${WRKPLACEP}/syncthing 58WRKPLACE= ${WRKPLACEP}/syncthing
58 59
59MAKE_ENV+= GOPATH=${GOPATH} 60MAKE_ENV+= GOPATH=${GOPATH}
60 61
61# This used to be set; there seems to be no reason any longer. To be 62# This used to be set; there seems to be no reason any longer. To be
62# pruned on 2016-11-04. 63# pruned on 2016-11-04.
63# INSTALL_UNSTRIPPED= yes 64# INSTALL_UNSTRIPPED= yes
64 65
65SUBST_CLASSES+= version 66SUBST_CLASSES+= version
66SUBST_STAGE.version= pre-build 67SUBST_STAGE.version= pre-build
67SUBST_MESSAGE.version= Fixing version string 68SUBST_MESSAGE.version= Fixing version string
68SUBST_FILES.version= build.go 69SUBST_FILES.version= build.go
69SUBST_SED.version= -e 's|runError("git", "describe", "--always", "--dirty")|runError("echo","v${PKGVERSION_NOREV}")|' 70SUBST_SED.version= -e 's|runError("git", "describe", "--always", "--dirty")|runError("echo","v${PKGVERSION_NOREV}")|'
70SUBST_SED.version+= -e 's|runError("git", "show", "-s", "--format=%ct")|runError("false")|' 71SUBST_SED.version+= -e 's|runError("git", "show", "-s", "--format=%ct")|runError("false")|'
71 72
72# Create WRKPLACE's parent, but not WRKPLACE. Move the contents of 73# Create WRKPLACE's parent, but not WRKPLACE. Move the contents of
73# the distribution tarball to the directory name desired by upstream's 74# the distribution tarball to the directory name desired by upstream's
74# build instructions. Make a symlink so that the rest of the pkgsrc 75# build instructions. Make a symlink so that the rest of the pkgsrc
75# machinery that expects ${WRKSRC} to contain the tarball contents 76# machinery that expects ${WRKSRC} to contain the tarball contents
76# works. 77# works.
77post-extract: 78post-extract:
78 ${MKDIR} ${GOPATH}/src/github.com/syncthing/ 79 ${MKDIR} ${GOPATH}/src/github.com/syncthing/
79 ${MV} ${WRKSRC} ${WRKPLACE} 80 ${MV} ${WRKSRC} ${WRKPLACE}
80 ${LN} -s ${WRKPLACE} ${WRKSRC} 81 ${LN} -s ${WRKPLACE} ${WRKSRC}
81 82
82do-build: 83do-build:
83 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/go run build.go 84 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/go run build.go
84 85
85# Binaries other than syncthing proper should perhaps be installed. 86# Binaries other than syncthing proper should perhaps be installed.
86do-install: 87do-install:
87 ${INSTALL_PROGRAM} ${WRKSRC}/bin/syncthing ${DESTDIR}/${PREFIX}/bin 88 ${INSTALL_PROGRAM} ${WRKSRC}/bin/syncthing ${DESTDIR}/${PREFIX}/bin
88 89
89.include "../../mk/bsd.pkg.mk" 90.include "../../mk/bsd.pkg.mk"
cvs diff -r1.492 -r1.493 pkgsrc/pkgtools/pkglint/Makefile (switch to unified diff)

--- pkgsrc/pkgtools/pkglint/Makefile 2016/07/10 21:24:47 1.492
+++ pkgsrc/pkgtools/pkglint/Makefile 2016/08/20 09:21:46 1.493
@@ -1,53 +1,54 @@ @@ -1,53 +1,54 @@
1# $NetBSD: Makefile,v 1.492 2016/07/10 21:24:47 rillig Exp $ 1# $NetBSD: Makefile,v 1.493 2016/08/20 09:21:46 bsiegert Exp $
2 2
3PKGNAME= pkglint-5.4.7 3PKGNAME= pkglint-5.4.7
 4PKGREVISION= 1
4DISTFILES= # none 5DISTFILES= # none
5CATEGORIES= pkgtools 6CATEGORIES= pkgtools
6 7
7OWNER= rillig@NetBSD.org 8OWNER= rillig@NetBSD.org
8HOMEPAGE= http://www.NetBSD.org/docs/pkgsrc/ 9HOMEPAGE= http://www.NetBSD.org/docs/pkgsrc/
9COMMENT= Verifier for NetBSD packages 10COMMENT= Verifier for NetBSD packages
10LICENSE= 2-clause-bsd 11LICENSE= 2-clause-bsd
11CONFLICTS+= pkglint4-[0-9]* 12CONFLICTS+= pkglint4-[0-9]*
12 13
13WRKSRC= ${WRKDIR}/netbsd.org/pkglint 14WRKSRC= ${WRKDIR}/netbsd.org/pkglint
14NO_CHECKSUM= yes 15NO_CHECKSUM= yes
15USE_LANGUAGES= # none 16USE_LANGUAGES= # none
16USE_TOOLS+= pax 17USE_TOOLS+= pax
17AUTO_MKDIRS= yes 18AUTO_MKDIRS= yes
18GO_SRCPATH= netbsd.org/pkglint 19GO_SRCPATH= netbsd.org/pkglint
19 20
20SUBST_CLASSES+= pkglint 21SUBST_CLASSES+= pkglint
21SUBST_STAGE.pkglint= post-configure 22SUBST_STAGE.pkglint= post-configure
22SUBST_FILES.pkglint+= main.go package_test.go 23SUBST_FILES.pkglint+= main.go package_test.go
23SUBST_SED.pkglint+= -e s\|@VERSION@\|${PKGNAME:S/pkglint-//}\|g 24SUBST_SED.pkglint+= -e s\|@VERSION@\|${PKGNAME:S/pkglint-//}\|g
24SUBST_SED.pkglint+= -e s\|@BMAKE@\|${MAKE:Q}\|g 25SUBST_SED.pkglint+= -e s\|@BMAKE@\|${MAKE:Q}\|g
25 26
26do-extract: 27do-extract:
27 ${RUN} mkdir -p ${WRKDIR}/pkglint/plist-clash 28 ${RUN} mkdir -p ${WRKDIR}/pkglint/plist-clash
28 ${RUN} cd ${FILESDIR} && ${PAX} -rw *.go *.y */*.go pkglint.[01] ${WRKDIR}/pkglint 29 ${RUN} cd ${FILESDIR} && ${PAX} -rw *.go *.y */*.go pkglint.[01] ${WRKDIR}/pkglint
29 30
30pre-build: 31pre-build:
31 ${RUN} env GOPATH=${WRKDIR}:${BUILDLINK_DIR}/gopkg go generate ${GO_BUILD_PATTERN} 32 ${RUN} env GOPATH=${WRKDIR}:${BUILDLINK_DIR}/gopkg go generate ${GO_BUILD_PATTERN}
32 33
33do-install: do-install-man 34do-install: do-install-man
34 35
35.include "../../mk/bsd.prefs.mk" 36.include "../../mk/bsd.prefs.mk"
36 37
37do-install-man: .PHONY 38do-install-man: .PHONY
38.if !empty(MANINSTALL:Mcatinstall) 39.if !empty(MANINSTALL:Mcatinstall)
39. if defined(CATMAN_SECTION_SUFFIX) && !empty(CATMAN_SECTION_SUFFIX:M[Yy][Ee][Ss]) 40. if defined(CATMAN_SECTION_SUFFIX) && !empty(CATMAN_SECTION_SUFFIX:M[Yy][Ee][Ss])
40 ${INSTALL_MAN} ${WRKSRC}/pkglint.0 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1/pkglint.1 41 ${INSTALL_MAN} ${WRKSRC}/pkglint.0 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1/pkglint.1
41. else 42. else
42 ${INSTALL_MAN} ${WRKSRC}/pkglint.0 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1 43 ${INSTALL_MAN} ${WRKSRC}/pkglint.0 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1
43. endif 44. endif
44.endif 45.endif
45.if !empty(MANINSTALL:Mmaninstall) 46.if !empty(MANINSTALL:Mmaninstall)
46 ${INSTALL_MAN} ${WRKSRC}/pkglint.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 47 ${INSTALL_MAN} ${WRKSRC}/pkglint.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
47.endif 48.endif
48 49
49.include "../../lang/go/go-package.mk" 50.include "../../lang/go/go-package.mk"
50.if !empty(PKGSRC_RUN_TEST:M[yY][eE][sS]) 51.if !empty(PKGSRC_RUN_TEST:M[yY][eE][sS])
51.include "../../devel/go-check/buildlink3.mk" 52.include "../../devel/go-check/buildlink3.mk"
52.endif 53.endif
53.include "../../mk/bsd.pkg.mk" 54.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/security/go-crypto/Makefile (switch to unified diff)

--- pkgsrc/security/go-crypto/Makefile 2016/02/23 20:18:12 1.2
+++ pkgsrc/security/go-crypto/Makefile 2016/08/20 09:21:46 1.3
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.2 2016/02/23 20:18:12 bsiegert Exp $ 1# $NetBSD: Makefile,v 1.3 2016/08/20 09:21:46 bsiegert Exp $
2 2
3DISTNAME= go-crypto-0.0.20151215 3DISTNAME= go-crypto-0.0.20151215
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= security 5CATEGORIES= security
6MASTER_SITES= ${MASTER_SITE_GITHUB:=golang/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=golang/}
7GITHUB_PROJECT= crypto 7GITHUB_PROJECT= crypto
8GITHUB_TAG= f18420efc3b4f8e9f3d51f6bd2476e92c46260e9 8GITHUB_TAG= f18420efc3b4f8e9f3d51f6bd2476e92c46260e9
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://github.com/golang/crypto/ 11HOMEPAGE= https://github.com/golang/crypto/
12COMMENT= Go supplementary cryptography libraries 12COMMENT= Go supplementary cryptography libraries
13LICENSE= modified-bsd 13LICENSE= modified-bsd
14 14
15WRKSRC= ${WRKDIR} 15WRKSRC= ${WRKDIR}
16GO_DIST_BASE= ${GITHUB_PROJECT}-${GITHUB_TAG} 16GO_DIST_BASE= ${GITHUB_PROJECT}-${GITHUB_TAG}
17GO_SRCPATH= golang.org/x/crypto 17GO_SRCPATH= golang.org/x/crypto
18 18
19.include "../../lang/go/go-package.mk" 19.include "../../lang/go/go-package.mk"
20.include "../../mk/bsd.pkg.mk" 20.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/security/go-oauth2/Attic/Makefile (switch to unified diff)

--- pkgsrc/security/go-oauth2/Attic/Makefile 2016/02/23 20:18:12 1.5
+++ pkgsrc/security/go-oauth2/Attic/Makefile 2016/08/20 09:21:46 1.6
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1# $NetBSD: Makefile,v 1.5 2016/02/23 20:18:12 bsiegert Exp $ 1# $NetBSD: Makefile,v 1.6 2016/08/20 09:21:46 bsiegert Exp $
2# 2#
3 3
4DISTNAME= oauth2 4DISTNAME= oauth2
5PKGNAME= go-${DISTNAME}-20151204 5PKGNAME= go-${DISTNAME}-20151204
6PKGREVISION= 2 6PKGREVISION= 3
7GITHUB_PROJECT= ${DISTNAME} 7GITHUB_PROJECT= ${DISTNAME}
8CATEGORIES= security 8CATEGORIES= security
9MASTER_SITES= ${MASTER_SITE_GITHUB:=golang/} 9MASTER_SITES= ${MASTER_SITE_GITHUB:=golang/}
10GITHUB_TAG= 2baa8a1b93 10GITHUB_TAG= 2baa8a1b93
11 11
12MAINTAINER= bsiegert@NetBSD.org 12MAINTAINER= bsiegert@NetBSD.org
13HOMEPAGE= http://golang.org/ 13HOMEPAGE= http://golang.org/
14COMMENT= OAuth 2 library for Go 14COMMENT= OAuth 2 library for Go
15LICENSE= modified-bsd 15LICENSE= modified-bsd
16 16
17GO_SRCPATH= golang.org/x/oauth2 17GO_SRCPATH= golang.org/x/oauth2
18GO_DIST_BASE= ${DISTNAME}-${GITHUB_TAG}* 18GO_DIST_BASE= ${DISTNAME}-${GITHUB_TAG}*
19 19
20.include "../../textproc/go-text/buildlink3.mk" 20.include "../../textproc/go-text/buildlink3.mk"
21.include "../../net/gcloud-golang-metadata/buildlink3.mk" 21.include "../../net/gcloud-golang-metadata/buildlink3.mk"
22.include "../../lang/go/go-package.mk" 22.include "../../lang/go/go-package.mk"
23.include "../../mk/bsd.pkg.mk" 23.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/security/vault/Makefile (switch to unified diff)

--- pkgsrc/security/vault/Makefile 2016/05/06 13:35:52 1.1
+++ pkgsrc/security/vault/Makefile 2016/08/20 09:21:46 1.2
@@ -1,36 +1,37 @@ @@ -1,36 +1,37 @@
1# $NetBSD: Makefile,v 1.1 2016/05/06 13:35:52 fhajny Exp $ 1# $NetBSD: Makefile,v 1.2 2016/08/20 09:21:46 bsiegert Exp $
2 2
3DISTNAME= vault-0.5.2 3DISTNAME= vault-0.5.2
 4PKGREVISION= 1
4CATEGORIES= security 5CATEGORIES= security
5MASTER_SITES= ${MASTER_SITE_GITHUB:=hashicorp/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=hashicorp/}
6 7
7MAINTAINER= filip@joyent.com 8MAINTAINER= filip@joyent.com
8HOMEPAGE= http://www.vaultproject.io/ 9HOMEPAGE= http://www.vaultproject.io/
9COMMENT= Tool for managing secrets 10COMMENT= Tool for managing secrets
10LICENSE= mpl-2.0 11LICENSE= mpl-2.0
11 12
12GITHUB_TAG= v${PKGVERSION_NOREV} 13GITHUB_TAG= v${PKGVERSION_NOREV}
13 14
14WRKSRC= ${WRKDIR}/src/github.com/hashicorp/vault 15WRKSRC= ${WRKDIR}/src/github.com/hashicorp/vault
15 16
16.include "../../lang/go/version.mk" 17.include "../../lang/go/version.mk"
17 18
18BUILD_DEPENDS+= go-${GO_VERSION}*:../../lang/go 19BUILD_DEPENDS+= go-${GO_VERSION}*:../../lang/go
19 20
20USE_TOOLS+= bash gmake 21USE_TOOLS+= bash gmake
21 22
22MAKE_ENV+= GOPATH=${WRKDIR}:${PREFIX}/gopkg 23MAKE_ENV+= GOPATH=${WRKDIR}:${PREFIX}/gopkg
23 24
24INSTALLATION_DIRS+= bin 25INSTALLATION_DIRS+= bin
25 26
26post-extract: 27post-extract:
27 ${MKDIR} ${WRKSRC} 28 ${MKDIR} ${WRKSRC}
28 ${MV} ${WRKDIR}/${DISTNAME}/* ${WRKSRC} 29 ${MV} ${WRKDIR}/${DISTNAME}/* ${WRKSRC}
29 30
30do-build: 31do-build:
31 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} go build -o bin/vault 32 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} go build -o bin/vault
32 33
33do-install: 34do-install:
34 ${INSTALL_PROGRAM} ${WRKSRC}/bin/vault ${DESTDIR}${PREFIX}/bin 35 ${INSTALL_PROGRAM} ${WRKSRC}/bin/vault ${DESTDIR}${PREFIX}/bin
35 36
36.include "../../mk/bsd.pkg.mk" 37.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/sysutils/consul/Makefile (switch to unified diff)

--- pkgsrc/sysutils/consul/Makefile 2016/06/07 18:00:20 1.2
+++ pkgsrc/sysutils/consul/Makefile 2016/08/20 09:21:46 1.3
@@ -1,39 +1,40 @@ @@ -1,39 +1,40 @@
1# $NetBSD: Makefile,v 1.2 2016/06/07 18:00:20 joerg Exp $ 1# $NetBSD: Makefile,v 1.3 2016/08/20 09:21:46 bsiegert Exp $
2 2
3DISTNAME= consul-0.6.4 3DISTNAME= consul-0.6.4
 4PKGREVISION= 1
4CATEGORIES= sysutils 5CATEGORIES= sysutils
5MASTER_SITES= ${MASTER_SITE_GITHUB:=hashicorp/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=hashicorp/}
6 7
7MAINTAINER= filip@joyent.com 8MAINTAINER= filip@joyent.com
8HOMEPAGE= http://www.consul.io/ 9HOMEPAGE= http://www.consul.io/
9COMMENT= Tool for service discovery, monitoring and configuration 10COMMENT= Tool for service discovery, monitoring and configuration
10LICENSE= mpl-2.0 11LICENSE= mpl-2.0
11 12
12EXTRACT_USING= bsdtar 13EXTRACT_USING= bsdtar
13 14
14GITHUB_TAG= v${PKGVERSION_NOREV} 15GITHUB_TAG= v${PKGVERSION_NOREV}
15 16
16WRKSRC= ${WRKDIR}/src/github.com/hashicorp/consul 17WRKSRC= ${WRKDIR}/src/github.com/hashicorp/consul
17 18
18.include "../../lang/go/version.mk" 19.include "../../lang/go/version.mk"
19 20
20BUILD_DEPENDS+= go-${GO_VERSION}*:../../lang/go 21BUILD_DEPENDS+= go-${GO_VERSION}*:../../lang/go
21 22
22USE_LANGUAGES= c 23USE_LANGUAGES= c
23USE_TOOLS+= bash gmake 24USE_TOOLS+= bash gmake
24 25
25MAKE_ENV+= GOPATH=${WRKDIR}:${PREFIX}/gopkg 26MAKE_ENV+= GOPATH=${WRKDIR}:${PREFIX}/gopkg
26 27
27INSTALLATION_DIRS+= bin 28INSTALLATION_DIRS+= bin
28 29
29post-extract: 30post-extract:
30 ${MKDIR} ${WRKSRC} 31 ${MKDIR} ${WRKSRC}
31 ${MV} ${WRKDIR}/${DISTNAME}/* ${WRKSRC} 32 ${MV} ${WRKDIR}/${DISTNAME}/* ${WRKSRC}
32 33
33do-build: 34do-build:
34 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} go build -o bin/consul 35 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} go build -o bin/consul
35 36
36do-install: 37do-install:
37 ${INSTALL_PROGRAM} ${WRKSRC}/bin/consul ${DESTDIR}${PREFIX}/bin 38 ${INSTALL_PROGRAM} ${WRKSRC}/bin/consul ${DESTDIR}${PREFIX}/bin
38 39
39.include "../../mk/bsd.pkg.mk" 40.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/sysutils/facette/Attic/Makefile (switch to unified diff)

--- pkgsrc/sysutils/facette/Attic/Makefile 2016/03/14 12:55:40 1.6
+++ pkgsrc/sysutils/facette/Attic/Makefile 2016/08/20 09:21:46 1.7
@@ -1,111 +1,111 @@ @@ -1,111 +1,111 @@
1# $NetBSD: Makefile,v 1.6 2016/03/14 12:55:40 imil Exp $ 1# $NetBSD: Makefile,v 1.7 2016/08/20 09:21:46 bsiegert Exp $
2 2
3DISTNAME= facette-0.4.0dev 3DISTNAME= facette-0.4.0dev
4PKGREVISION= 6 4PKGREVISION= 7
5CATEGORIES= sysutils 5CATEGORIES= sysutils
6MASTER_SITES= ${MASTER_SITE_GITHUB:=facette/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=facette/}
7 7
8MAINTAINER= imil@NetBSD.org 8MAINTAINER= imil@NetBSD.org
9HOMEPAGE= https://facette.io/ 9HOMEPAGE= https://facette.io/
10COMMENT= Time series data visualization and graphing 10COMMENT= Time series data visualization and graphing
11LICENSE= modified-bsd 11LICENSE= modified-bsd
12 12
13GITHUB_PROJECT= facette 13GITHUB_PROJECT= facette
14GITHUB_TAG= d77e77680d52d232305d0f12af6e3e1c857903cb 14GITHUB_TAG= d77e77680d52d232305d0f12af6e3e1c857903cb
15 15
16EXTRACT_USING= bsdtar 16EXTRACT_USING= bsdtar
17 17
18USE_TOOLS+= bsdtar gmake gsed pax pkg-config 18USE_TOOLS+= bsdtar gmake gsed pax pkg-config
19BUILD_DEPENDS+= go-[0-9]*:../../lang/go 19BUILD_DEPENDS+= go-[0-9]*:../../lang/go
20BUILD_DEPENDS+= nodejs-[0-9]*:../../lang/nodejs 20BUILD_DEPENDS+= nodejs-[0-9]*:../../lang/nodejs
21 21
22BUILD_DEFS+= VARBASE 22BUILD_DEFS+= VARBASE
23 23
24SUBST_CLASSES+= prefix 24SUBST_CLASSES+= prefix
25SUBST_MESSAGE.prefix= Fixing prefix. 25SUBST_MESSAGE.prefix= Fixing prefix.
26SUBST_STAGE.prefix= pre-build 26SUBST_STAGE.prefix= pre-build
27SUBST_FILES.prefix= Makefile docs/examples/facette.json 27SUBST_FILES.prefix= Makefile docs/examples/facette.json
28SUBST_SED.prefix= -e 's,/usr/local,${PREFIX},g' 28SUBST_SED.prefix= -e 's,/usr/local,${PREFIX},g'
29 29
30SUBST_CLASSES+= conf 30SUBST_CLASSES+= conf
31SUBST_MESSAGE.conf= Fixing configuration path. 31SUBST_MESSAGE.conf= Fixing configuration path.
32SUBST_STAGE.conf= pre-build 32SUBST_STAGE.conf= pre-build
33SUBST_FILES.conf= cmd/facette/facette.go \ 33SUBST_FILES.conf= cmd/facette/facette.go \
34 cmd/facettectl/facettectl.go \ 34 cmd/facettectl/facettectl.go \
35 docs/examples/facette.json \ 35 docs/examples/facette.json \
36 docs/man/facette.1.md \ 36 docs/man/facette.1.md \
37 docs/man/facettectl.8.md \ 37 docs/man/facettectl.8.md \
38 pkg/config/config.go 38 pkg/config/config.go
39SUBST_SED.conf= -e 's,/etc,${PKG_SYSCONFDIR},g' 39SUBST_SED.conf= -e 's,/etc,${PKG_SYSCONFDIR},g'
40 40
41SUBST_CLASSES+= rrd 41SUBST_CLASSES+= rrd
42SUBST_MESSAGE.rrd= Fixing collectd rrd path. 42SUBST_MESSAGE.rrd= Fixing collectd rrd path.
43SUBST_STAGE.rrd= pre-build 43SUBST_STAGE.rrd= pre-build
44SUBST_FILES.rrd= docs/examples/providers/collectd.json 44SUBST_FILES.rrd= docs/examples/providers/collectd.json
45SUBST_SED.rrd= -e 's,/var/lib,${VARBASE}/db,g' 45SUBST_SED.rrd= -e 's,/var/lib,${VARBASE}/db,g'
46 46
47CHECK_PORTABILITY_SKIP= vendor/src/github.com/influxdb/influxdb/configure 47CHECK_PORTABILITY_SKIP= vendor/src/github.com/influxdb/influxdb/configure
48 48
49.include "../../mk/bsd.prefs.mk" 49.include "../../mk/bsd.prefs.mk"
50 50
51FACETTE_USER?= facette 51FACETTE_USER?= facette
52FACETTE_GROUP?= facette 52FACETTE_GROUP?= facette
53 53
54RCD_SCRIPTS+= facette 54RCD_SCRIPTS+= facette
55RCD_SCRIPT_SRC.facette= ${FILESDIR}/facette.sh 55RCD_SCRIPT_SRC.facette= ${FILESDIR}/facette.sh
56 56
57FACETTE_DOCDIR= ${PREFIX}/share/doc/facette 57FACETTE_DOCDIR= ${PREFIX}/share/doc/facette
58FACETTE_HTDOCS= ${PREFIX}/share/facette 58FACETTE_HTDOCS= ${PREFIX}/share/facette
59FACETTE_DATADIR= ${VARBASE}/lib/facette 59FACETTE_DATADIR= ${VARBASE}/lib/facette
60FACETTE_LOGDIR= ${VARBASE}/log/facette 60FACETTE_LOGDIR= ${VARBASE}/log/facette
61EGDIR= ${PREFIX}/share/examples/facette 61EGDIR= ${PREFIX}/share/examples/facette
62 62
63INSTALLATION_DIRS+= bin ${EGDIR} ${FACETTE_DOCDIR} 63INSTALLATION_DIRS+= bin ${EGDIR} ${FACETTE_DOCDIR}
64INSTALLATION_DIRS+= ${FACETTE_HTDOCS}/template ${FACETTE_HTDOCS}/static 64INSTALLATION_DIRS+= ${FACETTE_HTDOCS}/template ${FACETTE_HTDOCS}/static
65 65
66OWN_DIRS+= ${PKG_SYSCONFDIR}/facette 66OWN_DIRS+= ${PKG_SYSCONFDIR}/facette
67OWN_DIRS+= ${PKG_SYSCONFDIR}/facette/providers 67OWN_DIRS+= ${PKG_SYSCONFDIR}/facette/providers
68OWN_DIRS+= ${VARBASE}/run/facette 68OWN_DIRS+= ${VARBASE}/run/facette
69OWN_DIRS+= ${FACETTE_DATADIR} ${FACETTE_LOGDIR} 69OWN_DIRS+= ${FACETTE_DATADIR} ${FACETTE_LOGDIR}
70 70
71OWN_DIRS_PERMS+= ${VARBASE}/run/facette \ 71OWN_DIRS_PERMS+= ${VARBASE}/run/facette \
72 ${FACETTE_USER} ${FACETTE_GROUP} 0755 72 ${FACETTE_USER} ${FACETTE_GROUP} 0755
73OWN_DIRS_PERMS+= ${FACETTE_DATADIR} \ 73OWN_DIRS_PERMS+= ${FACETTE_DATADIR} \
74 ${FACETTE_USER} ${FACETTE_GROUP} 0755 74 ${FACETTE_USER} ${FACETTE_GROUP} 0755
75OWN_DIRS_PERMS+= ${FACETTE_LOGDIR} \ 75OWN_DIRS_PERMS+= ${FACETTE_LOGDIR} \
76 ${FACETTE_USER} ${FACETTE_GROUP} 0755 76 ${FACETTE_USER} ${FACETTE_GROUP} 0755
77 77
78PKG_GROUPS+= ${FACETTE_GROUP} 78PKG_GROUPS+= ${FACETTE_GROUP}
79PKG_USERS+= ${FACETTE_USER}:${FACETTE_GROUP} 79PKG_USERS+= ${FACETTE_USER}:${FACETTE_GROUP}
80PKG_GECOS.${FACETTE_USER}= Facette daemon user 80PKG_GECOS.${FACETTE_USER}= Facette daemon user
81PKG_HOME.${FACETTE_USER}= ${FACETTE_DATADIR} 81PKG_HOME.${FACETTE_USER}= ${FACETTE_DATADIR}
82 82
83FILES_SUBST+= FACETTE_USER=${FACETTE_USER} 83FILES_SUBST+= FACETTE_USER=${FACETTE_USER}
84FILES_SUBST+= FACETTE_GROUP=${FACETTE_GROUP} 84FILES_SUBST+= FACETTE_GROUP=${FACETTE_GROUP}
85FILES_SUBST+= FACETTE_LOGDIR=${FACETTE_LOGDIR} 85FILES_SUBST+= FACETTE_LOGDIR=${FACETTE_LOGDIR}
86 86
87CONF_FILES+= ${EGDIR}/facette.json \ 87CONF_FILES+= ${EGDIR}/facette.json \
88 ${PKG_SYSCONFDIR}/facette/facette.json 88 ${PKG_SYSCONFDIR}/facette/facette.json
89CONF_FILES+= ${EGDIR}/providers/collectd.json \ 89CONF_FILES+= ${EGDIR}/providers/collectd.json \
90 ${PKG_SYSCONFDIR}/facette/providers/collectd.json 90 ${PKG_SYSCONFDIR}/facette/providers/collectd.json
91 91
92CGO_LDFLAGS= -L${PREFIX}/lib ${COMPILER_RPATH_FLAG},${PREFIX}/lib 92CGO_LDFLAGS= -L${PREFIX}/lib ${COMPILER_RPATH_FLAG},${PREFIX}/lib
93 93
94do-build: 94do-build:
95 cd ${WRKSRC} && CGO_LDFLAGS=${CGO_LDFLAGS:Q} ${GMAKE} build 95 cd ${WRKSRC} && CGO_LDFLAGS=${CGO_LDFLAGS:Q} ${GMAKE} build
96 96
97do-install: 97do-install:
98 ${INSTALL_PROGRAM} ${WRKSRC}/build/*/bin/facette \ 98 ${INSTALL_PROGRAM} ${WRKSRC}/build/*/bin/facette \
99 ${DESTDIR}${PREFIX}/bin/ 99 ${DESTDIR}${PREFIX}/bin/
100 ${INSTALL_PROGRAM} ${WRKSRC}/build/*/bin/facettectl \ 100 ${INSTALL_PROGRAM} ${WRKSRC}/build/*/bin/facettectl \
101 ${DESTDIR}${PREFIX}/bin/ 101 ${DESTDIR}${PREFIX}/bin/
102 cd ${WRKSRC}/docs/man && ${PAX} -rw * ${DESTDIR}${FACETTE_DOCDIR} 102 cd ${WRKSRC}/docs/man && ${PAX} -rw * ${DESTDIR}${FACETTE_DOCDIR}
103 cd ${WRKSRC}/docs/examples && ${PAX} -rw * ${DESTDIR}${EGDIR} 103 cd ${WRKSRC}/docs/examples && ${PAX} -rw * ${DESTDIR}${EGDIR}
104 cd ${WRKSRC}/build/*/template && \ 104 cd ${WRKSRC}/build/*/template && \
105 ${PAX} -rw * ${DESTDIR}${FACETTE_HTDOCS}/template 105 ${PAX} -rw * ${DESTDIR}${FACETTE_HTDOCS}/template
106 cd ${WRKSRC}/build/*/static && \ 106 cd ${WRKSRC}/build/*/static && \
107 ${PAX} -rw * ${DESTDIR}${FACETTE_HTDOCS}/static 107 ${PAX} -rw * ${DESTDIR}${FACETTE_HTDOCS}/static
108 108
109 109
110.include "../../databases/rrdtool/buildlink3.mk" 110.include "../../databases/rrdtool/buildlink3.mk"
111.include "../../mk/bsd.pkg.mk" 111.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/textproc/go-runewidth/Attic/Makefile (switch to unified diff)

--- pkgsrc/textproc/go-runewidth/Attic/Makefile 2016/08/13 20:21:08 1.1
+++ pkgsrc/textproc/go-runewidth/Attic/Makefile 2016/08/20 09:21:46 1.2
@@ -1,19 +1,20 @@ @@ -1,19 +1,20 @@
1# $NetBSD: Makefile,v 1.1 2016/08/13 20:21:08 bsiegert Exp $ 1# $NetBSD: Makefile,v 1.2 2016/08/20 09:21:46 bsiegert Exp $
2 2
3DISTNAME= go-runewidth-0.0.1 3DISTNAME= go-runewidth-0.0.1
 4PKGREVISION= 1
4CATEGORIES= textproc 5CATEGORIES= textproc
5MASTER_SITES= ${MASTER_SITE_GITHUB:=mattn/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=mattn/}
6GITHUB_PROJECT= go-runewidth 7GITHUB_PROJECT= go-runewidth
7GITHUB_TAG= v0.0.1 8GITHUB_TAG= v0.0.1
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://github.com/mattn/go-runewidth 11HOMEPAGE= https://github.com/mattn/go-runewidth
11COMMENT= Provides functions to get fixed width of a string 12COMMENT= Provides functions to get fixed width of a string
12LICENSE= mit 13LICENSE= mit
13 14
14WRKSRC= ${WRKDIR} 15WRKSRC= ${WRKDIR}
15GO_DIST_BASE= ${GITHUB_PROJECT}-${GITHUB_TAG:S/v//} 16GO_DIST_BASE= ${GITHUB_PROJECT}-${GITHUB_TAG:S/v//}
16GO_SRCPATH= github.com/mattn/go-runewidth 17GO_SRCPATH= github.com/mattn/go-runewidth
17 18
18.include "../../lang/go/go-package.mk" 19.include "../../lang/go/go-package.mk"
19.include "../../mk/bsd.pkg.mk" 20.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.8 pkgsrc/textproc/go-text/Makefile (switch to unified diff)

--- pkgsrc/textproc/go-text/Makefile 2016/02/23 20:18:12 1.7
+++ pkgsrc/textproc/go-text/Makefile 2016/08/20 09:21:46 1.8
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1# $NetBSD: Makefile,v 1.7 2016/02/23 20:18:12 bsiegert Exp $ 1# $NetBSD: Makefile,v 1.8 2016/08/20 09:21:46 bsiegert Exp $
2# 2#
3 3
4DISTNAME= go-text-20151217 4DISTNAME= go-text-20151217
5PKGREVISION= 2 5PKGREVISION= 3
6CATEGORIES= textproc 6CATEGORIES= textproc
7MASTER_SITES= ${MASTER_SITE_GITHUB:=golang/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=golang/}
8GITHUB_PROJECT= text 8GITHUB_PROJECT= text
9GITHUB_TAG= cf4986612c 9GITHUB_TAG= cf4986612c
10 10
11MAINTAINER= bsiegert@NetBSD.org 11MAINTAINER= bsiegert@NetBSD.org
12HOMEPAGE= http://golang.org/ 12HOMEPAGE= http://golang.org/
13COMMENT= Supplementary text processing libraries for Go 13COMMENT= Supplementary text processing libraries for Go
14LICENSE= modified-bsd 14LICENSE= modified-bsd
15 15
16GO_SRCPATH= golang.org/x/text 16GO_SRCPATH= golang.org/x/text
17GO_DIST_BASE= ${GITHUB_PROJECT}-${GITHUB_TAG}* 17GO_DIST_BASE= ${GITHUB_PROJECT}-${GITHUB_TAG}*
18 18
19 19
20.include "../../lang/go/go-package.mk" 20.include "../../lang/go/go-package.mk"
21.include "../../mk/bsd.pkg.mk" 21.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/textproc/sift/Makefile (switch to unified diff)

--- pkgsrc/textproc/sift/Makefile 2016/02/23 20:18:12 1.3
+++ pkgsrc/textproc/sift/Makefile 2016/08/20 09:21:46 1.4
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1# $NetBSD: Makefile,v 1.3 2016/02/23 20:18:12 bsiegert Exp $ 1# $NetBSD: Makefile,v 1.4 2016/08/20 09:21:46 bsiegert Exp $
2 2
3DISTNAME= sift-0.6.0 3DISTNAME= sift-0.6.0
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= textproc 5CATEGORIES= textproc
6MASTER_SITES= ${MASTER_SITE_GITHUB:=svent/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=svent/}
7GITHUB_TAG= v${PKGVERSION_NOREV} 7GITHUB_TAG= v${PKGVERSION_NOREV}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://sift-tool.org/ 10HOMEPAGE= https://sift-tool.org/
11COMMENT= Fast and powerful open source alternative to grep 11COMMENT= Fast and powerful open source alternative to grep
12LICENSE= gnu-gpl-v3 12LICENSE= gnu-gpl-v3
13 13
14GO_DIST_BASE= ${DISTNAME} 14GO_DIST_BASE= ${DISTNAME}
15GO_SRCPATH= github.com/svent/sift 15GO_SRCPATH= github.com/svent/sift
16 16
17.include "../../security/go-crypto/buildlink3.mk" 17.include "../../security/go-crypto/buildlink3.mk"
18.include "../../devel/go-nbreader/buildlink3.mk" 18.include "../../devel/go-nbreader/buildlink3.mk"
19.include "../../devel/go-flags-svent/buildlink3.mk" 19.include "../../devel/go-flags-svent/buildlink3.mk"
20.include "../../lang/go/go-package.mk" 20.include "../../lang/go/go-package.mk"
21.include "../../mk/bsd.pkg.mk" 21.include "../../mk/bsd.pkg.mk"