Retire psycopg1 option and rename psycopg2 to postgresql, making it
the default. Bump revision.
This commit is contained in:
joerg
parent
ec7442b690
commit
53ee70416e
3 changed files with 39 additions and 48 deletions
|
|
@ -1,8 +1,9 @@
|
|||
# $NetBSD: Makefile,v 1.21 2009/10/19 11:31:05 joerg Exp $
|
||||
# $NetBSD: Makefile,v 1.22 2010/02/10 17:21:55 joerg Exp $
|
||||
|
||||
DJANGOVERS= 1.1.1
|
||||
DISTNAME= Django-${DJANGOVERS}
|
||||
PKGNAME= ${PYPKGPREFIX}-django-${DJANGOVERS}
|
||||
PKGREVISION= 1
|
||||
CATEGORIES= www python
|
||||
MASTER_SITES= http://media.djangoproject.com/releases/${DJANGOVERS}/
|
||||
|
||||
|
|
@ -30,10 +31,8 @@ pre-configure:
|
|||
.if empty(PKG_OPTIONS:Mmysql)
|
||||
rm -r ${WRKSRC}/django/db/backends/mysql
|
||||
.endif
|
||||
.if empty(PKG_OPTIONS:Mpsycopg1) && empty(PKG_OPTIONS:Mpsycopg2)
|
||||
.if empty(PKG_OPTIONS:Mpostgresql)
|
||||
rm -r ${WRKSRC}/django/db/backends/postgresql
|
||||
.endif
|
||||
.if empty(PKG_OPTIONS:Mpsycopg2)
|
||||
rm -r ${WRKSRC}/django/db/backends/postgresql_psycopg2
|
||||
.endif
|
||||
.if empty(PKG_OPTIONS:Msqlite)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
@comment $NetBSD: PLIST,v 1.12 2009/10/19 11:31:05 joerg Exp $
|
||||
@comment $NetBSD: PLIST,v 1.13 2010/02/10 17:21:55 joerg Exp $
|
||||
bin/django-admin.py
|
||||
${PYSITELIB}/django/__init__.py
|
||||
${PYSITELIB}/django/__init__.pyc
|
||||
|
|
@ -1863,36 +1863,36 @@ ${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/introspection.pyo
|
|||
${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/validation.py
|
||||
${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/validation.pyc
|
||||
${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/validation.pyo
|
||||
${PLIST.psycopg1}${PYSITELIB}/django/db/backends/postgresql/__init__.py
|
||||
${PLIST.psycopg1}${PYSITELIB}/django/db/backends/postgresql/__init__.pyc
|
||||
${PLIST.psycopg1}${PYSITELIB}/django/db/backends/postgresql/__init__.pyo
|
||||
${PLIST.psycopg1}${PYSITELIB}/django/db/backends/postgresql/base.py
|
||||
${PLIST.psycopg1}${PYSITELIB}/django/db/backends/postgresql/base.pyc
|
||||
${PLIST.psycopg1}${PYSITELIB}/django/db/backends/postgresql/base.pyo
|
||||
${PLIST.psycopg1}${PYSITELIB}/django/db/backends/postgresql/client.py
|
||||
${PLIST.psycopg1}${PYSITELIB}/django/db/backends/postgresql/client.pyc
|
||||
${PLIST.psycopg1}${PYSITELIB}/django/db/backends/postgresql/client.pyo
|
||||
${PLIST.psycopg1}${PYSITELIB}/django/db/backends/postgresql/creation.py
|
||||
${PLIST.psycopg1}${PYSITELIB}/django/db/backends/postgresql/creation.pyc
|
||||
${PLIST.psycopg1}${PYSITELIB}/django/db/backends/postgresql/creation.pyo
|
||||
${PLIST.psycopg1}${PYSITELIB}/django/db/backends/postgresql/introspection.py
|
||||
${PLIST.psycopg1}${PYSITELIB}/django/db/backends/postgresql/introspection.pyc
|
||||
${PLIST.psycopg1}${PYSITELIB}/django/db/backends/postgresql/introspection.pyo
|
||||
${PLIST.psycopg1}${PYSITELIB}/django/db/backends/postgresql/operations.py
|
||||
${PLIST.psycopg1}${PYSITELIB}/django/db/backends/postgresql/operations.pyc
|
||||
${PLIST.psycopg1}${PYSITELIB}/django/db/backends/postgresql/operations.pyo
|
||||
${PLIST.psycopg1}${PYSITELIB}/django/db/backends/postgresql/version.py
|
||||
${PLIST.psycopg1}${PYSITELIB}/django/db/backends/postgresql/version.pyc
|
||||
${PLIST.psycopg1}${PYSITELIB}/django/db/backends/postgresql/version.pyo
|
||||
${PLIST.psycopg2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/__init__.py
|
||||
${PLIST.psycopg2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/__init__.pyc
|
||||
${PLIST.psycopg2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/__init__.pyo
|
||||
${PLIST.psycopg2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/base.py
|
||||
${PLIST.psycopg2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/base.pyc
|
||||
${PLIST.psycopg2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/base.pyo
|
||||
${PLIST.psycopg2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/introspection.py
|
||||
${PLIST.psycopg2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/introspection.pyc
|
||||
${PLIST.psycopg2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/introspection.pyo
|
||||
${PLIST.postgresql}${PYSITELIB}/django/db/backends/postgresql/__init__.py
|
||||
${PLIST.postgresql}${PYSITELIB}/django/db/backends/postgresql/__init__.pyc
|
||||
${PLIST.postgresql}${PYSITELIB}/django/db/backends/postgresql/__init__.pyo
|
||||
${PLIST.postgresql}${PYSITELIB}/django/db/backends/postgresql/base.py
|
||||
${PLIST.postgresql}${PYSITELIB}/django/db/backends/postgresql/base.pyc
|
||||
${PLIST.postgresql}${PYSITELIB}/django/db/backends/postgresql/base.pyo
|
||||
${PLIST.postgresql}${PYSITELIB}/django/db/backends/postgresql/client.py
|
||||
${PLIST.postgresql}${PYSITELIB}/django/db/backends/postgresql/client.pyc
|
||||
${PLIST.postgresql}${PYSITELIB}/django/db/backends/postgresql/client.pyo
|
||||
${PLIST.postgresql}${PYSITELIB}/django/db/backends/postgresql/creation.py
|
||||
${PLIST.postgresql}${PYSITELIB}/django/db/backends/postgresql/creation.pyc
|
||||
${PLIST.postgresql}${PYSITELIB}/django/db/backends/postgresql/creation.pyo
|
||||
${PLIST.postgresql}${PYSITELIB}/django/db/backends/postgresql/introspection.py
|
||||
${PLIST.postgresql}${PYSITELIB}/django/db/backends/postgresql/introspection.pyc
|
||||
${PLIST.postgresql}${PYSITELIB}/django/db/backends/postgresql/introspection.pyo
|
||||
${PLIST.postgresql}${PYSITELIB}/django/db/backends/postgresql/operations.py
|
||||
${PLIST.postgresql}${PYSITELIB}/django/db/backends/postgresql/operations.pyc
|
||||
${PLIST.postgresql}${PYSITELIB}/django/db/backends/postgresql/operations.pyo
|
||||
${PLIST.postgresql}${PYSITELIB}/django/db/backends/postgresql/version.py
|
||||
${PLIST.postgresql}${PYSITELIB}/django/db/backends/postgresql/version.pyc
|
||||
${PLIST.postgresql}${PYSITELIB}/django/db/backends/postgresql/version.pyo
|
||||
${PLIST.postgresql}${PYSITELIB}/django/db/backends/postgresql_psycopg2/__init__.py
|
||||
${PLIST.postgresql}${PYSITELIB}/django/db/backends/postgresql_psycopg2/__init__.pyc
|
||||
${PLIST.postgresql}${PYSITELIB}/django/db/backends/postgresql_psycopg2/__init__.pyo
|
||||
${PLIST.postgresql}${PYSITELIB}/django/db/backends/postgresql_psycopg2/base.py
|
||||
${PLIST.postgresql}${PYSITELIB}/django/db/backends/postgresql_psycopg2/base.pyc
|
||||
${PLIST.postgresql}${PYSITELIB}/django/db/backends/postgresql_psycopg2/base.pyo
|
||||
${PLIST.postgresql}${PYSITELIB}/django/db/backends/postgresql_psycopg2/introspection.py
|
||||
${PLIST.postgresql}${PYSITELIB}/django/db/backends/postgresql_psycopg2/introspection.pyc
|
||||
${PLIST.postgresql}${PYSITELIB}/django/db/backends/postgresql_psycopg2/introspection.pyo
|
||||
${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/__init__.py
|
||||
${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/__init__.pyc
|
||||
${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/__init__.pyo
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
# $NetBSD: options.mk,v 1.5 2008/04/12 22:43:13 jlam Exp $
|
||||
# $NetBSD: options.mk,v 1.6 2010/02/10 17:21:55 joerg Exp $
|
||||
|
||||
PKG_OPTIONS_VAR = PKG_OPTIONS.django
|
||||
PKG_SUPPORTED_OPTIONS= mysql psycopg1 psycopg2 sqlite
|
||||
PKG_SUGGESTED_OPTIONS= psycopg1
|
||||
PKG_SUPPORTED_OPTIONS= mysql postgresql sqlite
|
||||
PKG_SUGGESTED_OPTIONS= postgresql
|
||||
|
||||
.include "../../mk/bsd.options.mk"
|
||||
|
||||
|
|
@ -13,17 +13,9 @@ DEPENDS+= ${PYPKGPREFIX}-mysqldb-[0-9]*:../../databases/py-mysqldb
|
|||
PLIST.mysql= yes
|
||||
.endif
|
||||
|
||||
.if !empty(PKG_OPTIONS:Mpsycopg1)
|
||||
DEPENDS+= ${PYPKGPREFIX}-psycopg-[0-9]*:../../databases/py-psycopg
|
||||
.endif
|
||||
|
||||
.if !empty(PKG_OPTIONS:Mpsycopg2)
|
||||
.if !empty(PKG_OPTIONS:Mpostgresql)
|
||||
DEPENDS+= ${PYPKGPREFIX}-psycopg2-[0-9]*:../../databases/py-psycopg2
|
||||
PLIST.psycopg2= yes
|
||||
.endif
|
||||
|
||||
.if !empty(PKG_OPTIONS:Mpsycopg1) || !empty(PKG_OPTIONS:Mpsycopg2)
|
||||
PLIST.psycopg1= yes
|
||||
PLIST.postgresql= yes
|
||||
.endif
|
||||
|
||||
.if !empty(PKG_OPTIONS:Msqlite)
|
||||
|
|
|
|||
Loading…
Reference in a new issue