Index: head/devel/go-bindata/Makefile =================================================================== --- head/devel/go-bindata/Makefile (revision 463610) +++ head/devel/go-bindata/Makefile (revision 463611) @@ -1,39 +1,39 @@ # $FreeBSD$ PORTNAME= go-bindata PORTVERSION= 3.1.0 DISTVERSIONPREFIX= v CATEGORIES= devel MAINTAINER= swills@FreeBSD.org COMMENT= Generates Go code from any file BUILD_DEPENDS= ${LOCALBASE}/bin/go:lang/go USE_GITHUB= yes GH_ACCOUNT= jteeuwen GH_TAGNAME= a0ff256 GH_SUBDIR= src/github.com/jteeuwen/go-bindata PLIST_FILES= bin/go-bindata PORTDOCS= CONTRIBUTING.md LICENSE README.md OPTIONS_DEFINE= DOCS do-build: cd ${WRKSRC} ; \ - ${SETENV} GOPATH=${WRKSRC} go build -o bin/go-bindata ./go-bindata/ + ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build -o bin/go-bindata ./go-bindata/ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} \ ${STAGEDIR}${PREFIX}/bin/ ${MKDIR} ${STAGEDIR}${DOCSDIR} do-install-DOCS-on: .for x in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/${x} \ ${STAGEDIR}${DOCSDIR} .endfor .include Index: head/devel/gogs/Makefile =================================================================== --- head/devel/gogs/Makefile (revision 463610) +++ head/devel/gogs/Makefile (revision 463611) @@ -1,79 +1,79 @@ # $FreeBSD$ PORTNAME= gogs DISTVERSIONPREFIX= v DISTVERSION= 0.11.34 PORTREVISION= 2 CATEGORIES= devel www MAINTAINER= dg@syrec.org COMMENT= Painless self-hosted Git service LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= go:lang/go RUN_DEPENDS= git:devel/git USE_GITHUB= yes GH_ACCOUNT= gogits GH_SUBDIR= src/github.com/${GH_ACCOUNT}/${PORTNAME} OPTIONS_DEFINE= DOCS USERS= git GROUPS= git GOGS_DBDIR?= /var/db/gogs GOGS_LOGDIR?= /var/log/gogs PORTNAME_FANCY= Gogs SUB_FILES= gogs \ gogs-service \ gogs-rm-data \ pkg-message SUB_LIST= PORTNAME=${PORTNAME} \ PORTNAME_FANCY=${PORTNAME_FANCY} \ GOGS_USER=${USERS} \ GOGS_DBDIR=${GOGS_DBDIR} \ GOGS_LOGDIR=${GOGS_LOGDIR} PLIST_SUB= GOGS_USER=${USERS} \ GOGS_GROUP=${GROUPS} \ GOGS_DBDIR=${GOGS_DBDIR} \ GOGS_LOGDIR=${GOGS_LOGDIR} PORTDOCS= README.md post-patch: @${REINPLACE_CMD} \ -e '/^# \!\!\!/d' \ -e 's|^RUN_USER = git$$|RUN_USER = ${USERS}|' \ -e 's|^RUN_MODE = dev$$|RUN_MODE = prod|' \ -e 's|^ROOT =$$|ROOT = ${GOGS_DBDIR}/repositories|' \ -e 's|^ROOT_PATH =$$|ROOT_PATH = ${GOGS_LOGDIR}|' \ -e 's|^DB_TYPE = mysql$$|DB_TYPE = sqlite3|' \ ${WRKSRC}/conf/app.ini do-build: @(cd ${WRKSRC}/${GH_SUBDIR} && \ - ${SETENV} GOPATH=${WRKSRC} go build -tags "sqlite pam cert" -p ${MAKE_JOBS_NUMBER} -o ${PORTNAME}) + ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build -tags "sqlite pam cert" -p ${MAKE_JOBS_NUMBER} -o ${PORTNAME}) do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME} ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/ ${INSTALL_SCRIPT} ${WRKDIR}/gogs ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_SCRIPT} ${WRKDIR}/gogs-rm-data ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_SCRIPT} ${WRKDIR}/gogs-service ${STAGEDIR}${PREFIX}/etc/rc.d/gogs @(cd ${WRKSRC} && ${COPYTREE_SHARE} "conf public templates" ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}) @${MKDIR} ${STAGEDIR}${ETCDIR}/conf @${MKDIR} ${STAGEDIR}${ETCDIR}/https ${INSTALL_DATA} ${WRKSRC}/conf/app.ini ${STAGEDIR}${ETCDIR}/conf/app.ini.sample @${RLN} ${STAGEDIR}${ETCDIR} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/custom @${MKDIR} ${STAGEDIR}${GOGS_DBDIR}/data ${STAGEDIR}${GOGS_DBDIR}/repositories @${LN} -sf ${GOGS_DBDIR}/data ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/data @${MKDIR} ${STAGEDIR}${GOGS_LOGDIR} @${LN} -sf ${GOGS_LOGDIR} ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/log @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include Index: head/misc/cryptoballot/Makefile =================================================================== --- head/misc/cryptoballot/Makefile (revision 463610) +++ head/misc/cryptoballot/Makefile (revision 463611) @@ -1,47 +1,47 @@ # $FreeBSD$ PORTNAME= cryptoballot DISTVERSION= g20170928 CATEGORIES= misc MAINTAINER= yuri@FreeBSD.org COMMENT= Cryptographically secure online voting LICENSE= AGPLv3 BUILD_DEPENDS= go:lang/go USE_GITHUB= yes GH_TAGNAME= ec9df0a GH_TUPLE= ${PORTNAME}:entropychecker:188ae6c:entropychecker/src/github.com/${PORTNAME}/entropychecker \ ${PORTNAME}:fdh:5eb31ce:fdh/src/github.com/${PORTNAME}/fdh \ ${PORTNAME}:rsablind:14f9913:rsablind/src/github.com/${PORTNAME}/rsablind \ urfave:cli:v1.20.0:cli/src/github.com/urfave/cli \ phayes:decryptpem:7e4f5bc:decryptpem/src/github.com/phayes/decryptpem \ phayes:errors:ad407e6:errors/src/github.com/phayes/errors \ dlintw:goconf:dcc0709:goconf/src/github.com/dlintw/goconf \ Sam-Izdat:govote:7d55c89:govote/src/github.com/Sam-Izdat/govote \ lib:pq:88edab0:pq/src/github.com/lib/pq \ golang:crypto:650f4a3:crypto/src/golang.org/x/crypto \ golang:sys:37707fd:sys/src/golang.org/x/sys GH_SUBDIR= src/github.com/${PORTNAME}/${PORTNAME} PROGS= servers/ballotbox servers/electionclerk \ utils/cryptoballot \ utils/cryptoballot-getid utils/cryptoballot-public-key \ utils/cryptoballot-sign utils/cryptoballot-signature-request PLIST_FILES= ${PROGS:C/.*\//bin\//} do-build: .for p in ${PROGS} @cd ${WRKSRC}/${GH_SUBDIR}/${p}/ && \ - ${SETENV} GOPATH=${WRKSRC} go build -o ${p:C/.*\///} + ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build -o ${p:C/.*\///} .endfor do-install: .for p in ${PROGS} ${INSTALL_PROGRAM} ${WRKSRC}/${GH_SUBDIR}/${p}/${p:C/.*\///} ${STAGEDIR}${PREFIX}/bin/${p:C/.*\///} .endfor .include Index: head/net/rclone/Makefile =================================================================== --- head/net/rclone/Makefile (revision 463610) +++ head/net/rclone/Makefile (revision 463611) @@ -1,50 +1,50 @@ # $FreeBSD$ PORTNAME= rclone PORTVERSION= 1.38 DISTVERSIONPREFIX= v CATEGORIES= net MAINTAINER= wg@FreeBSD.org COMMENT= Sync files to and from various cloud services LICENSE= MIT USES= go USE_GITHUB= yes GH_ACCOUNT= ncw GH_SUBDIR= src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME} GH_TUPLE+= \ google:google-api-go-client:0caa379:googleapigoclient/src/google.golang.org/api \ ncw:go-acd:56da839:goacd/src/github.com/ncw/go-acd \ ncw:swift:b964f2c:swift/src/github.com/ncw/swift \ aws:aws-sdk-go:87a2cff:awssdkgo/src/github.com/aws/aws-sdk-go \ mreiferson:go-httpclient:31f0106:gohttpclient/src/github.com/mreiferson/go-httpclient \ google:go-querystring:9235644:goquerystring/src/github.com/google/go-querystring \ GoogleCloudPlatform:google-cloud-go:80a7732:gcloudgolang/src/cloud.google.com/go \ golang:oauth2:3c3a985:oauth2/src/golang.org/x/oauth2 \ golang:net:6d3beae:net/src/golang.org/x/net \ golang:text:a7c0236:text/src/golang.org/x/text \ skratchdot:open-golang:75fb7ed:opengolang/src/github.com/skratchdot/open-golang \ stacktic:dropbox:58f839b:dropbox/src/github.com/stacktic/dropbox \ tsenart:tb:19f4c3d:tb/src/github.com/tsenart/tb \ VividCortex:ewma:c595cd8:ewma/src/github.com/VividCortex/ewma \ golang:crypto:8e06e8d:crypto/src/golang.org/x/crypto \ pkg:errors:a887431:errors/src/github.com/pkg/errors \ bazil:fuse:371fbbd:fuse/src/bazil.org/fuse \ spf13:cobra:9c28e4b:cobra/src/github.com/spf13/cobra \ spf13:pflag:c7e63cf:pflag/src/github.com/spf13/pflag \ rfjakob:eme:601d0e2:eme/src/github.com/rfjakob/eme \ ogier:pflag:45c278a:opflag/src/github.com/ogier/pflag \ Unknwon:goconfig:5aa4f8c:goconfig/src/github.com/Unknwon/goconfig \ cpuguy83:go-md2man:a65d4d2:gomd2man/src/github.com/cpuguy83/go-md2man PLIST_FILES= bin/rclone do-build: - @cd ${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME}; ${SETENV} GOPATH=${WRKSRC} go build . + @cd ${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME} && ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build . do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} .include Index: head/net-mgmt/prometheus1/Makefile =================================================================== --- head/net-mgmt/prometheus1/Makefile (revision 463610) +++ head/net-mgmt/prometheus1/Makefile (revision 463611) @@ -1,49 +1,49 @@ # Created by: Jev Björsell # $FreeBSD$ PORTNAME= prometheus PORTVERSION= 1.8.2 DISTVERSIONPREFIX= v PORTREVISION= 1 CATEGORIES= net-mgmt PKGNAMESUFFIX= 1 MAINTAINER= ports@ecadlabs.com COMMENT= Systems monitoring and alerting toolkit LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE USES= go gmake USE_GITHUB= yes GO_PKGNAME= github.com/${PORTNAME}/${PORTNAME} USE_RC_SUBR= prometheus USERS= prometheus GROUPS= prometheus BUILD_USER?= ${USER} LD_FLAG_X_PREFIX= -X ${GO_PKGNAME}/vendor/github.com/prometheus/common/version LD_FLAG_STRING= -s \ ${LD_FLAG_X_PREFIX}.Version=${PORTVERSION} \ ${LD_FLAG_X_PREFIX}.Revision=${PORTREVISION} \ ${LD_FLAG_X_PREFIX}.Branch=release-${PORTVERSION:R} \ ${LD_FLAG_X_PREFIX}.BuildUser=${BUILD_USER} do-build: ( cd ${GO_WRKSRC}/cmd/prometheus ; \ - ${SETENV} ${GO_ENV} go install -ldflags "${LD_FLAG_STRING}" ) + ${SETENV} ${MAKE_ENV} ${GO_ENV} go install -ldflags "${LD_FLAG_STRING}" ) ( cd ${GO_WRKSRC}/cmd/promtool ; \ - ${SETENV} ${GO_ENV} go install -ldflags "${LD_FLAG_STRING}" ) + ${SETENV} ${MAKE_ENV} ${GO_ENV} go install -ldflags "${LD_FLAG_STRING}" ) do-install: ${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/prometheus ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/promtool ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/documentation/examples/prometheus.yml ${STAGEDIR}${LOCALBASE}/etc/prometheus.yml.sample ${MKDIR} ${STAGEDIR}${DESTDIR}/var/db/prometheus .include Index: head/security/honeybadger/Makefile =================================================================== --- head/security/honeybadger/Makefile (revision 463610) +++ head/security/honeybadger/Makefile (revision 463611) @@ -1,48 +1,48 @@ # $FreeBSD$ PORTNAME= honeybadger PORTVERSION= 0.0.0.2016022301 CATEGORIES= security MAINTAINER= shawn.webb@hardenedbsd.org COMMENT= Quantum Insert detector and 0-day catcher BUILD_DEPENDS= go:lang/go USE_GITHUB= yes GH_TUPLE= david415:HoneyBadger:11dc0ca:DEFAULT/src/github.com/david415/HoneyBadger \ google:gopacket:f361903:gp/src/github.com/google/gopacket \ fatih:color:7a5857d:co/src/github.com/fatih/color \ mattn:go-colorable:9fdad7c:gc/src/github.com/mattn/go-colorable \ mattn:go-isatty:56b76bd:gi/src/github.com/mattn/go-isatty \ golang:sys:50c6bc5:xs/src/golang.org/x/sys \ golang:net:b6d7b13:xn/src/golang.org/x/net BIN_FILES= handshakeHijacker honeyBadger \ honeybadgerReportTool honeybadgerReportToolColor sprayInjector PLIST_FILES= ${BIN_FILES:S/^/bin\//} OPTIONS_DEFINE= DOCS PORTDOCS= README.rst LICENSE LICENSE_BSD LICENSE= GPLv3 do-build: .for bin in ${BIN_FILES} - cd ${WRKSRC}/src/github.com/david415/HoneyBadger/cmd/${bin}; ${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build + cd ${WRKSRC}/src/github.com/david415/HoneyBadger/cmd/${bin}; ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build .endfor do-install: .for bin in ${BIN_FILES} cd ${WRKSRC}/src/github.com/david415/HoneyBadger/cmd/${bin}; ${CP} ${bin} ${STAGEDIR}${PREFIX}/bin/${src} .endfor post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} .for doc in ${PORTDOCS} ${CP} ${WRKSRC}/src/github.com/david415/HoneyBadger/${doc} ${STAGEDIR}${DOCSDIR} .endfor .include Index: head/security/obfs4proxy-tor/Makefile =================================================================== --- head/security/obfs4proxy-tor/Makefile (revision 463610) +++ head/security/obfs4proxy-tor/Makefile (revision 463611) @@ -1,43 +1,43 @@ # $FreeBSD$ PORTNAME= obfs4proxy DISTVERSION= 0.0.7 PORTREVISION= 1 CATEGORIES= security net ipv6 MASTER_SITES= https://people.torproject.org/~yawning/releases/${PORTNAME}/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} PKGNAMESUFFIX= -tor MAINTAINER= egypcio@googlemail.com COMMENT= Pluggable transport proxy for Tor (obfs4, The Obfuscator) LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= go:lang/go CPE_VENDOR= torproject USES= cpe tar:xz USE_GITHUB= nodefault GH_TUPLE= Yawning:goptlib:9b7a700:goptlib/obfs4proxy/src/git.torproject.org/pluggable-transports/goptlib.git \ agl:ed25519:5312a61:ed25519/obfs4proxy/src/github.com/agl/ed25519 \ dchest:siphash:4ebf1de:siphash/obfs4proxy/src/github.com/dchest/siphash \ golang:crypto:d585fd2:crypto/obfs4proxy/src/golang.org/x/crypto \ golang:net:d866cfc:net/obfs4proxy/src/golang.org/x/net SUB_FILES= pkg-message PLIST_FILES= bin/obfs4proxy \ man/man1/obfs4proxy.1.gz do-build: @${RLN} ${WRKSRC} ${WRKSRC}/obfs4proxy/src/git.torproject.org/pluggable-transports/obfs4.git @cd ${WRKSRC}/obfs4proxy && \ - ${SETENV} GOPATH=${WRKSRC}/obfs4proxy go build + ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC}/obfs4proxy go build do-install: ${INSTALL_PROGRAM} ${WRKSRC}/obfs4proxy/obfs4proxy ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/doc/obfs4proxy.1 ${STAGEDIR}${PREFIX}/man/man1 .include Index: head/sysutils/epazote/Makefile =================================================================== --- head/sysutils/epazote/Makefile (revision 463610) +++ head/sysutils/epazote/Makefile (revision 463611) @@ -1,32 +1,32 @@ # $FreeBSD$ PORTNAME= epazote PORTVERSION= 2.1.2 CATEGORIES= sysutils MAINTAINER= nbari@tequila.io COMMENT= Automated HTTP (microservices) supervisor LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= go>=1.7:lang/go USES= compiler USE_GITHUB= yes GH_TUPLE= epazote:scheduler:0.1.0:scheduler/src/github.com/epazote/scheduler \ go-yaml:yaml:cd8b52f:yaml/src/github.com/go-yaml/yaml GH_SUBDIR= src/github.com/${PORTNAME}/${PORTNAME} PLIST_FILES= bin/epazote do-build: @cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}; \ - ${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags \ + ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags \ "-X main.version=${PORTVERSION}" -o epazote cmd/epazote/main.go; do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/epazote ${STAGEDIR}${PREFIX}/bin/epazote .include Index: head/www/go-appengine-sdk/Makefile =================================================================== --- head/www/go-appengine-sdk/Makefile (revision 463610) +++ head/www/go-appengine-sdk/Makefile (revision 463611) @@ -1,90 +1,91 @@ # $FreeBSD$ PORTNAME= go-appengine-sdk DISTVERSION= 1.9.62 CATEGORIES= www devel MASTER_SITES= https://storage.googleapis.com/appengine-sdks/featured/ DISTNAME= ${PORTNAME:S,-,_,g}_linux_amd64-${PORTVERSION} MAINTAINER= dg@syrec.org COMMENT= App Engine SDK for Go LICENSE= APACHE20 BSD3CLAUSE GPLv2 LGPL21 MIT MPL11 PSFL LICENSE_COMB= multi LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/LICENSE LICENSE_FILE_GPLv2= ${WRKSRC}/LICENSE LICENSE_FILE_LGPL21= ${WRKSRC}/LICENSE LICENSE_FILE_MIT= ${WRKSRC}/LICENSE LICENSE_FILE_MPL11= ${WRKSRC}/LICENSE LICENSE_FILE_PSFL= ${WRKSRC}/LICENSE ONLY_FOR_ARCHS= amd64 i386 BUILD_DEPENDS= go:lang/go RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=${PYTHON_VER}:databases/py-sqlite3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6:security/py-pycrypto@${PY_FLAVOR} USES= gettext python:2.7 shebangfix zip SHEBANG_GLOB= *.py *.bash *.sh *.pl *.cgi goapp WRKSRC= ${WRKDIR}/go_appengine GAEDATADIRS= google lib tools GAEGOROOTS= goroot-1.6 goroot-1.8 GAESCRIPTS= appcfg.py backends_conversion.py \ bulkload_client.py bulkloader.py dev_appserver.py \ download_appstats.py endpointscfg.py run_tests.py \ wrapper_util.py GOARCH= ${ARCH:S,i386,386,} PLIST_FILES= ${GAESCRIPTS:C,(.+)\.py,bin/\1-go,} \ bin/goapp PLIST_DIRS= ${GAEGOROOTS:C,(.+),${DATADIR}/\1/pkg/obj/${OPSYS:tl}_${GOARCH},} OPTIONS_DEFINE= EXAMPLES SSE2 OPTIONS_DEFAULT= SSE2 SSE2_DESC= Generate code with SSE2 (check off for old x86 CPUs) SSE2_VARS_OFF= GO386=387 PORTDATA= * PORTEXAMPLES= * do-build: @for R in ${GAEGOROOTS}; do \ (cd ${WRKSRC}/$${R}/src && \ + ${SETENV} ${MAKE_ENV} \ GOROOT_BOOTSTRAP=${LOCALBASE}/go \ GOOS=${OPSYS:tl} GOARCH=${GOARCH} \ GO386=${GO386} \ ${SH} make.bash); \ (cd ${WRKSRC}/$${R}/bin && \ ${RM} godoc cover && ${MV} go goapp); \ (cd ${WRKSRC}/$${R} && \ ${RM} -rf ./pkg/linux_amd64_appengine ./pkg/tool/linux_amd64); \ done # Create wrapper scripts to avoid conflicts with other AppEngine SDK(s) @cd ${WRKSRC} && \ for S in ${GAESCRIPTS} goapp; do \ ${ECHO} "#!/bin/sh" >> $${S%.py}-go; \ - ${ECHO} "${LOCALBASE}/bin/python2.7 ${DATADIR}/$${S} \$$*" >> $${S%.py}-go; \ + ${ECHO} "${PYTHON_CMD} ${DATADIR}/$${S} \$$*" >> $${S%.py}-go; \ done do-install: @${MKDIR} ${STAGEDIR}${DATADIR} for S in ${GAESCRIPTS} _python_runtime.py goapp; do \ ${INSTALL_SCRIPT} ${WRKSRC}/$${S} ${STAGEDIR}${DATADIR}; \ done ${INSTALL_SCRIPT} ${WRKSRC}/*-go ${STAGEDIR}${PREFIX}/bin ${MV} ${STAGEDIR}${PREFIX}/bin/goapp-go ${STAGEDIR}${PREFIX}/bin/goapp cd ${WRKSRC} && \ ${COPYTREE_SHARE} "${GAEDATADIRS}" ${STAGEDIR}${DATADIR} && \ ${CP} -a ${GAEGOROOTS} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/VERSION ${STAGEDIR}${DATADIR} cd ${STAGEDIR}${DATADIR} && \ ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -d ${DATADIR} -f ${GAEDATADIRS} -q do-install-EXAMPLES-on: cd ${WRKSRC}/demos && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} .include Index: head/www/grafana4/Makefile =================================================================== --- head/www/grafana4/Makefile (revision 463610) +++ head/www/grafana4/Makefile (revision 463611) @@ -1,88 +1,88 @@ # $FreeBSD$ PORTNAME= grafana PORTVERSION= 4.6.2 DISTVERSIONPREFIX= v CATEGORIES= www MASTER_SITES+= https://s3-us-west-2.amazonaws.com/grafana-releases/release/:public PKGNAMESUFFIX= ${PORTVERSION:C/([0-9]).*/\1/1} DISTFILES= grafana-${PORTVERSION}.linux-x64${EXTRACT_SUFX}:public EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= swills@FreeBSD.org COMMENT= Dashboard and graph editor for Graphite, InfluxDB & OpenTSDB LICENSE= APACHE20 BUILD_DEPENDS= ${LOCALBASE}/bin/go:lang/go ONLY_FOR_ARCHS= i386 amd64 USE_RC_SUBR= grafana USES= compiler USE_GITHUB= yes GH_SUBDIR= src/github.com/${PORTNAME}/${PORTNAME} TAG= 8db5f08 GRAFANA_USER?= grafana GRAFANA_GROUP?= grafana USERS= ${GRAFANA_USER} GROUPS= ${GRAFANA_GROUP} GRAFANAHOMEDIR= ${PREFIX}/share/grafana/ GRAFANADATADIR= /var/db/${PORTNAME}/ GRAFANALOGDIR= /var/log/${PORTNAME}/ GRAFANAPIDDIR= /var/run/${PORTNAME}/ GRAFANAPLUGINDIR= /var/db/${PORTNAME}/plugins GRAFANADASHBOARDDIR= /var/db/${PORTNAME}/dashboards SUB_FILES= grafana grafana.conf SUB_LIST+= GRAFANA_USER=${GRAFANA_USER} \ GRAFANA_GROUP=${GRAFANA_GROUP} \ GRAFANADATADIR=${GRAFANADATADIR} \ GRAFANALOGDIR=${GRAFANALOGDIR} \ GRAFANAPIDDIR=${GRAFANAPIDDIR} \ GRAFANAHOMEDIR=${GRAFANAHOMEDIR} \ GRAFANAPLUGINDIR=${GRAFANAPLUGINDIR} \ GRAFANADASHBOARDDIR=${GRAFANADASHBOARDDIR} PLIST_SUB+= GRAFANAHOMEDIR=${GRAFANAHOMEDIR} post-extract: @${RM} -r ${WRKSRC}/src/github.com/grafana/grafana/public @(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/grafana-${PORTVERSION}.linux-x64${EXTRACT_SUFX} ${EXTRACT_AFTER_ARGS} grafana-${PORTVERSION}/public) do-build: - @cd ${WRKSRC}/src/github.com/${PORTNAME}/${PORTNAME} ; ${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags "-w -X main.version=${PORTVERSION} -X main.commit=${TAG}" -o ./bin/grafana-server ./pkg/cmd/grafana-server - @cd ${WRKSRC}/src/github.com/${PORTNAME}/${PORTNAME} ; ${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags "-w -X main.version=${PORTVERSION} -X main.commit=${TAG}" -o ./bin/grafana-cli ./pkg/cmd/grafana-cli + @cd ${WRKSRC}/src/github.com/${PORTNAME}/${PORTNAME} ; ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags "-w -X main.version=${PORTVERSION} -X main.commit=${TAG}" -o ./bin/grafana-server ./pkg/cmd/grafana-server + @cd ${WRKSRC}/src/github.com/${PORTNAME}/${PORTNAME} ; ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags "-w -X main.version=${PORTVERSION} -X main.commit=${TAG}" -o ./bin/grafana-cli ./pkg/cmd/grafana-cli do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/grafana/grafana/bin/grafana-server \ ${STAGEDIR}${PREFIX}/bin/grafana-server ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/grafana/grafana/bin/grafana-cli \ ${STAGEDIR}${PREFIX}/bin/grafana-cli cd ${WRKSRC}/src/github.com/grafana/grafana && \ ${COPYTREE_SHARE} public ${STAGEDIR}${PREFIX}/share/grafana ${MKDIR} ${STAGEDIR}${GRAFANAPIDDIR} ${MKDIR} ${STAGEDIR}${GRAFANALOGDIR} ${MKDIR} ${STAGEDIR}${GRAFANAHOMEDIR} ${MKDIR} ${STAGEDIR}${GRAFANADATADIR} ${MKDIR} ${STAGEDIR}${GRAFANAPLUGINDIR} ${MKDIR} ${STAGEDIR}${GRAFANADASHBOARDDIR} ${MKDIR} ${STAGEDIR}${GRAFANAHOMEDIR}/conf ${MKDIR} ${STAGEDIR}${GRAFANAHOMEDIR}/data ${MKDIR} ${STAGEDIR}${GRAFANAHOMEDIR}/data/log ${INSTALL_DATA} ${WRKSRC}/src/github.com/grafana/grafana/conf/defaults.ini \ ${STAGEDIR}${GRAFANAHOMEDIR}/conf/defaults.ini ${INSTALL_DATA} ${WRKDIR}/grafana.conf ${STAGEDIR}${PREFIX}/etc/grafana.conf.sample .include .if ${COMPILER_TYPE} == clang BUILD_ENV= CC=clang .endif .include