From 4f61eeed3e05db75a2eab050b59297bfd45f5487 Mon Sep 17 00:00:00 2001 From: afresh1 Date: Thu, 5 Nov 2020 02:58:03 +0000 Subject: [PATCH] Update databases/p5-DBIx-Class to 0.082842 From wen heping With tweaks by me Two tests still failing, reported upstream as it's not clear it's us https://rt.cpan.org/Public/Bug/Display.html?id=133170 --- databases/p5-DBIx-Class/Makefile | 55 ++++++++++--------- databases/p5-DBIx-Class/distinfo | 4 +- .../p5-DBIx-Class/patches/patch-Makefile_PL | 13 ----- databases/p5-DBIx-Class/pkg/PLIST | 9 ++- 4 files changed, 36 insertions(+), 45 deletions(-) delete mode 100644 databases/p5-DBIx-Class/patches/patch-Makefile_PL diff --git a/databases/p5-DBIx-Class/Makefile b/databases/p5-DBIx-Class/Makefile index 9e958045f15..adb8b9bc9c0 100644 --- a/databases/p5-DBIx-Class/Makefile +++ b/databases/p5-DBIx-Class/Makefile @@ -1,23 +1,21 @@ -# $OpenBSD: Makefile,v 1.25 2020/07/03 21:44:36 sthen Exp $ +# $OpenBSD: Makefile,v 1.26 2020/11/05 02:58:03 afresh1 Exp $ 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 +MAINTAINER = Andrew Hewus Fresh -# 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,7 +26,7 @@ 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 \ @@ -42,42 +40,45 @@ TEST_DEPENDS = databases/p5-DBD-SQLite>=1.29 \ 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 \ + 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 +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 \ diff --git a/databases/p5-DBIx-Class/distinfo b/databases/p5-DBIx-Class/distinfo index b459458ed56..3b3883e4acb 100644 --- a/databases/p5-DBIx-Class/distinfo +++ b/databases/p5-DBIx-Class/distinfo @@ -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 diff --git a/databases/p5-DBIx-Class/patches/patch-Makefile_PL b/databases/p5-DBIx-Class/patches/patch-Makefile_PL deleted file mode 100644 index e197eb39b6c..00000000000 --- a/databases/p5-DBIx-Class/patches/patch-Makefile_PL +++ /dev/null @@ -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 - diff --git a/databases/p5-DBIx-Class/pkg/PLIST b/databases/p5-DBIx-Class/pkg/PLIST index b01b3afb3f2..5aeeb3ff9cd 100644 --- a/databases/p5-DBIx-Class/pkg/PLIST +++ b/databases/p5-DBIx-Class/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.6 2018/05/17 09:20:08 espie Exp $ +@comment $OpenBSD: PLIST,v 1.7 2020/11/05 02:58:03 afresh1 Exp $ @comment bin/dbicadmin ${P5SITE}/DBIx/Class.pm ${P5SITE}/DBIx/Class.pod @@ -126,14 +126,13 @@ ${P5SITE}/DBIx/Class/SQLAHacks/OracleJoins.pm ${P5SITE}/DBIx/Class/SQLAHacks/SQLite.pm ${P5SITE}/DBIx/Class/SQLMaker/ ${P5SITE}/DBIx/Class/SQLMaker.pm -${P5SITE}/DBIx/Class/SQLMaker.pod ${P5SITE}/DBIx/Class/SQLMaker/ACCESS.pm +${P5SITE}/DBIx/Class/SQLMaker/ClassicExtensions.pm ${P5SITE}/DBIx/Class/SQLMaker/LimitDialects.pm ${P5SITE}/DBIx/Class/SQLMaker/MSSQL.pm ${P5SITE}/DBIx/Class/SQLMaker/MySQL.pm ${P5SITE}/DBIx/Class/SQLMaker/Oracle.pm ${P5SITE}/DBIx/Class/SQLMaker/OracleJoins.pm -${P5SITE}/DBIx/Class/SQLMaker/OracleJoins.pod ${P5SITE}/DBIx/Class/SQLMaker/SQLite.pm ${P5SITE}/DBIx/Class/Schema/ ${P5SITE}/DBIx/Class/Schema.pm @@ -206,6 +205,7 @@ ${P5SITE}/DBIx/Class/Storage/DBI/Sybase/Microsoft_SQL_Server/NoBindVars.pm ${P5SITE}/DBIx/Class/Storage/DBI/UniqueIdentifier.pm ${P5SITE}/DBIx/Class/Storage/DBI/mysql.pm ${P5SITE}/DBIx/Class/Storage/DBIHacks.pm +${P5SITE}/DBIx/Class/Storage/Debug/PrettyTrace.pm ${P5SITE}/DBIx/Class/Storage/Statistics.pm ${P5SITE}/DBIx/Class/Storage/TxnScopeGuard.pm ${P5SITE}/DBIx/Class/UTF8Columns.pm @@ -268,6 +268,7 @@ ${P5SITE}/SQL/Translator/Producer/DBIx/Class/File.pm @man man/man3p/DBIx::Class::Relationship::Base.3p @man man/man3p/DBIx::Class::ResultClass::HashRefInflator.3p @man man/man3p/DBIx::Class::ResultSet.3p +@man man/man3p/DBIx::Class::ResultSet::Pager.3p @man man/man3p/DBIx::Class::ResultSetColumn.3p @man man/man3p/DBIx::Class::ResultSetManager.3p @man man/man3p/DBIx::Class::ResultSource.3p @@ -277,6 +278,7 @@ ${P5SITE}/SQL/Translator/Producer/DBIx/Class/File.pm @man man/man3p/DBIx::Class::ResultSourceProxy::Table.3p @man man/man3p/DBIx::Class::Row.3p @man man/man3p/DBIx::Class::SQLMaker.3p +@man man/man3p/DBIx::Class::SQLMaker::ClassicExtensions.3p @man man/man3p/DBIx::Class::SQLMaker::LimitDialects.3p @man man/man3p/DBIx::Class::SQLMaker::OracleJoins.3p @man man/man3p/DBIx::Class::Schema.3p @@ -332,6 +334,7 @@ ${P5SITE}/SQL/Translator/Producer/DBIx/Class/File.pm @man man/man3p/DBIx::Class::Storage::DBI::Sybase::Microsoft_SQL_Server::NoBindVars.3p @man man/man3p/DBIx::Class::Storage::DBI::UniqueIdentifier.3p @man man/man3p/DBIx::Class::Storage::DBI::mysql.3p +@man man/man3p/DBIx::Class::Storage::Debug::PrettyTrace.3p @man man/man3p/DBIx::Class::Storage::Statistics.3p @man man/man3p/DBIx::Class::Storage::TxnScopeGuard.3p @man man/man3p/DBIx::Class::UTF8Columns.3p