From 485d31558761607d20f2d67f4c06a946e0fcb5d5 Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 10 Apr 2011 20:46:10 +0000 Subject: -Add CONFLICTS with the each others. -Add GNOME_DESKTOP_VERSION. Maybe it can be resolved the conflict by rename libexec/gnome-pty-helper. It's only a binary that is conflict. Need to research it to see if it can be renamed git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@15790 df743ca5-7f9a-e211-a948-0013205c9059 --- x11-toolkits/vte3/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'x11-toolkits/vte3') diff --git a/x11-toolkits/vte3/Makefile b/x11-toolkits/vte3/Makefile index ec2f0bcc2..0f8a6a15d 100644 --- a/x11-toolkits/vte3/Makefile +++ b/x11-toolkits/vte3/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom: ports/x11-toolkits/vte3/Makefile,v 1.4 2011/02/21 18:01:42 kwm Exp $ +# $MCom: ports/x11-toolkits/vte3/Makefile,v 1.5 2011/04/05 09:26:05 kwm Exp $ # PORTNAME= vte @@ -20,7 +20,7 @@ USE_BZIP2= yes .if !defined(REFERENCE_PORT) -#BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection +CONFLICTS= vte-0.26.[0-9]* USE_GMAKE= yes USE_BISON= build -- cgit v1.2.3