summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059>2011-04-11 04:46:10 +0800
committermezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059>2011-04-11 04:46:10 +0800
commit485d31558761607d20f2d67f4c06a946e0fcb5d5 (patch)
treeaa41603be0251d36d3fa2aa0b0baabef4420a3a1
parent1aa60032bbe3f6bbe545e17d3de25c5309a2e18d (diff)
downloadmarcuscom-ports-485d31558761607d20f2d67f4c06a946e0fcb5d5.tar
marcuscom-ports-485d31558761607d20f2d67f4c06a946e0fcb5d5.tar.gz
marcuscom-ports-485d31558761607d20f2d67f4c06a946e0fcb5d5.tar.bz2
marcuscom-ports-485d31558761607d20f2d67f4c06a946e0fcb5d5.tar.lz
marcuscom-ports-485d31558761607d20f2d67f4c06a946e0fcb5d5.tar.xz
marcuscom-ports-485d31558761607d20f2d67f4c06a946e0fcb5d5.tar.zst
marcuscom-ports-485d31558761607d20f2d67f4c06a946e0fcb5d5.zip
-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
-rw-r--r--Mk/bsd.gnome.mk4
-rw-r--r--x11-toolkits/vte/Makefile55
-rw-r--r--x11-toolkits/vte/distinfo2
-rw-r--r--x11-toolkits/vte/files/extra-patch-gnome-pty-helper_gnome-utmp.c40
-rw-r--r--x11-toolkits/vte/files/patch-config.h.in12
-rw-r--r--x11-toolkits/vte/files/patch-configure11
-rw-r--r--x11-toolkits/vte/files/patch-gnome-pty-helper_Makefile.in13
-rw-r--r--x11-toolkits/vte/files/patch-gnome-pty-helper_gnome-pty-helper.c10
-rw-r--r--x11-toolkits/vte/files/patch-python_Makefile.in19
-rw-r--r--x11-toolkits/vte/files/patch-src_vteseq.c10
-rw-r--r--x11-toolkits/vte/pkg-descr4
-rw-r--r--x11-toolkits/vte/pkg-plist159
-rw-r--r--x11-toolkits/vte3/Makefile4
13 files changed, 340 insertions, 3 deletions
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk
index 3fb1a1f0a..8fe40c6b6 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.540 2011/04/10 15:14:12 mezz Exp $
+# $MCom: ports/Mk/bsd.gnome.mk,v 1.541 2011/04/10 19:28:34 mezz Exp $
#
# Please view me with 4 column tabs!
@@ -398,10 +398,12 @@ 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
new file mode 100644
index 000000000..1beb229a7
--- /dev/null
+++ b/x11-toolkits/vte/Makefile
@@ -0,0 +1,55 @@
+# New ports collection makefile for: vte
+# Date created: 05 October 2002
+# 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 $
+#
+
+PORTNAME= vte
+PORTVERSION= 0.26.2
+PORTREVISION?= 0
+CATEGORIES= x11-toolkits gnome
+MASTER_SITES= GNOME
+DIST_SUBDIR= gnome2
+
+MAINTAINER?= gnome@FreeBSD.org
+COMMENT?= Terminal widget with improved accessibility and I18N support
+
+USE_BZIP2= yes
+
+.if !defined(REFERENCE_PORT)
+
+CONFLICTS= vte-0.28.[0-9]*
+
+USE_GMAKE= yes
+USE_BISON= build
+USE_LDCONFIG= yes
+USE_AUTOTOOLS= libtool
+USE_GETTEXT= yes
+USE_GNOME?= gnomeprefix gnomehack gtk20 ltverhack referencehack
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
+# BSD_PTHREAD_LIBS="${PTHREAD_LIBS}"
+CONFIGURE_ARGS?=--disable-python \
+ --disable-Bsymbolic \
+ --disable-freetypetest
+
+.if !defined(MASTERDIR)
+OPTIONS= GLX "Enable support for DRI/GLX rendering" off
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 900007
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gnome-pty-helper_gnome-utmp.c
+.endif
+
+.if defined(WITH_GLX) && !defined(MASTERDIR)
+CONFIGURE_ARGS+= --with-glX
+USE_GL= yes
+.endif
+
+.include <bsd.port.post.mk>
+
+.endif
diff --git a/x11-toolkits/vte/distinfo b/x11-toolkits/vte/distinfo
new file mode 100644
index 000000000..8eb9d3e3e
--- /dev/null
+++ b/x11-toolkits/vte/distinfo
@@ -0,0 +1,2 @@
+SHA256 (gnome2/vte-0.26.2.tar.bz2) = f02c350340266c9515a98b8f69c72b4bdc53b352cd053624a63a7cb97ddec9bd
+SIZE (gnome2/vte-0.26.2.tar.bz2) = 1310863
diff --git a/x11-toolkits/vte/files/extra-patch-gnome-pty-helper_gnome-utmp.c b/x11-toolkits/vte/files/extra-patch-gnome-pty-helper_gnome-utmp.c
new file mode 100644
index 000000000..bc0877bf5
--- /dev/null
+++ b/x11-toolkits/vte/files/extra-patch-gnome-pty-helper_gnome-utmp.c
@@ -0,0 +1,40 @@
+--- gnome-pty-helper/gnome-utmp.c.orig Sat Oct 28 23:15:53 2006
++++ gnome-pty-helper/gnome-utmp.c Sat Oct 28 23:15:40 2006
+@@ -258,10 +258,18 @@ write_logout_record (char *login_name, v
+ #endif
+
+ if (utmp)
++#if defined(__FreeBSD__)
++ logout (put.ut_line);
++#else
+ update_utmp (&put);
++#endif
+
+ if (wtmp)
++#if defined(__FreeBSD__)
++ logwtmp (put.ut_line, "", "");
++#else
+ update_wtmp (WTMP_OUTPUT_FILENAME, &put);
++#endif
+
+ free (ut);
+ }
+@@ -347,10 +355,18 @@ write_login_record (char *login_name, ch
+ # endif
+ #endif
+ if (utmp)
++#if defined(__FreeBSD__)
++ login (ut);
++#else
+ update_utmp (ut);
++#endif
+
+ if (wtmp)
++#if defined(__FreeBSD__)
++ logwtmp (ut->ut_line, ut->ut_name, ut->ut_host);
++#else
+ update_wtmp (WTMP_OUTPUT_FILENAME, ut);
++#endif
+
+ if (lastlog)
+ update_lastlog(login_name, ut);
diff --git a/x11-toolkits/vte/files/patch-config.h.in b/x11-toolkits/vte/files/patch-config.h.in
new file mode 100644
index 000000000..03db0e1c4
--- /dev/null
+++ b/x11-toolkits/vte/files/patch-config.h.in
@@ -0,0 +1,12 @@
+--- config.h.in.orig Wed May 17 10:45:57 2006
++++ config.h.in Wed May 17 10:46:25 2006
+@@ -106,6 +106,9 @@
+ /* Define to 1 if you have the <GL/glx.h> header file. */
+ #undef HAVE_GL_GLX_H
+
++/* Define to 1 if you have the `posix_openpt' function. */
++#undef HAVE_POSIX_OPENPT
++
+ /* Define to 1 if you have the `grantpt' function. */
+ #undef HAVE_GRANTPT
+
diff --git a/x11-toolkits/vte/files/patch-configure b/x11-toolkits/vte/files/patch-configure
new file mode 100644
index 000000000..bfc8e7c5c
--- /dev/null
+++ b/x11-toolkits/vte/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig 2010-03-30 14:43:41.000000000 +0200
++++ configure 2010-03-30 14:47:26.000000000 +0200
+@@ -14102,7 +14102,7 @@
+
+
+ # Check for PTY handling functions.
+-for ac_func in cfmakeraw fork setsid setpgid getpgid getpt grantpt unlockpt ptsname ptsname_r tcgetattr tcsetattr
++for ac_func in cfmakeraw fork setsid setpgid getpgid getpt grantpt posix_openpt unlockpt ptsname ptsname_r tcgetattr tcsetattr
+ do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
diff --git a/x11-toolkits/vte/files/patch-gnome-pty-helper_Makefile.in b/x11-toolkits/vte/files/patch-gnome-pty-helper_Makefile.in
new file mode 100644
index 000000000..93f9d08da
--- /dev/null
+++ b/x11-toolkits/vte/files/patch-gnome-pty-helper_Makefile.in
@@ -0,0 +1,13 @@
+--- gnome-pty-helper/Makefile.in.orig 2009-05-06 01:20:54.000000000 -0400
++++ gnome-pty-helper/Makefile.in 2009-05-06 01:21:30.000000000 -0400
+@@ -590,8 +590,8 @@ uninstall-am: uninstall-libexecPROGRAMS
+
+
+ install-exec-hook:
+- chown root.utmp $(DESTDIR)$(libexecdir)/gnome-pty-helper || true
+- chmod g+s $(DESTDIR)$(libexecdir)/gnome-pty-helper || true
++ chown root:wheel $(DESTDIR)$(libexecdir)/gnome-pty-helper || true
++ chmod u+s $(DESTDIR)$(libexecdir)/gnome-pty-helper || true
+
+ -include $(top_srcdir)/git.mk
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/x11-toolkits/vte/files/patch-gnome-pty-helper_gnome-pty-helper.c b/x11-toolkits/vte/files/patch-gnome-pty-helper_gnome-pty-helper.c
new file mode 100644
index 000000000..ab80c5364
--- /dev/null
+++ b/x11-toolkits/vte/files/patch-gnome-pty-helper_gnome-pty-helper.c
@@ -0,0 +1,10 @@
+--- gnome-pty-helper/gnome-pty-helper.c
++++ gnome-pty-helper/gnome-pty-helper.c
+@@ -51,7 +51,6 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <stdio.h>
+-#include <utmp.h>
+ #include <grp.h>
+ #include "gnome-pty.h"
+ #include "gnome-login-support.h"
diff --git a/x11-toolkits/vte/files/patch-python_Makefile.in b/x11-toolkits/vte/files/patch-python_Makefile.in
new file mode 100644
index 000000000..d821a7cf6
--- /dev/null
+++ b/x11-toolkits/vte/files/patch-python_Makefile.in
@@ -0,0 +1,19 @@
+--- python/Makefile.in.orig 2009-11-01 13:38:24.000000000 -0500
++++ python/Makefile.in 2009-11-01 13:38:24.000000000 -0500
+@@ -73,7 +73,6 @@ am__installdirs = "$(DESTDIR)$(pythonsit
+ LTLIBRARIES = $(pythonsiteexec_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+ @BUILD_PYTHON_MODULES_TRUE@vtemodule_la_DEPENDENCIES = \
+-@BUILD_PYTHON_MODULES_TRUE@ $(top_builddir)/src/libvte.la \
+ @BUILD_PYTHON_MODULES_TRUE@ $(am__DEPENDENCIES_1) \
+ @BUILD_PYTHON_MODULES_TRUE@ $(am__DEPENDENCIES_1) \
+ @BUILD_PYTHON_MODULES_TRUE@ $(am__DEPENDENCIES_1)
+@@ -320,7 +319,7 @@ EXTRA_DIST = vte.defs pyvte.pc.in vte.ov
+ # we do this to suport building with -Wl,-z,defs which errors on
+ # vtemodule.so as we cannot include $(PYTHON_LIBS) due to bug 410986.
+ @BUILD_PYTHON_MODULES_TRUE@vtemodule_la_LDFLAGS = -module -avoid-version -export-symbols-regex initvte $(PYTHON_LDFLAGS) $(AM_LDFLAGS)
+-@BUILD_PYTHON_MODULES_TRUE@vtemodule_la_LIBADD = $(top_builddir)/src/libvte.la $(LIBS) $(PYGTK_LIBS) $(VTE_LIBS) $(X_LIBS)
++@BUILD_PYTHON_MODULES_TRUE@vtemodule_la_LIBADD = -lvte $(LIBS) $(PYGTK_LIBS) $(VTE_LIBS) $(X_LIBS)
+ @BUILD_PYTHON_MODULES_TRUE@nodist_vtemodule_la_SOURCES = vte.c
+ all: all-am
+
diff --git a/x11-toolkits/vte/files/patch-src_vteseq.c b/x11-toolkits/vte/files/patch-src_vteseq.c
new file mode 100644
index 000000000..e5afb288b
--- /dev/null
+++ b/x11-toolkits/vte/files/patch-src_vteseq.c
@@ -0,0 +1,10 @@
+--- src/vteseq.c.orig Mon Jun 12 20:27:00 2006
++++ src/vteseq.c Mon Jun 12 20:27:19 2006
+@@ -20,6 +20,7 @@
+ #include "../config.h"
+
+ #ifdef HAVE_SYS_SYSLIMITS_H
++#include <sys/cdefs.h>
+ #include <sys/syslimits.h>
+ #endif
+
diff --git a/x11-toolkits/vte/pkg-descr b/x11-toolkits/vte/pkg-descr
new file mode 100644
index 000000000..a363e23c7
--- /dev/null
+++ b/x11-toolkits/vte/pkg-descr
@@ -0,0 +1,4 @@
+Terminal widget with improved font, internationalisation and accessibility
+support for the GNOME 2 desktop. Designed to replace libzvt.
+
+WWW: http://www.gnome.org/
diff --git a/x11-toolkits/vte/pkg-plist b/x11-toolkits/vte/pkg-plist
new file mode 100644
index 000000000..52983e8f0
--- /dev/null
+++ b/x11-toolkits/vte/pkg-plist
@@ -0,0 +1,159 @@
+bin/vte
+include/vte-0.0/vte/pty.h
+include/vte-0.0/vte/reaper.h
+include/vte-0.0/vte/vte.h
+include/vte-0.0/vte/vteaccess.h
+include/vte-0.0/vte/vtedeprecated.h
+include/vte-0.0/vte/vtepty.h
+include/vte-0.0/vte/vtetypebuiltins.h
+include/vte-0.0/vte/vteversion.h
+lib/libvte.a
+lib/libvte.la
+lib/libvte.so
+lib/libvte.so.9
+lib/vte-0.0/decset
+lib/vte-0.0/interpret
+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
+share/locale/as/LC_MESSAGES/vte-0.0.mo
+share/locale/ast/LC_MESSAGES/vte-0.0.mo
+share/locale/az/LC_MESSAGES/vte-0.0.mo
+share/locale/be/LC_MESSAGES/vte-0.0.mo
+share/locale/be@latin/LC_MESSAGES/vte-0.0.mo
+share/locale/bg/LC_MESSAGES/vte-0.0.mo
+share/locale/bn/LC_MESSAGES/vte-0.0.mo
+share/locale/bn_IN/LC_MESSAGES/vte-0.0.mo
+share/locale/bs/LC_MESSAGES/vte-0.0.mo
+share/locale/ca/LC_MESSAGES/vte-0.0.mo
+share/locale/ca@valencia/LC_MESSAGES/vte-0.0.mo
+share/locale/cs/LC_MESSAGES/vte-0.0.mo
+share/locale/cy/LC_MESSAGES/vte-0.0.mo
+share/locale/da/LC_MESSAGES/vte-0.0.mo
+share/locale/de/LC_MESSAGES/vte-0.0.mo
+share/locale/dz/LC_MESSAGES/vte-0.0.mo
+share/locale/el/LC_MESSAGES/vte-0.0.mo
+share/locale/en@shaw/LC_MESSAGES/vte-0.0.mo
+share/locale/en_CA/LC_MESSAGES/vte-0.0.mo
+share/locale/en_GB/LC_MESSAGES/vte-0.0.mo
+share/locale/eo/LC_MESSAGES/vte-0.0.mo
+share/locale/es/LC_MESSAGES/vte-0.0.mo
+share/locale/et/LC_MESSAGES/vte-0.0.mo
+share/locale/eu/LC_MESSAGES/vte-0.0.mo
+share/locale/fa/LC_MESSAGES/vte-0.0.mo
+share/locale/fi/LC_MESSAGES/vte-0.0.mo
+share/locale/fr/LC_MESSAGES/vte-0.0.mo
+share/locale/ga/LC_MESSAGES/vte-0.0.mo
+share/locale/gl/LC_MESSAGES/vte-0.0.mo
+share/locale/gu/LC_MESSAGES/vte-0.0.mo
+share/locale/he/LC_MESSAGES/vte-0.0.mo
+share/locale/hi/LC_MESSAGES/vte-0.0.mo
+share/locale/hr/LC_MESSAGES/vte-0.0.mo
+share/locale/hu/LC_MESSAGES/vte-0.0.mo
+share/locale/id/LC_MESSAGES/vte-0.0.mo
+share/locale/is/LC_MESSAGES/vte-0.0.mo
+share/locale/it/LC_MESSAGES/vte-0.0.mo
+share/locale/ja/LC_MESSAGES/vte-0.0.mo
+share/locale/ka/LC_MESSAGES/vte-0.0.mo
+share/locale/kn/LC_MESSAGES/vte-0.0.mo
+share/locale/ko/LC_MESSAGES/vte-0.0.mo
+share/locale/ku/LC_MESSAGES/vte-0.0.mo
+share/locale/ky/LC_MESSAGES/vte-0.0.mo
+share/locale/li/LC_MESSAGES/vte-0.0.mo
+share/locale/lt/LC_MESSAGES/vte-0.0.mo
+share/locale/lv/LC_MESSAGES/vte-0.0.mo
+share/locale/mai/LC_MESSAGES/vte-0.0.mo
+share/locale/mi/LC_MESSAGES/vte-0.0.mo
+share/locale/mk/LC_MESSAGES/vte-0.0.mo
+share/locale/ml/LC_MESSAGES/vte-0.0.mo
+share/locale/mn/LC_MESSAGES/vte-0.0.mo
+share/locale/mr/LC_MESSAGES/vte-0.0.mo
+share/locale/ms/LC_MESSAGES/vte-0.0.mo
+share/locale/nb/LC_MESSAGES/vte-0.0.mo
+share/locale/ne/LC_MESSAGES/vte-0.0.mo
+share/locale/nds/LC_MESSAGES/vte-0.0.mo
+share/locale/nl/LC_MESSAGES/vte-0.0.mo
+share/locale/nn/LC_MESSAGES/vte-0.0.mo
+share/locale/oc/LC_MESSAGES/vte-0.0.mo
+share/locale/or/LC_MESSAGES/vte-0.0.mo
+share/locale/pa/LC_MESSAGES/vte-0.0.mo
+share/locale/pl/LC_MESSAGES/vte-0.0.mo
+share/locale/pt/LC_MESSAGES/vte-0.0.mo
+share/locale/pt_BR/LC_MESSAGES/vte-0.0.mo
+share/locale/ro/LC_MESSAGES/vte-0.0.mo
+share/locale/ru/LC_MESSAGES/vte-0.0.mo
+share/locale/rw/LC_MESSAGES/vte-0.0.mo
+share/locale/si/LC_MESSAGES/vte-0.0.mo
+share/locale/sk/LC_MESSAGES/vte-0.0.mo
+share/locale/sl/LC_MESSAGES/vte-0.0.mo
+share/locale/sq/LC_MESSAGES/vte-0.0.mo
+share/locale/sr/LC_MESSAGES/vte-0.0.mo
+share/locale/sr@latin/LC_MESSAGES/vte-0.0.mo
+share/locale/sv/LC_MESSAGES/vte-0.0.mo
+share/locale/ta/LC_MESSAGES/vte-0.0.mo
+share/locale/te/LC_MESSAGES/vte-0.0.mo
+share/locale/th/LC_MESSAGES/vte-0.0.mo
+share/locale/tr/LC_MESSAGES/vte-0.0.mo
+share/locale/ug/LC_MESSAGES/vte-0.0.mo
+share/locale/uk/LC_MESSAGES/vte-0.0.mo
+share/locale/vi/LC_MESSAGES/vte-0.0.mo
+share/locale/wa/LC_MESSAGES/vte-0.0.mo
+share/locale/xh/LC_MESSAGES/vte-0.0.mo
+share/locale/zh_CN/LC_MESSAGES/vte-0.0.mo
+share/locale/zh_HK/LC_MESSAGES/vte-0.0.mo
+share/locale/zh_TW/LC_MESSAGES/vte-0.0.mo
+%%DATADIR%%/termcap/xterm
+@dirrm %%DATADIR%%/termcap
+@dirrm %%DATADIR%%
+@dirrm lib/vte-0.0
+@dirrm include/vte-0.0/vte
+@dirrm include/vte-0.0
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@dirrmtry share/locale/nds/LC_MESSAGES
+@dirrmtry share/locale/nds
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mi/LC_MESSAGES
+@dirrmtry share/locale/mi
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
+@dirrmtry share/locale/ky/LC_MESSAGES
+@dirrmtry share/locale/ky
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
+@dirrmtry share/locale/ang/LC_MESSAGES
+@dirrmtry share/locale/ang
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 <marcus@FreeBSD.org>
#
# $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