From root@feld.me  Fri Aug 19 13:33:22 2011
Return-Path: <root@feld.me>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 618991065674
	for <freebsd-gnats-submit@freebsd.org>; Fri, 19 Aug 2011 13:33:22 +0000 (UTC)
	(envelope-from root@feld.me)
Received: from mta21.charter.net (mta21.charter.net [216.33.127.81])
	by mx1.freebsd.org (Postfix) with ESMTP id ECE388FC19
	for <freebsd-gnats-submit@freebsd.org>; Fri, 19 Aug 2011 13:33:21 +0000 (UTC)
Received: from imp09 ([10.20.200.9]) by mta21.charter.net
          (InterMail vM.7.09.02.04 201-2219-117-106-20090629) with ESMTP
          id <20110819133321.YAHO3880.mta21.charter.net@imp09>;
          Fri, 19 Aug 2011 09:33:21 -0400
Received: from feld.me ([68.117.126.78])
	by imp09 with smtp.charter.net
	id NDZL1h00W1hcoSk05DZL68; Fri, 19 Aug 2011 09:33:21 -0400
Received: from root by feld.me with local (Exim 4.76 (FreeBSD))
	(envelope-from <root@feld.me>)
	id 1QuPCK-000CYK-L6; Fri, 19 Aug 2011 08:33:20 -0500
Message-Id: <E1QuPCK-000CYK-L6@feld.me>
Date: Fri, 19 Aug 2011 08:33:20 -0500
From: Mark Felder <feld@feld.me>
To: FreeBSD-gnats-submit@freebsd.org
Cc: freebsd@linepoint.com
Subject: [PATCH] net/haproxy: update to 1.4.16
X-Send-Pr-Version: 3.113
X-GNATS-Notify: freebsd@linepoint.com

>Number:         159913
>Category:       ports
>Synopsis:       [PATCH] net/haproxy: update to 1.4.16
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    crees
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Aug 19 13:40:09 UTC 2011
>Closed-Date:    Thu Aug 25 17:24:48 UTC 2011
>Last-Modified:  Thu Aug 25 17:30:08 UTC 2011
>Originator:     Mark Felder
>Release:        FreeBSD 9.0-BETA1 amd64
>Organization:
>Environment:
System: FreeBSD nas.feld.me 9.0-BETA1 FreeBSD 9.0-BETA1 #1 r224922M: Tue Aug 16 20:43:23 CDT
>Description:
- Update to 1.4.16

Cleaned up Makefile as well to appease portlint.

Port maintainer (freebsd@linepoint.com) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- haproxy-1.4.16.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net/haproxy.orig/Makefile /usr/ports/net/haproxy/Makefile
--- /usr/ports/net/haproxy.orig/Makefile	2011-08-19 08:29:52.189960965 -0500
+++ /usr/ports/net/haproxy/Makefile	2011-08-19 08:32:03.268684423 -0500
@@ -6,17 +6,17 @@
 #
 
 PORTNAME=	haproxy
-PORTVERSION=	1.4.15
+PORTVERSION=	1.4.16
 CATEGORIES=	net www
 MASTER_SITES=	http://haproxy.1wt.eu/download/1.4/src/
 
 MAINTAINER=	freebsd@linepoint.com
 COMMENT=	The Reliable, High Performance TCP/HTTP Load Balancer
 
-CONFLICTS=	haproxy-devel*
-
-LICENSE_COMB=	multi
 LICENSE=	GPLv2 LGPL21
+LICENSE_COMB=	multi
+
+CONFLICTS=	haproxy-devel*
 
 USE_RC_SUBR=	haproxy
 USE_GMAKE=	YES
diff -ruN --exclude=CVS /usr/ports/net/haproxy.orig/distinfo /usr/ports/net/haproxy/distinfo
--- /usr/ports/net/haproxy.orig/distinfo	2011-08-19 08:29:52.194941759 -0500
+++ /usr/ports/net/haproxy/distinfo	2011-08-19 08:31:04.090691145 -0500
@@ -1,2 +1,2 @@
-SHA256 (haproxy-1.4.15.tar.gz) = 4baebfe0a5a9220f77d9175b2e711dc8985bbb696d11c38033cc0e94e3cca93a
-SIZE (haproxy-1.4.15.tar.gz) = 812293
+SHA256 (haproxy-1.4.16.tar.gz) = ab789ced19db1462a815ffdd436edd7a2eeaf7cc2908b9253b3b01f659a9e2db
+SIZE (haproxy-1.4.16.tar.gz) = 813322
--- haproxy-1.4.16.patch ends here ---

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Fri Aug 19 13:40:20 UTC 2011 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

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

From: Edwin Groothuis <edwin@FreeBSD.org>
To: freebsd@linepoint.com
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/159913: [PATCH] net/haproxy: update to 1.4.16
Date: Fri, 19 Aug 2011 13:40:18 UT

 Maintainer of net/haproxy,
 
 Please note that PR ports/159913 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/159913
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
Responsible-Changed-From-To: freebsd-ports-bugs->crees 
Responsible-Changed-By: crees 
Responsible-Changed-When: Fri Aug 19 16:59:41 UTC 2011 
Responsible-Changed-Why:  
I'll take it. 

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

From: Ross West <freebsd@linepoint.com>
To: <bug-followup@FreeBSD.org>
Cc: <crees@freebsd.org>, <feld@feld.me>
Subject: Re: ports/159913: [PATCH] net/haproxy: update to 1.4.16
Date: Thu, 25 Aug 2011 11:27:53 -0400

 > Please note that PR ports/159913 has just been submitted.
 >
 > If it contains a patch for an upgrade, an enhancement or a bug fix
 > you agree on, reply to this email stating that you approve the patch
 > and a committer will take care of it.
 
 This PR change is approved - Many thanks for the update.
 
 (Started new job, so got behind on this)
 
 Cheers,
    Ross.
State-Changed-From-To: feedback->closed 
State-Changed-By: crees 
State-Changed-When: Thu Aug 25 17:24:47 UTC 2011 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/159913: commit references a PR
Date: Thu, 25 Aug 2011 17:24:45 +0000 (UTC)

 crees       2011-08-25 17:24:32 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net/haproxy          Makefile distinfo 
   Log:
   - Update to 1.4.16
   - Reorder LICENSE code in Makefile for portlint
   - While here:
    . Unbreak clang build
    . Canonicalise CONFLICTS
   
   PR:             ports/159913
   Submitted by:   Mark Felder <feld@feld.me>
   Approved by:    Ross West <freebsd@linepoint.com> (maintainer)
   
   Revision  Changes    Path
   1.35      +5 -5      ports/net/haproxy/Makefile
   1.32      +2 -2      ports/net/haproxy/distinfo
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
