From 8a3f16869b397863d4a6f7ea09efc5d2a41462a5 Mon Sep 17 00:00:00 2001 From: eadler Date: Wed, 7 Sep 2011 19:50:46 +0000 Subject: - emulators/wahcade: eliminate py-elementtree dependency [0] - security/zenmap: eliminate py-pysqlite2x dependency [1] - deskutils/griffith: eliminate py-pysqlite2x dependency [2] PR: ports/160049 [0], ports/160071 [1], ports/160161 [2] Submitted by: Ruslan Mahmatkhanov [0,1,2] Approved by: bapt (mentor) --- deskutils/griffith/Makefile | 18 +++++++++--------- emulators/wahcade/Makefile | 3 +-- security/zenmap/Makefile | 10 +++++----- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/deskutils/griffith/Makefile b/deskutils/griffith/Makefile index 669b9338b32c..67ce39aa0c84 100644 --- a/deskutils/griffith/Makefile +++ b/deskutils/griffith/Makefile @@ -7,27 +7,27 @@ PORTNAME= griffith PORTVERSION= 0.12.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= deskutils MASTER_SITES= http://launchpadlibrarian.net/58153655/ MAINTAINER= ports@FreeBSD.org COMMENT= Lightweight film collection manager -RUN_DEPENDS= py*-pysqlite>=2.0:${PORTSDIR}/databases/py-pysqlite23 \ - py*-sqlalchemy06>=0.5:${PORTSDIR}/databases/py-sqlalchemy06 \ - py*-imaging>=0:${PORTSDIR}/graphics/py-imaging \ - py*-reportlab>=1.19:${PORTSDIR}/print/py-reportlab \ - py*-chardet>=0:${PORTSDIR}/textproc/py-chardet \ - ${PYXML} - LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3 \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy06>=0.5:${PORTSDIR}/databases/py-sqlalchemy06 \ + ${PYTHON_PKGNAMEPREFIX}imaging>=0:${PORTSDIR}/graphics/py-imaging \ + ${PYTHON_PKGNAMEPREFIX}reportlab>=1.19:${PORTSDIR}/print/py-reportlab \ + ${PYTHON_PKGNAMEPREFIX}chardet>=0:${PORTSDIR}/textproc/py-chardet \ + ${PYXML} + USE_XZ= yes USE_GNOME= pygtk2 WANT_GNOME= yes -USE_PYTHON= yes +USE_PYTHON= 2.5+ USE_GETTEXT= yes USE_GMAKE= yes NO_BUILD= yes diff --git a/emulators/wahcade/Makefile b/emulators/wahcade/Makefile index 7201301b8dcc..e55d14dc5d14 100644 --- a/emulators/wahcade/Makefile +++ b/emulators/wahcade/Makefile @@ -7,7 +7,7 @@ PORTNAME= wahcade PORTVERSION= 0.28 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= emulators MASTER_SITES= http://www.anti-particle.com/projects/wahcade/ @@ -15,7 +15,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A frontend for almost any emulator (MameWAH clone) RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolkits/py-gtk2 \ - ${PYTHON_SITELIBDIR}/cElementTree.so:${PORTSDIR}/devel/py-celementtree \ ${PYTHON_SITELIBDIR}/chardet/__init__.py:${PORTSDIR}/textproc/py-chardet USE_PYTHON= 2.5+ diff --git a/security/zenmap/Makefile b/security/zenmap/Makefile index a5a979ff09e3..02f01e53648e 100644 --- a/security/zenmap/Makefile +++ b/security/zenmap/Makefile @@ -7,7 +7,7 @@ PORTNAME= zenmap PORTVERSION= 5.21 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= security ipv6 MASTER_SITES= http://nmap.org/dist/ \ http://nmap.ucsd.edu/dist/ \ @@ -21,11 +21,11 @@ MAINTAINER= ports@FreeBSD.org COMMENT= GUI frontend for the nmap scanning utility RUN_DEPENDS= ${LOCALBASE}/bin/nmap:${PORTSDIR}/security/nmap \ - ${PYTHON_SITELIBDIR}/pysqlite2/__init__.py:${PORTSDIR}/databases/py-pysqlite23 + ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 PYDISTUTILS_PKGVERSION= ${DISTVERSION} USE_BZIP2= yes -USE_PYTHON= yes +USE_PYTHON= 2.5+ USE_GETTEXT= yes USE_GNOME= pygtk2 INSTALLS_EGGINFO= yes @@ -35,11 +35,11 @@ MLINKS= zenmap.1 xnmap.1 .include -.if ${ARCH} != "i386" +.if ${ARCH} != "i386" || ${PYTHON_REL} > 260 WITHOUT_PSYCO= yes .endif -.ifndef(WITHOUT_PSYCO) +.ifndef(WITHOUT_PSYCO) RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/psyco/_psyco.so:${PORTSDIR}/devel/py-psyco .endif -- cgit