4 files changed, 99 insertions, 39 deletions

diff --git a/sysutils/qzeitgeist/Makefile b/sysutils/qzeitgeist/Makefile
index 1b38a77b93b4..c050be33c6a9 100644
--- a/sysutils/qzeitgeist/Makefile
+++ b/sysutils/qzeitgeist/Makefile
@@ -6,10 +6,15 @@
 #
 
 PORTNAME=	qzeitgeist
-PORTVERSION=	0.7.0
+PORTVERSION=	0.8.0
 CATEGORIES=	sysutils
-MASTER_SITES=	http://releases.zeitgeist-project.com/${PORTNAME}/
-DISTNAME=	QtZeitgeist-${PORTVERSION}
+MASTER_SITES=	${MASTER_SITE_KDE_kde} \
+		http://launchpad.net/zeitgeist/${ZEITGEIST_VERSION:R}/${ZEITGEIST_VERSION}/+download/
+MASTER_SITE_SUBDIR=	stable/lib${PORTNAME}/${PORTVERSION}/src/
+DISTNAME=	lib${PORTNAME}-${PORTVERSION}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:kde \
+		zeitgeist-${ZEITGEIST_VERSION}.tar.gz
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	avilla@FreeBSD.org
 COMMENT=	Qt 4 wrapper library around the Zeitgeist D-Bus API
@@ -17,15 +22,31 @@ COMMENT=	Qt 4 wrapper library around the Zeitgeist D-Bus API
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USE_BZIP2=	yes
+BUILD_DEPENDS=	rapper:${PORTSDIR}/textproc/raptor2 \
+		${PYTHON_SITELIBDIR}/rdflib/__init__.py:${PORTSDIR}/textproc/py-rdflib
+
+USE_KDE4=	automoc4
+USE_PYTHON_BUILD=	yes
 USE_QT_VER=	4
-QT_COMPONENTS=	corelib dbus qtestlib \
+QT_COMPONENTS=	dbus declarative qtestlib \
 		moc_build qmake_build rcc_build uic_build
-MAKE_JOBS_SAFE=	yes
+USE_BZIP2=	yes
 USE_CMAKE=	yes
+MAKE_JOBS_SAFE=	yes
 USE_LDCONFIG=	yes
 
-WRKSRC=		${WRKDIR}/${DISTNAME}-Source
+# To be kept in sync with sysutils/zeitgeist.
+ZEITGEIST_VERSION=	0.8.2
+
+post-extract:
+	@(cd ${WRKDIR} && ${GZIP_CMD} ${EXTRACT_BEFORE_ARGS} \
+		${_DISTDIR}/zeitgeist-${ZEITGEIST_VERSION}.tar.gz ${EXTRACT_AFTER_ARGS})
+	cd ${WRKDIR}/zeitgeist-${ZEITGEIST_VERSION} && \
+		${CP} zeitgeist/datamodel.py \
+			extra/ontology/*.trig \
+			extra/rdfxml2py \
+			extra/PythonSerializer.py \
+			${WRKSRC}/scripts
 
 post-patch:
 	${REINPLACE_CMD} -e '/\.pc/ s|pkgconfig|../libdata/pkgconfig|' \
@@ -34,8 +55,21 @@ post-patch:
 		${WRKSRC}/CMakeLists.txt \
 		${WRKSRC}/src/CMakeLists.txt \
 		${WRKSRC}/QZeitgeistConfig.cmake.in
+	${REINPLACE_CMD} -e '/import _config/ d' \
+		-e 's|_config.datadir, "zeitgeist/ontology/zeitgeist.py"|runpath, "zeitgeist.py"|' \
+		${WRKSRC}/scripts/datamodel.py
+	${REINPLACE_CMD} -e 's|zeitgeist.datamodel|datamodel|' \
+		${WRKSRC}/scripts/onto2cpp.py
+	${REINPLACE_CMD} -e 's|/usr/bin/python|${PYTHON_CMD}|g' \
+		${WRKSRC}/scripts/rdfxml2py
+
+pre-build:
+	cd ${WRKSRC}/scripts && \
+		${CAT} *.trig | \
+		${LOCALBASE}/bin/rapper -i trig -o rdfxml -I ZeitgeistNamespace - | \
+		./rdfxml2py >> zeitgeist.py
 
 post-install:
-	${CAT} ${PKGMESSAGE}
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/sysutils/qzeitgeist/distinfo b/sysutils/qzeitgeist/distinfo
index c76a46ad5386..c1cb12a99763 100644
--- a/sysutils/qzeitgeist/distinfo
+++ b/sysutils/qzeitgeist/distinfo
@@ -1,2 +1,4 @@
-SHA256 (QtZeitgeist-0.7.0.tar.bz2) = 12c3073196ba5ea871759e79bc0a1ecf5a3a20f1d90abd814d2555ff21175d7e
-SIZE (QtZeitgeist-0.7.0.tar.bz2) = 31260
+SHA256 (libqzeitgeist-0.8.0.tar.bz2) = 0a8aa980d64549cce93691705807681fd7e3e079a48aee68fc4b2653f17d61ad
+SIZE (libqzeitgeist-0.8.0.tar.bz2) = 29459
+SHA256 (zeitgeist-0.8.2.tar.gz) = 6155611ee182f642cc1fe9f8aadc25c7e2942fdef2565b1f29e8388bc4643703
+SIZE (zeitgeist-0.8.2.tar.gz) = 358781
diff --git a/sysutils/qzeitgeist/files/patch-scripts__PythonSerializer.py b/sysutils/qzeitgeist/files/patch-scripts__PythonSerializer.py
new file mode 100644
index 000000000000..ce4b5020e6c4
--- /dev/null
+++ b/sysutils/qzeitgeist/files/patch-scripts__PythonSerializer.py
@@ -0,0 +1,13 @@
+--- ./scripts/PythonSerializer.py.orig	2012-04-04 17:46:44.385371264 +0200
++++ ./scripts/PythonSerializer.py	2012-04-05 00:32:11.175489615 +0200
+@@ -85,8 +85,8 @@
+ 		assert root_type
+ 		#TODO: displayname, how are translation handled? on trig level or on python level?
+ 		stream.write(
+-			"Symbol('%s', parent=%r, uri='%s', display_name='%s', doc='%s', auto_resolve=False)\n" %(name, 
+-				root_type, symbol, display_name, doc)
++			str("Symbol('%s', parent=%r, uri='%s', display_name='%s', doc='%s', auto_resolve=False)\n" %(name, 
++				root_type, symbol, display_name, doc))
+ 		)
+ 		
+ 
diff --git a/sysutils/qzeitgeist/pkg-plist b/sysutils/qzeitgeist/pkg-plist
index fadd34ff9fe3..d6e94e64f52e 100644
--- a/sysutils/qzeitgeist/pkg-plist
+++ b/sysutils/qzeitgeist/pkg-plist
@@ -1,31 +1,42 @@
-include/QtZeitgeist/DataModel/DataSource
-include/QtZeitgeist/DataModel/Event
-include/QtZeitgeist/DataModel/Subject
-include/QtZeitgeist/DataModel/TimeRange
-include/QtZeitgeist/DataModel/datasource.h
-include/QtZeitgeist/DataModel/event.h
-include/QtZeitgeist/DataModel/subject.h
-include/QtZeitgeist/DataModel/timerange.h
-include/QtZeitgeist/DataSourceRegistry
-include/QtZeitgeist/Interpretation
-include/QtZeitgeist/Log
-include/QtZeitgeist/Manifestation
-include/QtZeitgeist/Monitor
-include/QtZeitgeist/QtZeitgeist
-include/QtZeitgeist/datasourceregistry.h
-include/QtZeitgeist/interpretation.h
-include/QtZeitgeist/log.h
-include/QtZeitgeist/manifestation.h
-include/QtZeitgeist/monitor.h
-include/QtZeitgeist/qtzeitgeist.h
-lib/cmake/qzeitgeist/QZeitgeistConfig.cmake
-lib/cmake/qzeitgeist/QZeitgeistExport-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/qzeitgeist/QZeitgeistExport.cmake
+include/QZeitgeist/DataModel/DataSource
+include/QZeitgeist/DataModel/Event
+include/QZeitgeist/DataModel/Subject
+include/QZeitgeist/DataModel/TimeRange
+include/QZeitgeist/DataModel/datasource.h
+include/QZeitgeist/DataModel/event.h
+include/QZeitgeist/DataModel/subject.h
+include/QZeitgeist/DataModel/timerange.h
+include/QZeitgeist/DataSourceRegistry
+include/QZeitgeist/Interpretation
+include/QZeitgeist/Log
+include/QZeitgeist/LogModel
+include/QZeitgeist/Manifestation
+include/QZeitgeist/Monitor
+include/QZeitgeist/QZeitgeist
+include/QZeitgeist/datasourceregistry.h
+include/QZeitgeist/interpretation.h
+include/QZeitgeist/log.h
+include/QZeitgeist/logmodel.h
+include/QZeitgeist/manifestation.h
+include/QZeitgeist/monitor.h
+include/QZeitgeist/qzeitgeist.h
+include/QZeitgeist/qzeitgeist_version.h
+include/QZeitgeist/refreshjob.h
+lib/cmake/QZeitgeist/QZeitgeistConfig.cmake
+lib/cmake/QZeitgeist/QZeitgeistConfigVersion.cmake
+lib/cmake/QZeitgeist/QZeitgeistExport-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/QZeitgeist/QZeitgeistExport.cmake
 lib/libqzeitgeist.so
-lib/libqzeitgeist.so.0
-lib/libqzeitgeist.so.0.7
-libdata/pkgconfig/QtZeitgeist.pc
-@dirrm lib/cmake/qzeitgeist
+lib/libqzeitgeist.so.0.8.0
+lib/libqzeitgeist.so.1
+%%QT_LIBDIR_REL%%/imports/org/gnome/zeitgeist/libQZeitgeistDeclarativePlugin.so
+%%QT_LIBDIR_REL%%/imports/org/gnome/zeitgeist/qmldir
+libdata/pkgconfig/QZeitgeist.pc
+@dirrm %%QT_LIBDIR_REL%%/imports/org/gnome/zeitgeist
+@dirrm %%QT_LIBDIR_REL%%/imports/org/gnome
+@dirrmtry %%QT_LIBDIR_REL%%/imports/org
+@dirrmtry %%QT_LIBDIR_REL%%/imports
+@dirrm lib/cmake/QZeitgeist
 @dirrmtry lib/cmake
-@dirrm include/QtZeitgeist/DataModel
-@dirrm include/QtZeitgeist
+@dirrm include/QZeitgeist/DataModel
+@dirrm include/QZeitgeist