add COMPILER_LINKS. Tweak USE_WXNEEDED to support a 3rd option (special)

This commit is contained in:
espie 2017-06-05 14:48:09 +00:00
parent d50fc347d1
commit 1b6cc5b9f4
5 changed files with 27 additions and 5 deletions

View File

@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.67 2017/05/31 08:39:21 espie Exp $
# $OpenBSD: Makefile,v 1.68 2017/06/05 14:48:09 espie Exp $
CATEGORIES = databases
V = 6.4
V = 6.5
DISTNAME = sqlports-$V
DISTFILES =
COMMENT = sqlite database of ports

View File

@ -1,4 +1,4 @@
# $OpenBSD: Info.pm,v 1.21 2017/05/31 08:39:21 espie Exp $
# $OpenBSD: Info.pm,v 1.22 2017/06/05 14:48:09 espie Exp $
#
# Copyright (c) 2012 Marc Espie <espie@openbsd.org>
#
@ -32,6 +32,7 @@ our $vars = {
CATEGORIES => 'CategoriesVar',
COMES_WITH => 'DefinedVar',
COMMENT => 'AnyVar',
COMPILER_LINKS => 'CompilerLinksVar',
CONFIGURE_ARGS => 'ConfigureArgsVar',
CONFIGURE_STYLE => 'ConfigureVar',
DESCR => 'DescrVar',
@ -95,7 +96,7 @@ our $vars = {
USE_GMAKE => 'YesNoVar',
USE_GROFF => 'YesNoVar',
USE_LIBTOOL => 'YesNoGnuVar',
USE_WXNEEDED => 'YesNoVar',
USE_WXNEEDED => 'YesNoSpecialVar',
COMPILER => 'DefinedVar',
COMPILER_LANGS => 'DefinedVar',
WANTLIB => 'WantlibVar',

View File

@ -1,4 +1,4 @@
# $OpenBSD: Var.pm,v 1.24 2015/04/19 12:08:02 espie Exp $
# $OpenBSD: Var.pm,v 1.25 2017/06/05 14:48:09 espie Exp $
#
# Copyright (c) 2006-2010 Marc Espie <espie@openbsd.org>
#
@ -256,6 +256,18 @@ sub values
}
}
package YesNoSpecialVar;
our @ISA = qw(ValuedVar);
sub values
{
return {
yes => 1,
special => 2,
no => undef
}
}
# variable is always defined, but we don't need to store empty values.
package DefinedVar;
our @ISA = qw(AnyVar);
@ -488,6 +500,11 @@ package ArchListVar;
our @ISA = qw(DefinedListKeyVar);
sub keyword_table() { 'Arch' }
package CompilerLinksVar;
our @ISA = qw(DefinedListKeyVar);
sub table() { 'CompilerLinks' }
sub keyword_table() { 'Compiler' }
package OnlyForArchListVar;
our @ISA = qw(ArchListVar);
sub table() { 'OnlyForArch' }

View File

@ -53,6 +53,7 @@ stored in specialized tables, e.g.,:
README
COMPILER
COMPILER_LANGS
COMPILER_LINKS
This information is mostly unchanged, except for replacing Yes/No variables
with 1/0. Variables not present in a given port are left undefined.
@ -61,6 +62,7 @@ README corresponds to README files (full text value) and only exists when
such files are present.
Note that USE_LIBTOOL is 3-valued: 2 is gnu, 1 is yes, undef is no.
Note that USE_WXNEEDED is 3-valued: 2 is special, 1 is yes, undef is no.
MULTI_PACKAGES ports hold several entries with corresponding FULLPKGPATH

View File

@ -51,6 +51,7 @@ holds all the information retrieved through various variables, e.g.,:
README
COMPILER
COMPILER_LANGS
COMPILER_LINKS
This information is mostly unchanged, except for replacing Yes/No variables
with 1/0. Variables not present in a given port are left undefined.
@ -59,6 +60,7 @@ README corresponds to README files (full text value) and only exists when
such files are present.
Note that USE_LIBTOOL is 3-valued: 2 is gnu, 1 is yes, undef is no.
Note that USE_WXNEEDED is 3-valued: 2 is special, 1 is yes, undef is no.
The FULLPKGPATH is complete, including flavor and pseudo-flavors markers.
For every port with MULTI_PACKAGES settings, one entry is written for