From owner-svn-ports-head@FreeBSD.ORG  Fri Apr 26 01:17:54 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 55FBF92A;
 Fri, 26 Apr 2013 01:17:54 +0000 (UTC)
 (envelope-from mezz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 48DAD1499;
 Fri, 26 Apr 2013 01:17:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3Q1Hroj021788;
 Fri, 26 Apr 2013 01:17:53 GMT (envelope-from mezz@svn.freebsd.org)
Received: (from mezz@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3Q1HrcH021786;
 Fri, 26 Apr 2013 01:17:53 GMT (envelope-from mezz@svn.freebsd.org)
Message-Id: <201304260117.r3Q1HrcH021786@svn.freebsd.org>
From: Jeremy Messenger <mezz@FreeBSD.org>
Date: Fri, 26 Apr 2013 01:17:53 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r316539 - head/x11/gnome-panel
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 26 Apr 2013 01:17:54 -0000

Author: mezz
Date: Fri Apr 26 01:17:53 2013
New Revision: 316539
URL: http://svnweb.freebsd.org/changeset/ports/316539

Log:
  No longer conflict with mate-panel, bump the PORTREVISION.

Modified:
  head/x11/gnome-panel/Makefile   (contents, props changed)

Modified: head/x11/gnome-panel/Makefile
==============================================================================
--- head/x11/gnome-panel/Makefile	Thu Apr 25 23:50:23 2013	(r316538)
+++ head/x11/gnome-panel/Makefile	Fri Apr 26 01:17:53 2013	(r316539)
@@ -8,7 +8,7 @@
 
 PORTNAME=	gnome-panel
 PORTVERSION=	2.32.1
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -24,7 +24,7 @@ LIB_DEPENDS=	gweather:${PORTSDIR}/net/li
 		dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
 		canberra-gtk:${PORTSDIR}/audio/libcanberra
 
-CONFLICTS=	gnome-panel-3.[0-9]* mate-panel-*
+CONFLICTS=	gnome-panel-3.[0-9]*
 
 USE_GETTEXT=	yes
 USE_XORG=	ice sm x11 xau xrandr