diff options
author | John Marino <marino@FreeBSD.org> | 2016-09-04 20:52:52 +0000 |
---|---|---|
committer | John Marino <marino@FreeBSD.org> | 2016-09-04 20:52:52 +0000 |
commit | c3a2647364641ecd359a9c7bd57cc2e75a6d8fff (patch) | |
tree | 7fda4ba1afe37ffdf4091ed7df3736aebf02b47c /deskutils/gnome-contacts | |
parent | ca47d72e6fceffb9ed923e8eef4bc25f5e65544e (diff) | |
download | ports-c3a2647364641ecd359a9c7bd57cc2e75a6d8fff.tar.gz ports-c3a2647364641ecd359a9c7bd57cc2e75a6d8fff.zip |
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)
Notes
Notes:
svn path=/head/; revision=421349
Diffstat (limited to 'deskutils/gnome-contacts')
-rw-r--r-- | deskutils/gnome-contacts/Makefile | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/deskutils/gnome-contacts/Makefile b/deskutils/gnome-contacts/Makefile index 1fcb0d5c05bb..2e11e32b5591 100644 --- a/deskutils/gnome-contacts/Makefile +++ b/deskutils/gnome-contacts/Makefile @@ -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 gdkpixbuf2 glib20 gnomedesktop3 \ 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 \ |