Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 22 Apr 2016 12:40:05 +0000 (UTC)
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r413776 - in head: Mk/Uses databases/godis databases/gomdb databases/gosqlite3 databases/levigo databases/redigo devel/gb devel/git-lfs devel/go-btree devel/go-flags devel/go-hashicorp-...
Message-ID:  <201604221240.u3MCe5bh021189@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mat
Date: Fri Apr 22 12:40:04 2016
New Revision: 413776
URL: https://svnweb.freebsd.org/changeset/ports/413776

Log:
  Move lang/go/files/bsd.go.mk to USES=go.
  
  Reviewed by:	bapt
  Sponsored by:	Absolight
  Differential Revision:	https://reviews.freebsd.org/D6057

Added:
  head/Mk/Uses/go.mk   (contents, props changed)
     - copied, changed from r413775, head/lang/go/files/bsd.go.mk
Deleted:
  head/lang/go/files/bsd.go.mk
Modified:
  head/databases/godis/Makefile
  head/databases/gomdb/Makefile
  head/databases/gosqlite3/Makefile
  head/databases/levigo/Makefile
  head/databases/redigo/Makefile
  head/devel/gb/Makefile
  head/devel/git-lfs/Makefile
  head/devel/go-btree/Makefile
  head/devel/go-flags/Makefile
  head/devel/go-hashicorp-logutils/Makefile
  head/devel/go-json-rest/Makefile
  head/devel/go-pretty/Makefile
  head/devel/go-raw/Makefile
  head/devel/go-runewidth/Makefile
  head/devel/go-slices/Makefile
  head/devel/go-sql-driver/Makefile
  head/devel/go-termbox/Makefile
  head/devel/go-uuid/Makefile
  head/devel/goprotobuf/Makefile
  head/devel/statik/Makefile
  head/net-im/xmpp-client/Makefile
  head/net/go-amqp/Makefile
  head/net/go-geoip/Makefile
  head/net/go.net/Makefile
  head/security/go.crypto/Makefile
  head/security/goptlib/Makefile
  head/security/meek/Makefile
  head/security/pond/Makefile
  head/sysutils/logstash-forwarder/Makefile
  head/textproc/go-text/Makefile
  head/textproc/go.text/Makefile
  head/textproc/peco/Makefile
  head/www/webgo/Makefile

Copied and modified: head/Mk/Uses/go.mk (from r413775, head/lang/go/files/bsd.go.mk)
==============================================================================
--- head/lang/go/files/bsd.go.mk	Fri Apr 22 12:26:25 2016	(r413775, copy source)
+++ head/Mk/Uses/go.mk	Fri Apr 22 12:40:04 2016	(r413776)
@@ -1,5 +1,12 @@
+# $FreeBSD$
+#
 # This file contains logic to ease porting of Go packages or binaries using
 # the `go` command.
+#
+# Feature:	go
+# Usage:	USES=go
+# Valid ARGS:	none
+#
 # You can set the following variables to control the process.
 #
 # GO_PKGNAME
@@ -16,6 +23,11 @@
 # CGO_LDFLAGS
 #	Addional LDFLAGS variables to be passed to the C compiler by the `go`
 #	command
+#
+# MAINTAINER: jlaffaye@FreeBSD.org
+
+.if !defined(_INCLUDE_USES_GO_MK)
+_INCLUDE_USES_GO_MK=	yes
 
 .if ${ARCH} == "i386"
 GOARCH=	386
@@ -77,3 +89,5 @@ do-install:
 	fi;
 .endfor
 .endif
+
+.endif

Modified: head/databases/godis/Makefile
==============================================================================
--- head/databases/godis/Makefile	Fri Apr 22 12:26:25 2016	(r413775)
+++ head/databases/godis/Makefile	Fri Apr 22 12:40:04 2016	(r413776)
@@ -10,11 +10,10 @@ MASTER_SITES=	LOCAL/jlaffaye
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Redis client library written in Go
 
+USES=		go
 GO_PKGNAME=	github.com/simonz05/${PORTNAME}
 
 pre-install:
 	@${RM} ${WRKSRC}/fmt.sh
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/go/files/bsd.go.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/databases/gomdb/Makefile
==============================================================================
--- head/databases/gomdb/Makefile	Fri Apr 22 12:26:25 2016	(r413775)
+++ head/databases/gomdb/Makefile	Fri Apr 22 12:40:04 2016	(r413776)
@@ -13,7 +13,7 @@ BUILD_DEPENDS=	go:lang/go
 
 ONLY_FOR_ARCHS=	i386 amd64
 
-USES=		compiler
+USES=		compiler go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	szferi
@@ -32,5 +32,4 @@ USE_GCC=	yes
 CONFIGURE_ENV+=	CC=${CC}
 GO_ENV+=	${CONFIGURE_ENV}
 
-.include "${PORTSDIR}/lang/go/files/bsd.go.mk"
 .include <bsd.port.post.mk>

Modified: head/databases/gosqlite3/Makefile
==============================================================================
--- head/databases/gosqlite3/Makefile	Fri Apr 22 12:26:25 2016	(r413775)
+++ head/databases/gosqlite3/Makefile	Fri Apr 22 12:40:04 2016	(r413776)
@@ -10,15 +10,16 @@ MASTER_SITES=	LOCAL/jlaffaye
 MAINTAINER=	lichray@gmail.com
 COMMENT=	Go interface for SQLite3
 
-USES=		compiler
+USES=		compiler go
 
 LIB_DEPENDS+=	libsqlite3.so:databases/sqlite3
 
 GO_PKGNAME=	github.com/kuroneko/${PORTNAME}
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/go/files/bsd.go.mk"
+
 .if ${COMPILER_TYPE} == clang && ${CC} == cc
 CC=	clang
 .endif
+
 .include <bsd.port.post.mk>

Modified: head/databases/levigo/Makefile
==============================================================================
--- head/databases/levigo/Makefile	Fri Apr 22 12:26:25 2016	(r413775)
+++ head/databases/levigo/Makefile	Fri Apr 22 12:40:04 2016	(r413776)
@@ -14,7 +14,7 @@ LIB_DEPENDS=	libleveldb.so:databases/lev
 
 ONLY_FOR_ARCHS=	i386 amd64
 
-USES=		compiler
+USES=		compiler go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jmhodges
@@ -35,5 +35,4 @@ CONFIGURE_ENV+=	CC=${CC} \
 		CXX=${CXX}
 GO_ENV+=	${CONFIGURE_ENV}
 
-.include "${PORTSDIR}/lang/go/files/bsd.go.mk"
 .include <bsd.port.post.mk>

Modified: head/databases/redigo/Makefile
==============================================================================
--- head/databases/redigo/Makefile	Fri Apr 22 12:26:25 2016	(r413775)
+++ head/databases/redigo/Makefile	Fri Apr 22 12:40:04 2016	(r413776)
@@ -10,8 +10,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Go client for the Redis database
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/redis
+USES=		go
 GO_PKGNAME=	github.com/garyburd/${PORTNAME}/redis
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/go/files/bsd.go.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/devel/gb/Makefile
==============================================================================
--- head/devel/gb/Makefile	Fri Apr 22 12:26:25 2016	(r413775)
+++ head/devel/gb/Makefile	Fri Apr 22 12:40:04 2016	(r413776)
@@ -12,6 +12,7 @@ LICENSE=	MIT
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
 
+USES=		go
 USE_GITHUB=	yes
 GH_ACCOUNT=	constabulary
 
@@ -28,6 +29,4 @@ do-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	( cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/ ; )
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/go/files/bsd.go.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/devel/git-lfs/Makefile
==============================================================================
--- head/devel/git-lfs/Makefile	Fri Apr 22 12:26:25 2016	(r413775)
+++ head/devel/git-lfs/Makefile	Fri Apr 22 12:40:04 2016	(r413776)
@@ -14,12 +14,11 @@ LICENSE=	MIT
 
 BROKEN=		fails to build
 
+USES=		go
 USE_GITHUB=	yes
 GH_ACCOUNT=	github
 PLIST_FILES=	bin/git-lfs
 
 GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/go/files/bsd.go.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/devel/go-btree/Makefile
==============================================================================
--- head/devel/go-btree/Makefile	Fri Apr 22 12:26:25 2016	(r413775)
+++ head/devel/go-btree/Makefile	Fri Apr 22 12:40:04 2016	(r413776)
@@ -11,6 +11,7 @@ COMMENT=	BTree implementation for Go
 
 LICENSE=	APACHE20
 
+USES=		go
 USE_GITHUB=	yes
 GH_ACCOUNT=	google
 GH_PROJECT=	${PORTNAME}
@@ -18,6 +19,4 @@ GH_TAGNAME=	cc6329d
 
 GO_PKGNAME=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/go/files/bsd.go.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/devel/go-flags/Makefile
==============================================================================
--- head/devel/go-flags/Makefile	Fri Apr 22 12:26:25 2016	(r413775)
+++ head/devel/go-flags/Makefile	Fri Apr 22 12:40:04 2016	(r413776)
@@ -11,6 +11,7 @@ COMMENT=	Go command line option parser
 
 LICENSE=	BSD3CLAUSE
 
+USES=		go
 USE_GITHUB=	yes
 GH_ACCOUNT=	jessevdk
 GH_PROJECT=	${PKGNAMEPREFIX}${PORTNAME}
@@ -18,6 +19,4 @@ GH_TAGNAME=	6b9493b3
 
 GO_PKGNAME=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/go/files/bsd.go.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/devel/go-hashicorp-logutils/Makefile
==============================================================================
--- head/devel/go-hashicorp-logutils/Makefile	Fri Apr 22 12:26:25 2016	(r413775)
+++ head/devel/go-hashicorp-logutils/Makefile	Fri Apr 22 12:40:04 2016	(r413776)
@@ -10,6 +10,7 @@ COMMENT=	Utilities for slightly better l
 
 LICENSE=	BSD2CLAUSE
 
+USES=		go
 USE_GITHUB=	yes
 GH_ACCOUNT=	hashicorp
 GH_PROJECT=	logutils
@@ -17,6 +18,4 @@ GH_TAGNAME=	8e0820f
 
 GO_PKGNAME=	github.com/hashicorp/logutils
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/go/files/bsd.go.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/devel/go-json-rest/Makefile
==============================================================================
--- head/devel/go-json-rest/Makefile	Fri Apr 22 12:26:25 2016	(r413775)
+++ head/devel/go-json-rest/Makefile	Fri Apr 22 12:40:04 2016	(r413776)
@@ -12,6 +12,7 @@ MASTER_SITES=	GH \
 MAINTAINER=	lattera@gmail.com
 COMMENT=	Quick and easy way to setup a RESTful JSON API
 
+USES=		go
 USE_GITHUB=	yes
 GH_ACCOUNT=	ant0ine
 
@@ -22,6 +23,4 @@ post-install:
 	@${INSTALL_DATA} ${GO_WRKDIR_PKG}/${GO_PKGNAME}/trie.a \
 		${STAGEDIR}${PREFIX}/${GO_LIBDIR}/${GO_PKGNAME}
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/go/files/bsd.go.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/devel/go-pretty/Makefile
==============================================================================
--- head/devel/go-pretty/Makefile	Fri Apr 22 12:26:25 2016	(r413775)
+++ head/devel/go-pretty/Makefile	Fri Apr 22 12:40:04 2016	(r413776)
@@ -13,8 +13,7 @@ COMMENT=	Pretty-printing package for go 
 BUILD_DEPENDS=	${LOCALBASE}/${GO_LIBDIR}/github.com/kr/text.a:textproc/go-text
 RUN_DEPENDS=	${LOCALBASE}/${GO_LIBDIR}/github.com/kr/text.a:textproc/go-text
 
+USES=		go
 GO_PKGNAME=	github.com/kr/pretty
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/go/files/bsd.go.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/devel/go-raw/Makefile
==============================================================================
--- head/devel/go-raw/Makefile	Fri Apr 22 12:26:25 2016	(r413775)
+++ head/devel/go-raw/Makefile	Fri Apr 22 12:40:04 2016	(r413776)
@@ -10,12 +10,11 @@ COMMENT=	Go library for high-level inter
 
 #LICENSE=	MIT based, but with no-evil clause
 
+USES=		go
 USE_GITHUB=	yes
 GH_ACCOUNT=	feyeleanor
 GH_TAGNAME=	724aedf
 
 GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/go/files/bsd.go.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/devel/go-runewidth/Makefile
==============================================================================
--- head/devel/go-runewidth/Makefile	Fri Apr 22 12:26:25 2016	(r413775)
+++ head/devel/go-runewidth/Makefile	Fri Apr 22 12:40:04 2016	(r413776)
@@ -11,6 +11,7 @@ COMMENT=	Go library to get the fixed wid
 
 LICENSE=	MIT
 
+USES=		go
 USE_GITHUB=	yes
 GH_ACCOUNT=	mattn
 GH_PROJECT=	${PKGNAMEPREFIX}${PORTNAME}
@@ -18,6 +19,4 @@ GH_TAGNAME=	d6bea18f
 
 GO_PKGNAME=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/go/files/bsd.go.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/devel/go-slices/Makefile
==============================================================================
--- head/devel/go-slices/Makefile	Fri Apr 22 12:26:25 2016	(r413775)
+++ head/devel/go-slices/Makefile	Fri Apr 22 12:40:04 2016	(r413776)
@@ -12,12 +12,11 @@ COMMENT=	Go library for slice-based data
 
 BUILD_DEPENDS=	go-raw>0:devel/go-raw
 
+USES=		go
 USE_GITHUB=	yes
 GH_ACCOUNT=	feyeleanor
 GH_TAGNAME=	bb44bb2
 
 GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/go/files/bsd.go.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/devel/go-sql-driver/Makefile
==============================================================================
--- head/devel/go-sql-driver/Makefile	Fri Apr 22 12:26:25 2016	(r413775)
+++ head/devel/go-sql-driver/Makefile	Fri Apr 22 12:40:04 2016	(r413776)
@@ -11,12 +11,11 @@ MASTER_SITES=	GH \
 MAINTAINER=	lattera@gmail.com
 COMMENT=	Lightweight and fast MySQL driver for go
 
+USES=		go
 USE_GITHUB=	yes
 GH_ACCOUNT=	${PORTNAME}
 GH_PROJECT=	mysql
 
 GO_PKGNAME=	github.com/${PORTNAME}/${GH_PROJECT}
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/go/files/bsd.go.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/devel/go-termbox/Makefile
==============================================================================
--- head/devel/go-termbox/Makefile	Fri Apr 22 12:26:25 2016	(r413775)
+++ head/devel/go-termbox/Makefile	Fri Apr 22 12:40:04 2016	(r413776)
@@ -13,6 +13,7 @@ LICENSE=	MIT
 
 BUILD_DEPENDS=	${LOCALBASE}/${GO_LIBDIR}/github.com/mattn/go-runewidth.a:devel/go-runewidth
 
+USES=		go
 USE_GITHUB=	yes
 GH_ACCOUNT=	nsf
 GH_PROJECT=	${PORTNAME}-go
@@ -20,6 +21,4 @@ GH_TAGNAME=	362329b
 
 GO_PKGNAME=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/go/files/bsd.go.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/devel/go-uuid/Makefile
==============================================================================
--- head/devel/go-uuid/Makefile	Fri Apr 22 12:26:25 2016	(r413775)
+++ head/devel/go-uuid/Makefile	Fri Apr 22 12:40:04 2016	(r413776)
@@ -12,12 +12,11 @@ COMMENT=	Go library to generates and ins
 
 LICENSE=	MIT
 
+USES=		go
 REVISION=	35bc42037350
 PROJECTHOST=	${PKGNAMEPREFIX}${PORTNAME}
 WRKSRC=		${WRKDIR}/go-uuid-${REVISION}
 GO_PKGNAME=	code.google.com/p/go-uuid/uuid
 GO_TARGET=	code.google.com/p/go-uuid/uuid/uuid
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/go/files/bsd.go.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/devel/goprotobuf/Makefile
==============================================================================
--- head/devel/goprotobuf/Makefile	Fri Apr 22 12:26:25 2016	(r413775)
+++ head/devel/goprotobuf/Makefile	Fri Apr 22 12:40:04 2016	(r413776)
@@ -13,11 +13,10 @@ LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	protoc:devel/protobuf
 
+USES=		go
 GO_PKGNAME=	github.com/golang/protobuf
 GO_TARGET=	${GO_PKGNAME}/proto \
 		${GO_PKGNAME}/protoc-gen-go \
 		${GO_PKGNAME}/jsonpb
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/go/files/bsd.go.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/devel/statik/Makefile
==============================================================================
--- head/devel/statik/Makefile	Fri Apr 22 12:26:25 2016	(r413775)
+++ head/devel/statik/Makefile	Fri Apr 22 12:40:04 2016	(r413776)
@@ -9,14 +9,11 @@ COMMENT=	Embed static files into a Go ex
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	go:lang/go
-
 ONLY_FOR_ARCHS=	i386 amd64
 
+USES=		go
 USE_GITHUB=	yes
 GH_ACCOUNT=	rakyll
 GH_TAGNAME=	4a16c83
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/go/files/bsd.go.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/net-im/xmpp-client/Makefile
==============================================================================
--- head/net-im/xmpp-client/Makefile	Fri Apr 22 12:26:25 2016	(r413775)
+++ head/net-im/xmpp-client/Makefile	Fri Apr 22 12:40:04 2016	(r413776)
@@ -13,13 +13,8 @@ LICENSE=	BSD3CLAUSE
 BUILD_DEPENDS=	${LOCALBASE}/${GO_LIBDIR}/golang.org/x/crypto/bcrypt.a:security/go.crypto \
 		${LOCALBASE}/${GO_LIBDIR}/code.google.com/p/go.net/dict.a:net/go.net
 
+USES=		go
 PLIST_FILES=	bin/xmpp-client
 GO_PKGNAME=	github.com/agl/${PORTNAME}
 
-post-extract:
-	@${MKDIR} ${GO_WRKSRC:H}
-	@${LN} -sf ${WRKSRC} ${GO_WRKSRC}
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/go/files/bsd.go.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/net/go-amqp/Makefile
==============================================================================
--- head/net/go-amqp/Makefile	Fri Apr 22 12:26:25 2016	(r413775)
+++ head/net/go-amqp/Makefile	Fri Apr 22 12:40:04 2016	(r413776)
@@ -10,12 +10,11 @@ COMMENT=	Go library for AMQP client with
 
 LICENSE=	BSD2CLAUSE
 
+USES=		go
 USE_GITHUB=	yes
 GH_ACCOUNT=	streadway
 GH_TAGNAME=	7d6d180
 
 GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/go/files/bsd.go.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/net/go-geoip/Makefile
==============================================================================
--- head/net/go-geoip/Makefile	Fri Apr 22 12:26:25 2016	(r413775)
+++ head/net/go-geoip/Makefile	Fri Apr 22 12:40:04 2016	(r413776)
@@ -13,7 +13,7 @@ LICENSE=	MIT
 
 LIB_DEPENDS=	libGeoIP.so:net/GeoIP
 
-USES=		compiler
+USES=		compiler go
 USE_GITHUB=	yes
 GH_ACCOUNT=	abh
 GH_TAGNAME=	da13074
@@ -21,8 +21,9 @@ GH_TAGNAME=	da13074
 GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/go/files/bsd.go.mk"
+
 .if ${COMPILER_TYPE} == clang && ${CC} == cc
 CC=	clang
 .endif
+
 .include <bsd.port.post.mk>

Modified: head/net/go.net/Makefile
==============================================================================
--- head/net/go.net/Makefile	Fri Apr 22 12:26:25 2016	(r413775)
+++ head/net/go.net/Makefile	Fri Apr 22 12:40:04 2016	(r413776)
@@ -13,6 +13,7 @@ LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	${LOCALBASE}/${GO_LIBDIR}/code.google.com/p/go.text:textproc/go.text
 
+USES=		go
 GO_PKGNAME=	code.google.com/p/go.net
 GO_TARGET=	${GO_PKGNAME}/dict		\
 		${GO_PKGNAME}/html		\
@@ -27,6 +28,4 @@ GO_TARGET=	${GO_PKGNAME}/dict		\
 		${GO_PKGNAME}/spdy		\
 		${GO_PKGNAME}/websocket
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/go/files/bsd.go.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/security/go.crypto/Makefile
==============================================================================
--- head/security/go.crypto/Makefile	Fri Apr 22 12:26:25 2016	(r413775)
+++ head/security/go.crypto/Makefile	Fri Apr 22 12:40:04 2016	(r413776)
@@ -8,6 +8,7 @@ MASTER_SITES=	http://www.c-s.li/ports/
 MAINTAINER=	jlaffaye@FreeBSD.org
 COMMENT=	Additional cryptography packages for Go
 
+USES=		go
 GO_PKGNAME=	golang.org/x/crypto
 GO_TARGET=	${GO_PKGNAME}/bcrypt		\
 		${GO_PKGNAME}/blowfish		\
@@ -43,7 +44,4 @@ GO_TARGET=	${GO_PKGNAME}/bcrypt		\
 		${GO_PKGNAME}/xtea		\
 		${GO_PKGNAME}/xts
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/go/files/bsd.go.mk"
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/security/goptlib/Makefile
==============================================================================
--- head/security/goptlib/Makefile	Fri Apr 22 12:26:25 2016	(r413775)
+++ head/security/goptlib/Makefile	Fri Apr 22 12:40:04 2016	(r413776)
@@ -8,13 +8,8 @@ MASTER_SITES=	http://c-s.li/ports/
 MAINTAINER=	cs@FreeBSD.org
 COMMENT=	Go pluggable transports library
 
+USES=		go
 GO_PKGNAME=	git.torproject.org/pluggable-transports/${PORTNAME}.git
 GO_TARGET=	${GO_PKGNAME}
 
-post-extract:
-	@${MKDIR} ${GO_WRKSRC:H}
-	@${LN} -sf ${WRKSRC} ${GO_WRKSRC}
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/go/files/bsd.go.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/security/meek/Makefile
==============================================================================
--- head/security/meek/Makefile	Fri Apr 22 12:26:25 2016	(r413775)
+++ head/security/meek/Makefile	Fri Apr 22 12:40:04 2016	(r413776)
@@ -10,20 +10,15 @@ COMMENT=	Pluggable transport proxy that 
 
 BUILD_DEPENDS=	${LOCALBASE}/${GO_LIBDIR}/git.torproject.org/pluggable-transports/goptlib.git.a:security/goptlib
 
+USES=		go
 PLIST_FILES=	bin/meek-client bin/meek-server man/man1/meek-client.1.gz man/man1/meek-server.1.gz
 SUB_FILES=	pkg-message
 GO_PKGNAME=	git.torproject.org/pluggable-transports/${PORTNAME}.git
 GO_TARGET=	${GO_PKGNAME}/${PORTNAME}-server \
 		${GO_PKGNAME}/${PORTNAME}-client
 
-post-extract:
-	@${MKDIR} ${GO_WRKSRC:H}
-	@${LN} -sf ${WRKSRC} ${GO_WRKSRC}
-
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/meek-server.1 ${STAGEDIR}${PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/doc/meek-client.1 ${STAGEDIR}${PREFIX}/man/man1
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/go/files/bsd.go.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/security/pond/Makefile
==============================================================================
--- head/security/pond/Makefile	Fri Apr 22 12:26:25 2016	(r413775)
+++ head/security/pond/Makefile	Fri Apr 22 12:40:04 2016	(r413776)
@@ -21,6 +21,7 @@ RUN_DEPENDS=	tor:security/tor
 LIB_DEPENDS=	libgtkspell.so:textproc/gtkspell \
 		libtspi.so:security/trousers
 
+USES=		go
 PLIST_FILES=	bin/pond-server bin/pond
 USE_GNOME=	gtk30
 GO_PKGNAME=	github.com/agl/pond
@@ -61,6 +62,4 @@ post-patch:
 do-build:
 	@(cd ${GO_WRKSRC}; ${SETENV} ${GO_ENV} ${GO_CMD} install -tags nogui -v ${GO_TARGET})
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/go/files/bsd.go.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/sysutils/logstash-forwarder/Makefile
==============================================================================
--- head/sysutils/logstash-forwarder/Makefile	Fri Apr 22 12:26:25 2016	(r413775)
+++ head/sysutils/logstash-forwarder/Makefile	Fri Apr 22 12:40:04 2016	(r413776)
@@ -11,6 +11,7 @@ LICENSE=	APACHE20
 
 BUILD_DEPENDS=	go:lang/go
 
+USES=		go
 USE_GITHUB=	yes
 GH_ACCOUNT=	elasticsearch
 GH_TAGNAME=	3b718f0
@@ -21,6 +22,4 @@ SUB_FILES=	pkg-message
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/logstash-forwarder.conf.example ${STAGEDIR}${PREFIX}/etc/logstash-forwarder.conf.example
 
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../lang/go/files/bsd.go.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/textproc/go-text/Makefile
==============================================================================
--- head/textproc/go-text/Makefile	Fri Apr 22 12:26:25 2016	(r413775)
+++ head/textproc/go-text/Makefile	Fri Apr 22 12:40:04 2016	(r413776)
@@ -11,8 +11,7 @@ COMMENT=	Go package for manipulating par
 
 LICENSE=	MIT
 
+USES=		go
 GO_PKGNAME=	github.com/kr/text
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/go/files/bsd.go.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/textproc/go.text/Makefile
==============================================================================
--- head/textproc/go.text/Makefile	Fri Apr 22 12:26:25 2016	(r413775)
+++ head/textproc/go.text/Makefile	Fri Apr 22 12:40:04 2016	(r413776)
@@ -10,6 +10,7 @@ COMMENT=	Additional textproc packages fo
 
 LICENSE=	BSD3CLAUSE
 
+USES=		go
 GO_PKGNAME=	code.google.com/p/go.text
 GO_TARGET=	${GO_PKGNAME}/cldr				\
 		${GO_PKGNAME}/collate				\
@@ -26,6 +27,4 @@ GO_TARGET=	${GO_PKGNAME}/cldr				\
 		${GO_PKGNAME}/transform				\
 		${GO_PKGNAME}/unicode/norm
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/go/files/bsd.go.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/textproc/peco/Makefile
==============================================================================
--- head/textproc/peco/Makefile	Fri Apr 22 12:26:25 2016	(r413775)
+++ head/textproc/peco/Makefile	Fri Apr 22 12:40:04 2016	(r413776)
@@ -16,6 +16,7 @@ BUILD_DEPENDS=	${LOCALBASE}/${GO_LIBDIR}
 		${LOCALBASE}/${GO_LIBDIR}/github.com/nsf/termbox-go.a:devel/go-termbox \
 		${LOCALBASE}/${GO_LIBDIR}/github.com/google/btree.a:devel/go-btree
 
+USES=		go
 USE_GITHUB=	yes
 
 WRKSRC_SUBDIR=	cmd/peco
@@ -26,6 +27,4 @@ post-extract:
 	@${MKDIR} ${GO_WRKSRC:H:H:H}
 	@${LN} -sf ${WRKSRC:H:H} ${GO_WRKSRC:H:H}
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/go/files/bsd.go.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/www/webgo/Makefile
==============================================================================
--- head/www/webgo/Makefile	Fri Apr 22 12:26:25 2016	(r413775)
+++ head/www/webgo/Makefile	Fri Apr 22 12:40:04 2016	(r413776)
@@ -13,8 +13,7 @@ COMMENT=	Simplest way to write web appli
 
 SVNVERSION=	20120419
 
+USES=		go
 GO_PKGNAME=	github.com/hoisie/web
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/go/files/bsd.go.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604221240.u3MCe5bh021189>