cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

prepare for new specs

Browse Source
This commit is contained in:
espie 2010-11-14 08:42:00 +00:00
parent 1c0a277e2c
commit 4d961263ee
2 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
databases/sqlports/Makefile
View File

@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.27 2010/10/30 23:00:28 espie Exp $
# $OpenBSD: Makefile,v 1.28 2010/11/14 08:42:00 espie Exp $
CATEGORIES = databases
V = 1.12
V = 1.13
DISTNAME = sqlports-$V
DISTFILES =
COMMENT = sqlite database of ports

24
databases/sqlports/files/Var.pm
View File

@ -1,5 +1,5 @@
#! /usr/bin/perl
# $OpenBSD: Var.pm,v 1.6 2010/10/02 10:26:17 espie Exp $
# $OpenBSD: Var.pm,v 1.7 2010/11/14 08:42:00 espie Exp $
#
# Copyright (c) 2006-2010 Marc Espie <espie@openbsd.org>
#
@ -222,7 +222,12 @@ sub add
my ($self, $ins) = @_;
$self->SUPER::add($ins);
for my $depends ($self->words) {
my ($libs, $pkgspec, $pkgpath2, $rest) = split(/\:/, $depends);
$depends =~ s/^\:+//;
my ($pkgspec, $pkgpath2, $rest) = split(/\:/, $depends);
if ($pkgspec =~ m/\//) {
($pkgspec, $pkgpath2, $rest) =
('', $pkgspec, $pkgpath2);
}
if (!defined $pkgpath2) {
print STDERR "Wrong depends $depends\n";
return;
@ -231,11 +236,6 @@ sub add
$ins->find_pathkey($pkgpath2),
$ins->convert_depends($self->depends_type),
$pkgspec, $rest);
if ($libs ne '') {
for my $lib (split(/\,/, $libs)) {
$self->add_lib($ins, $lib);
}
}
}
}
@ -252,20 +252,10 @@ sub create_table
"FULLDEPENDS", "DEPENDSPATH", "TYPE", "PKGSPEC", "REST");
}
sub add_lib
{
}
package LibDependsVar;
our @ISA = qw(DependsVar);
sub depends_type() { 'Library' }
sub add_lib
{
my ($self, $ins, $lib) = @_;
WantlibVar->add_value($ins, $lib);
}
package RunDependsVar;
our @ISA = qw(DependsVar);
sub depends_type() { 'Run' }