Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 2 Sep 2016 20:33:30 +0000 (UTC)
From:      Steve Wills <swills@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r421275 - in head/sysutils/serf: . files
Message-ID:  <201609022033.u82KXUr0092345@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: swills
Date: Fri Sep  2 20:33:30 2016
New Revision: 421275
URL: https://svnweb.freebsd.org/changeset/ports/421275

Log:
  sysutils/serf: convert to GH_SUBDIR and GH_TUPLE
  
  While here, remove unneeded patch. Resulting binary should be the same.

Deleted:
  head/sysutils/serf/files/patch-deps_v0-6-4.json
Modified:
  head/sysutils/serf/Makefile
  head/sysutils/serf/distinfo

Modified: head/sysutils/serf/Makefile
==============================================================================
--- head/sysutils/serf/Makefile	Fri Sep  2 20:32:20 2016	(r421274)
+++ head/sysutils/serf/Makefile	Fri Sep  2 20:33:30 2016	(r421275)
@@ -14,18 +14,23 @@ LICENSE=	MPL
 BUILD_DEPENDS=	go14>=1.4:lang/go14
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	hashicorp:DEFAULT,go_msgpack,go_syslog,go_net,logutils,mdns,memberlist \
-		armon:circbuf,go_metrics miekg:dns mitchellh:cli,mapstructure \
-		ryanuber:columnize golang:crypto
-GH_PROJECT=	circbuf:circbuf cli:cli columnize:columnize dns:dns \
-		go-metrics:go_metrics go-msgpack:go_msgpack \
-		go-syslog:go_syslog go.net:go_net logutils:logutils \
-		mapstructure:mapstructure mdns:mdns memberlist:memberlist \
-		crypto:crypto
-GH_TAGNAME=	0dc08b1:logutils 281073e:mapstructure 983d3a5:columnize \
-		fa3f638:go_msgpack 9888dc5:memberlist 42a2b57:go_syslog \
-		75e6e86:dns 104dcad:go_net 8102d0e:cli 06b6099:go_metrics \
-		9d85cf2:mdns bbbad09:circbuf f18420e:crypto
+
+GH_ACCOUNT=	hashicorp
+GH_SUBDIR:=	src/github.com/${GH_ACCOUNT}/${PORTNAME}
+
+GH_TUPLE=	hashicorp:go-msgpack:fa3f638:msgpack/src/github.com/hashicorp/go-msgpack \
+		hashicorp:go-syslog:42a2b57:syslog/src/github.com/hashicorp/go-syslog \
+		hashicorp:go.net:104dcad:net/src/github.com/hashicorp/go.net \
+		hashicorp:logutils:0dc08b1:logutil/src/github.com/hashicorp/logutils \
+		hashicorp:mdns:9d85cf2:mdns/src/github.com/hashicorp/mdns \
+		hashicorp:memberlist:9888dc5:memberlist/src/github.com/hashicorp/memberlist \
+		armon:circbuf:bbbad09:circbuf/src/github.com/armon/circbuf \
+		armon:go-metrics:06b6099:metrics/src/github.com/armon/go-metrics \
+		miekg:dns:75e6e86:dns/src/github.com/miekg/dns \
+		mitchellh:cli:8102d0e:cli/src/github.com/mitchellh/cli \
+		mitchellh:mapstructure:281073e:mapstructure/src/github.com/mitchellh/mapstructure \
+		ryanuber:columnize:983d3a5:columnize/src/github.com/ryanuber/columnize \
+		golang:crypto:f18420e:crypto/src/golang.org/x/crypto
 
 USE_RC_SUBR=	serf
 
@@ -36,49 +41,6 @@ PLIST_FILES=	bin/serf
 
 STRIP=		# stripping can break go binaries
 
-post-patch:
-	@${MKDIR} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}
-.for src in .gitignore .travis.yml CHANGELOG.md LICENSE Makefile README.md \
-	client coordinate command commands.go demo deps main.go main_test.go \
-	ops-misc scripts serf testutil version.go website
-	@${MV} ${WRKSRC}/${src} \
-		${WRKSRC}/src/github.com/hashicorp/${PORTNAME}
-.endfor
-	@${MKDIR} ${WRKSRC}/src/github.com/armon
-	@${MKDIR} ${WRKSRC}/src/github.com/mitchellh
-	@${MKDIR} ${WRKSRC}/src/github.com/miekg
-	@${MKDIR} ${WRKSRC}/src/github.com/ryanuber
-	@${MKDIR} ${WRKSRC}/src/golang.org/x
-	@${MKDIR} ${WRKSRC}/src/code.google.com/p/go.net
-	@${MV} ${WRKSRC_circbuf} \
-		${WRKSRC}/src/github.com/armon/circbuf
-	@${MV} ${WRKSRC_go_metrics} \
-		${WRKSRC}/src/github.com/armon/go-metrics
-	@${MV} ${WRKSRC_go_msgpack} \
-		${WRKSRC}/src/github.com/hashicorp/go-msgpack
-	@${MV} ${WRKSRC_go_syslog} \
-		${WRKSRC}/src/github.com/hashicorp/go-syslog
-	@${MV} ${WRKSRC_logutils} \
-		${WRKSRC}/src/github.com/hashicorp/logutils
-	@${MV} ${WRKSRC_memberlist} \
-		${WRKSRC}/src/github.com/hashicorp/memberlist
-	@${MV} ${WRKSRC_mapstructure} \
-		${WRKSRC}/src/github.com/mitchellh/mapstructure
-	@${MV} ${WRKSRC_mdns} \
-		${WRKSRC}/src/github.com/hashicorp/mdns
-	@${MV} ${WRKSRC_cli} \
-		${WRKSRC}/src/github.com/mitchellh/cli
-	@${MV} ${WRKSRC_columnize} \
-		${WRKSRC}/src/github.com/ryanuber/columnize
-	@${MV} ${WRKSRC_dns} \
-		${WRKSRC}/src/github.com/miekg/dns
-	@${MV} ${WRKSRC_go_net} \
-		${WRKSRC}/src/github.com/hashicorp/go.net
-	@${MV} ${WRKSRC_crypto} \
-		${WRKSRC}/src/golang.org/x/crypto
-	@${CP} -r ${WRKSRC}/src/github.com/hashicorp/go.net/internal \
-		${WRKSRC}/src/code.google.com/p/go.net
-
 do-build:
 	@cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}; \
 		${SETENV} CGO_ENABLED=0 PATH=${PATH}:${LOCALBASE}/go14/bin ${BUILD_ENV} GOPATH=${WRKSRC} \

Modified: head/sysutils/serf/distinfo
==============================================================================
--- head/sysutils/serf/distinfo	Fri Sep  2 20:32:20 2016	(r421274)
+++ head/sysutils/serf/distinfo	Fri Sep  2 20:33:30 2016	(r421275)
@@ -1,3 +1,4 @@
+TIMESTAMP = 1472766963
 SHA256 (hashicorp-serf-v0.7.0_GH0.tar.gz) = 2699dbbc616e4b76fb158d8ea3291b0ae43bb0499ab263907ef38de61f75d652
 SIZE (hashicorp-serf-v0.7.0_GH0.tar.gz) = 597426
 SHA256 (hashicorp-go-msgpack-fa3f638_GH0.tar.gz) = 6353c623d5d58c7ca03e2bdac63f9da7da8848fb1f5f7f239b33e3ce6fe6c6bd



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