From owner-svn-ports-all@freebsd.org Sun Sep 4 20:52:53 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BB222B713C9; Sun, 4 Sep 2016 20:52:53 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 61762F53; Sun, 4 Sep 2016 20:52:53 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u84KqqoX027214; Sun, 4 Sep 2016 20:52:52 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u84Kqqr0027213; Sun, 4 Sep 2016 20:52:52 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201609042052.u84Kqqr0027213@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Sun, 4 Sep 2016 20:52:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421349 - head/deskutils/gnome-contacts 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.23 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: Sun, 04 Sep 2016 20:52:53 -0000 Author: marino Date: Sun Sep 4 20:52:52 2016 New Revision: 421349 URL: https://svnweb.freebsd.org/changeset/ports/421349 Log: deskutils/gnome-contacts: remove CHEESE option Since version 3.18 was introduced (Feb 2016), it's not been possible to build gnome-contacts with the CHEESE option turned off. Since it appears to be required now, remove this option and set the configuration and dependencies for cheese unconditionally. PR: 207426 Approved by: maintainer timeout (6.5 months) Modified: head/deskutils/gnome-contacts/Makefile Modified: head/deskutils/gnome-contacts/Makefile ============================================================================== --- head/deskutils/gnome-contacts/Makefile Sun Sep 4 19:18:10 2016 (r421348) +++ head/deskutils/gnome-contacts/Makefile Sun Sep 4 20:52:52 2016 (r421349) @@ -13,6 +13,7 @@ COMMENT= Contacts manager for gnome BUILD_DEPENDS= vala>=0.14.0:lang/vala LIB_DEPENDS= libgoa-1.0.so:net/gnome-online-accounts \ libchamplain-0.12.so:graphics/libchamplain \ + libcheese-gtk.so:multimedia/cheese \ libclutter-gtk-1.0.so:graphics/clutter-gtk3 \ libgee-0.8.so:devel/libgee \ libfolks.so:net-im/folks \ @@ -38,6 +39,7 @@ USE_GNOME= cairo evolutiondataserver3 gd USE_GL= egl USES= gettext gmake gnome pathfix perl5 pkgconfig sqlite tar:xz GNU_CONFIGURE= yes +CONFIGURE_ARGS= --with-cheese CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -46,20 +48,10 @@ MAKE_ENV= XDG_CACHE_HOME=${WRKDIR} GLIB_SCHEMAS= org.gnome.Contacts.enums.xml \ org.gnome.Contacts.gschema.xml -CHEESE_DESC= Cheese webcam support - OPTIONS_SUB= yes OPTIONS_DEFINE= MANPAGES NLS OPTIONS_DEFAULT=MANPAGES -OPTIONS_DEFINE_i386= CHEESE -OPTIONS_DEFAULT_i386= CHEESE -OPTIONS_DEFINE_amd64= CHEESE -OPTIONS_DEFAULT_amd64= CHEESE - -CHEESE_CONFIGURE_WITH= cheese -CHEESE_LIB_DEPENDS= libcheese-gtk.so:multimedia/cheese - MANPAGES_CONFIGURE_ENABLE= man-pages MANPAGES_USE= GNOME=libxslt:build MANPAGES_BUILD_DEPENDS= docbook-xml>=0:textproc/docbook-xml \