Index: Mk/bsd.port.mk =================================================================== --- Mk/bsd.port.mk +++ Mk/bsd.port.mk @@ -1316,14 +1316,8 @@ PKGVERSION= ${PORTVERSION:C/[-_,]/./g}${_SUF1}${_SUF2} PKGNAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PKGVERSION} DISTVERSIONFULL= ${DISTVERSIONPREFIX}${DISTVERSION:C/:(.)/\1/g}${DISTVERSIONSUFFIX} -.if defined(USE_GITHUB) && empty(MASTER_SITES:MGHC) -# Only add in DISTVERSIONFULL if GH_TAGNAME if set by port. Otherwise -# GH_TAGNAME defaults to DISTVERSIONFULL; Avoid adding DISTVERSIONFULL in twice. -. if defined(GH_TAGNAME) -DISTNAME?= ${GH_ACCOUNT}-${GH_PROJECT}-${DISTVERSIONFULL}-${GH_TAGNAME_SANITIZED} -. else -DISTNAME?= ${GH_ACCOUNT}-${GH_PROJECT}-${GH_TAGNAME_SANITIZED} -. endif +.if defined(USE_GITHUB) && empty(MASTER_SITES:MGHC) && empty(DISTNAME) +_GITHUB_MUST_SET_DISTNAME= yes .else DISTNAME?= ${PORTNAME}-${DISTVERSIONFULL} .endif Index: Mk/bsd.sites.mk =================================================================== --- Mk/bsd.sites.mk +++ Mk/bsd.sites.mk @@ -523,23 +523,114 @@ . if !defined(MASTER_SITES) || !${MASTER_SITES:MGH} && !${MASTER_SITES:MGHC} MASTER_SITES+= GH . endif -GH_ACCOUNT?= ${PORTNAME} -GH_PROJECT?= ${PORTNAME} +_GH_ACCOUNT_DEFAULT= ${PORTNAME} +GH_ACCOUNT?= ${_GH_ACCOUNT_DEFAULT} +_GH_PROJECT_DEFAULT= ${PORTNAME} +GH_PROJECT?= ${_GH_PROJECT_DEFAULT} # Use full PREFIX/SUFFIX and converted DISTVERSION -GH_TAGNAME?= ${DISTVERSIONFULL} -# This new scheme rerolls distfiles. Also ensure they are renamed to avoid -# conflicts. Use _GITHUB_REV in case github changes their zipping or structure -# which has happened before. -_GITHUB_REV= 0 -. if ${MASTER_SITES:MGH} -DISTNAME:= ${DISTNAME}_GH${_GITHUB_REV} +_GH_TAGNAME_DEFAULT= ${DISTVERSIONFULL} +GH_TAGNAME?= ${_GH_TAGNAME_DEFAULT} +_GITHUB_GROUPS= DEFAULT +.for _A in ${GH_ACCOUNT} +_S_TEMP= ${_A:S/^${_A:C@:[^/:]+$@@}//:S/^://} +. if !empty(_S_TEMP) +. for _group in ${_S_TEMP:S/,/ /g} +. if ${_group} == all || ${_group} == ALL || ${_group} == default +check-makevars:: + @${ECHO_MSG} "Makefile error: the words all, ALL and default are reserved and cannot be" + @${ECHO_MSG} "used in group definitions. Please fix your GH_ACCOUNT" + @${FALSE} +. endif +. if !${_GITHUB_GROUPS:M${_group}} +_GITHUB_GROUPS+= ${_group} +. endif +_GH_ACCOUNT_${_group}= ${_A:C@^(.*):[^/:]+$@\1@} +. endfor +. else +_GH_ACCOUNT_DEFAULT= ${_A:C@^(.*):[^/:]+$@\1@} +. endif +.endfor +.for _P in ${GH_PROJECT} +_S_TEMP= ${_P:S/^${_P:C@:[^/:]+$@@}//:S/^://} +. if !empty(_S_TEMP) +. for _group in ${_S_TEMP:S/,/ /g} +. if ${_group} == all || ${_group} == ALL || ${_group} == default +check-makevars:: + @${ECHO_MSG} "Makefile error: the words all, ALL and default are reserved and cannot be" + @${ECHO_MSG} "used in group definitions. Please fix your GH_PROJECT" + @${FALSE} +. endif +. if !${_GITHUB_GROUPS:M${_group}} +_GITHUB_GROUPS+= ${_group} +. endif +_GH_PROJECT_${_group}= ${_P:C@^(.*):[^/:]+$@\1@} +. endfor +. else +_GH_PROJECT_DEFAULT= ${_P:C@^(.*):[^/:]+$@\1@} +. endif +.endfor +.for _T in ${GH_TAGNAME} +_S_TEMP= ${_T:S/^${_T:C@:[^/:]+$@@}//:S/^://} +. if !empty(_S_TEMP) +. for _group in ${_S_TEMP:S/,/ /g} +. if ${_group} == all || ${_group} == ALL || ${_group} == default +check-makevars:: + @${ECHO_MSG} "Makefile error: the words all, ALL and default are reserved and cannot be" + @${ECHO_MSG} "used in group definitions. Please fix your GH_TAGNAME" + @${FALSE} +. endif +. if !${_GITHUB_GROUPS:M${_group}} +_GITHUB_GROUPS+= ${_group} +. endif +_GH_TAGNAME_${_group}= ${_T:C@^(.*):[^/:]+$@\1@} +. endfor +. else +_GH_TAGNAME_DEFAULT= ${_T:C@^(.*):[^/:]+$@\1@} . endif +.endfor +GH_ACCOUNT:= ${_GH_ACCOUNT_DEFAULT} +GH_PROJECT:= ${_GH_PROJECT_DEFAULT} +GH_TAGNAME:= ${_GH_TAGNAME_DEFAULT} . if defined(GH_TAGNAME) GH_TAGNAME_SANITIZED= ${GH_TAGNAME:S,/,-,} # Github silently converts tags starting with v to not have v in the filename # and extraction directory. GH_TAGNAME_EXTRACT= ${GH_TAGNAME_SANITIZED:C/^[vV]([0-9])/\1/} +. endif +. if defined(_GITHUB_MUST_SET_DISTNAME) +# GH_TAGNAME defaults to DISTVERSIONFULL; Avoid adding DISTVERSIONFULL in twice +. if ${GH_TAGNAME_SANITIZED} != ${DISTVERSIONFULL} +DISTNAME= ${GH_ACCOUNT}-${GH_PROJECT}-${DISTVERSIONFULL}-${GH_TAGNAME_SANITIZED} +. else +DISTNAME= ${GH_ACCOUNT}-${GH_PROJECT}-${GH_TAGNAME_SANITIZED} +. endif . endif +# This new scheme rerolls distfiles. Also ensure they are renamed to avoid +# conflicts. Use _GITHUB_REV in case github changes their zipping or structure +# which has happened before. +_GITHUB_REV= 0 +. if ${MASTER_SITES:MGH} +DISTNAME:= ${DISTNAME}_GH${_GITHUB_REV} +. endif +.endif +_GITHUB_EXTRACT_SUFX= .tar.gz +# If there are non default groups +.if !empty(_GITHUB_GROUPS:NDEFAULT) +# Put the DEFAULT distfile first +DISTFILES+= ${DISTNAME}${_GITHUB_EXTRACT_SUFX} +# Then for each group, add DISTFILES and MASTER_SITES entries +# and create a WRKSRC_group helper variable. +. for _group in ${_GITHUB_GROUPS:NDEFAULT} +_a_tmp= ${_GH_ACCOUNT_${_group}:U${_GH_ACCOUNT_DEFAULT}} +_p_tmp= ${_GH_PROJECT_${_group}:U${_GH_PROJECT_DEFAULT}} +_t_tmp= ${_GH_TAGNAME_${_group}:U${_GH_TAGNAME_DEFAULT}} +_t_tmp_s= ${_t_tmp:S,/,-,} +_t_tmp_e= ${_t_tmp_s:C/^[vV]([0-9])/\1/} +_DISTNAME= ${_a_tmp}-${_p_tmp}-${_t_tmp_s} +DISTFILES:= ${DISTFILES} ${_DISTNAME}_GH${_GITHUB_REV}${_GITHUB_EXTRACT_SUFX}:${_group} +MASTER_SITES:= ${MASTER_SITES} ${MASTER_SITE_GITHUB:S@%SUBDIR%@${_a_tmp}/${_p_tmp}/tar.gz/${_t_tmp}?dummy=/:${_group}@} +WRKSRC_${_group}:= ${WRKDIR}/${_p_tmp}-${_t_tmp_e} +. endfor .endif .endif Index: net/syncthing-cli/Makefile =================================================================== --- net/syncthing-cli/Makefile +++ net/syncthing-cli/Makefile @@ -5,12 +5,6 @@ PORTVERSION= 0.1.0.2015050601 PORTREVISION= 1 CATEGORIES= net -MASTER_SITES= GH \ - https://github.com/syncthing/syncthing/archive/v${SYNCTHING_VER}.tar.gz?dummy=/:group2 \ - https://codeload.github.com/AudriusButkevicius/cli/legacy.tar.gz/7f561c7?dummy=/:group3 -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - syncthing-${SYNCTHING_VER}${EXTRACT_SUFX}:group2 \ - AudriusButkevicius-cli-7f561c7${EXTACT_SUFX}:group3 MAINTAINER= swills@FreeBSD.org COMMENT= Syncthing CLI @@ -18,9 +12,9 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/go:${PORTSDIR}/lang/go USE_GITHUB= yes -GH_ACCOUNT= syncthing -GH_PROJECT= syncthing-cli -GH_TAGNAME= 51ec7bb30c3ccb92a3c4616ef00be3b3db739afe +GH_ACCOUNT= syncthing AudriusButkevicius:audrius +GH_PROJECT= syncthing:st cli:audrius +GH_TAGNAME= 51ec7bb v${SYNCTHING_VER}:st 7f561c7:audrius SYNCTHING_VER= 0.11.4 @@ -34,17 +28,17 @@ @${MKDIR} ${WRKSRC}/src/code.google.com/p @${MKDIR} ${WRKSRC}/src/golang.org/x @${MKDIR} ${WRKSRC}/src/github.com/bkaradzic - @${MV} ${WRKDIR}/AudriusButkevicius-cli-7f561c7 \ + @${MV} ${WRKSRC_audrius} \ ${WRKSRC}/src/github.com/AudriusButkevicius/cli - @${MV} ${WRKDIR}/syncthing-${SYNCTHING_VER}/Godeps/_workspace/src/golang.org/x/crypto \ + @${MV} ${WRKSRC_st}/Godeps/_workspace/src/golang.org/x/crypto \ ${WRKSRC}/src/golang.org/x - @${MV} ${WRKDIR}/syncthing-${SYNCTHING_VER}/Godeps/_workspace/src/golang.org/x/text \ + @${MV} ${WRKSRC_st}/Godeps/_workspace/src/golang.org/x/text \ ${WRKSRC}/src/golang.org/x - @${MV} ${WRKDIR}/syncthing-${SYNCTHING_VER}/Godeps/_workspace/src/github.com/bkaradzic/go-lz4 \ + @${MV} ${WRKSRC_st}/Godeps/_workspace/src/github.com/bkaradzic/go-lz4 \ ${WRKSRC}/src/github.com/bkaradzic - @${MV} ${WRKDIR}/syncthing-${SYNCTHING_VER}/Godeps/_workspace/src/github.com/calmh \ + @${MV} ${WRKSRC_st}/Godeps/_workspace/src/github.com/calmh \ ${WRKSRC}/src/github.com/calmh - @${MV} ${WRKDIR}/syncthing-${SYNCTHING_VER} \ + @${MV} ${WRKSRC_st} \ ${WRKSRC}/src/github.com/syncthing/syncthing @${MV} ${WRKSRC}/src/github.com/syncthing/syncthing/Godeps/_workspace/src/github.com/syncthing/protocol \ ${WRKSRC}/src/github.com/syncthing/protocol Index: net/syncthing-cli/distinfo =================================================================== --- net/syncthing-cli/distinfo +++ net/syncthing-cli/distinfo @@ -1,6 +1,6 @@ -SHA256 (syncthing-syncthing-cli-0.1.0.2015050601-51ec7bb30c3ccb92a3c4616ef00be3b3db739afe_GH0.tar.gz) = aeb4e6a5588391e0b0645f23684e2fb11ccaff3a5b20abf7dea3a4a45f7d69a3 -SIZE (syncthing-syncthing-cli-0.1.0.2015050601-51ec7bb30c3ccb92a3c4616ef00be3b3db739afe_GH0.tar.gz) = 9202 -SHA256 (syncthing-0.11.4.tar.gz) = f4dbc3d24ec2d1bdf302c994c1e088b2129791522a25122710fb427d2a19387e -SIZE (syncthing-0.11.4.tar.gz) = 3159537 -SHA256 (AudriusButkevicius-cli-7f561c7) = ad64f151c314333f714ef600f65a4fb512ce7242bc2100074775581a56ad439a -SIZE (AudriusButkevicius-cli-7f561c7) = 14736 +SHA256 (syncthing-syncthing-cli-0.1.0.2015050601-51ec7bb_GH0.tar.gz) = c22a842d8647fca8bdfb9d48ca61f3c5bdfee3573aeec0364f3b1c0f4bd304a3 +SIZE (syncthing-syncthing-cli-0.1.0.2015050601-51ec7bb_GH0.tar.gz) = 9201 +SHA256 (AudriusButkevicius-cli-7f561c7_GH0.tar.gz) = 8d6c282b2737c5ae17c3ba4ce81037762f46aa5a05d0095c0d481639d081110c +SIZE (AudriusButkevicius-cli-7f561c7_GH0.tar.gz) = 14722 +SHA256 (syncthing-syncthing-v0.11.4_GH0.tar.gz) = f4dbc3d24ec2d1bdf302c994c1e088b2129791522a25122710fb427d2a19387e +SIZE (syncthing-syncthing-v0.11.4_GH0.tar.gz) = 3159537 Index: net/syncthing-discosrv/Makefile =================================================================== --- net/syncthing-discosrv/Makefile +++ net/syncthing-discosrv/Makefile @@ -5,11 +5,6 @@ PORTVERSION= 0.0.0.2015022401 PORTREVISION= 2 CATEGORIES= net -MASTER_SITES= https://github.com/syncthing/syncthing/archive/v${SYNCTHING_VER}.tar.gz?dummy=/:group2 \ - https://codeload.github.com/golang/groupcache/legacy.tar.gz/${GROUPCACHE_COMMIT}?dummy=/:group3 -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - syncthing-${SYNCTHING_VER}${EXTRACT_SUFX}:group2 \ - golang-groupcache-${GROUPCACHE_COMMIT}${EXTRACT_SUFX}:group3 MAINTAINER= swills@FreeBSD.org COMMENT= Discovery server for syncthing @@ -17,12 +12,11 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/go:${PORTSDIR}/lang/go USE_GITHUB= yes -GH_ACCOUNT= syncthing -GH_PROJECT= discosrv -GH_TAGNAME= 4e1240a610bcc2ef8772eb2641492822b4ec4f88 +GH_ACCOUNT= syncthing golang:gc +GH_PROJECT= discosrv syncthing:st groupcache:gc +GH_TAGNAME= 4e1240a v${SYNCTHING_VER}:st d2a1805:gc SYNCTHING_VER= 0.11.4 -GROUPCACHE_COMMIT= d2a1805 PLIST_FILES= bin/syncthing-discosrv @@ -40,25 +34,25 @@ @${MKDIR} ${WRKSRC}/src/github.com/syncthing @${MKDIR} ${WRKSRC}/src/github.com/syndtr @${MKDIR} ${WRKSRC}/src/golang.org/x - @${MV} ${WRKDIR}/syncthing-${SYNCTHING_VER}/Godeps/_workspace/src/github.com/calmh \ + @${MV} ${WRKSRC_st}/Godeps/_workspace/src/github.com/calmh \ ${WRKSRC}/src/github.com - @${MV} ${WRKDIR}/syncthing-${SYNCTHING_VER}/Godeps/_workspace/src/github.com/bkaradzic/go-lz4 \ + @${MV} ${WRKSRC_st}/Godeps/_workspace/src/github.com/bkaradzic/go-lz4 \ ${WRKSRC}/src/github.com/bkaradzic - @${MV} ${WRKDIR}/syncthing-${SYNCTHING_VER}/Godeps/_workspace/src/github.com/juju/ratelimit \ + @${MV} ${WRKSRC_st}/Godeps/_workspace/src/github.com/juju/ratelimit \ ${WRKSRC}/src/github.com/juju - @${MV} ${WRKDIR}/syncthing-${SYNCTHING_VER}/Godeps/_workspace/src/github.com/syndtr/goleveldb \ + @${MV} ${WRKSRC_st}/Godeps/_workspace/src/github.com/syndtr/goleveldb \ ${WRKSRC}/src/github.com/syndtr - @${MV} ${WRKDIR}/syncthing-${SYNCTHING_VER}/Godeps/_workspace/src/github.com/syndtr/gosnappy \ + @${MV} ${WRKSRC_st}/Godeps/_workspace/src/github.com/syndtr/gosnappy \ ${WRKSRC}/src/github.com/syndtr - @${MV} ${WRKDIR}/syncthing-${SYNCTHING_VER}/Godeps/_workspace/src/golang.org/x/crypto \ + @${MV} ${WRKSRC_st}/Godeps/_workspace/src/golang.org/x/crypto \ ${WRKSRC}/src/golang.org/x - @${MV} ${WRKDIR}/syncthing-${SYNCTHING_VER}/Godeps/_workspace/src/golang.org/x/text \ + @${MV} ${WRKSRC_st}/Godeps/_workspace/src/golang.org/x/text \ ${WRKSRC}/src/golang.org/x - @${MV} ${WRKDIR}/syncthing-${SYNCTHING_VER} \ + @${MV} ${WRKSRC_st} \ ${WRKSRC}/src/github.com/syncthing/syncthing @${MV} ${WRKSRC}/src/github.com/syncthing/syncthing/Godeps/_workspace/src/github.com/syncthing/protocol \ ${WRKSRC}/src/github.com/syncthing/protocol - @${MV} ${WRKDIR}/golang-groupcache-${GROUPCACHE_COMMIT} \ + @${MV} ${WRKSRC_gc} \ ${WRKSRC}/src/github.com/golang/groupcache do-build: Index: net/syncthing-discosrv/distinfo =================================================================== --- net/syncthing-discosrv/distinfo +++ net/syncthing-discosrv/distinfo @@ -1,6 +1,6 @@ -SHA256 (syncthing-discosrv-0.0.0.2015022401-4e1240a610bcc2ef8772eb2641492822b4ec4f88_GH0.tar.gz) = 70ddebacddb8c3de9019f83e1e63cb95d36731433068480b2499d491dcdd45e7 -SIZE (syncthing-discosrv-0.0.0.2015022401-4e1240a610bcc2ef8772eb2641492822b4ec4f88_GH0.tar.gz) = 16841 -SHA256 (syncthing-0.11.4.tar.gz) = f4dbc3d24ec2d1bdf302c994c1e088b2129791522a25122710fb427d2a19387e -SIZE (syncthing-0.11.4.tar.gz) = 3159537 -SHA256 (golang-groupcache-d2a1805.tar.gz) = be22ff0c07a589fdb4665637787a2693e685e824a4ccb2bcfe8d9811d0c822a3 -SIZE (golang-groupcache-d2a1805.tar.gz) = 24094 +SHA256 (syncthing-discosrv-0.0.0.2015022401-4e1240a_GH0.tar.gz) = a0b1865793da2a780a50ddf112515e3467ddb04741562a761437f434a453fde7 +SIZE (syncthing-discosrv-0.0.0.2015022401-4e1240a_GH0.tar.gz) = 16804 +SHA256 (golang-groupcache-d2a1805_GH0.tar.gz) = 4589876f2e8830663a2d19bb4d7ca2e3993e8e8d2710dd3c1941b6d0d5e6de34 +SIZE (golang-groupcache-d2a1805_GH0.tar.gz) = 24089 +SHA256 (syncthing-syncthing-v0.11.4_GH0.tar.gz) = f4dbc3d24ec2d1bdf302c994c1e088b2129791522a25122710fb427d2a19387e +SIZE (syncthing-syncthing-v0.11.4_GH0.tar.gz) = 3159537 Index: sysutils/consul/Makefile =================================================================== --- sysutils/consul/Makefile +++ sysutils/consul/Makefile @@ -2,77 +2,10 @@ PORTNAME= consul PORTVERSION= 0.5.2 +DISTVERSIONPREFIX= v CATEGORIES= sysutils -MASTER_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/archive/${GH_TAGNAME}.tar.gz?dummy=/:group1 \ - https://github.com/armon/circbuf/archive/f092b4f207b6e5cce0569056fba9e1a2735cb6cf.tar.gz?dummy=/:group2 \ - https://github.com/golang/protobuf/archive/5677a0e3d5e89854c9974e1256839ee23f8233ca.tar.gz?dummy=/:group3 \ - https://github.com/armon/go-metrics/archive/a54701ebec11868993bc198c3f315353e9de2ed6.tar.gz?dummy=/:group4 \ - https://github.com/armon/go-radix/archive/0bab926c3433cfd6490c6d3c504a7b471362390c.tar.gz?dummy=/:group5 \ - https://github.com/armon/gomdb/archive/151f2e08ef45cb0e57d694b2562f351955dff572.tar.gz?dummy=/:group6 \ - https://github.com/hashicorp/go-checkpoint/archive/88326f6851319068e7b34981032128c0b1a6524d.tar.gz?dummy=/:group7 \ - https://github.com/hashicorp/go-msgpack/archive/71c2886f5a673a35f909803f38ece5810165097b.tar.gz?dummy=/:group8 \ - https://github.com/hashicorp/go-multierror/archive/fcdddc395df1ddf4247c69bd436e84cfa0733f7e.tar.gz?dummy=/:group9 \ - https://github.com/hashicorp/go-syslog/archive/42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz?dummy=/:group10 \ - https://github.com/hashicorp/golang-lru/archive/995efda3e073b6946b175ed93901d729ad47466a.tar.gz?dummy=/:group11 \ - https://github.com/hashicorp/hcl/archive/513e04c400ee2e81e97f5e011c08fb42c6f69b84.tar.gz?dummy=/:group12 \ - https://github.com/hashicorp/logutils/archive/367a65d59043b4f846d179341d138f01f988c186.tar.gz?dummy=/:group13 \ - https://github.com/hashicorp/memberlist/archive/6025015f2dc659ca2c735112d37e753bda6e329d.tar.gz?dummy=/:group14 \ - https://github.com/hashicorp/raft/archive/a8065f298505708bf60f518c09178149f3c06f21.tar.gz?dummy=/:group15 \ - https://github.com/hashicorp/raft-mdb/archive/4ec3694ffbc74d34f7532e70ef2e9c3546a0c0b0.tar.gz?dummy=/:group16 \ - https://github.com/hashicorp/serf/archive/320787d8567bdcf9d77f8c5d65031fcb19e71ebc.tar.gz?dummy=/:group17 \ - https://github.com/hashicorp/scada-client/archive/c26580cfe35393f6f4bf1b9ba55e6afe33176bae.tar.gz?dummy=/:group18 \ - https://github.com/hashicorp/yamux/archive/b2e55852ddaf823a85c67f798080eb7d08acd71d.tar.gz?dummy=/:group19 \ - https://github.com/inconshreveable/muxado/archive/f693c7e88ba316d1a0ae3e205e22a01aa3ec2848.tar.gz?dummy=/:group20 \ - https://github.com/miekg/dns/archive/bb1103f648f811d2018d4bedcb2d4b2bce34a0f1.tar.gz?dummy=/:group21 \ - https://github.com/mitchellh/cli/archive/6cc8bc522243675a2882b81662b0b0d2e04b99c9.tar.gz?dummy=/:group22 \ - https://github.com/mitchellh/mapstructure/archive/442e588f213303bec7936deba67901f8fc8f18b1.tar.gz?dummy=/:group23 \ - https://github.com/ryanuber/columnize/archive/44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a.tar.gz?dummy=/:group24 \ - https://github.com/ugorji/go/archive/e906e395b9d45d3230e800c8ad1f92f99764e753.tar.gz?dummy=/:group25 \ - https://github.com/hashicorp/net-rpc-msgpackrpc/archive/d377902b7aba83dd3895837b902f6cf3f71edcb2.tar.gz?dummy=/:group26 \ - https://github.com/matttproud/golang_protobuf_extensions/archive/ba7d65ac66e9da93a714ca18f6d1bc7a0c09100c.tar.gz?dummy=/:group27 \ - https://github.com/prometheus/client_golang/archive/38dbb2e26868d15db0275ddbaac0cbe450ec03de.tar.gz?dummy=/:group28 \ - https://github.com/prometheus/client_model/archive/fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz?dummy=/:group29 \ - https://github.com/prometheus/procfs/archive/92faa308558161acab0ada1db048e9996ecec160.tar.gz?dummy=/:group30 \ - https://dl.bintray.com/mitchellh/consul/:group31 \ - https://github.com/hashicorp/raft-boltdb/archive/d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee.tar.gz?dummy=/:group32 \ - https://github.com/boltdb/bolt/archive/2c04100eb9793f2b8541d243494e2909d2112325.tar.gz?dummy=/:group33 \ - https://github.com/hashicorp/consul-migrate/archive/4977886fc950a0db1a6f0bbadca56dfabf170f9c.tar.gz?dummy=/:group34 \ - https://github.com/golang/crypto/archive/74f810a0152f4c50a16195f6b9ff44afc35594e8.tar.gz?dummy=/:group35 -DISTFILES= consul-${PORTVERSION}.tar.gz:group1 \ - armon_circbuf_f092b4f207b6e5cce0569056fba9e1a2735cb6cf.tar.gz:group2 \ - golang_protobuf_5677a0e3d5e89854c9974e1256839ee23f8233ca.tar.gz:group3 \ - armon_go-metrics_a54701ebec11868993bc198c3f315353e9de2ed6.tar.gz:group4 \ - armon_go-radix_0bab926c3433cfd6490c6d3c504a7b471362390c.tar.gz:group5 \ - armon_gomdb_151f2e08ef45cb0e57d694b2562f351955dff572.tar.gz:group6 \ - hashicorp_go-checkpoint_88326f6851319068e7b34981032128c0b1a6524d.tar.gz:group7 \ - hashicorp_go-msgpack_71c2886f5a673a35f909803f38ece5810165097b.tar.gz:group8 \ - hashicorp_go-multierror_fcdddc395df1ddf4247c69bd436e84cfa0733f7e.tar.gz:group9 \ - hashicorp_go-syslog_42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz:group10 \ - hashicorp_golang-lru_995efda3e073b6946b175ed93901d729ad47466a.tar.gz:group11 \ - hashicorp_hcl_513e04c400ee2e81e97f5e011c08fb42c6f69b84.tar.gz:group12 \ - hashicorp_logutils_367a65d59043b4f846d179341d138f01f988c186.tar.gz:group13 \ - hashicorp_memberlist_6025015f2dc659ca2c735112d37e753bda6e329d.tar.gz:group14 \ - hashicorp_raft_a8065f298505708bf60f518c09178149f3c06f21.tar.gz:group15 \ - hashicorp_raft-mdb_4ec3694ffbc74d34f7532e70ef2e9c3546a0c0b0.tar.gz:group16 \ - hashicorp_serf_320787d8567bdcf9d77f8c5d65031fcb19e71ebc.tar.gz:group17 \ - hashicorp_scada-client_c26580cfe35393f6f4bf1b9ba55e6afe33176bae.tar.gz:group18 \ - hashicorp_yamux_b2e55852ddaf823a85c67f798080eb7d08acd71d.tar.gz:group19 \ - inconshreveable_muxado_f693c7e88ba316d1a0ae3e205e22a01aa3ec2848.tar.gz:group20 \ - miekg_dns_bb1103f648f811d2018d4bedcb2d4b2bce34a0f1.tar.gz:group21 \ - mitchellh_cli_6cc8bc522243675a2882b81662b0b0d2e04b99c9.tar.gz:group22 \ - mitchellh_mapstructure_442e588f213303bec7936deba67901f8fc8f18b1.tar.gz:group23 \ - ryanuber_columnize_44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a.tar.gz:group24 \ - ugorji_go_e906e395b9d45d3230e800c8ad1f92f99764e753.tar.gz:group25 \ - net-rpc-msgpackrpc_d377902b7aba83dd3895837b902f6cf3f71edcb2.tar.gz:group26 \ - golang_protobuf_extensions_ba7d65ac66e9da93a714ca18f6d1bc7a0c09100c.tar.gz:group27 \ - prometheus_client_golang_38dbb2e26868d15db0275ddbaac0cbe450ec03de.tar.gz:group28 \ - prometheus_client_model_fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz:group29 \ - prometheus_procfs_92faa308558161acab0ada1db048e9996ecec160.tar.gz:group30 \ - ${PORTVERSION}_web_ui.zip:group31 \ - hashicorp_raft-boltdb_d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee.tar.gz:group32 \ - boltdb_bolt_2c04100eb9793f2b8541d243494e2909d2112325.tar.gz:group33 \ - hashicorp_consul-migrate_4977886fc950a0db1a6f0bbadca56dfabf170f9c.tar.gz:group34 \ - golang_crypto_74f810a0152f4c50a16195f6b9ff44afc35594e8.tar.gz:group35 +MASTER_SITES= https://dl.bintray.com/mitchellh/consul/:web_ui +DISTFILES= ${PORTVERSION}_web_ui.zip:web_ui MAINTAINER= swills@FreeBSD.org COMMENT= Service discovery and configuration made easy @@ -84,16 +17,42 @@ USES= compiler USE_GITHUB= yes -GH_ACCOUNT= hashicorp -GH_TAGNAME= v${PORTVERSION} +GH_ACCOUNT= hashicorp:DEFAULT,go_checkpoint,go_msgpack,go_multierror,go_syslog,golang_lru,hcl,logutils,memberlist,raft,raft_mdb,serf,scada,yamux,migrate,msgpackrpc,boltdb \ + armon:circbuf,go_metrics,go_radix,gomdb golang:protobuf,crypto \ + boltdb:bolt inconshreveable:muxado matttproud:protobuf_ext \ + miekg:dns mitchellh:cli mitchellh:mapstructure \ + prometheus:client_golang,client_model,procfs \ + ryanuber:columnize ugorji:go +GH_PROJECT= circbuf:circbuf protobuf:protobuf go-metrics:go_metrics \ + go-radix:go_radix gomdb:gomdb go-checkpoint:go_checkpoint \ + go-msgpack:go_msgpack go-multierror:go_multierror \ + go-syslog:go_syslog golang-lru:golang_lru hcl:hcl \ + logutils:logutils memberlist:memberlist raft:raft \ + raft-mdb:raft_mdb serf:serf scada-client:scada yamux:yamux \ + consul-migrate:migrate net-rpc-msgpackrpc:msgpackrpc \ + raft-boltdb:boltdb crypto:crypto bolt:bolt muxado:muxado \ + golang_protobuf_extensions:protobuf_ext dns:dns cli:cli \ + mapstructure:mapstructure client_golang:client_golang \ + client_model:client_model procfs:procfs columnize:columnize \ + go:go +GH_TAGNAME= f092b4f:circbuf 5677a0e:protobuf a54701e:go_metrics \ + 0bab926:go_radix 151f2e0:gomdb 88326f6:go_checkpoint \ + 71c2886:go_msgpack fcdddc3:go_multierror 42a2b57:go_syslog \ + 995efda:golang_lru 513e04c:hcl 367a65d:logutils \ + 6025015:memberlist a8065f2:raft 4ec3694:raft_mdb 320787d:serf \ + c26580c:scada b2e5585:yamux 4977886:migrate \ + d377902:msgpackrpc d1e82c1:boltdb 74f810a:crypto 2c04100:bolt \ + f693c7e:muxado ba7d65a:protobuf_ext bb1103f:dns 6cc8bc5:cli \ + 442e588:mapstructure 38dbb2e:client_golang \ + fa8ad6f:client_model 92faa30:procfs 44cb478:columnize \ + e906e39:go + USE_RC_SUBR= consul USERS= consul GROUPS= consul -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} - STRIP= # stripping can break go binaries post-patch: @@ -116,69 +75,69 @@ @${MKDIR} ${WRKSRC}/src/github.com/matttproud @${MKDIR} ${WRKSRC}/src/github.com/prometheus @${MKDIR} ${WRKSRC}/src/golang.org/x - @${MV} ${WRKDIR}/circbuf-f092b4f207b6e5cce0569056fba9e1a2735cb6cf \ + @${MV} ${WRKSRC_circbuf} \ ${WRKSRC}/src/github.com/armon/circbuf - @${MV} ${WRKDIR}/go-metrics-a54701ebec11868993bc198c3f315353e9de2ed6 \ + @${MV} ${WRKSRC_go_metrics} \ ${WRKSRC}/src/github.com/armon/go-metrics - @${MV} ${WRKDIR}/go-radix-0bab926c3433cfd6490c6d3c504a7b471362390c \ + @${MV} ${WRKSRC_go_radix} \ ${WRKSRC}/src/github.com/armon/go-radix - @${MV} ${WRKDIR}/gomdb-151f2e08ef45cb0e57d694b2562f351955dff572 \ + @${MV} ${WRKSRC_gomdb} \ ${WRKSRC}/src/github.com/armon/gomdb - @${MV} ${WRKDIR}/protobuf-5677a0e3d5e89854c9974e1256839ee23f8233ca \ + @${MV} ${WRKSRC_protobuf} \ ${WRKSRC}/src/github.com/golang/protobuf - @${MV} ${WRKDIR}/go-msgpack-71c2886f5a673a35f909803f38ece5810165097b \ + @${MV} ${WRKSRC_go_msgpack} \ ${WRKSRC}/src/github.com/hashicorp/go-msgpack - @${MV} ${WRKDIR}/go-multierror-fcdddc395df1ddf4247c69bd436e84cfa0733f7e \ + @${MV} ${WRKSRC_go_multierror} \ ${WRKSRC}/src/github.com/hashicorp/go-multierror - @${MV} ${WRKDIR}/go-checkpoint-88326f6851319068e7b34981032128c0b1a6524d \ + @${MV} ${WRKSRC_go_checkpoint} \ ${WRKSRC}/src/github.com/hashicorp/go-checkpoint - @${MV} ${WRKDIR}/go-syslog-42a2b573b664dbf281bd48c3cc12c086b17a39ba \ + @${MV} ${WRKSRC_go_syslog} \ ${WRKSRC}/src/github.com/hashicorp/go-syslog - @${MV} ${WRKDIR}/golang-lru-995efda3e073b6946b175ed93901d729ad47466a \ + @${MV} ${WRKSRC_golang_lru} \ ${WRKSRC}/src/github.com/hashicorp/golang-lru - @${MV} ${WRKDIR}/hcl-513e04c400ee2e81e97f5e011c08fb42c6f69b84 \ + @${MV} ${WRKSRC_hcl} \ ${WRKSRC}/src/github.com/hashicorp/hcl - @${MV} ${WRKDIR}/logutils-367a65d59043b4f846d179341d138f01f988c186 \ + @${MV} ${WRKSRC_logutils} \ ${WRKSRC}/src/github.com/hashicorp/logutils - @${MV} ${WRKDIR}/memberlist-6025015f2dc659ca2c735112d37e753bda6e329d \ + @${MV} ${WRKSRC_memberlist} \ ${WRKSRC}/src/github.com/hashicorp/memberlist - @${MV} ${WRKDIR}/raft-a8065f298505708bf60f518c09178149f3c06f21 \ + @${MV} ${WRKSRC_raft} \ ${WRKSRC}/src/github.com/hashicorp/raft - @${MV} ${WRKDIR}/raft-mdb-4ec3694ffbc74d34f7532e70ef2e9c3546a0c0b0 \ + @${MV} ${WRKSRC_raft_mdb} \ ${WRKSRC}/src/github.com/hashicorp/raft-mdb - @${MV} ${WRKDIR}/serf-320787d8567bdcf9d77f8c5d65031fcb19e71ebc \ + @${MV} ${WRKSRC_serf} \ ${WRKSRC}/src/github.com/hashicorp/serf - @${MV} ${WRKDIR}/scada-client-c26580cfe35393f6f4bf1b9ba55e6afe33176bae \ + @${MV} ${WRKSRC_scada} \ ${WRKSRC}/src/github.com/hashicorp/scada-client - @${MV} ${WRKDIR}/yamux-b2e55852ddaf823a85c67f798080eb7d08acd71d \ + @${MV} ${WRKSRC_yamux} \ ${WRKSRC}/src/github.com/hashicorp/yamux - @${MV} ${WRKDIR}/muxado-f693c7e88ba316d1a0ae3e205e22a01aa3ec2848 \ + @${MV} ${WRKSRC_muxado} \ ${WRKSRC}/src/github.com/inconshreveable/muxado - @${MV} ${WRKDIR}/dns-bb1103f648f811d2018d4bedcb2d4b2bce34a0f1 \ + @${MV} ${WRKSRC_dns} \ ${WRKSRC}/src/github.com/miekg/dns - @${MV} ${WRKDIR}/cli-6cc8bc522243675a2882b81662b0b0d2e04b99c9 \ + @${MV} ${WRKSRC_cli} \ ${WRKSRC}/src/github.com/mitchellh/cli - @${MV} ${WRKDIR}/mapstructure-442e588f213303bec7936deba67901f8fc8f18b1 \ + @${MV} ${WRKSRC_mapstructure} \ ${WRKSRC}/src/github.com/mitchellh/mapstructure - @${MV} ${WRKDIR}/columnize-44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a \ + @${MV} ${WRKSRC_columnize} \ ${WRKSRC}/src/github.com/ryanuber/columnize - @${MV} ${WRKDIR}/net-rpc-msgpackrpc-d377902b7aba83dd3895837b902f6cf3f71edcb2 \ + @${MV} ${WRKSRC_msgpackrpc} \ ${WRKSRC}/src/github.com/hashicorp/net-rpc-msgpackrpc - @${MV} ${WRKDIR}/golang_protobuf_extensions-ba7d65ac66e9da93a714ca18f6d1bc7a0c09100c \ + @${MV} ${WRKSRC_protobuf_ext} \ ${WRKSRC}/src/github.com/matttproud/golang_protobuf_extensions - @${MV} ${WRKDIR}/client_golang-38dbb2e26868d15db0275ddbaac0cbe450ec03de \ + @${MV} ${WRKSRC_client_golang} \ ${WRKSRC}/src/github.com/prometheus/client_golang - @${MV} ${WRKDIR}/client_model-fa8ad6fec33561be4280a8f0514318c79d7f6cb6 \ + @${MV} ${WRKSRC_client_model} \ ${WRKSRC}/src/github.com/prometheus/client_model - @${MV} ${WRKDIR}/procfs-92faa308558161acab0ada1db048e9996ecec160 \ + @${MV} ${WRKSRC_procfs} \ ${WRKSRC}/src/github.com/prometheus/procfs - @${MV} ${WRKDIR}/raft-boltdb-d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee \ + @${MV} ${WRKSRC_boltdb} \ ${WRKSRC}/src/github.com/hashicorp/raft-boltdb - @${MV} ${WRKDIR}/bolt-2c04100eb9793f2b8541d243494e2909d2112325 \ + @${MV} ${WRKSRC_bolt} \ ${WRKSRC}/src/github.com/boltdb/bolt - @${MV} ${WRKDIR}/consul-migrate-4977886fc950a0db1a6f0bbadca56dfabf170f9c \ + @${MV} ${WRKSRC_migrate} \ ${WRKSRC}/src/github.com/hashicorp/consul-migrate - @${MV} ${WRKDIR}/crypto-74f810a0152f4c50a16195f6b9ff44afc35594e8 \ + @${MV} ${WRKSRC_crypto} \ ${WRKSRC}/src/golang.org/x/crypto do-build: Index: sysutils/consul/distinfo =================================================================== --- sysutils/consul/distinfo +++ sysutils/consul/distinfo @@ -1,70 +1,70 @@ -SHA256 (consul-0.5.2.tar.gz) = acaa3b7a7c874d247175faaa9178bb1e93eabb2d810dc842c79ccf272b4518b6 -SIZE (consul-0.5.2.tar.gz) = 1821228 -SHA256 (armon_circbuf_f092b4f207b6e5cce0569056fba9e1a2735cb6cf.tar.gz) = b67d2ffc0a725b6844895680d52ba4a63757987637c8dabbb2c3e4d836512d52 -SIZE (armon_circbuf_f092b4f207b6e5cce0569056fba9e1a2735cb6cf.tar.gz) = 2748 -SHA256 (golang_protobuf_5677a0e3d5e89854c9974e1256839ee23f8233ca.tar.gz) = 683d5562625ed05baaffc265bfda73a6f9afa04fc1436c98df2c9bba2f3667f1 -SIZE (golang_protobuf_5677a0e3d5e89854c9974e1256839ee23f8233ca.tar.gz) = 133649 -SHA256 (armon_go-metrics_a54701ebec11868993bc198c3f315353e9de2ed6.tar.gz) = 2f4206d5d50eaab383cdc4f5c57179e285b93649c028a69dd9e2a4a45b69afe3 -SIZE (armon_go-metrics_a54701ebec11868993bc198c3f315353e9de2ed6.tar.gz) = 11268 -SHA256 (armon_go-radix_0bab926c3433cfd6490c6d3c504a7b471362390c.tar.gz) = f4e628adceee06d7717dce0bf566d5ebd8c009599807f2436b3cda259011b331 -SIZE (armon_go-radix_0bab926c3433cfd6490c6d3c504a7b471362390c.tar.gz) = 5446 -SHA256 (armon_gomdb_151f2e08ef45cb0e57d694b2562f351955dff572.tar.gz) = de5119016d4e12885c474f4f1e682c80984b464a0ae2809f28699aeba1badc68 -SIZE (armon_gomdb_151f2e08ef45cb0e57d694b2562f351955dff572.tar.gz) = 100298 -SHA256 (hashicorp_go-checkpoint_88326f6851319068e7b34981032128c0b1a6524d.tar.gz) = ea62599bfbe3ec9b616a8b75a14013ccfc288b8b0ccdcac4dac93c82503d41ae -SIZE (hashicorp_go-checkpoint_88326f6851319068e7b34981032128c0b1a6524d.tar.gz) = 9830 -SHA256 (hashicorp_go-msgpack_71c2886f5a673a35f909803f38ece5810165097b.tar.gz) = c32b90e67762a375981b38154cae65222bb1aaa7722727d0225d5f8de773e4c8 -SIZE (hashicorp_go-msgpack_71c2886f5a673a35f909803f38ece5810165097b.tar.gz) = 49485 -SHA256 (hashicorp_go-multierror_fcdddc395df1ddf4247c69bd436e84cfa0733f7e.tar.gz) = af90f9be029c091eb011ff25d270772fdb51edf3c6396cf99f224c4e7ad724c3 -SIZE (hashicorp_go-multierror_fcdddc395df1ddf4247c69bd436e84cfa0733f7e.tar.gz) = 8058 -SHA256 (hashicorp_go-syslog_42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz) = 378f5249729661db9d0c65030fbf636f6ec1d60ee926e67abf8c6dd7921d3907 -SIZE (hashicorp_go-syslog_42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz) = 4397 -SHA256 (hashicorp_golang-lru_995efda3e073b6946b175ed93901d729ad47466a.tar.gz) = cac6e889020e8b31e46d50b98e0af9acbb44bf352ad0ca9d30db79b6235849e2 -SIZE (hashicorp_golang-lru_995efda3e073b6946b175ed93901d729ad47466a.tar.gz) = 7872 -SHA256 (hashicorp_hcl_513e04c400ee2e81e97f5e011c08fb42c6f69b84.tar.gz) = 109ec067ff8ff7f30538e0d2ba1384c1fe25694c99d56972003b1c669d19d0b2 -SIZE (hashicorp_hcl_513e04c400ee2e81e97f5e011c08fb42c6f69b84.tar.gz) = 28692 -SHA256 (hashicorp_logutils_367a65d59043b4f846d179341d138f01f988c186.tar.gz) = 9b2173d9277574adbc45400101cb0b65534a5cd3defe62eeb3bff652eeb3e34c -SIZE (hashicorp_logutils_367a65d59043b4f846d179341d138f01f988c186.tar.gz) = 7704 -SHA256 (hashicorp_memberlist_6025015f2dc659ca2c735112d37e753bda6e329d.tar.gz) = 7b808ff100db2e484e6cf338d32ed55512f4c371c5cbba498aeca632f21c830f -SIZE (hashicorp_memberlist_6025015f2dc659ca2c735112d37e753bda6e329d.tar.gz) = 51853 -SHA256 (hashicorp_raft_a8065f298505708bf60f518c09178149f3c06f21.tar.gz) = a952ce8348085be36a1accbb7555e8c5a1a1c2292066d1966f17994ec90276ef -SIZE (hashicorp_raft_a8065f298505708bf60f518c09178149f3c06f21.tar.gz) = 56934 -SHA256 (hashicorp_raft-mdb_4ec3694ffbc74d34f7532e70ef2e9c3546a0c0b0.tar.gz) = 9873fa73d17174e0e7175216848a2a7c58a9c66701459ed4d4866ab063ef58c1 -SIZE (hashicorp_raft-mdb_4ec3694ffbc74d34f7532e70ef2e9c3546a0c0b0.tar.gz) = 9811 -SHA256 (hashicorp_serf_320787d8567bdcf9d77f8c5d65031fcb19e71ebc.tar.gz) = 65806140d10ef5e7922acd1b89a7b3024c9feca64dd26a25601059821061e7a4 -SIZE (hashicorp_serf_320787d8567bdcf9d77f8c5d65031fcb19e71ebc.tar.gz) = 572427 -SHA256 (hashicorp_scada-client_c26580cfe35393f6f4bf1b9ba55e6afe33176bae.tar.gz) = 74d7195f4d7b213cb82278ed34c16808a79923be9009aab7e8f1267d5a6675f7 -SIZE (hashicorp_scada-client_c26580cfe35393f6f4bf1b9ba55e6afe33176bae.tar.gz) = 15805 -SHA256 (hashicorp_yamux_b2e55852ddaf823a85c67f798080eb7d08acd71d.tar.gz) = e4ca04b27f2899bd04033d4bb8cf2c5d0eac6e916c87851ded9cfa57d1f70b5f -SIZE (hashicorp_yamux_b2e55852ddaf823a85c67f798080eb7d08acd71d.tar.gz) = 19249 -SHA256 (inconshreveable_muxado_f693c7e88ba316d1a0ae3e205e22a01aa3ec2848.tar.gz) = 237354d5acf550d05d20841e0ec6e88cea29ece70fdf8fc73a2d59884ea6be01 -SIZE (inconshreveable_muxado_f693c7e88ba316d1a0ae3e205e22a01aa3ec2848.tar.gz) = 25816 -SHA256 (miekg_dns_bb1103f648f811d2018d4bedcb2d4b2bce34a0f1.tar.gz) = 4b539f47f2ccf7fffd35490b4840fa4503506223bdb25ce957797b5a373d2743 -SIZE (miekg_dns_bb1103f648f811d2018d4bedcb2d4b2bce34a0f1.tar.gz) = 117777 -SHA256 (mitchellh_cli_6cc8bc522243675a2882b81662b0b0d2e04b99c9.tar.gz) = 87d7f733c0f2e778fa72951c55a7fe65ea8694f2a1f621c368ecffb111098b05 -SIZE (mitchellh_cli_6cc8bc522243675a2882b81662b0b0d2e04b99c9.tar.gz) = 12690 -SHA256 (mitchellh_mapstructure_442e588f213303bec7936deba67901f8fc8f18b1.tar.gz) = b4fa5d3b888734f849c5d6784fc1c5749e4ece168fda65c604676fca39c085d2 -SIZE (mitchellh_mapstructure_442e588f213303bec7936deba67901f8fc8f18b1.tar.gz) = 12220 -SHA256 (ryanuber_columnize_44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a.tar.gz) = 504519c9befbac3045a00a7a70e82cc437622294ece6ac19b85ffd4aa915369f -SIZE (ryanuber_columnize_44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a.tar.gz) = 3680 -SHA256 (ugorji_go_e906e395b9d45d3230e800c8ad1f92f99764e753.tar.gz) = 035386ecdb37ee268507890c627f222960839db2757b22a9e64c4947f9f06c4d -SIZE (ugorji_go_e906e395b9d45d3230e800c8ad1f92f99764e753.tar.gz) = 58411 -SHA256 (net-rpc-msgpackrpc_d377902b7aba83dd3895837b902f6cf3f71edcb2.tar.gz) = 0eb8244654cf9e461ce6338cdb7c6ab28dc118d425497e5f6045808e24932a0f -SIZE (net-rpc-msgpackrpc_d377902b7aba83dd3895837b902f6cf3f71edcb2.tar.gz) = 2805 -SHA256 (golang_protobuf_extensions_ba7d65ac66e9da93a714ca18f6d1bc7a0c09100c.tar.gz) = 9f44314e29e16bf598392f0815ea8d1ba4ba519c10cfa085330c41ea41b17da9 -SIZE (golang_protobuf_extensions_ba7d65ac66e9da93a714ca18f6d1bc7a0c09100c.tar.gz) = 9806 -SHA256 (prometheus_client_golang_38dbb2e26868d15db0275ddbaac0cbe450ec03de.tar.gz) = af20838f56cdfcbbd5e4d6989b28dad69ddd80682a2d0332b85093ffe36a1afb -SIZE (prometheus_client_golang_38dbb2e26868d15db0275ddbaac0cbe450ec03de.tar.gz) = 103898 -SHA256 (prometheus_client_model_fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz) = d29d75de6645bd67452df27cda2e4a09848161f9ecacc62b1c1818d0a701cff9 -SIZE (prometheus_client_model_fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz) = 54855 -SHA256 (prometheus_procfs_92faa308558161acab0ada1db048e9996ecec160.tar.gz) = fafefa92613aec2aa2f411d98c7f677c7beb7cb3bc78f961a900ae5b49af061c -SIZE (prometheus_procfs_92faa308558161acab0ada1db048e9996ecec160.tar.gz) = 11214 SHA256 (0.5.2_web_ui.zip) = ad883aa52e1c0136ab1492bbcedad1210235f26d59719fb6de3ef6464f1ff3b1 SIZE (0.5.2_web_ui.zip) = 252584 -SHA256 (hashicorp_raft-boltdb_d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee.tar.gz) = 490ced07cc72baede9b997dcf92499fa0d4298926fbc51ee632bde3d3ea0979e -SIZE (hashicorp_raft-boltdb_d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee.tar.gz) = 8881 -SHA256 (boltdb_bolt_2c04100eb9793f2b8541d243494e2909d2112325.tar.gz) = c0cdbaa6ec724c73799003ba166a4c9f1c6f1cc1b9760f98ef2d2a2a431577da -SIZE (boltdb_bolt_2c04100eb9793f2b8541d243494e2909d2112325.tar.gz) = 69587 -SHA256 (hashicorp_consul-migrate_4977886fc950a0db1a6f0bbadca56dfabf170f9c.tar.gz) = 5a2334dd710f775a50ccffe8b02431e43ef30ad71d4eedb184fa0c77a24b4365 -SIZE (hashicorp_consul-migrate_4977886fc950a0db1a6f0bbadca56dfabf170f9c.tar.gz) = 12871 -SHA256 (golang_crypto_74f810a0152f4c50a16195f6b9ff44afc35594e8.tar.gz) = 432fd0fd3e7c2701e1111147af13f1f6b566ed674342d417c0d8eec503e79989 -SIZE (golang_crypto_74f810a0152f4c50a16195f6b9ff44afc35594e8.tar.gz) = 864744 +SHA256 (hashicorp-consul-v0.5.2_GH0.tar.gz) = acaa3b7a7c874d247175faaa9178bb1e93eabb2d810dc842c79ccf272b4518b6 +SIZE (hashicorp-consul-v0.5.2_GH0.tar.gz) = 1821228 +SHA256 (hashicorp-go-checkpoint-88326f6_GH0.tar.gz) = 49133eeca2707d2c025219f261dd3ebd8155fe22907c412445b8ffc7a4137755 +SIZE (hashicorp-go-checkpoint-88326f6_GH0.tar.gz) = 9826 +SHA256 (hashicorp-go-msgpack-71c2886_GH0.tar.gz) = 052a52b77e262daa6f4bb618970d6673dd77713be031c6da18bd3aff5bc1448d +SIZE (hashicorp-go-msgpack-71c2886_GH0.tar.gz) = 49479 +SHA256 (hashicorp-go-multierror-fcdddc3_GH0.tar.gz) = e730020ed331e0fed430a5f725de4c5f61aa7f240258f797833d1689efb178b0 +SIZE (hashicorp-go-multierror-fcdddc3_GH0.tar.gz) = 8064 +SHA256 (hashicorp-go-syslog-42a2b57_GH0.tar.gz) = c092db8da3dc2c7279b4ad6afbb6ee7c4daae9ac3020a591096be59f94330544 +SIZE (hashicorp-go-syslog-42a2b57_GH0.tar.gz) = 4394 +SHA256 (hashicorp-golang-lru-995efda_GH0.tar.gz) = d67757033d551d5d4949b099c1f5933aaeb2931c3398c1509eb4948cb2623b15 +SIZE (hashicorp-golang-lru-995efda_GH0.tar.gz) = 7871 +SHA256 (hashicorp-hcl-513e04c_GH0.tar.gz) = 9cb1e4a7fb176da78d8e9d001faf4290ed3717659f663e37ee5937544f22ee3c +SIZE (hashicorp-hcl-513e04c_GH0.tar.gz) = 28683 +SHA256 (hashicorp-logutils-367a65d_GH0.tar.gz) = 8d5c3590f17c3bd5cb11d3edf93ee082fe3fb18a05edfddca4aaa2e7c064cd1e +SIZE (hashicorp-logutils-367a65d_GH0.tar.gz) = 7703 +SHA256 (hashicorp-memberlist-6025015_GH0.tar.gz) = 41f025ceeb51b7a21a3cfe2dd82af937d7b5059e16d6abf0b5daf01503bb3a26 +SIZE (hashicorp-memberlist-6025015_GH0.tar.gz) = 51849 +SHA256 (hashicorp-raft-a8065f2_GH0.tar.gz) = d501b00077052522db41515c213c4eb095a6df03950e0461607fcd39e99f379b +SIZE (hashicorp-raft-a8065f2_GH0.tar.gz) = 56862 +SHA256 (hashicorp-raft-mdb-4ec3694_GH0.tar.gz) = 5bfbd917fc4cb650d6420adfc0887a8da0e5c55d77868c305aeb2b2003f745e3 +SIZE (hashicorp-raft-mdb-4ec3694_GH0.tar.gz) = 9809 +SHA256 (hashicorp-serf-320787d_GH0.tar.gz) = 5879495cdc54bf6b022d06ff1ff5c84c4d12a0c16f4af38d192ac7873225cb55 +SIZE (hashicorp-serf-320787d_GH0.tar.gz) = 572308 +SHA256 (hashicorp-scada-client-c26580c_GH0.tar.gz) = 5690d7ba2f01a39693571eecf8dcdd16a588efced8f140ea19dbee8aaefe5b36 +SIZE (hashicorp-scada-client-c26580c_GH0.tar.gz) = 15800 +SHA256 (hashicorp-yamux-b2e5585_GH0.tar.gz) = 38e3b567240898d870c5134cace538bfc7df9105d2d0cdd487fb1bd5e8e895f4 +SIZE (hashicorp-yamux-b2e5585_GH0.tar.gz) = 19245 +SHA256 (hashicorp-consul-migrate-4977886_GH0.tar.gz) = 39d0caf52c03debdc25f827686e5c18d173dca95e8d1403dff23ae714137109a +SIZE (hashicorp-consul-migrate-4977886_GH0.tar.gz) = 12845 +SHA256 (hashicorp-net-rpc-msgpackrpc-d377902_GH0.tar.gz) = 2d57363825d8da1ce2f1608f67bdef99c3db10b56294f8c9bc3a1ffe3060cf4e +SIZE (hashicorp-net-rpc-msgpackrpc-d377902_GH0.tar.gz) = 2806 +SHA256 (hashicorp-raft-boltdb-d1e82c1_GH0.tar.gz) = 68bb2996a4ec490c099612efcc255ad721014aaf42afbf9f0b21fcf8361162d9 +SIZE (hashicorp-raft-boltdb-d1e82c1_GH0.tar.gz) = 8879 +SHA256 (armon-circbuf-f092b4f_GH0.tar.gz) = e18e259eab192a3d820ed6d5a813268726ea80acd438d28f2a0cea92b7c94a6b +SIZE (armon-circbuf-f092b4f_GH0.tar.gz) = 2744 +SHA256 (armon-go-metrics-a54701e_GH0.tar.gz) = 31550ea79de7e4e5beadfa6d3b43dd58a1ce144cbda29c74970cc6ebb956cd05 +SIZE (armon-go-metrics-a54701e_GH0.tar.gz) = 11259 +SHA256 (armon-go-radix-0bab926_GH0.tar.gz) = 2ff6c92d418018e16078ce5b51287cb429f79d73dca62b63f77c37b66fbdf9d1 +SIZE (armon-go-radix-0bab926_GH0.tar.gz) = 5447 +SHA256 (armon-gomdb-151f2e0_GH0.tar.gz) = 52a16b34c6b609276977e005d829604b214869c3745fb63b2017124c3039906f +SIZE (armon-gomdb-151f2e0_GH0.tar.gz) = 100222 +SHA256 (golang-protobuf-5677a0e_GH0.tar.gz) = 90ec47cb66083182e2ba8bf69adf751ed41c778248b421e691bcd70d01a50d06 +SIZE (golang-protobuf-5677a0e_GH0.tar.gz) = 133568 +SHA256 (golang-crypto-74f810a_GH0.tar.gz) = 25e0c9cb7c6d6a5935aa318c9792fa6e18c8e0238994b5be039f90c8d58fd680 +SIZE (golang-crypto-74f810a_GH0.tar.gz) = 864642 +SHA256 (boltdb-bolt-2c04100_GH0.tar.gz) = 569f48d921b5df3796fe2dc6768506c4cada55c7d8a441885e2c3ab362bcfc3d +SIZE (boltdb-bolt-2c04100_GH0.tar.gz) = 69541 +SHA256 (inconshreveable-muxado-f693c7e_GH0.tar.gz) = 2ef25a734872d8beb7740fbf58598f56653d6c47d0ee971ca950dad90823344d +SIZE (inconshreveable-muxado-f693c7e_GH0.tar.gz) = 25814 +SHA256 (matttproud-golang_protobuf_extensions-ba7d65a_GH0.tar.gz) = 54a6776542b2c069a63c0f1f34ef9414fa24dc1f7acab03334ca5be22011a879 +SIZE (matttproud-golang_protobuf_extensions-ba7d65a_GH0.tar.gz) = 9806 +SHA256 (miekg-dns-bb1103f_GH0.tar.gz) = f0dda560702df67459697ac05c439a1f65cff3d5ea540dd53a00deb220c9b5e6 +SIZE (miekg-dns-bb1103f_GH0.tar.gz) = 117681 +SHA256 (mitchellh-cli-6cc8bc5_GH0.tar.gz) = 548d9450e53b527aaa494d060769d91449f2daeeed4ae77e818117b169f19937 +SIZE (mitchellh-cli-6cc8bc5_GH0.tar.gz) = 12683 +SHA256 (mitchellh-mapstructure-442e588_GH0.tar.gz) = 5ca01f6ba1175733ae94a13e532e9465b11951519dcdcc6693651842ed1d6205 +SIZE (mitchellh-mapstructure-442e588_GH0.tar.gz) = 12216 +SHA256 (prometheus-client_golang-38dbb2e_GH0.tar.gz) = b54cc041d0b7c7257c095f2fbac58fa197dfc71f63601c841698b6520e44f6e5 +SIZE (prometheus-client_golang-38dbb2e_GH0.tar.gz) = 103905 +SHA256 (prometheus-client_model-fa8ad6f_GH0.tar.gz) = 726ebe6d3aba7c99ffc30788972ef693d0521072c6a33794a9d8ee1f26389466 +SIZE (prometheus-client_model-fa8ad6f_GH0.tar.gz) = 54787 +SHA256 (prometheus-procfs-92faa30_GH0.tar.gz) = a627c3e4c84b3be43dd6dbcba414e6bbcee5817dd216ff3570869e46570ef2e7 +SIZE (prometheus-procfs-92faa30_GH0.tar.gz) = 11214 +SHA256 (ryanuber-columnize-44cb478_GH0.tar.gz) = 6d69bf022706ff59a5e5478da7e437451b62dcc8c614fde10b104d830148644b +SIZE (ryanuber-columnize-44cb478_GH0.tar.gz) = 3673 +SHA256 (ugorji-go-e906e39_GH0.tar.gz) = a311502741f9c2bb13598711d7275e9756f9b8f6e60704ca3664737a3150aaa9 +SIZE (ugorji-go-e906e39_GH0.tar.gz) = 58379 Index: sysutils/osquery/Makefile =================================================================== --- sysutils/osquery/Makefile +++ sysutils/osquery/Makefile @@ -5,10 +5,6 @@ PORTVERSION= 1.4.5 PORTREVISION= 2 CATEGORIES= sysutils -MASTER_SITES= GH:ghc \ - https://codeload.github.com/${PORTNAME}/third-party/tar.gz/${PORTVERSION}?dummy=/:gh -DISTFILES= ${DISTNAME}.tar.gz:ghc \ - third-party-${PORTVERSION}.tar.gz:gh MAINTAINER= zi@FreeBSD.org COMMENT= SQL powered OS instrumentation, monitoring, and analytics @@ -39,7 +35,8 @@ BLDDIR= ${WRKDIR}/.build/${PORTNAME} USE_RC_SUBR= ${PORTNAME}d USE_GITHUB= yes -GH_ACCOUNT= facebook +GH_ACCOUNT= facebook ${PORTNAME}:tp +GH_PROJECT= third-party:tp MAKE_JOBS_UNSAFE= yes .include @@ -50,7 +47,7 @@ post-extract: ${RMDIR} ${WRKSRC}/third-party - ${LN} -sf ${WRKDIR}/third-party-${PORTVERSION} ${WRKSRC}/third-party + ${LN} -sf ${WRKSRC_tp} ${WRKSRC}/third-party post-patch: ${REINPLACE_CMD} -e 's|/var/osquery|/var/db/osquery|g' \ Index: sysutils/osquery/distinfo =================================================================== --- sysutils/osquery/distinfo +++ sysutils/osquery/distinfo @@ -1,4 +1,4 @@ SHA256 (facebook-osquery-1.4.5_GH0.tar.gz) = b0812eec4ca53eb6ada4692330caaed00ed1e50ead43b99486b3d15139369738 SIZE (facebook-osquery-1.4.5_GH0.tar.gz) = 412622 -SHA256 (third-party-1.4.5.tar.gz) = 06897b9ddf637c61f5c9e90f640b9f8c50c124d6276058a71f7d952439c8e58f -SIZE (third-party-1.4.5.tar.gz) = 6073986 +SHA256 (osquery-third-party-1.4.5_GH0.tar.gz) = 06897b9ddf637c61f5c9e90f640b9f8c50c124d6276058a71f7d952439c8e58f +SIZE (osquery-third-party-1.4.5_GH0.tar.gz) = 6073986