4 files changed, 47 insertions, 61 deletions

diff --git a/databases/kinterbasdb/Makefile b/databases/kinterbasdb/Makefile
index 4f702675fda1..d9f4a3c1988a 100644
--- a/databases/kinterbasdb/Makefile
+++ b/databases/kinterbasdb/Makefile
@@ -7,12 +7,12 @@
 
 PORTNAME=		kinterbasdb
 PORTVERSION=		3.1
-VERSIONSUFFIX=		_pre6
+PORTREVISION=		1
 CATEGORIES=		databases python
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	kinterbasdb
 PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}
-DISTNAME=		${PORTNAME}-${PORTVERSION}${VERSIONSUFFIX}-src
+DISTNAME=		${PORTNAME}-${PORTVERSION}.src
 
 MAINTAINER=		rud@cs.uni-magdeburg.de
 COMMENT=		Python extension for Firebird/Interbase(R) relational databases
@@ -20,12 +20,14 @@ COMMENT=		Python extension for Firebird/Interbase(R) relational databases
 LIB_DEPENDS=		gds.1:${PORTSDIR}/databases/firebird
 RUN_DEPENDS=		${PYTHON_SITELIBDIR}/mx/DateTime/__init__.py:${PORTSDIR}/lang/py-mx-base
 
-WRKSRC=			${WRKDIR}/${PORTNAME}-${PORTVERSION}${VERSIONSUFFIX}
+WRKSRC=			${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 USE_PYTHON_PREFIX=	yes
 
+USE_GCC=		3.4
+
 PLIST_SUB=		INSTALLDIR=lib/${PYTHON_VERSION}/site-packages/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/databases/kinterbasdb/distinfo b/databases/kinterbasdb/distinfo
index 7ad5419cfd97..d4ed94367c51 100644
--- a/databases/kinterbasdb/distinfo
+++ b/databases/kinterbasdb/distinfo
@@ -1,2 +1,2 @@
-MD5 (kinterbasdb-3.1_pre6-src.tar.gz) = 60776283a744b87dc4e04c06f526657c
-SIZE (kinterbasdb-3.1_pre6-src.tar.gz) = 193680
+MD5 (kinterbasdb-3.1.src.tar.gz) = 33df6cd34efc25dc83aedec11d860ba6
+SIZE (kinterbasdb-3.1.src.tar.gz) = 215252
diff --git a/databases/kinterbasdb/files/patch-_kinterbasdb_constants.c b/databases/kinterbasdb/files/patch-_kinterbasdb_constants.c
deleted file mode 100644
index 83002fdac6de..000000000000
--- a/databases/kinterbasdb/files/patch-_kinterbasdb_constants.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- _kinterbasdb_constants.c.dist	Wed Dec  3 00:07:47 2003
-+++ _kinterbasdb_constants.c	Wed Dec  3 00:09:09 2003
-@@ -45,8 +45,8 @@
- ** The point of SET_TPB_CONST is to enter into dict d the equivalent of the

- ** Python string '\020', when passed the name and value of isc_some_dumb_const.

-  */

--#define SET_TPB_CONST(name, value) \

--  convArray[0] = (char) value; \

-+#define SET_TPB_CONST(name, value) \
-+  convArray[0] = (char) value; \
-   PyDict_SetItemString(d, name, PyString_FromStringAndSize(convArray, 1));

- 

-   /* 2003.02.20: added isc_tpb_version3: */

-@@ -85,7 +85,7 @@
- static void _init_kidb_ibase_header_constants_database_info(PyObject *d) {

- /* SET_INT_CONST is just a shortcut for entering database info constants into

- ** dict d. */

--#define SET_INT_CONST(name, value) \

-+#define SET_INT_CONST(name, value) \
-   PyDict_SetItemString(d, name, PyInt_FromLong(value));

- 

-   SET_INT_CONST("isc_info_db_id",                   isc_info_db_id);

diff --git a/databases/kinterbasdb/pkg-plist b/databases/kinterbasdb/pkg-plist
index 8cea58bc0f50..036f58271f16 100644
--- a/databases/kinterbasdb/pkg-plist
+++ b/databases/kinterbasdb/pkg-plist
@@ -1,50 +1,56 @@
 %%INSTALLDIR%%/__init__.py
-%%INSTALLDIR%%/__init__.pyc
-%%INSTALLDIR%%/__init__.pyo
+%%INSTALLDIR%%/k_exceptions.py
+%%INSTALLDIR%%/typeconv_naked.py
+%%INSTALLDIR%%/typeconv_backcompat.py
+%%INSTALLDIR%%/typeconv_23plus.py
+%%INSTALLDIR%%/typeconv_fixed_stdlib.py
+%%INSTALLDIR%%/typeconv_fixed_fixedpoint.py
+%%INSTALLDIR%%/typeconv_datetime_naked.py
+%%INSTALLDIR%%/typeconv_datetime_stdlib.py
+%%INSTALLDIR%%/typeconv_datetime_mx.py
+%%INSTALLDIR%%/typeconv_text_unicode.py
+%%INSTALLDIR%%/typeconv_util_isinstance.py
+%%INSTALLDIR%%/_py21incompat.py
+%%INSTALLDIR%%/services.py
 %%INSTALLDIR%%/_kinterbasdb.so
 %%INSTALLDIR%%/_kiservices.so
-%%INSTALLDIR%%/k_exceptions.py
+%%INSTALLDIR%%/__init__.pyc
 %%INSTALLDIR%%/k_exceptions.pyc
-%%INSTALLDIR%%/k_exceptions.pyo
-%%INSTALLDIR%%/services.py
-%%INSTALLDIR%%/services.pyc
-%%INSTALLDIR%%/services.pyo
-%%INSTALLDIR%%/typeconv_23plus.py
-%%INSTALLDIR%%/typeconv_23plus.pyc
-%%INSTALLDIR%%/typeconv_23plus.pyo
-%%INSTALLDIR%%/typeconv_backcompat.py
+%%INSTALLDIR%%/typeconv_naked.pyc
 %%INSTALLDIR%%/typeconv_backcompat.pyc
-%%INSTALLDIR%%/typeconv_backcompat.pyo
-%%INSTALLDIR%%/typeconv_datetime_mx.py
-%%INSTALLDIR%%/typeconv_datetime_mx.pyc
-%%INSTALLDIR%%/typeconv_datetime_mx.pyo
-%%INSTALLDIR%%/typeconv_datetime_naked.py
+%%INSTALLDIR%%/typeconv_23plus.pyc
+%%INSTALLDIR%%/typeconv_fixed_stdlib.pyc
+%%INSTALLDIR%%/typeconv_fixed_fixedpoint.pyc
 %%INSTALLDIR%%/typeconv_datetime_naked.pyc
-%%INSTALLDIR%%/typeconv_datetime_naked.pyo
-%%INSTALLDIR%%/typeconv_datetime_stdlib.py
 %%INSTALLDIR%%/typeconv_datetime_stdlib.pyc
-%%INSTALLDIR%%/typeconv_datetime_stdlib.pyo
-%%INSTALLDIR%%/typeconv_fixed_fixedpoint.py
-%%INSTALLDIR%%/typeconv_fixed_fixedpoint.pyc
-%%INSTALLDIR%%/typeconv_fixed_fixedpoint.pyo
-%%INSTALLDIR%%/typeconv_fixed_stdlib.py
-%%INSTALLDIR%%/typeconv_fixed_stdlib.pyc
-%%INSTALLDIR%%/typeconv_fixed_stdlib.pyo
-%%INSTALLDIR%%/typeconv_naked.py
-%%INSTALLDIR%%/typeconv_naked.pyc
-%%INSTALLDIR%%/typeconv_naked.pyo
-%%INSTALLDIR%%/typeconv_util_isinstance.py
+%%INSTALLDIR%%/typeconv_datetime_mx.pyc
+%%INSTALLDIR%%/typeconv_text_unicode.pyc
 %%INSTALLDIR%%/typeconv_util_isinstance.pyc
+%%INSTALLDIR%%/_py21incompat.pyc
+%%INSTALLDIR%%/services.pyc
+%%INSTALLDIR%%/__init__.pyo
+%%INSTALLDIR%%/k_exceptions.pyo
+%%INSTALLDIR%%/typeconv_naked.pyo
+%%INSTALLDIR%%/typeconv_backcompat.pyo
+%%INSTALLDIR%%/typeconv_23plus.pyo
+%%INSTALLDIR%%/typeconv_fixed_stdlib.pyo
+%%INSTALLDIR%%/typeconv_fixed_fixedpoint.pyo
+%%INSTALLDIR%%/typeconv_datetime_naked.pyo
+%%INSTALLDIR%%/typeconv_datetime_stdlib.pyo
+%%INSTALLDIR%%/typeconv_datetime_mx.pyo
+%%INSTALLDIR%%/typeconv_text_unicode.pyo
 %%INSTALLDIR%%/typeconv_util_isinstance.pyo
-%%INSTALLDIR%%/docs/Python-DB-API-2.0.html
-%%INSTALLDIR%%/docs/changelog.txt
-%%INSTALLDIR%%/docs/global.css
+%%INSTALLDIR%%/_py21incompat.pyo
+%%INSTALLDIR%%/services.pyo
 %%INSTALLDIR%%/docs/index.html
-%%INSTALLDIR%%/docs/installation-binary.html
 %%INSTALLDIR%%/docs/installation-source.html
+%%INSTALLDIR%%/docs/installation-binary.html
+%%INSTALLDIR%%/docs/usage.html
+%%INSTALLDIR%%/docs/changelog.txt
 %%INSTALLDIR%%/docs/license.txt
+%%INSTALLDIR%%/docs/Python-DB-API-2.0.html
 %%INSTALLDIR%%/docs/links.html
-%%INSTALLDIR%%/docs/usage.html
+%%INSTALLDIR%%/docs/global.css
 %%INSTALLDIR%%/docs/w3c.png
 @dirrm %%INSTALLDIR%%/docs
 @dirrm %%INSTALLDIR%%