summaryrefslogtreecommitdiff
path: root/net/glib-networking
diff options
context:
space:
mode:
authorKoop Mast <kwm@FreeBSD.org>2018-09-30 11:58:29 +0000
committerKoop Mast <kwm@FreeBSD.org>2018-09-30 11:58:29 +0000
commit951c1f5d1c7354f058f5919d858dbb0c174dc73e (patch)
tree6146e775343aaf339921799078894a48fef9aa15 /net/glib-networking
parentRemove expired ports: (diff)
The FreeBSD GNOME team proudly presents GNOME 3.28 for FreeBSD.
The offical GNOME 3.28 release notes can be found at https://help.gnome.org/misc/release-notes/3.28/ Thanks to Antoine Brodin for running the exp-runs. PR: 229761
Diffstat (limited to 'net/glib-networking')
-rw-r--r--net/glib-networking/Makefile22
-rw-r--r--net/glib-networking/distinfo6
-rw-r--r--net/glib-networking/files/patch-tls_gnutls_gtlsclientconnection-gnutls.c30
-rw-r--r--net/glib-networking/pkg-plist7
4 files changed, 16 insertions, 49 deletions
diff --git a/net/glib-networking/Makefile b/net/glib-networking/Makefile
index c200c0306132..1b15921a78e6 100644
--- a/net/glib-networking/Makefile
+++ b/net/glib-networking/Makefile
@@ -2,19 +2,20 @@
# $FreeBSD$
PORTNAME= glib-networking
-PORTVERSION= 2.50.0
-PORTREVISION= 1
+PORTVERSION= 2.56.1
CATEGORIES= net
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome2
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Network-related giomodules for glib
+LICENSE= LGPL21
+LICENSE_FILE= ${WRKSRC}/COPYING
+
BUILD_DEPENDS= ca_root_nss>=0:security/ca_root_nss \
gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
LIB_DEPENDS= libgnutls.so:security/gnutls \
- libgcrypt.so:security/libgcrypt \
libp11-kit.so:security/p11-kit \
libdbus-1.so:devel/dbus \
libproxy.so:net/libproxy
@@ -23,16 +24,15 @@ RUN_DEPENDS= ca_root_nss>=0:security/ca_root_nss \
PORTSCOUT= limitw:1,even
-USES= gettext gmake gnome libtool localbase pathfix pkgconfig tar:xz
-USE_GNOME= glib20 intltool
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-ca-certificates=${LOCALBASE}/share/certs/ca-root-nss.crt
-INSTALL_TARGET= install-strip
+USES= gettext gnome localbase meson pkgconfig \
+ python:3.6+,build tar:xz
+USE_GNOME= glib20
+MESON_ARGS= -Dca_certificates_path="${LOCALBASE}/share/certs/ca-root-nss.crt"
-post-patch:
- @${REINPLACE_CMD} -e' s|-Wmissing-include-dirs||g' ${WRKSRC}/configure
+BINARY_ALIAS= python3=${PYTHON_VERSION}
post-install:
${RM} -r ${STAGEDIR}${PREFIX}/lib/systemd
+ ${RM} -r ${STAGEDIR}${PREFIX}/share/installed-tests
.include <bsd.port.mk>
diff --git a/net/glib-networking/distinfo b/net/glib-networking/distinfo
index eb74b64b538e..199150f32ea1 100644
--- a/net/glib-networking/distinfo
+++ b/net/glib-networking/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1491088154
-SHA256 (gnome2/glib-networking-2.50.0.tar.xz) = 3f1a442f3c2a734946983532ce59ed49120319fdb10c938447c373d5e5286bee
-SIZE (gnome2/glib-networking-2.50.0.tar.xz) = 435380
+TIMESTAMP = 1527916290
+SHA256 (gnome/glib-networking-2.56.1.tar.xz) = df47b0e0a037d2dcf6b1846cbdf68dd4b3cc055e026bb40c4a55f19f29f635c8
+SIZE (gnome/glib-networking-2.56.1.tar.xz) = 164852
diff --git a/net/glib-networking/files/patch-tls_gnutls_gtlsclientconnection-gnutls.c b/net/glib-networking/files/patch-tls_gnutls_gtlsclientconnection-gnutls.c
deleted file mode 100644
index 0e8e34509232..000000000000
--- a/net/glib-networking/files/patch-tls_gnutls_gtlsclientconnection-gnutls.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- tls/gnutls/gtlsclientconnection-gnutls.c.orig 2015-04-30 17:57:54.000000000 +0200
-+++ tls/gnutls/gtlsclientconnection-gnutls.c 2015-08-06 17:06:17.000000000 +0200
-@@ -322,7 +322,8 @@
-
- g_assert (inout_error != NULL);
-
-- if (g_error_matches (*inout_error, G_TLS_ERROR, G_TLS_ERROR_NOT_TLS) &&
-+ if (inout_error &&
-+ g_error_matches (*inout_error, G_TLS_ERROR, G_TLS_ERROR_NOT_TLS) &&
- gnutls->priv->cert_requested)
- {
- g_clear_error (inout_error);
-@@ -339,7 +340,7 @@
- }
-
- resumed = gnutls_session_is_resumed (g_tls_connection_gnutls_get_session (conn));
-- if (*inout_error || !resumed)
-+ if (inout_error && *inout_error || !resumed)
- {
- /* Clear session data since the server did not accept what we provided. */
- gnutls->priv->session_data_override = FALSE;
-@@ -348,7 +349,7 @@
- g_tls_backend_gnutls_remove_session (GNUTLS_CLIENT, gnutls->priv->session_id);
- }
-
-- if (!*inout_error && !resumed)
-+ if (inout_error && !*inout_error && !resumed)
- {
- gnutls_datum_t session_datum;
-
diff --git a/net/glib-networking/pkg-plist b/net/glib-networking/pkg-plist
index 6877e3b40a1f..3059116d4a38 100644
--- a/net/glib-networking/pkg-plist
+++ b/net/glib-networking/pkg-plist
@@ -1,8 +1,5 @@
-lib/gio/modules/libgiognomeproxy.a
lib/gio/modules/libgiognomeproxy.so
-lib/gio/modules/libgiognutls.a
lib/gio/modules/libgiognutls.so
-lib/gio/modules/libgiolibproxy.a
lib/gio/modules/libgiolibproxy.so
libexec/glib-pacrunner
share/dbus-1/services/org.gtk.GLib.PACRunner.service
@@ -34,6 +31,7 @@ share/locale/gl/LC_MESSAGES/glib-networking.mo
share/locale/gu/LC_MESSAGES/glib-networking.mo
share/locale/he/LC_MESSAGES/glib-networking.mo
share/locale/hi/LC_MESSAGES/glib-networking.mo
+share/locale/hr/LC_MESSAGES/glib-networking.mo
share/locale/hu/LC_MESSAGES/glib-networking.mo
share/locale/id/LC_MESSAGES/glib-networking.mo
share/locale/it/LC_MESSAGES/glib-networking.mo
@@ -47,6 +45,7 @@ share/locale/lv/LC_MESSAGES/glib-networking.mo
share/locale/ml/LC_MESSAGES/glib-networking.mo
share/locale/mr/LC_MESSAGES/glib-networking.mo
share/locale/nb/LC_MESSAGES/glib-networking.mo
+share/locale/ne/LC_MESSAGES/glib-networking.mo
share/locale/nl/LC_MESSAGES/glib-networking.mo
share/locale/oc/LC_MESSAGES/glib-networking.mo
share/locale/or/LC_MESSAGES/glib-networking.mo
@@ -72,5 +71,3 @@ share/locale/vi/LC_MESSAGES/glib-networking.mo
share/locale/zh_CN/LC_MESSAGES/glib-networking.mo
share/locale/zh_HK/LC_MESSAGES/glib-networking.mo
share/locale/zh_TW/LC_MESSAGES/glib-networking.mo
-@postexec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true
-@postunexec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true