summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Mk/bsd.gnome.mk4
-rw-r--r--x11-toolkits/vte/Makefile9
-rw-r--r--x11-toolkits/vte/pkg-plist1
-rw-r--r--x11-toolkits/vte3/Makefile4
4 files changed, 6 insertions, 12 deletions
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk
index 8fe40c6b6..4e1034b38 100644
--- a/Mk/bsd.gnome.mk
+++ b/Mk/bsd.gnome.mk
@@ -3,7 +3,7 @@
#
# $FreeBSD$
# $NetBSD: $
-# $MCom: ports/Mk/bsd.gnome.mk,v 1.541 2011/04/10 19:28:34 mezz Exp $
+# $MCom: ports/Mk/bsd.gnome.mk,v 1.542 2011/04/10 20:46:09 mezz Exp $
#
# Please view me with 4 column tabs!
@@ -398,12 +398,10 @@ libwnck3_GNOME_DESKTOP_VERSION=3
vte_LIB_DEPENDS= vte.9:${PORTSDIR}/x11-toolkits/vte
vte_DETECT= ${LOCALBASE}/libdata/pkgconfig/vte.pc
vte_USE_GNOME_IMPL= gtk20
-vte_GNOME_DESKTOP_VERSION=2
vte3_LIB_DEPENDS= vte2_90.9:${PORTSDIR}/x11-toolkits/vte3
vte3_DETECT= ${LOCALBASE}/libdata/pkgconfig/vte-2.90.pc
vte3_USE_GNOME_IMPL= gtk30
-vte3_GNOME_DESKTOP_VERSION=3
libzvt_LIB_DEPENDS= zvt-2.0.0:${PORTSDIR}/x11-toolkits/libzvt
libzvt_DETECT= ${LOCALBASE}/libdata/pkgconfig/libzvt-2.0.pc
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 <marcus@FreeBSD.org>
#
# $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 <marcus@FreeBSD.org>
#
# $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