Index: devel/gsettings-desktop-schemas/Makefile =================================================================== diff -u -N -r31adf11acbf77d30f729f40744e4c03148081d01 -rd20d7214afa5aea2b0c107c3fef1fdeeb181f4a9 --- devel/gsettings-desktop-schemas/Makefile (.../Makefile) (revision 31adf11acbf77d30f729f40744e4c03148081d01) +++ devel/gsettings-desktop-schemas/Makefile (.../Makefile) (revision d20d7214afa5aea2b0c107c3fef1fdeeb181f4a9) @@ -1,7 +1,5 @@ -# $MidnightBSD$ - PORTNAME= gsettings-desktop-schemas -PORTVERSION= 3.28.0 +PORTVERSION= 3.28.1 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -14,10 +12,8 @@ PORTSCOUT= limitw:1,even -RUN_DEPENDS= ${LOCALBASE}/etc/fonts/conf.avail/31-cantarell.conf:x11-fonts/cantarell-fonts - # keep python here for gnome-desktop -USES= gettext gmake pathfix perl5 pkgconfig tar:xz python:2 +USES= gettext gmake gnome localbase pathfix perl5 pkgconfig tar:xz python:2 USE_PERL5= build USE_GNOME= intltool glib20 introspection:build GNU_CONFIGURE= yes Index: devel/gsettings-desktop-schemas/distinfo =================================================================== diff -u -N -r31adf11acbf77d30f729f40744e4c03148081d01 -rd20d7214afa5aea2b0c107c3fef1fdeeb181f4a9 --- devel/gsettings-desktop-schemas/distinfo (.../distinfo) (revision 31adf11acbf77d30f729f40744e4c03148081d01) +++ devel/gsettings-desktop-schemas/distinfo (.../distinfo) (revision d20d7214afa5aea2b0c107c3fef1fdeeb181f4a9) @@ -1,3 +1,3 @@ -TIMESTAMP = 1524854589 -SHA256 (gnome3/gsettings-desktop-schemas-3.28.0.tar.xz) = 4cb4cd7790b77e5542ec75275237613ad22f3a1f2f41903a298cf6cc996a9167 -SIZE (gnome3/gsettings-desktop-schemas-3.28.0.tar.xz) = 648296 +TIMESTAMP = 1567777237 +SHA256 (gnome3/gsettings-desktop-schemas-3.28.1.tar.xz) = f88ea6849ffe897c51cfeca5e45c3890010c82c58be2aee18b01349648e5502f +SIZE (gnome3/gsettings-desktop-schemas-3.28.1.tar.xz) = 652416 Index: net/glib-networking/files/patch-tls_gnutls_gtlsclientconnection-gnutls.c =================================================================== diff -u -N --- net/glib-networking/files/patch-tls_gnutls_gtlsclientconnection-gnutls.c (revision 162b9bf1c559d897b3d0e76e0857ecc531ab114a) +++ net/glib-networking/files/patch-tls_gnutls_gtlsclientconnection-gnutls.c (revision 0) @@ -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; - Index: x11-fonts/cantarell-fonts/Makefile =================================================================== diff -u -N -rec2ef352b1da3f12e917a145be5685d5a2598da7 -rd20d7214afa5aea2b0c107c3fef1fdeeb181f4a9 --- x11-fonts/cantarell-fonts/Makefile (.../Makefile) (revision ec2ef352b1da3f12e917a145be5685d5a2598da7) +++ x11-fonts/cantarell-fonts/Makefile (.../Makefile) (revision d20d7214afa5aea2b0c107c3fef1fdeeb181f4a9) @@ -1,21 +1,19 @@ -# $MidnightBSD$ - PORTNAME= cantarell-fonts -PORTVERSION= 0.0.25 +PORTVERSION= 0.101 CATEGORIES= x11-fonts gnome MASTER_SITES= GNOME MAINTAINER= ports@MidnightBSD.org COMMENT= Cantarell, a Humanist sans-serif font family LICENSE= other +LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig +BUILD_DEPENDS= appstream-util:devel/appstream-glib +LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig -USES= gmake pkgconfig tar:xz -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-configdir=${PREFIX}/etc/fonts/conf.avail +USES= gettext-tools fonts meson tar:xz FONTSDIR= share/fonts/cantarell -PLIST_SUB= FONTSDIR=${FONTSDIR} +NO_ARCH= yes .include Index: x11-fonts/cantarell-fonts/distinfo =================================================================== diff -u -N -rec2ef352b1da3f12e917a145be5685d5a2598da7 -rd20d7214afa5aea2b0c107c3fef1fdeeb181f4a9 --- x11-fonts/cantarell-fonts/distinfo (.../distinfo) (revision ec2ef352b1da3f12e917a145be5685d5a2598da7) +++ x11-fonts/cantarell-fonts/distinfo (.../distinfo) (revision d20d7214afa5aea2b0c107c3fef1fdeeb181f4a9) @@ -1,3 +1,3 @@ -TIMESTAMP = 1535343401 -SHA256 (cantarell-fonts-0.0.25.tar.xz) = 14a228aa0b516dfc367b434a850f955a00c57fc549cbb05348e2b150196a737f -SIZE (cantarell-fonts-0.0.25.tar.xz) = 351768 +TIMESTAMP = 1567777310 +SHA256 (cantarell-fonts-0.101.tar.xz) = 9b9e6e824fee7a809129f2238710f09d4ef4c6fe8fd7db1969bb5e228c3f7ee5 +SIZE (cantarell-fonts-0.101.tar.xz) = 263480 Index: x11-fonts/cantarell-fonts/pkg-plist =================================================================== diff -u -N -rec2ef352b1da3f12e917a145be5685d5a2598da7 -rd20d7214afa5aea2b0c107c3fef1fdeeb181f4a9 --- x11-fonts/cantarell-fonts/pkg-plist (.../pkg-plist) (revision ec2ef352b1da3f12e917a145be5685d5a2598da7) +++ x11-fonts/cantarell-fonts/pkg-plist (.../pkg-plist) (revision d20d7214afa5aea2b0c107c3fef1fdeeb181f4a9) @@ -1,7 +1,8 @@ -etc/fonts/conf.avail/31-cantarell.conf -share/fonts/cantarell/Cantarell-Bold.otf -share/fonts/cantarell/Cantarell-Regular.otf -%%FONTSDIR%%/Cantarell-BoldOblique.otf -%%FONTSDIR%%/Cantarell-Oblique.otf +%%FONTSDIR%%/Cantarell-Bold.otf +%%FONTSDIR%%/Cantarell-ExtraBold.otf +%%FONTSDIR%%/Cantarell-Light.otf +%%FONTSDIR%%/Cantarell-Regular.otf +%%FONTSDIR%%/Cantarell-Thin.otf +share/metainfo/org.gnome.cantarell.metainfo.xml @exec %D/bin/fc-cache -f -v %D/%%FONTSDIR%% @unexec %D/bin/fc-cache -f -v %D/%%FONTSDIR%%