From 80448819a5844f55b01bd4fe28b5903519b4e6c7 Mon Sep 17 00:00:00 2001 From: espie Date: Mon, 10 Jul 2006 14:34:01 +0000 Subject: [PATCH] Handle CONFIGURE_ARGS as a list, e.g., SELECT DISTINCT VALUE FROM ConfigureArgs makes sense. --- databases/sqlports/Makefile | 4 ++-- databases/sqlports/pkg/DESCR | 1 + infrastructure/package/mksqlitedb | 10 +++++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/databases/sqlports/Makefile b/databases/sqlports/Makefile index f3a928c8cc8..0bad63b388b 100644 --- a/databases/sqlports/Makefile +++ b/databases/sqlports/Makefile @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile,v 1.2 2006/07/10 11:44:30 espie Exp $ +# $OpenBSD: Makefile,v 1.3 2006/07/10 14:34:01 espie Exp $ CATEGORIES= databases -DISTNAME= sqlports-0.1 +DISTNAME= sqlports-0.2 DISTFILES= COMMENT= 'sqlite database of ports' MAINTAINER= Marc Espie diff --git a/databases/sqlports/pkg/DESCR b/databases/sqlports/pkg/DESCR index 69c8f49e28b..f1fcfde4457 100644 --- a/databases/sqlports/pkg/DESCR +++ b/databases/sqlports/pkg/DESCR @@ -51,6 +51,7 @@ the correct SUBPACKAGE. - Multi(PKGPATH, VALUE) - Modules(PKGPATH, VALUE) - Configure(PKGPATH, VALUE) +- ConfigureArgs(PKGPATH, VALUE) All of these values are actually lists. After disassembling the list, one can find many entries in these secondary tables. diff --git a/infrastructure/package/mksqlitedb b/infrastructure/package/mksqlitedb index 77267173156..362cfbf9f18 100644 --- a/infrastructure/package/mksqlitedb +++ b/infrastructure/package/mksqlitedb @@ -1,5 +1,5 @@ #! /usr/bin/perl -# $OpenBSD: mksqlitedb,v 1.9 2006/07/10 11:44:30 espie Exp $ +# $OpenBSD: mksqlitedb,v 1.10 2006/07/10 14:34:01 espie Exp $ # # Copyright (c) 2006 Marc Espie # @@ -156,6 +156,10 @@ package ConfigureVar; our @ISA=(qw(DefinedListVar)); sub table() { 'Configure' } +package ConfigureArgsVar; +our @ISA=(qw(ListVar)); +sub table() { 'ConfigureArgs' } + package WantlibVar; our @ISA=(qw(ListVar)); sub table() { 'Wantlib' } @@ -218,7 +222,7 @@ my $vars = { BUILD_DEPENDS => 'BuildDependsVar', CATEGORIES=> 'CategoriesVar', COMMENT => 'AnyVar', - CONFIGURE_ARGS => 'AnyVar', + CONFIGURE_ARGS => 'ConfigureArgsVar', CONFIGURE_STYLE => 'ConfigureVar', DESCR => 'FileVar', PACKAGING => 'AnyVar', @@ -270,7 +274,7 @@ my $vars = { # create the various tables, dropping old versions -for my $t (qw(Categories Flavors Multi Modules Configure Wantlib Descr)) { +for my $t (qw(Categories Flavors Multi Modules Configure ConfigureArgs Wantlib Descr)) { $db->do("DROP TABLE $t"); $db->do("CREATE TABLE $t (PKGPATH TEXT NOT NULL, VALUE TEXT NOT NULL, UNIQUE(PKGPATH, VALUE))"); }