[Midnightbsd-cvs] mports [19854] trunk/sysutils: cleanup

[laffer1 at midnightbsd.org]

Revision: 19854
          http://svnweb.midnightbsd.org/mports/?rev=19854
Author:   laffer1
Date:     2015-08-20 08:20:11 -0400 (Thu, 20 Aug 2015)
Log Message:
-----------
cleanup

Modified Paths:
--------------
    trunk/sysutils/qzeitgeist/Makefile
    trunk/sysutils/zeitgeist/Makefile
    trunk/sysutils/zeitgeist/pkg-plist

Modified: trunk/sysutils/qzeitgeist/Makefile
===================================================================
--- trunk/sysutils/qzeitgeist/Makefile	2015-08-20 12:18:13 UTC (rev 19853)
+++ trunk/sysutils/qzeitgeist/Makefile	2015-08-20 12:20:11 UTC (rev 19854)
@@ -2,10 +2,10 @@
 
 PORTNAME=	qzeitgeist
 PORTVERSION=	0.8.0
+PORTREVISION=	1
 CATEGORIES=	sysutils
-MASTER_SITES=	${MASTER_SITE_KDE:C@$@:kde@} \
+MASTER_SITES=	KDE/stable/lib${PORTNAME}/${PORTVERSION}/src/:kde \
 		http://launchpad.net/zeitgeist/${ZEITGEIST_VERSION:R}/${ZEITGEIST_VERSION}/+download/
-MASTER_SITE_SUBDIR=	stable/lib${PORTNAME}/${PORTVERSION}/src/:kde
 DISTNAME=	lib${PORTNAME}-${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:kde \
 		zeitgeist-${ZEITGEIST_VERSION}.tar.gz
@@ -15,16 +15,15 @@
 COMMENT=	Qt 4 wrapper library around the Zeitgeist D-Bus API
 
 LICENSE=	lgpl2.1
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	rapper:${PORTSDIR}/textproc/raptor2 \
 		${PYTHON_SITELIBDIR}/rdflib/__init__.py:${PORTSDIR}/textproc/py-rdflib
 
 USE_KDE4=	automoc4
-USE_PYTHON_BUILD=	yes
 USE_QT4=	dbus declarative qtestlib \
 		moc_build qmake_build rcc_build uic_build
-USE_BZIP2=	yes
-USES=		cmake
+USES=		cmake python:build tar:bzip2
 USE_LDCONFIG=	yes
 
 # To be kept in sync with sysutils/zeitgeist.
@@ -31,8 +30,9 @@
 ZEITGEIST_VERSION=	0.8.2
 
 post-extract:
-	@(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
-		${_DISTDIR}/zeitgeist-${ZEITGEIST_VERSION}.tar.gz ${EXTRACT_AFTER_ARGS})
+	@(cd ${WRKDIR} && ${TAR} ${EXTRACT_BEFORE_ARGS} \
+		${_DISTDIR}/zeitgeist-${ZEITGEIST_VERSION}.tar.gz \
+		${EXTRACT_AFTER_ARGS})
 	cd ${WRKDIR}/zeitgeist-${ZEITGEIST_VERSION} && \
 		${CP} zeitgeist/datamodel.py \
 			extra/ontology/*.trig \

Modified: trunk/sysutils/zeitgeist/Makefile
===================================================================
--- trunk/sysutils/zeitgeist/Makefile	2015-08-20 12:18:13 UTC (rev 19853)
+++ trunk/sysutils/zeitgeist/Makefile	2015-08-20 12:20:11 UTC (rev 19854)
@@ -9,18 +9,19 @@
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Event logging framework - engine
 
-LICENSE=	lgpl
+LICENSE=	lgpl2.1
 
-BUILD_DEPENDS=	rapper:${PORTSDIR}/textproc/raptor2 \
+BUILD_DEPENDS=	python:${PORTSDIR}/lang/python \
+		rapper:${PORTSDIR}/textproc/raptor2 \
 		${PYTHON_SITELIBDIR}/rdflib/__init__.py:${PORTSDIR}/textproc/py-rdflib
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
+RUN_DEPENDS=	python:${PORTSDIR}/lang/python \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
 		${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py-xdg \
 		${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus
 
 USE_GNOME=	intlhack pygobject
-USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
-USES=		gmake gettext pathfix
+USES=		gmake gettext pathfix python
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 

Modified: trunk/sysutils/zeitgeist/pkg-plist
===================================================================
--- trunk/sysutils/zeitgeist/pkg-plist	2015-08-20 12:18:13 UTC (rev 19853)
+++ trunk/sysutils/zeitgeist/pkg-plist	2015-08-20 12:20:11 UTC (rev 19854)
@@ -128,16 +128,3 @@
 %%DATADIR%%/ontology/zeitgeist.py
 %%DATADIR%%/ontology/zg.py
 %%DATADIR%%/ontology/zg.trig
- at dirrm %%DATADIR%%/ontology
- at dirrm %%DATADIR%%/_zeitgeist/engine/upgrades
- at dirrm %%DATADIR%%/_zeitgeist/engine/extensions
- at dirrm %%DATADIR%%/_zeitgeist/engine
- at dirrm %%DATADIR%%/_zeitgeist
- at dirrm %%DATADIR%%
- at dirrmtry share/locale/ur/LC_MESSAGES
- at dirrmtry share/locale/ur
- at dirrmtry share/locale/te/LC_MESSAGES
- at dirrmtry share/locale/te
- at dirrmtry share/locale/oc/LC_MESSAGES
- at dirrmtry share/locale/oc
- at dirrm %%PYTHON_SITELIBDIR%%/zeitgeist