From de8d34ed612e8183dbc96b8ecf78395082bd3c09 Mon Sep 17 00:00:00 2001 From: espie Date: Thu, 25 Feb 2021 23:26:30 +0000 Subject: [PATCH] add FIX_CRLF_FILES to secondary tables --- databases/sqlports/Makefile | 6 +++--- databases/sqlports/files/Info.pm | 5 +++-- databases/sqlports/files/Var.pm | 10 ++++++++-- databases/sqlports/files/man/sqlports.5 | 9 ++++++--- 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/databases/sqlports/Makefile b/databases/sqlports/Makefile index 28854005050..67472ce098c 100644 --- a/databases/sqlports/Makefile +++ b/databases/sqlports/Makefile @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile,v 1.131 2021/02/21 09:14:05 espie Exp $ +# $OpenBSD: Makefile,v 1.132 2021/02/25 23:26:30 espie Exp $ CATEGORIES = databases -V = 7.35 +V = 7.36 DISTNAME = sqlports-$V DISTFILES = COMMENT = sqlite database of ports @@ -31,7 +31,7 @@ STRICT =-s .endif # for debugging the ports tree purposes, start at this dir -# STARTDIR = -S net/rsync +#STARTDIR = -S games/stepmania SCRIPTS = print-ports-index show-reverse-deps rebuild-sqlports-cache MANS = show-reverse-deps.1 sqlports.5 diff --git a/databases/sqlports/files/Info.pm b/databases/sqlports/files/Info.pm index 7dbf799aecc..01a662c662a 100644 --- a/databases/sqlports/files/Info.pm +++ b/databases/sqlports/files/Info.pm @@ -1,4 +1,4 @@ -# $OpenBSD: Info.pm,v 1.34 2021/02/20 18:05:04 espie Exp $ +# $OpenBSD: Info.pm,v 1.35 2021/02/25 23:26:30 espie Exp $ # # Copyright (c) 2012 Marc Espie # @@ -55,7 +55,7 @@ our $vars = { IS_INTERACTIVE => 'AnyVar', LIB_DEPENDS => 'LibDependsVar', MAINTAINER=> 'EmailVar', - MAKEFILE_LIST => 'FilesListVar', + MAKEFILE_LIST => 'MakefilesListVar', MASTER_SITES => 'MasterSitesVar', MASTER_SITES0 => 'MasterSitesVar', MASTER_SITES1 => 'MasterSitesVar', @@ -114,6 +114,7 @@ our $vars = { FETCH_MANUALLY => 'IgnoredVar', FLAVOR => 'IgnoredVar', MISSING_FILES => 'IgnoredVar', + FIX_CRLF_FILES => 'CRLFFiles', }; my @indexed = qw(FULLPKGNAME RUN_DEPENDS LIB_DEPENDS IGNORE diff --git a/databases/sqlports/files/Var.pm b/databases/sqlports/files/Var.pm index e5449627ed6..81493d204de 100644 --- a/databases/sqlports/files/Var.pm +++ b/databases/sqlports/files/Var.pm @@ -1,4 +1,4 @@ -# $OpenBSD: Var.pm,v 1.61 2021/02/20 18:05:04 espie Exp $ +# $OpenBSD: Var.pm,v 1.62 2021/02/25 23:26:30 espie Exp $ # # Copyright (c) 2006-2010 Marc Espie # @@ -798,7 +798,7 @@ sub add $self->SUPER::add($ins); } -package FilesListVar; +package MakefilesListVar; our @ISA = qw(DefinedListKeyVar); my $portsdir = $ENV{PORTSDIR} || '/usr/ports'; @@ -834,6 +834,12 @@ sub words return @result; } +package CRLFFiles; +our @ISA = qw(DefinedListKeyVar); + +sub table() { 'FixCRLFFiles' } +sub keyword_table() { '_Filename2' } + package FlavorsVar; our @ISA = qw(DefinedListKeyVar); sub table() { 'Flavors' } diff --git a/databases/sqlports/files/man/sqlports.5 b/databases/sqlports/files/man/sqlports.5 index c33a49aac97..85ce7240651 100644 --- a/databases/sqlports/files/man/sqlports.5 +++ b/databases/sqlports/files/man/sqlports.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sqlports.5,v 1.6 2021/02/21 09:14:05 espie Exp $ +.\" $OpenBSD: sqlports.5,v 1.7 2021/02/25 23:26:30 espie Exp $ .\" .\" Copyright (c) 2020 Marc Espie .\" @@ -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: February 21 2021 $ +.Dd $Mdocdate: February 25 2021 $ .Dt SQLPORTS 5 .Os .Sh NAME @@ -125,6 +125,7 @@ Corresponds to CONFIGURE_STYLE This tables contains only Makefiles from MAKE_FILE_LIST that are not .Sq default values (always included makefiles). +.It _FixCRLFFiles(FULLPKGPATH, VALUE, N) .It _NotForArch(FULLPKGPATH, VALUE, N) .It _OnlyForArch(FULLPKGPATH, VALUE, N) All of these variable values are actually ordered lists (hence the N). @@ -180,6 +181,8 @@ is stored as keyword references to other tables: .Bl -tag -width AUTOMAKE_VERSIONblablabla -offset indent -compact .It AUTOCONF_VERSION , AUTOMAKE_VERSION _AUTOVERSION +.It FixCRLFFiles +_FILENAME2 .It _DPBProperties.value _DPBKeys .It MAINTAINER @@ -189,7 +192,7 @@ _CATEGORYKEYS .It CONFIGURE _CONFIGURE_KEYS .It MAKEFILES -_FILENAMES +_FILENAME .It MODULES _MODULEKEYS .It PREFIX