diff options
34 files changed, 80 insertions, 110 deletions
diff --git a/lang/go/files/bsd.go.mk b/Mk/Uses/go.mk index 384225e8121e..eb63d03e2bee 100644 --- a/lang/go/files/bsd.go.mk +++ b/Mk/Uses/go.mk @@ -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 diff --git a/databases/godis/Makefile b/databases/godis/Makefile index 9f79aca1c21a..ea44e938b97a 100644 --- a/databases/godis/Makefile +++ b/databases/godis/Makefile @@ -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> diff --git a/databases/gomdb/Makefile b/databases/gomdb/Makefile index 2fe4d651c61c..bff849b31ee3 100644 --- a/databases/gomdb/Makefile +++ b/databases/gomdb/Makefile @@ -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> diff --git a/databases/gosqlite3/Makefile b/databases/gosqlite3/Makefile index 3c631e307692..4adc16cd4d97 100644 --- a/databases/gosqlite3/Makefile +++ b/databases/gosqlite3/Makefile @@ -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> diff --git a/databases/levigo/Makefile b/databases/levigo/Makefile index 4df752a45d9b..83f918fd70d7 100644 --- a/databases/levigo/Makefile +++ b/databases/levigo/Makefile @@ -14,7 +14,7 @@ LIB_DEPENDS= libleveldb.so:databases/leveldb 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> diff --git a/databases/redigo/Makefile b/databases/redigo/Makefile index 8ea214ec04dd..9871be037dba 100644 --- a/databases/redigo/Makefile +++ b/databases/redigo/Makefile @@ -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> diff --git a/devel/gb/Makefile b/devel/gb/Makefile index 91168f046421..b7e44babb2c7 100644 --- a/devel/gb/Makefile +++ b/devel/gb/Makefile @@ -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> diff --git a/devel/git-lfs/Makefile b/devel/git-lfs/Makefile index 9fb3846745d1..01f5ff6aaeb6 100644 --- a/devel/git-lfs/Makefile +++ b/devel/git-lfs/Makefile @@ -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> diff --git a/devel/go-btree/Makefile b/devel/go-btree/Makefile index 21ec47ed1ab2..d03235663a76 100644 --- a/devel/go-btree/Makefile +++ b/devel/go-btree/Makefile @@ -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> diff --git a/devel/go-flags/Makefile b/devel/go-flags/Makefile index da80a44d2441..80c928abce55 100644 --- a/devel/go-flags/Makefile +++ b/devel/go-flags/Makefile @@ -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> diff --git a/devel/go-hashicorp-logutils/Makefile b/devel/go-hashicorp-logutils/Makefile index f87a9177f467..576e85df46bf 100644 --- a/devel/go-hashicorp-logutils/Makefile +++ b/devel/go-hashicorp-logutils/Makefile @@ -10,6 +10,7 @@ COMMENT= Utilities for slightly better logging in Go (Golang) 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> diff --git a/devel/go-json-rest/Makefile b/devel/go-json-rest/Makefile index b99e0c7efab9..bda777830410 100644 --- a/devel/go-json-rest/Makefile +++ b/devel/go-json-rest/Makefile @@ -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> diff --git a/devel/go-pretty/Makefile b/devel/go-pretty/Makefile index 637c5554f1a1..300c7f4d65b0 100644 --- a/devel/go-pretty/Makefile +++ b/devel/go-pretty/Makefile @@ -13,8 +13,7 @@ COMMENT= Pretty-printing package for go values 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> diff --git a/devel/go-raw/Makefile b/devel/go-raw/Makefile index 8b6ffa0065ec..ee9f53067c5a 100644 --- a/devel/go-raw/Makefile +++ b/devel/go-raw/Makefile @@ -10,12 +10,11 @@ COMMENT= Go library for high-level interface to unsafe and reflection packages #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> diff --git a/devel/go-runewidth/Makefile b/devel/go-runewidth/Makefile index 802a33ad6552..587de89e6386 100644 --- a/devel/go-runewidth/Makefile +++ b/devel/go-runewidth/Makefile @@ -11,6 +11,7 @@ COMMENT= Go library to get the fixed width of a character or string 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> diff --git a/devel/go-slices/Makefile b/devel/go-slices/Makefile index 54230c7c890c..84e74954c6d1 100644 --- a/devel/go-slices/Makefile +++ b/devel/go-slices/Makefile @@ -12,12 +12,11 @@ COMMENT= Go library for slice-based datatypes 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> diff --git a/devel/go-sql-driver/Makefile b/devel/go-sql-driver/Makefile index 96426dc70a48..1b88813dae6d 100644 --- a/devel/go-sql-driver/Makefile +++ b/devel/go-sql-driver/Makefile @@ -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> diff --git a/devel/go-termbox/Makefile b/devel/go-termbox/Makefile index 265dadbc0cbb..183954ab0aa6 100644 --- a/devel/go-termbox/Makefile +++ b/devel/go-termbox/Makefile @@ -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> diff --git a/devel/go-uuid/Makefile b/devel/go-uuid/Makefile index c9d5207f4df3..573494c2389a 100644 --- a/devel/go-uuid/Makefile +++ b/devel/go-uuid/Makefile @@ -12,12 +12,11 @@ COMMENT= Go library to generates and inspects UUIDs based on RFC 4122 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> diff --git a/devel/goprotobuf/Makefile b/devel/goprotobuf/Makefile index 6b28cde27237..dc3632b82087 100644 --- a/devel/goprotobuf/Makefile +++ b/devel/goprotobuf/Makefile @@ -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> diff --git a/devel/statik/Makefile b/devel/statik/Makefile index 6e6e851dba1e..517eae66977b 100644 --- a/devel/statik/Makefile +++ b/devel/statik/Makefile @@ -9,14 +9,11 @@ COMMENT= Embed static files into a Go executable 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> diff --git a/net-im/xmpp-client/Makefile b/net-im/xmpp-client/Makefile index d7c3aa5ec7fa..dca1a14d696c 100644 --- a/net-im/xmpp-client/Makefile +++ b/net-im/xmpp-client/Makefile @@ -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> diff --git a/net/go-amqp/Makefile b/net/go-amqp/Makefile index 776684fa276c..1a345a1a27b0 100644 --- a/net/go-amqp/Makefile +++ b/net/go-amqp/Makefile @@ -10,12 +10,11 @@ COMMENT= Go library for AMQP client with RabbitMQ extensions 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> diff --git a/net/go-geoip/Makefile b/net/go-geoip/Makefile index 179ba3cef580..bdd65bca9969 100644 --- a/net/go-geoip/Makefile +++ b/net/go-geoip/Makefile @@ -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> diff --git a/net/go.net/Makefile b/net/go.net/Makefile index b126dc797112..5ad7c4fc98bc 100644 --- a/net/go.net/Makefile +++ b/net/go.net/Makefile @@ -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> diff --git a/security/go.crypto/Makefile b/security/go.crypto/Makefile index c05314044774..052533a6f30e 100644 --- a/security/go.crypto/Makefile +++ b/security/go.crypto/Makefile @@ -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> diff --git a/security/goptlib/Makefile b/security/goptlib/Makefile index d787f3577ce2..375844b9b261 100644 --- a/security/goptlib/Makefile +++ b/security/goptlib/Makefile @@ -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> diff --git a/security/meek/Makefile b/security/meek/Makefile index 4023efafa7a3..d3aafc881b35 100644 --- a/security/meek/Makefile +++ b/security/meek/Makefile @@ -10,20 +10,15 @@ COMMENT= Pluggable transport proxy that relays through third-party server 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> diff --git a/security/pond/Makefile b/security/pond/Makefile index 02f40eefff7a..8cc9cb444795 100644 --- a/security/pond/Makefile +++ b/security/pond/Makefile @@ -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> diff --git a/sysutils/logstash-forwarder/Makefile b/sysutils/logstash-forwarder/Makefile index fad75905a209..88fdaaeab0d9 100644 --- a/sysutils/logstash-forwarder/Makefile +++ b/sysutils/logstash-forwarder/Makefile @@ -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> diff --git a/textproc/go-text/Makefile b/textproc/go-text/Makefile index e30a9deec615..5a6c8c44c8eb 100644 --- a/textproc/go-text/Makefile +++ b/textproc/go-text/Makefile @@ -11,8 +11,7 @@ COMMENT= Go package for manipulating paragraphs of text 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> diff --git a/textproc/go.text/Makefile b/textproc/go.text/Makefile index 7489ba53664e..f43f13459f1b 100644 --- a/textproc/go.text/Makefile +++ b/textproc/go.text/Makefile @@ -10,6 +10,7 @@ COMMENT= Additional textproc packages for Go 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> diff --git a/textproc/peco/Makefile b/textproc/peco/Makefile index 2d2af4af0a62..728a1ac17e71 100644 --- a/textproc/peco/Makefile +++ b/textproc/peco/Makefile @@ -16,6 +16,7 @@ BUILD_DEPENDS= ${LOCALBASE}/${GO_LIBDIR}/github.com/jessevdk/go-flags.a:devel/go ${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> diff --git a/www/webgo/Makefile b/www/webgo/Makefile index 1ced8db0a912..11174e59b533 100644 --- a/www/webgo/Makefile +++ b/www/webgo/Makefile @@ -13,8 +13,7 @@ COMMENT= Simplest way to write web applications in the Go programming language 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> |