summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/glib-networking/Makefile6
-rw-r--r--net/gtk-vnc/Makefile21
-rw-r--r--net/gtk-vnc/distinfo4
-rw-r--r--net/gtk-vnc/files/patch-configure427
-rw-r--r--net/gtk-vnc/files/patch-src_Makefile.in206
-rw-r--r--net/gtk-vnc/files/patch-src_continuation.h6
-rw-r--r--net/gtk-vnc/files/patch-src_coroutine_ucontext.c6
-rw-r--r--net/gtk-vnc/files/patch-src_gvnc.c11
-rw-r--r--net/gtk-vnc/files/patch-src_gvnc.h22
-rw-r--r--net/gtk-vnc/pkg-plist53
-rw-r--r--net/libgweather/Makefile (renamed from net/libgweather3/Makefile)11
-rw-r--r--net/libgweather/distinfo (renamed from net/libgweather3/distinfo)0
-rw-r--r--net/libgweather/pkg-descr (renamed from net/libgweather3/pkg-descr)0
-rw-r--r--net/libgweather/pkg-plist (renamed from net/libgweather3/pkg-plist)3
-rw-r--r--net/libproxy/Makefile5
15 files changed, 714 insertions, 67 deletions
diff --git a/net/glib-networking/Makefile b/net/glib-networking/Makefile
index 65c7c7b75..2998e32be 100644
--- a/net/glib-networking/Makefile
+++ b/net/glib-networking/Makefile
@@ -1,6 +1,6 @@
# Created by: Koop Mast <kwm@FreeBSD.org>
# $FreeBSD$
-# $MCom: ports/trunk/net/glib-networking/Makefile 18537 2013-06-16 20:08:30Z kwm $
+# $MCom$
PORTNAME= glib-networking
PORTVERSION= 2.36.2
@@ -20,7 +20,6 @@ LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \
RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \
gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
-NO_STAGE= yes
USE_XZ= yes
GNU_CONFIGURE= yes
USE_GNOME= glib20 intltool
@@ -32,4 +31,7 @@ LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} -e' s|-Wmissing-include-dirs||g' ${WRKSRC}/configure
+post-install:
+ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gio/modules/lib*.so
+
.include <bsd.port.mk>
diff --git a/net/gtk-vnc/Makefile b/net/gtk-vnc/Makefile
index c6c7a53d6..a89f26a21 100644
--- a/net/gtk-vnc/Makefile
+++ b/net/gtk-vnc/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= gtk-vnc
-PORTVERSION= 0.3.10
-PORTREVISION= 8
+PORTVERSION= 0.4.4
CATEGORIES= net gnome
MASTER_SITES= GNOME
@@ -12,19 +11,23 @@ COMMENT= VNC viewer widget for GTK+
LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \
libgcrypt.so:${PORTSDIR}/security/libgcrypt \
- libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 \
- libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext
+ libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
-CONFLICTS= gtk-vnc-0.4.[0-9]*
+LICENSE= LGPL21
+LICENSE_FILE= ${WRKSRC}/COPYING.LIB
-NO_STAGE= yes
-USE_GNOME= pygtk2
+USE_XZ= yes
+USE_GNOME= gtk20 introspection:build
USES= gettext gmake pathfix pkgconfig
USE_LDCONFIG= yes
-USE_PYTHON= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ARGS= --with-gtkglext=yes
+CONFIGURE_ARGS= --with-gtk=2.0 --enable-introspection \
+ --disable-plugin --without-python
+MAKE_JOBS_UNSAFE=yes
+
+post-install:
+ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so.0
.include <bsd.port.mk>
diff --git a/net/gtk-vnc/distinfo b/net/gtk-vnc/distinfo
index ef8bf092a..764f4cc43 100644
--- a/net/gtk-vnc/distinfo
+++ b/net/gtk-vnc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gtk-vnc-0.3.10.tar.gz) = 61fdc1824e5621ba77a116fae7e512ced377a914ad34b2a694188277ca679384
-SIZE (gtk-vnc-0.3.10.tar.gz) = 604228
+SHA256 (gtk-vnc-0.4.4.tar.xz) = c93fdb53c78b52a1cfa067c1a0be0b93d4adfc17ccea1215f20eeab2818308b7
+SIZE (gtk-vnc-0.4.4.tar.xz) = 377304
diff --git a/net/gtk-vnc/files/patch-configure b/net/gtk-vnc/files/patch-configure
new file mode 100644
index 000000000..eb14a6abc
--- /dev/null
+++ b/net/gtk-vnc/files/patch-configure
@@ -0,0 +1,427 @@
+--- configure.orig 2013-12-15 11:12:43.000000000 +0100
++++ configure 2013-12-15 11:18:53.000000000 +0100
+@@ -620,14 +620,16 @@
+ WITH_VALA_FALSE
+ WITH_VALA_TRUE
+ VAPIGEN
+-G_IR_SCANNER_SYMBOL_PREFIX_FALSE
+-G_IR_SCANNER_SYMBOL_PREFIX_TRUE
+-WITH_GOBJECT_INTROSPECTION_FALSE
+-WITH_GOBJECT_INTROSPECTION_TRUE
+-G_IR_COMPILER
+-G_IR_SCANNER
+-GOBJECT_INTROSPECTION_LIBS
+-GOBJECT_INTROSPECTION_CFLAGS
++HAVE_INTROSPECTION_FALSE
++HAVE_INTROSPECTION_TRUE
++INTROSPECTION_MAKEFILE
++INTROSPECTION_LIBS
++INTROSPECTION_CFLAGS
++INTROSPECTION_TYPELIBDIR
++INTROSPECTION_GIRDIR
++INTROSPECTION_GENERATE
++INTROSPECTION_COMPILER
++INTROSPECTION_SCANNER
+ ENABLE_PLUGIN_FALSE
+ ENABLE_PLUGIN_TRUE
+ WITH_EXAMPLES_FALSE
+@@ -915,9 +917,7 @@
+ FIREFOX_PLUGIN_CFLAGS
+ FIREFOX_PLUGIN_LIBS
+ MOZILLA_PLUGIN_CFLAGS
+-MOZILLA_PLUGIN_LIBS
+-GOBJECT_INTROSPECTION_CFLAGS
+-GOBJECT_INTROSPECTION_LIBS'
++MOZILLA_PLUGIN_LIBS'
+
+
+ # Initialize some variables set by options.
+@@ -1555,7 +1555,8 @@
+ --enable-iso-c Try to warn if code is not ISO C
+ --enable-plugin=no/yes enable browser plugin default=no
+ --disable-rebuilds disable all source autogeneration rules
+- --enable-introspection enable GObject introspection
++ --enable-introspection=[no/auto/yes]
++ Enable introspection for this build
+ --enable-vala enable Vala binding generation
+
+ Optional Packages:
+@@ -1624,11 +1625,6 @@
+ C compiler flags for MOZILLA_PLUGIN, overriding pkg-config
+ MOZILLA_PLUGIN_LIBS
+ linker flags for MOZILLA_PLUGIN, overriding pkg-config
+- GOBJECT_INTROSPECTION_CFLAGS
+- C compiler flags for GOBJECT_INTROSPECTION, overriding
+- pkg-config
+- GOBJECT_INTROSPECTION_LIBS
+- linker flags for GOBJECT_INTROSPECTION, overriding pkg-config
+
+ Use these variables to override the choices made by `configure' or to help
+ it to find libraries and programs with nonstandard names/locations.
+@@ -15735,286 +15731,98 @@
+ fi
+
+
+-# Check whether --enable-introspection was given.
+-if test "${enable_introspection+set}" = set; then :
+- enableval=$enable_introspection;
+-else
+- enable_introspection=check
+-fi
+-
+-
+-has_symbol_prefix=no
+-if test "x$enable_introspection" != "xno" ; then
+-
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GOBJECT_INTROSPECTION" >&5
+-$as_echo_n "checking for GOBJECT_INTROSPECTION... " >&6; }
+-
+-if test -n "$GOBJECT_INTROSPECTION_CFLAGS"; then
+- pkg_cv_GOBJECT_INTROSPECTION_CFLAGS="$GOBJECT_INTROSPECTION_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= \$GOBJECT_INTROSPECTION_DESIRED\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_DESIRED") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; then
+- pkg_cv_GOBJECT_INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_DESIRED" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- else
+- pkg_failed=untried
+-fi
+-if test -n "$GOBJECT_INTROSPECTION_LIBS"; then
+- pkg_cv_GOBJECT_INTROSPECTION_LIBS="$GOBJECT_INTROSPECTION_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= \$GOBJECT_INTROSPECTION_DESIRED\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_DESIRED") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; then
+- pkg_cv_GOBJECT_INTROSPECTION_LIBS=`$PKG_CONFIG --libs "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_DESIRED" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- else
+- pkg_failed=untried
+-fi
+-
+-
+
+-if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
++ # Check whether --enable-introspection was given.
++if test "${enable_introspection+set}" = set; then :
++ enableval=$enable_introspection;
+ else
+- _pkg_short_errors_supported=no
++ enable_introspection=auto
+ fi
+- if test $_pkg_short_errors_supported = yes; then
+- GOBJECT_INTROSPECTION_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_DESIRED" 2>&1`
+- else
+- GOBJECT_INTROSPECTION_PKG_ERRORS=`$PKG_CONFIG --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_DESIRED" 2>&1`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$GOBJECT_INTROSPECTION_PKG_ERRORS" >&5
+-
+
+
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GOBJECT_INTROSPECTION" >&5
+-$as_echo_n "checking for GOBJECT_INTROSPECTION... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gobject-introspection" >&5
++$as_echo_n "checking for gobject-introspection... " >&6; }
+
+-if test -n "$GOBJECT_INTROSPECTION_CFLAGS"; then
+- pkg_cv_GOBJECT_INTROSPECTION_CFLAGS="$GOBJECT_INTROSPECTION_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= \$GOBJECT_INTROSPECTION_REQUIRED\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; then
+- pkg_cv_GOBJECT_INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- else
+- pkg_failed=untried
+-fi
+-if test -n "$GOBJECT_INTROSPECTION_LIBS"; then
+- pkg_cv_GOBJECT_INTROSPECTION_LIBS="$GOBJECT_INTROSPECTION_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= \$GOBJECT_INTROSPECTION_REQUIRED\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED") 2>&5
++ case $enable_introspection in #(
++ no) :
++ found_introspection="no (disabled, use --enable-introspection to enable)"
++ ;; #(
++ yes) :
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_GOBJECT_INTROSPECTION_LIBS=`$PKG_CONFIG --libs "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- else
+- pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+-else
+- _pkg_short_errors_supported=no
+-fi
+- if test $_pkg_short_errors_supported = yes; then
+- GOBJECT_INTROSPECTION_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED" 2>&1`
+- else
+- GOBJECT_INTROSPECTION_PKG_ERRORS=`$PKG_CONFIG --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED" 2>&1`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$GOBJECT_INTROSPECTION_PKG_ERRORS" >&5
+-
+-
+- if test "x$enable_introspection" = "xcheck"; then
+- enable_introspection=no
+- else
+- as_fn_error $? "gobject-introspection is not available" "$LINENO" 5
+- fi
+-
+-elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+- if test "x$enable_introspection" = "xcheck"; then
+- enable_introspection=no
+- else
+- as_fn_error $? "gobject-introspection is not available" "$LINENO" 5
+- fi
+-
++ :
+ else
+- GOBJECT_INTROSPECTION_CFLAGS=$pkg_cv_GOBJECT_INTROSPECTION_CFLAGS
+- GOBJECT_INTROSPECTION_LIBS=$pkg_cv_GOBJECT_INTROSPECTION_LIBS
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+- enable_introspection=yes
+- has_symbol_prefix=no
+-
++ as_fn_error $? "gobject-introspection-1.0 is not installed" "$LINENO" 5
+ fi
+-
+-elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GOBJECT_INTROSPECTION" >&5
+-$as_echo_n "checking for GOBJECT_INTROSPECTION... " >&6; }
+-
+-if test -n "$GOBJECT_INTROSPECTION_CFLAGS"; then
+- pkg_cv_GOBJECT_INTROSPECTION_CFLAGS="$GOBJECT_INTROSPECTION_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= \$GOBJECT_INTROSPECTION_REQUIRED\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED") 2>&5
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.9.4\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.9.4") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_GOBJECT_INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED" 2>/dev/null`
++ found_introspection=yes
+ else
+- pkg_failed=yes
+-fi
+- else
+- pkg_failed=untried
++ as_fn_error $? "You need to have gobject-introspection >= 0.9.4 installed to build gtk-vnc" "$LINENO" 5
+ fi
+-if test -n "$GOBJECT_INTROSPECTION_LIBS"; then
+- pkg_cv_GOBJECT_INTROSPECTION_LIBS="$GOBJECT_INTROSPECTION_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= \$GOBJECT_INTROSPECTION_REQUIRED\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED") 2>&5
++ ;; #(
++ auto) :
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.9.4\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.9.4") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_GOBJECT_INTROSPECTION_LIBS=`$PKG_CONFIG --libs "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED" 2>/dev/null`
++ found_introspection=yes
+ else
+- pkg_failed=yes
+-fi
+- else
+- pkg_failed=untried
++ found_introspection=no
+ fi
++ enable_introspection=$found_introspection
++ ;; #(
++ *) :
++ as_fn_error $? "invalid argument passed to --enable-introspection, should be one of [no/auto/yes]" "$LINENO" 5
++ ;;
++esac
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $found_introspection" >&5
++$as_echo "$found_introspection" >&6; }
+
++ INTROSPECTION_SCANNER=
++ INTROSPECTION_COMPILER=
++ INTROSPECTION_GENERATE=
++ INTROSPECTION_GIRDIR=
++ INTROSPECTION_TYPELIBDIR=
++ if test "x$found_introspection" = "xyes"; then
++ INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
++ INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
++ INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
++ INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
++ INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
++ INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
++ INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
++ INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
++ fi
+
+
+-if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+-else
+- _pkg_short_errors_supported=no
+-fi
+- if test $_pkg_short_errors_supported = yes; then
+- GOBJECT_INTROSPECTION_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED" 2>&1`
+- else
+- GOBJECT_INTROSPECTION_PKG_ERRORS=`$PKG_CONFIG --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED" 2>&1`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$GOBJECT_INTROSPECTION_PKG_ERRORS" >&5
+-
+
+- if test "x$enable_introspection" = "xcheck"; then
+- enable_introspection=no
+- else
+- as_fn_error $? "gobject-introspection is not available" "$LINENO" 5
+- fi
+
+-elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+
+- if test "x$enable_introspection" = "xcheck"; then
+- enable_introspection=no
+- else
+- as_fn_error $? "gobject-introspection is not available" "$LINENO" 5
+- fi
+
+-else
+- GOBJECT_INTROSPECTION_CFLAGS=$pkg_cv_GOBJECT_INTROSPECTION_CFLAGS
+- GOBJECT_INTROSPECTION_LIBS=$pkg_cv_GOBJECT_INTROSPECTION_LIBS
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+
+- enable_introspection=yes
+- has_symbol_prefix=no
+
+-fi
+
++ if test "x$found_introspection" = "xyes"; then
++ HAVE_INTROSPECTION_TRUE=
++ HAVE_INTROSPECTION_FALSE='#'
+ else
+- GOBJECT_INTROSPECTION_CFLAGS=$pkg_cv_GOBJECT_INTROSPECTION_CFLAGS
+- GOBJECT_INTROSPECTION_LIBS=$pkg_cv_GOBJECT_INTROSPECTION_LIBS
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+- enable_introspection=yes
+- has_symbol_prefix=yes
+-
++ HAVE_INTROSPECTION_TRUE='#'
++ HAVE_INTROSPECTION_FALSE=
+ fi
+
+- if test "x$enable_introspection" = "xyes" ; then
+-
+-$as_echo "#define WITH_GOBJECT_INTROSPECTION 1" >>confdefs.h
+-
+-
+-
+- G_IR_SCANNER=$($PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0)
+
+- G_IR_COMPILER=$($PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0)
+-
+- fi
+-fi
+- if test "x$enable_introspection" = "xyes"; then
+- WITH_GOBJECT_INTROSPECTION_TRUE=
+- WITH_GOBJECT_INTROSPECTION_FALSE='#'
+-else
+- WITH_GOBJECT_INTROSPECTION_TRUE='#'
+- WITH_GOBJECT_INTROSPECTION_FALSE=
+-fi
+-
+- if test "x$has_symbol_prefix" = "xyes"; then
+- G_IR_SCANNER_SYMBOL_PREFIX_TRUE=
+- G_IR_SCANNER_SYMBOL_PREFIX_FALSE='#'
+-else
+- G_IR_SCANNER_SYMBOL_PREFIX_TRUE='#'
+- G_IR_SCANNER_SYMBOL_PREFIX_FALSE=
+-fi
+
+
+ if test "x$with_gtk" = "x3.0"; then
+@@ -16030,7 +15838,7 @@
+ enable_vala="$default_vala"
+ fi
+
+-if test "x$enable_introspection" = "xyes" ; then
++if test "x$found_introspection" = "xyes" ; then
+ if test "x$enable_vala" != "xno" ; then
+ # Extract the first word of "vapigen", so it can be a program name with args.
+ set dummy vapigen; ac_word=$2
+@@ -16264,12 +16072,8 @@
+ as_fn_error $? "conditional \"ENABLE_PLUGIN\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+-if test -z "${WITH_GOBJECT_INTROSPECTION_TRUE}" && test -z "${WITH_GOBJECT_INTROSPECTION_FALSE}"; then
+- as_fn_error $? "conditional \"WITH_GOBJECT_INTROSPECTION\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+-if test -z "${G_IR_SCANNER_SYMBOL_PREFIX_TRUE}" && test -z "${G_IR_SCANNER_SYMBOL_PREFIX_FALSE}"; then
+- as_fn_error $? "conditional \"G_IR_SCANNER_SYMBOL_PREFIX\" was never defined.
++if test -z "${HAVE_INTROSPECTION_TRUE}" && test -z "${HAVE_INTROSPECTION_FALSE}"; then
++ as_fn_error $? "conditional \"HAVE_INTROSPECTION\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${WITH_VALA_TRUE}" && test -z "${WITH_VALA_FALSE}"; then
diff --git a/net/gtk-vnc/files/patch-src_Makefile.in b/net/gtk-vnc/files/patch-src_Makefile.in
new file mode 100644
index 000000000..a87c4399b
--- /dev/null
+++ b/net/gtk-vnc/files/patch-src_Makefile.in
@@ -0,0 +1,206 @@
+--- src/Makefile.in.orig 2013-12-15 11:10:12.000000000 +0100
++++ src/Makefile.in 2013-12-15 11:07:30.000000000 +0100
+@@ -95,10 +95,13 @@
+ @WITH_PYTHON_TRUE@am__append_11 = vnc.defs vncmodule.defs.c
+ @WITH_PYTHON_TRUE@am__append_12 = vnc.override
+ @WITH_PYTHON_FALSE@am__append_13 = vnc.override vncmodule.c
+-@HAVE_GTK_2_TRUE@@WITH_GOBJECT_INTROSPECTION_TRUE@am__append_14 = \
+-@HAVE_GTK_2_TRUE@@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncimageframebuffer.h $(srcdir)/vncimageframebuffer.c
++@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@am__append_14 = \
++@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vncimageframebuffer.h $(srcdir)/vncimageframebuffer.c
+
+-@WITH_GOBJECT_INTROSPECTION_TRUE@am__append_15 = $(gir_DATA) $(typelibs_DATA)
++@HAVE_INTROSPECTION_TRUE@am__append_15 = GVnc-1.0.gir
++@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@am__append_16 = GtkVnc-1.0.gir
++@HAVE_GTK_2_FALSE@@HAVE_INTROSPECTION_TRUE@am__append_17 = GtkVnc-2.0.gir
++@HAVE_INTROSPECTION_TRUE@am__append_18 = $(gir_DATA) $(typelibs_DATA)
+ subdir = src
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/build-aux/mkinstalldirs \
+@@ -355,8 +358,6 @@
+ GNUTLS_LIBS = @GNUTLS_LIBS@
+ GNUTLS_REQUIRED = @GNUTLS_REQUIRED@
+ GOBJECT_CFLAGS = @GOBJECT_CFLAGS@
+-GOBJECT_INTROSPECTION_CFLAGS = @GOBJECT_INTROSPECTION_CFLAGS@
+-GOBJECT_INTROSPECTION_LIBS = @GOBJECT_INTROSPECTION_LIBS@
+ GOBJECT_LIBS = @GOBJECT_LIBS@
+ GOBJECT_REQUIRED = @GOBJECT_REQUIRED@
+ GREP = @GREP@
+@@ -367,8 +368,6 @@
+ GTK_LIBS = @GTK_LIBS@
+ GTK_REQUIRED = @GTK_REQUIRED@
+ GTK_VNC_API_VERSION = @GTK_VNC_API_VERSION@
+-G_IR_COMPILER = @G_IR_COMPILER@
+-G_IR_SCANNER = @G_IR_SCANNER@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -380,6 +379,14 @@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+@@ -613,7 +620,7 @@
+ vncconnectionenums.h vncconnectionenums.c
+
+ CLEANFILES = $(MARSHAL_FILES) $(ENUM_FILES) $(am__append_11) \
+- $(am__append_15)
++ $(am__append_18)
+ @WITH_PYTHON_TRUE@pyexec_LTLIBRARIES = gtkvnc.la
+ @WITH_PYTHON_TRUE@gtkvnc_la_LIBADD = libgtk-vnc-$(GTK_VNC_API_VERSION).la @PYGTK_LIBS@
+ @WITH_PYTHON_TRUE@gtkvnc_la_CFLAGS = @GTK_CFLAGS@ @PYTHON_INCLUDES@ \
+@@ -624,31 +631,62 @@
+ @WITH_PYTHON_TRUE@nodist_gtkvnc_la_SOURCES = vncmodule.defs.c
+ @WITH_PYTHON_TRUE@CODEGENDIR = $(shell pkg-config --variable=codegendir pygtk-2.0)
+ @WITH_PYTHON_TRUE@DEFSDIR = $(shell pkg-config --variable=defsdir pygtk-2.0)
+-@WITH_GOBJECT_INTROSPECTION_TRUE@GVNC_INTROSPECTION_SRCS = \
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncpixelformat.h \
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncframebuffer.h $(srcdir)/vncframebuffer.c \
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncbaseframebuffer.h $(srcdir)/vncbaseframebuffer.c \
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vnccolormap.h $(srcdir)/vnccolormap.c \
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vnccursor.h $(srcdir)/vnccursor.c \
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncconnection.h $(srcdir)/vncconnection.c \
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(builddir)/vncconnectionenums.h $(builddir)/vncconnectionenums.c \
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncutil.h $(srcdir)/vncutil.c
+-
+-@WITH_GOBJECT_INTROSPECTION_TRUE@GTK_VNC_INTROSPECTION_SRCS = $(srcdir)/vnccairoframebuffer.h \
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vnccairoframebuffer.c \
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncdisplay.h \
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncdisplay.c \
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncgrabsequence.h \
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncgrabsequence.c \
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(builddir)/vncdisplayenums.h \
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(builddir)/vncdisplayenums.c \
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(am__append_14)
+-@G_IR_SCANNER_SYMBOL_PREFIX_FALSE@@WITH_GOBJECT_INTROSPECTION_TRUE@PREFIX_ARGS = --strip-prefix=Vnc
+-@G_IR_SCANNER_SYMBOL_PREFIX_TRUE@@WITH_GOBJECT_INTROSPECTION_TRUE@PREFIX_ARGS = --symbol-prefix=vnc --identifier-prefix=Vnc
+-@WITH_GOBJECT_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0
+-@WITH_GOBJECT_INTROSPECTION_TRUE@gir_DATA = GVnc-1.0.gir GtkVnc-$(GTK_VNC_API_VERSION).gir
+-@WITH_GOBJECT_INTROSPECTION_TRUE@typelibsdir = $(libdir)/girepository-1.0
+-@WITH_GOBJECT_INTROSPECTION_TRUE@typelibs_DATA = GVnc-1.0.typelib GtkVnc-$(GTK_VNC_API_VERSION).typelib
++INTROSPECTION_GIRS = $(am__append_15) $(am__append_16) \
++ $(am__append_17)
++INTROSPECTION_SCANNER_ARGS = --symbol-prefix=vnc \
++ --identifier-prefix=Vnc \
++ --add-include-path=$(top_srcdir) \
++ --add-include-path=$(srcdir) \
++ --add-include-path=$(builddir)
++
++INTROSPECTION_COMPILER_ARGS = --includedir=$(top_srcdir) \
++ --includedir=$(srcdir)
++
++@HAVE_INTROSPECTION_TRUE@GVNC_INTROSPECTION_SRCS = \
++@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vncpixelformat.h \
++@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vncframebuffer.h $(srcdir)/vncframebuffer.c \
++@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vncbaseframebuffer.h $(srcdir)/vncbaseframebuffer.c \
++@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vnccolormap.h $(srcdir)/vnccolormap.c \
++@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vnccursor.h $(srcdir)/vnccursor.c \
++@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vncconnection.h $(srcdir)/vncconnection.c \
++@HAVE_INTROSPECTION_TRUE@ $(builddir)/vncconnectionenums.h $(builddir)/vncconnectionenums.c \
++@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vncutil.h $(srcdir)/vncutil.c
++
++@HAVE_INTROSPECTION_TRUE@GTK_VNC_INTROSPECTION_SRCS = \
++@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vnccairoframebuffer.h \
++@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vnccairoframebuffer.c \
++@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vncdisplay.h \
++@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vncdisplay.c \
++@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vncgrabsequence.h \
++@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vncgrabsequence.c \
++@HAVE_INTROSPECTION_TRUE@ $(builddir)/vncdisplayenums.h \
++@HAVE_INTROSPECTION_TRUE@ $(builddir)/vncdisplayenums.c \
++@HAVE_INTROSPECTION_TRUE@ $(am__append_14)
++@HAVE_INTROSPECTION_TRUE@GVnc_1_0_gir_INCLUDES = GObject-2.0
++@HAVE_INTROSPECTION_TRUE@GVnc_1_0_gir_PACKAGES = gobject-2.0
++@HAVE_INTROSPECTION_TRUE@GVnc_1_0_gir_EXPORT_PACKAGES = gvnc-1.0
++@HAVE_INTROSPECTION_TRUE@GVnc_1_0_gir_LIBS = libgvnc-1.0.la
++@HAVE_INTROSPECTION_TRUE@GVnc_1_0_gir_FILES = $(GVNC_INTROSPECTION_SRCS)
++@HAVE_INTROSPECTION_TRUE@GVnc_1_0_gir_CFLAGS = $(libgvnc_1_0_la_CFLAGS)
++@HAVE_INTROSPECTION_TRUE@GVnc_1_0_gir_SCANNERFLAGS = --c-include="gvnc.h"
++@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@GtkVnc_1_0_gir_INCLUDES = GObject-2.0 GVnc-1.0
++@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@GtkVnc_1_0_gir_PACKAGES = gobject-2.0 gtk+-$(GTK_API_VERSION)
++@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@GtkVnc_1_0_gir_EXPORT_PACKAGES = gtk-vnc-$(GTK_VNC_API_VERSION)
++@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@GtkVnc_1_0_gir_LIBS = libgvnc-1.0.la libgtk-vnc-$(GTK_VNC_API_VERSION).la
++@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@GtkVnc_1_0_gir_FILES = $(GTK_VNC_INTROSPECTION_SRCS)
++@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@GtkVnc_1_0_gir_CFLAGS = $(libgvnc_1_0_la_CFLAGS) $(libgvncpulse_1_0_la_CFLAGS)
++@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@GtkVnc_1_0_gir_SCANNERFLAGS = --c-include="gtk-vnc.h"
++@HAVE_GTK_2_FALSE@@HAVE_INTROSPECTION_TRUE@GtkVnc_2_0_gir_INCLUDES = GObject-2.0 GVnc-1.0
++@HAVE_GTK_2_FALSE@@HAVE_INTROSPECTION_TRUE@GtkVnc_2_0_gir_PACKAGES = gobject-2.0 gtk+-$(GTK_API_VERSION)
++@HAVE_GTK_2_FALSE@@HAVE_INTROSPECTION_TRUE@GtkVnc_2_0_gir_EXPORT_PACKAGES = gtk-vnc-$(GKT_VNC_API_VERSION)
++@HAVE_GTK_2_FALSE@@HAVE_INTROSPECTION_TRUE@GtkVnc_2_0_gir_LIBS = libgvnc-1.0.la libgtk-vnc-$(GTK_VNC_API_VERSION).la
++@HAVE_GTK_2_FALSE@@HAVE_INTROSPECTION_TRUE@GtkVnc_2_0_gir_FILES = $(GTK_VNC_INTROSPECTION_SRCS)
++@HAVE_GTK_2_FALSE@@HAVE_INTROSPECTION_TRUE@GtkVnc_2_0_gir_CFLAGS = $(libgvnc_1_0_la_CFLAGS) $(libgvncpulse_1_0_la_CFLAGS)
++@HAVE_GTK_2_FALSE@@HAVE_INTROSPECTION_TRUE@GtkVnc_2_0_gir_SCANNERFLAGS = --c-include="gtk-vnc.h"
++@HAVE_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0
++@HAVE_INTROSPECTION_TRUE@gir_DATA = $(INTROSPECTION_GIRS)
++@HAVE_INTROSPECTION_TRUE@typelibsdir = $(libdir)/girepository-1.0
++@HAVE_INTROSPECTION_TRUE@typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+ all: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) all-am
+
+@@ -1452,50 +1490,12 @@
+ @WITH_PYTHON_TRUE@ --register $(DEFSDIR)/gtk-types.defs \
+ @WITH_PYTHON_TRUE@ --override $(srcdir)/vnc.override vnc.defs > $@
+
+-@WITH_GOBJECT_INTROSPECTION_TRUE@GVnc-1.0.gir: libgvnc-1.0.la $(G_IR_SCANNER) Makefile.am
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(AM_V_GEN)PKG_CONFIG_PATH=$(top_builddir) $(G_IR_SCANNER) -v \
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ --namespace GVnc \
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ --nsversion 1.0 \
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ --include GObject-2.0 \
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(PREFIX_ARGS) \
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ --library=$(builddir)/libgvnc-1.0.la \
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ --add-include-path=$(top_srcdir) \
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ --add-include-path=$(srcdir) \
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ --add-include-path=$(builddir) \
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ --c-include="gvnc.h" \
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ --output $@ \
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ -I$(top_srcdir) \
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ -I$(srcdir) \
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ --verbose \
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ --pkg=gvnc-1.0 \
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(GVNC_INTROSPECTION_SRCS)
+-
+-@WITH_GOBJECT_INTROSPECTION_TRUE@GtkVnc-$(GTK_VNC_API_VERSION).gir: GVnc-1.0.gir libgtk-vnc-$(GTK_VNC_API_VERSION).la $(G_IR_SCANNER) Makefile.am
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(AM_V_GEN)PKG_CONFIG_PATH=$(top_builddir) $(G_IR_SCANNER) -v \
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ --namespace GtkVnc \
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ --nsversion $(GTK_VNC_API_VERSION) \
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ --include GObject-2.0 \
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ --include Gtk-$(GTK_API_VERSION) \
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ --include GVnc-1.0 \
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(PREFIX_ARGS) \
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ --library=$(builddir)/libgtk-vnc-$(GTK_VNC_API_VERSION).la \
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ --add-include-path=$(top_srcdir) \
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ --add-include-path=$(srcdir) \
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ --add-include-path=$(builddir) \
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ --c-include="gtk-vnc.h" \
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ --output $@ \
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ -I$(top_srcdir) \
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ -I$(srcdir) \
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ --verbose \
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ --pkg=gtk-vnc-$(GTK_VNC_API_VERSION) \
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(GTK_VNC_INTROSPECTION_SRCS)
+-
+-@WITH_GOBJECT_INTROSPECTION_TRUE@%.typelib: %.gir
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(AM_V_GEN)$(G_IR_COMPILER) \
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ --includedir=$(srcdir) \
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ --includedir=$(builddir) \
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ --includedir=$(girdir) \
+-@WITH_GOBJECT_INTROSPECTION_TRUE@ -o $@ $<
++-include $(INTROSPECTION_MAKEFILE)
++
++@HAVE_INTROSPECTION_TRUE@GVnc-1.0.gir: libgvnc-1.0.la
++
++@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@GtkVnc-1.0.gir: libgtk-vnc-$(GTK_VNC_API_VERSION).la
++@HAVE_GTK_2_FALSE@@HAVE_INTROSPECTION_TRUE@GtkVnc-2.0.gir: libgtk-vnc-2.0.la
+
+ -include $(top_srcdir)/git.mk
+
diff --git a/net/gtk-vnc/files/patch-src_continuation.h b/net/gtk-vnc/files/patch-src_continuation.h
index 549af869b..6b4878259 100644
--- a/net/gtk-vnc/files/patch-src_continuation.h
+++ b/net/gtk-vnc/files/patch-src_continuation.h
@@ -1,6 +1,6 @@
---- src/continuation.h.orig 2007-12-16 13:58:18.000000000 -0500
-+++ src/continuation.h 2007-12-16 13:58:39.000000000 -0500
-@@ -11,6 +11,7 @@
+--- src/continuation.h.orig 2011-02-18 16:29:10.000000000 +0000
++++ src/continuation.h 2011-02-20 17:50:37.000000000 +0000
+@@ -21,6 +21,7 @@
#ifndef _CONTINUATION_H_
#define _CONTINUATION_H_
diff --git a/net/gtk-vnc/files/patch-src_coroutine_ucontext.c b/net/gtk-vnc/files/patch-src_coroutine_ucontext.c
index 7a52f6e10..e50fb8576 100644
--- a/net/gtk-vnc/files/patch-src_coroutine_ucontext.c
+++ b/net/gtk-vnc/files/patch-src_coroutine_ucontext.c
@@ -1,6 +1,6 @@
---- src/coroutine_ucontext.c.orig 2007-12-16 13:59:13.000000000 -0500
-+++ src/coroutine_ucontext.c 2007-12-16 13:59:21.000000000 -0500
-@@ -48,7 +48,7 @@ int coroutine_init(struct coroutine *co)
+--- src/coroutine_ucontext.c.orig 2011-02-18 16:29:10.000000000 +0000
++++ src/coroutine_ucontext.c 2011-02-20 17:51:14.000000000 +0000
+@@ -60,7 +60,7 @@ int coroutine_init(struct coroutine *co)
co->cc.stack_size = co->stack_size;
co->cc.stack = mmap(0, co->stack_size,
PROT_READ | PROT_WRITE,
diff --git a/net/gtk-vnc/files/patch-src_gvnc.c b/net/gtk-vnc/files/patch-src_gvnc.c
deleted file mode 100644
index dcf479f23..000000000
--- a/net/gtk-vnc/files/patch-src_gvnc.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gvnc.c.orig 2012-03-17 12:30:12.000000000 -0500
-+++ src/gvnc.c 2012-03-17 12:31:37.000000000 -0500
-@@ -3543,7 +3543,7 @@
- gvnc->minor = 8;
- }
-
-- snprintf(version, 12, "RFB %03d.%03d\n", gvnc->major, gvnc->minor);
-+ snprintf(version, 13, "RFB %03d.%03d\n", gvnc->major, gvnc->minor);
- gvnc_write(gvnc, version, 12);
- gvnc_flush(gvnc);
- GVNC_DEBUG("Using version: %d.%d", gvnc->major, gvnc->minor);
diff --git a/net/gtk-vnc/files/patch-src_gvnc.h b/net/gtk-vnc/files/patch-src_gvnc.h
deleted file mode 100644
index 150b05330..000000000
--- a/net/gtk-vnc/files/patch-src_gvnc.h
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/gvnc.h.orig 2008-03-24 11:39:20.000000000 -0400
-+++ src/gvnc.h 2008-03-24 11:40:22.000000000 -0400
-@@ -3,6 +3,19 @@
-
- #include <glib.h>
- #include <stdint.h>
-+#ifdef __FreeBSD__
-+#include <sys/endian.h>
-+
-+#define __BYTE_ORDER _BYTE_ORDER
-+#define __LITTLE_ENDIAN _LITTLE_ENDIAN
-+#define __BIG_ENDIAN _BIG_ENDIAN
-+
-+#define bswap_16 bswap16
-+#define bswap_32 bswap32
-+#define bswap_64 bswap64
-+#else
-+#include <endian.h>
-+#endif
-
- struct gvnc;
-
diff --git a/net/gtk-vnc/pkg-plist b/net/gtk-vnc/pkg-plist
index e57277615..371858669 100644
--- a/net/gtk-vnc/pkg-plist
+++ b/net/gtk-vnc/pkg-plist
@@ -1,23 +1,68 @@
+bin/gvnccapture
+include/gtk-vnc-1.0/gtk-vnc.h
include/gtk-vnc-1.0/vncdisplay.h
-lib/libgtk-vnc-1.0.a
+include/gtk-vnc-1.0/vncdisplayenums.h
+include/gtk-vnc-1.0/vncgrabsequence.h
+include/gtk-vnc-1.0/vncimageframebuffer.h
+include/gvnc-1.0/gvnc.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
+lib/girepository-1.0/GVnc-1.0.typelib
+lib/girepository-1.0/GtkVnc-1.0.typelib
lib/libgtk-vnc-1.0.la
lib/libgtk-vnc-1.0.so
lib/libgtk-vnc-1.0.so.0
-%%PYTHON_SITELIBDIR%%/gtkvnc.a
-%%PYTHON_SITELIBDIR%%/gtkvnc.la
-%%PYTHON_SITELIBDIR%%/gtkvnc.so
+lib/libgvnc-1.0.la
+lib/libgvnc-1.0.so
+lib/libgvnc-1.0.so.0
libdata/pkgconfig/gtk-vnc-1.0.pc
+libdata/pkgconfig/gvnc-1.0.pc
+man/man1/gvnccapture.1.gz
+share/gir-1.0/GVnc-1.0.gir
+share/gir-1.0/GtkVnc-1.0.gir
+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/it/LC_MESSAGES/gtk-vnc.mo
+share/locale/ja/LC_MESSAGES/gtk-vnc.mo
+share/locale/ko/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/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
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/nds/LC_MESSAGES
+@dirrmtry share/locale/nds
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
@dirrm include/gtk-vnc-1.0
+@dirrm include/gvnc-1.0
diff --git a/net/libgweather3/Makefile b/net/libgweather/Makefile
index 5cbd7022c..da5d333af 100644
--- a/net/libgweather3/Makefile
+++ b/net/libgweather/Makefile
@@ -1,6 +1,6 @@
# Created by: Koop Mast <kwm@FreeBSD.org>
# $FreeBSD$
-# $MCom: ports/trunk/net/libgweather3/Makefile 18610 2013-06-30 16:33:05Z marcus $
+# $MCom$
PORTNAME= libgweather
PORTVERSION= 3.6.2
@@ -14,19 +14,18 @@ BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/mi
LIB_DEPENDS= libsoup-2.4.so:${PORTSDIR}/devel/libsoup
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
-CONFLICTS= libgweather-2.[0-9]*
-
-NO_STAGE= yes
-LATEST_LINK= libgweather3
USES= gettext gmake pathfix pkgconfig
USE_XZ= yes
INSTALLS_ICONS= yes
USE_GNOME= gnomehier gnomeprefix intlhack gconf2 ltverhack gtk30
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool
+GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
GLIB_SCHEMAS= org.gnome.GWeather.enums.xml \
org.gnome.GWeather.gschema.xml
+post-install:
+ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so.*
+
.include <bsd.port.mk>
diff --git a/net/libgweather3/distinfo b/net/libgweather/distinfo
index 5059f7980..5059f7980 100644
--- a/net/libgweather3/distinfo
+++ b/net/libgweather/distinfo
diff --git a/net/libgweather3/pkg-descr b/net/libgweather/pkg-descr
index 99ea830ef..99ea830ef 100644
--- a/net/libgweather3/pkg-descr
+++ b/net/libgweather/pkg-descr
diff --git a/net/libgweather3/pkg-plist b/net/libgweather/pkg-plist
index 4732bed13..5c3425bdf 100644
--- a/net/libgweather3/pkg-plist
+++ b/net/libgweather/pkg-plist
@@ -8,10 +8,9 @@ include/libgweather-3.0/libgweather/gweather-xml.h
include/libgweather-3.0/libgweather/location-entry.h
include/libgweather-3.0/libgweather/timezone-menu.h
include/libgweather-3.0/libgweather/gweather-weather.h
-lib/libgweather-3.a
lib/libgweather-3.la
lib/libgweather-3.so
-lib/libgweather-3.so.1
+lib/libgweather-3.so.2
libdata/pkgconfig/gweather-3.0.pc
%%DOCSDIR%%-3.0/GWeatherLocation.html
%%DOCSDIR%%-3.0/GWeatherLocationEntry.html
diff --git a/net/libproxy/Makefile b/net/libproxy/Makefile
index 0f1a92873..8ba30da56 100644
--- a/net/libproxy/Makefile
+++ b/net/libproxy/Makefile
@@ -1,6 +1,6 @@
# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
# $FreeBSD$
-# $MCom: ports/trunk/net/libproxy/Makefile 18610 2013-06-30 16:33:05Z marcus $
+# $MCom$
PORTNAME= libproxy
PORTVERSION= 0.4.6
@@ -11,7 +11,6 @@ MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
MAINTAINER= gnome@FreeBSD.org
COMMENT?= Library that provides automatic proxy configuration management
-NO_STAGE= yes
USES= cmake
USE_GNOME= gnomehier
@@ -67,6 +66,6 @@ CMAKE_ARGS+= -DWITH_MOZJS:BOOL=OFF
.endif
post-install:
- @${MKDIR} ${PREFIX}/lib/libproxy/${PORTVERSION}/modules/
+ @${MKDIR} ${STAGEDIR}${PREFIX}/lib/libproxy/${PORTVERSION}/modules/
.include <bsd.port.mk>
generated by cgit (git 2.34.1) at 2024-12-31 06:09:17 +0800