Update to 0.5.1

* Convert to use gtk2 and gtk3 (latest vinagre uses gtk3,
  and python binding requires gtk2)
* Set python option as deafult
* Add pulseaudio option (functionality is not tested)
* plugin option is broken like before

Changelog:

July 12, 2012: Release 0.5.1
============================

New features:

 o New API for connecting to a GSocketAddress * object
 o New API to allow specification of a hostname with
   a pre-opened file descriptor
 o Support for UNIX domain sockets in gvncviewer demo
 o More translations

Bug fixes:

 o Fix building with newer glibc-headers and -O0
 o Fix GIR building by linking against libgvnc
   from builddir
 o Fix deprecation warnings when building against
   glib >= 2.32
 o Switch to using mingw64 toolchain for Win32 builds
 o Fix introspection of key grab APIs
 o Ensure debugging works with GLib >= 2.32
 o Allow explicit control over pulseaudio building
 o Add check for Perl  Text::CSV when building from GIT
 o Fix POD syntax in gvnccapture man page
 o Reduce excessive stack usage in vncconnection.c

Dec 21, 2011: Release 0.5.0
===========================

New features:

 o QEMU audio extension support

Bug fixes:

 o Avoid deprecated GNUTLS functions
 o Allow access to VncConnection object inside VncDisplay
 o Don't override PKG_CONFIG_PATH when building GIR files
 o Death to all TABs
 o General code style/indentation cleanup
 o Fix memory leak in keymap code
 o Fix mapping of shift key in Windows


Nov 10, 2011: Release 0.4.4
===========================

New features:

 o Vala bindings

Bug fixes:

 o Missing OS-X keymapping for the letter 'A'
 o Update Turkish/Esperanto/Korean/Slovak translations
 o Mapping for Left Control / Alt keys
 o Fix leak of string list in grab sequence string
 o Fix introspection for vnc_display_get_pixbuf
 o Fix GTK3 build on Mingw32
 o Improved log messages for TLS auth subtypes


Feb 18, 2011: Release 0.4.3
===========================

New features:

 o None

Bug fixes:

 o Fix crash in pointer motion event handler
 o Fix crash in vnc_display_get_pixbuf
 o Fix crash in TLS cleanup code
 o Fix frambuffer boundary checks
 o Improve drawing performance with server side pixmap
 o Fix performance degradation due to leaked GSource
 o Fix setting of 'shared' connection flag
 o Make pointer warp boundary detection more robust
 o Adapt keymap code to build with GDK3 multiple displays
 o Remove use of gdk_drawable calls to fix GTK3

Code cleanup:

 o Remove need for Text::CSV perl module at build time

Nov  3, 2010: Release 0.4.2
===========================

New features:

 o OS-X VNC authentiction scheme
 o Add API to query library version

Bug fixes:

 o Disable extended key events if display keymap
   cannot be determined
 o Rewritten keymap code to work on non-Xorg
   servers and native OS-X/Win32 GTK backends.
 o Many more language translations
 o Strict bounds checking on all framebuffer updates
 o Fixed parameter for vnc-server-cut-text signal
 o Fixed build with latest GTK3 development snapshot

Code cleanup:

 o Switched over to GIO for socket connections
 o Removed all use of GNULIB now GIO handles all
   portability issues with sockets.
 o Mandate use of Cairo for all drawing, removing
   any use of GdkPixmap, GdkImage, GdkBitmap.

Jul 14, 2010: Release 0.4.1
===========================

Bug fixes:

 o Fix test suite execution
 o Ensure builds against GTK3 get a separate library soname,
   pkg-config file and include directory to allow parallel
   install with GTK2 builds.

Jul 11, 2010: Release 0.4.0
===========================

Bug fixes:

 o Fix protocol greeting so wireshark detects stream
 o Fix build with GSEAL
 o Try next DNS address after any connect failure
 o Plugin build with newer mozilla
 o Fix linkage to libgpg-error
 o Fix linker flags on solaris
 o Fix gcrypt threading callbacks
 o Fix multiple memory leaks
 o Remove use of PATH_MAX to fix Hurd

New features:

 o Refactored gvnc module to provide a full GObject
   for interacting with the RFB protcol.
 o Create a libgvnc.so for non-GTK related APIs for
   dealing with RFB protcol
 o Add gvnccapture command line tool for screenshot
   capture
 o Many updated translations

11 files changed, 160 insertions, 91 deletions

diff --git a/net/gtk-vnc/Makefile b/net/gtk-vnc/Makefile
index 8c15dff9871..30a1d416535 100644
--- a/net/gtk-vnc/Makefile
+++ b/net/gtk-vnc/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.21 2012/07/02 19:23:29 drochner Exp $
+# $NetBSD: Makefile,v 1.22 2012/08/20 11:34:58 ryoon Exp $
 #
 
-DISTNAME=	gtk-vnc-0.3.10
-PKGREVISION=	15
+DISTNAME=	gtk-vnc-0.5.1
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtk-vnc/0.3/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtk-vnc/0.5/}
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://live.gnome.org/gtk-vnc
@@ -14,15 +14,35 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config msgfmt intltool
+USE_TOOLS+=	gmake intltool msgfmt pkg-config
 
 PKGCONFIG_OVERRIDE+=	gtk-vnc-1.0.pc.in
+PKGCONFIG_OVERRIDE+=	gtk-vnc-2.0.pc.in
+PKGCONFIG_OVERRIDE+=	gvnc-1.0.pc.in
+PKGCONFIG_OVERRIDE+=	gvncpulse-1.0.pc.in
 PY_PATCHPLIST=	yes
 
 CONFIGURE_ARGS+=	--with-coroutine=gthread
 
 .include "options.mk"
 
+# idea from arch linux PKGBUILD
+CONFIGURE_SCRIPT=	../configure
+BUILD_DIRS=		gtk2-build gtk3-build
+INSTALL_DIRS=		gtk2-build gtk3-build
+
+pre-configure:
+	${RM} -rf ${WRKSRC}/gtk2-build ${WRKSRC}/gtk3-build
+	${MKDIR} ${WRKSRC}/gtk2-build ${WRKSRC}/gtk3-build
+
+do-configure:
+	cd ${WRKSRC}/gtk2-build \
+	&& env ${CONFIGURE_ENV} ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS} \
+	--with-gtk=2.0
+	cd ${WRKSRC}/gtk3-build \
+	&& env ${CONFIGURE_ENV} ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS} \
+	--with-gtk=3.0
+
 #VIEW_REQUIRED=0.6.0
 #libview
 
@@ -33,6 +53,8 @@ CONFIGURE_ARGS+=	--with-coroutine=gthread
 BUILDLINK_API_DEPENDS.gnutls+=	gnutls>=1.4.0
 .include "../../security/gnutls/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.10.0
+BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.18.0
 .include "../../x11/gtk2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gtk3+=	gtk3+>=3.0.0
+.include "../../x11/gtk3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/gtk-vnc/PLIST b/net/gtk-vnc/PLIST
index f40b94ab005..1c004104816 100644
--- a/net/gtk-vnc/PLIST
+++ b/net/gtk-vnc/PLIST
@@ -1,6 +1,73 @@
-@comment $NetBSD: PLIST,v 1.3 2009/09/14 10:07:03 tnn Exp $
+@comment $NetBSD: PLIST,v 1.4 2012/08/20 11:34:58 ryoon Exp $
+bin/gvnccapture
+include/gtk-vnc-1.0/gtk-vnc.h
 include/gtk-vnc-1.0/vncdisplay.h
-${PLIST.plugin}lib/netscape/plugins/gtk-vnc-plugin.so
+include/gtk-vnc-1.0/vncdisplayenums.h
+include/gtk-vnc-1.0/vncgrabsequence.h
+include/gtk-vnc-1.0/vncimageframebuffer.h
+include/gtk-vnc-2.0/gtk-vnc.h
+include/gtk-vnc-2.0/vncdisplay.h
+include/gtk-vnc-2.0/vncdisplayenums.h
+include/gtk-vnc-2.0/vncgrabsequence.h
+include/gtk-vnc-2.0/vncimageframebuffer.h
+include/gvnc-1.0/gvnc.h
+include/gvnc-1.0/vncaudio.h
+include/gvnc-1.0/vncaudioformat.h
+include/gvnc-1.0/vncaudiosample.h
+include/gvnc-1.0/vncbaseaudio.h
+include/gvnc-1.0/vncbaseframebuffer.h
+include/gvnc-1.0/vnccolormap.h
+include/gvnc-1.0/vncconnection.h
+include/gvnc-1.0/vncconnectionenums.h
+include/gvnc-1.0/vnccursor.h
+include/gvnc-1.0/vncframebuffer.h
+include/gvnc-1.0/vncpixelformat.h
+include/gvnc-1.0/vncutil.h
+${PLIST.pulseaudio}include/gvncpulse-1.0/gvncpulse.h
+${PLIST.pulseaudio}include/gvncpulse-1.0/vncaudiopulse.h
 lib/libgtk-vnc-1.0.la
+lib/libgtk-vnc-2.0.la
+lib/libgvnc-1.0.la
+${PLIST.pulseaudio}lib/libgvncpulse-1.0.la
 lib/pkgconfig/gtk-vnc-1.0.pc
+lib/pkgconfig/gtk-vnc-2.0.pc
+lib/pkgconfig/gvnc-1.0.pc
+${PLIST.pulseaudio}lib/pkgconfig/gvncpulse-1.0.pc
 ${PLIST.python}${PYSITELIB}/gtkvnc.la
+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
+share/locale/en_GB/LC_MESSAGES/gtk-vnc.mo
+share/locale/eo/LC_MESSAGES/gtk-vnc.mo
+share/locale/es/LC_MESSAGES/gtk-vnc.mo
+share/locale/eu/LC_MESSAGES/gtk-vnc.mo
+share/locale/fr/LC_MESSAGES/gtk-vnc.mo
+share/locale/gl/LC_MESSAGES/gtk-vnc.mo
+share/locale/hu/LC_MESSAGES/gtk-vnc.mo
+share/locale/id/LC_MESSAGES/gtk-vnc.mo
+share/locale/it/LC_MESSAGES/gtk-vnc.mo
+share/locale/ja/LC_MESSAGES/gtk-vnc.mo
+share/locale/ko/LC_MESSAGES/gtk-vnc.mo
+share/locale/lt/LC_MESSAGES/gtk-vnc.mo
+share/locale/lv/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/sk/LC_MESSAGES/gtk-vnc.mo
+share/locale/sl/LC_MESSAGES/gtk-vnc.mo
+share/locale/sv/LC_MESSAGES/gtk-vnc.mo
+share/locale/th/LC_MESSAGES/gtk-vnc.mo
+share/locale/tr/LC_MESSAGES/gtk-vnc.mo
+share/locale/uk/LC_MESSAGES/gtk-vnc.mo
+share/locale/zh_CN/LC_MESSAGES/gtk-vnc.mo
+share/locale/zh_HK/LC_MESSAGES/gtk-vnc.mo
+share/locale/zh_TW/LC_MESSAGES/gtk-vnc.mo
diff --git a/net/gtk-vnc/buildlink3.mk b/net/gtk-vnc/buildlink3.mk
index 8d796055d92..3c7f5419c03 100644
--- a/net/gtk-vnc/buildlink3.mk
+++ b/net/gtk-vnc/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.14 2012/05/07 01:53:52 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2012/08/20 11:34:58 ryoon Exp $
 
 BUILDLINK_TREE+=	gtk-vnc
 
 .if !defined(GTK_VNC_BUILDLINK3_MK)
 GTK_VNC_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gtk-vnc+=	gtk-vnc>=0.3.7
-BUILDLINK_ABI_DEPENDS.gtk-vnc+=	gtk-vnc>=0.3.10nb11
+BUILDLINK_API_DEPENDS.gtk-vnc+=	gtk-vnc>=0.5.1
+BUILDLINK_ABI_DEPENDS.gtk-vnc+=	gtk-vnc>=0.5.1
 BUILDLINK_PKGSRCDIR.gtk-vnc?=	../../net/gtk-vnc
 
 pkgbase := gtk-vnc
@@ -18,7 +18,7 @@ pkgbase := gtk-vnc
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
 .endif # GTK_VNC_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-gtk-vnc
diff --git a/net/gtk-vnc/distinfo b/net/gtk-vnc/distinfo
index 1e4e2370bc0..b98111e0170 100644
--- a/net/gtk-vnc/distinfo
+++ b/net/gtk-vnc/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.3 2009/10/26 11:02:21 drochner Exp $
+$NetBSD: distinfo,v 1.4 2012/08/20 11:34:58 ryoon Exp $
 
-SHA1 (gtk-vnc-0.3.10.tar.gz) = 40dfa4f5c28dee13db72b9173ecbe9f182817cee
-RMD160 (gtk-vnc-0.3.10.tar.gz) = 5269505a826eb0c9ba78f2426fc71d8c629be025
-Size (gtk-vnc-0.3.10.tar.gz) = 604228 bytes
-SHA1 (patch-aa) = e59cd2080d9d88d4d689f10ed15738aa3309dcf3
-SHA1 (patch-ab) = e4e34a1f664de13a1c27c3c53eeed5b62d9f988c
-SHA1 (patch-ac) = 623da8d775c1065de0c396d1cbc2cf840adb73f3
-SHA1 (patch-ad) = a25d9b04656b6a4c98d399c6c201e7cb0b862195
-SHA1 (patch-ae) = f3d1fe46974f46d421a5ea0cc87a2908a96b679f
-SHA1 (patch-af) = 7f72b9e16fd82880ab61e74835a55f616fc1aacc
+SHA1 (gtk-vnc-0.5.1.tar.xz) = b3266137d9cdd8bca740b84adde33b98db81f3d1
+RMD160 (gtk-vnc-0.5.1.tar.xz) = 9b21f59911c4aeea70bd3171066956c65ad59b8e
+Size (gtk-vnc-0.5.1.tar.xz) = 413652 bytes
+SHA1 (patch-ab) = f59d1260533ed8c8e2932f6af416d8e5a6088650
+SHA1 (patch-ac) = 7d0adf79172e12c18016bacf8b3f5787689e7a35
+SHA1 (patch-ad) = f0a977570e4839e2753bcc0bea836596fdb7ddf3
+SHA1 (patch-ae) = 75b082408787267888d0f9ba5a6fcf7f953de13f
+SHA1 (patch-af) = 2944c204dadf701aa4e13d591e25842a9705863b
diff --git a/net/gtk-vnc/options.mk b/net/gtk-vnc/options.mk
index a315ab64497..62fc5f9f222 100644
--- a/net/gtk-vnc/options.mk
+++ b/net/gtk-vnc/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.3 2010/01/21 17:05:59 drochner Exp $
+# $NetBSD: options.mk,v 1.4 2012/08/20 11:34:58 ryoon Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gtk-vnc
-PKG_SUPPORTED_OPTIONS=	python plugin vnc-sasl
-PKG_SUGGESTED_OPTIONS=	vnc-sasl
+PKG_SUPPORTED_OPTIONS=	python plugin vnc-sasl pulseaudio
+PKG_SUGGESTED_OPTIONS=	python vnc-sasl
 
 .include "../../mk/bsd.options.mk"
 
@@ -10,10 +10,10 @@ PLIST_VARS=	python
 .if !empty(PKG_OPTIONS:Mpython)
 .include "../../lang/python/extension.mk"
 .include "../../x11/py-gtk2/buildlink3.mk"
-USE_TOOLS+=	gmake
 PLIST.python=	yes
+CONFIGURE_ARGS+=	--with-python
 .else
-CONFIGURE_ARGS+=	--with-python=no
+CONFIGURE_ARGS+=	--without-python
 .endif
 
 PLIST_VARS+=	plugin
@@ -28,3 +28,12 @@ PLIST.plugin=	yes
 .else
 CONFIGURE_ARGS+=	--without-sasl
 .endif
+
+PLIST_VARS+=	pulseaudio
+.if !empty(PKG_OPTIONS:Mpulseaudio)
+.include "../../audio/pulseaudio/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-pulseaudio
+PLIST.pulseaudio=	yes
+.else
+CONFIGURE_ARGS+=	--without-pulseaudio
+.endif
diff --git a/net/gtk-vnc/patches/patch-aa b/net/gtk-vnc/patches/patch-aa
deleted file mode 100644
index a80d346c10e..00000000000
--- a/net/gtk-vnc/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/04/06 10:17:32 wiz Exp $
-
---- src/gvnc.c.orig	2008-12-07 20:35:14.000000000 +0100
-+++ src/gvnc.c
-@@ -59,6 +59,10 @@
- #endif
- 
- 
-+#ifndef AI_ADDRCONFIG
-+#define AI_ADDRCONFIG 0
-+#endif
-+
- struct wait_queue
- {
- 	gboolean waiting;
diff --git a/net/gtk-vnc/patches/patch-ab b/net/gtk-vnc/patches/patch-ab
index e58527f832d..c0183dd7d38 100644
--- a/net/gtk-vnc/patches/patch-ab
+++ b/net/gtk-vnc/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2009/04/06 10:17:32 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2012/08/20 11:34:59 ryoon Exp $
 
---- src/coroutine_ucontext.c.orig	2008-09-05 12:32:16.000000000 +0000
+--- src/coroutine_ucontext.c.orig	2012-07-12 08:37:05.000000000 +0000
 +++ src/coroutine_ucontext.c
-@@ -14,6 +14,10 @@
+@@ -26,6 +26,10 @@
  #include <stdlib.h>
  #include "coroutine.h"
  
@@ -12,4 +12,4 @@ $NetBSD: patch-ab,v 1.1.1.1 2009/04/06 10:17:32 wiz Exp $
 +
  int coroutine_release(struct coroutine *co)
  {
- 	return cc_release(&co->cc);
+     return cc_release(&co->cc);
diff --git a/net/gtk-vnc/patches/patch-ac b/net/gtk-vnc/patches/patch-ac
index 99c39ece8d1..070dd184404 100644
--- a/net/gtk-vnc/patches/patch-ac
+++ b/net/gtk-vnc/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.3 2009/10/26 11:02:21 drochner Exp $
+$NetBSD: patch-ac,v 1.4 2012/08/20 11:34:59 ryoon Exp $
 
---- plugin/Makefile.in.orig	2009-10-20 20:32:54.000000000 +0200
+--- plugin/Makefile.in.orig	2012-07-12 08:37:47.000000000 +0000
 +++ plugin/Makefile.in
-@@ -489,7 +489,7 @@ target_alias = @target_alias@
+@@ -336,7 +336,7 @@ target_alias = @target_alias@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
diff --git a/net/gtk-vnc/patches/patch-ad b/net/gtk-vnc/patches/patch-ad
index ad42599f902..959baf86b99 100644
--- a/net/gtk-vnc/patches/patch-ad
+++ b/net/gtk-vnc/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.1 2009/09/14 10:07:04 tnn Exp $
+$NetBSD: patch-ad,v 1.2 2012/08/20 11:34:59 ryoon Exp $
 
---- src/npupp.h.orig	2009-09-14 11:50:07.000000000 +0200
+--- src/npupp.h.orig	2012-08-18 14:28:53.000000000 +0000
 +++ src/npupp.h
 @@ -0,0 +1,1292 @@
 +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
diff --git a/net/gtk-vnc/patches/patch-ae b/net/gtk-vnc/patches/patch-ae
index d36647fd4e4..aa639299ee1 100644
--- a/net/gtk-vnc/patches/patch-ae
+++ b/net/gtk-vnc/patches/patch-ae
@@ -1,36 +1,22 @@
-$NetBSD: patch-ae,v 1.2 2009/10/26 11:02:21 drochner Exp $
+$NetBSD: patch-ae,v 1.3 2012/08/20 11:34:59 ryoon Exp $
 
---- configure.orig	2009-10-20 20:32:57.000000000 +0200
+--- configure.orig	2012-07-12 08:37:45.000000000 +0000
 +++ configure
-@@ -27598,12 +27598,12 @@ if test -n "$PKG_CONFIG"; then
-         pkg_cv_NSPR_CFLAGS="$NSPR_CFLAGS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nspr >= \$NSPR_REQUIRED\"") >&5
--  ($PKG_CONFIG --exists --print-errors "nspr >= $NSPR_REQUIRED") 2>&5
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mozilla-nspr >= \$NSPR_REQUIRED\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "mozilla-nspr >= $NSPR_REQUIRED") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  pkg_cv_NSPR_CFLAGS=`$PKG_CONFIG --cflags "nspr >= $NSPR_REQUIRED" 2>/dev/null`
-+  pkg_cv_NSPR_CFLAGS=`$PKG_CONFIG --cflags "mozilla-nspr >= $NSPR_REQUIRED" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -27616,12 +27616,12 @@ if test -n "$PKG_CONFIG"; then
-         pkg_cv_NSPR_LIBS="$NSPR_LIBS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nspr >= \$NSPR_REQUIRED\"") >&5
--  ($PKG_CONFIG --exists --print-errors "nspr >= $NSPR_REQUIRED") 2>&5
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mozilla-nspr >= \$NSPR_REQUIRED\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "mozilla-nspr >= $NSPR_REQUIRED") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  pkg_cv_NSPR_LIBS=`$PKG_CONFIG --libs "nspr >= $NSPR_REQUIRED" 2>/dev/null`
-+  pkg_cv_NSPR_LIBS=`$PKG_CONFIG --libs "mozilla-nspr >= $NSPR_REQUIRED" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
+@@ -15496,7 +15496,7 @@ fi
+ HAVE_PULSEAUDIO=no
+ if test "x$with_pulseaudio" != "xno"; then
+   PULSEAUDIO_MODULES=libpulse-simple
+-  if test "x$with_pulseaudio" == "xyes"; then
++  if test "x$with_pulseaudio" = "xyes"; then
+ 
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PULSEAUDIO" >&5
+@@ -17158,7 +17158,7 @@ fi
+ 
+ 
+                 if test "x$VAPIGEN" != "xno"; then
+-                        if test "x$enable_vala" == "xcheck" ; then
++                        if test "x$enable_vala" = "xcheck" ; then
+                                 enable_vala=yes
+ 
+                         fi
diff --git a/net/gtk-vnc/patches/patch-af b/net/gtk-vnc/patches/patch-af
index 950fc3bb87f..2a09f8b31a7 100644
--- a/net/gtk-vnc/patches/patch-af
+++ b/net/gtk-vnc/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.1 2009/09/14 10:07:04 tnn Exp $
+$NetBSD: patch-af,v 1.2 2012/08/20 11:34:59 ryoon Exp $
 
---- plugin/npunix.c.orig	2008-12-07 20:35:14.000000000 +0100
+--- plugin/npunix.c.orig	2012-07-12 08:37:05.000000000 +0000
 +++ plugin/npunix.c
 @@ -241,6 +241,7 @@ NPN_ForceRedraw(NPP instance)
      CallNPN_ForceRedrawProc(gNetscapeFuncs.forceredraw, instance);
@@ -10,15 +10,16 @@ $NetBSD: patch-af,v 1.1 2009/09/14 10:07:04 tnn Exp $
  void NPN_PushPopupsEnabledState(NPP instance, NPBool enabled)
  {
      CallNPN_PushPopupsEnabledStateProc(gNetscapeFuncs.pushpopupsenabledstate,
-@@ -252,6 +253,7 @@ void NPN_PopPopupsEnabledState(NPP insta
+@@ -252,7 +253,7 @@ void NPN_PopPopupsEnabledState(NPP insta
      CallNPN_PopPopupsEnabledStateProc(gNetscapeFuncs.poppopupsenabledstate,
-         instance);
+                                       instance);
  }
+-
 +#endif
  
  
- 
-@@ -488,8 +490,10 @@ NP_Initialize(NPNetscapeFuncs* nsTable, 
+ /***********************************************************************
+@@ -488,8 +489,10 @@ NP_Initialize(NPNetscapeFuncs* nsTable, 
  #endif
          gNetscapeFuncs.getvalue      = nsTable->getvalue;
          gNetscapeFuncs.setvalue      = nsTable->setvalue;