From owner-cvs-all@FreeBSD.ORG  Mon Dec 26 23:12:55 2005
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 [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id E48E516A41F;
	Mon, 26 Dec 2005 23:12:55 +0000 (GMT)
	(envelope-from linimon@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6953943D5E;
	Mon, 26 Dec 2005 23:12:55 +0000 (GMT)
	(envelope-from linimon@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBQNCtn5058907;
	Mon, 26 Dec 2005 23:12:55 GMT
	(envelope-from linimon@repoman.freebsd.org)
Received: (from linimon@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBQNCtvd058906;
	Mon, 26 Dec 2005 23:12:55 GMT (envelope-from linimon)
Message-Id: <200512262312.jBQNCtvd058906@repoman.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Mon, 26 Dec 2005 23:12:54 +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/devel/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: Mon, 26 Dec 2005 23:12:56 -0000

linimon     2005-12-26 23:12:54 UTC

  FreeBSD ports repository

  Modified files:
    devel/portmk/Mk      bsd.port.mk 
  Log:
  Correct slight mis-merge.  Should not affect anything.
  
  Revision  Changes    Path
  1.13      +5 -5      ports/devel/portmk/Mk/bsd.port.mk