5 files changed, 20 insertions, 40 deletions

diff --git a/databases/p5-DBD-SQLite/Makefile b/databases/p5-DBD-SQLite/Makefile
index 5abf3c160583..24afada953df 100644
--- a/databases/p5-DBD-SQLite/Makefile
+++ b/databases/p5-DBD-SQLite/Makefile
@@ -5,9 +5,9 @@
 # $FreeBSD$
 #
 
-PORTNAME=	DBD-SQLite
-PORTVERSION=	0.31
-PORTREVISION=	1
+PORTNAME=	DBD-SQLite2
+PORTVERSION=	0.33
+PORTREVISION=	0
 CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	DBD
@@ -18,7 +18,7 @@ COMMENT=	Provides access to SQLite2 databases through the DBI
 
 PERL_CONFIGURE=	yes
 
-MAN3=		DBD::SQLite.3
+MAN3=		DBD::SQLite2.3
 
 .include <bsd.port.pre.mk>
 
@@ -30,4 +30,7 @@ BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
 .endif
 
+post-extract:
+	${RM} -f ${WRKSRC}/getsqlite.pl
+
 .include <bsd.port.post.mk>
diff --git a/databases/p5-DBD-SQLite/distinfo b/databases/p5-DBD-SQLite/distinfo
index 89cda21de584..ff20764a3709 100644
--- a/databases/p5-DBD-SQLite/distinfo
+++ b/databases/p5-DBD-SQLite/distinfo
@@ -1,2 +1,2 @@
-MD5 (DBD-SQLite-0.31.tar.gz) = 4aa99c39104b7cd39129aec548e7d3e4
-SIZE (DBD-SQLite-0.31.tar.gz) = 357902
+MD5 (DBD-SQLite2-0.33.tar.gz) = babd83fd5eb9ba7560ad4bab4c76c0eb
+SIZE (DBD-SQLite2-0.33.tar.gz) = 363277
diff --git a/databases/p5-DBD-SQLite/files/patch-dbdimp.c b/databases/p5-DBD-SQLite/files/patch-dbdimp.c
deleted file mode 100644
index ac2081868ac1..000000000000
--- a/databases/p5-DBD-SQLite/files/patch-dbdimp.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- dbdimp.c.orig	Sun Feb 15 02:36:38 2004
-+++ dbdimp.c	Fri Jun 11 22:32:17 2004
-@@ -1,4 +1,4 @@
--/* $Id: dbdimp.c,v 1.44 2004/02/14 17:36:38 matt Exp $ */
-+/* $Id: dbdimp.c,v 1.45 2004/03/16 19:08:22 matt Exp $ */
- 
- #include "SQLiteXS.h"
- 
-@@ -294,8 +294,11 @@
- char *
- sqlite_decode(imp_dbh_t *imp_dbh, char *input, size_t *len)
- {
--  char *ret = malloc(*len);
--  char *swit = ret;
-+  char *ret;
-+  char *swit;
-+
-+  New(1, ret, *len, char);
-+  swit = ret;
- 
-   while (*input) {
-     switch (*input) {
diff --git a/databases/p5-DBD-SQLite/pkg-descr b/databases/p5-DBD-SQLite/pkg-descr
index 67516ef45351..4fca15965e42 100644
--- a/databases/p5-DBD-SQLite/pkg-descr
+++ b/databases/p5-DBD-SQLite/pkg-descr
@@ -1,12 +1,12 @@
-DBD::SQLite
-===========
+DBD::SQLite2
+============
 
 SQLite is a small fast embedded SQL database engine.
 
-DBD::SQLite embeds that database engine into a DBD driver, so if
+DBD::SQLite2 embeds that database engine into a DBD driver, so if
 you want a relational database for your project, but don't want
 to install a large RDBMS system like MySQL or PostgreSQL, then
-DBD::SQLite may be just what you need.
+DBD::SQLite2 may be just what you need.
 
 It supports quite a lot of features, such as transactions (atomic
 commit and rollback), indexes, DBA-free operation, a large subset
diff --git a/databases/p5-DBD-SQLite/pkg-plist b/databases/p5-DBD-SQLite/pkg-plist
index ebefd1d70f3a..7cda5ab0da53 100644
--- a/databases/p5-DBD-SQLite/pkg-plist
+++ b/databases/p5-DBD-SQLite/pkg-plist
@@ -1,8 +1,7 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/DBD/SQLite.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBD/getsqlite.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/SQLite/SQLite.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/SQLite/SQLite.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/SQLite/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/SQLite 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD        2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/DBD             2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/DBD/SQLite2.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/SQLite2/SQLite2.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/SQLite2/SQLite2.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/SQLite2/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/SQLite2 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD         2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/DBD              2>/dev/null || true