From owner-svn-ports-all@freebsd.org  Thu Dec 22 12:36:24 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 72BE1C8BD3D;
 Thu, 22 Dec 2016 12:36:24 +0000 (UTC)
 (envelope-from avilla@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3B6A816E8;
 Thu, 22 Dec 2016 12:36:24 +0000 (UTC)
 (envelope-from avilla@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBMCaN4j032540;
 Thu, 22 Dec 2016 12:36:23 GMT (envelope-from avilla@FreeBSD.org)
Received: (from avilla@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBMCaN4h032539;
 Thu, 22 Dec 2016 12:36:23 GMT (envelope-from avilla@FreeBSD.org)
Message-Id: <201612221236.uBMCaN4h032539@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: avilla set sender to
 avilla@FreeBSD.org using -f
From: Alberto Villa <avilla@FreeBSD.org>
Date: Thu, 22 Dec 2016 12:36:23 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r429155 - head/sysutils/qzeitgeist
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Dec 2016 12:36:24 -0000

Author: avilla
Date: Thu Dec 22 12:36:23 2016
New Revision: 429155
URL: https://svnweb.freebsd.org/changeset/ports/429155

Log:
  - Fix build with Python 3
  
  PR:		214737
  Reported by:	freebsd@get-experience.com

Modified:
  head/sysutils/qzeitgeist/Makefile

Modified: head/sysutils/qzeitgeist/Makefile
==============================================================================
--- head/sysutils/qzeitgeist/Makefile	Thu Dec 22 12:00:08 2016	(r429154)
+++ head/sysutils/qzeitgeist/Makefile	Thu Dec 22 12:36:23 2016	(r429155)
@@ -22,7 +22,7 @@ BUILD_DEPENDS=	rapper:textproc/raptor2 \
 
 USES=		cmake kde:4 python:build tar:bzip2
 USE_KDE=	automoc4
-USE_QT4=	dbus declarative qtestlib \
+USE_QT4=	corelib dbus declarative qtestlib \
 		moc_build qmake_build rcc_build uic_build
 USE_LDCONFIG=	yes
 
@@ -38,6 +38,8 @@ post-extract:
 			data/ontology \
 			${WRKSRC}/scripts
 
+.include <bsd.port.pre.mk>
+
 post-patch:
 	${REINPLACE_CMD} -e '/\.pc/ s|pkgconfig|../libdata/pkgconfig|' \
 		-e 's|share/${PORTNAME}/cmake|lib/cmake/${PORTNAME}|' \
@@ -46,8 +48,16 @@ post-patch:
 		${WRKSRC}/src/CMakeLists.txt \
 		${WRKSRC}/QZeitgeistConfig.cmake.in
 	${REINPLACE_CMD} -e 's|zeitgeist.datamodel|datamodel|' \
+		-e 's|env python|env ${PYTHON_CMD}|g' \
 		${WRKSRC}/scripts/onto2cpp.py
-	${REINPLACE_CMD} -e 's|env python|env ${PYTHON_CMD}|g' \
-		${WRKSRC}/scripts/onto2cpp.py
+.if ${PYTHON_VERSION:M*3*}
+	${REINPLACE_CMD} -E -e '/except/ s|,| as |' \
+		-e 's|(print) +>> +(sys\.stderr) *, *(.*)|\1(\3, file=\2)|' \
+		-e 's|(print) +(.*)|\1(\2)|' \
+		-e '/gettext\.install/ s|\((.*),.*\)|(\1)|' \
+		-e 's|execfile\((.*)\)|exec(compile(open(\1, "rb").read(), \1, "exec"))|' \
+		-e '/iter(items|keys|values)\(\)/ s|iter||g' \
+		${WRKSRC}/scripts/*.py
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>