handle USE_MOTIF, add PKGSPEC

This commit is contained in:
espie 2010-11-26 20:32:38 +00:00
parent abf72e33c3
commit 871eb8299d
5 changed files with 28 additions and 7 deletions

View File

@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.30 2010/11/26 20:11:12 espie Exp $
# $OpenBSD: Makefile,v 1.31 2010/11/26 20:32:38 espie Exp $
CATEGORIES = databases
V = 1.13
V = 1.14
DISTNAME = sqlports-$V
DISTFILES =
COMMENT = sqlite database of ports

View File

@ -1,4 +1,4 @@
# $OpenBSD: Var.pm,v 1.8 2010/11/26 20:11:12 espie Exp $
# $OpenBSD: Var.pm,v 1.9 2010/11/26 20:32:38 espie Exp $
#
# Copyright (c) 2006-2010 Marc Espie <espie@openbsd.org>
#
@ -207,7 +207,6 @@ sub add
package YesNoVar;
our @ISA = qw(ValuedVar);
sub columntype() { 'OptIntegerColumn' }
sub values
{
return {
@ -216,6 +215,19 @@ sub values
};
}
package MotifVar;
our @ISA =qw(ValuedVar);
sub values
{
return {
lesstif => 2,
openmotif => 1,
yes => 3,
any => 3,
no => undef
};
}
package YesNoGnuVar;
our @ISA = qw(ValuedVar);

View File

@ -1,5 +1,5 @@
#! /usr/bin/perl
# $OpenBSD: mksqlitedb,v 1.28 2010/11/26 20:11:12 espie Exp $
# $OpenBSD: mksqlitedb,v 1.29 2010/11/26 20:32:38 espie Exp $
#
# Copyright (c) 2006-2010 Marc Espie <espie@openbsd.org>
#
@ -94,6 +94,7 @@ my $vars = {
PERMIT_PACKAGE_CDROM => 'YesKeyVar',
PERMIT_PACKAGE_FTP=> 'YesKeyVar',
PKGNAME => 'AnyVar',
PKGSPEC => 'AnyVar',
PKG_ARCH => 'ArchKeyVar',
PSEUDO_FLAVORS => 'PseudoFlavorsVar',
REGRESS_DEPENDS => 'RegressDependsVar',
@ -109,7 +110,7 @@ my $vars = {
USE_GMAKE => 'YesNoVar',
USE_GROFF => 'YesNoVar',
USE_LIBTOOL => 'YesNoGnuVar',
USE_MOTIF => 'YesNoVar',
USE_MOTIF => 'MotifVar',
WANTLIB => 'WantlibVar',
};

View File

@ -31,6 +31,7 @@ stored in specialized tables, e.g.,:
NO_*
PERMIT_*
PKGNAME
PKGSPEC
PKG_ARCH
PSEUDO_FLAVORS
REGRESS_IS_INTERACTIVE
@ -46,6 +47,9 @@ with 1/0. Variables not present in a given port are left undefined.
Note that USE_LIBTOOL is 3-valued: 2 is gnu, 1 is yes, undef is no.
Note that USE_MOTIF is 4-valued: 1 is openmotif, 2 is lestif, 3 is any/yes,
undef is no.
MULTI_PACKAGES ports hold several entries with corresponding FULLPKGPATH
- Flavors(FULLPKGPATH, VALUE)

View File

@ -31,6 +31,7 @@ holds all the information retrieved through various variables, e.g.,:
ONLY_FOR_ARCHS
PERMIT_*
PKGNAME
PKGSPEC
PKG_ARCH
PSEUDO_FLAVORS
REGRESS_IS_INTERACTIVE
@ -46,7 +47,10 @@ holds all the information retrieved through various variables, e.g.,:
This information is mostly unchanged, except for replacing Yes/No variables
with 1/0. Variables not present in a given port are left undefined.
Note that USE_LIBTOOL can be 2 (gnu), 1 (yes), or undef.
Note that USE_LIBTOOL is 3-valued: 2 is gnu, 1 is yes, undef is no.
Note that USE_MOTIF is 4-valued: 1 is openmotif, 2 is lestif, 3 is any/yes,
undef is no.
The FULLPKGPATH is complete, including flavors markers. For each port with
MULTI_PACKAGES setting, another entry is written with the correct SUBPACKAGE.