aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlo Strub <cs@FreeBSD.org>2012-07-18 06:28:06 +0000
committerCarlo Strub <cs@FreeBSD.org>2012-07-18 06:28:06 +0000
commit7fa834594425662d4e8fce9b6b34f1f5c2aebdef (patch)
tree4f5134074ad2f29e8ca2509b489ffb2fecde1dbe
parentb53413a3d07960d27d71a11c269467fba56643b5 (diff)
downloadports-7fa834594425662d4e8fce9b6b34f1f5c2aebdef.tar.gz
ports-7fa834594425662d4e8fce9b6b34f1f5c2aebdef.zip
Register CONFLICTS
Submitted by: Sulev-Madis 'ketas' Silber (via e-mail)
Notes
Notes: svn path=/head/; revision=301064
-rw-r--r--astro/match/Makefile1
-rw-r--r--devel/py-epsilon/Makefile1
-rw-r--r--news/lottanzb/Makefile5
3 files changed, 5 insertions, 2 deletions
diff --git a/astro/match/Makefile b/astro/match/Makefile
index 20c18fa1e22b..b655e9c5cf6b 100644
--- a/astro/match/Makefile
+++ b/astro/match/Makefile
@@ -17,6 +17,7 @@ COMMENT= A program for matching star lists
LICENSE= GPLv2
+CONFLICTS= avenger-[0-9]*
GNU_CONFIGURE= yes
MAN1= match.1
diff --git a/devel/py-epsilon/Makefile b/devel/py-epsilon/Makefile
index c8bf17331877..9cc3a2b3f489 100644
--- a/devel/py-epsilon/Makefile
+++ b/devel/py-epsilon/Makefile
@@ -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
diff --git a/news/lottanzb/Makefile b/news/lottanzb/Makefile
index 2f6334764f2c..0b7edf07a9c0 100644
--- a/news/lottanzb/Makefile
+++ b/news/lottanzb/Makefile
@@ -17,6 +17,8 @@ MASTER_SITES= http://www.lottanzb.org/releases/ \
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/sabnzbdplus \
${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