From owner-cvs-ports@FreeBSD.ORG  Wed May 18 23:41:42 2011
Return-Path: <owner-cvs-ports@FreeBSD.ORG>
Delivered-To: cvs-ports@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 245351065670;
	Wed, 18 May 2011 23:41:42 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id EFCC78FC0A;
	Wed, 18 May 2011 23:41:41 +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 p4INffVe063018;
	Wed, 18 May 2011 23:41:41 GMT
	(envelope-from delphij@repoman.freebsd.org)
Received: (from delphij@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id p4INff74063017;
	Wed, 18 May 2011 23:41:41 GMT (envelope-from delphij)
Message-Id: <201105182341.p4INff74063017@repoman.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Wed, 18 May 2011 23:41:41 +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/iet Makefile
X-BeenThere: cvs-ports@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the ports tree <cvs-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-ports>
List-Post: <mailto:cvs-ports@freebsd.org>
List-Help: <mailto:cvs-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 18 May 2011 23:41:42 -0000

delphij     2011-05-18 23:41:41 UTC

  FreeBSD ports repository

  Modified files:
    net/iet              Makefile 
  Log:
  Resolve conflict against b.p.m's CONF_* variables.
  
  Submitted by:   Chris Rees <utisoft gmail.com>
  PR:             ports/157157
  
  Revision  Changes    Path
  1.7       +4 -5      ports/net/iet/Makefile