SecBSD/ports
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync ports with The Matrix

Browse source
This commit is contained in:
purplerain 2023-09-26 08:23:20 +00:00
parent d97ea2d955
commit 6dacb122d0
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
148 changed files with 6228 additions and 2485 deletions
Download patch file Download diff file Expand all files Collapse all files

2
databases/sqlports/Makefile
View file

@ -1,5 +1,5 @@
CATEGORIES = databases
V = 7.48
V = 7.49
DISTNAME = sqlports-$V
DISTFILES =
COMMENT-main = sqlite database of ports

35
databases/sqlports/files/Var.pm
View file

@ -1,4 +1,4 @@
# $OpenBSD: Var.pm,v 1.73 2023/09/06 21:07:16 espie Exp $
# $OpenBSD: Var.pm,v 1.74 2023/09/25 17:10:44 espie Exp $
#
# Copyright (c) 2006-2010 Marc Espie <espie@openbsd.org>
#
@ -910,20 +910,6 @@ sub table($) { 'ConfigureArgs' }
package DebugConfigureArgsVar;
our @ISA = qw(ConfigureArgsVar);
sub table($) { 'DebugConfigureArgs' }
package Sql::Column::View::WithSite;
our @ISA = qw(Sql::Column::View::Expr);
sub expr($self)
{
my $c = $self->column;
my $n = $self->column("N");
return
qq{CASE 1
WHEN $n IS NULL THEN $c
ELSE $c||':'||$n
END
};
}
package DistfilesVar;
our @ISA = qw(ListVar);
@ -932,25 +918,16 @@ sub table($) { 'Distfiles' }
sub match($) { 0 }
sub want_in_ports_view($) { 0 }
sub _add($self, $ins, $value, $num)
sub add_value($self, $ins, $value, @extra)
{
my $sufx;
if ($self->var =~ m/^(?:DISTFILES|SUPDISTFILES|PATCHFILES)(.+)$/) {
$sufx = $1;
}
$self->normal_insert($ins, $self->keyword($ins, $value), $num,
$self->normal_insert($ins, $self->keyword($ins, $value),
$sufx, $self->match);
}
sub add_value($self, $ins, $value, @extra)
{
if ($value =~ m/^(.*?)\:(\d)$/) {
$self->_add($ins, $1, $2);
} else {
$self->_add($ins, $value, undef);
}
}
sub create_tables($self, $inserter)
{
my $t = $self->table_name($self->table);
@ -958,15 +935,13 @@ sub create_tables($self, $inserter)
$self->create_table(
$self->fullpkgpath,
Sql::Column::Integer->new("Value")->references($k)->constraint,
Sql::Column::Integer->new("N")->constraint,
Sql::Column::Text->new("SUFX")->constraint,
Sql::Column::Integer->new("Type")->constraint->notnull);
$self->create_view(
$self->pathref,
Sql::Column::View::WithSite->new("Value")->join(Sql::Join->new($k)
Sql::Column::View->new("Value")->join(Sql::Join->new($k)
->add(Sql::Equal->new("KeyRef", "Value"))),
Sql::Column::View->new("N"),
Sql::Column::View->new("Sufx"),
Sql::Column::View->new("Type"));
$inserter->make_ordered_view($self);
@ -977,7 +952,7 @@ sub subselect($self)
my $t = $self->table_name($self->table);
my $k = $self->keyword_table;
return (Sql::Column::View->new('FullPkgPath'),
Sql::Column::View::WithSite->new("Value")->join(Sql::Join->new($k)
Sql::Column::View->new("Value")->join(Sql::Join->new($k)
->add(Sql::Equal->new("KeyRef", "Value"))),
Sql::Column::View->new("Sufx"),
Sql::Column::View->new("Type"),

7
databases/sqlports/files/man/sqlports.5
View file

@ -1,4 +1,4 @@
.\" $OpenBSD: sqlports.5,v 1.11 2023/09/06 11:56:34 espie Exp $
.\" $OpenBSD: sqlports.5,v 1.12 2023/09/25 17:10:44 espie Exp $
.\"
.\" Copyright (c) 2020 Marc Espie <espie@openbsd.org>
.\"
@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
.Dd $Mdocdate: September 6 2023 $
.Dd $Mdocdate: September 25 2023 $
.Dt SQLPORTS 5
.Os
.Sh NAME
@ -147,7 +147,7 @@ FULLDEPENDS is the full text of the dependency, which parses as DEPENDSPATH,
the actual PKGPATH we depend upon, PKGSPEC, the spec we depend upon
(if explicit), and REST the remainder of the text (things like :configure and
such).
.It _Distfiles(FULLPKGPATH, VALUE, N, Sufx, Type)
.It _Distfiles(FULLPKGPATH, VALUE, Sufx, Type)
All distfiles/patchfiles/supdistfiles are stored in a single table, with Type
.Bl -tag -width 10 -offset indent -compact
.It 0
@ -157,7 +157,6 @@ patchfiles
.It 2
supdistfiles
.El
Note that N is :N from Sites, those are not considered ordered lists.
.It _DPBProperties (FULLPKGPATH, VALUE, N)
.It _Wantlib(FULLPKGPATH, VALUE, EXTRA)
All the libraries the FULLPKGPATH depends upon, with optional version