From nobody@FreeBSD.org  Wed Aug 24 12:10:12 2011
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5FCF7106567B
	for <freebsd-gnats-submit@FreeBSD.org>; 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 <freebsd-gnats-submit@FreeBSD.org>; 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 <freebsd-gnats-submit@FreeBSD.org>; 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 <cvs-src@yandex.ru>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH] games/anki: eliminate py-pysqlite2x dependency
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         160055
>Category:       ports
>Synopsis:       [PATCH] games/anki: eliminate py-pysqlite2x dependency
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    eadler
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 24 12:20:09 UTC 2011
>Closed-Date:    Wed Aug 31 17:57:41 UTC 2011
>Last-Modified:  Wed Aug 31 18:00:23 UTC 2011
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->eadler 
Responsible-Changed-By: eadler 
Responsible-Changed-When: Mon Aug 29 23:36:54 UTC 2011 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=160055 
State-Changed-From-To: open->closed 
State-Changed-By: eadler 
State-Changed-When: Wed Aug 31 17:57:39 UTC 2011 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=160055 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/160055: commit references a PR
Date: Wed, 31 Aug 2011 17:52:45 +0000 (UTC)

 eadler      2011-08-31 17:52:32 UTC
 
   FreeBSD ports repository
 
   Modified files:
     games/anki           Makefile.inc 
     multimedia/pyjama    Makefile 
   Log:
   - eliminate py-pysqlite2x dependency from games/anki [0]
   - eliminate py-pysqlite2x dependency from multimedia/pyjama [1]
   - add gstreamer-plugins-gnomevfs as a dep to multimedias/pyjama [2]
   
   PR:             ports/160055 [0], ports/160065 [1,2]
   Submitted by:   Ruslan Mahmatkhanov <cvs-src@yandex.ru> [0,1], Kjell Tore Ullavik <ktullavik@gmail.com> (maintainer) [2]
   Approved by:    bapt (mentor), Kjell Tore Ullavik <ktullavik@gmail.com> (maintainer)
   
   Revision  Changes    Path
   1.12      +3 -3      ports/games/anki/Makefile.inc
   1.7       +3 -3      ports/multimedia/pyjama/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
