From owner-cvs-all@FreeBSD.ORG  Thu Aug 25 17:24:32 2011
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BA038106564A;
	Thu, 25 Aug 2011 17:24:32 +0000 (UTC)
	(envelope-from crees@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9223A8FC15;
	Thu, 25 Aug 2011 17:24:32 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id p7PHOWM1068196;
	Thu, 25 Aug 2011 17:24:32 GMT
	(envelope-from crees@repoman.freebsd.org)
Received: (from crees@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id p7PHOW1q068195;
	Thu, 25 Aug 2011 17:24:32 GMT (envelope-from crees)
Message-Id: <201108251724.p7PHOW1q068195@repoman.freebsd.org>
From: Chris Rees <crees@FreeBSD.org>
Date: Thu, 25 Aug 2011 17:24:32 +0000 (UTC)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: ports/net/haproxy Makefile distinfo
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the entire tree
	<cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 25 Aug 2011 17:24:32 -0000

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