diff options
| author | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2011-04-10 05:37:53 +0800 |
|---|---|---|
| committer | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2011-04-10 05:37:53 +0800 |
| commit | 30667769b7931c0ecaed2d12ad2f5fa8d21c8421 (patch) | |
| tree | bfe812a98307abc4bd889d3955a6568764ed34cf | |
| parent | b07d6a7e9197104c3ba49062b97abc3cdd51925e (diff) | |
| download | marcuscom-ports-30667769b7931c0ecaed2d12ad2f5fa8d21c8421.tar marcuscom-ports-30667769b7931c0ecaed2d12ad2f5fa8d21c8421.tar.gz marcuscom-ports-30667769b7931c0ecaed2d12ad2f5fa8d21c8421.tar.bz2 marcuscom-ports-30667769b7931c0ecaed2d12ad2f5fa8d21c8421.tar.lz marcuscom-ports-30667769b7931c0ecaed2d12ad2f5fa8d21c8421.tar.xz marcuscom-ports-30667769b7931c0ecaed2d12ad2f5fa8d21c8421.tar.zst marcuscom-ports-30667769b7931c0ecaed2d12ad2f5fa8d21c8421.zip | |
Add CONFLICTS with the each others.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@15781 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | graphics/evince/Makefile | 4 | ||||
| -rw-r--r-- | graphics/evince3/Makefile | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile index 08793b89e..4479475aa 100644 --- a/graphics/evince/Makefile +++ b/graphics/evince/Makefile @@ -3,7 +3,7 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD: ports/graphics/evince/Makefile,v 1.63 2010/12/04 07:31:56 ade Exp $ -# $MCom: ports/graphics/evince/Makefile,v 1.150 2011/03/14 21:40:52 mezz Exp $ +# $MCom: ports/graphics/evince/Makefile,v 1.151 2011/03/31 09:49:56 kwm Exp $ # PORTNAME= evince @@ -21,6 +21,8 @@ LIB_DEPENDS= poppler-glib.6:${PORTSDIR}/graphics/poppler-gtk \ spectre.1:${PORTSDIR}/print/libspectre RUN_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme +CONFLICTS= evince-3.[0-9]* + USE_LDCONFIG= yes USE_BZIP2= yes USE_AUTOTOOLS= libtool diff --git a/graphics/evince3/Makefile b/graphics/evince3/Makefile index 63c1c2ba1..1ba69a84b 100644 --- a/graphics/evince3/Makefile +++ b/graphics/evince3/Makefile @@ -3,7 +3,7 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/evince3/Makefile,v 1.9 2011/03/31 09:49:57 kwm Exp $ +# $MCom: ports/graphics/evince3/Makefile,v 1.10 2011/04/05 16:59:48 kwm Exp $ # PORTNAME= evince @@ -23,6 +23,8 @@ LIB_DEPENDS= poppler-glib.6:${PORTSDIR}/graphics/poppler-gtk \ RUN_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme \ ${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas +CONFLICTS= evince-2.[0-9]* + USE_LDCONFIG= yes USE_BZIP2= yes USE_AUTOTOOLS= libtool |