svn commit: r421349 - head/deskutils/gnome-contacts

[John Marino]

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 \