RUN_DEPENDS, py-gobject => py-gobject3.

Missing TEST_DEPENDS.
Fix LIBZEITGEIST_LT_VERSION.
Sync DESCR with source.
Add conflict with libzeitgeist-* so that it gets removed.
This commit is contained in:
ajacoutot 2013-03-28 21:09:12 +00:00
parent a6bfc54852
commit 728c035f9c
4 changed files with 17 additions and 22 deletions

View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.8 2013/03/28 19:56:09 jasper Exp $ # $OpenBSD: Makefile,v 1.9 2013/03/28 21:09:12 ajacoutot Exp $
COMMENT = event logging framework COMMENT = event logging framework
V = 0.9.10 V = 0.9.10
DISTNAME = zeitgeist-${V} DISTNAME = zeitgeist-${V}
REVISION = 0
SHARED_LIBS += zeitgeist-2.0 0.0 # 0.0 SHARED_LIBS += zeitgeist-2.0 0.0 # 0.0
@ -13,7 +14,7 @@ HOMEPAGE = http://zeitgeist-project.com/
MAINTAINER = Jasper Lievisse Adriaanse <jasper@openbsd.org> MAINTAINER = Jasper Lievisse Adriaanse <jasper@openbsd.org>
# LGPLv2.1 # GPLv2 - LGPLv2.1
PERMIT_PACKAGE_CDROM = Yes PERMIT_PACKAGE_CDROM = Yes
MASTER_SITES = http://edge.launchpad.net/zeitgeist/${V:R}/${V}/+download/ MASTER_SITES = http://edge.launchpad.net/zeitgeist/${V:R}/${V}/+download/
@ -27,10 +28,12 @@ BUILD_DEPENDS = textproc/py-rdflib \
textproc/raptor \ textproc/raptor \
x11/dbus x11/dbus
RUN_DEPENDS = devel/py-gobject \ RUN_DEPENDS = devel/py-gobject3 \
devel/py-xdg \ devel/py-xdg \
x11/dbus-python x11/dbus-python
TEST_DEPENDS = devel/py-gobject
WANTLIB += ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi WANTLIB += ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
WANTLIB += Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0 atspi WANTLIB += Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0 atspi
WANTLIB += c cairo cairo-gobject dbus-1 dbus-glib-1 expat ffi WANTLIB += c cairo cairo-gobject dbus-1 dbus-glib-1 expat ffi
@ -47,13 +50,14 @@ LIB_DEPENDS = devel/json-glib \
net/telepathy/telepathy-glib \ net/telepathy/telepathy-glib \
x11/gtk+3 x11/gtk+3
MAKE_FLAGS += LIBZEITGEIST_LT_VERSION=${LIBzeitgeist-2.0_VERSION:R}:${LIBzeitgeist-2.0_VERSION:E}:0 MAKE_FLAGS += LIBZEITGEIST_LT_VERSION=${LIBzeitgeist-2.0_VERSION:R}:${LIBzeitgeist-2.0_VERSION:E}
FAKE_FLAGS += zeitgeistdocdir="${PREFIX}/share/doc/zeitgeist/" \ FAKE_FLAGS += zeitgeistdocdir="${PREFIX}/share/doc/zeitgeist/" \
sysconfdir="${PREFIX}/share/examples/zeitgeist/" sysconfdir="${PREFIX}/share/examples/zeitgeist/"
CONFIGURE_STYLE = gnu CONFIGURE_STYLE = gnu
# XXX: FTS++ fails to build in controller.cpp; needs fixing.
CONFIGURE_ARGS += --disable-fts # XXX: Requires zeitgeist-datahub which has not been ported yet
#CONFIGURE_ARGS += --disable-datahub
# XXX: Requires dee-icu which has not been ported yet # XXX: Requires dee-icu which has not been ported yet
CONFIGURE_ARGS += --without-dee-icu CONFIGURE_ARGS += --without-dee-icu

View File

@ -1,15 +1,6 @@
$OpenBSD: patch-configure,v 1.4 2013/03/28 19:56:09 jasper Exp $ $OpenBSD: patch-configure,v 1.5 2013/03/28 21:09:12 ajacoutot Exp $
--- configure.orig Tue Mar 19 11:47:27 2013 --- configure.orig Tue Mar 19 11:47:27 2013
+++ configure Thu Mar 28 19:02:44 2013 +++ configure Thu Mar 28 19:02:44 2013
@@ -17939,7 +17939,7 @@ LIBZEITGEIST_VERSION="$LIBZEITGEIST_VERSION_MAJOR.$LIB
# - If the interface is the same as the previous version, change to C:R+1:A
LIBZEITGEIST_LT_CURRENT=0
LIBZEITGEIST_LT_REV=0
-LIBZEITGEIST_LG_AGE=0
+LIBZEITGEIST_LT_AGE=0
LIBZEITGEIST_LT_VERSION="$LIBZEITGEIST_LT_CURRENT:$LIBZEITGEIST_LT_REV:$LIBZEITGEIST_LT_AGE"
@@ -18235,7 +18235,7 @@ fi @@ -18235,7 +18235,7 @@ fi
# check for python-rdflib # check for python-rdflib
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for python-rdflib" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for python-rdflib" >&5

View File

@ -1,5 +1,4 @@
Zeitgeist is a service which logs the users's activities and events Zeitgeist is a service which logs the users's activities and
(files opened, websites visites, conversations held with other people, events (files opened, websites visites, conversations held with
etc.) and makes relevant information available to other applications. It other people, etc.) and makes relevant information available to
is able to establish relationships between items based on similarity and other applications.
usage patterns.

View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.3 2013/03/28 19:56:09 jasper Exp $ @comment $OpenBSD: PLIST,v 1.4 2013/03/28 21:09:12 ajacoutot Exp $
@conflict libzeitgeist-*
@pkgpath productivity/libzeitgeist @pkgpath productivity/libzeitgeist
@bin bin/zeitgeist-daemon @bin bin/zeitgeist-daemon
@bin bin/zeitgeist-datahub @bin bin/zeitgeist-datahub