From 569842bfe3cf7482b7f587f0a6af3725e9ad6b64 Mon Sep 17 00:00:00 2001 From: schmonz Date: Sat, 13 Jul 2013 18:12:11 +0000 Subject: 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. --- databases/p5-DBD-SQLite/Makefile | 9 ++++++--- databases/p5-DBD-SQLite/distinfo | 3 ++- databases/p5-DBD-SQLite/patches/patch-Makefile.PL | 15 +++++++++++++++ 3 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 databases/p5-DBD-SQLite/patches/patch-Makefile.PL (limited to 'databases/p5-DBD-SQLite') diff --git a/databases/p5-DBD-SQLite/Makefile b/databases/p5-DBD-SQLite/Makefile index f55af0ba7a9..912d5e94208 100644 --- a/databases/p5-DBD-SQLite/Makefile +++ b/databases/p5-DBD-SQLite/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.37 2013/07/10 02:32:45 schmonz Exp $ +# $NetBSD: Makefile,v 1.38 2013/07/13 18:12:11 schmonz Exp $ DISTNAME= DBD-SQLite-1.39 PKGNAME= p5-${DISTNAME} +PKGREVISION= 1 SVR4_PKGNAME= p5dsl CATEGORIES= databases perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=DBD/} @@ -15,10 +16,12 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_LANGUAGES= c PERL5_PACKLIST= auto/DBD/SQLite/.packlist -#MAKE_PARAMS+= SQLITE_LOCATION=${PREFIX:Q} +MAKE_PARAMS+= SQLITE_LOCATION=${LOCALBASE:Q} BUILDLINK_API_DEPENDS.p5-DBI+= p5-DBI>=1.580 +BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.7.17 + .include "../../databases/p5-DBI/buildlink3.mk" -#.include "../../databases/sqlite3/buildlink3.mk" +.include "../../databases/sqlite3/buildlink3.mk" .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/p5-DBD-SQLite/distinfo b/databases/p5-DBD-SQLite/distinfo index 040db92f33e..c249121fc76 100644 --- a/databases/p5-DBD-SQLite/distinfo +++ b/databases/p5-DBD-SQLite/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.18 2013/07/10 02:32:45 schmonz Exp $ +$NetBSD: distinfo,v 1.19 2013/07/13 18:12:11 schmonz Exp $ SHA1 (DBD-SQLite-1.39.tar.gz) = 73c6a48ce0f05ccfef50bb656b72f2c050ddf9fe RMD160 (DBD-SQLite-1.39.tar.gz) = 470e295e1895837e76450f06cdd0cdbf45c6f346 Size (DBD-SQLite-1.39.tar.gz) = 1571169 bytes +SHA1 (patch-Makefile.PL) = 8caa350b9e380a0eeae5dea3ee3f3ab239f685ea diff --git a/databases/p5-DBD-SQLite/patches/patch-Makefile.PL b/databases/p5-DBD-SQLite/patches/patch-Makefile.PL new file mode 100644 index 00000000000..d09f4025c78 --- /dev/null +++ b/databases/p5-DBD-SQLite/patches/patch-Makefile.PL @@ -0,0 +1,15 @@ +$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 =~ /=(.*)/; -- cgit v1.2.3