diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2008-05-16 21:54:09 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2008-05-16 21:54:09 +0000 |
| commit | e99796c8b92cec310685a6eedfd9d0cbc3162bcb (patch) | |
| tree | 23b0222ce4223d14888bcc59552d8c1a0496cfed | |
| parent | 759bf812a9c4aeb2555ed1099d912bfb5c64fc05 (diff) | |
| download | ports-e99796c8b92cec310685a6eedfd9d0cbc3162bcb.tar.gz ports-e99796c8b92cec310685a6eedfd9d0cbc3162bcb.zip | |
- Add mutual conflicts to graphics/uniconvertor and editors/yudit: both install bin/uniconv
PR: 123743
Submitted by: Dmitry Marakasov <amdmi3@amdmi3.ru>
Notes
Notes:
svn path=/head/; revision=213171
| -rw-r--r-- | editors/yudit/Makefile | 3 | ||||
| -rw-r--r-- | graphics/uniconvertor/Makefile | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/editors/yudit/Makefile b/editors/yudit/Makefile index 2905e0a86f9e..78cd6b4c1242 100644 --- a/editors/yudit/Makefile +++ b/editors/yudit/Makefile @@ -7,6 +7,7 @@ PORTNAME= yudit PORTVERSION= 2.9.0 +PORTREVISION= 1 CATEGORIES= editors converters print MASTER_SITES= http://yudit.org/download/ \ SUNSITE/apps/editors/X @@ -15,6 +16,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Multi-lingual unicode text editor with TTF support +CONFLICTS= uniconvertor-[0-9]* + USE_XORG= x11 USE_GNOME= gnometarget USE_GMAKE= yes diff --git a/graphics/uniconvertor/Makefile b/graphics/uniconvertor/Makefile index 43a4f1905bdc..c725250d47b9 100644 --- a/graphics/uniconvertor/Makefile +++ b/graphics/uniconvertor/Makefile @@ -7,6 +7,7 @@ PORTNAME= uniconvertor PORTVERSION= 1.1.2 +PORTREVISION= 1 CATEGORIES= graphics python MASTER_SITES= http://sk1project.org/downloads/uniconvertor/v${PORTVERSION}/ \ http://www.amdmi3.ru/distfiles/ @@ -14,6 +15,8 @@ MASTER_SITES= http://sk1project.org/downloads/uniconvertor/v${PORTVERSION}/ \ MAINTAINER= amdmi3@amdmi3.ru COMMENT= Universal vector graphics translator +CONFLICTS= yudit-[0-9]* + USE_PYTHON= yes USE_PYDISTUTILS=yes |