[Wigwam-cvs] wigwam-base/build-scripts update-packages, 1.6, 1.7 update-packages2.in, 1.4, 1.5

[Dave B. <dav...@us...>]

Update of /cvsroot/wigwam/wigwam-base/build-scripts
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv22129/build-scripts

Modified Files:
	update-packages update-packages2.in 
Log Message:
support system-packages, system-packages.local


Index: update-packages
===================================================================
RCS file: /cvsroot/wigwam/wigwam-base/build-scripts/update-packages,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** update-packages	11 Dec 2006 19:33:01 -0000	1.6
--- update-packages	23 Oct 2007 17:29:13 -0000	1.7
***************
*** 97,106 ****
  fi
  
- case "$script" in
-   maybe-update-package)
-     ...
-     ;;
- esac
- 
  for full_pkg_name in $project_packages ; do
      run-configurable "bin/build/$script" $child_options \
--- 97,100 ----

Index: update-packages2.in
===================================================================
RCS file: /cvsroot/wigwam/wigwam-base/build-scripts/update-packages2.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** update-packages2.in	24 May 2007 20:06:08 -0000	1.4
--- update-packages2.in	23 Oct 2007 17:29:13 -0000	1.5
***************
*** 143,146 ****
--- 143,162 ----
  }
  
+ @system_packages_files = ( "$ENV{PLAYPEN_ROOT}/system-packages.local",
+                            "$ENV{PLAYPEN_ROOT}/system-packages" );
+ for (@system_packages_files)
+ {
+   if (-e $_) {
+     if (!(open SP, "<$_")) { die "could not open $_: $!" }
+     while (<SP>) {
+       next unless /^([a-zA-Z0-9\-_\.+]+)/;
+       if ((defined $ACTIONS{$1}) && ($ACTIONS{$1} ne 'UNINSTALL')) {
+         delete $ACTIONS{$1};
+       }
+     }
+     close SP;
+   }
+ }
+ 
  for (keys %ACTIONS) {
    next if $ACTIONS{$_} eq 'UNINSTALL';