From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Aug 24 12:20:09 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 BE547106564A for ; Wed, 24 Aug 2011 12:20:09 +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 9B9F08FC1C for ; Wed, 24 Aug 2011 12:20:09 +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 p7OCK9jY050889 for ; Wed, 24 Aug 2011 12:20:09 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p7OCK9cN050888; Wed, 24 Aug 2011 12:20:09 GMT (envelope-from gnats) Resent-Date: Wed, 24 Aug 2011 12:20:09 GMT Resent-Message-Id: <201108241220.p7OCK9cN050888@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 5FCF7106567B for ; Wed, 24 Aug 2011 12:10:12 +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 506198FC13 for ; Wed, 24 Aug 2011 12:10:12 +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 p7OCABgS022611 for ; Wed, 24 Aug 2011 12:10:11 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id p7OCABH2022610; Wed, 24 Aug 2011 12:10:11 GMT (envelope-from nobody) Message-Id: <201108241210.p7OCABH2022610@red.freebsd.org> Date: Wed, 24 Aug 2011 12:10:11 GMT From: Ruslan Mahmatkhanov To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/160055: [PATCH] games/anki: 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 12:20:09 -0000 >Number: 160055 >Category: ports >Synopsis: [PATCH] games/anki: 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 12:20:09 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Ruslan Mahmatkhanov >Release: 9.0-BETA1 >Organization: >Environment: 9.0-BETA1 i386 >Description: - bump USE_PYTHON to 2.5+ (the point is to not depend on python24) - since it now requires 2.5+ use databases/py-sqlite3 instead of databases/py-pysqlite2x - while here use GOOGLE_CODE instead of ${MASTER_SITE_GOOGLE_CODE} - bump port revision because of dependencies change I checked the code. They use this pattern when using sqlite binding: 18 try: 19 from pysqlite2 import dbapi2 as sqlite 20 except ImportError: 21 try: 22 from sqlite3 import dbapi2 as sqlite 23 except: 24 raise Exception("Please install pysqlite2 or python2.5") So nothing will be broken with sqlite3. >How-To-Repeat: >Fix: Patch attached with submission follows: --- Makefile.inc.orig 2011-07-21 00:09:09.000000000 +0400 +++ Makefile.inc 2011-08-24 16:03:49.000000000 +0400 @@ -2,12 +2,12 @@ PORTNAME= anki PORTVERSION= 1.2.8 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} +MASTER_SITES= GOOGLE_CODE EXTRACT_SUFX= .tgz -USE_PYTHON= yes +USE_PYTHON= 2.5+ USE_GETTEXT= yes USE_PYDISTUTILS= easy_install @@ -36,7 +36,7 @@ false .else BUILD_DEPENDS= ${PYNUMPY} \ - py*-pysqlite>=0:${PORTSDIR}/databases/py-pysqlite23 \ + ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \ py*-sqlalchemy06>=0:${PORTSDIR}/databases/py-sqlalchemy06 \ py*-game>=0:${PORTSDIR}/devel/py-game \ py*-simplejson>=0:${PORTSDIR}/devel/py-simplejson \ >Release-Note: >Audit-Trail: >Unformatted: