hi, here's an update for devel/vte to 0.16.1 (needed by gnome-terminal). please test and comment (and ok).
http://humppa.nl/~jasper/gnome/vte.diff cheers, jasper Index: Makefile =================================================================== RCS file: /cvs/ports/devel/vte/Makefile,v retrieving revision 1.18 diff -u -r1.18 Makefile --- Makefile 14 Apr 2007 21:20:19 -0000 1.18 +++ Makefile 20 Apr 2007 14:11:25 -0000 @@ -2,10 +2,9 @@ COMMENT= "terminal emulation library" -DISTNAME= vte-0.11.12 -PKGNAME= ${DISTNAME}p5 +DISTNAME= vte-0.16.1 CATEGORIES= devel -SHARED_LIBS= vte 8.0 +SHARED_LIBS += vte 11.4 # .11.5 HOMEPAGE= http://www.gnome.org/ @@ -14,28 +13,25 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= ICE SM X11 Xau Xdmcp Xft Xrender c expat \ - fontconfig freetype m ncurses util atk-1.0 glib-2.0 \ - gmodule-2.0 gobject-2.0 pango-1.0 \ - pangoft2-1.0 pangox-1.0 pangoxft-1.0 \ - pangocairo-1.0 cairo glitz png z +WANTLIB= ICE SM X11 Xau Xcursor Xdmcp Xext Xfixes Xft Xi Xinerama \ + Xrandr Xrender atk-1.0 c cairo expat fontconfig freetype \ + glib-2.0 glitz gmodule-2.0 gobject-2.0 m ncurses pango-1.0 \ + pangocairo-1.0 pangoft2-1.0 pangox-1.0 pangoxft-1.0 \ + png util z -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/vte/0.11/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/vte/0.16/} EXTRACT_SUFX= .tar.bz2 -LIB_DEPENDS= gdk-x11-2.0.>=0.8,gdk_pixbuf-2.0.>=0.8,gtk-x11-2.0.>=0.8::x11/gtk+2 - MODULES= devel/gettext +LIB_DEPENDS= gdk-x11-2.0.>=1000,gdk_pixbuf-2.0.>=1000,gtk-x11-2.0.>=1000::x11/gtk+2 USE_X11= Yes USE_GMAKE= Yes USE_LIBTOOL= Yes CONFIGURE_STYLE= gnu -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} -CONFIGURE_ARGS+= --disable-gtk-doc -CONFIGURE_ARGS+= --disable-python +CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ + --disable-python CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" \ - PKG_CONFIG_PATH="${X11BASE}/lib/pkgconfig" + LDFLAGS="-L${LOCALBASE}/lib" .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/devel/vte/distinfo,v retrieving revision 1.7 diff -u -r1.7 distinfo --- distinfo 5 Apr 2007 15:38:07 -0000 1.7 +++ distinfo 20 Apr 2007 14:11:25 -0000 @@ -1,5 +1,5 @@ -MD5 (vte-0.11.12.tar.bz2) = Kpx88RA0K3xfQUND0uz/wQ== -RMD160 (vte-0.11.12.tar.bz2) = 6UlJzjjpGEhLQIOU3W3gKIuAB/w= -SHA1 (vte-0.11.12.tar.bz2) = vl//bnsy2MVhixhqHiY4F/epyHk= -SHA256 (vte-0.11.12.tar.bz2) = EVv71y/b+U0Jwcbc5qNk+wfJ7DcS8ZGsIAz608Jk9+8= -SIZE (vte-0.11.12.tar.bz2) = 947865 +MD5 (vte-0.16.1.tar.bz2) = zuyThmaJnB5n4c5N01jHUw== +RMD160 (vte-0.16.1.tar.bz2) = SijiGxXhn1qK69fXZjn7G7iQ6GU= +SHA1 (vte-0.16.1.tar.bz2) = AfROchmfCHjYX6eQClRd7MVOPJU= +SHA256 (vte-0.16.1.tar.bz2) = bk3ZbVI08Fcb9UVq7Lm40C46yu2vrCrdB8JyjiW/KnY= +SIZE (vte-0.16.1.tar.bz2) = 1097978 Index: patches/patch-configure =================================================================== RCS file: patches/patch-configure diff -N patches/patch-configure --- patches/patch-configure 12 Apr 2005 21:23:12 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,23 +0,0 @@ -$OpenBSD: patch-configure,v 1.3 2005/04/12 21:23:12 marcm Exp $ ---- configure.orig Mon Feb 28 14:16:28 2005 -+++ configure Sat Apr 9 22:17:56 2005 -@@ -26375,19 +26375,10 @@ fi - rm -f conftest* - - --cat >>confdefs.h <<\_ACEOF --#define _XOPEN_SOURCE_EXTENDED 1 --_ACEOF - - --cat >>confdefs.h <<\_ACEOF --#define _XOPEN_SOURCE 1 --_ACEOF - - --cat >>confdefs.h <<\_ACEOF --#define __EXTENSIONS__ 1 --_ACEOF - - - # Check whether --enable-deprecation or --disable-deprecation was given. Index: patches/patch-gnome-pty-helper_configure =================================================================== RCS file: patches/patch-gnome-pty-helper_configure diff -N patches/patch-gnome-pty-helper_configure --- patches/patch-gnome-pty-helper_configure 12 Apr 2005 21:23:12 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,23 +0,0 @@ -$OpenBSD: patch-gnome-pty-helper_configure,v 1.2 2005/04/12 21:23:12 marcm Exp $ ---- gnome-pty-helper/configure.orig Mon Feb 28 14:11:22 2005 -+++ gnome-pty-helper/configure Sat Apr 9 22:17:56 2005 -@@ -7104,19 +7104,10 @@ fi - rm -f conftest* - - --cat >>confdefs.h <<\_ACEOF --#define _XOPEN_SOURCE_EXTENDED 1 --_ACEOF - - --cat >>confdefs.h <<\_ACEOF --#define _XOPEN_SOURCE 1 --_ACEOF - - --cat >>confdefs.h <<\_ACEOF --#define __EXTENSIONS__ 1 --_ACEOF - - - ac_config_headers="$ac_config_headers config.h" Index: patches/patch-gnome-pty-helper_gnome-pty-helper_c =================================================================== RCS file: /cvs/ports/devel/vte/patches/patch-gnome-pty-helper_gnome-pty-helper_c,v retrieving revision 1.1 diff -u -r1.1 patch-gnome-pty-helper_gnome-pty-helper_c --- patches/patch-gnome-pty-helper_gnome-pty-helper_c 7 Oct 2003 05:47:58 -0000 1.1 +++ patches/patch-gnome-pty-helper_gnome-pty-helper_c 20 Apr 2007 14:11:25 -0000 @@ -1,20 +1,12 @@ $OpenBSD: patch-gnome-pty-helper_gnome-pty-helper_c,v 1.1 2003/10/07 05:47:58 marcm Exp $ ---- gnome-pty-helper/gnome-pty-helper.c.orig 2003-09-08 15:32:27.000000000 -0700 -+++ gnome-pty-helper/gnome-pty-helper.c 2003-09-08 15:32:59.000000000 -0700 -@@ -42,6 +42,7 @@ extern char *strdup(const char *); - #include <unistd.h> - #include <string.h> - #include <signal.h> -+#include <sys/param.h> - #include <fcntl.h> - #include <termios.h> - #include <errno.h> -@@ -93,7 +94,7 @@ static pty_info *pty_list; - #endif - #endif /* CMSG_DATA */ - --#define CONTROLLEN (sizeof (struct cmsghdr) + sizeof (int)) -+#define CONTROLLEN (sizeof (struct cmsghdr) + sizeof (long)) - - static struct cmsghdr *cmptr; +--- gnome-pty-helper/gnome-pty-helper.c.orig Fri Mar 23 16:14:44 2007 ++++ gnome-pty-helper/gnome-pty-helper.c Fri Mar 23 16:15:42 2007 +@@ -101,7 +101,7 @@ static int CONTROLLEN; + static int + init_msg_pass (void) + { +- CONTROLLEN = (CMSG_DATA (cmptr) - (unsigned char *)cmptr) + sizeof(int); ++ CONTROLLEN = (CMSG_DATA (cmptr) - (unsigned char *)cmptr) + sizeof(long); + cmptr = malloc (CONTROLLEN); + if (cmptr) Index: patches/patch-src_Makefile_in =================================================================== RCS file: /cvs/ports/devel/vte/patches/patch-src_Makefile_in,v retrieving revision 1.2 diff -u -r1.2 patch-src_Makefile_in --- patches/patch-src_Makefile_in 12 Apr 2005 21:23:12 -0000 1.2 +++ patches/patch-src_Makefile_in 20 Apr 2007 14:11:25 -0000 @@ -1,21 +1,21 @@ $OpenBSD: patch-src_Makefile_in,v 1.2 2005/04/12 21:23:12 marcm Exp $ ---- src/Makefile.in.orig Mon Feb 28 14:16:27 2005 -+++ src/Makefile.in Sat Apr 9 22:19:22 2005 -@@ -272,7 +272,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - INSTOBJEXT = @INSTOBJEXT@ - INTLLIBS = @INTLLIBS@ +--- src/Makefile.in.orig Mon Apr 9 19:50:37 2007 ++++ src/Makefile.in Fri Apr 20 16:01:42 2007 +@@ -341,7 +341,7 @@ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ + INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ -LDFLAGS = @LDFLAGS@ +LDFLAGS = -L./.libs @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ -@@ -399,7 +399,7 @@ EXTRA_DIST = \ - unitable.KSX1001 +@@ -491,7 +491,7 @@ AM_CPPFLAGS = -DDATADIR='"$(datadir)"' \ + -DLIBEXECDIR='"$(libexecdir)"' \ + -DLOCALEDIR='"$(localedir)"' - AM_CFLAGS = @VTE_CFLAGS@ @CFLAGS@ @X_CFLAGS@ --AM_LDFLAGS = @LDFLAGS@ -+AM_LDFLAGS = +-AM_LDFLAGS = $(LDFLAGS) ++AM_LDFLAGS = EXTRA_libvte_la_SOURCES = keysyms.c - libvte_la_SOURCES = \ - buffer.c \ + libvte_la_SOURCES = buffer.c buffer.h caps.c caps.h debug.c debug.h \ + iso2022.c iso2022.h keymap.c keymap.h marshal.c marshal.h \ Index: patches/patch-src_pty_c =================================================================== RCS file: /cvs/ports/devel/vte/patches/patch-src_pty_c,v retrieving revision 1.2 diff -u -r1.2 patch-src_pty_c --- patches/patch-src_pty_c 1 Aug 2004 06:10:09 -0000 1.2 +++ patches/patch-src_pty_c 20 Apr 2007 14:11:25 -0000 @@ -1,11 +1,11 @@ -OpenBSD$ ---- src/pty.c.orig Sat May 1 00:12:51 2004 -+++ src/pty.c Sat Jul 31 15:33:41 2004 -@@ -48,6 +48,7 @@ - #include "pty.h" - - #ifdef VTE_USE_GNOME_PTY_HELPER +$OpenBSD$ +--- src/pty.c.orig Fri Mar 23 16:17:28 2007 ++++ src/pty.c Fri Mar 23 16:18:29 2007 +@@ -62,6 +62,7 @@ + #ifdef HAVE_SYS_UN_H + #include <sys/un.h> + #endif +#include "../gnome-pty-helper/config.h" #include "../gnome-pty-helper/gnome-pty.h" - #endif - + static gboolean _vte_pty_helper_started = FALSE; + static pid_t _vte_pty_helper_pid = -1; Index: patches/patch-src_vtebg_c =================================================================== RCS file: patches/patch-src_vtebg_c diff -N patches/patch-src_vtebg_c --- patches/patch-src_vtebg_c 6 Sep 2005 04:10:12 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_vtebg_c,v 1.1 2005/09/06 04:10:12 marcm Exp $ ---- src/vtebg.c.orig Mon Aug 29 16:22:36 2005 -+++ src/vtebg.c Mon Aug 29 16:23:02 2005 -@@ -112,7 +112,7 @@ _vte_property_get_pixmaps(GdkWindow *win - XID **pixmaps) - { - return gdk_property_get(window, atom, GDK_TARGET_PIXMAP, -- 0, INT_MAX, -+ 0, INT_MAX - 3, - FALSE, - type, NULL, size, - (guchar**) pixmaps); Index: patches/patch-src_vterdb_c =================================================================== RCS file: patches/patch-src_vterdb_c diff -N patches/patch-src_vterdb_c --- patches/patch-src_vterdb_c 6 Sep 2005 04:10:12 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_vterdb_c,v 1.1 2005/09/06 04:10:12 marcm Exp $ ---- src/vterdb.c.orig Mon Aug 29 16:24:30 2005 -+++ src/vterdb.c Mon Aug 29 16:24:47 2005 -@@ -40,7 +40,7 @@ _vte_property_get_string(GdkWindow *wind - char **retval) - { - return gdk_property_get(window, atom, GDK_TARGET_STRING, -- 0, INT_MAX, -+ 0, INT_MAX - 3, - FALSE, - type, NULL, size, - (guchar**) retval); Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/devel/vte/pkg/PLIST,v retrieving revision 1.9 diff -u -r1.9 PLIST --- pkg/PLIST 19 Mar 2007 09:48:44 -0000 1.9 +++ pkg/PLIST 20 Apr 2007 14:11:25 -0000 @@ -32,7 +32,15 @@ share/gtk-doc/html/vte/VteTerminal.html share/gtk-doc/html/vte/VteTerminalAccessible.html share/gtk-doc/html/vte/ch01.html +share/gtk-doc/html/vte/home.png share/gtk-doc/html/vte/index.html +share/gtk-doc/html/vte/index.sgml +share/gtk-doc/html/vte/left.png +share/gtk-doc/html/vte/right.png +share/gtk-doc/html/vte/style.css +share/gtk-doc/html/vte/up.png +share/gtk-doc/html/vte/vte.devhelp +share/gtk-doc/html/vte/vte.devhelp2 share/locale/am/ share/locale/am/LC_MESSAGES/ share/locale/am/LC_MESSAGES/vte.mo @@ -46,10 +54,16 @@ share/locale/az/LC_MESSAGES/ share/locale/az/LC_MESSAGES/vte.mo share/locale/be/LC_MESSAGES/vte.mo +share/locale/[EMAIL PROTECTED]/ +share/locale/[EMAIL PROTECTED]/LC_MESSAGES/ +share/locale/[EMAIL PROTECTED]/LC_MESSAGES/vte.mo share/locale/bg/LC_MESSAGES/vte.mo share/locale/bn/ share/locale/bn/LC_MESSAGES/ share/locale/bn/LC_MESSAGES/vte.mo +share/locale/bn_IN/ +share/locale/bn_IN/LC_MESSAGES/ +share/locale/bn_IN/LC_MESSAGES/vte.mo share/locale/bs/ share/locale/bs/LC_MESSAGES/ share/locale/bs/LC_MESSAGES/vte.mo @@ -60,6 +74,9 @@ share/locale/cy/LC_MESSAGES/vte.mo share/locale/da/LC_MESSAGES/vte.mo share/locale/de/LC_MESSAGES/vte.mo +share/locale/dz/ +share/locale/dz/LC_MESSAGES/ +share/locale/dz/LC_MESSAGES/vte.mo share/locale/el/LC_MESSAGES/vte.mo share/locale/en_CA/ share/locale/en_CA/LC_MESSAGES/ @@ -78,6 +95,7 @@ share/locale/fi/LC_MESSAGES/vte.mo share/locale/fr/LC_MESSAGES/vte.mo share/locale/ga/LC_MESSAGES/vte.mo +share/locale/gl/LC_MESSAGES/vte.mo share/locale/gu/ share/locale/gu/LC_MESSAGES/ share/locale/gu/LC_MESSAGES/vte.mo @@ -96,7 +114,16 @@ share/locale/ka/ share/locale/ka/LC_MESSAGES/ share/locale/ka/LC_MESSAGES/vte.mo +share/locale/kn/ +share/locale/kn/LC_MESSAGES/ +share/locale/kn/LC_MESSAGES/vte.mo share/locale/ko/LC_MESSAGES/vte.mo +share/locale/ku/ +share/locale/ku/LC_MESSAGES/ +share/locale/ku/LC_MESSAGES/vte.mo +share/locale/ky/ +share/locale/ky/LC_MESSAGES/ +share/locale/ky/LC_MESSAGES/vte.mo share/locale/li/ share/locale/li/LC_MESSAGES/ share/locale/li/LC_MESSAGES/vte.mo @@ -116,6 +143,9 @@ share/locale/mn/ share/locale/mn/LC_MESSAGES/ share/locale/mn/LC_MESSAGES/vte.mo +share/locale/mr/ +share/locale/mr/LC_MESSAGES/ +share/locale/mr/LC_MESSAGES/vte.mo share/locale/ms/ share/locale/ms/LC_MESSAGES/ share/locale/ms/LC_MESSAGES/vte.mo @@ -125,7 +155,6 @@ share/locale/ne/LC_MESSAGES/vte.mo share/locale/nl/LC_MESSAGES/vte.mo share/locale/nn/LC_MESSAGES/vte.mo -share/locale/no/LC_MESSAGES/vte.mo share/locale/or/ share/locale/or/LC_MESSAGES/ share/locale/or/LC_MESSAGES/vte.mo @@ -137,6 +166,9 @@ share/locale/pt_BR/LC_MESSAGES/vte.mo share/locale/ro/LC_MESSAGES/vte.mo share/locale/ru/LC_MESSAGES/vte.mo +share/locale/rw/ +share/locale/rw/LC_MESSAGES/ +share/locale/rw/LC_MESSAGES/vte.mo share/locale/sk/LC_MESSAGES/vte.mo share/locale/sl/LC_MESSAGES/vte.mo share/locale/sq/ @@ -150,13 +182,25 @@ share/locale/ta/ share/locale/ta/LC_MESSAGES/ share/locale/ta/LC_MESSAGES/vte.mo +share/locale/th/ +share/locale/th/LC_MESSAGES/ +share/locale/th/LC_MESSAGES/vte.mo share/locale/tr/LC_MESSAGES/vte.mo +share/locale/ug/ +share/locale/ug/LC_MESSAGES/ +share/locale/ug/LC_MESSAGES/vte.mo share/locale/uk/LC_MESSAGES/vte.mo share/locale/vi/LC_MESSAGES/vte.mo share/locale/wa/ share/locale/wa/LC_MESSAGES/ share/locale/wa/LC_MESSAGES/vte.mo +share/locale/xh/ +share/locale/xh/LC_MESSAGES/ +share/locale/xh/LC_MESSAGES/vte.mo share/locale/zh_CN/LC_MESSAGES/vte.mo +share/locale/zh_HK/ +share/locale/zh_HK/LC_MESSAGES/ +share/locale/zh_HK/LC_MESSAGES/vte.mo share/locale/zh_TW/LC_MESSAGES/vte.mo share/vte/ share/vte/termcap/ -- ``This statement is false'' NedBSD: http://nedbsd.eu
