From owner-cvs-all@FreeBSD.ORG  Tue Nov 23 09:57:57 2010
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 6ED141065675;
	Tue, 23 Nov 2010 09:57:57 +0000 (UTC) (envelope-from pav@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 446E08FC1D;
	Tue, 23 Nov 2010 09:57:57 +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 oAN9vvln007514;
	Tue, 23 Nov 2010 09:57:57 GMT (envelope-from pav@repoman.freebsd.org)
Received: (from pav@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id oAN9vvkH007513;
	Tue, 23 Nov 2010 09:57:57 GMT (envelope-from pav)
Message-Id: <201011230957.oAN9vvkH007513@repoman.freebsd.org>
From: Pav Lucistnik <pav@FreeBSD.org>
Date: Tue, 23 Nov 2010 09:57:57 +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/math/surf Makefile ports/www/surf Makefile
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: Tue, 23 Nov 2010 09:57:57 -0000

pav         2010-11-23 09:57:57 UTC

  FreeBSD ports repository

  Modified files:
    math/surf            Makefile 
    www/surf             Makefile 
  Log:
  - Annotate conflict between math/surf and www/surf
  
  PR:             ports/152231
  Reported by:    Kostas Blekos <eelvex@gmail.com>
  
  Revision  Changes    Path
  1.28      +2 -0      ports/math/surf/Makefile
  1.8       +2 -0      ports/www/surf/Makefile