4 files changed, 21 insertions, 30 deletions

diff --git a/databases/p5-DBD-SQLite/Makefile b/databases/p5-DBD-SQLite/Makefile
index 463b8c220cdc..681a9230256e 100644
--- a/databases/p5-DBD-SQLite/Makefile
+++ b/databases/p5-DBD-SQLite/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	DBD-SQLite
-PORTVERSION=	1.11
-PORTREVISION=	2
+PORTVERSION=	1.12
 CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	DBD
diff --git a/databases/p5-DBD-SQLite/distinfo b/databases/p5-DBD-SQLite/distinfo
index fe83d0e1b1e0..8ad820f01372 100644
--- a/databases/p5-DBD-SQLite/distinfo
+++ b/databases/p5-DBD-SQLite/distinfo
@@ -1,3 +1,3 @@
-MD5 (DBD-SQLite-1.11.tar.gz) = 7f22d8789245047343e114e655571022
-SHA256 (DBD-SQLite-1.11.tar.gz) = f43a1eaab5c00aba5f3b46e389b396cb603d8abbf7e4500c35e1457f0438ca18
-SIZE (DBD-SQLite-1.11.tar.gz) = 493821
+MD5 (DBD-SQLite-1.12.tar.gz) = 40b1d208d70d5d8cab7723df96fc239c
+SHA256 (DBD-SQLite-1.12.tar.gz) = 37ad91ec0cec17c07f367b1aa974e3fd2b719e4a1cbb16e06b1799ed112ae2bd
+SIZE (DBD-SQLite-1.12.tar.gz) = 547151
diff --git a/databases/p5-DBD-SQLite/files/patch-Makefile.PL b/databases/p5-DBD-SQLite/files/patch-Makefile.PL
index 099baf8a17dd..e458f994f0c8 100644
--- a/databases/p5-DBD-SQLite/files/patch-Makefile.PL
+++ b/databases/p5-DBD-SQLite/files/patch-Makefile.PL
@@ -1,6 +1,6 @@
---- Makefile.PL.orig	Sat Aug  6 02:15:09 2005
-+++ Makefile.PL	Sat Dec  3 13:28:17 2005
-@@ -65,31 +65,31 @@
+--- Makefile.PL.orig	Fri Aug  5 19:15:09 2005
++++ Makefile.PL	Wed Apr 12 11:13:37 2006
+@@ -65,31 +65,31 @@ if ($force_local = (grep(/USE_LOCAL_SQLI
  
  # Now, check for a compatible sqlite3
  unless ($force_local) {
@@ -39,3 +39,17 @@
              last if $version;
          }
      }
+@@ -115,11 +115,11 @@ WriteMakefile(
+     'OBJECT'        => ($force_local) ? '$(O_FILES)' : 'SQLite.o dbdimp.o',
+     'INC'           => '-I. -I$(DBI_INSTARCH_DIR)' .
+                        (($sqlite_inc) ? " -I$sqlite_inc" : ''),
+-    $force_local ? () : ('LIBS' => '-lsqlite3'),
++    $force_local ? () : ('LIBS' => $sqlite_lib ? "-L$sqlite_lib -lsqlite3" : "-lsqlite3"),
+     $sqlite_lib  ? ('dynamic_lib' => { OTHERLDFLAGS => "-L$sqlite_lib" }) : (),
+     'OPTIMIZE'      => "-O2",
+     'DEFINE'        => "-DNDEBUG=1 -DSQLITE_PTR_SZ=$Config{ptrsize}" .
+-                       ( ($Config{d_usleep} ||
++                       ( (1 ||
+                           $Config{osname} =~ m/linux/) ?
+                                 " -DHAVE_USLEEP=1" : "" ) .
+                        ($DBI::VERSION > 1.42 ? '' : ' -Dno_last_insert_id'),
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 c9b329bdb988..000000000000
--- a/databases/p5-DBD-SQLite/files/patch-dbdimp.c
+++ /dev/null
@@ -1,22 +0,0 @@
-$FreeBSD$
-
---- dbdimp.c.orig	Wed Mar 22 15:21:16 2006
-+++ dbdimp.c	Wed Mar 22 15:21:38 2006
-@@ -260,7 +260,7 @@ sqlite_st_prepare (SV *sth, imp_sth_t *i
-     imp_sth->retval = SQLITE_OK;
-     imp_sth->params = newAV();
- 
--    if ((retval = sqlite3_prepare(imp_dbh->db, statement, 0, &(imp_sth->stmt), &extra))
-+    if ((retval = sqlite3_prepare(imp_dbh->db, statement, -1, &(imp_sth->stmt), &extra))
-         != SQLITE_OK)
-     {
-         if (imp_sth->stmt) {
-@@ -320,7 +320,7 @@ sqlite_st_execute (SV *sth, imp_sth_t *i
-         psv = hv_fetch((HV*)SvRV(sth), "Statement", 9, 0);
-         statement = (psv && SvOK(*psv)) ? SvPV_nolen(*psv) : "";
-         sqlite_trace(3, "re-prepare statement %s", statement);
--        if ((retval = sqlite3_prepare(imp_dbh->db, statement, 0, &(imp_sth->stmt), &extra))
-+        if ((retval = sqlite3_prepare(imp_dbh->db, statement, -1, &(imp_sth->stmt), &extra))
-             != SQLITE_OK)
-         {
-             if (imp_sth->stmt) {