From owner-svn-ports-head@freebsd.org Sat Oct 22 21:18:13 2016 Return-Path: Delivered-To: svn-ports-head@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 EE2A2C1D1AE; Sat, 22 Oct 2016 21:18:13 +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 A0B0FFD5; Sat, 22 Oct 2016 21:18:13 +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 u9MLICOm022160; Sat, 22 Oct 2016 21:18:12 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9MLIC6O022159; Sat, 22 Oct 2016 21:18:12 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201610222118.u9MLIC6O022159@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Sat, 22 Oct 2016 21:18:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r424488 - 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-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Oct 2016 21:18:14 -0000 Author: marino Date: Sat Oct 22 21:18:12 2016 New Revision: 424488 URL: https://svnweb.freebsd.org/changeset/ports/424488 Log: deskutils/gnome-contacts: restore CHEESE option Since version 3.18, the --without-cheese configuration argument didn't work out of the box. However, touching a couple of files causes c source files to be regenerated enabling the option to be honored. This commit restores the options as they were before r421349 but now disabling the default CHEESE option works. PR: 207426 Approved by: follow-on commit (r421349) Modified: head/deskutils/gnome-contacts/Makefile Modified: head/deskutils/gnome-contacts/Makefile ============================================================================== --- head/deskutils/gnome-contacts/Makefile Sat Oct 22 21:07:00 2016 (r424487) +++ head/deskutils/gnome-contacts/Makefile Sat Oct 22 21:18:12 2016 (r424488) @@ -13,7 +13,6 @@ 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 \ @@ -39,7 +38,6 @@ 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 @@ -52,6 +50,11 @@ OPTIONS_SUB= yes OPTIONS_DEFINE= MANPAGES NLS OPTIONS_DEFAULT=MANPAGES +OPTIONS_DEFINE_i386= CHEESE +OPTIONS_DEFINE_amd64= CHEESE +OPTIONS_DEFAULT_i386= CHEESE +OPTIONS_DEFAULT_amd64= CHEESE + MANPAGES_CONFIGURE_ENABLE= man-pages MANPAGES_USE= GNOME=libxslt:build MANPAGES_BUILD_DEPENDS= docbook-xml>=0:textproc/docbook-xml \ @@ -60,5 +63,13 @@ MANPAGES_BUILD_DEPENDS= docbook-xml>=0:t NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext +CHEESE_DESC= Cheese webcam support +CHEESE_CONFIGURE_WITH= cheese +CHEESE_LIB_DEPENDS= libcheese-gtk.so:multimedia/cheese + +post-patch: + # touch vala sources to force regen c sources to honor cheese setting + ${TOUCH} ${WRKSRC}/src/main.vala \ + ${WRKSRC}/src/contacts-avatar-dialog.vala .include