On Mon, Jul 27, 2020 at 07:57:08AM +0000, wen heping wrote:
> Hi, all:
>
> Here is a patch for databases/p5-DBIx-Class to update 0.082842.
> It build well and run well. 2 tests failed in total of 314 tests.(while
> currently
> there are 7 tests failed in total 308 tests)
> There are 16 ports depends on databases/p5-DBIx-Class, 2 of them build but
> failed tests, others build well and pass all tests :
> 1) audio/squeezecenter: Actually I did not test it, because in my memory,
> the version of squeezecenter is too old and there are many tests failed.
> 2) security/p5-Catalyst-Plugin-Authentication-Store-DBIC: also its test
> failure
> is caused by the deprecation version of Catalyst. And this port could be
> removed
> after we update Catalyst.
>
> One new port should be added before this patch:
> databases/p5-SQL-Abstract-Classic,
> which I submitted yesterday.
>
> Cheers !
> wen
I reworked this a bit, for one the patches need to be removed now and
I updated the DEPENDS (as well as moving some MODULES += down by the
setup for them so they are easier to comment out). Removing the mysql
and Pg tests by commenting out the setup for those modules and not
running the "live" tests does avoid the failures.
I have asked on IRC for some help with figuring out the failing tests,
but note that I see the same failures in 0.082820.
This does, as was said above, require the new port of
p5-SQL-Abstract-Classic that was submitted previously and I am waiting
for another OK to import.
Comments? OK pending the other import?
Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/p5-DBIx-Class/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile 3 Jul 2020 21:44:36 -0000 1.25
+++ Makefile 17 Aug 2020 00:27:53 -0000
@@ -2,22 +2,20 @@
COMMENT = extensible and flexible object relational mapper
-MODULES = cpan databases/postgresql databases/mariadb
+MODULES = cpan
PKG_ARCH = *
-DISTNAME = DBIx-Class-0.082820
+DISTNAME = DBIx-Class-0.082842
CATEGORIES = databases devel
-REVISION = 2
MAINTAINER = Andrew Fresh <afre...@openbsd.org>
-# Artistic
+# Perl
PERMIT_PACKAGE = Yes
CONFIGURE_ARGS = --skipdeps
RUN_DEPENDS = databases/p5-DBI>=1.57 \
- databases/p5-Data-Page>=2.00 \
- databases/p5-SQL-Abstract>=1.81 \
+ databases/p5-SQL-Abstract-Classic>=1.91 \
devel/p5-Class-Accessor-Grouped>=0.10012 \
devel/p5-Class-C3-Componentised>=1.0009 \
devel/p5-Class-Inspector>=1.24 \
@@ -28,13 +26,14 @@ RUN_DEPENDS = databases/p5-DBI>=1.57 \
devel/p5-Hash-Merge>=0.12 \
devel/p5-MRO-Compat>=0.12 \
devel/p5-Module-Find>=0.07 \
- devel/p5-Moo>=2.000 \
+ devel/p5-Moo>=2.0 \
devel/p5-Path-Class>=0.18 \
devel/p5-Scope-Guard>=0.03 \
devel/p5-Sub-Name>=0.04 \
devel/p5-Try-Tiny>=0.07 \
devel/p5-namespace-clean>=0.24
+# Listed as BUILD_DEPENDS, but are actually TEST_DEPENDS
TEST_DEPENDS = databases/p5-DBD-SQLite>=1.29 \
devel/p5-Package-Stash>=0.28 \
devel/p5-Test-Deep>=0.101 \
@@ -42,42 +41,46 @@ TEST_DEPENDS = databases/p5-DBD-SQLite>=
devel/p5-Test-Warn>=0.21
# Optional depends to avoid skipping tests
-TEST_DEPENDS += converters/p5-JSON-Any \
- devel/p5-Getopt-Long-Descriptive \
- devel/p5-Module-Pluggable \
- devel/p5-Sys-SigAction \
- math/p5-Math-Base36 \
- textproc/p5-Text-CSV \
+TEST_DEPENDS += \
+ converters/p5-Cpanel-JSON-XS \
+ converters/p5-JSON \
+ converters/p5-JSON-Any>=1.31 \
+ converters/p5-JSON-DWIW \
+ converters/p5-JSON-XS \
databases/p5-Class-DBI \
- databases/p5-SQL-Translator>=0.11018
-
-TEST_DEPENDS += devel/p5-DateTime-Format-MySQL \
- devel/p5-DateTime-Format-Pg \
+ databases/p5-SQL-Translator>=0.11018 \
+ devel/p5-DateTime>=0.55 \
+ devel/p5-DateTime-Format-MySQL \
+ devel/p5-DateTime-Format-Pg>=0.16004 \
devel/p5-DateTime-Format-SQLite \
- devel/p5-DateTime-Format-Strptime \
- devel/p5-Time-Piece-MySQL
-
-TEST_DEPENDS += devel/p5-Moose \
- devel/p5-MooseX-Types \
- devel/p5-MooseX-Types-LoadableClass \
- devel/p5-MooseX-Types-Path-Class
+ devel/p5-DateTime-Format-Strptime>=1.2 \
+ devel/p5-Getopt-Long-Descriptive>=0.081 \
+ devel/p5-Moose>=0.98 \
+ devel/p5-MooseX-Types>=0.21 \
+ devel/p5-MooseX-Types-LoadableClass>=0.011 \
+ devel/p5-MooseX-Types-Path-Class>=0.05 \
+ devel/p5-Time-Piece-MySQL \
+ math/p5-Math-Base36>=0.07 \
+ textproc/p5-Text-CSV>=1.16
# More tests can be enabled by porting
# * p5-Class-DBI-Plugin-DeepAbstractSearch
-# * p5-Cpanel-JSON-XS
# * p5-MooseX-Types-JSON
+# * p5-Test-Moose
MAKE_ENV = RELEASE_TESTING=Yes \
TEST_POD=Yes
DATABASE = dbix_class_test
-MODPOSTGRESQL_TEST_DBNAME = ${DATABASE}
+MODULES += databases/postgresql
+MODPOSTGRESQL_TEST_DBNAME = ${DATABASE}
MAKE_ENV += DBICTEST_PG_DSN='dbi:Pg:dbname=${DATABASE}' \
DBICTEST_PG_USER=${USER} \
DBICTEST_PG_PASS=1
TEST_DEPENDS += databases/p5-DBD-Pg
+MODULES += databases/mariadb
MODMARIADB_TEST_DBNAME = ${DATABASE}
MAKE_ENV +=
DBICTEST_MYSQL_DSN='dbi:mysql:database=${DATABASE};mysql_socket=${MODMARIADB_TEST_SOCKET}'
\
DBICTEST_MYSQL_USER=root \
Index: distinfo
===================================================================
RCS file: /cvs/ports/databases/p5-DBIx-Class/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo 20 Jul 2015 15:37:24 -0000 1.10
+++ distinfo 17 Aug 2020 00:27:53 -0000
@@ -1,2 +1,2 @@
-SHA256 (DBIx-Class-0.082820.tar.gz) =
e2CDoSc9R014Wqk1gdwdozS75dg8dBV07i45QlWdrrk=
-SIZE (DBIx-Class-0.082820.tar.gz) = 850564
+SHA256 (DBIx-Class-0.082842.tar.gz) =
sF7WgXJpnuErd74LdzoFkJJBplZZKRXrD2zFJWWLB+Y=
+SIZE (DBIx-Class-0.082842.tar.gz) = 879377
Index: patches/patch-Makefile_PL
===================================================================
RCS file: patches/patch-Makefile_PL
diff -N patches/patch-Makefile_PL
--- patches/patch-Makefile_PL 3 Feb 2019 13:17:45 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-Makefile_PL,v 1.3 2019/02/03 13:17:45 sthen Exp $
-
-Index: Makefile.PL
---- Makefile.PL.orig
-+++ Makefile.PL
-@@ -2,6 +2,7 @@ use strict;
- use warnings;
-
- use 5.008001;
-+BEGIN { push @INC, '.'; }
- use inc::Module::Install 1.06;
- BEGIN { makemaker_args( NORECURS => 1 ) } # needs to happen early for old EUMM
-
Index: patches/patch-lib_DBIx_Class_Manual_Troubleshooting_pod
===================================================================
RCS file: patches/patch-lib_DBIx_Class_Manual_Troubleshooting_pod
diff -N patches/patch-lib_DBIx_Class_Manual_Troubleshooting_pod
--- patches/patch-lib_DBIx_Class_Manual_Troubleshooting_pod 25 Dec 2016
15:42:09 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-lib_DBIx_Class_Manual_Troubleshooting_pod,v 1.1 2016/12/25
15:42:09 zhuk Exp $
-Don't pollute the makewhatis index.
---- lib/DBIx/Class/Manual/Troubleshooting.pod.orig Sun Apr 3 20:51:24 2016
-+++ lib/DBIx/Class/Manual/Troubleshooting.pod Sun Apr 3 20:51:57 2016
-@@ -2,6 +2,8 @@
-
- DBIx::Class::Manual::Troubleshooting - Got a problem? Shoot it.
-
-+=head1 QUESTIONS AND ANSWERS
-+
- =head2 "Can't locate storage blabla"
-
- You're trying to make a query on a non-connected schema. Make sure you got
