Update to 0.10.11. Yep, a commit as long as your arm for a 0.00.01

version number bump.  Yeah, well, it took me a bit to even get it
to compile, one of those, "Hey, let's change the entire build
infrastructure for a minor bugfix!" things...

But hey now we're fully in-sync with Gnome 2.6.2.
This commit is contained in:
marcm 2004-08-01 06:10:09 +00:00
parent ca3b5569fc
commit 52d34cce2d
12 changed files with 108 additions and 202 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.4 2003/12/05 08:20:40 pvalchev Exp $
# $OpenBSD: Makefile,v 1.5 2004/08/01 06:10:09 marcm Exp $
COMMENT= "experimental terminal emulator"
COMMENT= "terminal emulatation library"
DISTNAME= vte-0.11.10
DISTNAME= vte-0.11.11
CATEGORIES= devel
HOMEPAGE= http://www.gnome.org/
@ -19,9 +19,8 @@ MASTER_SITES= ${MASTER_SITE_GNOME:=sources/vte/0.11/}
EXTRACT_SUFX= .tar.bz2
BUILD_DEPENDS= :pkgconfig->=0.14.0p1:devel/pkgconfig
LIB_DEPENDS= gdk-x11-2.0.0.0,gdk_pixbuf-2.0.0.0,gtk-x11-2.0.0.0::x11/gtk+2
LIB_DEPENDS= gdk-x11-2.0.0.8,gdk_pixbuf-2.0.0.8,gtk-x11-2.0.0.8::x11/gtk+2
#SEPARATE_BUILD= concurrent
USE_GMAKE= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
@ -29,6 +28,6 @@ CONFIGURE_ARGS+= --disable-gtk-doc
CONFIGURE_ARGS+= --disable-python
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
PKG_CONFIG_PATH="${LOCALBASE}/lib/pkgconfig:${X11BASE}/lib/pkgconfig"
PKG_CONFIG_PATH="${X11BASE}/lib/pkgconfig"
.include <bsd.port.mk>

View File

@ -1,3 +1,3 @@
MD5 (vte-0.11.10.tar.bz2) = 71facdedd477749908402a6931d36e64
RMD160 (vte-0.11.10.tar.bz2) = d25aba5fc863246bd6f32e47e53eea51047aa4cf
SHA1 (vte-0.11.10.tar.bz2) = 10fb64a786e925b45aa7c919595212d56441dd23
MD5 (vte-0.11.11.tar.bz2) = 4d7a3674df5b8be7f1adffa981c1fc3d
RMD160 (vte-0.11.11.tar.bz2) = cb37c4f38650e37c723c5565a11402f9af9f37cf
SHA1 (vte-0.11.11.tar.bz2) = 655a7e2a4310a13caf3853dc51f07ee3b8fe3622

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.1 2003/10/07 05:47:58 marcm Exp $
--- configure.orig 2003-06-16 14:50:24.000000000 -0700
+++ configure 2003-09-08 22:38:21.000000000 -0700
@@ -23732,19 +23732,10 @@ fi
$OpenBSD: patch-configure,v 1.2 2004/08/01 06:10:09 marcm Exp $
--- configure.orig Sat May 1 23:44:03 2004
+++ configure Sat Jul 24 23:15:53 2004
@@ -25114,19 +25114,10 @@ fi
rm -f conftest*
@ -20,4 +20,4 @@ $OpenBSD: patch-configure,v 1.1 2003/10/07 05:47:58 marcm Exp $
-_ACEOF
# Check whether --enable-deprecation or --disable-deprecation was given.

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-gnome-pty-helper_Makefile_in,v 1.2 2003/10/07 05:47:58 marcm Exp $
--- gnome-pty-helper/Makefile.in.orig 2003-06-16 14:50:27.000000000 -0700
+++ gnome-pty-helper/Makefile.in 2003-09-08 15:25:52.000000000 -0700
@@ -514,7 +514,7 @@ uninstall-am: uninstall-info-am uninstal
$OpenBSD: patch-gnome-pty-helper_Makefile_in,v 1.3 2004/08/01 06:10:09 marcm Exp $
--- gnome-pty-helper/Makefile.in.orig Sat May 1 23:44:07 2004
+++ gnome-pty-helper/Makefile.in Sat Jul 24 23:15:53 2004
@@ -515,7 +515,7 @@ uninstall-am: uninstall-info-am uninstal
install-exec-hook:

View File

@ -0,0 +1,23 @@
$OpenBSD: patch-gnome-pty-helper_configure,v 1.1 2004/08/01 06:10:09 marcm Exp $
--- gnome-pty-helper/configure.orig Sat Jul 24 23:59:52 2004
+++ gnome-pty-helper/configure Sun Jul 25 00:00:22 2004
@@ -6269,19 +6269,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"

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-ltmain_sh,v 1.3 2003/10/07 05:47:58 marcm Exp $
--- ltmain.sh.orig 2003-06-16 14:50:13.000000000 -0700
+++ ltmain.sh 2003-09-08 15:26:20.000000000 -0700
@@ -1290,6 +1290,17 @@ EOF
$OpenBSD: patch-ltmain_sh,v 1.4 2004/08/01 06:10:09 marcm Exp $
--- ltmain.sh.orig Sat May 1 23:43:48 2004
+++ ltmain.sh Sat Jul 24 23:15:53 2004
@@ -1374,6 +1374,17 @@ EOF
continue
;;
@ -19,10 +19,12 @@ $OpenBSD: patch-ltmain_sh,v 1.3 2003/10/07 05:47:58 marcm Exp $
-module)
module=yes
continue
@@ -1961,6 +1972,19 @@ EOF
@@ -2022,6 +2033,19 @@ EOF
newdlfiles="$newdlfiles $deplib"
fi
fi
continue
;;
+ continue
+ ;;
+ -pthread)
+ case $linkmode in
+ lib)
@ -34,49 +36,6 @@ $OpenBSD: patch-ltmain_sh,v 1.3 2003/10/07 05:47:58 marcm Exp $
+ finalize_deplibs="$deplib $finalize_deplibs"
+ ;;
+ esac
+ continue
+ ;;
%DEPLIBS%)
alldeplibs=yes
continue
@@ -5705,40 +5729,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = : && exit 0
- $echo "----------------------------------------------------------------------"
- $echo "Libraries have been installed in:"
- for libdir in $libdirs; do
- $echo " $libdir"
- done
- $echo
- $echo "If you ever happen to want to link against installed libraries"
- $echo "in a given directory, LIBDIR, you must either use libtool, and"
- $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
- $echo "flag during linking and do at least one of the following:"
- if test -n "$shlibpath_var"; then
- $echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
- $echo " during execution"
- fi
- if test -n "$runpath_var"; then
- $echo " - add LIBDIR to the \`$runpath_var' environment variable"
- $echo " during linking"
- fi
- if test -n "$hardcode_libdir_flag_spec"; then
- libdir=LIBDIR
- eval flag=\"$hardcode_libdir_flag_spec\"
-
- $echo " - use the \`$flag' linker flag"
- fi
- if test -n "$admincmds"; then
- $echo " - have your system administrator run these commands:$admincmds"
- fi
- if test -f /etc/ld.so.conf; then
- $echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
- fi
- $echo
- $echo "See any operating system documentation about shared libraries for"
- $echo "more information, such as the ld(1) and ld.so(8) manual pages."
- $echo "----------------------------------------------------------------------"
exit 0
;;
;;
%DEPLIBS%)

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-po_Makefile_in_in,v 1.1.1.1 2003/06/12 19:45:35 marcm Exp $
--- po/Makefile.in.in.orig Tue May 27 19:29:17 2003
+++ po/Makefile.in.in Tue May 27 19:29:35 2003
@@ -27,7 +27,7 @@ prefix = @prefix@
exec_prefix = @exec_prefix@
datadir = @datadir@
libdir = @libdir@
-localedir = $(libdir)/locale
+localedir = $(datadir)/locale
gnulocaledir = $(datadir)/locale
gettextsrcdir = $(datadir)/glib-2.0/gettext/po
subdir = po

View File

@ -0,0 +1,21 @@
$OpenBSD: patch-src_Makefile_in,v 1.1 2004/08/01 06:10:09 marcm Exp $
--- src/Makefile.in.orig Sat May 1 23:44:02 2004
+++ src/Makefile.in Sun Jul 25 00:07:17 2004
@@ -94,7 +94,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = -L./.libs @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
@@ -222,7 +222,7 @@ EXTRA_DIST = \
AM_CFLAGS = @VTE_CFLAGS@ @CFLAGS@ @X_CFLAGS@
-AM_LDFLAGS = @LDFLAGS@
+AM_LDFLAGS =
EXTRA_libvte_la_SOURCES = keysyms.c

View File

@ -1,14 +1,17 @@
$OpenBSD: patch-src_dumpkeys_c,v 1.3 2003/10/07 05:47:58 marcm Exp $
--- src/dumpkeys.c.orig 2003-04-23 19:50:54.000000000 -0700
+++ src/dumpkeys.c 2003-09-08 15:25:52.000000000 -0700
@@ -18,11 +18,11 @@
$OpenBSD: patch-src_dumpkeys_c,v 1.4 2004/08/01 06:10:09 marcm Exp $
--- src/dumpkeys.c.orig Thu Apr 29 18:16:53 2004
+++ src/dumpkeys.c Sat Jul 24 23:18:20 2004
@@ -18,6 +18,7 @@
#ident "$Id: patch-src_dumpkeys_c,v 1.3 2003/10/07 05:47:58 marcm Exp $"
#ident "$Id: patch-src_dumpkeys_c,v 1.4 2004/08/01 06:10:09 marcm Exp $"
#include "../config.h"
+#include <sys/types.h>
#ifdef HAVE_SYS_SELECT_H
#include <sys/select.h>
#endif
@@ -25,7 +26,6 @@
#include <sys/termios.h>
#endif
#include <sys/time.h>
-#include <sys/types.h>
#include <unistd.h>

View File

@ -1,14 +1,11 @@
OpenBSD$
--- src/pty.c.orig Thu May 29 22:06:01 2003
+++ src/pty.c Thu May 29 22:06:03 2003
@@ -48,6 +48,10 @@
--- 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
+#include "../gnome-pty-helper/config.h"
#include "../gnome-pty-helper/gnome-pty.h"
#endif
+#ifdef __OpenBSD__
+#define HAVE_RECVMSG 1
+#endif
+
#ifdef MSG_NOSIGNAL
#define PTY_RECVMSG_FLAGS MSG_NOSIGNAL
#else

View File

@ -1,3 +1,3 @@
@comment $OpenBSD: PFRAG.shared,v 1.2 2003/10/07 05:47:58 marcm Exp $
lib/libvte.so.5.1
@comment $OpenBSD: PFRAG.shared,v 1.3 2004/08/01 06:10:09 marcm Exp $
lib/libvte.so.8.0
DYNLIBDIR(%D/lib)

View File

@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST,v 1.4 2003/12/15 16:51:05 naddy Exp $
@comment $OpenBSD: PLIST,v 1.5 2004/08/01 06:10:09 marcm Exp $
bin/vte
include/vte/
include/vte/pty.h
include/vte/reaper.h
include/vte/vte.h
@ -7,6 +8,7 @@ include/vte/vteaccess.h
lib/libvte.a
lib/libvte.la
lib/pkgconfig/vte.pc
lib/vte/
lib/vte/decset
lib/vte/interpret
lib/vte/iso8859mode
@ -18,7 +20,9 @@ lib/vte/utf8mode
lib/vte/vterdb
lib/vte/window
libexec/gnome-pty-helper
@comment share/gtk-doc/html/vte/
share/locale/am/LC_MESSAGES/vte.mo
share/locale/ar/LC_MESSAGES/vte.mo
share/locale/az/LC_MESSAGES/vte.mo
share/locale/be/LC_MESSAGES/vte.mo
share/locale/bg/LC_MESSAGES/vte.mo
@ -29,11 +33,18 @@ share/locale/cy/LC_MESSAGES/vte.mo
share/locale/da/LC_MESSAGES/vte.mo
share/locale/de/LC_MESSAGES/vte.mo
share/locale/el/LC_MESSAGES/vte.mo
share/locale/en_CA/LC_MESSAGES/vte.mo
share/locale/en_GB/LC_MESSAGES/vte.mo
share/locale/es/LC_MESSAGES/vte.mo
share/locale/et/LC_MESSAGES/vte.mo
share/locale/eu/LC_MESSAGES/vte.mo
share/locale/fa/LC_MESSAGES/vte.mo
share/locale/fi/LC_MESSAGES/vte.mo
share/locale/fr/LC_MESSAGES/vte.mo
share/locale/ga/LC_MESSAGES/vte.mo
share/locale/gu/LC_MESSAGES/vte.mo
share/locale/he/LC_MESSAGES/vte.mo
share/locale/hr/LC_MESSAGES/vte.mo
share/locale/hu/LC_MESSAGES/vte.mo
share/locale/id/LC_MESSAGES/vte.mo
share/locale/is/LC_MESSAGES/vte.mo
@ -41,13 +52,17 @@ share/locale/it/LC_MESSAGES/vte.mo
share/locale/ja/LC_MESSAGES/vte.mo
share/locale/ko/LC_MESSAGES/vte.mo
share/locale/li/LC_MESSAGES/vte.mo
share/locale/lt/LC_MESSAGES/vte.mo
share/locale/lv/LC_MESSAGES/vte.mo
share/locale/mk/LC_MESSAGES/vte.mo
share/locale/ml/LC_MESSAGES/vte.mo
share/locale/mn/LC_MESSAGES/vte.mo
share/locale/ms/LC_MESSAGES/vte.mo
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/pa/LC_MESSAGES/vte.mo
share/locale/pl/LC_MESSAGES/vte.mo
share/locale/pt/LC_MESSAGES/vte.mo
share/locale/pt_BR/LC_MESSAGES/vte.mo
@ -62,109 +77,10 @@ share/locale/sv/LC_MESSAGES/vte.mo
share/locale/tr/LC_MESSAGES/vte.mo
share/locale/uk/LC_MESSAGES/vte.mo
share/locale/vi/LC_MESSAGES/vte.mo
share/locale/wa/LC_MESSAGES/vte.mo
share/locale/zh_CN/LC_MESSAGES/vte.mo
share/locale/zh_TW/LC_MESSAGES/vte.mo
share/vte/
share/vte/termcap/
share/vte/termcap/xterm
%%SHARED%%
@dirrm share/vte/termcap
@dirrm share/vte
@dirrm share/locale/zh_TW/LC_MESSAGES
@dirrm share/locale/zh_TW
@dirrm share/locale/zh_CN/LC_MESSAGES
@dirrm share/locale/zh_CN
@dirrm share/locale/vi/LC_MESSAGES
@dirrm share/locale/vi
@dirrm share/locale/uk/LC_MESSAGES
@dirrm share/locale/uk
@dirrm share/locale/tr/LC_MESSAGES
@dirrm share/locale/tr
@dirrm share/locale/sv/LC_MESSAGES
@dirrm share/locale/sv
@dirrm share/locale/sr@Latn/LC_MESSAGES
@dirrm share/locale/sr@Latn
@dirrm share/locale/sr/LC_MESSAGES
@dirrm share/locale/sr
@dirrm share/locale/sq/LC_MESSAGES
@dirrm share/locale/sq
@dirrm share/locale/sl/LC_MESSAGES
@dirrm share/locale/sl
@dirrm share/locale/sk/LC_MESSAGES
@dirrm share/locale/sk
@dirrm share/locale/ru/LC_MESSAGES
@dirrm share/locale/ru
@dirrm share/locale/ro/LC_MESSAGES
@dirrm share/locale/ro
@dirrm share/locale/pt_BR/LC_MESSAGES
@dirrm share/locale/pt_BR
@dirrm share/locale/pt/LC_MESSAGES
@dirrm share/locale/pt
@dirrm share/locale/pl/LC_MESSAGES
@dirrm share/locale/pl
@dirrm share/locale/no/LC_MESSAGES
@dirrm share/locale/no
@dirrm share/locale/nl/LC_MESSAGES
@dirrm share/locale/nl
@dirrm share/locale/ms/LC_MESSAGES
@dirrm share/locale/ms
@dirrm share/locale/mn/LC_MESSAGES
@dirrm share/locale/mn
@dirrm share/locale/ml/LC_MESSAGES
@dirrm share/locale/ml
@dirrm share/locale/mk/LC_MESSAGES
@dirrm share/locale/mk
@dirrm share/locale/lv/LC_MESSAGES
@dirrm share/locale/lv
@dirrm share/locale/li/LC_MESSAGES
@dirrm share/locale/li
@dirrm share/locale/ko/LC_MESSAGES
@dirrm share/locale/ko
@dirrm share/locale/ja/LC_MESSAGES
@dirrm share/locale/ja
@dirrm share/locale/it/LC_MESSAGES
@dirrm share/locale/it
@dirrm share/locale/is/LC_MESSAGES
@dirrm share/locale/is
@dirrm share/locale/id/LC_MESSAGES
@dirrm share/locale/id
@dirrm share/locale/hu/LC_MESSAGES
@dirrm share/locale/hu
@dirrm share/locale/he/LC_MESSAGES
@dirrm share/locale/he
@dirrm share/locale/fr/LC_MESSAGES
@dirrm share/locale/fr
@dirrm share/locale/fi/LC_MESSAGES
@dirrm share/locale/fi
@dirrm share/locale/fa/LC_MESSAGES
@dirrm share/locale/fa
@dirrm share/locale/es/LC_MESSAGES
@dirrm share/locale/es
@dirrm share/locale/el/LC_MESSAGES
@dirrm share/locale/el
@dirrm share/locale/de/LC_MESSAGES
@dirrm share/locale/de
@dirrm share/locale/da/LC_MESSAGES
@dirrm share/locale/da
@dirrm share/locale/cy/LC_MESSAGES
@dirrm share/locale/cy
@dirrm share/locale/cs/LC_MESSAGES
@dirrm share/locale/cs
@dirrm share/locale/ca/LC_MESSAGES
@dirrm share/locale/ca
@dirrm share/locale/bn/LC_MESSAGES
@dirrm share/locale/bn
@dirrm share/locale/bg/LC_MESSAGES
@dirrm share/locale/bg
@dirrm share/locale/be/LC_MESSAGES
@dirrm share/locale/be
@dirrm share/locale/az/LC_MESSAGES
@dirrm share/locale/az
@dirrm share/locale/am/LC_MESSAGES
@dirrm share/locale/am
@dirrm share/locale
@comment @exec mkdir -p %D/share/gtk-doc/html/vte
@comment @dirrm share/gtk-doc/html/vte
@comment @dirrm share/gtk-doc/html
@comment @dirrm share/gtk-doc
@dirrm lib/vte
@dirrm lib/pkgconfig
@dirrm include/vte