From owner-freebsd-gnome@FreeBSD.ORG Wed Mar 5 10:19:15 2014 Return-Path: Delivered-To: gnome@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CA6091E6; Wed, 5 Mar 2014 10:19:15 +0000 (UTC) Received: from smtpout6.timeweb.ru (smtpout6.timeweb.ru [92.53.117.39]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 84ACC62C; Wed, 5 Mar 2014 10:19:15 +0000 (UTC) Received: from [213.148.20.85] (helo=hive.panopticon) by smtp.timeweb.ru with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1WL8un-0006Mu-Ci; Wed, 05 Mar 2014 14:19:05 +0400 Received: from hades.panopticon (hades.panopticon [192.168.0.32]) by hive.panopticon (Postfix) with ESMTP id E259C65; Wed, 5 Mar 2014 14:19:04 +0400 (MSK) Received: by hades.panopticon (Postfix, from userid 1000) id BFA4D1D687; Wed, 5 Mar 2014 14:19:04 +0400 (MSK) To: FreeBSD-gnats-submit@freebsd.org Subject: [PATCH] net/glib-networking: optionize, stage From: Dmitry Marakasov X-send-pr-version: 3.113 X-GNATS-Notify: Message-Id: <20140305101904.BFA4D1D687@hades.panopticon> Date: Wed, 5 Mar 2014 14:19:04 +0400 (MSK) Cc: gnome@FreeBSD.org X-BeenThere: freebsd-gnome@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: GNOME for FreeBSD -- porting and maintaining List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Mar 2014 10:19:15 -0000 >Submitter-Id: current-users >Originator: Dmitry Marakasov >Organization: >Confidential: no >Synopsis: [PATCH] net/glib-networking: optionize, stage >Severity: non-critical >Priority: low >Category: ports >Class: change-request >Release: FreeBSD 10.0-RELEASE amd64 >Environment: System: FreeBSD hades.panopticon 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260807: Fri Jan 17 13:14:28 MSK >Description: - Add OPTIONS - Remove dbus dependency (dbus is not used) - Support staging - Use new LIB_DEPENDS syntax Port maintainer (gnome@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 1.00.2014.02.18 (mode: change, diff: ports) >How-To-Repeat: >Fix: --- glib-networking-2.36.2.patch begins here --- diff -ruN /usr/ports/net/glib-networking/Makefile ./Makefile --- /usr/ports/net/glib-networking/Makefile 2013-09-21 02:10:23.000000000 +0400 +++ ./Makefile 2014-03-05 14:13:31.758413446 +0400 @@ -4,6 +4,7 @@ PORTNAME= glib-networking PORTVERSION= 2.36.2 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -11,14 +12,9 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Network-related giomodules for glib -BUILD_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \ - gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas -LIB_DEPENDS= gnutls:${PORTSDIR}/security/gnutls \ - gcrypt:${PORTSDIR}/security/libgcrypt \ - dbus-1:${PORTSDIR}/devel/dbus \ - proxy:${PORTSDIR}/net/libproxy -RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \ - gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas +BUILD_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss +LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt +RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss USE_XZ= yes GNU_CONFIGURE= yes @@ -28,7 +24,23 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -NO_STAGE= yes +OPTIONS_DEFINE= GNUTLS PKCS11 PROXY GNOME_PROXY +OPTIONS_DEFAULT=GNUTLS PKCS11 PROXY GNOME_PROXY +OPTIONS_SUB= yes + +GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls +GNUTLS_CONFIGURE_WITH= gnutls +PKCS11_DESC= Enable PKCS11 support (requires GNUTLS) +PKCS11_LIB_DEPENDS= p11-kit:${PORTSDIR}/security/p11-kit \ + libgnutls.so:${PORTSDIR}/security/gnutls +PKCS11_CONFIGURE_WITH= pkcs11 +PROXY_LIB_DEPENDS= libproxy.so:${PORTSDIR}/net/libproxy +PROXY_CONFIGURE_WITH= libproxy +GNOME_PROXY_DESC= Support for GNOME proxy configuration +GNOME_PROXY_BUILD_DEPENDS= gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas +GNOME_PROXY_RUN_DEPENDS= gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas +GNOME_PROXY_CONFIGURE_WITH= gnome-proxy + post-patch: @${REINPLACE_CMD} -e' s|-Wmissing-include-dirs||g' ${WRKSRC}/configure diff -ruN /usr/ports/net/glib-networking/pkg-plist ./pkg-plist --- /usr/ports/net/glib-networking/pkg-plist 2013-07-31 15:57:45.000000000 +0400 +++ ./pkg-plist 2014-03-05 14:06:05.017443957 +0400 @@ -1,14 +1,14 @@ -lib/gio/modules/libgiognomeproxy.a -lib/gio/modules/libgiognomeproxy.la -lib/gio/modules/libgiognomeproxy.so -lib/gio/modules/libgiognutls.a -lib/gio/modules/libgiognutls.la -lib/gio/modules/libgiognutls.so -lib/gio/modules/libgiolibproxy.a -lib/gio/modules/libgiolibproxy.la -lib/gio/modules/libgiolibproxy.so -libexec/glib-pacrunner -share/dbus-1/services/org.gtk.GLib.PACRunner.service +%%GNOME_PROXY%%lib/gio/modules/libgiognomeproxy.a +%%GNOME_PROXY%%lib/gio/modules/libgiognomeproxy.la +%%GNOME_PROXY%%lib/gio/modules/libgiognomeproxy.so +%%GNUTLS%%lib/gio/modules/libgiognutls.a +%%GNUTLS%%lib/gio/modules/libgiognutls.la +%%GNUTLS%%lib/gio/modules/libgiognutls.so +%%PROXY%%lib/gio/modules/libgiolibproxy.a +%%PROXY%%lib/gio/modules/libgiolibproxy.la +%%PROXY%%lib/gio/modules/libgiolibproxy.so +%%PROXY%%libexec/glib-pacrunner +%%PROXY%%share/dbus-1/services/org.gtk.GLib.PACRunner.service share/locale/an/LC_MESSAGES/glib-networking.mo share/locale/ar/LC_MESSAGES/glib-networking.mo share/locale/as/LC_MESSAGES/glib-networking.mo @@ -93,5 +93,7 @@ @dirrmtry share/locale/as @dirrmtry share/locale/an/LC_MESSAGES @dirrmtry share/locale/an +%%PROXY%%@dirrmtry share/dbus-1/services +%%PROXY%%@dirrmtry share/dbus-1 @exec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true @unexec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true --- glib-networking-2.36.2.patch ends here ---