diff --git a/x11/gtk-vnc/Makefile b/x11/gtk-vnc/Makefile index b36eceda33d..fad7a60521a 100644 --- a/x11/gtk-vnc/Makefile +++ b/x11/gtk-vnc/Makefile @@ -1,11 +1,10 @@ -# $OpenBSD: Makefile,v 1.22 2010/10/24 09:23:34 landry Exp $ +# $OpenBSD: Makefile,v 1.23 2010/11/05 13:52:59 ajacoutot Exp $ COMMENT-main= VNC viewer widget for GTK COMMENT-plugin= gtk-vnc browser plugin GNOME_PROJECT= gtk-vnc -GNOME_VERSION= 0.4.1 -REVISION= 2 +GNOME_VERSION= 0.4.2 PKGNAME-main= ${DISTNAME} PKGNAME-plugin= gtk-vnc-plugin-${GNOME_VERSION} @@ -33,20 +32,23 @@ WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \ glib-2.0 gmodule-2.0 gobject-2.0 gpg-error gthread-2.0 \ gtk-x11-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 \ pcre pixman-1 png tasn1 z pthread-stubs xcb xcb-render \ - xcb-render-util - -WANTLIB-main= ${WANTLIB} c ffi pthread gnutls.>=13 sasl2.>=2 + GL Xxf86vm drm xcb-shm MULTI_PACKAGES= -main -plugin -BUILD_DEPENDS= ${RUN_DEPENDS} -BUILD_DEPENDS+= :xulrunner-devel->=1.9.1:devel/xulrunner/1.9,-devel -RUN_DEPENDS= ::x11/py-gtk2 +BUILD_DEPENDS= ${RUN_DEPENDS} \ + ::textproc/p5-Text-CSV \ + :xulrunner-devel->=1.9.1:devel/xulrunner/1.9,-devel + LIB_DEPENDS= ::security/gnutls \ ::security/cyrus-sasl2 + +RUN_DEPENDS-main= ::x11/py-gtk2 +WANTLIB-main += ${WANTLIB} c ffi pthread gnutls.>=13 sasl2.>=2 + LIB_DEPENDS-plugin= ${LIB_DEPENDS} \ ::${BASE_PKGPATH} -WANTLIB-plugin= ${WANTLIB} gvnc-1.0 gtk-vnc-1.0 gnutls sasl2 +WANTLIB-plugin += ${WANTLIB} gvnc-1.0 gtk-vnc-1.0 gnutls sasl2 CONFIGURE_STYLE= gnu CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ diff --git a/x11/gtk-vnc/distinfo b/x11/gtk-vnc/distinfo index f3620ddfc15..86cebf49259 100644 --- a/x11/gtk-vnc/distinfo +++ b/x11/gtk-vnc/distinfo @@ -1,5 +1,5 @@ -MD5 (gtk-vnc-0.4.1.tar.bz2) = YQM6CwEw4eBKi8JUZWftjA== -RMD160 (gtk-vnc-0.4.1.tar.bz2) = KYcrtM01KJkw+PE2sHVdWCcxstw= -SHA1 (gtk-vnc-0.4.1.tar.bz2) = ROlKQwlKQGUVB9+WKKOdfawhew4= -SHA256 (gtk-vnc-0.4.1.tar.bz2) = CVrnyY3boNs5hFtRa0llGhNMfti0XM0C7Ruj/WZkW1c= -SIZE (gtk-vnc-0.4.1.tar.bz2) = 536411 +MD5 (gtk-vnc-0.4.2.tar.bz2) = aP3rcYRMSdXVq08yy8i92w== +RMD160 (gtk-vnc-0.4.2.tar.bz2) = ul2Bo+9LbW6wMiv9xRAU3zjubHs= +SHA1 (gtk-vnc-0.4.2.tar.bz2) = iqdru2pHlR1GkuuxrCQfp7O9ou8= +SHA256 (gtk-vnc-0.4.2.tar.bz2) = lulItimEoaOjL9g3k/tkXEk8G8k7MD64Meyv7gGpVtI= +SIZE (gtk-vnc-0.4.2.tar.bz2) = 438062 diff --git a/x11/gtk-vnc/patches/patch-configure b/x11/gtk-vnc/patches/patch-configure index 7a071a7d34d..ad2b7dcbbd4 100644 --- a/x11/gtk-vnc/patches/patch-configure +++ b/x11/gtk-vnc/patches/patch-configure @@ -1,16 +1,16 @@ -$OpenBSD: patch-configure,v 1.7 2010/07/14 11:11:18 ajacoutot Exp $ ---- configure.orig Wed Jul 14 12:28:30 2010 -+++ configure Wed Jul 14 12:52:29 2010 -@@ -2788,7 +2788,7 @@ for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin +$OpenBSD: patch-configure,v 1.8 2010/11/05 13:52:59 ajacoutot Exp $ +--- configure.orig Fri Nov 5 12:55:22 2010 ++++ configure Fri Nov 5 13:22:20 2010 +@@ -2712,7 +2712,7 @@ for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. -- for ac_prog in mkdir gmkdir; do -+ for ac_prog in mkdir ; do +- for ac_prog in mkdir gmkdir; do ++ for ac_prog in mkdir; do for ac_exec_ext in '' $ac_executable_extensions; do { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( -@@ -10576,7 +10576,6 @@ openbsd*) +@@ -10136,7 +10136,6 @@ openbsd*) *) need_version=no ;; esac library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' @@ -18,7 +18,7 @@ $OpenBSD: patch-configure,v 1.7 2010/07/14 11:11:18 ajacoutot Exp $ shlibpath_var=LD_LIBRARY_PATH if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then case $host_os in -@@ -26130,6 +26129,12 @@ case "$host" in +@@ -13143,6 +13142,12 @@ case "$host" in NO_UNDEFINED_LDFLAGS="-no-undefined" ;; diff --git a/x11/gtk-vnc/patches/patch-gnulib_tests_Makefile_in b/x11/gtk-vnc/patches/patch-gnulib_tests_Makefile_in deleted file mode 100644 index 204b16367ae..00000000000 --- a/x11/gtk-vnc/patches/patch-gnulib_tests_Makefile_in +++ /dev/null @@ -1,26 +0,0 @@ -$OpenBSD: patch-gnulib_tests_Makefile_in,v 1.5 2010/07/14 11:11:18 ajacoutot Exp $ - -Don't bother running these two useless (and failing) tests. - ---- gnulib/tests/Makefile.in.orig Wed Jul 14 12:28:32 2010 -+++ gnulib/tests/Makefile.in Wed Jul 14 12:52:29 2010 -@@ -52,7 +52,7 @@ TESTS = test-alloca-opt$(EXEEXT) test-arpa_inet$(EXEEX - test-stdbool$(EXEEXT) test-stdint$(EXEEXT) test-stdio$(EXEEXT) \ - test-stdlib$(EXEEXT) test-sys_socket$(EXEEXT) \ - test-unistd$(EXEEXT) test-vasnprintf$(EXEEXT) \ -- test-vc-list-files-git.sh test-wchar$(EXEEXT) -+ test-wchar$(EXEEXT) - noinst_PROGRAMS = - check_PROGRAMS = test-alloca-opt$(EXEEXT) test-arpa_inet$(EXEEXT) \ - test-errno$(EXEEXT) test-getaddrinfo$(EXEEXT) \ -@@ -675,8 +675,8 @@ EXTRA_DIST = test-alloca-opt.c test-arpa_inet.c test-e - test-getaddrinfo.c intprops.h test-netinet_in.c \ - test-snprintf.c test-stdbool.c test-stdint.c test-stdio.c \ - test-stdlib.c test-sys_socket.c test-unistd.c \ -- test-vasnprintf.c test-vc-list-files-git.sh \ -- test-vc-list-files-cvs.sh test-wchar.c -+ test-vasnprintf.c \ -+ test-wchar.c - BUILT_SOURCES = - SUFFIXES = - MOSTLYCLEANFILES = core *.stackdump diff --git a/x11/gtk-vnc/patches/patch-plugin_Makefile_in b/x11/gtk-vnc/patches/patch-plugin_Makefile_in deleted file mode 100644 index 76e0a700b96..00000000000 --- a/x11/gtk-vnc/patches/patch-plugin_Makefile_in +++ /dev/null @@ -1,41 +0,0 @@ -$OpenBSD: patch-plugin_Makefile_in,v 1.7 2010/07/14 11:11:18 ajacoutot Exp $ ---- plugin/Makefile.in.orig Wed Jul 14 12:28:32 2010 -+++ plugin/Makefile.in Wed Jul 14 12:52:29 2010 -@@ -545,7 +545,7 @@ target_alias = @target_alias@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --@ENABLE_PLUGIN_TRUE@plugindir = $(libdir)/mozilla/plugins -+@ENABLE_PLUGIN_TRUE@plugindir = $(PREFIX)/lib/mozilla-plugins - @ENABLE_PLUGIN_TRUE@plugin_LTLIBRARIES = gtk-vnc-plugin.la - @ENABLE_PLUGIN_TRUE@gtk_vnc_plugin_la_SOURCES = \ - @ENABLE_PLUGIN_TRUE@ gtk-vnc-plugin.c gtk-vnc-plugin.h npshell.c npunix.c -@@ -599,7 +599,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4 - $(am__aclocal_m4_deps): - install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ test -z "$(plugindir)" || $(MKDIR_P) "$(plugindir)" - @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -607,8 +607,8 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \ -- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(plugindir)'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(plugindir)"; \ - } - - uninstall-pluginLTLIBRARIES: -@@ -782,7 +782,7 @@ check: check-am - @ENABLE_PLUGIN_FALSE@all-local: - all-am: Makefile $(LTLIBRARIES) all-local - installdirs: -- for dir in "$(DESTDIR)$(plugindir)"; do \ -+ for dir in "$(plugindir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done - install: install-am diff --git a/x11/gtk-vnc/patches/patch-plugin_npshell_c b/x11/gtk-vnc/patches/patch-plugin_npshell_c index 6108d914427..2573f889698 100644 --- a/x11/gtk-vnc/patches/patch-plugin_npshell_c +++ b/x11/gtk-vnc/patches/patch-plugin_npshell_c @@ -1,6 +1,8 @@ -$OpenBSD: patch-plugin_npshell_c,v 1.1 2010/10/24 09:23:34 landry Exp $ +$OpenBSD: patch-plugin_npshell_c,v 1.2 2010/11/05 13:52:59 ajacoutot Exp $ + Don't call NPN_GetValue with NPNVToolkit. For unknown reasons this doesn't work with xl 1.9. + --- plugin/npshell.c.orig Wed Jul 14 12:28:15 2010 +++ plugin/npshell.c Sun Oct 24 01:18:58 2010 @@ -81,7 +81,7 @@ Contributor(s): Adobe Systems Incorporated. diff --git a/x11/gtk-vnc/patches/patch-plugin_npunix_c b/x11/gtk-vnc/patches/patch-plugin_npunix_c index 88d34865c67..42960394d8d 100644 --- a/x11/gtk-vnc/patches/patch-plugin_npunix_c +++ b/x11/gtk-vnc/patches/patch-plugin_npunix_c @@ -1,6 +1,8 @@ -$OpenBSD: patch-plugin_npunix_c,v 1.1 2010/10/24 09:23:34 landry Exp $ +$OpenBSD: patch-plugin_npunix_c,v 1.2 2010/11/05 13:52:59 ajacoutot Exp $ + grab npunix.c from ffx 3.6.11 tarball -with NPP_NewStream call still commented out.. +with NPP_NewStream call still commented out... + --- plugin/npunix.c.orig Wed Jul 14 12:28:15 2010 +++ plugin/npunix.c Sun Oct 24 10:40:26 2010 @@ -54,11 +54,9 @@ diff --git a/x11/gtk-vnc/pkg/PLIST-main b/x11/gtk-vnc/pkg/PLIST-main index d06f66b2604..0d5ce69fea0 100644 --- a/x11/gtk-vnc/pkg/PLIST-main +++ b/x11/gtk-vnc/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.4 2010/07/12 09:31:51 ajacoutot Exp $ +@comment $OpenBSD: PLIST-main,v 1.5 2010/11/05 13:52:59 ajacoutot Exp $ @pkgpath ${BASE_PKGPATH} @bin bin/gvnccapture @bin bin/gvncviewer @@ -29,6 +29,8 @@ lib/python${MODPY_VERSION}/site-packages/gtkvnc.la lib/python${MODPY_VERSION}/site-packages/gtkvnc.so @man man/man1/gvnccapture.1 share/locale/ca/LC_MESSAGES/gtk-vnc.mo +share/locale/ca@valencia/LC_MESSAGES/gtk-vnc.mo +share/locale/cs/LC_MESSAGES/gtk-vnc.mo share/locale/da/LC_MESSAGES/gtk-vnc.mo share/locale/de/LC_MESSAGES/gtk-vnc.mo share/locale/el/LC_MESSAGES/gtk-vnc.mo @@ -40,10 +42,13 @@ share/locale/gl/LC_MESSAGES/gtk-vnc.mo share/locale/hu/LC_MESSAGES/gtk-vnc.mo share/locale/it/LC_MESSAGES/gtk-vnc.mo share/locale/ja/LC_MESSAGES/gtk-vnc.mo +share/locale/nb/LC_MESSAGES/gtk-vnc.mo +share/locale/nds/LC_MESSAGES/gtk-vnc.mo share/locale/pa/LC_MESSAGES/gtk-vnc.mo share/locale/pl/LC_MESSAGES/gtk-vnc.mo share/locale/pt/LC_MESSAGES/gtk-vnc.mo share/locale/pt_BR/LC_MESSAGES/gtk-vnc.mo +share/locale/ro/LC_MESSAGES/gtk-vnc.mo share/locale/ru/LC_MESSAGES/gtk-vnc.mo share/locale/sl/LC_MESSAGES/gtk-vnc.mo share/locale/sv/LC_MESSAGES/gtk-vnc.mo diff --git a/x11/gtk-vnc/pkg/PLIST-plugin b/x11/gtk-vnc/pkg/PLIST-plugin index 2214bd02f21..c14c6b674fd 100644 --- a/x11/gtk-vnc/pkg/PLIST-plugin +++ b/x11/gtk-vnc/pkg/PLIST-plugin @@ -1,7 +1,6 @@ -@comment $OpenBSD: PLIST-plugin,v 1.3 2008/12/11 12:36:31 jasper Exp $ -lib/mozilla-plugins/ -@comment lib/mozilla-plugins/gtk-vnc-plugin.a -@comment lib/mozilla-plugins/gtk-vnc-plugin.la -lib/mozilla-plugins/gtk-vnc-plugin.so +@comment $OpenBSD: PLIST-plugin,v 1.4 2010/11/05 13:52:59 ajacoutot Exp $ +lib/mozilla/ +lib/mozilla/plugins/ +lib/mozilla/plugins/gtk-vnc-plugin.so share/examples/gtk-vnc/ share/examples/gtk-vnc/README.plugin