OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 30-Dec-2002 23:21:40
Branch: HEAD Handle: 2002123022213900
Modified files:
openpkg-src/openpkg-tool
openpkg-build.pl openpkg-index.pl
Log:
more regex fixes, but build is still broken
Summary:
Revision Changes Path
1.20 +3 -3 openpkg-src/openpkg-tool/openpkg-build.pl
1.5 +1 -1 openpkg-src/openpkg-tool/openpkg-index.pl
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg-tool/openpkg-build.pl
============================================================================
$ cvs diff -u -r1.19 -r1.20 openpkg-build.pl
--- openpkg-src/openpkg-tool/openpkg-build.pl 30 Dec 2002 22:09:19 -0000 1.19
+++ openpkg-src/openpkg-tool/openpkg-build.pl 30 Dec 2002 22:21:39 -0000 1.20
@@ -356,10 +356,10 @@
sub parse_options ($) {
my($l) = @_;
$l = join("\n", @$l) if ref $l;
- return if ($l !~ m/(--define|%option)/s);
+ return if ($l !~ m/(--define|%option\s+)/s);
my $with = {};
- $l =~ s/--define\s*'(\S+)\s+(\S+?)'/$with->{$1} = $2, ''/ge; # before
openpkg-20021230
- $l =~ s/%option\s+(\S+)\s+(\S+)/$with->{$1} = $2, ''/ge; # after
openpkg-20021230
+ $l =~ s/--define\s*'(\S+)\s+(\S+?)'/$with->{$1} = $2, ''/sge; # before
openpkg-20021230
+ $l =~ s/%option\s+(\S+)\s+(\S+)/$with->{$1} = $2, ''/sge; # after
openpkg-20021230
return $with;
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg-tool/openpkg-index.pl
============================================================================
$ cvs diff -u -r1.4 -r1.5 openpkg-index.pl
--- openpkg-src/openpkg-tool/openpkg-index.pl 30 Dec 2002 22:05:36 -0000 1.4
+++ openpkg-src/openpkg-tool/openpkg-index.pl 30 Dec 2002 22:21:39 -0000 1.5
@@ -130,7 +130,7 @@
my($spec, $descr) = @_;
my $evar = {};
$descr =~ s/--define\s*'(\S+)\s*\%\{\1\}'/$evar->{$1} = '%{'.$1.'}', ''/sge; #
before openpkg-20021230
- $spec =~ s/^%option\s*(\S+)\s+\S+/$evar->{$1} = '%{'.$1.'}', ''/mge; #
after openpkg-20021230
+ $spec =~ s/^%option\s+(\S+)\s+\S+/$evar->{$1} = '%{'.$1.'}', ''/mge; #
after openpkg-20021230
return $evar;
}
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
