From nobody@FreeBSD.org  Sat Nov  9 18:38:52 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTP id 9BC3D78D
	for <freebsd-gnats-submit@FreeBSD.org>; Sat,  9 Nov 2013 18:38:52 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 6FF442CB2
	for <freebsd-gnats-submit@FreeBSD.org>; Sat,  9 Nov 2013 18:38:52 +0000 (UTC)
Received: from oldred.freebsd.org ([127.0.1.6])
	by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id rA9IcpCZ049139
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 9 Nov 2013 18:38:51 GMT
	(envelope-from nobody@oldred.freebsd.org)
Received: (from nobody@localhost)
	by oldred.freebsd.org (8.14.5/8.14.5/Submit) id rA9Icpmp049138;
	Sat, 9 Nov 2013 18:38:51 GMT
	(envelope-from nobody)
Message-Id: <201311091838.rA9Icpmp049138@oldred.freebsd.org>
Date: Sat, 9 Nov 2013 18:38:51 GMT
From: Bartek Rutkowski <ports@robakdesign.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Update of devel/etcd to version 0.1.2
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         183819
>Category:       ports
>Synopsis:       Update of devel/etcd to version 0.1.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    wg
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Nov 09 18:40:00 UTC 2013
>Closed-Date:    Sat Nov 09 19:24:14 UTC 2013
>Last-Modified:  Sat Nov  9 19:30:00 UTC 2013
>Originator:     Bartek Rutkowski
>Release:        9.2-R
>Organization:
Pixeware LTD
>Environment:
FreeBSD zapiekanka-z-watrobki 9.2-RELEASE FreeBSD 9.2-RELEASE #0 r255898: Thu Sep 26 22:50:31 UTC 2013     root@bake.isc.freebsd.org:/usr/obj/usr/src/sys/KAROL  amd64
>Description:
This is patch for devel/etcd port that does the following:

* updates the port to latest 0.1.2 version
* fixes the port to use docs option properly
>How-To-Repeat:
Apply the patch to the port dir, test the port.
>Fix:
Patch attached to this PR.

Patch attached with submission follows:

diff -ruN etcd.orig/Makefile etcd/Makefile
--- etcd.orig/Makefile	2013-10-04 13:09:38.000000000 +0200
+++ etcd/Makefile	2013-11-09 17:33:54.000000000 +0100
@@ -1,7 +1,7 @@
 # $FreeBSD: devel/etcd/Makefile 329287 2013-10-04 11:09:38Z bdrewery $
 
 PORTNAME=	etcd
-PORTVERSION=	0.1.1
+PORTVERSION=	0.1.2
 CATEGORIES=	devel
 PKGNAMEPREFIX=	coreos
 
@@ -13,7 +13,7 @@
 USE_GITHUB=	yes
 GH_ACCOUNT=	coreos
 GH_TAGNAME=	v${PORTVERSION}
-GH_COMMIT=	7b28904
+GH_COMMIT=	5589b6f
 
 PLIST_FILES+=	bin/${PORTNAME}
 
@@ -22,18 +22,24 @@
 NO_BUILD=	yes
 
 OPTIONS_DEFINE=	DOCS
+DOCS_DESC=	Install etcd README file
+
+.include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|$$VER|${DISTVERSION}|' ${WRKSRC}/scripts/release-version
 	@${REINPLACE_CMD} -e '/VER=/d' ${WRKSRC}/scripts/release-version
-	@${REINPLACE_CMD} -e 's|#!/bin/bash|#!/bin/sh|' ${WRKSRC}/build
 
 pre-install:
 	@(cd ${WRKSRC}; ${SH} build)
 
 do-install:
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+#	PLIST_FILES+=${STAGEDIR}${DOCSDIR}/${PORTDOCS}
+.endif
+
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
 
 .include <bsd.port.mk>
diff -ruN etcd.orig/distinfo etcd/distinfo
--- etcd.orig/distinfo	2013-10-04 13:09:38.000000000 +0200
+++ etcd/distinfo	2013-11-06 19:16:31.000000000 +0100
@@ -1,2 +1,2 @@
-SHA256 (etcd-0.1.1.tar.gz) = 337f173b165360889586a7388f5874bf0b16746992f3cd43ed162f39cd30e9ff
-SIZE (etcd-0.1.1.tar.gz) = 601641
+SHA256 (etcd-0.1.2.tar.gz) = 71847f86d3e585a2bcd391e59006f1d07a8e9135f24871bc9e52ffc6fca6b7e9
+SIZE (etcd-0.1.2.tar.gz) = 1423331


>Release-Note:
>Audit-Trail:

From: =?utf-8?Q?Bart=C5=82omiej_Rutkowski?= <r@robakdesign.com>
To: bug-followup@FreeBSD.org,
 ports@robakdesign.com
Cc:  
Subject: Re: ports/183819: Update of devel/etcd to version 0.1.2
Date: Sat, 9 Nov 2013 19:45:28 +0100

 --Apple-Mail=_7860ECB2-BF8B-4109-903B-F33868F1BC62
 Content-Transfer-Encoding: 7bit
 Content-Type: text/plain;
 	charset=us-ascii
 
 The initial PR had patch with unneccessary comment, cleaned version attached.
 
 
 --Apple-Mail=_7860ECB2-BF8B-4109-903B-F33868F1BC62
 Content-Disposition: attachment;
 	filename=etcd.patch
 Content-Type: application/octet-stream;
 	x-unix-mode=0666;
 	name="etcd.patch"
 Content-Transfer-Encoding: 7bit
 
 diff -ruN etcd.orig/Makefile etcd/Makefile
 --- etcd.orig/Makefile	2013-10-04 13:09:38.000000000 +0200
 +++ etcd/Makefile	2013-11-09 18:40:28.000000000 +0100
 @@ -1,7 +1,7 @@
  # $FreeBSD: devel/etcd/Makefile 329287 2013-10-04 11:09:38Z bdrewery $
  
  PORTNAME=	etcd
 -PORTVERSION=	0.1.1
 +PORTVERSION=	0.1.2
  CATEGORIES=	devel
  PKGNAMEPREFIX=	coreos
  
 @@ -13,7 +13,7 @@
  USE_GITHUB=	yes
  GH_ACCOUNT=	coreos
  GH_TAGNAME=	v${PORTVERSION}
 -GH_COMMIT=	7b28904
 +GH_COMMIT=	5589b6f
  
  PLIST_FILES+=	bin/${PORTNAME}
  
 @@ -22,18 +22,23 @@
  NO_BUILD=	yes
  
  OPTIONS_DEFINE=	DOCS
 +DOCS_DESC=	Install etcd README file
 +
 +.include <bsd.port.options.mk>
  
  post-patch:
  	@${REINPLACE_CMD} -e 's|$$VER|${DISTVERSION}|' ${WRKSRC}/scripts/release-version
  	@${REINPLACE_CMD} -e '/VER=/d' ${WRKSRC}/scripts/release-version
 -	@${REINPLACE_CMD} -e 's|#!/bin/bash|#!/bin/sh|' ${WRKSRC}/build
  
  pre-install:
  	@(cd ${WRKSRC}; ${SH} build)
  
  do-install:
 +.if ${PORT_OPTIONS:MDOCS}
  	${MKDIR} ${STAGEDIR}${DOCSDIR}
 -	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 +	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 +.endif
 +
  	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
  
  .include <bsd.port.mk>
 diff -ruN etcd.orig/distinfo etcd/distinfo
 --- etcd.orig/distinfo	2013-10-04 13:09:38.000000000 +0200
 +++ etcd/distinfo	2013-11-06 19:16:31.000000000 +0100
 @@ -1,2 +1,2 @@
 -SHA256 (etcd-0.1.1.tar.gz) = 337f173b165360889586a7388f5874bf0b16746992f3cd43ed162f39cd30e9ff
 -SIZE (etcd-0.1.1.tar.gz) = 601641
 +SHA256 (etcd-0.1.2.tar.gz) = 71847f86d3e585a2bcd391e59006f1d07a8e9135f24871bc9e52ffc6fca6b7e9
 +SIZE (etcd-0.1.2.tar.gz) = 1423331
 
 --Apple-Mail=_7860ECB2-BF8B-4109-903B-F33868F1BC62--
Responsible-Changed-From-To: freebsd-ports-bugs->wg 
Responsible-Changed-By: wg 
Responsible-Changed-When: Sat Nov 9 19:21:43 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183819 
State-Changed-From-To: open->closed 
State-Changed-By: wg 
State-Changed-When: Sat Nov 9 19:24:13 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183819 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/183819: commit references a PR
Date: Sat,  9 Nov 2013 19:24:19 +0000 (UTC)

 Author: wg
 Date: Sat Nov  9 19:24:11 2013
 New Revision: 333332
 URL: http://svnweb.freebsd.org/changeset/ports/333332
 
 Log:
   devel/etcd: update to 0.1.2
   
   PR:		ports/183819
   Submitted by:	maintainer
 
 Modified:
   head/devel/etcd/Makefile
   head/devel/etcd/distinfo
 
 Modified: head/devel/etcd/Makefile
 ==============================================================================
 --- head/devel/etcd/Makefile	Sat Nov  9 19:20:29 2013	(r333331)
 +++ head/devel/etcd/Makefile	Sat Nov  9 19:24:11 2013	(r333332)
 @@ -1,7 +1,7 @@
  # $FreeBSD$
  
  PORTNAME=	etcd
 -PORTVERSION=	0.1.1
 +PORTVERSION=	0.1.2
  CATEGORIES=	devel
  PKGNAMEPREFIX=	coreos
  
 @@ -13,27 +13,27 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/go:${POR
  USE_GITHUB=	yes
  GH_ACCOUNT=	coreos
  GH_TAGNAME=	v${PORTVERSION}
 -GH_COMMIT=	7b28904
 +GH_COMMIT=	5589b6f
  
 -PLIST_FILES+=	bin/${PORTNAME}
 +PLIST_FILES=	bin/${PORTNAME}
  
  PORTDOCS=	README.md
  
  NO_BUILD=	yes
  
  OPTIONS_DEFINE=	DOCS
 +DOCS_DESC=	Install etcd README file
  
  post-patch:
  	@${REINPLACE_CMD} -e 's|$$VER|${DISTVERSION}|' ${WRKSRC}/scripts/release-version
  	@${REINPLACE_CMD} -e '/VER=/d' ${WRKSRC}/scripts/release-version
 -	@${REINPLACE_CMD} -e 's|#!/bin/bash|#!/bin/sh|' ${WRKSRC}/build
  
  pre-install:
  	@(cd ${WRKSRC}; ${SH} build)
  
  do-install:
  	${MKDIR} ${STAGEDIR}${DOCSDIR}
 -	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 +	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
  	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
  
  .include <bsd.port.mk>
 
 Modified: head/devel/etcd/distinfo
 ==============================================================================
 --- head/devel/etcd/distinfo	Sat Nov  9 19:20:29 2013	(r333331)
 +++ head/devel/etcd/distinfo	Sat Nov  9 19:24:11 2013	(r333332)
 @@ -1,2 +1,2 @@
 -SHA256 (etcd-0.1.1.tar.gz) = 337f173b165360889586a7388f5874bf0b16746992f3cd43ed162f39cd30e9ff
 -SIZE (etcd-0.1.1.tar.gz) = 601641
 +SHA256 (etcd-0.1.2.tar.gz) = 71847f86d3e585a2bcd391e59006f1d07a8e9135f24871bc9e52ffc6fca6b7e9
 +SIZE (etcd-0.1.2.tar.gz) = 1423331
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
