OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 13-Jan-2003 14:25:56
Branch: HEAD Handle: 2003011313255401
Modified files:
openpkg-src/openpkg-tool
openpkg-index.pl openpkg-tool.spec
openpkg-web news.txt
Log:
Handle %undefine
Summary:
Revision Changes Path
1.10 +7 -1 openpkg-src/openpkg-tool/openpkg-index.pl
1.22 +2 -2 openpkg-src/openpkg-tool/openpkg-tool.spec
1.2690 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg-tool/openpkg-index.pl
============================================================================
$ cvs diff -u -r1.9 -r1.10 openpkg-index.pl
--- openpkg-src/openpkg-tool/openpkg-index.pl 9 Jan 2003 14:23:17 -0000 1.9
+++ openpkg-src/openpkg-tool/openpkg-index.pl 13 Jan 2003 13:25:55 -0000 1.10
@@ -321,6 +321,12 @@
} else {
$var{$1} = $2;
}
+ } elsif ($v =~ /^\#(?:undefine)\s*(\S+)\s*$/) {
+ if (exists $evar{$1}) {
+ $evar{$1} = "\%\{$1\}";
+ } else {
+ delete $var{$1};
+ }
} elsif ($v =~ /^\#(?:provides)\s*(\S+)\s*(.*?)\s*$/) {
#
# store option for current condition
@@ -372,7 +378,7 @@
$s =~ s/^\s*#.*?\n//mg;
# map commands
- $s =~ s/^%(ifdef|ifndef|if|NoSource|option|define|else|endif|\{)/#$1/mg;
+ $s =~
s/^%(ifdef|ifndef|if|NoSource|option|undefine|define|else|endif|\{)/#$1/mg;
# split sections
foreach (split(/^(?=%\w+\s*\n)/m, $s)) {
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg-tool/openpkg-tool.spec
============================================================================
$ cvs diff -u -r1.21 -r1.22 openpkg-tool.spec
--- openpkg-src/openpkg-tool/openpkg-tool.spec 10 Jan 2003 09:50:57 -0000
1.21
+++ openpkg-src/openpkg-tool/openpkg-tool.spec 13 Jan 2003 13:25:55 -0000
1.22
@@ -32,8 +32,8 @@
Distribution: OpenPKG [EVAL]
Group: Bootstrapping
License: GPL
-Version: 20030110
-Release: 20030110
+Version: 20030113
+Release: 20030113
# list of sources
Source0: openpkg.sh
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.2689 -r1.2690 news.txt
--- openpkg-web/news.txt 13 Jan 2003 13:05:36 -0000 1.2689
+++ openpkg-web/news.txt 13 Jan 2003 13:25:54 -0000 1.2690
@@ -1,3 +1,4 @@
+13-Jan-2003: Upgraded package: P<openpkg-tool-20030113-20030113>
13-Jan-2003: Upgraded package: P<indent-2.2.8a-20030113>
13-Jan-2003: Upgraded package: P<imap-2002b-20030113>
13-Jan-2003: Upgraded package: P<guile-1.6.1-20030113>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
