From 26a49a2943f35d8ae46cc176371b0dba490f6bdb Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Thu, 11 Jul 2019 22:54:05 +0000
Subject: user/perl-dbd-pg: bump to 3.8.1 for >= 10 support, fix tests

---
 user/perl-dbd-pg/APKBUILD        | 14 +++++++-------
 user/perl-dbd-pg/fix-tests.patch | 13 +++++++++++++
 2 files changed, 20 insertions(+), 7 deletions(-)
 create mode 100644 user/perl-dbd-pg/fix-tests.patch

diff --git a/user/perl-dbd-pg/APKBUILD b/user/perl-dbd-pg/APKBUILD
index bf7d3b2a2..4cb07d7d2 100644
--- a/user/perl-dbd-pg/APKBUILD
+++ b/user/perl-dbd-pg/APKBUILD
@@ -1,8 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
 pkgname=perl-dbd-pg
-_pkgname=DBD-Pg
-pkgver=3.7.4
+pkgver=3.8.1
 pkgrel=0
 pkgdesc="PostgreSQL interface for Perl DBI"
 url="https://metacpan.org/release/DBD-Pg"
@@ -10,25 +9,26 @@ arch="all"
 license="Artistic-1.0-Perl OR GPL-2.0-only"
 depends="perl-dbi"
 makedepends="perl-dev postgresql-dev"
+checkdepends="cmd:locale postgresql"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/T/TU/TURNSTEP/DBD-Pg-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/T/TU/TURNSTEP/DBD-Pg-$pkgver.tar.gz
+	fix-tests.patch
+	"
 builddir="$srcdir/DBD-Pg-$pkgver"
 
 build() {
-	cd "$builddir"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="77c629ce89233345f7893b0cc2799a5efc646e86b62ee91986678f196380ac772ece7b9f6c98dae588fbf8f29def1f997335fa85874562ab648af8665cd9add8  DBD-Pg-3.7.4.tar.gz"
+sha512sums="0e48e8b5932a0d680284e0b494b3e09b8aceeecebc3631cc02e35c391fdc7bde5ab2f6d3fe2eeb46c207fba2143871728ef57f8d0a81c075745e2be4249e2423  DBD-Pg-3.8.1.tar.gz
+f7032e7e63eb403778e3f42e1b7f7d472695175d3d8c30bc10062ffee6275b8f46635ea2a82ca2cc5c9de48f7bfa64cdfce56ce58846302bb32db0e4657dcee7  fix-tests.patch"
diff --git a/user/perl-dbd-pg/fix-tests.patch b/user/perl-dbd-pg/fix-tests.patch
new file mode 100644
index 000000000..fd977b05c
--- /dev/null
+++ b/user/perl-dbd-pg/fix-tests.patch
@@ -0,0 +1,13 @@
+--- DBD-Pg-3.8.1/t/dbdpg_test_setup.pl.old	2019-07-06 15:16:37.000000000 +0000
++++ DBD-Pg-3.8.1/t/dbdpg_test_setup.pl	2019-07-11 22:52:13.898484394 +0000
+@@ -425,10 +425,6 @@
+ 		if ($info =~ /but is not empty/) {
+ 			## Assume this is already good to go
+ 		}
+-		elsif ($info !~ /pg_ctl/) {
+-			$@ = "initdb did not give a pg_ctl string: $info";
+-			last GETHANDLE; ## Fail - bad output
+-		}
+ 
+ 		## Which user do we connect as?
+ 		if (!$su and $info =~ /owned by user "(.+?)"/) {
-- 
cgit v1.2.3-70-g09d2