[pkgsrc/trunk]: pkgsrc/www/trac unbork the sqlite2/sqlite3 breakage after my ...

[abs <abs%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4485a2b9b366
branches:  trunk
changeset: 547362:4485a2b9b366
user:      abs <abs%pkgsrc.org@localhost>
date:      Mon Sep 15 17:44:03 2008 +0000

description:
unbork the sqlite2/sqlite3 breakage after my upgrade to 0.11.1
Traq was already using sqlite3 - I misunderstood the py-sqlite numbering.
    - py-sqlite3 is sqlite3 for python2.5
    - py-sqlite2 is sqlite3 from python < 2.5
    - py-sqlite is sqlite2 for some version or versions
Apologies to the non python 2.5 users for he original breakage

diffstat:

 www/trac/Makefile |  17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diffs (45 lines):

diff -r 08232ce5f6ca -r 4485a2b9b366 www/trac/Makefile
--- a/www/trac/Makefile Mon Sep 15 17:42:53 2008 +0000
+++ b/www/trac/Makefile Mon Sep 15 17:44:03 2008 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2008/09/15 14:53:12 joerg Exp $
+# $NetBSD: Makefile,v 1.37 2008/09/15 17:44:03 abs Exp $
 #
 
 DISTNAME=      Trac-0.11.1
+PKGREVISION=   1
 PKGNAME=       ${DISTNAME:tl}
 EGG_NAME=      ${DISTNAME}
 CATEGORIES=    devel www
@@ -17,17 +18,18 @@
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.trac
 PKG_OPTIONS_REQUIRED_GROUPS=   db
-PKG_OPTIONS_GROUP.db=  sqlite2 sqlite3 pgsql psycopg2
-PKG_SUGGESTED_OPTIONS= sqlite3
+PKG_OPTIONS_GROUP.db=  sqlite pgsql psycopg2
+PKG_SUGGESTED_OPTIONS= sqlite
 
 .include "../../mk/bsd.options.mk"
+.include "../../lang/python/application.mk"
 
-.if !empty(PKG_OPTIONS:Msqlite2)
+.if !empty(PKG_OPTIONS:Msqlite)
+.if !empty(PYPKGPREFIX:M2*[1234])
 DEPENDS+=      ${PYPKGPREFIX}-sqlite2>=2:../../databases/py-sqlite2
+.else
+DEPENDS+=      ${PYPKGPREFIX}-sqlite3>=0:../../databases/py-sqlite3
 .endif
-.if !empty(PKG_OPTIONS:Msqlite3)
-DEPENDS+=      ${PYPKGPREFIX}-sqlite3>=0:../../databases/py-sqlite3
-PYTHON_VERSIONS_ACCEPTED=      25
 .endif
 .if !empty(PKG_OPTIONS:Mpgsql)
 DEPENDS+=      ${PYPKGPREFIX}-PgSQL>=2.4:../../databases/py-PgSQL
@@ -51,6 +53,5 @@
        ${INSTALL_SCRIPT} ${WRKSRC}/contrib/[A-qs-v]* ${EGDIR}
        ${INSTALL_SCRIPT} ${WRKSRC}/cgi-bin/trac.* ${CGIBINDIR}
 
-.include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"