From dc0e64f5c686b86b4ac03bcadb90334c84712577 Mon Sep 17 00:00:00 2001 From: mezz Date: Mon, 11 Apr 2011 02:36:01 +0000 Subject: Disable install gnome-pty-helper to resolve the conflict between with vte3, bump it. Now both no longer conflict and remove GNOME_DESKTOP_VERSION. Discussed w/: marcus git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@15795 df743ca5-7f9a-e211-a948-0013205c9059 --- x11-toolkits/vte/Makefile | 9 ++++----- x11-toolkits/vte/pkg-plist | 1 - x11-toolkits/vte3/Makefile | 4 +--- 3 files changed, 5 insertions(+), 9 deletions(-) (limited to 'x11-toolkits') diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile index 1beb229a7..8db5767bc 100644 --- a/x11-toolkits/vte/Makefile +++ b/x11-toolkits/vte/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke # # $FreeBSD: ports/x11-toolkits/vte/Makefile,v 1.99 2010/12/04 07:34:24 ade Exp $ -# $MCom: ports/x11-toolkits/vte/Makefile,v 1.117 2010/11/13 13:16:58 kwm Exp $ +# $MCom: ports/x11-toolkits/vte/Makefile,v 1.119 2011/04/10 20:46:10 mezz Exp $ # PORTNAME= vte PORTVERSION= 0.26.2 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -20,8 +20,6 @@ USE_BZIP2= yes .if !defined(REFERENCE_PORT) -CONFLICTS= vte-0.28.[0-9]* - USE_GMAKE= yes USE_BISON= build USE_LDCONFIG= yes @@ -33,7 +31,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ # BSD_PTHREAD_LIBS="${PTHREAD_LIBS}" CONFIGURE_ARGS?=--disable-python \ --disable-Bsymbolic \ - --disable-freetypetest + --disable-freetypetest \ + --disable-gnome-pty-helper .if !defined(MASTERDIR) OPTIONS= GLX "Enable support for DRI/GLX rendering" off diff --git a/x11-toolkits/vte/pkg-plist b/x11-toolkits/vte/pkg-plist index 52983e8f0..3cb7ab0c9 100644 --- a/x11-toolkits/vte/pkg-plist +++ b/x11-toolkits/vte/pkg-plist @@ -17,7 +17,6 @@ lib/vte-0.0/osc lib/vte-0.0/slowcat lib/vte-0.0/window libdata/pkgconfig/vte.pc -libexec/gnome-pty-helper share/locale/am/LC_MESSAGES/vte-0.0.mo share/locale/ang/LC_MESSAGES/vte-0.0.mo share/locale/ar/LC_MESSAGES/vte-0.0.mo diff --git a/x11-toolkits/vte3/Makefile b/x11-toolkits/vte3/Makefile index 0f8a6a15d..fb6172e66 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.5 2011/04/05 09:26:05 kwm Exp $ +# $MCom: ports/x11-toolkits/vte3/Makefile,v 1.6 2011/04/10 20:46:10 mezz Exp $ # PORTNAME= vte @@ -20,8 +20,6 @@ USE_BZIP2= yes .if !defined(REFERENCE_PORT) -CONFLICTS= vte-0.26.[0-9]* - USE_GMAKE= yes USE_BISON= build USE_LDCONFIG= yes -- cgit v1.2.3