From owner-cvs-all@FreeBSD.ORG  Wed Jul 18 18:29:24 2007
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@FreeBSD.org
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 205CE16A408;
	Wed, 18 Jul 2007 18:29:24 +0000 (UTC)
	(envelope-from linimon@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id E7E0313C4C6;
	Wed, 18 Jul 2007 18:29:23 +0000 (UTC)
	(envelope-from linimon@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l6IITNYI053937;
	Wed, 18 Jul 2007 18:29:23 GMT
	(envelope-from linimon@repoman.freebsd.org)
Received: (from linimon@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6IITNMk053936;
	Wed, 18 Jul 2007 18:29:23 GMT (envelope-from linimon)
Message-Id: <200707181829.l6IITNMk053936@repoman.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Wed, 18 Jul 2007 18:29:23 +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/ports-mgmt/portmk/Mk bsd.port.mk
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: 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: Wed, 18 Jul 2007 18:29:24 -0000

linimon     2007-07-18 18:29:23 UTC

  FreeBSD ports repository

  Modified files:
    ports-mgmt/portmk/Mk bsd.port.mk 
  Log:
  Fix one-line mismerge.
  
  Revision  Changes    Path
  1.56      +2 -1      ports/ports-mgmt/portmk/Mk/bsd.port.mk