From owner-svn-ports-all@FreeBSD.ORG Mon May 12 02:04:14 2014 Return-Path: Delivered-To: svn-ports-all@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 26069B21; Mon, 12 May 2014 02:04:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 130C32BAD; Mon, 12 May 2014 02:04:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4C24DJw030088; Mon, 12 May 2014 02:04:13 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4C24DdS030085; Mon, 12 May 2014 02:04:13 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201405120204.s4C24DdS030085@svn.freebsd.org> From: Dmitry Marakasov Date: Mon, 12 May 2014 02:04:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r353764 - head/net/glib-networking X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 May 2014 02:04:14 -0000 Author: amdmi3 Date: Mon May 12 02:04:13 2014 New Revision: 353764 URL: http://svnweb.freebsd.org/changeset/ports/353764 QAT: https://qat.redports.org/buildarchive/r353764/ Log: - Add OPTIONS - Remove dbus dependency (not used) PR: 187277 Submitted by: amdmi3 Approved by: maintainer timeout Modified: head/net/glib-networking/Makefile head/net/glib-networking/pkg-plist Modified: head/net/glib-networking/Makefile ============================================================================== --- head/net/glib-networking/Makefile Mon May 12 02:01:19 2014 (r353763) +++ head/net/glib-networking/Makefile Mon May 12 02:04:13 2014 (r353764) @@ -4,7 +4,7 @@ PORTNAME= glib-networking PORTVERSION= 2.36.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -12,14 +12,9 @@ DIST_SUBDIR= gnome2 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= libgnutls.so:${PORTSDIR}/security/gnutls \ - libgcrypt.so:${PORTSDIR}/security/libgcrypt \ - libdbus-1.so:${PORTSDIR}/devel/dbus \ - libproxy.so:${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 +RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss +LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt GNU_CONFIGURE= yes USES= gettext gmake libtool:keepla pathfix pkgconfig tar:xz @@ -29,6 +24,23 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip +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= libp11-kit.so:${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 Modified: head/net/glib-networking/pkg-plist ============================================================================== --- head/net/glib-networking/pkg-plist Mon May 12 02:01:19 2014 (r353763) +++ head/net/glib-networking/pkg-plist Mon May 12 02:04:13 2014 (r353764) @@ -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 @@ share/locale/zh_TW/LC_MESSAGES/glib-netw @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