ports/160054: [PATCH] games/gcompris: eliminate py-pysqlite2x dependency

[Ruslan Mahmatkhanov]

>Number:         160054
>Category:       ports
>Synopsis:       [PATCH] games/gcompris: 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 11:50:07 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+
- since it now requires 2.5+ use databases/py-sqlite3 
  instead of databases/py-pysqlite2x
- bump portrevision

I checked the source. gcompris use sqlite like this:

 29 # Database
 30 try:
 31   from sqlite3 import dbapi2 as sqlite # python 2.5
 32 except:
 33   try:
 34     from pysqlite2 import dbapi2 as sqlite
 35   except:
 36     print 'This program requires pysqlite2\n',\
 37         'http://initd.org/tracker/pysqlite/'
 38     sys.exit(1)

So nothing will be breaked with sqlite3.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

--- Makefile.orig	2011-08-14 00:58:25.000000000 +0400
+++ Makefile	2011-08-24 15:33:04.000000000 +0400
@@ -7,6 +7,7 @@
 
 PORTNAME=	gcompris
 PORTVERSION=	9.6.1
+PORTREVISION=	1
 CATEGORIES=	games gnome
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}/
 
@@ -18,7 +19,7 @@
 
 BUILD_DEPENDS=	texi2html:${PORTSDIR}/textproc/texi2html \
 		gnuchess:${PORTSDIR}/games/gnuchess \
-		${PYTHON_SITELIBDIR}/pysqlite2/__init__.py:${PORTSDIR}/databases/py-pysqlite20
+		${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3
 LIB_DEPENDS=	vorbis.4:${PORTSDIR}/audio/libvorbis \
 		ao.4:${PORTSDIR}/audio/libao \
 		assetml.0:${PORTSDIR}/devel/libassetml \
@@ -26,14 +27,14 @@
 		gnet-2.0.0:${PORTSDIR}/net/gnet2 \
 		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 RUN_DEPENDS=	gnuchess:${PORTSDIR}/games/gnuchess \
-		${PYTHON_SITELIBDIR}/pysqlite2/__init__.py:${PORTSDIR}/databases/py-pysqlite20 \
+		${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \
 		gnucap:${PORTSDIR}/cad/gnucap
 
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 USE_GSTREAMER=	yes
-USE_PYTHON=	yes
+USE_PYTHON=	2.5+
 USE_SDL=	mixer
 USE_DISPLAY=	yes
 USE_GNOME=	gnomehack intlhack gnomeprefix gtk20 pygtk2 libxml2 librsvg2


>Release-Note:
>Audit-Trail:
>Unformatted: