Sat Jul 13 18:12:11 2013 UTC ()
This package bundles its own copy of SQLite 3.7.17. The bundled
copy isn't as portable as what's in databases/sqlite3. Instead of
trying to fix the copy, declare a buildlink dependency on 3.7.17,
and let pkgsrc figure out how to fulfill it. Bump PKGREVISION.


(schmonz)
diff -r1.37 -r1.38 pkgsrc/databases/p5-DBD-SQLite/Makefile
diff -r1.18 -r1.19 pkgsrc/databases/p5-DBD-SQLite/distinfo
diff -r0 -r1.1 pkgsrc/databases/p5-DBD-SQLite/patches/patch-Makefile.PL

cvs diff -r1.37 -r1.38 pkgsrc/databases/p5-DBD-SQLite/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/p5-DBD-SQLite/Makefile 2013/07/10 02:32:45 1.37
+++ pkgsrc/databases/p5-DBD-SQLite/Makefile 2013/07/13 18:12:11 1.38
@@ -1,24 +1,27 @@ @@ -1,24 +1,27 @@
1# $NetBSD: Makefile,v 1.37 2013/07/10 02:32:45 schmonz Exp $ 1# $NetBSD: Makefile,v 1.38 2013/07/13 18:12:11 schmonz Exp $
2 2
3DISTNAME= DBD-SQLite-1.39 3DISTNAME= DBD-SQLite-1.39
4PKGNAME= p5-${DISTNAME} 4PKGNAME= p5-${DISTNAME}
 5PKGREVISION= 1
5SVR4_PKGNAME= p5dsl 6SVR4_PKGNAME= p5dsl
6CATEGORIES= databases perl5 7CATEGORIES= databases perl5
7MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=DBD/} 8MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=DBD/}
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://search.cpan.org/dist/DBD-SQLite/ 11HOMEPAGE= http://search.cpan.org/dist/DBD-SQLite/
11COMMENT= Perl DBI/DBD driver for sqlite databases (self contained) 12COMMENT= Perl DBI/DBD driver for sqlite databases (self contained)
12LICENSE= ${PERL5_LICENSE} 13LICENSE= ${PERL5_LICENSE}
13 14
14PKG_INSTALLATION_TYPES= overwrite pkgviews 15PKG_INSTALLATION_TYPES= overwrite pkgviews
15 16
16USE_LANGUAGES= c 17USE_LANGUAGES= c
17PERL5_PACKLIST= auto/DBD/SQLite/.packlist 18PERL5_PACKLIST= auto/DBD/SQLite/.packlist
18#MAKE_PARAMS+= SQLITE_LOCATION=${PREFIX:Q} 19MAKE_PARAMS+= SQLITE_LOCATION=${LOCALBASE:Q}
19 20
20BUILDLINK_API_DEPENDS.p5-DBI+= p5-DBI>=1.580 21BUILDLINK_API_DEPENDS.p5-DBI+= p5-DBI>=1.580
 22BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.7.17
 23
21.include "../../databases/p5-DBI/buildlink3.mk" 24.include "../../databases/p5-DBI/buildlink3.mk"
22#.include "../../databases/sqlite3/buildlink3.mk" 25.include "../../databases/sqlite3/buildlink3.mk"
23.include "../../lang/perl5/module.mk" 26.include "../../lang/perl5/module.mk"
24.include "../../mk/bsd.pkg.mk" 27.include "../../mk/bsd.pkg.mk"

cvs diff -r1.18 -r1.19 pkgsrc/databases/p5-DBD-SQLite/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/p5-DBD-SQLite/distinfo 2013/07/10 02:32:45 1.18
+++ pkgsrc/databases/p5-DBD-SQLite/distinfo 2013/07/13 18:12:11 1.19
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.18 2013/07/10 02:32:45 schmonz Exp $ 1$NetBSD: distinfo,v 1.19 2013/07/13 18:12:11 schmonz Exp $
2 2
3SHA1 (DBD-SQLite-1.39.tar.gz) = 73c6a48ce0f05ccfef50bb656b72f2c050ddf9fe 3SHA1 (DBD-SQLite-1.39.tar.gz) = 73c6a48ce0f05ccfef50bb656b72f2c050ddf9fe
4RMD160 (DBD-SQLite-1.39.tar.gz) = 470e295e1895837e76450f06cdd0cdbf45c6f346 4RMD160 (DBD-SQLite-1.39.tar.gz) = 470e295e1895837e76450f06cdd0cdbf45c6f346
5Size (DBD-SQLite-1.39.tar.gz) = 1571169 bytes 5Size (DBD-SQLite-1.39.tar.gz) = 1571169 bytes
 6SHA1 (patch-Makefile.PL) = 8caa350b9e380a0eeae5dea3ee3f3ab239f685ea

File Added: pkgsrc/databases/p5-DBD-SQLite/patches/patch-Makefile.PL
$NetBSD: patch-Makefile.PL,v 1.1 2013/07/13 18:12:11 schmonz Exp $

Use pkgsrc's sqlite for portability.

--- Makefile.PL.orig	2013-05-31 04:30:29.000000000 +0000
+++ Makefile.PL
@@ -125,7 +125,7 @@ SCOPE: {
 # a system sqlite is also sophisticated enough to have a patching system
 # that can change the if ( 0 ) to if ( 1 )
 my ($sqlite_local, $sqlite_base, $sqlite_lib, $sqlite_inc);
-if ( 0 ) {
+if ( 1 ) {
 	require File::Spec;
 	if ( $sqlite_base = (grep(/SQLITE_LOCATION=.*/, @ARGV))[0] ) {
 		$sqlite_base =~ /=(.*)/;