Date: Sat, 22 Oct 2016 21:18:12 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r424488 - head/deskutils/gnome-contacts Message-ID: <201610222118.u9MLIC6O022159@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610222118.u9MLIC6O022159>