svn commit: r496640 - head/net-im/folks

[Koop Mast]

Author: kwm
Date: Sat Mar 23 11:44:51 2019
New Revision: 496640
URL: https://svnweb.freebsd.org/changeset/ports/496640

Log:
  Drop libsocialweb support, it is archived upstream.
  
  libsocialweb is broken after base r345349. While here pet portlint.
  
  PR:		236141

Modified:
  head/net-im/folks/Makefile
  head/net-im/folks/pkg-plist

Modified: head/net-im/folks/Makefile
==============================================================================
--- head/net-im/folks/Makefile	Sat Mar 23 11:24:33 2019	(r496639)
+++ head/net-im/folks/Makefile	Sat Mar 23 11:44:51 2019	(r496640)
@@ -3,12 +3,12 @@
 
 PORTNAME=	folks
 PORTVERSION=	0.11.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im
 MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome at FreeBSD.org
-COMMENT=	library to aggregates people from multiple sources
+COMMENT=	Library to aggregates people from multiple sources
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
@@ -26,12 +26,14 @@ LIB_DEPENDS=	libgee-0.8.so:devel/libgee \
 		libdbus-glib-1.so:devel/dbus-glib \
 		libdbus-1.so:devel/dbus
 
-USE_LDCONFIG=	yes
-USES=		gettext gmake libtool localbase pathfix pkgconfig \
+USES=		gettext gmake gnome libtool localbase pathfix pkgconfig \
 		readline sqlite tar:xz
 USE_GNOME=	evolutiondataserver3 intlhack introspection:build
+USE_LDCONFIG=	yes
+
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-bluez-backend
+CONFIGURE_ARGS=	--disable-bluez-backend \
+		--disable-libsocialweb-backend
 CONFIGURE_ENV+=	ac_cv_path_EGREP=${LOCALBASE}/bin/egrep
 INSTALL_TARGET=	install-strip
 
@@ -40,13 +42,9 @@ GLIB_SCHEMAS=	org.freedesktop.folks.gschema.xml
 PLIST_SUB=	LIBVER=25 VERSION=43 LIBVERLONG=25.18.4
 
 OPTIONS_SUB=	yes
-OPTIONS_DEFINE=	SOCIALWEB TRACKER
-OPTIONS_DEFAULT=SOCIALWEB TRACKER
-SOCIALWEB_DESC=	Social web backend
+OPTIONS_DEFINE=	TRACKER
+OPTIONS_DEFAULT=TRACKER
 TRACKER_DESC=	Tracker backend
-
-SOCIALWEB_CONFIGURE_ENABLE=	libsocialweb-backend
-SOCIALWEB_LIB_DEPENDS=	libsocialweb.so:www/libsocialweb
 
 TRACKER_CONFIGURE_ENABLE=	tracker-backend
 TRACKER_LIB_DEPENDS=	libtracker-control-2.0.so:sysutils/tracker

Modified: head/net-im/folks/pkg-plist
==============================================================================
--- head/net-im/folks/pkg-plist	Sat Mar 23 11:24:33 2019	(r496639)
+++ head/net-im/folks/pkg-plist	Sat Mar 23 11:44:51 2019	(r496640)
@@ -1,6 +1,5 @@
 bin/folks-import
 bin/folks-inspect
-%%SOCIALWEB%%include/folks/folks-libsocialweb.h
 include/folks/folks-dummy.h
 include/folks/folks-eds.h
 include/folks/folks-telepathy.h
@@ -9,14 +8,12 @@ include/folks/folks.h
 lib/folks/%%VERSION%%/backends/dummy/dummy.so
 lib/folks/%%VERSION%%/backends/eds/eds.so
 lib/folks/%%VERSION%%/backends/key-file/key-file.so
-%%SOCIALWEB%%lib/folks/%%VERSION%%/backends/libsocialweb/libsocialweb.so
 lib/folks/%%VERSION%%/backends/ofono/ofono.so
 lib/folks/%%VERSION%%/backends/telepathy/telepathy.so
 %%TRACKER%%lib/folks/%%VERSION%%/backends/tracker/tracker.so
 lib/girepository-1.0/Folks-0.6.typelib
 lib/girepository-1.0/FolksDummy-0.6.typelib
 lib/girepository-1.0/FolksEds-0.6.typelib
-%%SOCIALWEB%%lib/girepository-1.0/FolksLibsocialweb-0.6.typelib
 lib/girepository-1.0/FolksTelepathy-0.6.typelib
 %%TRACKER%%lib/girepository-1.0/FolksTracker-0.6.typelib
 lib/libfolks-dummy.so
@@ -25,9 +22,6 @@ lib/libfolks-dummy.so.%%LIBVERLONG%%
 lib/libfolks-eds.so
 lib/libfolks-eds.so.%%LIBVER%%
 lib/libfolks-eds.so.%%LIBVERLONG%%
-%%SOCIALWEB%%lib/libfolks-libsocialweb.so
-%%SOCIALWEB%%lib/libfolks-libsocialweb.so.%%LIBVER%%
-%%SOCIALWEB%%lib/libfolks-libsocialweb.so.%%LIBVERLONG%%
 lib/libfolks-telepathy.so
 lib/libfolks-telepathy.so.%%LIBVER%%
 lib/libfolks-telepathy.so.%%LIBVERLONG%%
@@ -39,7 +33,6 @@ lib/libfolks.so.%%LIBVER%%
 lib/libfolks.so.%%LIBVERLONG%%
 libdata/pkgconfig/folks-dummy.pc
 libdata/pkgconfig/folks-eds.pc
-%%SOCIALWEB%%libdata/pkgconfig/folks-libsocialweb.pc
 libdata/pkgconfig/folks-telepathy.pc
 %%TRACKER%%libdata/pkgconfig/folks-tracker.pc
 libdata/pkgconfig/folks.pc
@@ -48,7 +41,6 @@ share/gir-1.0/Folks-0.6.gir
 share/gir-1.0/FolksDummy-0.6.gir
 share/gir-1.0/FolksEds-0.6.gir
 %%TRACKER%%share/gir-1.0/FolksTracker-0.6.gir
-%%SOCIALWEB%%share/gir-1.0/FolksLibsocialweb-0.6.gir
 share/gir-1.0/FolksTelepathy-0.6.gir
 share/locale/ar/LC_MESSAGES/folks.mo
 share/locale/as/LC_MESSAGES/folks.mo
@@ -115,8 +107,6 @@ share/vala/vapi/folks-dummy.deps
 share/vala/vapi/folks-dummy.vapi
 share/vala/vapi/folks-eds.deps
 share/vala/vapi/folks-eds.vapi
-%%SOCIALWEB%%share/vala/vapi/folks-libsocialweb.deps
-%%SOCIALWEB%%share/vala/vapi/folks-libsocialweb.vapi
 share/vala/vapi/folks-telepathy.deps
 share/vala/vapi/folks-telepathy.vapi
 %%TRACKER%%share/vala/vapi/folks-tracker.deps