svn commit: r301064 - in head: astro/match devel/py-epsilon news/lottanzb

[Carlo Strub]

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 at 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