update to version 1.25

tested by bernd@ in a bulk build, thanks!
early test and late reminder by landry@
This commit is contained in:
simon 2009-05-12 23:26:26 +00:00
parent be59bde7ab
commit 93c093b8ac
4 changed files with 42 additions and 17 deletions

View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.17 2009/01/24 17:42:22 simon Exp $
# $OpenBSD: Makefile,v 1.18 2009/05/12 23:26:26 simon Exp $
SHARED_ONLY= Yes
COMMENT= SQLite drivers for the Perl DBI
MODULES= cpan
DISTNAME= DBD-SQLite-1.14
PKGNAME= p5-${DISTNAME}p1v0
DISTNAME= DBD-SQLite-1.25
PKGNAME= p5-${DISTNAME}v0
CATEGORIES= databases
MAINTAINER= Robert Nagy <robert@openbsd.org>
@ -19,15 +19,12 @@ PERMIT_DISTFILES_FTP= Yes
BUILD_DEPENDS= :p5-DBI->=1.08:databases/p5-DBI
RUN_DEPENDS= :p5-DBI->=1.08:databases/p5-DBI
LIB_DEPENDS= sqlite3:sqlite3->=3.6.4:databases/sqlite3
LIB_DEPENDS= sqlite3:sqlite3->=3.6.13p0:databases/sqlite3
CONFIGURE_ARGS= SQLITE_LOCATION=${LOCALBASE}
MAKE_FLAGS= CC='${CC}' \
LD='${CC}'
# as DBD::SQLite bundles sqlite3, our patches can't use functions from newer
# versions installed via ports
post-extract:
rm -f ${WRKSRC}/sqlite3.h ${WRKSRC}/sqlite3ext.h
MAKE_ENV += AUTOMATED_TESTING=1
.include <bsd.port.mk>

View File

@ -1,5 +1,5 @@
MD5 (DBD-SQLite-1.14.tar.gz) = eKicyP1GuypdU3Qz3MzI5g==
RMD160 (DBD-SQLite-1.14.tar.gz) = B2FtPbfeVRNFiPyn3/PexQkf/Hc=
SHA1 (DBD-SQLite-1.14.tar.gz) = aOE6XxuhJJlikwFAoLDjtYdAGrc=
SHA256 (DBD-SQLite-1.14.tar.gz) = RBidNzp37rilNT4M2Iv/BN3m5hFnir3Gg0yA010vDQc=
SIZE (DBD-SQLite-1.14.tar.gz) = 703380
MD5 (DBD-SQLite-1.25.tar.gz) = O8nI8UHLbJJW6m283buf5w==
RMD160 (DBD-SQLite-1.25.tar.gz) = 9gjYHCdl7BeUaMlhGMTORjZRGB8=
SHA1 (DBD-SQLite-1.25.tar.gz) = VKKdl8TSILIEgX8TAft84Plk6Vw=
SHA256 (DBD-SQLite-1.25.tar.gz) = gywfmnPQJYapOgVBX5fCiYClAyPnaYrzGHMKB2UCrZ0=
SIZE (DBD-SQLite-1.25.tar.gz) = 1102688

View File

@ -0,0 +1,28 @@
Upstream forces use of bundeled sqlite but we use the one from ports.
$OpenBSD: patch-Makefile_PL,v 1.8 2009/05/12 23:26:26 simon Exp $
--- Makefile.PL.orig Thu Apr 23 12:12:04 2009
+++ Makefile.PL Thu Apr 23 17:52:59 2009
@@ -79,7 +79,7 @@ if ( $@ or DBI->VERSION < $DBI_required ) {
# Let's find out the full story first, so we can make an informed
# decision to whether to do this. -- ADAMK
my ($force_local, $sqlite_base, $sqlite_lib, $sqlite_inc);
-if ( 0 ) {
+if ( 1 ) {
require File::Spec;
if ( $sqlite_base = (grep(/SQLITE_LOCATION=.*/, @ARGV))[0] ) {
$sqlite_base =~ /=(.*)/;
@@ -141,8 +141,13 @@ if ( 0 ) {
# Use always the bundled one.
# XXX: ... and this message should be more informative.
+
+=for comment
+
$force_local = 1;
print "We're using the bundled sqlite library.\n" if $ENV{AUTOMATED_TESTING};
+
+=cut
@ARGV = grep( ! /SQLITE_LOCATION|USE_LOCAL_SQLITE/, @ARGV );

View File

@ -2,10 +2,10 @@ This patch makes sure that prepared statements get closed when
$dbh->disconnect() is called. Ticket created upstream at
http://rt.cpan.org/Public/Bug/Display.html?id=40383
$OpenBSD: patch-dbdimp_c,v 1.5 2009/01/24 17:42:22 simon Exp $
--- dbdimp.c.orig Fri Aug 24 04:51:25 2007
+++ dbdimp.c Sat Oct 25 22:31:04 2008
@@ -151,8 +151,13 @@ sqlite_db_disconnect (SV *dbh, imp_dbh_t *imp_dbh)
$OpenBSD: patch-dbdimp_c,v 1.6 2009/05/12 23:26:26 simon Exp $
--- dbdimp.c.orig Thu Apr 23 12:12:05 2009
+++ dbdimp.c Thu Apr 23 17:51:37 2009
@@ -169,8 +169,13 @@ sqlite_db_disconnect (SV *dbh, imp_dbh_t *imp_dbh)
}
if (sqlite3_close(imp_dbh->db) == SQLITE_BUSY) {