From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Aug 24 13:40:10 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A88381065675 for ; Wed, 24 Aug 2011 13:40:10 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 85D528FC23 for ; Wed, 24 Aug 2011 13:40:10 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p7ODeAiK026889 for ; Wed, 24 Aug 2011 13:40:10 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p7ODeAJT026888; Wed, 24 Aug 2011 13:40:10 GMT (envelope-from gnats) Resent-Date: Wed, 24 Aug 2011 13:40:10 GMT Resent-Message-Id: <201108241340.p7ODeAJT026888@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Ruslan Mahmatkhanov Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 28BE7106564A for ; Wed, 24 Aug 2011 13:32:30 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id F043E8FC19 for ; Wed, 24 Aug 2011 13:32:29 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p7ODWTuu012499 for ; Wed, 24 Aug 2011 13:32:29 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id p7ODWTgX012498; Wed, 24 Aug 2011 13:32:29 GMT (envelope-from nobody) Message-Id: <201108241332.p7ODWTgX012498@red.freebsd.org> Date: Wed, 24 Aug 2011 13:32:29 GMT From: Ruslan Mahmatkhanov To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/160063: [PATCH] deskutils/conduit: eliminate py-pysqlite2x dependency X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Aug 2011 13:40:10 -0000 >Number: 160063 >Category: ports >Synopsis: [PATCH] deskutils/conduit: eliminate py-pysqlite2x dependency >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Aug 24 13:40:10 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Ruslan Mahmatkhanov >Release: 9.0-BETA1 >Organization: >Environment: 9.0-BETA1 i386 >Description: - since this port requires python2.5+ (with USE_PYTHON) switch to databases/py-sqlite3 instead of databases/py-pysqlite2x that is for python24 - while here use ${PYTHON_PKGNAMEPREFIX} instead of "py-*" - bimp portrevision because of this deps changes I checked the code and they use this pattern when dealing with sqlite: """ try: from sqlite3 import dbapi2 as sqlite except ImportError: from pysqlite2 import dbapi2 as sqlite """ So nothing will be broken with sqlite3. >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruNa conduit.orig/Makefile conduit/Makefile --- conduit.orig/Makefile 2011-08-01 09:35:44.000000000 +0400 +++ conduit/Makefile 2011-08-24 17:29:57.000000000 +0400 @@ -7,7 +7,7 @@ PORTNAME= conduit PORTVERSION= 0.3.17 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= deskutils MASTER_SITES= GNOME @@ -15,15 +15,15 @@ COMMENT= Synchronization application for GNOME BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/goocanvasmodule.so:${PORTSDIR}/graphics/py-goocanvas \ - ${PYTHON_SITELIBDIR}/pysqlite2/__init__.py:${PORTSDIR}/databases/py-pysqlite23 \ + ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \ xmlproc_parse:${PORTSDIR}/textproc/py-xml \ - py*-vobject>=0.4.8:${PORTSDIR}/deskutils/py-vobject \ + ${PYTHON_PKGNAMEPREFIX}vobject>=0.4.8:${PORTSDIR}/deskutils/py-vobject \ ${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-dbus LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus RUN_DEPENDS= ${PYTHON_SITELIBDIR}/goocanvasmodule.so:${PORTSDIR}/graphics/py-goocanvas \ - ${PYTHON_SITELIBDIR}/pysqlite2/__init__.py:${PORTSDIR}/databases/py-pysqlite23 \ + ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \ xmlproc_parse:${PORTSDIR}/textproc/py-xml \ - py*-vobject>=0.4.8:${PORTSDIR}/deskutils/py-vobject \ + ${PYTHON_PKGNAMEPREFIX}vobject>=0.4.8:${PORTSDIR}/deskutils/py-vobject \ ${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-dbus \ xdg-open:${PORTSDIR}/devel/xdg-utils >Release-Note: >Audit-Trail: >Unformatted: