From owner-svn-ports-head@FreeBSD.ORG  Wed Jul 18 06:28:07 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 08424106564A;
	Wed, 18 Jul 2012 06:28:07 +0000 (UTC) (envelope-from cs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CE1B88FC14;
	Wed, 18 Jul 2012 06:28:06 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6I6S6dL036468;
	Wed, 18 Jul 2012 06:28:06 GMT (envelope-from cs@svn.freebsd.org)
Received: (from cs@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6I6S62R036464;
	Wed, 18 Jul 2012 06:28:06 GMT (envelope-from cs@svn.freebsd.org)
Message-Id: <201207180628.q6I6S62R036464@svn.freebsd.org>
From: Carlo Strub <cs@FreeBSD.org>
Date: Wed, 18 Jul 2012 06:28:06 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r301064 - in head: astro/match devel/py-epsilon
	news/lottanzb
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Wed, 18 Jul 2012 06:28:07 -0000

Author: cs
Date: Wed Jul 18 06:28:06 2012
New Revision: 301064
URL: http://svn.freebsd.org/changeset/ports/301064

Log:
  Register CONFLICTS
  
  Submitted by:	Sulev-Madis 'ketas' Silber (via e-mail)

Modified:
  head/astro/match/Makefile
  head/devel/py-epsilon/Makefile
  head/news/lottanzb/Makefile

Modified: head/astro/match/Makefile
==============================================================================
--- head/astro/match/Makefile	Wed Jul 18 06:21:15 2012	(r301063)
+++ head/astro/match/Makefile	Wed Jul 18 06:28:06 2012	(r301064)
@@ -17,6 +17,7 @@ COMMENT=	A program for matching star lis
 
 LICENSE=	GPLv2
 
+CONFLICTS=	avenger-[0-9]*
 GNU_CONFIGURE=	yes
 
 MAN1=		match.1

Modified: head/devel/py-epsilon/Makefile
==============================================================================
--- head/devel/py-epsilon/Makefile	Wed Jul 18 06:21:15 2012	(r301063)
+++ head/devel/py-epsilon/Makefile	Wed Jul 18 06:28:06 2012	(r301064)
@@ -19,6 +19,7 @@ LICENSE=	MIT
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/OpenSSL/__init__.py:${PORTSDIR}/security/py-openssl
 
+CONFLICTS=	brlcad-[0-9]*
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	Epsilon

Modified: head/news/lottanzb/Makefile
==============================================================================
--- head/news/lottanzb/Makefile	Wed Jul 18 06:21:15 2012	(r301063)
+++ head/news/lottanzb/Makefile	Wed Jul 18 06:28:06 2012	(r301064)
@@ -17,6 +17,8 @@ MASTER_SITES=	http://www.lottanzb.org/re
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A pyGTK usenet frontend for hellanzb
 
+LICENSE=	GPLv3
+
 RUN_DEPENDS=	SABnzbd.py:${PORTSDIR}/news/sabnzbdplus \
 		yelp:${PORTSDIR}/x11/yelp \
 		unrar:${PORTSDIR}/archivers/unrar \
@@ -25,8 +27,7 @@ RUN_DEPENDS=	SABnzbd.py:${PORTSDIR}/news
 		${PYTHON_SITELIBDIR}/feedparser.py:${PORTSDIR}/textproc/py-feedparser \
 		${PYTHON_SITELIBDIR}/OpenSSL/__init__.py:${PORTSDIR}/security/py-openssl
 
-LICENSE=	GPLv3
-
+CONFLICTS=	shared-mime-info-[0-9]*
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 USE_GNOME=	desktopfileutils intltool