From nobody@FreeBSD.org  Wed Nov 13 10:38:33 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 ESMTPS id 6F28495C
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 13 Nov 2013 10:38:33 +0000 (UTC)
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 6022425AA
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 13 Nov 2013 10:38:33 +0000 (UTC)
Received: from oldred.freebsd.org ([127.0.1.6])
	by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id rADAcX9d047206
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 13 Nov 2013 10:38:33 GMT
	(envelope-from nobody@oldred.freebsd.org)
Received: (from nobody@localhost)
	by oldred.freebsd.org (8.14.5/8.14.5/Submit) id rADAcXqM047200;
	Wed, 13 Nov 2013 10:38:33 GMT
	(envelope-from nobody)
Message-Id: <201311131038.rADAcXqM047200@oldred.freebsd.org>
Date: Wed, 13 Nov 2013 10:38:33 GMT
From: Bartek Rutkowski <ports@robakdesign.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [maintainer update] devel/etcd port updated with fix and new feature
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         183921
>Category:       ports
>Synopsis:       [maintainer update] devel/etcd port updated with fix and new feature
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    wg
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Nov 13 10:40:00 UTC 2013
>Closed-Date:    Wed Nov 13 12:11:39 UTC 2013
>Last-Modified:  Wed Nov 13 12:20:00 UTC 2013
>Originator:     Bartek Rutkowski
>Release:        9.2-R
>Organization:
Pixeware LTD
>Environment:
FreeBSD peek-and-poke 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/BASIC  amd64
>Description:
This update does two things:

* corrects the package prefix to 'coreos-' instead of 'coreos'
* adds option to build a commandline tool from devel/etcdctl

WARNING - this update relies on devel/etcdctl which is not yet in ports, and was submitted in http://www.freebsd.org/cgi/query-pr.cgi?pr=183845 - that should be accepted before commiting this update to devel/etcd
>How-To-Repeat:
Apply the patch to the Makefile, test the port, commit the change.
>Fix:
Patch attached.

Patch attached with submission follows:

--- Makefile.orig	2013-11-13 10:26:59.000000000 +0100
+++ Makefile	2013-11-13 10:27:06.000000000 +0100
@@ -3,7 +3,7 @@
 PORTNAME=	etcd
 PORTVERSION=	0.1.2
 CATEGORIES=	devel
-PKGNAMEPREFIX=	coreos
+PKGNAMEPREFIX=	coreos-
 
 MAINTAINER=	ports@robakdesign.com
 COMMENT=	Highly-available key value store and service discovery
@@ -21,8 +21,15 @@
 
 NO_BUILD=	yes
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS ETCDCTL
 DOCS_DESC=	Install etcd README file
+ETCDCTL_DESC=	Install etcdctl commandline tool
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:METCDCTL}
+RUN_DEPENDS+=   etcdctl:${PORTSDIR}/devel/etcdctl
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|$$VER|${DISTVERSION}|' ${WRKSRC}/scripts/release-version


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->wg 
Responsible-Changed-By: wg 
Responsible-Changed-When: Wed Nov 13 12:01:37 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183921 
State-Changed-From-To: open->closed 
State-Changed-By: wg 
State-Changed-When: Wed Nov 13 12:11:38 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/183921: commit references a PR
Date: Wed, 13 Nov 2013 12:11:38 +0000 (UTC)

 Author: wg
 Date: Wed Nov 13 12:11:30 2013
 New Revision: 333678
 URL: http://svnweb.freebsd.org/changeset/ports/333678
 
 Log:
   devel/etcd: fix pkg prefix and add option
   
   - Fix pkg name prefix to include a dash
   - Add an option to install etcdctl
   
   PR:		ports/183921
   Submitted by:	maintainer
 
 Modified:
   head/devel/etcd/Makefile
 
 Modified: head/devel/etcd/Makefile
 ==============================================================================
 --- head/devel/etcd/Makefile	Wed Nov 13 12:01:18 2013	(r333677)
 +++ head/devel/etcd/Makefile	Wed Nov 13 12:11:30 2013	(r333678)
 @@ -2,8 +2,9 @@
  
  PORTNAME=	etcd
  PORTVERSION=	0.1.2
 +PORTREVISION=	1
  CATEGORIES=	devel
 -PKGNAMEPREFIX=	coreos
 +PKGNAMEPREFIX=	coreos-
  
  MAINTAINER=	ports@robakdesign.com
  COMMENT=	Highly-available key value store and service discovery
 @@ -19,17 +20,18 @@ PLIST_FILES=	bin/${PORTNAME}
  
  PORTDOCS=	README.md
  
 -NO_BUILD=	yes
 -
 -OPTIONS_DEFINE=	DOCS
 +OPTIONS_DEFINE=	DOCS ETCDCTL
  DOCS_DESC=	Install etcd README file
  
 +ETCDCTL_DESC=	Install etcdctl commandline tool
 +ETCDCTL_RUN_DEPENDS=	etcdctl:${PORTSDIR}/devel/etcdctl
 +
  post-patch:
  	@${REINPLACE_CMD} -e 's|$$VER|${DISTVERSION}|' ${WRKSRC}/scripts/release-version
  	@${REINPLACE_CMD} -e '/VER=/d' ${WRKSRC}/scripts/release-version
  
 -pre-install:
 -	@(cd ${WRKSRC}; ${SH} build)
 +do-build:
 +	cd ${WRKSRC}; ${SH} build
  
  do-install:
  	${MKDIR} ${STAGEDIR}${DOCSDIR}
 _______________________________________________
 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:
