[Midnightbsd-cvs] mports: x11-toolkits/vte: .16.8

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Tue Aug 28 20:36:33 EDT 2007 

Log Message:
-----------
.16.8

Modified Files:
--------------
    mports/x11-toolkits/vte:
        Makefile (r1.1 -> r1.2)
        distinfo (r1.1 -> r1.2)
        pkg-plist (r1.1 -> r1.2)
    mports/x11-toolkits/vte/files:
        patch-configure (r1.1 -> r1.2)
        patch-gnome-pty-helper_Makefile.in (r1.1 -> r1.2)
        patch-gnome-pty-helper_configure (r1.1 -> r1.2)
        patch-src_pty.c (r1.1 -> r1.2)

Added Files:
-----------
    mports/x11-toolkits/vte/files:
        patch-config.h.in (r1.1)
        patch-gnome-pty-helper_gnome-utmp.c (r1.1)
        patch-python_Makefile.in (r1.1)
        patch-src_vteseq.c (r1.1)

Removed Files:
-------------
    mports/x11-toolkits/vte/files:
        patch-07_set_backspace_to_utf8

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/x11-toolkits/vte/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lx11-toolkits/vte/pkg-plist -Lx11-toolkits/vte/pkg-plist -u -r1.1 -r1.2
--- x11-toolkits/vte/pkg-plist
+++ x11-toolkits/vte/pkg-plist
@@ -6,7 +6,7 @@
 lib/libvte.a
 lib/libvte.la
 lib/libvte.so
-lib/libvte.so.4
+lib/libvte.so.9
 lib/vte/decset
 lib/vte/interpret
 lib/vte/iso8859mode
@@ -25,8 +25,10 @@
 share/locale/ar/LC_MESSAGES/vte.mo
 share/locale/az/LC_MESSAGES/vte.mo
 share/locale/be/LC_MESSAGES/vte.mo
+share/locale/be at latin/LC_MESSAGES/vte.mo
 share/locale/bg/LC_MESSAGES/vte.mo
 share/locale/bn/LC_MESSAGES/vte.mo
+share/locale/bn_IN/LC_MESSAGES/vte.mo
 share/locale/bs/LC_MESSAGES/vte.mo
 share/locale/ca/LC_MESSAGES/vte.mo
 share/locale/cs/LC_MESSAGES/vte.mo
@@ -66,12 +68,13 @@
 share/locale/mk/LC_MESSAGES/vte.mo
 share/locale/ml/LC_MESSAGES/vte.mo
 share/locale/mn/LC_MESSAGES/vte.mo
+share/locale/mr/LC_MESSAGES/vte.mo
 share/locale/ms/LC_MESSAGES/vte.mo
 share/locale/nb/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/oc/LC_MESSAGES/vte.mo
 share/locale/or/LC_MESSAGES/vte.mo
 share/locale/pa/LC_MESSAGES/vte.mo
 share/locale/pl/LC_MESSAGES/vte.mo
@@ -80,6 +83,7 @@
 share/locale/ro/LC_MESSAGES/vte.mo
 share/locale/ru/LC_MESSAGES/vte.mo
 share/locale/rw/LC_MESSAGES/vte.mo
+share/locale/si/LC_MESSAGES/vte.mo
 share/locale/sk/LC_MESSAGES/vte.mo
 share/locale/sl/LC_MESSAGES/vte.mo
 share/locale/sq/LC_MESSAGES/vte.mo
@@ -97,19 +101,35 @@
 share/locale/zh_CN/LC_MESSAGES/vte.mo
 share/locale/zh_HK/LC_MESSAGES/vte.mo
 share/locale/zh_TW/LC_MESSAGES/vte.mo
+ at dirrm share/gnome/vte/termcap
+ at dirrm share/gnome/vte
+ at dirrm lib/vte
+ at dirrm include/vte
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
+ at dirrmtry share/locale/xh/LC_MESSAGES
+ at dirrmtry share/locale/xh
 @dirrmtry share/locale/ug/LC_MESSAGES
 @dirrmtry share/locale/ug
+ at dirrmtry share/locale/si/LC_MESSAGES
+ at dirrmtry share/locale/si
+ at dirrmtry share/locale/rw/LC_MESSAGES
+ at dirrmtry share/locale/rw
+ at dirrmtry share/locale/oc/LC_MESSAGES
+ at dirrmtry share/locale/oc
+ at dirrmtry share/locale/mr/LC_MESSAGES
+ at dirrmtry share/locale/mr
+ at dirrmtry share/locale/mi/LC_MESSAGES
+ at dirrmtry share/locale/mi
 @dirrmtry share/locale/ky/LC_MESSAGES
 @dirrmtry share/locale/ky
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
+ at dirrmtry share/locale/bn_IN/LC_MESSAGES
+ at dirrmtry share/locale/bn_IN
+ at dirrmtry share/locale/be at latin/LC_MESSAGES
+ at dirrmtry share/locale/be at latin
 @dirrmtry share/locale/ang/LC_MESSAGES
 @dirrmtry share/locale/ang
- at dirrm share/gnome/vte/termcap
- at dirrm share/gnome/vte
- at dirrm lib/vte
- at dirrm include/vte
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/x11-toolkits/vte/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lx11-toolkits/vte/Makefile -Lx11-toolkits/vte/Makefile -u -r1.1 -r1.2
--- x11-toolkits/vte/Makefile
+++ x11-toolkits/vte/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	vte
-PORTVERSION=	0.12.2
+PORTVERSION=	0.16.8
 PORTREVISION?=	0
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -23,21 +23,24 @@
 
 USE_GMAKE=	yes
 USE_BISON=	yes
-USE_X_PREFIX=	yes
-INSTALLS_SHLIB=	yes
+USE_XLIB=	yes
+USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_GETTEXT=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20 ltverhack referencehack
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
 		BSD_PTHREAD_LIBS="${PTHREAD_LIBS}"
-CONFIGURE_ARGS=	--disable-python
+CONFIGURE_ARGS=	--disable-python \
+		--disable-freetypetest
 
+.if !defined(MASTERDIR)
 OPTIONS=	GLX	"Enable support for DRI/GLX rendering" off
+.endif
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_GLX)
+.if defined(WITH_GLX) && !defined(MASTERDIR)
 CONFIGURE_ARGS+=	--with-glX
 USE_GL=			yes
 .endif
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/x11-toolkits/vte/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lx11-toolkits/vte/distinfo -Lx11-toolkits/vte/distinfo -u -r1.1 -r1.2
--- x11-toolkits/vte/distinfo
+++ x11-toolkits/vte/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/vte-0.12.2.tar.bz2) = 7cb1bd6ca528bc4db5ec685549fd3eb1
-SHA256 (gnome2/vte-0.12.2.tar.bz2) = 41d22c945960feb1a924f58d2d237db2fbd1920cc48768ae0b4ac762245fcffb
-SIZE (gnome2/vte-0.12.2.tar.bz2) = 974551
+MD5 (gnome2/vte-0.16.8.tar.bz2) = 65344de3023c41c8dda2b35a415bf969
+SHA256 (gnome2/vte-0.16.8.tar.bz2) = 1dc06ad4224c18061b000de0435b81b7c249215da4163edecb62a8d46090098f
+SIZE (gnome2/vte-0.16.8.tar.bz2) = 1112410
--- x11-toolkits/vte/files/patch-07_set_backspace_to_utf8
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/vte.c.orig	2004-12-20 00:57:39 -0800
-+++ src/vte.c	2004-12-20 00:57:44 -0800
-@@ -7125,7 +7125,11 @@
- 		break;
- 	default:
- 		if (pid != 0) {
-+			char *codeset;
- 			terminal->pvt->pty_master = i;
-+			g_get_charset(&codeset);
-+			_vte_pty_set_utf8(terminal->pvt->pty_master,
-+					  (strcmp(codeset, "UTF-8") == 0));
- 		}
- 	}
-
Index: patch-gnome-pty-helper_Makefile.in
===================================================================
RCS file: /home/cvs/mports/x11-toolkits/vte/files/patch-gnome-pty-helper_Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lx11-toolkits/vte/files/patch-gnome-pty-helper_Makefile.in -Lx11-toolkits/vte/files/patch-gnome-pty-helper_Makefile.in -u -r1.1 -r1.2
--- x11-toolkits/vte/files/patch-gnome-pty-helper_Makefile.in
+++ x11-toolkits/vte/files/patch-gnome-pty-helper_Makefile.in
@@ -1,23 +1,23 @@
---- gnome-pty-helper/Makefile.in.orig	Mon Jun  2 20:23:02 2003
-+++ gnome-pty-helper/Makefile.in	Mon Jun  2 20:26:54 2003
-@@ -65,6 +65,7 @@
+--- gnome-pty-helper/Makefile.in.orig	2007-07-29 17:20:13.000000000 -0400
++++ gnome-pty-helper/Makefile.in	2007-07-29 17:25:47.000000000 -0400
+@@ -107,6 +107,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_P
  LDFLAGS = @LDFLAGS@
  LIBOBJS = @LIBOBJS@
  LIBS = @LIBS@
 +BSD_PTHREAD_LIBS = @BSD_PTHREAD_LIBS@
  LTLIBOBJS = @LTLIBOBJS@
  MAINT = @MAINT@
- MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-@@ -217,7 +218,7 @@
+ MAKEINFO = @MAKEINFO@
+@@ -271,7 +272,7 @@ clean-libexecPROGRAMS:
  	-test -z "$(libexec_PROGRAMS)" || rm -f $(libexec_PROGRAMS)
  gnome-pty-helper$(EXEEXT): $(gnome_pty_helper_OBJECTS) $(gnome_pty_helper_DEPENDENCIES) 
  	@rm -f gnome-pty-helper$(EXEEXT)
--	$(LINK) $(gnome_pty_helper_LDFLAGS) $(gnome_pty_helper_OBJECTS) $(gnome_pty_helper_LDADD) $(LIBS)
-+	$(LINK) $(gnome_pty_helper_LDFLAGS) $(gnome_pty_helper_OBJECTS) $(gnome_pty_helper_LDADD) $(LIBS) $(BSD_PTHREAD_LIBS)
+-	$(LINK) $(gnome_pty_helper_OBJECTS) $(gnome_pty_helper_LDADD) $(LIBS)
++	$(LINK) $(gnome_pty_helper_OBJECTS) $(gnome_pty_helper_LDADD) $(LIBS) $(BSD_PTHREAD_LIBS)
  
  mostlyclean-compile:
- 	-rm -f *.$(OBJEXT) core *.core
-@@ -514,8 +515,8 @@
+ 	-rm -f *.$(OBJEXT)
+@@ -584,8 +585,8 @@ uninstall-am: uninstall-libexecPROGRAMS
  
  
  install-exec-hook:
--- /dev/null
+++ 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
+ 
Index: patch-src_pty.c
===================================================================
RCS file: /home/cvs/mports/x11-toolkits/vte/files/patch-src_pty.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lx11-toolkits/vte/files/patch-src_pty.c -Lx11-toolkits/vte/files/patch-src_pty.c -u -r1.1 -r1.2
--- x11-toolkits/vte/files/patch-src_pty.c
+++ x11-toolkits/vte/files/patch-src_pty.c
@@ -1,19 +1,10 @@
---- src/pty.c.orig	Tue Jun  3 15:54:15 2003
-+++ src/pty.c	Wed Apr  7 02:55:57 2004
-@@ -45,6 +45,7 @@
- #include "pty.h"
+--- src/pty.c.orig	Tue Feb 13 16:24:15 2007
++++ src/pty.c	Tue Feb 13 16:29:15 2007
+@@ -271,6 +271,7 @@ _vte_pty_run_on_pty (struct vte_pty_chil
+ 		     GPid *pid, GError **error)
+ {
+ 	gboolean ret = TRUE;
++	extern char **environ;
+ 	GError *local_error = NULL;
  
- #ifdef VTE_USE_GNOME_PTY_HELPER
-+#include "../gnome-pty-helper/config.h"
- #include "../gnome-pty-helper/gnome-pty.h"
- #endif
- 
-@@ -709,6 +710,8 @@
- #ifdef HAVE_GETPT
- 	/* Call the system's function for allocating a pty. */
- 	fd = getpt();
-+#elif defined(HAVE_POSIX_OPENPT)
-+	fd = posix_openpt(O_RDWR | O_NOCTTY);
- #else
- 	/* Try to allocate a pty by accessing the pty master multiplex. */
- 	fd = open("/dev/ptmx", O_RDWR | O_NOCTTY);
+ 	if (command != NULL) {
--- /dev/null
+++ x11-toolkits/vte/files/patch-python_Makefile.in
@@ -0,0 +1,19 @@
+--- python/Makefile.in.orig	Tue Feb 27 12:46:42 2007
++++ python/Makefile.in	Tue Feb 27 12:47:11 2007
+@@ -61,7 +61,6 @@
+ LTLIBRARIES = $(pythonsiteexec_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+ @BUILD_PYTHON_MODULES_TRUE at vtemodule_la_DEPENDENCIES =  \
+- at 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) \
+@@ -303,7 +302,7 @@
+ @BUILD_PYTHON_MODULES_TRUE at CLEANFILES = vte.c
+ @BUILD_PYTHON_MODULES_TRUE at vtemodule_la_CFLAGS = $(VTE_CFLAGS) $(X_CFLAGS) $(PYTHON_INCLUDES) $(PYGTK_CFLAGS)
+ @BUILD_PYTHON_MODULES_TRUE at vtemodule_la_SOURCES = vtemodule.c
+- at BUILD_PYTHON_MODULES_TRUE@vtemodule_la_LIBADD = $(top_builddir)/src/libvte.la $(LIBS) $(PYGTK_LIBS) $(VTE_LIBS) $(X_LIBS)
++ at BUILD_PYTHON_MODULES_TRUE@vtemodule_la_LIBADD = -lvte $(LIBS) $(PYGTK_LIBS) $(VTE_LIBS) $(X_LIBS)
+ @BUILD_PYTHON_MODULES_TRUE at vtemodule_la_LDFLAGS = -module -avoid-version -export-symbols-regex initvte
+ @BUILD_PYTHON_MODULES_TRUE at nodist_vtemodule_la_SOURCES = vte.c
+ all: all-am
Index: patch-configure
===================================================================
RCS file: /home/cvs/mports/x11-toolkits/vte/files/patch-configure,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lx11-toolkits/vte/files/patch-configure -Lx11-toolkits/vte/files/patch-configure -u -r1.1 -r1.2
--- x11-toolkits/vte/files/patch-configure
+++ x11-toolkits/vte/files/patch-configure
@@ -1,31 +1,11 @@
---- configure.orig	Tue Aug 23 20:29:13 2005
-+++ configure	Tue Aug 23 20:30:09 2005
-@@ -26765,10 +26765,6 @@
- rm -f conftest*
+--- configure.orig	Tue Feb 13 16:22:38 2007
++++ configure	Tue Feb 13 16:23:19 2007
+@@ -24887,7 +24887,7 @@ fi
  
  
--cat >>confdefs.h <<\_ACEOF
--#define _XOPEN_SOURCE_EXTENDED 1
--_ACEOF
--
  
- cat >>confdefs.h <<\_ACEOF
- #define _XOPEN_SOURCE 1
-@@ -27067,7 +27063,7 @@
- 
- 
- 
--for ac_func in cfmakeraw getpgid getpt grantpt unlockpt ptsname ptsname_r
-+for ac_func in cfmakeraw getpgid getpt posix_openpt grantpt unlockpt ptsname ptsname_r
+-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=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
  echo "$as_me:$LINENO: checking for $ac_func" >&5
-@@ -29400,7 +29396,7 @@
- 
- 
- cat >>confdefs.h <<_ACEOF
--#define LOCALEDIR "$mydatadir/locale"
-+#define LOCALEDIR "$prefix/share/locale"
- _ACEOF
- 
- 
Index: patch-gnome-pty-helper_configure
===================================================================
RCS file: /home/cvs/mports/x11-toolkits/vte/files/patch-gnome-pty-helper_configure,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lx11-toolkits/vte/files/patch-gnome-pty-helper_configure -Lx11-toolkits/vte/files/patch-gnome-pty-helper_configure -u -r1.1 -r1.2
--- x11-toolkits/vte/files/patch-gnome-pty-helper_configure
+++ x11-toolkits/vte/files/patch-gnome-pty-helper_configure
@@ -1,10 +1,19 @@
---- gnome-pty-helper/configure.orig	Mon Jun  2 20:27:32 2003
-+++ gnome-pty-helper/configure	Mon Jun  2 20:28:06 2003
-@@ -6318,6 +6318,7 @@
- s, at ECHO_N@,$ECHO_N,;t t
- s, at ECHO_T@,$ECHO_T,;t t
- s, at LIBS@,$LIBS,;t t
-+s, at BSD_PTHREAD_LIBS@,$BSD_PTHREAD_LIBS,;t t
- s, at INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
- s, at INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
- s, at INSTALL_DATA@,$INSTALL_DATA,;t t
+--- gnome-pty-helper/configure.orig	2007-07-29 17:28:10.000000000 -0400
++++ gnome-pty-helper/configure	2007-07-29 17:29:30.000000000 -0400
+@@ -8408,6 +8408,7 @@ ECHO_C!$ECHO_C$ac_delim
+ ECHO_N!$ECHO_N$ac_delim
+ ECHO_T!$ECHO_T$ac_delim
+ LIBS!$LIBS$ac_delim
++BSD_PTHREAD_LIBS!$BSD_PTHREAD_LIBS$ac_delim
+ build_alias!$build_alias$ac_delim
+ host_alias!$host_alias$ac_delim
+ target_alias!$target_alias$ac_delim
+@@ -8470,7 +8471,7 @@ LIBOBJS!$LIBOBJS$ac_delim
+ LTLIBOBJS!$LTLIBOBJS$ac_delim
+ _ACEOF
+ 
+-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 94; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 95; then
+     break
+   elif $ac_last_try; then
+     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
--- /dev/null
+++ x11-toolkits/vte/files/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);
--- /dev/null
+++ 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
+

More information about the Midnightbsd-cvs mailing list