From owner-cvs-all@FreeBSD.ORG  Fri Jul 25 22:24:15 2008
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 04B3C106566B;
	Fri, 25 Jul 2008 22:24:15 +0000 (UTC)
	(envelope-from marcus@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id ED6838FC08;
	Fri, 25 Jul 2008 22:24:14 +0000 (UTC)
	(envelope-from marcus@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m6PMOEWI060380;
	Fri, 25 Jul 2008 22:24:14 GMT
	(envelope-from marcus@repoman.freebsd.org)
Received: (from marcus@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m6PMOEWm060378;
	Fri, 25 Jul 2008 22:24:14 GMT (envelope-from marcus)
Message-Id: <200807252224.m6PMOEWm060378@repoman.freebsd.org>
From: Joe Marcus Clarke <marcus@FreeBSD.org>
Date: Fri, 25 Jul 2008 22:24:14 +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 UPDATING ports/misc/shared-mime-info Makefile
 distinfo pkg-plist ports/x11-fm/nautilus Makefile pkg-plist
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: Fri, 25 Jul 2008 22:24:15 -0000

marcus      2008-07-25 22:24:14 UTC

  FreeBSD ports repository

  Modified files:
    .                    UPDATING 
    misc/shared-mime-info Makefile distinfo pkg-plist 
    x11-fm/nautilus      Makefile pkg-plist 
  Log:
  Update shared-mime-info to 0.51, and remove conflicts with x11-fm/nautilus.
  Add an UPDATING entry on how to properly perform this upgrade.
  
  Revision  Changes    Path
  1.682     +12 -1     ports/UPDATING
  1.54      +1 -2      ports/misc/shared-mime-info/Makefile
  1.23      +3 -3      ports/misc/shared-mime-info/distinfo
  1.32      +20 -2     ports/misc/shared-mime-info/pkg-plist
  1.88      +1 -0      ports/x11-fm/nautilus/Makefile
  1.24      +0 -16     ports/x11-fm/nautilus/pkg-plist