summaryrefslogtreecommitdiffstats
path: root/net-im
diff options
context:
space:
mode:
Diffstat (limited to 'net-im')
-rw-r--r--net-im/folks/Makefile31
-rw-r--r--net-im/folks/distinfo4
-rw-r--r--net-im/folks/pkg-plist35
3 files changed, 21 insertions, 49 deletions
diff --git a/net-im/folks/Makefile b/net-im/folks/Makefile
index 9788bb51f..817d51389 100644
--- a/net-im/folks/Makefile
+++ b/net-im/folks/Makefile
@@ -3,7 +3,7 @@
# $MCom$
PORTNAME= folks
-PORTVERSION= 0.9.7.1
+PORTVERSION= 0.9.8
CATEGORIES= net-im
MASTER_SITES= GNOME
@@ -19,7 +19,7 @@ LIB_DEPENDS= libgee-0.8.so:${PORTSDIR}/devel/libgee \
CONFLICTS= folks-0.4.[0-9]*
USE_LDCONFIG= yes
-USES= gettext libtool:keepla gmake pathfix pkgconfig tar:xz
+USES= gettext libtool gmake pathfix pkgconfig tar:xz
USE_GNOME= evolutiondataserver3 gnomehier intlhack \
introspection:build
GNU_CONFIGURE= yes
@@ -30,32 +30,17 @@ INSTALL_TARGET= install-strip
GLIB_SCHEMAS= org.freedesktop.folks.gschema.xml
-PLIST_SUB= LIBVER=25 VERSION=42 LIBVERLONG=25.17.0
+PLIST_SUB= LIBVER=25 VERSION=42 LIBVERLONG=25.17.1
+OPTIONS_SUB= yes
OPTIONS_DEFINE= SOCIALWEB TRACKER
OPTIONS_DEFAULT=SOCIALWEB TRACKER
SOCIALWEB_DESC= Social web backend
TRACKER_DESC= Tracker backend
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MSOCIALWEB}
-LIB_DEPENDS+= libsocialweb.so:${PORTSDIR}/www/libsocialweb
-CONFIGURE_ARGS+=--enable-libsocialweb-backend
-PLIST_SUB+= SOCIAL=""
-.else
-CONFIGURE_ARGS+=--disable-libsocialweb-backend
-PLIST_SUB+= SOCIAL="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MTRACKER}
-LIB_DEPENDS+= libtracker-control-1.0.so:${PORTSDIR}/sysutils/tracker
-CONFIGURE_ARGS+=--enable-tracker-backend
-PLIST_SUB+= TRACKER=""
-.else
-CONFIGURE_ARGS+=--disable-tracker-backend
-PLIST_SUB+= TRACKER="@comment "
-.endif
+SOCIALWEB_CONFIGURE_ENABLE= libsocialweb-backend
+SOCIALWEB_LIB_DEPENDS= libsocialweb.so:${PORTSDIR}/www/libsocialweb
+TRACKER_CONFIGURE_ENABLE= tracker-backend
+TRACKER_LIB_DEPENDS= libtracker-control-1.0.so:${PORTSDIR}/sysutils/tracker
post-patch:
@${REINPLACE_CMD} -e 's|TRACKER_SPARQL_MAJOR=0.16|TRACKER_SPARQL_MAJOR=1.0|g' \
diff --git a/net-im/folks/distinfo b/net-im/folks/distinfo
index 00423b593..8a7fdf85c 100644
--- a/net-im/folks/distinfo
+++ b/net-im/folks/distinfo
@@ -1,2 +1,2 @@
-SHA256 (folks-0.9.7.1.tar.xz) = 8d53cf9f6ccb7d9499a352c7367170b103b14a7d59da0bd06dda8c57b689276a
-SIZE (folks-0.9.7.1.tar.xz) = 1860208
+SHA256 (folks-0.9.8.tar.xz) = d2d1da6ba107aa077efdcb05df6250ddc225f1ac7275f47888976b06e3d08b25
+SIZE (folks-0.9.8.tar.xz) = 1862184
diff --git a/net-im/folks/pkg-plist b/net-im/folks/pkg-plist
index 89c030855..93c092d4b 100644
--- a/net-im/folks/pkg-plist
+++ b/net-im/folks/pkg-plist
@@ -1,58 +1,45 @@
bin/folks-import
bin/folks-inspect
-%%SOCIAL%%include/folks/folks-libsocialweb.h
+%%SOCIALWEB%%include/folks/folks-libsocialweb.h
include/folks/folks-dummy.h
include/folks/folks-eds.h
include/folks/folks-telepathy.h
%%TRACKER%%include/folks/folks-tracker.h
include/folks/folks.h
-lib/folks/%%VERSION%%/backends/dummy/dummy.la
lib/folks/%%VERSION%%/backends/dummy/dummy.so
-lib/folks/%%VERSION%%/backends/eds/eds.la
lib/folks/%%VERSION%%/backends/eds/eds.so
-lib/folks/%%VERSION%%/backends/key-file/key-file.la
lib/folks/%%VERSION%%/backends/key-file/key-file.so
-%%SOCIAL%%lib/folks/%%VERSION%%/backends/libsocialweb/libsocialweb.la
-%%SOCIAL%%lib/folks/%%VERSION%%/backends/libsocialweb/libsocialweb.so
-lib/folks/%%VERSION%%/backends/ofono/ofono.la
+%%SOCIALWEB%%lib/folks/%%VERSION%%/backends/libsocialweb/libsocialweb.so
lib/folks/%%VERSION%%/backends/ofono/ofono.so
-lib/folks/%%VERSION%%/backends/telepathy/telepathy.la
lib/folks/%%VERSION%%/backends/telepathy/telepathy.so
-%%TRACKER%%lib/folks/%%VERSION%%/backends/tracker/tracker.la
%%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
-%%SOCIAL%%lib/girepository-1.0/FolksLibsocialweb-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.la
lib/libfolks-dummy.so
lib/libfolks-dummy.so.%%LIBVER%%
lib/libfolks-dummy.so.%%LIBVERLONG%%
-lib/libfolks-eds.la
lib/libfolks-eds.so
lib/libfolks-eds.so.%%LIBVER%%
lib/libfolks-eds.so.%%LIBVERLONG%%
-%%SOCIAL%%lib/libfolks-libsocialweb.la
-%%SOCIAL%%lib/libfolks-libsocialweb.so
-%%SOCIAL%%lib/libfolks-libsocialweb.so.%%LIBVER%%
-%%SOCIAL%%lib/libfolks-libsocialweb.so.%%LIBVERLONG%%
-lib/libfolks-telepathy.la
+%%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%%
-%%TRACKER%%lib/libfolks-tracker.la
%%TRACKER%%lib/libfolks-tracker.so
%%TRACKER%%lib/libfolks-tracker.so.%%LIBVER%%
%%TRACKER%%lib/libfolks-tracker.so.%%LIBVERLONG%%
-lib/libfolks.la
lib/libfolks.so
lib/libfolks.so.%%LIBVER%%
lib/libfolks.so.%%LIBVERLONG%%
libdata/pkgconfig/folks-dummy.pc
libdata/pkgconfig/folks-eds.pc
-%%SOCIAL%%libdata/pkgconfig/folks-libsocialweb.pc
+%%SOCIALWEB%%libdata/pkgconfig/folks-libsocialweb.pc
libdata/pkgconfig/folks-telepathy.pc
%%TRACKER%%libdata/pkgconfig/folks-tracker.pc
libdata/pkgconfig/folks.pc
@@ -61,7 +48,7 @@ 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
-%%SOCIAL%%share/gir-1.0/FolksLibsocialweb-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
@@ -121,8 +108,8 @@ share/vala/vapi/folks-dummy.deps
share/vala/vapi/folks-dummy.vapi
share/vala/vapi/folks-eds.deps
share/vala/vapi/folks-eds.vapi
-%%SOCIAL%%share/vala/vapi/folks-libsocialweb.deps
-%%SOCIAL%%share/vala/vapi/folks-libsocialweb.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
@@ -132,7 +119,7 @@ share/vala/vapi/folks.vapi
%%TRACKER%%@dirrm lib/folks/%%VERSION%%/backends/tracker
@dirrm lib/folks/%%VERSION%%/backends/telepathy
@dirrm lib/folks/%%VERSION%%/backends/ofono
-%%SOCIAL%%@dirrm lib/folks/%%VERSION%%/backends/libsocialweb
+%%SOCIALWEB%%@dirrm lib/folks/%%VERSION%%/backends/libsocialweb
@dirrm lib/folks/%%VERSION%%/backends/key-file
@dirrm lib/folks/%%VERSION%%/backends/eds
@dirrm lib/folks/%%VERSION%%/backends/dummy