From 489630147862eef6ab7669fb827d30fae056f4e4 Mon Sep 17 00:00:00 2001 From: jasper Date: Fri, 29 Mar 2013 16:48:27 +0000 Subject: [PATCH] drop tracker subpackage. as suggested by aja@ --- net/telepathy/folks/Makefile | 60 ++++++------------- net/telepathy/folks/pkg/{DESCR-main => DESCR} | 0 net/telepathy/folks/pkg/DESCR-tracker | 1 - net/telepathy/folks/pkg/{PLIST-main => PLIST} | 6 +- net/telepathy/folks/pkg/PLIST-tracker | 10 ---- 5 files changed, 22 insertions(+), 55 deletions(-) rename net/telepathy/folks/pkg/{DESCR-main => DESCR} (100%) delete mode 100644 net/telepathy/folks/pkg/DESCR-tracker rename net/telepathy/folks/pkg/{PLIST-main => PLIST} (94%) delete mode 100644 net/telepathy/folks/pkg/PLIST-tracker diff --git a/net/telepathy/folks/Makefile b/net/telepathy/folks/Makefile index f664f99adca..61ae6c320c3 100644 --- a/net/telepathy/folks/Makefile +++ b/net/telepathy/folks/Makefile @@ -1,27 +1,20 @@ -# $OpenBSD: Makefile,v 1.51 2013/03/28 21:32:03 jasper Exp $ +# $OpenBSD: Makefile,v 1.52 2013/03/29 16:48:27 jasper Exp $ -COMMENT-main= people aggregation library -COMMENT-tracker= (meta-)tracker backend for folks +COMMENT= people aggregation library GNOME_PROJECT= folks GNOME_VERSION= 0.8.0 # MODULE_VERSION in config.h API_V= 37 -PKGNAME-main= ${DISTNAME} -PKGNAME-tracker= ${GNOME_PROJECT}-meta-tracker-${GNOME_VERSION} - -REVISION-main= 3 -REVISION-tracker= 1 +REVISION= 4 SHARED_LIBS += folks-telepathy 5.0 # 37.0 SHARED_LIBS += folks 5.1 # 37.0 SHARED_LIBS += folks-eds 0.1 # 37.0 SHARED_LIBS += folks-libsocialweb 0.0 # 37.0 -SHARED_LIBS += folks-tracker 0.0 # 37.0 -TRACKER_VERSION= 0.14 -SUBST_VARS= API_V TRACKER_VERSION +SUBST_VARS= API_V HOMEPAGE= ${HOMEPAGE_TP:=Folks} @@ -29,37 +22,21 @@ MODULES= devel/dconf \ devel/gettext \ x11/gnome -WANTLIB += ffi gee gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 -WANTLIB += m pcre sqlite3 +WANTLIB += asn1 c camel-1.2 com_err crypto db dbus-1 dbus-glib-1 +WANTLIB += ebackend-1.2 ebook-1.2 ebook-contacts-1.2 edata-book-1.2 +WANTLIB += edataserver-1.2 ffi gck-1 gcr-base-3 gcrypt gee gio-2.0 +WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 gpg-error gssapi gthread-2.0 +WANTLIB += krb5 m ncurses nspr4 nss3 nssutil3 p11-kit pcre plc4 +WANTLIB += plds4 pthread readline secret-1 smime3 socialweb-client +WANTLIB += softokn3 soup-2.4 sqlite3 ssl3 telepathy-glib xml2 +WANTLIB += z zeitgeist-1.0 -MULTI_PACKAGES= -main -tracker - -WANTLIB-main += ${WANTLIB} -WANTLIB-main += asn1 c camel-1.2 com_err crypto ebook-1.2 edataserver-1.2 -WANTLIB-main += gssapi krb5 ncurses nspr4 nss3 socialweb-client plc4 plds4 -WANTLIB-main += pthread readline smime3 softokn3 soup-2.4 ssl3 telepathy-glib -WANTLIB-main += xml2 z gck-1 gcr-base-3 gcrypt gpg-error gnome-keyring -WANTLIB-main += nssutil3 p11-kit zeitgeist-1.0 dbus-1 dbus-glib-1 - -LIB_DEPENDS-main= ${MODGETTEXT_LIB_DEPENDS} \ - databases/evolution-data-server>=3.6.0p3 \ - devel/libgee06 \ - net/telepathy/telepathy-glib>=0.15.5 \ - net/libsocialweb \ - productivity/libzeitgeist -RUN_DEPENDS-main= ${MODGETTEXT_RUN_DEPENDS} \ - net/telepathy/telepathy-mission-control - -WANTLIB-tracker += ${WANTLIB} -WANTLIB-tracker += lib/tracker-${TRACKER_VERSION}/tracker-common -WANTLIB-tracker += lib/tracker-${TRACKER_VERSION}/tracker-data -WANTLIB-tracker += e2fs-uuid folks kvm tracker-sparql-${TRACKER_VERSION} -WANTLIB-tracker += z pthread icui18n icuuc - -RUN_DEPENDS-tracker= ${MODGETTEXT_RUN_DEPENDS} -LIB_DEPENDS-tracker= ${MODGETTEXT_LIB_DEPENDS} \ - ${BASE_PKGPATH},-main \ - x11/gnome/tracker>=0.14.0 +LIB_DEPENDS= databases/evolution-data-server>=3.6.0p3 \ + devel/libgee06 \ + net/telepathy/telepathy-glib>=0.15.5 \ + net/libsocialweb \ + productivity/libzeitgeist +RUN_DEPENDS= net/telepathy/telepathy-mission-control TEST_DEPENDS= ${FULLPKGNAME}:${BASE_PKGPATH} @@ -67,7 +44,6 @@ MODGNOME_TOOLS= goi vala CONFIGURE_ARGS+= --enable-import-tool \ --enable-inspect-tool \ - --enable-tracker-backend \ --enable-libsocialweb-backend \ --enable-eds-backend post-install: diff --git a/net/telepathy/folks/pkg/DESCR-main b/net/telepathy/folks/pkg/DESCR similarity index 100% rename from net/telepathy/folks/pkg/DESCR-main rename to net/telepathy/folks/pkg/DESCR diff --git a/net/telepathy/folks/pkg/DESCR-tracker b/net/telepathy/folks/pkg/DESCR-tracker deleted file mode 100644 index 3b67156cbc4..00000000000 --- a/net/telepathy/folks/pkg/DESCR-tracker +++ /dev/null @@ -1 +0,0 @@ -This package provides the (meta-)tracker backend for folks. diff --git a/net/telepathy/folks/pkg/PLIST-main b/net/telepathy/folks/pkg/PLIST similarity index 94% rename from net/telepathy/folks/pkg/PLIST-main rename to net/telepathy/folks/pkg/PLIST index ff5073699be..c60ed8ffbfa 100644 --- a/net/telepathy/folks/pkg/PLIST-main +++ b/net/telepathy/folks/pkg/PLIST @@ -1,5 +1,7 @@ -@comment $OpenBSD: PLIST-main,v 1.6 2012/10/04 09:14:24 jasper Exp $ -@pkgpath ${BASE_PKGPATH} +@comment $OpenBSD: PLIST,v 1.13 2013/03/29 16:48:27 jasper Exp $ +@conflict net/telepathy/folks,-tracker +@pkgpath net/telepathy/folks,-main +@pkgpath net/telepathy/folks,-tracker @bin bin/folks-import @bin bin/folks-inspect include/folks/ diff --git a/net/telepathy/folks/pkg/PLIST-tracker b/net/telepathy/folks/pkg/PLIST-tracker deleted file mode 100644 index a17253012ea..00000000000 --- a/net/telepathy/folks/pkg/PLIST-tracker +++ /dev/null @@ -1,10 +0,0 @@ -@comment $OpenBSD: PLIST-tracker,v 1.2 2012/09/29 10:38:11 jasper Exp $ -include/folks/folks-tracker.h -lib/folks/${API_V}/backends/tracker/ -lib/folks/${API_V}/backends/tracker/tracker.so -lib/libfolks-tracker.a -lib/libfolks-tracker.la -@lib lib/libfolks-tracker.so.${LIBfolks-tracker_VERSION} -lib/pkgconfig/folks-tracker.pc -share/vala/vapi/folks-tracker.deps -share/vala/vapi/folks-tracker.vapi