diff options
| -rw-r--r-- | x11/vte/Makefile | 9 | ||||
| -rw-r--r-- | x11/vte/PLIST | 9 | ||||
| -rw-r--r-- | x11/vte/distinfo | 10 | ||||
| -rw-r--r-- | x11/vte/patches/patch-ai | 19 |
4 files changed, 21 insertions, 26 deletions
diff --git a/x11/vte/Makefile b/x11/vte/Makefile index b76002be9a9..51db41346a5 100644 --- a/x11/vte/Makefile +++ b/x11/vte/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.61 2009/01/24 08:23:56 obache Exp $ +# $NetBSD: Makefile,v 1.62 2009/03/15 16:47:29 jmcneill Exp $ # -DISTNAME= vte-0.17.4 -PKGREVISION= 1 +DISTNAME= vte-0.19.4 CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/vte/0.17/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/vte/0.19/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org @@ -22,6 +21,7 @@ USE_TOOLS+= gmake intltool msgfmt pkg-config CONFIGURE_ARGS+= --disable-python CONFIGURE_ARGS+= --with-ft-exec-prefix=${BUILDLINK_PREFIX.freetype2} +PKGCONFIG_OVERRIDE+= pyvte.pc.in PKGCONFIG_OVERRIDE+= vte.pc.in BUILDLINK_API_DEPENDS.glib2+= glib2>=2.10.0 @@ -36,6 +36,7 @@ BUILDLINK_DEPMETHOD.libXt?= build .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.include "../../x11/py-gtk2/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXft/buildlink3.mk" diff --git a/x11/vte/PLIST b/x11/vte/PLIST index 67714ea0787..56c441a653e 100644 --- a/x11/vte/PLIST +++ b/x11/vte/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.17 2008/10/16 13:35:12 drochner Exp $ +@comment $NetBSD: PLIST,v 1.18 2009/03/15 16:47:29 jmcneill Exp $ bin/vte include/vte/pty.h include/vte/reaper.h @@ -7,16 +7,12 @@ include/vte/vteaccess.h include/vte/vtetypebuiltins.h include/vte/vteversion.h lib/libvte.la +lib/pkgconfig/pyvte.pc lib/pkgconfig/vte.pc lib/vte/decset lib/vte/interpret -lib/vte/iso8859mode -lib/vte/nativeecho lib/vte/osc lib/vte/slowcat -lib/vte/utf8echo -lib/vte/utf8mode -lib/vte/vterdb lib/vte/window libexec/gnome-pty-helper share/gtk-doc/html/vte/VteReaper.html @@ -114,6 +110,7 @@ share/locale/xh/LC_MESSAGES/vte.mo share/locale/zh_CN/LC_MESSAGES/vte.mo share/locale/zh_HK/LC_MESSAGES/vte.mo share/locale/zh_TW/LC_MESSAGES/vte.mo +share/pygtk/2.0/defs/vte.defs share/vte/termcap/xterm @dirrm share/vte/termcap @dirrm share/vte diff --git a/x11/vte/distinfo b/x11/vte/distinfo index 3c6656cc530..20f9709b33c 100644 --- a/x11/vte/distinfo +++ b/x11/vte/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.32 2008/10/24 20:23:50 wiz Exp $ +$NetBSD: distinfo,v 1.33 2009/03/15 16:47:29 jmcneill Exp $ -SHA1 (vte-0.17.4.tar.bz2) = fe4a3ec476c97d0f385249ee60edb12887b69575 -RMD160 (vte-0.17.4.tar.bz2) = 8fa3ccc35bc9ef8c204b058b180f532ba6fe7a1a -Size (vte-0.17.4.tar.bz2) = 1084847 bytes +SHA1 (vte-0.19.4.tar.bz2) = 94c8e21701ba01dc13c9d1c7055201a7545a2760 +RMD160 (vte-0.19.4.tar.bz2) = 46928a23bbca3db56f2563a85cd9c639dafd818d +Size (vte-0.19.4.tar.bz2) = 1102643 bytes SHA1 (patch-aa) = 6b722ecbbd9face7152feca39f1d323870d2a69a SHA1 (patch-ab) = 93146997c7fcb992db190c4c634fb98b05e61ec9 SHA1 (patch-ac) = 3b357bf9d1bca93c24f5b09dae1adec82323be0d SHA1 (patch-af) = 69ea7e022f6c495c3c9af681d05644b9d70e7bdc SHA1 (patch-ah) = 28cee2661439d7d6f1959ebf3c7d1b7b3fe0a764 -SHA1 (patch-ai) = d3edea00d1aa079f6ec9542b1d74ba97f9db4519 +SHA1 (patch-ai) = f2fe5969be0af12c8b4c88622ebe3dcb13f79fee diff --git a/x11/vte/patches/patch-ai b/x11/vte/patches/patch-ai index 3459429fe62..71033ec596c 100644 --- a/x11/vte/patches/patch-ai +++ b/x11/vte/patches/patch-ai @@ -1,21 +1,18 @@ -$NetBSD: patch-ai,v 1.1 2006/07/14 14:57:13 rillig Exp $ +$NetBSD: patch-ai,v 1.2 2009/03/15 16:47:29 jmcneill Exp $ -Assume that if CMSG_FIRSTHDR is not defined, struct msghdr.msg_control -does not exist either. Needed for Solaris 8. - ---- gnome-pty-helper/gnome-pty-helper.c.orig 2006-02-14 10:00:32.000000000 +0100 -+++ gnome-pty-helper/gnome-pty-helper.c 2006-07-14 01:38:57.548708903 +0200 -@@ -123,6 +123,7 @@ pass_fd (int client_fd, int fd) +--- gnome-pty-helper/gnome-pty-helper.c.orig 2008-11-27 19:13:04.000000000 -0500 ++++ gnome-pty-helper/gnome-pty-helper.c +@@ -121,6 +121,7 @@ pass_fd (int client_fd, int fd) msg.msg_iovlen = 1; msg.msg_name = NULL; msg.msg_namelen = 0; +#if defined(CMSG_FIRSTHDR) - msg.msg_control = (caddr_t) cmptr; - msg.msg_controllen = CONTROLLEN; + msg.msg_control = (caddr_t) cmsgbuf; + msg.msg_controllen = sizeof(cmsgbuf); -@@ -130,6 +131,7 @@ pass_fd (int client_fd, int fd) +@@ -129,6 +130,7 @@ pass_fd (int client_fd, int fd) cmptr->cmsg_type = SCM_RIGHTS; - cmptr->cmsg_len = CONTROLLEN; + cmptr->cmsg_len = CMSG_LEN(sizeof(int)); *(int *)CMSG_DATA (cmptr) = fd; +#endif |