Author: glen Date: Tue Dec 7 13:08:14 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- pear macros migration
---- Files affected:
packages:
adapter.awk (1.476 -> 1.477)
---- Diffs:
================================================================
Index: packages/adapter.awk
diff -u packages/adapter.awk:1.476 packages/adapter.awk:1.477
--- packages/adapter.awk:1.476 Mon Nov 15 13:29:29 2010
+++ packages/adapter.awk Tue Dec 7 14:08:08 2010
@@ -238,6 +238,20 @@
mod_name = $3
if ($2 ~ /^_?pearname$/)
pearname = $3
+ if ($2 ~ /^_class$/)
+ pear_class = $3
+ if ($2 ~ /^_subclass$/)
+ pear_subclass = $3
+
+ # kill the _class and _subclass pear macros
+ if ($2 == "_pearname" || $2 == "pearname") {
+ if (pear_class) {
+ gsub("%{_class}", pear_class, $3);
+ }
+ if (pear_subclass) {
+ gsub("%{_subclass}", pear_subclass, $3);
+ }
+ }
sub(/[ \t]+$/, "");
# do nothing further, otherwise adapter thinks we're at preamble
@@ -1377,6 +1391,15 @@
$0 = fixedsub("%(%{__cc} -dumpversion)", "%{cc_version}", $0);
$0 = fixedsub("%(%{__cxx} -dumpversion)", "%{cxx_version}", $0);
+
+ # kill the _class and _subclass pear macros
+ if (pear_class) {
+ gsub("%{_class}", pear_class);
+ }
+ if (pear_subclass) {
+ gsub("%{_subclass}", pear_subclass);
+ }
+
}
function format_configure(line, n, a, s) {
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/adapter.awk?r1=1.476&r2=1.477&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
