[csw-devel] SF.net SVN: gar:[8335] csw/mgar

wahwah at users.sourceforge.net wahwah at users.sourceforge.net
Wed Feb 3 19:36:42 CET 2010


Revision: 8335
          http://gar.svn.sourceforge.net/gar/?rev=8335&view=rev
Author:   wahwah
Date:     2010-02-03 18:36:29 +0000 (Wed, 03 Feb 2010)

Log Message:
-----------
everything: Implementing variable names mapping as discussed in Munich and documented in the minutes: http://wiki.opencsw.org/wintercamp-2009-minutes

Modified Paths:
--------------
    csw/mgar/gar/v1/gar.mk
    csw/mgar/gar/v1/gar.pkg.mk
    csw/mgar/gar/v2/gar.mk
    csw/mgar/gar/v2/gar.pkg.mk
    csw/mgar/gar/v2/lib/python/checkpkg.py
    csw/mgar/gar/v2/lib/python/checkpkg_test.py
    csw/mgar/gar/v2-git/gar.mk
    csw/mgar/gar/v2-git/gar.pkg.mk
    csw/mgar/gar/v2-git/lib/python/checkpkg.py
    csw/mgar/gar/v2-git/lib/python/checkpkg_test.py
    csw/mgar/gar/v2-relocate/gar.mk
    csw/mgar/gar/v2-relocate/gar.pkg.mk
    csw/mgar/gar/v2-skayser/gar.mk
    csw/mgar/gar/v2-skayser/gar.pkg.mk
    csw/mgar/pkg/GeoIP/trunk/Makefile
    csw/mgar/pkg/ImageMagick/trunk/Makefile
    csw/mgar/pkg/MailScanner/trunk/Makefile
    csw/mgar/pkg/Vispan/trunk/Makefile
    csw/mgar/pkg/ZSI/trunk/Makefile
    csw/mgar/pkg/aide/trunk/Makefile
    csw/mgar/pkg/alpine/trunk/Makefile
    csw/mgar/pkg/amavisd-new/trunk/Makefile
    csw/mgar/pkg/apache2/tags/apache-2.2.13-by-idogan/Makefile
    csw/mgar/pkg/apache2/trunk/Makefile
    csw/mgar/pkg/apcupsd/trunk/Makefile
    csw/mgar/pkg/asciidoc/trunk/Makefile
    csw/mgar/pkg/autoconf/tags/autoconf-2.64,REV=2009.07.29/Makefile
    csw/mgar/pkg/autoconf/trunk/Makefile
    csw/mgar/pkg/automake/trunk/Makefile
    csw/mgar/pkg/autoproject/trunk/Makefile
    csw/mgar/pkg/awstats/trunk/Makefile
    csw/mgar/pkg/bash/trunk/Makefile
    csw/mgar/pkg/bashdb/trunk/Makefile
    csw/mgar/pkg/bazaar/trunk/Makefile
    csw/mgar/pkg/bdb/trunk/Makefile
    csw/mgar/pkg/bdb3/tags/bdb-consolidation-4.4.20,REV=2009.07.28/Makefile
    csw/mgar/pkg/bdb3/tags/bdb-consolidation-4.4.20,REV=2009.07.28/legacy/Makefile
    csw/mgar/pkg/bdb3/tags/bdb3-stub-to-bdb33-UNRELEASED/Makefile
    csw/mgar/pkg/bdb3/trunk/Makefile
    csw/mgar/pkg/bdb4/trunk/Makefile
    csw/mgar/pkg/bdb42/tags/bdb-consolidation-4.4.20,REV=2009.07.28/Makefile
    csw/mgar/pkg/bdb42/tags/bdb-consolidation-4.4.20,REV=2009.07.28/legacy/Makefile
    csw/mgar/pkg/bdb42/trunk/Makefile
    csw/mgar/pkg/bdb43/tags/bdb-consolidation-4.3.29,REV=2009.06.26/Makefile
    csw/mgar/pkg/bdb43/trunk/Makefile
    csw/mgar/pkg/bdb44/tags/bdb-consolidation-4.4.20,REV=2009.07.28/Makefile
    csw/mgar/pkg/bdb44/tags/bdb-consolidation-4.4.20,REV=2009.07.28/legacy/Makefile
    csw/mgar/pkg/bdb44/trunk/Makefile
    csw/mgar/pkg/bdb45/trunk/Makefile
    csw/mgar/pkg/bdb46/trunk/Makefile
    csw/mgar/pkg/bdb47/trunk/Makefile
    csw/mgar/pkg/bdb48/trunk/Makefile
    csw/mgar/pkg/beautifulsoup/trunk/Makefile
    csw/mgar/pkg/bind/branches/stable/Makefile
    csw/mgar/pkg/bind/branches/stable-9.4.3p3/Makefile
    csw/mgar/pkg/bind/trunk/Makefile
    csw/mgar/pkg/bind2nsd/trunk/Makefile
    csw/mgar/pkg/binutils/trunk/Makefile
    csw/mgar/pkg/bison/trunk/Makefile
    csw/mgar/pkg/botnet/trunk/Makefile
    csw/mgar/pkg/buildbot/trunk/Makefile
    csw/mgar/pkg/cacti/trunk/Makefile
    csw/mgar/pkg/cadaver/trunk/Makefile
    csw/mgar/pkg/cairomm/trunk/Makefile
    csw/mgar/pkg/cdecl/trunk/Makefile
    csw/mgar/pkg/cfengine/trunk/Makefile
    csw/mgar/pkg/cgit/trunk/Makefile
    csw/mgar/pkg/chkconfig/trunk/Makefile
    csw/mgar/pkg/chmlib/trunk/Makefile
    csw/mgar/pkg/chromium/trunk/Makefile
    csw/mgar/pkg/clamav/trunk/Makefile
    csw/mgar/pkg/clearsilver/trunk/Makefile
    csw/mgar/pkg/clusterssh/trunk/Makefile
    csw/mgar/pkg/cmake/trunk/Makefile
    csw/mgar/pkg/colordiff/trunk/Makefile
    csw/mgar/pkg/colormake/trunk/Makefile
    csw/mgar/pkg/coreutils/trunk/Makefile
    csw/mgar/pkg/cpan/Algorithm-Annotate/trunk/Makefile
    csw/mgar/pkg/cpan/Algorithm-Depedency/trunk/Makefile
    csw/mgar/pkg/cpan/Apache-Test/trunk/Makefile
    csw/mgar/pkg/cpan/Apache2-AuthzNIS/trunk/Makefile
    csw/mgar/pkg/cpan/App-CLI/trunk/Makefile
    csw/mgar/pkg/cpan/Archive-Tar/trunk/Makefile
    csw/mgar/pkg/cpan/Archive-Zip/trunk/Makefile
    csw/mgar/pkg/cpan/Authen-SASL/trunk/Makefile
    csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile
    csw/mgar/pkg/cpan/Bit-Vector/trunk/Makefile
    csw/mgar/pkg/cpan/Cairo/trunk/Makefile
    csw/mgar/pkg/cpan/Capitalization/trunk/Makefile
    csw/mgar/pkg/cpan/Chart/trunk/Makefile
    csw/mgar/pkg/cpan/Class-Container/trunk/Makefile
    csw/mgar/pkg/cpan/Class-ReturnValue/trunk/Makefile
    csw/mgar/pkg/cpan/Compress-Bzip2/trunk/Makefile
    csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/Makefile
    csw/mgar/pkg/cpan/Compress-Zlib/trunk/Makefile
    csw/mgar/pkg/cpan/Crypt-OpenSSL-Bignum/trunk/Makefile
    csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/Makefile
    csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/Makefile
    csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/Makefile
    csw/mgar/pkg/cpan/DBD-SQLite/trunk/Makefile
    csw/mgar/pkg/cpan/DBI/trunk/Makefile
    csw/mgar/pkg/cpan/Data-Hierarchy/trunk/Makefile
    csw/mgar/pkg/cpan/Date-Calc/trunk/Makefile
    csw/mgar/pkg/cpan/DateTime/trunk/Makefile
    csw/mgar/pkg/cpan/DateTime-Locale/trunk/Makefile
    csw/mgar/pkg/cpan/DateTime-TimeZone/trunk/Makefile
    csw/mgar/pkg/cpan/Devel-Caller/trunk/Makefile
    csw/mgar/pkg/cpan/Devel-LexAlias/trunk/Makefile
    csw/mgar/pkg/cpan/Email-Simple/trunk/Makefile
    csw/mgar/pkg/cpan/Event-Lib/trunk/Makefile
    csw/mgar/pkg/cpan/ExtUtils-ParseXS/trunk/Makefile
    csw/mgar/pkg/cpan/Font-Freetype/trunk/Makefile
    csw/mgar/pkg/cpan/GD/trunk/Makefile
    csw/mgar/pkg/cpan/GSSAPI/trunk/Makefile
    csw/mgar/pkg/cpan/Geo-IP-PurePerl/trunk/Makefile
    csw/mgar/pkg/cpan/Gimp/trunk/Makefile
    csw/mgar/pkg/cpan/Glib/trunk/Makefile
    csw/mgar/pkg/cpan/HTML-Mason/trunk/Makefile
    csw/mgar/pkg/cpan/HTML-Parser/trunk/Makefile
    csw/mgar/pkg/cpan/IO-Compress/trunk/Makefile
    csw/mgar/pkg/cpan/IO-Compress-Base/trunk/Makefile
    csw/mgar/pkg/cpan/IO-Compress-Zlib/trunk/Makefile
    csw/mgar/pkg/cpan/IO-Digest/trunk/Makefile
    csw/mgar/pkg/cpan/IO-Zlib/trunk/Makefile
    csw/mgar/pkg/cpan/IPC-Cmd/trunk/Makefile
    csw/mgar/pkg/cpan/Lexical-Persistence/trunk/Makefile
    csw/mgar/pkg/cpan/Locale-Gettext/trunk/Makefile
    csw/mgar/pkg/cpan/Locale-Maketext-Simple/trunk/Makefile
    csw/mgar/pkg/cpan/Log-Dispatch/trunk/Makefile
    csw/mgar/pkg/cpan/Log-Message/trunk/Makefile
    csw/mgar/pkg/cpan/Log-Message-Simple/trunk/Makefile
    csw/mgar/pkg/cpan/MIME-Lite/trunk/Makefile
    csw/mgar/pkg/cpan/MIME-Types/trunk/Makefile
    csw/mgar/pkg/cpan/Mail-DKIM/trunk/Makefile
    csw/mgar/pkg/cpan/Mail-SPF/trunk/Makefile
    csw/mgar/pkg/cpan/Module-Build/trunk/Makefile
    csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/Makefile
    csw/mgar/pkg/cpan/Net-Analysis/trunk/Makefile
    csw/mgar/pkg/cpan/Net-DNS/trunk/Makefile
    csw/mgar/pkg/cpan/Net-NIS/trunk/Makefile
    csw/mgar/pkg/cpan/Net-Pcap/trunk/Makefile
    csw/mgar/pkg/cpan/Net-SMTP-SSL/trunk/Makefile
    csw/mgar/pkg/cpan/Net-SSLeay/trunk/Makefile
    csw/mgar/pkg/cpan/Object-Accessor/trunk/Makefile
    csw/mgar/pkg/cpan/PDF-API2/trunk/Makefile
    csw/mgar/pkg/cpan/Params-Check/trunk/Makefile
    csw/mgar/pkg/cpan/Parse-RecDescent/trunk/Makefile
    csw/mgar/pkg/cpan/Path-Class/trunk/Makefile
    csw/mgar/pkg/cpan/PerlIO-gzip/trunk/Makefile
    csw/mgar/pkg/cpan/Pod-Coverage/trunk/Makefile
    csw/mgar/pkg/cpan/Pod-Simple/trunk/Makefile
    csw/mgar/pkg/cpan/RADIUS-UserFile/trunk/Makefile
    csw/mgar/pkg/cpan/RPC-XML/trunk/Makefile
    csw/mgar/pkg/cpan/SOAP-Lite/trunk/Makefile
    csw/mgar/pkg/cpan/Search-Xapian/trunk/Makefile
    csw/mgar/pkg/cpan/Shout/trunk/Makefile
    csw/mgar/pkg/cpan/Spiffy/trunk/Makefile
    csw/mgar/pkg/cpan/Template-Toolkit/trunk/Makefile
    csw/mgar/pkg/cpan/Term-ReadLine-Gnu/trunk/Makefile
    csw/mgar/pkg/cpan/TermReadKey/trunk/Makefile
    csw/mgar/pkg/cpan/Test-ClassAPI/trunk/Makefile
    csw/mgar/pkg/cpan/Test-Distribution/trunk/Makefile
    csw/mgar/pkg/cpan/Test-Exception/trunk/Makefile
    csw/mgar/pkg/cpan/Test-Script/trunk/Makefile
    csw/mgar/pkg/cpan/Text-GenderFromName/trunk/Makefile
    csw/mgar/pkg/cpan/UNIVERSAL-can/trunk/Makefile
    csw/mgar/pkg/cpan/UNIVERSAL-isa/trunk/Makefile
    csw/mgar/pkg/cpan/Unicode-Map/trunk/Makefile
    csw/mgar/pkg/cpan/Unix-Statgrab/trunk/Makefile
    csw/mgar/pkg/cpan/WWW-Curl/trunk/Makefile
    csw/mgar/pkg/cpan/XML-LibXML/trunk/Makefile
    csw/mgar/pkg/cpan/XML-Parser/trunk/Makefile
    csw/mgar/pkg/cpan/XML-Records/trunk/Makefile
    csw/mgar/pkg/cpan/XML-Simple/trunk/Makefile
    csw/mgar/pkg/cpan/XML-TokeParser/trunk/Makefile
    csw/mgar/pkg/cpan/XML-XPath/trunk/Makefile
    csw/mgar/pkg/cpan/libwww-perl/trunk/Makefile
    csw/mgar/pkg/cpan/perl-ldap/trunk/Makefile
    csw/mgar/pkg/cpan/perlconsole/trunk/Makefile
    csw/mgar/pkg/cswpkgloghooks/trunk/Makefile
    csw/mgar/pkg/cswutils/trunk/Makefile
    csw/mgar/pkg/cups/branches/cups-1.3/Makefile
    csw/mgar/pkg/cups/branches/cups-1.4.0/Makefile
    csw/mgar/pkg/cups/trunk/Makefile
    csw/mgar/pkg/curl/trunk/Makefile
    csw/mgar/pkg/cvs2svn/trunk/Makefile
    csw/mgar/pkg/cvsproxy/trunk/Makefile
    csw/mgar/pkg/cvsps/trunk/Makefile
    csw/mgar/pkg/cx-oracle/trunk/Makefile
    csw/mgar/pkg/cyrus_imapd/trunk/Makefile
    csw/mgar/pkg/dante/trunk/Makefile
    csw/mgar/pkg/dbus/trunk/Makefile
    csw/mgar/pkg/dbus-glib/trunk/Makefile
    csw/mgar/pkg/dbus-python/trunk/Makefile
    csw/mgar/pkg/dhcp/trunk/Makefile
    csw/mgar/pkg/diffuse/trunk/Makefile
    csw/mgar/pkg/distcc/trunk/Makefile
    csw/mgar/pkg/django/trunk/Makefile
    csw/mgar/pkg/djvulibre/trunk/Makefile
    csw/mgar/pkg/dnstop/trunk/Makefile
    csw/mgar/pkg/dnswalk/trunk/Makefile
    csw/mgar/pkg/docbook-dtds/trunk/Makefile
    csw/mgar/pkg/docbook-style-dsssl/trunk/Makefile
    csw/mgar/pkg/docbook-style-xsl/trunk/Makefile
    csw/mgar/pkg/dovecot/trunk/Makefile
    csw/mgar/pkg/doxygen/trunk/Makefile
    csw/mgar/pkg/drill/trunk/Makefile
    csw/mgar/pkg/drupal/trunk/Makefile
    csw/mgar/pkg/dsniff/trunk/Makefile
    csw/mgar/pkg/elinks/trunk/Makefile
    csw/mgar/pkg/esound/trunk/Makefile
    csw/mgar/pkg/etckeeper/trunk/Makefile
    csw/mgar/pkg/euler/trunk/Makefile
    csw/mgar/pkg/eventlog/trunk/Makefile
    csw/mgar/pkg/evolution-ds/trunk/Makefile
    csw/mgar/pkg/evolution-exchange/trunk/Makefile
    csw/mgar/pkg/evolution-mapi/trunk/Makefile
    csw/mgar/pkg/evolution-webcal/trunk/Makefile
    csw/mgar/pkg/exempi/trunk/Makefile
    csw/mgar/pkg/exiftool/trunk/Makefile
    csw/mgar/pkg/expat/trunk/Makefile
    csw/mgar/pkg/facter/trunk/Makefile
    csw/mgar/pkg/ffmpeg/trunk/Makefile
    csw/mgar/pkg/fftw/trunk/Makefile
    csw/mgar/pkg/file/trunk/Makefile
    csw/mgar/pkg/findutils/trunk/Makefile
    csw/mgar/pkg/firefox/branches/firefox2-maintenance/Makefile
    csw/mgar/pkg/firefox/branches/firefox3-packaging/Makefile
    csw/mgar/pkg/firefox/branches/firefox3.5-packaging/Makefile
    csw/mgar/pkg/firefox/trunk/Makefile
    csw/mgar/pkg/flac/trunk/Makefile
    csw/mgar/pkg/flex_new/trunk/Makefile
    csw/mgar/pkg/fontconfig/trunk/Makefile
    csw/mgar/pkg/fontforge/trunk/Makefile
    csw/mgar/pkg/fprobe/trunk/Makefile
    csw/mgar/pkg/freehdl/trunk/Makefile
    csw/mgar/pkg/freetype/trunk/Makefile
    csw/mgar/pkg/gail/trunk/Makefile
    csw/mgar/pkg/ganglia/branches/ganglia-3.1.3-rc/Makefile
    csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/Makefile
    csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/Makefile
    csw/mgar/pkg/ganglia/trunk/Makefile
    csw/mgar/pkg/gar/trunk/Makefile
    csw/mgar/pkg/gardev/trunk/Makefile
    csw/mgar/pkg/gcc4/trunk/files/package_def.mk
    csw/mgar/pkg/gccgo/trunk/Makefile
    csw/mgar/pkg/gconf2/trunk/Makefile
    csw/mgar/pkg/gcpio/trunk/Makefile
    csw/mgar/pkg/gd/trunk/Makefile
    csw/mgar/pkg/gdata-python-client/trunk/Makefile
    csw/mgar/pkg/gdb/trunk/Makefile
    csw/mgar/pkg/gdome2/trunk/Makefile
    csw/mgar/pkg/genshi/trunk/Makefile
    csw/mgar/pkg/gettext/trunk/Makefile
    csw/mgar/pkg/ghc/trunk/Makefile
    csw/mgar/pkg/ghostscript/trunk/Makefile
    csw/mgar/pkg/giflib/trunk/Makefile
    csw/mgar/pkg/git/tags/1.6.2.1-2009.04.14/Makefile
    csw/mgar/pkg/git/trunk/Makefile
    csw/mgar/pkg/git-subtree/trunk/Makefile
    csw/mgar/pkg/gitosis/trunk/Makefile
    csw/mgar/pkg/glib/trunk/Makefile
    csw/mgar/pkg/glib2/trunk/Makefile
    csw/mgar/pkg/glibmm/trunk/Makefile
    csw/mgar/pkg/glpk/trunk/Makefile
    csw/mgar/pkg/gnome-terminal/trunk/Makefile
    csw/mgar/pkg/gnomedesktop/trunk/Makefile
    csw/mgar/pkg/gnulinks/trunk/Makefile
    csw/mgar/pkg/gnumeric/trunk/Makefile
    csw/mgar/pkg/gnupg/trunk/Makefile
    csw/mgar/pkg/gnupg2/trunk/Makefile
    csw/mgar/pkg/gnupg_minimal/trunk/Makefile
    csw/mgar/pkg/gnutls/trunk/Makefile
    csw/mgar/pkg/gobject-introspection/trunk/Makefile
    csw/mgar/pkg/goocanvas/trunk/Makefile
    csw/mgar/pkg/gpgme/trunk/Makefile
    csw/mgar/pkg/graphviz/trunk/Makefile
    csw/mgar/pkg/gsasl/trunk/Makefile
    csw/mgar/pkg/gtar/trunk/Makefile
    csw/mgar/pkg/gtk-doc/trunk/Makefile
    csw/mgar/pkg/gtk2/trunk/Makefile
    csw/mgar/pkg/gtksourceview/trunk/Makefile
    csw/mgar/pkg/gtkwave/trunk/Makefile
    csw/mgar/pkg/gts/trunk/Makefile
    csw/mgar/pkg/guile/trunk/Makefile
    csw/mgar/pkg/gvim/trunk/Makefile
    csw/mgar/pkg/gzip/trunk/Makefile
    csw/mgar/pkg/hachoir-parser/trunk/Makefile
    csw/mgar/pkg/hdf5/tags/hdf5-1.8.3,REV=2009.11.03/Makefile
    csw/mgar/pkg/hdf5/trunk/Makefile
    csw/mgar/pkg/help2man/tags/help2man-1.36.4,REV=2008.09.18/Makefile
    csw/mgar/pkg/help2man/trunk/Makefile
    csw/mgar/pkg/htmldoc/trunk/Makefile
    csw/mgar/pkg/httping/trunk/Makefile
    csw/mgar/pkg/hylafax/trunk/Makefile
    csw/mgar/pkg/icecast/trunk/Makefile
    csw/mgar/pkg/icinga/trunk/Makefile
    csw/mgar/pkg/iftop/trunk/Makefile
    csw/mgar/pkg/ilmbase/trunk/Makefile
    csw/mgar/pkg/imapproxy/trunk/Makefile
    csw/mgar/pkg/imapsync/trunk/Makefile
    csw/mgar/pkg/imlib2/trunk/Makefile
    csw/mgar/pkg/indent/trunk/Makefile
    csw/mgar/pkg/intltool/trunk/Makefile
    csw/mgar/pkg/ipython/trunk/Makefile
    csw/mgar/pkg/irssi/trunk/Makefile
    csw/mgar/pkg/java/ajcbeanutils/tags/commons_beanutils-1.8.0,REV=2009.02.24-testing-b1/Makefile
    csw/mgar/pkg/java/ajcbeanutils/tags/commons_beanutils-1.8.0,REV=2009.02.24-unstable-20090302/Makefile
    csw/mgar/pkg/java/ajcbeanutils/trunk/Makefile
    csw/mgar/pkg/java/ajcchain/tags/commons_chain-1.2,REV=2009.02.24-testing-b1/Makefile
    csw/mgar/pkg/java/ajcchain/tags/commons_chain-1.2,REV=2009.02.24-unstable-20090302/Makefile
    csw/mgar/pkg/java/ajcchain/trunk/Makefile
    csw/mgar/pkg/java/ajccli/tags/commons_cli-1.1,REV=2009.02.24-testing-b1/Makefile
    csw/mgar/pkg/java/ajccli/tags/commons_cli-1.1,REV=2009.02.24-unstable-20090302/Makefile
    csw/mgar/pkg/java/ajccli/trunk/Makefile
    csw/mgar/pkg/java/ajccollections/tags/commons_collect-3.2.1,REV=2009.02.24-testing-b1/Makefile
    csw/mgar/pkg/java/ajccollections/tags/commons_collect-3.2.1,REV=2009.02.24-unstable-20090302/Makefile
    csw/mgar/pkg/java/ajccollections/trunk/Makefile
    csw/mgar/pkg/java/ajcconfig/trunk/Makefile
    csw/mgar/pkg/java/ajcdigester/trunk/Makefile
    csw/mgar/pkg/java/ajcdiscovery/trunk/Makefile
    csw/mgar/pkg/java/ajcemail/trunk/Makefile
    csw/mgar/pkg/java/ajchttpcl/trunk/Makefile
    csw/mgar/pkg/java/ajcio/trunk/Makefile
    csw/mgar/pkg/java/ajclang/trunk/Makefile
    csw/mgar/pkg/java/ajclogging/trunk/Makefile
    csw/mgar/pkg/java/ajcmath/trunk/Makefile
    csw/mgar/pkg/java/ajcnet/trunk/Makefile
    csw/mgar/pkg/java/ajcpool/trunk/Makefile
    csw/mgar/pkg/java/ajcprimitives/trunk/Makefile
    csw/mgar/pkg/java/ajcupload/trunk/Makefile
    csw/mgar/pkg/java/ajcvalidator/trunk/Makefile
    csw/mgar/pkg/java/junit/tags/junit-4.5,REV=2009.03.08-testing-b1/Makefile
    csw/mgar/pkg/java/junit/trunk/Makefile
    csw/mgar/pkg/java/log4j/tags/log4j-1.2.15,REV=2009.03.09-testing-b1/Makefile
    csw/mgar/pkg/java/log4j/trunk/Makefile
    csw/mgar/pkg/jdk5/trunk/Makefile
    csw/mgar/pkg/jdk6/trunk/Makefile
    csw/mgar/pkg/jetty6/trunk/Makefile
    csw/mgar/pkg/jpeg/trunk/Makefile
    csw/mgar/pkg/jpeginfo/trunk/Makefile
    csw/mgar/pkg/json-glib/trunk/Makefile
    csw/mgar/pkg/keychain/trunk/Makefile
    csw/mgar/pkg/krb5/trunk/Makefile
    csw/mgar/pkg/lame/trunk/Makefile
    csw/mgar/pkg/lcms/trunk/Makefile
    csw/mgar/pkg/ldapvi/trunk/Makefile
    csw/mgar/pkg/ldns/trunk/Makefile
    csw/mgar/pkg/leafnode/trunk/Makefile
    csw/mgar/pkg/lensfun/trunk/Makefile
    csw/mgar/pkg/less/trunk/Makefile
    csw/mgar/pkg/lftp/trunk/Makefile
    csw/mgar/pkg/liba52/trunk/Makefile
    csw/mgar/pkg/libao/trunk/Makefile
    csw/mgar/pkg/libassuan/trunk/Makefile
    csw/mgar/pkg/libast/trunk/Makefile
    csw/mgar/pkg/libatk/trunk/Makefile
    csw/mgar/pkg/libcairo/trunk/Makefile
    csw/mgar/pkg/libcddb/trunk/Makefile
    csw/mgar/pkg/libcdio/trunk/Makefile
    csw/mgar/pkg/libcroco/trunk/Makefile
    csw/mgar/pkg/libdatrie/trunk/Makefile
    csw/mgar/pkg/liberation-fonts/trunk/Makefile
    csw/mgar/pkg/libevent/tags/libevent-1.4.12,REV=2009.11.04/Makefile
    csw/mgar/pkg/libevent/trunk/Makefile
    csw/mgar/pkg/libexif/trunk/Makefile
    csw/mgar/pkg/libfaac/trunk/Makefile
    csw/mgar/pkg/libfaad2/trunk/Makefile
    csw/mgar/pkg/libffi/trunk/Makefile
    csw/mgar/pkg/libfishsound/trunk/Makefile
    csw/mgar/pkg/libfpx/trunk/Makefile
    csw/mgar/pkg/libgcrypt/trunk/Makefile
    csw/mgar/pkg/libgda/trunk/Makefile
    csw/mgar/pkg/libglade2/trunk/Makefile
    csw/mgar/pkg/libgmp/trunk/Makefile
    csw/mgar/pkg/libgnomecanvas/trunk/Makefile
    csw/mgar/pkg/libgnomedb/trunk/Makefile
    csw/mgar/pkg/libgoffice/trunk/Makefile
    csw/mgar/pkg/libgpg_error/trunk/Makefile
    csw/mgar/pkg/libgsf/trunk/Makefile
    csw/mgar/pkg/libgss/trunk/Makefile
    csw/mgar/pkg/libiconv/branches/sync-pkgname/Makefile
    csw/mgar/pkg/libiconv/trunk/Makefile
    csw/mgar/pkg/libid3tag/trunk/Makefile
    csw/mgar/pkg/libidl/trunk/Makefile
    csw/mgar/pkg/libidn/tags/libidn-1.15,REV=2009.06.10/Makefile
    csw/mgar/pkg/libidn/trunk/Makefile
    csw/mgar/pkg/libiptcdata/trunk/Makefile
    csw/mgar/pkg/libksba/trunk/Makefile
    csw/mgar/pkg/liblasi/tags/liblasi-1.1.0,REV=2009.05.28/Makefile
    csw/mgar/pkg/liblasi/trunk/Makefile
    csw/mgar/pkg/liblcms/trunk/Makefile
    csw/mgar/pkg/libmatroska/trunk/Makefile
    csw/mgar/pkg/libmcal/trunk/Makefile
    csw/mgar/pkg/libmpeg2/trunk/Makefile
    csw/mgar/pkg/libmpfr/trunk/Makefile
    csw/mgar/pkg/libnids/trunk/Makefile
    csw/mgar/pkg/liboggz/trunk/Makefile
    csw/mgar/pkg/liboil/trunk/Makefile
    csw/mgar/pkg/libpaper/trunk/Makefile
    csw/mgar/pkg/libpcap/trunk/Makefile
    csw/mgar/pkg/libpopt/tags/popt-1.15,REV=2009.10.06/Makefile
    csw/mgar/pkg/libpopt/trunk/Makefile
    csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/Makefile
    csw/mgar/pkg/libproxy/trunk/Makefile
    csw/mgar/pkg/librsvg/trunk/Makefile
    csw/mgar/pkg/libsamplerate/trunk/Makefile
    csw/mgar/pkg/libschroedinger/trunk/Makefile
    csw/mgar/pkg/libsdl/trunk/Makefile
    csw/mgar/pkg/libserf/trunk/Makefile
    csw/mgar/pkg/libshout/trunk/Makefile
    csw/mgar/pkg/libsmi/trunk/Makefile
    csw/mgar/pkg/libsndfile/tags/libsndfile-1.0.20,REV=2009.11.04/Makefile
    csw/mgar/pkg/libsndfile/trunk/Makefile
    csw/mgar/pkg/libsoup/trunk/Makefile
    csw/mgar/pkg/libsoup2/trunk/Makefile
    csw/mgar/pkg/libspectre/trunk/Makefile
    csw/mgar/pkg/libspf2/trunk/Makefile
    csw/mgar/pkg/libssh2/trunk/Makefile
    csw/mgar/pkg/libtasn1/trunk/Makefile
    csw/mgar/pkg/libthai/trunk/Makefile
    csw/mgar/pkg/libtheora/trunk/Makefile
    csw/mgar/pkg/libtool/tags/libtool-2.2.6,REV=2009.09.04_rev=a/Makefile
    csw/mgar/pkg/libtool/tags/libtool-2.2.6-legacy-gcctags/Makefile
    csw/mgar/pkg/libtool/tags/libtool-2.2.6b,REV=2010.01.05/Makefile
    csw/mgar/pkg/libtool/trunk/Makefile
    csw/mgar/pkg/libunique/trunk/Makefile
    csw/mgar/pkg/libvanessa-socket/trunk/Makefile
    csw/mgar/pkg/libvorbis/trunk/Makefile
    csw/mgar/pkg/libwww/trunk/Makefile
    csw/mgar/pkg/libxml2/trunk/Makefile
    csw/mgar/pkg/libxslt/trunk/Makefile
    csw/mgar/pkg/log4sh/trunk/Makefile
    csw/mgar/pkg/logwatch/trunk/Makefile
    csw/mgar/pkg/loudmouth/trunk/Makefile
    csw/mgar/pkg/lutefisk/trunk/Makefile
    csw/mgar/pkg/lzop/trunk/Makefile
    csw/mgar/pkg/m4/trunk/Makefile
    csw/mgar/pkg/mailx/trunk/Makefile
    csw/mgar/pkg/mairix/trunk/Makefile
    csw/mgar/pkg/man2html/trunk/Makefile
    csw/mgar/pkg/mantis/trunk/Makefile
    csw/mgar/pkg/mbuffer/trunk/Makefile
    csw/mgar/pkg/mcabber/trunk/Makefile
    csw/mgar/pkg/mediawiki/trunk/Makefile
    csw/mgar/pkg/memcached/tags/memcached-1.4.3,REV=2009.11.24/Makefile
    csw/mgar/pkg/memcached/trunk/Makefile
    csw/mgar/pkg/mercurial/trunk/Makefile
    csw/mgar/pkg/mibdump/trunk/Makefile
    csw/mgar/pkg/miltergreylist/trunk/Makefile
    csw/mgar/pkg/mocha/trunk/Makefile
    csw/mgar/pkg/mod_macro/trunk/Makefile
    csw/mgar/pkg/mod_proxy_html/trunk/Makefile
    csw/mgar/pkg/mod_python/trunk/Makefile
    csw/mgar/pkg/mod_wsgi/trunk/Makefile
    csw/mgar/pkg/mpd/trunk/Makefile
    csw/mgar/pkg/mpg123/trunk/Makefile
    csw/mgar/pkg/msmtp/trunk/Makefile
    csw/mgar/pkg/msttcorefonts/trunk/Makefile
    csw/mgar/pkg/mtools/trunk/Makefile
    csw/mgar/pkg/mtr/trunk/Makefile
    csw/mgar/pkg/multitail/trunk/Makefile
    csw/mgar/pkg/munin/trunk/Makefile
    csw/mgar/pkg/mutt/trunk/Makefile
    csw/mgar/pkg/myodbc/trunk/Makefile
    csw/mgar/pkg/mysql-python/trunk/Makefile
    csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile
    csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile
    csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile
    csw/mgar/pkg/mysql5/trunk/Makefile
    csw/mgar/pkg/nagios/trunk/Makefile
    csw/mgar/pkg/nagios_plugins/trunk/Makefile
    csw/mgar/pkg/nagvis/trunk/Makefile
    csw/mgar/pkg/nano/trunk/Makefile
    csw/mgar/pkg/ncdu/trunk/Makefile
    csw/mgar/pkg/ncftp/trunk/Makefile
    csw/mgar/pkg/ncmpc/trunk/Makefile
    csw/mgar/pkg/ncurses/trunk/Makefile
    csw/mgar/pkg/ndoutils/trunk/Makefile
    csw/mgar/pkg/neon/tags/neon-0.29.1,REV=2009.12.17/Makefile
    csw/mgar/pkg/neon/trunk/Makefile
    csw/mgar/pkg/netsnmp/tags/netsnmp-5.4.2.1/Makefile
    csw/mgar/pkg/netsnmp/trunk/Makefile
    csw/mgar/pkg/nginx/trunk/Makefile
    csw/mgar/pkg/nrpe/trunk/Makefile
    csw/mgar/pkg/nsca/trunk/Makefile
    csw/mgar/pkg/nsd/trunk/Makefile
    csw/mgar/pkg/nspr/trunk/Makefile
    csw/mgar/pkg/nss/trunk/Makefile
    csw/mgar/pkg/nxcl/trunk/Makefile
    csw/mgar/pkg/oinkmaster/trunk/Makefile
    csw/mgar/pkg/openexr/trunk/Makefile
    csw/mgar/pkg/opengrok/trunk/Makefile
    csw/mgar/pkg/openjade/trunk/Makefile
    csw/mgar/pkg/openldap/trunk/Makefile
    csw/mgar/pkg/openssh/trunk/Makefile
    csw/mgar/pkg/openssl/trunk/Makefile
    csw/mgar/pkg/openssl1/trunk/Makefile
    csw/mgar/pkg/openvpn/trunk/Makefile
    csw/mgar/pkg/oracle/trunk/Makefile
    csw/mgar/pkg/orbit2/trunk/Makefile
    csw/mgar/pkg/orca/trunk/Makefile
    csw/mgar/pkg/otr/trunk/Makefile
    csw/mgar/pkg/pakchois/trunk/Makefile
    csw/mgar/pkg/pango/trunk/Makefile
    csw/mgar/pkg/pango-libthai/trunk/Makefile
    csw/mgar/pkg/patchutils/trunk/Makefile
    csw/mgar/pkg/pbzip2/trunk/Makefile
    csw/mgar/pkg/pcb/trunk/Makefile
    csw/mgar/pkg/pcre/tags/pcre-8.00,REV=2009.11.17/Makefile
    csw/mgar/pkg/pcre/trunk/Makefile
    csw/mgar/pkg/pdfjam/trunk/Makefile
    csw/mgar/pkg/perl/branches/perl-5.10.1/Makefile
    csw/mgar/pkg/perl/tags/perl-5.8.8,REV=2009.11.12/Makefile
    csw/mgar/pkg/perl/trunk/Makefile
    csw/mgar/pkg/pgadmin3/trunk/Makefile
    csw/mgar/pkg/php4/trunk/files/depend.mk
    csw/mgar/pkg/php5/trunk/Makefile
    csw/mgar/pkg/php5/trunk/Makefile.cswdir
    csw/mgar/pkg/php5/trunk/Makefile.php5dir
    csw/mgar/pkg/php5/trunk/extensions/php5_apache/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_apache2/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_bcmath/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_bz2/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_calendar/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_ctype/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_curl/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_dba/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_dbase/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_dom/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_exif/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_ftp/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_gd/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_gettext/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_gmp/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_hash/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_iconv/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_imap/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_json/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_ldap/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_mbstring/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_mcrypt/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_mhash/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_mime_magic/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_mssql/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_mysql/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_mysqli/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_ncurses/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_odbc/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_openssl/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_pcntl/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_pdo/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_pdomysql/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_pdoodbc/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_pdopgsql/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_pdosqlite/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_pgsql/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_posix/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_pspell/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_readline/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_session/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_shmop/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_snmp/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_soap/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_sockets/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_sqlite/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_sysvmsg/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_sysvsem/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_sysvshm/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_tidy/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_tokenizer/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_wddx/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_xmlreader/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_xmlrpc/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_xmlwriter/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_xsl/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_zip/Makefile
    csw/mgar/pkg/php5_apc/trunk/Makefile
    csw/mgar/pkg/php5_xdebug/trunk/Makefile
    csw/mgar/pkg/phpMyAdmin/trunk/Makefile
    csw/mgar/pkg/phpmode/tags/release-1.5.0,REV=2009.07.28/Makefile
    csw/mgar/pkg/phpmode/tags/release-1.5.0-20090728/Makefile
    csw/mgar/pkg/phpmode/trunk/Makefile
    csw/mgar/pkg/phpsysinfo/trunk/Makefile
    csw/mgar/pkg/pidgin/trunk/Makefile
    csw/mgar/pkg/pidgin_sipe/trunk/Makefile
    csw/mgar/pkg/pidginotr/trunk/Makefile
    csw/mgar/pkg/pigz/trunk/Makefile
    csw/mgar/pkg/pil/trunk/Makefile
    csw/mgar/pkg/pinentry/trunk/Makefile
    csw/mgar/pkg/pius/trunk/Makefile
    csw/mgar/pkg/pkgconfig/trunk/Makefile
    csw/mgar/pkg/pkgutil/trunk/Makefile
    csw/mgar/pkg/pnp/trunk/Makefile
    csw/mgar/pkg/poppler/trunk/Makefile
    csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile
    csw/mgar/pkg/postfix/trunk/Makefile
    csw/mgar/pkg/postgresql/trunk/Makefile
    csw/mgar/pkg/postgrey/trunk/Makefile
    csw/mgar/pkg/pound/trunk/Makefile
    csw/mgar/pkg/pound2/trunk/Makefile
    csw/mgar/pkg/privoxy/trunk/Makefile
    csw/mgar/pkg/proxytunnel/trunk/Makefile
    csw/mgar/pkg/pth/trunk/Makefile
    csw/mgar/pkg/pubcookie/trunk/Makefile
    csw/mgar/pkg/puppet/branches/puppet-0.24.x/Makefile
    csw/mgar/pkg/puppet/trunk/Makefile
    csw/mgar/pkg/pureftpd/trunk/Makefile
    csw/mgar/pkg/pv/trunk/Makefile
    csw/mgar/pkg/pwgen/trunk/Makefile
    csw/mgar/pkg/pxlib/trunk/Makefile
    csw/mgar/pkg/py_antlr/trunk/Makefile
    csw/mgar/pkg/pycairo/trunk/Makefile
    csw/mgar/pkg/pycurl/trunk/Makefile
    csw/mgar/pkg/pydes/trunk/Makefile
    csw/mgar/pkg/pydocutils/trunk/Makefile
    csw/mgar/pkg/pygobject/trunk/Makefile
    csw/mgar/pkg/pygtk/trunk/Makefile
    csw/mgar/pkg/pykstat/trunk/Makefile
    csw/mgar/pkg/pylxml/trunk/Makefile
    csw/mgar/pkg/pyorbit/trunk/Makefile
    csw/mgar/pkg/pysetuptools/trunk/Makefile
    csw/mgar/pkg/pysoappy/trunk/Makefile
    csw/mgar/pkg/pysqlite/trunk/Makefile
    csw/mgar/pkg/pysqlite2/trunk/Makefile
    csw/mgar/pkg/pysvn/trunk/Makefile
    csw/mgar/pkg/python/trunk/Makefile
    csw/mgar/pkg/python3/trunk/Makefile
    csw/mgar/pkg/pyyaml/trunk/Makefile
    csw/mgar/pkg/pyzor/trunk/Makefile
    csw/mgar/pkg/qhull/trunk/Makefile
    csw/mgar/pkg/qt4/trunk/Makefile
    csw/mgar/pkg/r/trunk/Makefile
    csw/mgar/pkg/rapidsvn/trunk/Makefile
    csw/mgar/pkg/rcairo/trunk/Makefile
    csw/mgar/pkg/rcs/trunk/Makefile
    csw/mgar/pkg/rdesktop/trunk/Makefile
    csw/mgar/pkg/re2c/Makefile
    csw/mgar/pkg/readline/tags/readline-6.0,REV=2009.03.31/Makefile
    csw/mgar/pkg/readline/trunk/Makefile
    csw/mgar/pkg/recode/trunk/Makefile
    csw/mgar/pkg/reportlab/trunk/Makefile
    csw/mgar/pkg/rlwrap/trunk/Makefile
    csw/mgar/pkg/rox-filer/trunk/Makefile
    csw/mgar/pkg/rrdtool/trunk/Makefile
    csw/mgar/pkg/rspec/trunk/Makefile
    csw/mgar/pkg/rtorrent/trunk/Makefile
    csw/mgar/pkg/ruby/trunk/Makefile
    csw/mgar/pkg/rubygems/trunk/Makefile
    csw/mgar/pkg/samba/trunk/Makefile
    csw/mgar/pkg/sar2rrd/trunk/Makefile
    csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/Makefile
    csw/mgar/pkg/screen/trunk/Makefile
    csw/mgar/pkg/scrollkeeper/trunk/Makefile
    csw/mgar/pkg/sdlimage/trunk/Makefile
    csw/mgar/pkg/sdlmixer/trunk/Makefile
    csw/mgar/pkg/seamonkey/trunk/Makefile
    csw/mgar/pkg/sed/trunk/Makefile
    csw/mgar/pkg/sendmail/branches/benny/Makefile
    csw/mgar/pkg/sendmail/branches/mwatters/Makefile
    csw/mgar/pkg/sendmail/trunk/Makefile
    csw/mgar/pkg/sgml-xml-common/trunk/Makefile
    csw/mgar/pkg/shared-mime-info/trunk/Makefile
    csw/mgar/pkg/shmux/trunk/Makefile
    csw/mgar/pkg/shout-python/trunk/Makefile
    csw/mgar/pkg/siege/trunk/Makefile
    csw/mgar/pkg/silvercity/trunk/Makefile
    csw/mgar/pkg/slang/trunk/Makefile
    csw/mgar/pkg/smbldap-tools/trunk/Makefile
    csw/mgar/pkg/snort/trunk/Makefile
    csw/mgar/pkg/socat/trunk/Makefile
    csw/mgar/pkg/sox/trunk/Makefile
    csw/mgar/pkg/spamass-milter/trunk/Makefile
    csw/mgar/pkg/spamassassin/trunk/Makefile
    csw/mgar/pkg/speex/trunk/Makefile
    csw/mgar/pkg/spine/trunk/Makefile
    csw/mgar/pkg/sqlite3/tags/sqlite3-3.6.19,REV=2009.10.29/Makefile
    csw/mgar/pkg/sqlite3/tags/sqlite3-3.6.21,REV=2010.01.04/Makefile
    csw/mgar/pkg/sqlite3/trunk/Makefile
    csw/mgar/pkg/squid/tags/squid-2.7,REV=2009.06.18_STABLE6/Makefile
    csw/mgar/pkg/squid/tags/squid-squid-2.7,REV=2009.06.18_STABLE6/Makefile
    csw/mgar/pkg/squid/trunk/Makefile
    csw/mgar/pkg/squidclamav/trunk/Makefile
    csw/mgar/pkg/squirrelmail/trunk/Makefile
    csw/mgar/pkg/ss5/trunk/Makefile
    csw/mgar/pkg/stunnel/trunk/Makefile
    csw/mgar/pkg/subversion/trunk/Makefile
    csw/mgar/pkg/sudo/branches/old-symlink-scheme/Makefile
    csw/mgar/pkg/sudo/trunk/Makefile
    csw/mgar/pkg/sudo_ldap/trunk/Makefile
    csw/mgar/pkg/supybot/trunk/Makefile
    csw/mgar/pkg/swig/trunk/Makefile
    csw/mgar/pkg/syslog_ng/trunk/Makefile
    csw/mgar/pkg/sysstat/tags/sysstat-20091024,REV=2009.10.25/Makefile
    csw/mgar/pkg/sysstat/trunk/Makefile
    csw/mgar/pkg/tcl/trunk/Makefile
    csw/mgar/pkg/tcl85/trunk/Makefile
    csw/mgar/pkg/tcpdump/trunk/Makefile
    csw/mgar/pkg/tcpflow/trunk/Makefile
    csw/mgar/pkg/tcsh/trunk/Makefile
    csw/mgar/pkg/template/trunk/Makefile
    csw/mgar/pkg/texinfo/trunk/Makefile
    csw/mgar/pkg/thunderbird/branches/thunderbird3-packaging/Makefile
    csw/mgar/pkg/thunderbird/trunk/Makefile
    csw/mgar/pkg/tiff/trunk/Makefile
    csw/mgar/pkg/tig/trunk/Makefile
    csw/mgar/pkg/tightvnc/branches/tightvnc-1.5/Makefile
    csw/mgar/pkg/tightvnc/trunk/Makefile
    csw/mgar/pkg/tk/trunk/Makefile
    csw/mgar/pkg/tkcvs/trunk/Makefile
    csw/mgar/pkg/tnef/trunk/Makefile
    csw/mgar/pkg/trac/trunk/Makefile
    csw/mgar/pkg/trafshow/trunk/Makefile
    csw/mgar/pkg/transmission/trunk/Makefile
    csw/mgar/pkg/tuntap/trunk/Makefile
    csw/mgar/pkg/twisted/trunk/Makefile
    csw/mgar/pkg/ufraw/trunk/Makefile
    csw/mgar/pkg/unbound/trunk/Makefile
    csw/mgar/pkg/unixodbc/trunk/Makefile
    csw/mgar/pkg/unrtf/trunk/Makefile
    csw/mgar/pkg/urxvt/trunk/Makefile
    csw/mgar/pkg/vim/trunk/Makefile
    csw/mgar/pkg/vixiecron/trunk/Makefile
    csw/mgar/pkg/vorbistools/trunk/Makefile
    csw/mgar/pkg/vsftpd/trunk/Makefile
    csw/mgar/pkg/w3m/trunk/Makefile
    csw/mgar/pkg/watch/trunk/Makefile
    csw/mgar/pkg/wavpack/tags/wavpack-4.60.0,REV=2009.11.06/Makefile
    csw/mgar/pkg/wavpack/trunk/Makefile
    csw/mgar/pkg/websvn/trunk/Makefile
    csw/mgar/pkg/wget/trunk/Makefile
    csw/mgar/pkg/wgetpaste/trunk/Makefile
    csw/mgar/pkg/wireshark/trunk/Makefile
    csw/mgar/pkg/wmf/trunk/Makefile
    csw/mgar/pkg/wput/trunk/Makefile
    csw/mgar/pkg/wxwidgets/trunk/Makefile
    csw/mgar/pkg/x11/individual/x11_evieextproto/trunk/Makefile
    csw/mgar/pkg/x11/individual/x11_fontcacheproto/trunk/Makefile
    csw/mgar/pkg/x11/individual/x11_printproto/trunk/Makefile
    csw/mgar/pkg/x11/individual/x11_trapproto/trunk/Makefile
    csw/mgar/pkg/x11/individual/x11_xf86miscproto/trunk/Makefile
    csw/mgar/pkg/x11/individual/x11_xf86rushproto/trunk/Makefile
    csw/mgar/pkg/x11/lib/libdmx/trunk/Makefile
    csw/mgar/pkg/x11/lib/libfontenc/trunk/Makefile
    csw/mgar/pkg/x11/lib/libfs/trunk/Makefile
    csw/mgar/pkg/x11/lib/libice/trunk/Makefile
    csw/mgar/pkg/x11/lib/libpthread-stubs/trunk/Makefile
    csw/mgar/pkg/x11/lib/libsm/trunk/Makefile
    csw/mgar/pkg/x11/lib/libx11/trunk/Makefile
    csw/mgar/pkg/x11/lib/libxau/trunk/Makefile
    csw/mgar/pkg/x11/lib/libxaw/trunk/Makefile
    csw/mgar/pkg/x11/lib/libxcomposite/trunk/Makefile
    csw/mgar/pkg/x11/lib/libxcursor/trunk/Makefile
    csw/mgar/pkg/x11/lib/libxdamage/trunk/Makefile
    csw/mgar/pkg/x11/lib/libxdmcp/trunk/Makefile
    csw/mgar/pkg/x11/lib/libxext/trunk/Makefile
    csw/mgar/pkg/x11/lib/libxfixes/trunk/Makefile
    csw/mgar/pkg/x11/lib/libxfont/trunk/Makefile
    csw/mgar/pkg/x11/lib/libxfontcache/trunk/Makefile
    csw/mgar/pkg/x11/lib/libxft/trunk/Makefile
    csw/mgar/pkg/x11/lib/libxi/trunk/Makefile
    csw/mgar/pkg/x11/lib/libxinerama/trunk/Makefile
    csw/mgar/pkg/x11/lib/libxkbfile/trunk/Makefile
    csw/mgar/pkg/x11/lib/libxmu/trunk/Makefile
    csw/mgar/pkg/x11/lib/libxpm/trunk/Makefile
    csw/mgar/pkg/x11/lib/libxrandr/trunk/Makefile
    csw/mgar/pkg/x11/lib/libxres/trunk/Makefile
    csw/mgar/pkg/x11/lib/libxscrnsaver/trunk/Makefile
    csw/mgar/pkg/x11/lib/libxt/trunk/Makefile
    csw/mgar/pkg/x11/lib/libxtst/trunk/Makefile
    csw/mgar/pkg/x11/lib/libxv/trunk/Makefile
    csw/mgar/pkg/x11/lib/libxvmc/trunk/Makefile
    csw/mgar/pkg/x11/lib/libxxf86dga/trunk/Makefile
    csw/mgar/pkg/x11/lib/libxxf86misc/trunk/Makefile
    csw/mgar/pkg/x11/lib/libxxf86vm/trunk/Makefile
    csw/mgar/pkg/x11/lib/xrender/trunk/Makefile
    csw/mgar/pkg/x11/lib/xtrans/trunk/Makefile
    csw/mgar/pkg/x11/liblbxutil/trunk/Makefile
    csw/mgar/pkg/x11/liboldx/trunk/Makefile
    csw/mgar/pkg/x11/libwindowswm/trunk/Makefile
    csw/mgar/pkg/x11/libxevie/trunk/Makefile
    csw/mgar/pkg/x11/libxkbui/trunk/Makefile
    csw/mgar/pkg/x11/libxp/trunk/Makefile
    csw/mgar/pkg/x11/libxprintapputil/trunk/Makefile
    csw/mgar/pkg/x11/libxprintutil/trunk/Makefile
    csw/mgar/pkg/x11/libxtrap/trunk/Makefile
    csw/mgar/pkg/x11/proto/x11_applewmproto/trunk/Makefile
    csw/mgar/pkg/x11/proto/x11_bigreqsproto/trunk/Makefile
    csw/mgar/pkg/x11/proto/x11_compositeproto/trunk/Makefile
    csw/mgar/pkg/x11/proto/x11_damageproto/trunk/Makefile
    csw/mgar/pkg/x11/proto/x11_dmxproto/trunk/Makefile
    csw/mgar/pkg/x11/proto/x11_dri2proto/trunk/Makefile
    csw/mgar/pkg/x11/proto/x11_fixesproto/trunk/Makefile
    csw/mgar/pkg/x11/proto/x11_fontsproto/trunk/Makefile
    csw/mgar/pkg/x11/proto/x11_glproto/trunk/Makefile
    csw/mgar/pkg/x11/proto/x11_inputproto/trunk/Makefile
    csw/mgar/pkg/x11/proto/x11_kbproto/trunk/Makefile
    csw/mgar/pkg/x11/proto/x11_randrproto/trunk/Makefile
    csw/mgar/pkg/x11/proto/x11_recordproto/trunk/Makefile
    csw/mgar/pkg/x11/proto/x11_renderproto/trunk/Makefile
    csw/mgar/pkg/x11/proto/x11_resourceproto/trunk/Makefile
    csw/mgar/pkg/x11/proto/x11_scrnsaverproto/trunk/Makefile
    csw/mgar/pkg/x11/proto/x11_videoproto/trunk/Makefile
    csw/mgar/pkg/x11/proto/x11_windowswmproto/trunk/Makefile
    csw/mgar/pkg/x11/proto/x11_xcmiscproto/trunk/Makefile
    csw/mgar/pkg/x11/proto/x11_xextproto/trunk/Makefile
    csw/mgar/pkg/x11/proto/x11_xf86bigfontproto/trunk/Makefile
    csw/mgar/pkg/x11/proto/x11_xf86dgaproto/trunk/Makefile
    csw/mgar/pkg/x11/proto/x11_xf86driproto/trunk/Makefile
    csw/mgar/pkg/x11/proto/x11_xf86vidmodeproto/trunk/Makefile
    csw/mgar/pkg/x11/proto/x11_xineramaproto/trunk/Makefile
    csw/mgar/pkg/x11/proto/x11_xproto/trunk/Makefile
    csw/mgar/pkg/x11/xcb/libxcb/trunk/Makefile
    csw/mgar/pkg/x11/xcb/x11_xcbproto/trunk/Makefile
    csw/mgar/pkg/x11/xcb/xcb-util/trunk/Makefile
    csw/mgar/pkg/xapian-bindings/trunk/Makefile
    csw/mgar/pkg/xapian-core/trunk/Makefile
    csw/mgar/pkg/xbill/trunk/Makefile
    csw/mgar/pkg/xchat/trunk/Makefile
    csw/mgar/pkg/xchm/trunk/Makefile
    csw/mgar/pkg/xfce/dbh/trunk/Makefile
    csw/mgar/pkg/xfce/libxfce4menu/trunk/Makefile
    csw/mgar/pkg/xfce/libxfce4util/trunk/Makefile
    csw/mgar/pkg/xfce/libxfcegui4/trunk/Makefile
    csw/mgar/pkg/xfce/xfconf/trunk/Makefile
    csw/mgar/pkg/xmlrpc_c/trunk/Makefile
    csw/mgar/pkg/xmlstarlet/trunk/Makefile
    csw/mgar/pkg/xmlto/trunk/Makefile
    csw/mgar/pkg/xpdf/trunk/Makefile
    csw/mgar/pkg/xterm/trunk/Makefile
    csw/mgar/pkg/xz/trunk/Makefile
    csw/mgar/pkg/yaml-mode/trunk/Makefile
    csw/mgar/pkg/yasm/trunk/Makefile
    csw/mgar/pkg/zlib/trunk/Makefile
    csw/mgar/pkg/zsh/trunk/Makefile
    csw/mgar/pkg/zshdb/trunk/Makefile

Modified: csw/mgar/gar/v1/gar.mk
===================================================================
--- csw/mgar/gar/v1/gar.mk	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/gar/v1/gar.mk	2010-02-03 18:36:29 UTC (rev 8335)
@@ -121,7 +121,7 @@
 	@echo "[===== NOW BUILDING:	$(DISTNAME)	=====]"
 
 # prerequisite	- Make sure that the system is in a sane state for building the package
-PREREQUISITE_TARGETS = $(addprefix prerequisitepkg-,$(PREREQUISITE_BASE_PKGS) $(PREREQUISITE_PKGS)) $(addprefix prerequisite-,$(PREREQUISITE_SCRIPTS))
+PREREQUISITE_TARGETS = $(addprefix prerequisitepkg-,$(PREREQUISITE_BASE_PKGS) $(BUILD_DEP_PKGS)) $(addprefix prerequisite-,$(PREREQUISITE_SCRIPTS))
 
 prerequisite: announce pre-everything $(COOKIEDIR) $(DOWNLOADDIR) $(PARTIALDIR) $(addprefix dep-$(GARDIR)/,$(FETCHDEPS)) pre-prerequisite $(PREREQUISITE_TARGETS) post-prerequisite
 	$(DONADA)
@@ -136,7 +136,7 @@
 	@$(MAKECOOKIE)
 
 # install-prerequisites - Install all packages which are prerequisites for the package to be build
-install-prerequisites: $(addprefix install-prerequisitepkg-,$(PREREQUISITE_BASE_PKGS) $(PREREQUISITE_PKGS))
+install-prerequisites: $(addprefix install-prerequisitepkg-,$(PREREQUISITE_BASE_PKGS) $(BUILD_DEP_PKGS))
 
 # fetch-list	- Show list of files that would be retrieved by fetch.
 # NOTE: DOES NOT RUN pre-everything!

Modified: csw/mgar/gar/v1/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v1/gar.pkg.mk	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/gar/v1/gar.pkg.mk	2010-02-03 18:36:29 UTC (rev 8335)
@@ -208,4 +208,4 @@
 	@echo
 	@echo "*** Dependencies"
 
-	@$(foreach P,$(PREREQUISITE_PKGS),echo "$P";)
+	@$(foreach P,$(BUILD_DEP_PKGS),echo "$P";)

Modified: csw/mgar/gar/v2/gar.mk
===================================================================
--- csw/mgar/gar/v2/gar.mk	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/gar/v2/gar.mk	2010-02-03 18:36:29 UTC (rev 8335)
@@ -295,7 +295,7 @@
 	@echo "[===== NOW BUILDING: $(DISTNAME) MODULATION $(MODULATION): $(foreach M,$(MODULATORS),$M=$($M)) =====]"
 
 # prerequisite	- Make sure that the system is in a sane state for building the package
-PREREQUISITE_TARGETS = $(addprefix prerequisitepkg-,$(PREREQUISITE_BASE_PKGS) $(PREREQUISITE_PKGS)) $(addprefix prerequisite-,$(PREREQUISITE_SCRIPTS))
+PREREQUISITE_TARGETS = $(addprefix prerequisitepkg-,$(PREREQUISITE_BASE_PKGS) $(BUILD_DEP_PKGS)) $(addprefix prerequisite-,$(PREREQUISITE_SCRIPTS))
 
 # Force to be called in global modulation
 prerequisite: $(if $(filter global,$(MODULATION)),announce pre-everything $(COOKIEDIR) $(DOWNLOADDIR) $(PARTIALDIR) $(addprefix dep-$(GARDIR)/,$(FETCHDEPS)) pre-prerequisite $(PREREQUISITE_TARGETS) post-prerequisite)
@@ -582,7 +582,7 @@
 #   the binaries should be executed by isaexec. This is usually bin, sbin and libexec.
 #
 # default:        relocate to ISA subdirs if more than one ISA, use isaexec-wrapper for bin/, etc.
-# NO_ISAEXEC = 1: ISA_DEFAULT gets installed in bin/..., all others in bin/$ISA/
+# NOISAEXEC = 1: ISA_DEFAULT gets installed in bin/..., all others in bin/$ISA/
 #
 # Automatic merging is only possible if you have the default modulation "ISA"
 # Otherwise you *must* specify merge scripts for all modulations.
@@ -598,7 +598,7 @@
 MERGE_SCRIPTS_isa-$(ISA_DEFAULT) ?= $(MERGE_SCRIPTS_isa-default)
 MERGE_SCRIPTS_$(MODULATION) ?= $(MERGE_SCRIPTS_$(MODULATION_ISACOLLAPSED))
 else
-ISAEXEC_DIRS ?= $(if $(NO_ISAEXEC),,$(bindir) $(sbindir) $(libexecdir))
+ISAEXEC_DIRS ?= $(if $(NOISAEXEC),,$(bindir) $(sbindir) $(libexecdir))
 MERGE_DIRS_isa-default ?= $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-$(ISA_DEFAULT))
 MERGE_DIRS_isa-extra ?= $(bindir) $(sbindir) $(libexecdir) $(libdir) $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-$(ISA))
 MERGE_DIRS_$(MODULATION_ISACOLLAPSED64) ?= $(MERGE_DIRS_$(MODULATION_ISACOLLAPSEDEXTRA))

Modified: csw/mgar/gar/v2/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2/gar.pkg.mk	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/gar/v2/gar.pkg.mk	2010-02-03 18:36:29 UTC (rev 8335)
@@ -49,7 +49,7 @@
 GARSYSTEMVERSION ?= $(shell $(SVN) propget svn:externals $(CURDIR) | perl -ane 'if($$F[0] eq "gar") { print ($$F[1]=~m(https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/(.*))),"\n";}')
 GARPKG_v1 = CSWgar-v1
 GARPKG_v2 = CSWgar-v2
-REQUIRED_PKGS_$(SRCPACKAGE) ?= $(or $(GARPKG_$(GARSYSTEMVERSION)),$(error GAR version $(GARSYSTEMVERSION) unknown))
+RUNTIME_DEP_PKGS_$(SRCPACKAGE) ?= $(or $(GARPKG_$(GARSYSTEMVERSION)),$(error GAR version $(GARSYSTEMVERSION) unknown))
 
 _PKG_SPECS      = $(filter-out $(NOPACKAGE),$(SPKG_SPECS))
 
@@ -65,7 +65,7 @@
 GARSYSTEMVERSION ?= $(shell $(SVN) propget svn:externals $(CURDIR) | perl -ane 'if($$F[0] eq "gar") { print ($$F[1]=~m(https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/(.*))),"\n";}')
 GARPKG_v1 = CSWgar-v1
 GARPKG_v2 = CSWgar-v2
-REQUIRED_PKGS_$(SRCPACKAGE) ?= $(or $(GARPKG_$(GARSYSTEMVERSION)),$(error GAR version $(GARSYSTEMVERSION) unknown))
+RUNTIME_DEP_PKGS_$(SRCPACKAGE) ?= $(or $(GARPKG_$(GARSYSTEMVERSION)),$(error GAR version $(GARSYSTEMVERSION) unknown))
 
 _PKG_SPECS      = $(filter-out $(NOPACKAGE),$(SPKG_SPECS))
 
@@ -403,7 +403,7 @@
 
 # Dynamic depends are constructed as follows:
 # - Packages the currently constructed one depends on can be specified with
-#   REQUIRED_PKGS_<pkg> specifically, or REQUIRED_PKGS for all packages build.
+#   RUNTIME_DEP_PKGS_<pkg> specifically, or RUNTIME_DEP_PKGS for all packages build.
 #   These are flagged as 'P' in the depend file.
 # - If multiple packages are build at the same time it is valid to have
 #   dependencies between them. In this case it is necessary to define the package
@@ -425,11 +425,11 @@
 $(WORKDIR)/%.depend: _EXTRA_GAR_PKGS += $(if $(strip $(shell cat $(WORKDIR)/$*.prototype | perl -ane '$(foreach C,$(_CSWCLASSES),print "$C\n" if( $$F[1] eq "$C");)')),CSWcswclassutils)
 
 $(WORKDIR)/%.depend: $(WORKDIR)
-	$(_DBG)$(if $(_EXTRA_GAR_PKGS)$(REQUIRED_PKGS_$*)$(REQUIRED_PKGS)$(INCOMPATIBLE_PKGS)$(INCOMPATIBLE_PKGS_$*), \
+	$(_DBG)$(if $(_EXTRA_GAR_PKGS)$(RUNTIME_DEP_PKGS_$*)$(RUNTIME_DEP_PKGS)$(INCOMPATIBLE_PKGS)$(INCOMPATIBLE_PKGS_$*), \
 		($(foreach PKG,$(INCOMPATIBLE_PKGS_$*) $(INCOMPATIBLE_PKGS),\
 			echo "I $(PKG)";\
 		)\
-		$(foreach PKG,$(sort $(_EXTRA_GAR_PKGS)) $(REQUIRED_PKGS_$*) $(REQUIRED_PKGS),\
+		$(foreach PKG,$(sort $(_EXTRA_GAR_PKGS)) $(RUNTIME_DEP_PKGS_$*) $(RUNTIME_DEP_PKGS),\
 			$(if $(SPKG_DESC_$(PKG)), \
 				echo "P $(PKG) $(call catalogname,$(PKG)) - $(SPKG_DESC_$(PKG))";, \
 				echo "$(shell (/usr/bin/pkginfo $(PKG) || echo "P $(PKG) - ") | $(GAWK) '{ $$1 = "P"; print } ')"; \

Modified: csw/mgar/gar/v2/lib/python/checkpkg.py
===================================================================
--- csw/mgar/gar/v2/lib/python/checkpkg.py	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/gar/v2/lib/python/checkpkg.py	2010-02-03 18:36:29 UTC (rev 8335)
@@ -46,7 +46,7 @@
 # SUGGESTION: you may want to add some or all of the following as depends:
 #    (Feel free to ignore SUNW or SPRO packages)
 #for $pkg in $sorted($missing_deps)
-REQUIRED_PKGS_$pkgname += $pkg
+RUNTIME_DEP_PKGS_$pkgname += $pkg
 #end for
 #end if
 #if $surplus_deps

Modified: csw/mgar/gar/v2/lib/python/checkpkg_test.py
===================================================================
--- csw/mgar/gar/v2/lib/python/checkpkg_test.py	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/gar/v2/lib/python/checkpkg_test.py	2010-02-03 18:36:29 UTC (rev 8335)
@@ -561,8 +561,8 @@
     expected = u"""# CSWfoo:
 # SUGGESTION: you may want to add some or all of the following as depends:
 #    (Feel free to ignore SUNW or SPRO packages)
-REQUIRED_PKGS_CSWfoo += *SUNWlxsl
-REQUIRED_PKGS_CSWfoo += SUNWgss
+RUNTIME_DEP_PKGS_CSWfoo += *SUNWlxsl
+RUNTIME_DEP_PKGS_CSWfoo += SUNWgss
 # The following dependencies might be unnecessary:
 # ? CSWlibxslt
 # ? CSWsudo

Modified: csw/mgar/gar/v2-git/gar.mk
===================================================================
--- csw/mgar/gar/v2-git/gar.mk	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/gar/v2-git/gar.mk	2010-02-03 18:36:29 UTC (rev 8335)
@@ -295,7 +295,7 @@
 	@echo "[===== NOW BUILDING: $(DISTNAME) MODULATION $(MODULATION): $(foreach M,$(MODULATORS),$M=$($M)) =====]"
 
 # prerequisite	- Make sure that the system is in a sane state for building the package
-PREREQUISITE_TARGETS = $(addprefix prerequisitepkg-,$(PREREQUISITE_BASE_PKGS) $(PREREQUISITE_PKGS)) $(addprefix prerequisite-,$(PREREQUISITE_SCRIPTS))
+PREREQUISITE_TARGETS = $(addprefix prerequisitepkg-,$(PREREQUISITE_BASE_PKGS) $(BUILD_DEP_PKGS)) $(addprefix prerequisite-,$(PREREQUISITE_SCRIPTS))
 
 # Force to be called in global modulation
 prerequisite: $(if $(filter global,$(MODULATION)),announce pre-everything $(COOKIEDIR) $(DOWNLOADDIR) $(PARTIALDIR) $(addprefix dep-$(GARDIR)/,$(FETCHDEPS)) pre-prerequisite $(PREREQUISITE_TARGETS) post-prerequisite)
@@ -619,7 +619,7 @@
 #   the binaries should be executed by isaexec. This is usually bin, sbin and libexec.
 #
 # default:        relocate to ISA subdirs if more than one ISA, use isaexec-wrapper for bin/, etc.
-# NO_ISAEXEC = 1: ISA_DEFAULT gets installed in bin/..., all others in bin/$ISA/
+# NOISAEXEC = 1: ISA_DEFAULT gets installed in bin/..., all others in bin/$ISA/
 #
 # Automatic merging is only possible if you have the default modulation "ISA"
 # Otherwise you *must* specify merge scripts for all modulations.
@@ -635,7 +635,7 @@
 MERGE_SCRIPTS_isa-$(ISA_DEFAULT) ?= $(MERGE_SCRIPTS_isa-default)
 MERGE_SCRIPTS_$(MODULATION) ?= $(MERGE_SCRIPTS_$(MODULATION_ISACOLLAPSED))
 else
-ISAEXEC_DIRS ?= $(if $(NO_ISAEXEC),,$(bindir) $(sbindir) $(libexecdir))
+ISAEXEC_DIRS ?= $(if $(NOISAEXEC),,$(bindir) $(sbindir) $(libexecdir))
 MERGE_DIRS_isa-default ?= $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-$(ISA_DEFAULT))
 MERGE_DIRS_isa-extra ?= $(bindir) $(sbindir) $(libexecdir) $(libdir) $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-$(ISA))
 MERGE_DIRS_$(MODULATION_ISACOLLAPSED64) ?= $(MERGE_DIRS_$(MODULATION_ISACOLLAPSEDEXTRA))

Modified: csw/mgar/gar/v2-git/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2-git/gar.pkg.mk	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/gar/v2-git/gar.pkg.mk	2010-02-03 18:36:29 UTC (rev 8335)
@@ -49,7 +49,7 @@
 GARSYSTEMVERSION ?= $(shell $(SVN) propget svn:externals $(CURDIR) | perl -ane 'if($$F[0] eq "gar") { print ($$F[1]=~m(https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/(.*))),"\n";}')
 GARPKG_v1 = CSWgar-v1
 GARPKG_v2 = CSWgar-v2
-REQUIRED_PKGS_$(SRCPACKAGE) ?= $(or $(GARPKG_$(GARSYSTEMVERSION)),$(error GAR version $(GARSYSTEMVERSION) unknown))
+RUNTIME_DEP_PKGS_$(SRCPACKAGE) ?= $(or $(GARPKG_$(GARSYSTEMVERSION)),$(error GAR version $(GARSYSTEMVERSION) unknown))
 
 _PKG_SPECS      = $(filter-out $(NOPACKAGE),$(SPKG_SPECS))
 
@@ -65,7 +65,7 @@
 GARSYSTEMVERSION ?= $(shell $(SVN) propget svn:externals $(CURDIR) | perl -ane 'if($$F[0] eq "gar") { print ($$F[1]=~m(https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/(.*))),"\n";}')
 GARPKG_v1 = CSWgar-v1
 GARPKG_v2 = CSWgar-v2
-REQUIRED_PKGS_$(SRCPACKAGE) ?= $(or $(GARPKG_$(GARSYSTEMVERSION)),$(error GAR version $(GARSYSTEMVERSION) unknown))
+RUNTIME_DEP_PKGS_$(SRCPACKAGE) ?= $(or $(GARPKG_$(GARSYSTEMVERSION)),$(error GAR version $(GARSYSTEMVERSION) unknown))
 
 _PKG_SPECS      = $(filter-out $(NOPACKAGE),$(SPKG_SPECS))
 
@@ -403,7 +403,7 @@
 
 # Dynamic depends are constructed as follows:
 # - Packages the currently constructed one depends on can be specified with
-#   REQUIRED_PKGS_<pkg> specifically, or REQUIRED_PKGS for all packages build.
+#   RUNTIME_DEP_PKGS_<pkg> specifically, or RUNTIME_DEP_PKGS for all packages build.
 #   These are flagged as 'P' in the depend file.
 # - If multiple packages are build at the same time it is valid to have
 #   dependencies between them. In this case it is necessary to define the package
@@ -425,11 +425,11 @@
 $(WORKDIR)/%.depend: _EXTRA_GAR_PKGS += $(if $(strip $(shell cat $(WORKDIR)/$*.prototype | perl -ane '$(foreach C,$(_CSWCLASSES),print "$C\n" if( $$F[1] eq "$C");)')),CSWcswclassutils)
 
 $(WORKDIR)/%.depend: $(WORKDIR)
-	$(_DBG)$(if $(_EXTRA_GAR_PKGS)$(REQUIRED_PKGS_$*)$(REQUIRED_PKGS)$(INCOMPATIBLE_PKGS)$(INCOMPATIBLE_PKGS_$*), \
+	$(_DBG)$(if $(_EXTRA_GAR_PKGS)$(RUNTIME_DEP_PKGS_$*)$(RUNTIME_DEP_PKGS)$(INCOMPATIBLE_PKGS)$(INCOMPATIBLE_PKGS_$*), \
 		($(foreach PKG,$(INCOMPATIBLE_PKGS_$*) $(INCOMPATIBLE_PKGS),\
 			echo "I $(PKG)";\
 		)\
-		$(foreach PKG,$(sort $(_EXTRA_GAR_PKGS)) $(REQUIRED_PKGS_$*) $(REQUIRED_PKGS),\
+		$(foreach PKG,$(sort $(_EXTRA_GAR_PKGS)) $(RUNTIME_DEP_PKGS_$*) $(RUNTIME_DEP_PKGS),\
 			$(if $(SPKG_DESC_$(PKG)), \
 				echo "P $(PKG) $(call catalogname,$(PKG)) - $(SPKG_DESC_$(PKG))";, \
 				echo "$(shell (/usr/bin/pkginfo $(PKG) || echo "P $(PKG) - ") | $(GAWK) '{ $$1 = "P"; print } ')"; \

Modified: csw/mgar/gar/v2-git/lib/python/checkpkg.py
===================================================================
--- csw/mgar/gar/v2-git/lib/python/checkpkg.py	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/gar/v2-git/lib/python/checkpkg.py	2010-02-03 18:36:29 UTC (rev 8335)
@@ -46,7 +46,7 @@
 # SUGGESTION: you may want to add some or all of the following as depends:
 #    (Feel free to ignore SUNW or SPRO packages)
 #for $pkg in $sorted($missing_deps)
-REQUIRED_PKGS_$pkgname += $pkg
+RUNTIME_DEP_PKGS_$pkgname += $pkg
 #end for
 #end if
 #if $surplus_deps

Modified: csw/mgar/gar/v2-git/lib/python/checkpkg_test.py
===================================================================
--- csw/mgar/gar/v2-git/lib/python/checkpkg_test.py	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/gar/v2-git/lib/python/checkpkg_test.py	2010-02-03 18:36:29 UTC (rev 8335)
@@ -561,8 +561,8 @@
     expected = u"""# CSWfoo:
 # SUGGESTION: you may want to add some or all of the following as depends:
 #    (Feel free to ignore SUNW or SPRO packages)
-REQUIRED_PKGS_CSWfoo += *SUNWlxsl
-REQUIRED_PKGS_CSWfoo += SUNWgss
+RUNTIME_DEP_PKGS_CSWfoo += *SUNWlxsl
+RUNTIME_DEP_PKGS_CSWfoo += SUNWgss
 # The following dependencies might be unnecessary:
 # ? CSWlibxslt
 # ? CSWsudo

Modified: csw/mgar/gar/v2-relocate/gar.mk
===================================================================
--- csw/mgar/gar/v2-relocate/gar.mk	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/gar/v2-relocate/gar.mk	2010-02-03 18:36:29 UTC (rev 8335)
@@ -231,7 +231,7 @@
 	@echo "[===== NOW BUILDING: $(DISTNAME) MODULATION $(MODULATION): $(foreach M,$(MODULATORS),$M=$($M)) =====]"
 
 # prerequisite	- Make sure that the system is in a sane state for building the package
-PREREQUISITE_TARGETS = $(addprefix prerequisitepkg-,$(PREREQUISITE_BASE_PKGS) $(PREREQUISITE_PKGS)) $(addprefix prerequisite-,$(PREREQUISITE_SCRIPTS))
+PREREQUISITE_TARGETS = $(addprefix prerequisitepkg-,$(PREREQUISITE_BASE_PKGS) $(BUILD_DEP_PKGS)) $(addprefix prerequisite-,$(PREREQUISITE_SCRIPTS))
 
 prerequisite: announce pre-everything $(COOKIEDIR) $(DOWNLOADDIR) $(PARTIALDIR) $(addprefix dep-$(GARDIR)/,$(FETCHDEPS)) pre-prerequisite $(PREREQUISITE_TARGETS) post-prerequisite
 	$(DONADA)
@@ -505,7 +505,7 @@
 #   the binaries should be executed by isaexec. This is usually bin, sbin and libexec.
 #
 # default:        relocate to ISA subdirs if more than one ISA, use isaexec-wrapper for bin/, etc.
-# NO_ISAEXEC = 1: ISA_DEFAULT gets installed in bin/..., all others in bin/$ISA/
+# NOISAEXEC = 1: ISA_DEFAULT gets installed in bin/..., all others in bin/$ISA/
 #
 # Automatic merging is only possible if you have the default modulation "ISA"
 # Otherwise you *must* specify merge scripts for all modulations.
@@ -519,7 +519,7 @@
 ifeq ($(NEEDED_ISAS),$(ISA_DEFAULT))
 MERGE_SCRIPTS_isa-$(ISA_DEFAULT) ?= copy-all $(EXTRA_MERGE_SCRIPTS_$(ISA_DEFAULT)) $(EXTRA_MERGE_SCRIPTS)
 else
-ISAEXEC_DIRS ?= $(if $(NO_ISAEXEC),,$(bindir) $(sbindir) $(libexecdir))
+ISAEXEC_DIRS ?= $(if $(NOISAEXEC),,$(bindir) $(sbindir) $(libexecdir))
 MERGE_DIRS_isa-$(ISA_DEFAULT) ?=
 MERGE_DIRS_isa-$(ISA) ?= $(bindir) $(sbindir) $(libexecdir) $(libdir) $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-$(ISA))
 MERGE_SCRIPTS_isa-$(ISA_DEFAULT) ?= copy-relocate $(EXTRA_MERGE_SCRIPTS_isa-$(ISA)) $(EXTRA_MERGE_SCRIPTS)

Modified: csw/mgar/gar/v2-relocate/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2-relocate/gar.pkg.mk	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/gar/v2-relocate/gar.pkg.mk	2010-02-03 18:36:29 UTC (rev 8335)
@@ -49,7 +49,7 @@
 GARSYSTEMVERSION ?= $(shell $(SVN) propget svn:externals $(CURDIR) | perl -ane 'if($$F[0] eq "gar") { print ($$F[1]=~m(https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/(.*))),"\n";}')
 GARPKG_v1 = CSWgar-v1
 GARPKG_v2 = CSWgar-v2
-REQUIRED_PKGS_$(SRCPACKAGE) ?= $(or $(GARPKG_$(GARSYSTEMVERSION)),$(error GAR version $(GARSYSTEMVERSION) unknown))
+RUNTIME_DEP_PKGS_$(SRCPACKAGE) ?= $(or $(GARPKG_$(GARSYSTEMVERSION)),$(error GAR version $(GARSYSTEMVERSION) unknown))
 
 _PKG_SPECS      = $(filter-out $(NOPACKAGE),$(SPKG_SPECS))
 
@@ -65,7 +65,7 @@
 GARSYSTEMVERSION ?= $(shell $(SVN) propget svn:externals $(CURDIR) | perl -ane 'if($$F[0] eq "gar") { print ($$F[1]=~m(https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/(.*))),"\n";}')
 GARPKG_v1 = CSWgar-v1
 GARPKG_v2 = CSWgar-v2
-REQUIRED_PKGS_$(SRCPACKAGE) ?= $(or $(GARPKG_$(GARSYSTEMVERSION)),$(error GAR version $(GARSYSTEMVERSION) unknown))
+RUNTIME_DEP_PKGS_$(SRCPACKAGE) ?= $(or $(GARPKG_$(GARSYSTEMVERSION)),$(error GAR version $(GARSYSTEMVERSION) unknown))
 
 _PKG_SPECS      = $(filter-out $(NOPACKAGE),$(SPKG_SPECS))
 
@@ -341,7 +341,7 @@
 
 # Dynamic depends are constructed as follows:
 # - Packages the currently constructed one depends on can be specified with
-#   REQUIRED_PKGS_<pkg> specifically, or REQUIRED_PKGS for all packages build.
+#   RUNTIME_DEP_PKGS_<pkg> specifically, or RUNTIME_DEP_PKGS for all packages build.
 #   These are flagged as 'P' in the depend file.
 # - If multiple packages are build at the same time it is valid to have
 #   dependencies between them. In this case it is necessary to define the package
@@ -356,11 +356,11 @@
 # $_EXTRA_GAR_PKGS is for dynamic dependencies added by GAR itself (like CSWisaexec or CSWcswclassutils)
 .PRECIOUS: $(WORKDIR)/%.depend
 $(WORKDIR)/%.depend: $(WORKDIR)
-	$(_DBG)$(if $(_EXTRA_GAR_PKGS)$(REQUIRED_PKGS_$*)$(REQUIRED_PKGS)$(INCOMPATIBLE_PKGS)$(INCOMPATIBLE_PKGS_$*), \
+	$(_DBG)$(if $(_EXTRA_GAR_PKGS)$(RUNTIME_DEP_PKGS_$*)$(RUNTIME_DEP_PKGS)$(INCOMPATIBLE_PKGS)$(INCOMPATIBLE_PKGS_$*), \
 		($(foreach PKG,$(INCOMPATIBLE_PKGS_$*) $(INCOMPATIBLE_PKGS),\
 			echo "I $(PKG)";\
 		)\
-		$(foreach PKG,$(sort $(_EXTRA_GAR_PKGS)) $(REQUIRED_PKGS_$*) $(REQUIRED_PKGS),\
+		$(foreach PKG,$(sort $(_EXTRA_GAR_PKGS)) $(RUNTIME_DEP_PKGS_$*) $(RUNTIME_DEP_PKGS),\
 			$(if $(SPKG_DESC_$(PKG)), \
 				echo "P $(PKG) $(call catalogname,$(PKG)) - $(SPKG_DESC_$(PKG))";, \
 				echo "$(shell (/usr/bin/pkginfo $(PKG) || echo "P $(PKG) - ") | awk '{ $$1 = "P"; print } ')"; \

Modified: csw/mgar/gar/v2-skayser/gar.mk
===================================================================
--- csw/mgar/gar/v2-skayser/gar.mk	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/gar/v2-skayser/gar.mk	2010-02-03 18:36:29 UTC (rev 8335)
@@ -231,7 +231,7 @@
 	@echo "[===== NOW BUILDING: $(DISTNAME) MODULATION $(MODULATION): $(foreach M,$(MODULATORS),$M=$($M)) =====]"
 
 # prerequisite	- Make sure that the system is in a sane state for building the package
-PREREQUISITE_TARGETS = $(addprefix prerequisitepkg-,$(PREREQUISITE_BASE_PKGS) $(PREREQUISITE_PKGS)) $(addprefix prerequisite-,$(PREREQUISITE_SCRIPTS))
+PREREQUISITE_TARGETS = $(addprefix prerequisitepkg-,$(PREREQUISITE_BASE_PKGS) $(BUILD_DEP_PKGS)) $(addprefix prerequisite-,$(PREREQUISITE_SCRIPTS))
 
 prerequisite: announce pre-everything $(COOKIEDIR) $(DOWNLOADDIR) $(PARTIALDIR) $(addprefix dep-$(GARDIR)/,$(FETCHDEPS)) pre-prerequisite $(PREREQUISITE_TARGETS) post-prerequisite
 	$(DONADA)
@@ -507,7 +507,7 @@
 #   the binaries should be executed by isaexec. This is usually bin, sbin and libexec.
 #
 # default:        relocate to ISA subdirs if more than one ISA, use isaexec-wrapper for bin/, etc.
-# NO_ISAEXEC = 1: ISA_DEFAULT gets installed in bin/..., all others in bin/$ISA/
+# NOISAEXEC = 1: ISA_DEFAULT gets installed in bin/..., all others in bin/$ISA/
 #
 # Automatic merging is only possible if you have the default modulation "ISA"
 # Otherwise you *must* specify merge scripts for all modulations.
@@ -521,7 +521,7 @@
 ifeq ($(NEEDED_ISAS),$(ISA_DEFAULT))
 MERGE_SCRIPTS_isa-$(ISA_DEFAULT) ?= copy-all $(EXTRA_MERGE_SCRIPTS_$(ISA_DEFAULT)) $(EXTRA_MERGE_SCRIPTS)
 else
-ISAEXEC_DIRS ?= $(if $(NO_ISAEXEC),,$(bindir) $(sbindir) $(libexecdir))
+ISAEXEC_DIRS ?= $(if $(NOISAEXEC),,$(bindir) $(sbindir) $(libexecdir))
 MERGE_DIRS_isa-$(ISA_DEFAULT) ?= $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-$(ISA_DEFAULT))
 MERGE_DIRS_isa-$(ISA) ?= $(bindir) $(sbindir) $(libexecdir) $(libdir) $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-$(ISA))
 MERGE_SCRIPTS_isa-$(ISA_DEFAULT) ?= copy-relocate $(EXTRA_MERGE_SCRIPTS_isa-$(ISA_DEFAULT)) $(EXTRA_MERGE_SCRIPTS)

Modified: csw/mgar/gar/v2-skayser/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2-skayser/gar.pkg.mk	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/gar/v2-skayser/gar.pkg.mk	2010-02-03 18:36:29 UTC (rev 8335)
@@ -49,7 +49,7 @@
 GARSYSTEMVERSION ?= $(shell $(SVN) propget svn:externals $(CURDIR) | perl -ane 'if($$F[0] eq "gar") { print ($$F[1]=~m(https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/(.*))),"\n";}')
 GARPKG_v1 = CSWgar-v1
 GARPKG_v2 = CSWgar-v2
-REQUIRED_PKGS_$(SRCPACKAGE) ?= $(or $(GARPKG_$(GARSYSTEMVERSION)),$(error GAR version $(GARSYSTEMVERSION) unknown))
+RUNTIME_DEP_PKGS_$(SRCPACKAGE) ?= $(or $(GARPKG_$(GARSYSTEMVERSION)),$(error GAR version $(GARSYSTEMVERSION) unknown))
 
 _PKG_SPECS      = $(filter-out $(NOPACKAGE),$(SPKG_SPECS))
 
@@ -65,7 +65,7 @@
 GARSYSTEMVERSION ?= $(shell $(SVN) propget svn:externals $(CURDIR) | perl -ane 'if($$F[0] eq "gar") { print ($$F[1]=~m(https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/(.*))),"\n";}')
 GARPKG_v1 = CSWgar-v1
 GARPKG_v2 = CSWgar-v2
-REQUIRED_PKGS_$(SRCPACKAGE) ?= $(or $(GARPKG_$(GARSYSTEMVERSION)),$(error GAR version $(GARSYSTEMVERSION) unknown))
+RUNTIME_DEP_PKGS_$(SRCPACKAGE) ?= $(or $(GARPKG_$(GARSYSTEMVERSION)),$(error GAR version $(GARSYSTEMVERSION) unknown))
 
 _PKG_SPECS      = $(filter-out $(NOPACKAGE),$(SPKG_SPECS))
 
@@ -340,7 +340,7 @@
 
 # Dynamic depends are constructed as follows:
 # - Packages the currently constructed one depends on can be specified with
-#   REQUIRED_PKGS_<pkg> specifically, or REQUIRED_PKGS for all packages build.
+#   RUNTIME_DEP_PKGS_<pkg> specifically, or RUNTIME_DEP_PKGS for all packages build.
 #   These are flagged as 'P' in the depend file.
 # - If multiple packages are build at the same time it is valid to have
 #   dependencies between them. In this case it is necessary to define the package
@@ -355,11 +355,11 @@
 # $_EXTRA_GAR_PKGS is for dynamic dependencies added by GAR itself (like CSWisaexec or CSWcswclassutils)
 .PRECIOUS: $(WORKDIR)/%.depend
 $(WORKDIR)/%.depend: $(WORKDIR)
-	$(_DBG)$(if $(_EXTRA_GAR_PKGS)$(REQUIRED_PKGS_$*)$(REQUIRED_PKGS)$(INCOMPATIBLE_PKGS)$(INCOMPATIBLE_PKGS_$*), \
+	$(_DBG)$(if $(_EXTRA_GAR_PKGS)$(RUNTIME_DEP_PKGS_$*)$(RUNTIME_DEP_PKGS)$(INCOMPATIBLE_PKGS)$(INCOMPATIBLE_PKGS_$*), \
 		($(foreach PKG,$(INCOMPATIBLE_PKGS_$*) $(INCOMPATIBLE_PKGS),\
 			echo "I $(PKG)";\
 		)\
-		$(foreach PKG,$(sort $(_EXTRA_GAR_PKGS)) $(REQUIRED_PKGS_$*) $(REQUIRED_PKGS),\
+		$(foreach PKG,$(sort $(_EXTRA_GAR_PKGS)) $(RUNTIME_DEP_PKGS_$*) $(RUNTIME_DEP_PKGS),\
 			$(if $(SPKG_DESC_$(PKG)), \
 				echo "P $(PKG) $(call catalogname,$(PKG)) - $(SPKG_DESC_$(PKG))";, \
 				echo "$(shell (/usr/bin/pkginfo $(PKG) || echo "P $(PKG) - ") | awk '{ $$1 = "P"; print } ')"; \

Modified: csw/mgar/pkg/GeoIP/trunk/Makefile
===================================================================
--- csw/mgar/pkg/GeoIP/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/GeoIP/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -11,8 +11,8 @@
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
 
 PACKAGES = CSWgeoip CSWgeoipdevel
-REQUIRED_PKGS_CSWgeoip = CSWgeolitedb CSWzlib CSWgcc3corert
-REQUIRED_PKGS_CSWgeoipdevel = CSWgeoip
+RUNTIME_DEP_PKGS_CSWgeoip = CSWgeolitedb CSWzlib CSWgcc3corert
+RUNTIME_DEP_PKGS_CSWgeoipdevel = CSWgeoip
 CATALOGNAME_CSWgeoip = geoip
 CATALOGNAME_CSWgeoipdevel = geoip_devel
 SPKG_DESC_CSWgeoip = $(DESCRIPTION)

Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ImageMagick/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/ImageMagick/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -20,12 +20,12 @@
 
 LICENSE = LICENSE
 
-REQUIRED_PKGS += CSWbzip2 CSWdjvulibrert CSWfconfig CSWftype2 CSWggettextrt
-REQUIRED_PKGS += CSWglib2 CSWgs CSWgtk2 CSWilmbase CSWjasper CSWjbigkit
-REQUIRED_PKGS += CSWjpeg CSWlcms CSWlibcairo CSWlibfpx CSWlibrsvg CSWlibxml2
-REQUIRED_PKGS += CSWopenexr CSWperl CSWpng CSWsunmath CSWtiff CSWwmf CSWzlib
-REQUIRED_PKGS += CSWlibtoolrt CSWlibice CSWlibsm CSWlibxext CSWgraphviz
-REQUIRED_PKGS += CSWlibx11 CSWlibxt
+RUNTIME_DEP_PKGS += CSWbzip2 CSWdjvulibrert CSWfconfig CSWftype2 CSWggettextrt
+RUNTIME_DEP_PKGS += CSWglib2 CSWgs CSWgtk2 CSWilmbase CSWjasper CSWjbigkit
+RUNTIME_DEP_PKGS += CSWjpeg CSWlcms CSWlibcairo CSWlibfpx CSWlibrsvg CSWlibxml2
+RUNTIME_DEP_PKGS += CSWopenexr CSWperl CSWpng CSWsunmath CSWtiff CSWwmf CSWzlib
+RUNTIME_DEP_PKGS += CSWlibtoolrt CSWlibice CSWlibsm CSWlibxext CSWgraphviz
+RUNTIME_DEP_PKGS += CSWlibx11 CSWlibxt
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = ImageMagick-((\d+(?:\.\d+)*)-(\d+)?).tar.bz2

Modified: csw/mgar/pkg/MailScanner/trunk/Makefile
===================================================================
--- csw/mgar/pkg/MailScanner/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/MailScanner/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -19,7 +19,7 @@
 PACKAGES = CSWmailscanner
 CATALOGNAME = mailscanner
 
-#REQUIRED_PKGS = 
+#RUNTIME_DEP_PKGS = 
 
 #ARCHALL = 1
 

Modified: csw/mgar/pkg/Vispan/trunk/Makefile
===================================================================
--- csw/mgar/pkg/Vispan/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/Vispan/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -15,7 +15,7 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
-REQUIRED_PKGS = CSWpmgeoippureperl CSWpmnetcidr CSWpmnetdns CSWpmgd CSWpmgdgraph CSWpmnumberformat CSWpmmailsendmail
+RUNTIME_DEP_PKGS = CSWpmgeoippureperl CSWpmnetcidr CSWpmnetdns CSWpmgd CSWpmgdgraph CSWpmnumberformat CSWpmmailsendmail
 
 CONFIGURE_ARGS = $(DIRPATHS)
 

Modified: csw/mgar/pkg/ZSI/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ZSI/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/ZSI/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -27,6 +27,6 @@
 CATALOGNAME = py_zsi
 ARCHALL = 1
 
-REQUIRED_PKGS = CSWpyxml
+RUNTIME_DEP_PKGS = CSWpyxml
 
 include gar/category.mk

Modified: csw/mgar/pkg/aide/trunk/Makefile
===================================================================
--- csw/mgar/pkg/aide/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/aide/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -24,8 +24,8 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
-REQUIRED_PKGS = CSWcurlrt CSWgcrypt CSWgpgerr CSWlibidn CSWlibmhash CSWlibpq
-REQUIRED_PKGS += CSWoldaprt CSWosslrt CSWzlib
+RUNTIME_DEP_PKGS = CSWcurlrt CSWgcrypt CSWgpgerr CSWlibidn CSWlibmhash CSWlibpq
+RUNTIME_DEP_PKGS += CSWoldaprt CSWosslrt CSWzlib
 
 sysconfdir = /etc/opt/csw/aide
 PRESERVECONF = $(sysconfdir)/aide.conf

Modified: csw/mgar/pkg/alpine/trunk/Makefile
===================================================================
--- csw/mgar/pkg/alpine/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/alpine/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -58,8 +58,8 @@
 
 TEST_TARGET = check
 
-REQUIRED_PKGS  = CSWggettextrt CSWiconv CSWtcl CSWsasl CSWosslrt
-REQUIRED_PKGS += CSWkrb5lib CSWlibnet CSWncurses CSWoldaprt
+RUNTIME_DEP_PKGS  = CSWggettextrt CSWiconv CSWtcl CSWsasl CSWosslrt
+RUNTIME_DEP_PKGS += CSWkrb5lib CSWlibnet CSWncurses CSWoldaprt
 
 include files/install_scripts.mk
 include gar/category.mk

Modified: csw/mgar/pkg/amavisd-new/trunk/Makefile
===================================================================
--- csw/mgar/pkg/amavisd-new/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/amavisd-new/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -20,22 +20,22 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
-REQUIRED_PKGS += CSWbdb47
-REQUIRED_PKGS += CSWperl
-REQUIRED_PKGS += CSWcswclassutils
-REQUIRED_PKGS += CSWpmiostringy
-REQUIRED_PKGS += CSWpmnetserver
-REQUIRED_PKGS += CSWpmmailtools
-REQUIRED_PKGS += CSWpmmimetools
-REQUIRED_PKGS += CSWiocompress
-REQUIRED_PKGS += CSWpmarchivetar
-REQUIRED_PKGS += CSWpmarchivezip
-REQUIRED_PKGS += CSWspamassassin
-REQUIRED_PKGS += CSWpmberkeleydb
-REQUIRED_PKGS += CSWpmconverttnef
-REQUIRED_PKGS += CSWpmconvertuulib
-REQUIRED_PKGS += CSWpmmaildkim
-REQUIRED_PKGS += CSWpmunixsyslog
+RUNTIME_DEP_PKGS += CSWbdb47
+RUNTIME_DEP_PKGS += CSWperl
+RUNTIME_DEP_PKGS += CSWcswclassutils
+RUNTIME_DEP_PKGS += CSWpmiostringy
+RUNTIME_DEP_PKGS += CSWpmnetserver
+RUNTIME_DEP_PKGS += CSWpmmailtools
+RUNTIME_DEP_PKGS += CSWpmmimetools
+RUNTIME_DEP_PKGS += CSWiocompress
+RUNTIME_DEP_PKGS += CSWpmarchivetar
+RUNTIME_DEP_PKGS += CSWpmarchivezip
+RUNTIME_DEP_PKGS += CSWspamassassin
+RUNTIME_DEP_PKGS += CSWpmberkeleydb
+RUNTIME_DEP_PKGS += CSWpmconverttnef
+RUNTIME_DEP_PKGS += CSWpmconvertuulib
+RUNTIME_DEP_PKGS += CSWpmmaildkim
+RUNTIME_DEP_PKGS += CSWpmunixsyslog
 
 PATCHFILES += amavisd-agent.diff
 PATCHFILES += amavisd-nanny.diff

Modified: csw/mgar/pkg/apache2/tags/apache-2.2.13-by-idogan/Makefile
===================================================================
--- csw/mgar/pkg/apache2/tags/apache-2.2.13-by-idogan/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/apache2/tags/apache-2.2.13-by-idogan/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -40,19 +40,19 @@
 DISTFILES += httpd-ssl.conf.CSW
 DISTFILES += update20to22
 
-REQUIRED_PKGS_CSWapache2 = CSWapache2c CSWap2prefork
-REQUIRED_PKGS_CSWapache2c = CSWapache2rt CSWbdb CSWexpat CSWgdbm CSWiconv
-REQUIRED_PKGS_CSWapache2c += CSWlibnet CSWoldaprt CSWosslrt CSWsasl CSWzlib
-REQUIRED_PKGS_CSWapache2c += CSWsqlite3 CSWcswclassutils
-REQUIRED_PKGS_CSWapache2rt = CSWbdb CSWexpat CSWgdbm CSWggettextrt CSWgsed
-REQUIRED_PKGS_CSWapache2rt += CSWiconv CSWoldaprt CSWosslrt CSWperl CSWsasl
-REQUIRED_PKGS_CSWapache2rt += CSWzlib CSWsqlite3 CSWlibnet CSWsqlite3rt
-REQUIRED_PKGS_CSWap2prefork = CSWapache2c CSWapache2rt CSWbdb CSWexpat CSWgdbm
-REQUIRED_PKGS_CSWap2prefork += CSWiconv CSWlibnet CSWoldaprt CSWosslrt CSWsasl
-REQUIRED_PKGS_CSWap2prefork += CSWzlib CSWsqlite3
-REQUIRED_PKGS_CSWap2suexec = CSWapache2
-REQUIRED_PKGS_CSWapache2-devel = CSWapache2rt
-REQUIRED_PKGS_CSWapache2-manual = CSWapache2
+RUNTIME_DEP_PKGS_CSWapache2 = CSWapache2c CSWap2prefork
+RUNTIME_DEP_PKGS_CSWapache2c = CSWapache2rt CSWbdb CSWexpat CSWgdbm CSWiconv
+RUNTIME_DEP_PKGS_CSWapache2c += CSWlibnet CSWoldaprt CSWosslrt CSWsasl CSWzlib
+RUNTIME_DEP_PKGS_CSWapache2c += CSWsqlite3 CSWcswclassutils
+RUNTIME_DEP_PKGS_CSWapache2rt = CSWbdb CSWexpat CSWgdbm CSWggettextrt CSWgsed
+RUNTIME_DEP_PKGS_CSWapache2rt += CSWiconv CSWoldaprt CSWosslrt CSWperl CSWsasl
+RUNTIME_DEP_PKGS_CSWapache2rt += CSWzlib CSWsqlite3 CSWlibnet CSWsqlite3rt
+RUNTIME_DEP_PKGS_CSWap2prefork = CSWapache2c CSWapache2rt CSWbdb CSWexpat CSWgdbm
+RUNTIME_DEP_PKGS_CSWap2prefork += CSWiconv CSWlibnet CSWoldaprt CSWosslrt CSWsasl
+RUNTIME_DEP_PKGS_CSWap2prefork += CSWzlib CSWsqlite3
+RUNTIME_DEP_PKGS_CSWap2suexec = CSWapache2
+RUNTIME_DEP_PKGS_CSWapache2-devel = CSWapache2rt
+RUNTIME_DEP_PKGS_CSWapache2-manual = CSWapache2
 
 SPKG_CLASSES_CSWapache2c = none cswinitsmf
 

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -36,11 +36,11 @@
 DISTFILES += httpd-ssl.conf.CSW
 DISTFILES += update20to22
 
-REQUIRED_PKGS_CSWapache2        = CSWbdb CSWexpat CSWgdbm CSWiconv
-REQUIRED_PKGS_CSWapache2       += CSWlibnet CSWoldaprt CSWosslrt CSWsasl CSWzlib
-REQUIRED_PKGS_CSWapache2       += CSWsqlite3rt CSWsqlite3 CSWcswclassutils
-REQUIRED_PKGS_CSWapache2       += CSWggettextrt CSWgsed
-REQUIRED_PKGS_CSWapache2       += CSWperl
+RUNTIME_DEP_PKGS_CSWapache2        = CSWbdb CSWexpat CSWgdbm CSWiconv
+RUNTIME_DEP_PKGS_CSWapache2       += CSWlibnet CSWoldaprt CSWosslrt CSWsasl CSWzlib
+RUNTIME_DEP_PKGS_CSWapache2       += CSWsqlite3rt CSWsqlite3 CSWcswclassutils
+RUNTIME_DEP_PKGS_CSWapache2       += CSWggettextrt CSWgsed
+RUNTIME_DEP_PKGS_CSWapache2       += CSWperl
 
 # The SMF support: you don't need to specify cswinitsmf any more.  You need to
 # make sure the the /etc/opt/csw/init.d/cswapache file gets installed during

Modified: csw/mgar/pkg/apcupsd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apcupsd/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/apcupsd/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -18,7 +18,7 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
-REQUIRED_PKGS = CSWcswclassutils
+RUNTIME_DEP_PKGS = CSWcswclassutils
 
 SPKG_CLASSES = none cswcpsampleconf cswinitsmf
 PROTOTYPE_FILTER = awk '$$$$3 ~ /\/init.d\/cswapcupsd$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/apcupsd\/apcupsd.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } { print }' | grep -v \/etc\/rc

Modified: csw/mgar/pkg/asciidoc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/asciidoc/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/asciidoc/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -18,7 +18,7 @@
 
 ARCHALL_CSWasciidoc = 1
 
-REQUIRED_PKGS_CSWasciidoc = CSWpython CSWgnulinks CSWggetopt
+RUNTIME_DEP_PKGS_CSWasciidoc = CSWpython CSWgnulinks CSWggetopt
 
 MASTER_SITES = $(SF_MIRRORS)
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz

Modified: csw/mgar/pkg/autoconf/tags/autoconf-2.64,REV=2009.07.29/Makefile
===================================================================
--- csw/mgar/pkg/autoconf/tags/autoconf-2.64,REV=2009.07.29/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/autoconf/tags/autoconf-2.64,REV=2009.07.29/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -17,8 +17,8 @@
 
 PATCHFILES = use-csw-tools.patch
 
-PREREQUISITE_PKGS = CSWhelp2man
-REQUIRED_PKGS = CSWgawk CSWgm4 CSWperl
+BUILD_DEP_PKGS = CSWhelp2man
+RUNTIME_DEP_PKGS = CSWgawk CSWgm4 CSWperl
 
 CONFIGURE_ARGS = $(DIRPATHS)
 

Modified: csw/mgar/pkg/autoconf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/autoconf/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/autoconf/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -17,8 +17,8 @@
 
 PATCHFILES = 0001-Prefer-CSW-tools.patch
 
-PREREQUISITE_PKGS = CSWhelp2man
-REQUIRED_PKGS = CSWgawk CSWgm4 CSWperl
+BUILD_DEP_PKGS = CSWhelp2man
+RUNTIME_DEP_PKGS = CSWgawk CSWgm4 CSWperl
 
 CONFIGURE_ARGS = $(DIRPATHS)
 

Modified: csw/mgar/pkg/automake/trunk/Makefile
===================================================================
--- csw/mgar/pkg/automake/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/automake/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -25,7 +25,7 @@
 NOCHECKSUM = README.CSW
 NOEXTRACT = $(filter-out $(GARNAME)-$(GARVERSION).tar.gz, $(SOURCEFILES))
 
-REQUIRED_PKGS = CSWperl
+RUNTIME_DEP_PKGS = CSWperl
 
 CONFIGURE_ARGS = $(DIRPATHS)
 

Modified: csw/mgar/pkg/autoproject/trunk/Makefile
===================================================================
--- csw/mgar/pkg/autoproject/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/autoproject/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -25,7 +25,7 @@
 PATCHFILES = 0001-gawk-and-ggrep.patch
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 ARCHALL = 1
-REQUIRED_PKGS = CSWautomake CSWbash CSWgawk CSWggrep
+RUNTIME_DEP_PKGS = CSWautomake CSWbash CSWgawk CSWggrep
 TEST_SCRIPTS =
 CONFIGURE_ARGS = $(DIRPATHS)
 AWK=gawk

Modified: csw/mgar/pkg/awstats/trunk/Makefile
===================================================================
--- csw/mgar/pkg/awstats/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/awstats/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -29,7 +29,7 @@
 
 SPKG_SOURCEURL = http://awstats.sourceforge.net
 
-REQUIRED_PKGS = CSWapache2 CSWperl
+RUNTIME_DEP_PKGS = CSWapache2 CSWperl
 
 LICENSE = docs/LICENSE.TXT
 

Modified: csw/mgar/pkg/bash/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bash/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/bash/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -26,8 +26,8 @@
 
 PACKAGES = CSWbash
 
-REQUIRED_PKGS = CSWggettextrt
-REQUIRED_PKGS += CSWiconv
+RUNTIME_DEP_PKGS = CSWggettextrt
+RUNTIME_DEP_PKGS += CSWiconv
 
 SPKG_SOURCEURL = http://tiswww.case.edu/php/chet/bash/bashtop.html
 

Modified: csw/mgar/pkg/bashdb/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bashdb/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/bashdb/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -26,7 +26,7 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
 
-REQUIRED_PKGS = CSWbash
+RUNTIME_DEP_PKGS = CSWbash
 
 CONFIGURE_ARGS = $(DIRPATHS)
 

Modified: csw/mgar/pkg/bazaar/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bazaar/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/bazaar/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -17,7 +17,7 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)$(PATHREV)-(\d+(?:\.\d+)*).tar.gz
 
-REQUIRED_PKGS += CSWcswclassutils
+RUNTIME_DEP_PKGS += CSWcswclassutils
 
 CONFIGURE_SCRIPTS =
 BUILD_SCRIPTS = $(WORKSRC)/setup.py

Modified: csw/mgar/pkg/bdb/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bdb/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/bdb/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -16,7 +16,7 @@
 PACKAGES = CSWbdb
 CATALOGNAME = berkeleydb
 
-REQUIRED_PKGS = CSWbdb47
+RUNTIME_DEP_PKGS = CSWbdb47
 
 CONFIGURE_SCRIPTS =
 BUILD_SCRIPTS =

Modified: csw/mgar/pkg/bdb3/tags/bdb-consolidation-4.4.20,REV=2009.07.28/Makefile
===================================================================
--- csw/mgar/pkg/bdb3/tags/bdb-consolidation-4.4.20,REV=2009.07.28/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/bdb3/tags/bdb-consolidation-4.4.20,REV=2009.07.28/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -25,7 +25,7 @@
 PACKAGES = CSWbdb44 
 SPKG_DESC = BerkeleyDB 4.4 embedded database libraries and utilities
 CATALOGNAME = berkeleydb44
-REQUIRED_PKGS = CSWbdb
+RUNTIME_DEP_PKGS = CSWbdb
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/bdb3/tags/bdb-consolidation-4.4.20,REV=2009.07.28/legacy/Makefile
===================================================================
--- csw/mgar/pkg/bdb3/tags/bdb-consolidation-4.4.20,REV=2009.07.28/legacy/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/bdb3/tags/bdb-consolidation-4.4.20,REV=2009.07.28/legacy/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -55,7 +55,7 @@
 # bdb tests are *very* time consuming
 TEST_SCRIPTS =
 
-NO_ISAEXEC = 1
+NOISAEXEC = 1
 
 PACKAGES = CSWbdb44 CSWbdb44-devel CSWbdb44-doc
 
@@ -69,7 +69,7 @@
 SPKG_DESC_CSWbdb44-devel = BerkeleyDB 4.4 development support
 SPKG_DESC_CSWbdb44-doc   = BerkeleyDB 4.4 documentation
 
-REQUIRED_PKGS_CSWbdb44-devel = CSWbdb44
+RUNTIME_DEP_PKGS_CSWbdb44-devel = CSWbdb44
 INCOMPATIBLE_PKGS_CSWbdb44-doc = CSWbdb44doc
 
 LICENSE = LICENSE

Modified: csw/mgar/pkg/bdb3/tags/bdb3-stub-to-bdb33-UNRELEASED/Makefile
===================================================================
--- csw/mgar/pkg/bdb3/tags/bdb3-stub-to-bdb33-UNRELEASED/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/bdb3/tags/bdb3-stub-to-bdb33-UNRELEASED/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -17,7 +17,7 @@
 CATALOGNAME = berkeleydb3
 
 ARCHALL = 1
-REQUIRED_PKGS = CSWbdb33
+RUNTIME_DEP_PKGS = CSWbdb33
 
 CONFIGURE_SCRIPTS =
 BUILD_SCRIPTS =

Modified: csw/mgar/pkg/bdb3/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bdb3/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/bdb3/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -27,7 +27,7 @@
 RELEASE = p$(words $(filter patch.$(GARVERSION).%,$(PATCHFILES)))
 
 #BUILD64 = 1
-NO_ISAEXEC = 1
+NOISAEXEC = 1
 
 CONFIGURE_SCRIPTS = dist
 
@@ -64,7 +64,7 @@
 
 SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html
 
-REQUIRED_PKGS_CSWbdb3devel = CSWbdb3
+RUNTIME_DEP_PKGS_CSWbdb3devel = CSWbdb3
 
 LICENSE = LICENSE
 

Modified: csw/mgar/pkg/bdb4/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bdb4/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/bdb4/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -17,7 +17,7 @@
 CATALOGNAME = berkeleydb4
 
 ARCHALL = 1
-REQUIRED_PKGS = CSWbdb42
+RUNTIME_DEP_PKGS = CSWbdb42
 
 CONFIGURE_SCRIPTS =
 BUILD_SCRIPTS =

Modified: csw/mgar/pkg/bdb42/tags/bdb-consolidation-4.4.20,REV=2009.07.28/Makefile
===================================================================
--- csw/mgar/pkg/bdb42/tags/bdb-consolidation-4.4.20,REV=2009.07.28/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/bdb42/tags/bdb-consolidation-4.4.20,REV=2009.07.28/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -25,7 +25,7 @@
 PACKAGES = CSWbdb44 
 SPKG_DESC = BerkeleyDB 4.4 embedded database libraries and utilities
 CATALOGNAME = berkeleydb44
-REQUIRED_PKGS = CSWbdb
+RUNTIME_DEP_PKGS = CSWbdb
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/bdb42/tags/bdb-consolidation-4.4.20,REV=2009.07.28/legacy/Makefile
===================================================================
--- csw/mgar/pkg/bdb42/tags/bdb-consolidation-4.4.20,REV=2009.07.28/legacy/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/bdb42/tags/bdb-consolidation-4.4.20,REV=2009.07.28/legacy/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -55,7 +55,7 @@
 # bdb tests are *very* time consuming
 TEST_SCRIPTS =
 
-NO_ISAEXEC = 1
+NOISAEXEC = 1
 
 PACKAGES = CSWbdb44 CSWbdb44-devel CSWbdb44-doc
 
@@ -69,7 +69,7 @@
 SPKG_DESC_CSWbdb44-devel = BerkeleyDB 4.4 development support
 SPKG_DESC_CSWbdb44-doc   = BerkeleyDB 4.4 documentation
 
-REQUIRED_PKGS_CSWbdb44-devel = CSWbdb44
+RUNTIME_DEP_PKGS_CSWbdb44-devel = CSWbdb44
 INCOMPATIBLE_PKGS_CSWbdb44-doc = CSWbdb44doc
 
 LICENSE = LICENSE

Modified: csw/mgar/pkg/bdb42/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bdb42/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/bdb42/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -27,7 +27,7 @@
 RELEASE = p$(words $(filter patch.$(GARVERSION).%,$(PATCHFILES)))
 
 BUILD64 = 1
-NO_ISAEXEC = 1
+NOISAEXEC = 1
 
 CONFIGURE_SCRIPTS = dist
 
@@ -64,7 +64,7 @@
 
 SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html
 
-REQUIRED_PKGS_CSWbdb42devel = CSWbdb42
+RUNTIME_DEP_PKGS_CSWbdb42devel = CSWbdb42
 
 LICENSE = LICENSE
 

Modified: csw/mgar/pkg/bdb43/tags/bdb-consolidation-4.3.29,REV=2009.06.26/Makefile
===================================================================
--- csw/mgar/pkg/bdb43/tags/bdb-consolidation-4.3.29,REV=2009.06.26/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/bdb43/tags/bdb-consolidation-4.3.29,REV=2009.06.26/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -25,7 +25,7 @@
 PACKAGES = CSWbdb43
 SPKG_DESC = BerkeleyDB 4.3 libraries and utilities
 CATALOGNAME = berkeleydb43
-REQUIRED_PKGS = CSWbdb
+RUNTIME_DEP_PKGS = CSWbdb
 
 include gar/category.mk
 install-custom:

Modified: csw/mgar/pkg/bdb43/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bdb43/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/bdb43/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -27,7 +27,7 @@
 WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/build_unix
 
 BUILD64 = 1
-NO_ISAEXEC = 1
+NOISAEXEC = 1
 
 CONFIGURE_SCRIPTS = dist
 
@@ -64,7 +64,7 @@
 
 SPKG_SOURCEURL = http://www.oracle.com/technology/products/berkeley-db/index.html
 
-REQUIRED_PKGS_CSWbdb43-devel = CSWbdb43
+RUNTIME_DEP_PKGS_CSWbdb43-devel = CSWbdb43
 
 LICENSE = LICENSE
 

Modified: csw/mgar/pkg/bdb44/tags/bdb-consolidation-4.4.20,REV=2009.07.28/Makefile
===================================================================
--- csw/mgar/pkg/bdb44/tags/bdb-consolidation-4.4.20,REV=2009.07.28/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/bdb44/tags/bdb-consolidation-4.4.20,REV=2009.07.28/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -25,7 +25,7 @@
 PACKAGES = CSWbdb44 
 SPKG_DESC = BerkeleyDB 4.4 embedded database libraries and utilities
 CATALOGNAME = berkeleydb44
-REQUIRED_PKGS = CSWbdb
+RUNTIME_DEP_PKGS = CSWbdb
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/bdb44/tags/bdb-consolidation-4.4.20,REV=2009.07.28/legacy/Makefile
===================================================================
--- csw/mgar/pkg/bdb44/tags/bdb-consolidation-4.4.20,REV=2009.07.28/legacy/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/bdb44/tags/bdb-consolidation-4.4.20,REV=2009.07.28/legacy/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -55,7 +55,7 @@
 # bdb tests are *very* time consuming
 TEST_SCRIPTS =
 
-NO_ISAEXEC = 1
+NOISAEXEC = 1
 
 PACKAGES = CSWbdb44 CSWbdb44-devel CSWbdb44-doc
 
@@ -69,7 +69,7 @@
 SPKG_DESC_CSWbdb44-devel = BerkeleyDB 4.4 development support
 SPKG_DESC_CSWbdb44-doc   = BerkeleyDB 4.4 documentation
 
-REQUIRED_PKGS_CSWbdb44-devel = CSWbdb44
+RUNTIME_DEP_PKGS_CSWbdb44-devel = CSWbdb44
 INCOMPATIBLE_PKGS_CSWbdb44-doc = CSWbdb44doc
 
 LICENSE = LICENSE

Modified: csw/mgar/pkg/bdb44/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bdb44/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/bdb44/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -27,7 +27,7 @@
 RELEASE = p$(words $(filter patch.$(GARVERSION).%,$(PATCHFILES)))
 
 BUILD64 = 1
-NO_ISAEXEC = 1
+NOISAEXEC = 1
 
 CONFIGURE_SCRIPTS = dist
 
@@ -64,7 +64,7 @@
 
 SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html
 
-REQUIRED_PKGS_CSWbdb44-devel = CSWbdb44
+RUNTIME_DEP_PKGS_CSWbdb44-devel = CSWbdb44
 
 LICENSE = LICENSE
 

Modified: csw/mgar/pkg/bdb45/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bdb45/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/bdb45/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -27,7 +27,7 @@
 RELEASE = p$(words $(filter patch.$(GARVERSION).%,$(PATCHFILES)))
 
 BUILD64 = 1
-NO_ISAEXEC = 1
+NOISAEXEC = 1
 
 CONFIGURE_SCRIPTS = dist
 
@@ -62,7 +62,7 @@
 
 SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html
 
-REQUIRED_PKGS_CSWbdb45devel = CSWbdb45
+RUNTIME_DEP_PKGS_CSWbdb45devel = CSWbdb45
 
 LICENSE = LICENSE
 

Modified: csw/mgar/pkg/bdb46/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bdb46/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/bdb46/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -27,7 +27,7 @@
 RELEASE = p$(words $(filter patch.$(GARVERSION).%,$(PATCHFILES)))
 
 BUILD64 = 1
-NO_ISAEXEC = 1
+NOISAEXEC = 1
 
 CONFIGURE_SCRIPTS = dist
 
@@ -62,7 +62,7 @@
 
 SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html
 
-REQUIRED_PKGS_CSWbdb46devel = CSWbdb46
+RUNTIME_DEP_PKGS_CSWbdb46devel = CSWbdb46
 
 LICENSE = LICENSE
 

Modified: csw/mgar/pkg/bdb47/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bdb47/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/bdb47/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -27,7 +27,7 @@
 RELEASE = p$(words $(filter patch.$(GARVERSION).%,$(PATCHFILES)))
 
 BUILD64 = 1
-NO_ISAEXEC = 1
+NOISAEXEC = 1
 
 CONFIGURE_SCRIPTS = dist
 
@@ -62,7 +62,7 @@
 
 SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html
 
-REQUIRED_PKGS_CSWbdb47devel = CSWbdb47
+RUNTIME_DEP_PKGS_CSWbdb47devel = CSWbdb47
 
 LICENSE = LICENSE
 

Modified: csw/mgar/pkg/bdb48/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bdb48/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/bdb48/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -27,7 +27,7 @@
 RELEASE = p$(words $(filter patch.$(GARVERSION).%,$(PATCHFILES)))
 
 BUILD64 = 1
-NO_ISAEXEC = 1
+NOISAEXEC = 1
 
 CONFIGURE_SCRIPTS = dist
 
@@ -63,7 +63,7 @@
 
 SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html
 
-REQUIRED_PKGS_CSWbdb48devel = CSWbdb48
+RUNTIME_DEP_PKGS_CSWbdb48devel = CSWbdb48
 
 LICENSE = LICENSE
 

Modified: csw/mgar/pkg/beautifulsoup/trunk/Makefile
===================================================================
--- csw/mgar/pkg/beautifulsoup/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/beautifulsoup/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -35,7 +35,7 @@
 INSTALL_SCRIPTS = beautifulsoup
 
 PACKAGES = CSWbeautifulsoup
-REQUIRED_PKGS_CSWbeautifulsoup = CSWpython CSWcswclassutils
+RUNTIME_DEP_PKGS_CSWbeautifulsoup = CSWpython CSWcswclassutils
 
 PROTOTYPE_FILTER = awk ' \
   $$$$3 ~/.*\.py$$$$/ { $$$$2 = "cswpycompile" } \

Modified: csw/mgar/pkg/bind/branches/stable/Makefile
===================================================================
--- csw/mgar/pkg/bind/branches/stable/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/bind/branches/stable/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -33,10 +33,10 @@
 SPKG_DESC_CSWlibbind = ISC BIND DNS library package
 SPKG_DESC_CSWbindutils = ISC BIND DNS utilities package
 
-REQUIRED_PKGS_CSWbind = CSWlibbind CSWbindutils CSWcswclassutils
-REQUIRED_PKGS_CSWbinddevel = CSWbind
-REQUIRED_PKGS_CSWlibbind = CSWiconv CSWlibxml2 CSWosslrt CSWzlib
-REQUIRED_PKGS_CSWbindutils = CSWlibbind CSWiconv CSWlibxml2 CSWosslrt
+RUNTIME_DEP_PKGS_CSWbind = CSWlibbind CSWbindutils CSWcswclassutils
+RUNTIME_DEP_PKGS_CSWbinddevel = CSWbind
+RUNTIME_DEP_PKGS_CSWlibbind = CSWiconv CSWlibxml2 CSWosslrt CSWzlib
+RUNTIME_DEP_PKGS_CSWbindutils = CSWlibbind CSWiconv CSWlibxml2 CSWosslrt
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UPSTREAM_MASTER_SITES = http://ftp.isc.org/isc/bind9/

Modified: csw/mgar/pkg/bind/branches/stable-9.4.3p3/Makefile
===================================================================
--- csw/mgar/pkg/bind/branches/stable-9.4.3p3/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/bind/branches/stable-9.4.3p3/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -20,7 +20,7 @@
 DISTFILES += $(call admfiles,CSWbind,preinstall postinstall preremove)
 
 LICENSE = COPYRIGHT
-REQUIRED_PKGS = CSWosslrt
+RUNTIME_DEP_PKGS = CSWosslrt
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = (\d+(?:\.\d+)*)-([A-Z][0-9])

Modified: csw/mgar/pkg/bind/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bind/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/bind/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -41,11 +41,11 @@
 SPKG_DESC_CSWbindutils = ISC BIND DNS utilities package
 SPKG_DESC_CSWbindchroot = ISC BIND DNS chroot package
 
-REQUIRED_PKGS_CSWbind = CSWlibbind CSWbindutils CSWiconv CSWlibxml2 CSWosslrt CSWzlib
-REQUIRED_PKGS_CSWbinddevel = CSWbind
-REQUIRED_PKGS_CSWlibbind = CSWiconv CSWlibxml2 CSWosslrt CSWzlib
-REQUIRED_PKGS_CSWbindutils = CSWlibbind CSWiconv CSWlibxml2 CSWosslrt CSWzlib
-REQUIRED_PKGS_CSWbindchroot = CSWbind
+RUNTIME_DEP_PKGS_CSWbind = CSWlibbind CSWbindutils CSWiconv CSWlibxml2 CSWosslrt CSWzlib
+RUNTIME_DEP_PKGS_CSWbinddevel = CSWbind
+RUNTIME_DEP_PKGS_CSWlibbind = CSWiconv CSWlibxml2 CSWosslrt CSWzlib
+RUNTIME_DEP_PKGS_CSWbindutils = CSWlibbind CSWiconv CSWlibxml2 CSWosslrt CSWzlib
+RUNTIME_DEP_PKGS_CSWbindchroot = CSWbind
 
 UPSTREAM_MASTER_SITES = http://ftp.isc.org/isc/bind9/
 UFILES_REGEX = (\d+(?:\.\d+)*)

Modified: csw/mgar/pkg/bind2nsd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bind2nsd/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/bind2nsd/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -27,7 +27,7 @@
 # UPSTREAM_MASTER_SITES = 
 
 PACKAGES = CSWbind2nsd
-REQUIRED_PKGS = CSWpython CSWpydes
+RUNTIME_DEP_PKGS = CSWpython CSWpydes
 CATALOGNAME = bind2nsd
 SPKG_DESC = scripts to translate DNS information in BIND format to NSD format
 

Modified: csw/mgar/pkg/binutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/binutils/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/binutils/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -14,7 +14,7 @@
 PATCHFILES  = 0001-Remove-gcc-specific-warning-no-error.patch
 PATCHFILES += 0002-Use-func-instead-of-FUNCTION.patch
 
-REQUIRED_PKGS = CSWzlib CSWiconv CSWggettextrt
+RUNTIME_DEP_PKGS = CSWzlib CSWiconv CSWggettextrt
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz

Modified: csw/mgar/pkg/bison/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bison/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/bison/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -11,8 +11,8 @@
 MASTER_SITES = $(GNU_MIRROR)
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
 
-PREREQUISITE_PKGS = CSWgnulinks
-REQUIRED_PKGS = CSWggettextrt CSWiconv CSWgm4
+BUILD_DEP_PKGS = CSWgnulinks
+RUNTIME_DEP_PKGS = CSWggettextrt CSWiconv CSWgm4
 
 SPKG_SOURCEURL = http://www.gnu.org/software/bison/
 

Modified: csw/mgar/pkg/botnet/trunk/Makefile
===================================================================
--- csw/mgar/pkg/botnet/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/botnet/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -15,7 +15,7 @@
 DISTFILES += $(call admfiles,CSWbotnet,)
 
 SPKG_DESC_CSWspamassassin = mail filter with a wide range of tests
-REQUIRED_PKGS = CSWspamassassin CSWcswclassutils
+RUNTIME_DEP_PKGS = CSWspamassassin CSWcswclassutils
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = -(\d+(?:\.\d+)*).tar

Modified: csw/mgar/pkg/buildbot/trunk/Makefile
===================================================================
--- csw/mgar/pkg/buildbot/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/buildbot/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -31,7 +31,7 @@
 
 SPKG_CLASSES = none cswpycompile
 
-REQUIRED_PKGS = CSWcswclassutils CSWpython CSWtwisted CSWzope CSWtextutils
+RUNTIME_DEP_PKGS = CSWcswclassutils CSWpython CSWtwisted CSWzope CSWtextutils
 
 ARCHALL = 1
 CONFIGURE_SCRIPTS =

Modified: csw/mgar/pkg/cacti/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cacti/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cacti/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -25,8 +25,8 @@
 # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES
 # UPSTREAM_MASTER_SITES = 
 
-REQUIRED_PKGS = CSWrrd CSWnetsnmp CSWmysql5client CSWcswclassutils
-REQUIRED_PKGS = CSWphp5 CSWap2modphp5 CSWphp5mysql CSWphp5snmp CSWphp5session CSWphp5sockets
+RUNTIME_DEP_PKGS = CSWrrd CSWnetsnmp CSWmysql5client CSWcswclassutils
+RUNTIME_DEP_PKGS = CSWphp5 CSWap2modphp5 CSWphp5mysql CSWphp5snmp CSWphp5session CSWphp5sockets
 
 SPKG_CLASSES = none cswusergroup
 

Modified: csw/mgar/pkg/cadaver/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cadaver/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cadaver/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -25,7 +25,7 @@
 PACKAGES = CSWcadav
 CATALOGNAME_CSWcadav = cadaver
 
-REQUIRED_PKGS = CSWggettextrt CSWiconv CSWneon CSWosslrt CSWreadline CSWzlib CSWgcrypt CSWgnutls CSWgpgerr
+RUNTIME_DEP_PKGS = CSWggettextrt CSWiconv CSWneon CSWosslrt CSWreadline CSWzlib CSWgcrypt CSWgnutls CSWgpgerr
 
 
 

Modified: csw/mgar/pkg/cairomm/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cairomm/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cairomm/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -23,7 +23,7 @@
 PKGFILES_CSWcairomm-devel += $(prefix)/lib/.*\.a
 PKGFILES_CSWcairomm-devel += $(prefix)/lib/pkgconfig/.*
 
-REQUIRED_PKGS_CSWcairomm-devel = CSWcairomm
+RUNTIME_DEP_PKGS_CSWcairomm-devel = CSWcairomm
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 

Modified: csw/mgar/pkg/cdecl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cdecl/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cdecl/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -18,8 +18,8 @@
 
 LICENSE = README
 
-REQUIRED_PKGS = CSWreadline
-PREREQUISITE_PKGS = $(REQUIRED_PKGS)
+RUNTIME_DEP_PKGS = CSWreadline
+BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS)
 
 CONFIGURE_SCRIPTS =
 

Modified: csw/mgar/pkg/cfengine/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cfengine/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cfengine/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -22,7 +22,7 @@
 
 CATALOGNAME_CSWcfengine = cfengine
 SPKG_DESC_CSWcfengine = A tool for administering Networks of Diverse Machines
-REQUIRED_PKGS_CSWcfengine = CSWosslrt CSWbdb3
+RUNTIME_DEP_PKGS_CSWcfengine = CSWosslrt CSWbdb3
 
 CATALOGNAME_CSWcfenginedoc = cfengine_doc
 SPKG_DESC_CSWcfenginedoc = Cfengine documentation

Modified: csw/mgar/pkg/cgit/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cgit/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cgit/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -16,7 +16,7 @@
  * maintained by Lars Hjemli, who is happy to receive patches, suggestions and bug reports.
 endef
 
-REQUIRED_PKGS_CSWcgit = CSWiconv CSWosslrt CSWzlib
+RUNTIME_DEP_PKGS_CSWcgit = CSWiconv CSWosslrt CSWzlib
 
 #MASTER_SITES = http://hjemli.net/git/cgit/snapshot/
 #DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz

Modified: csw/mgar/pkg/chkconfig/trunk/Makefile
===================================================================
--- csw/mgar/pkg/chkconfig/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/chkconfig/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -24,7 +24,7 @@
 SPKG_DESC_CSWchkconfig = Checkconfig engine from Red Hat chkconfig-$(GARVERSION)
 SPKG_DESC_CSWalternatives = Alternatives engine from Red Hat chkconfig-$(GARVERSION)
 
-REQUIRED_PKGS  = CSWggettextrt CSWlibpopt
+RUNTIME_DEP_PKGS  = CSWggettextrt CSWlibpopt
 
 PKGFILES_CSWalternatives = .*alternatives.*
 

Modified: csw/mgar/pkg/chmlib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/chmlib/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/chmlib/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -23,7 +23,7 @@
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
 
 BUILD64 = 1
-NO_ISAEXEC = 1
+NOISAEXEC = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-examples
 

Modified: csw/mgar/pkg/chromium/trunk/Makefile
===================================================================
--- csw/mgar/pkg/chromium/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/chromium/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -14,9 +14,9 @@
 # DISTFILES  = chromium.r$(CHROMIUM_REVISION).tgz
 DISTFILES   =
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
-REQUIRED_PKGS = CSWnspr CSWnss CSWffmpeg
+RUNTIME_DEP_PKGS = CSWnspr CSWnss CSWffmpeg
 # CSWpyxml must be uninstalled
-PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWnspr-devel CSWlibxcbdevel CSWffmpeg CSWgperf CSWpython
+BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWnspr-devel CSWlibxcbdevel CSWffmpeg CSWgperf CSWpython
 CONFIGURE_SCRIPTS = chromium
 BUILD_SCRIPTS     = chromium
 INSTALL_SCRIPTS   = chromium

Modified: csw/mgar/pkg/clamav/trunk/Makefile
===================================================================
--- csw/mgar/pkg/clamav/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/clamav/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -24,8 +24,8 @@
 CATALOGNAME_CSWlibclamav = libclamav
 SPKG_DESC_CSWlibclamav = $(DESCRIPTION) Library
 
-REQUIRED_PKGS_CSWclamav = CSWlibclamav CSWzlib CSWbzip2 CSWiconv CSWcswclassutils CSWncurses CSWlibtoolrt
-REQUIRED_PKGS_CSWlibclamav = CSWzlib CSWbzip2 CSWiconv CSWlibtoolrt
+RUNTIME_DEP_PKGS_CSWclamav = CSWlibclamav CSWzlib CSWbzip2 CSWiconv CSWcswclassutils CSWncurses CSWlibtoolrt
+RUNTIME_DEP_PKGS_CSWlibclamav = CSWzlib CSWbzip2 CSWiconv CSWlibtoolrt
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz

Modified: csw/mgar/pkg/clearsilver/trunk/Makefile
===================================================================
--- csw/mgar/pkg/clearsilver/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/clearsilver/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -15,9 +15,9 @@
 
 PACKAGES = CSWcs CSWpmcs CSWpycs
 
-REQUIRED_PKGS_CSWcs   = CSWzlib CSWggettextrt
-REQUIRED_PKGS_CSWpmcs = CSWcs CSWperl
-REQUIRED_PKGS_CSWpycs = CSWcs CSWpython
+RUNTIME_DEP_PKGS_CSWcs   = CSWzlib CSWggettextrt
+RUNTIME_DEP_PKGS_CSWpmcs = CSWcs CSWperl
+RUNTIME_DEP_PKGS_CSWpycs = CSWcs CSWpython
 
 CATALOGNAME_CSWcs   = clearsilver
 CATALOGNAME_CSWpmcs = pm_clearsilver
@@ -35,7 +35,7 @@
 EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc
 PROTOTYPE_FILTER = awk '$$$$3 ~ /.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }'
 SPKG_CLASSES = none cswpycompile
-REQUIRED_PKGS += CSWcswclassutils
+RUNTIME_DEP_PKGS += CSWcswclassutils
 
 # We define upstream file regex so we can be notifed of 
 # new upstream software release

Modified: csw/mgar/pkg/clusterssh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/clusterssh/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/clusterssh/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -17,10 +17,10 @@
 UPSTREAM_USE_SF = 1
 UFILES_REGEX = (\d+(?:\.\d+)*)
 
-REQUIRED_PKGS  = CSWperl
-REQUIRED_PKGS += CSWpmtk
-REQUIRED_PKGS += CSWpmx11protocol
-# REQUIRED_PKGS += CSWossh
+RUNTIME_DEP_PKGS  = CSWperl
+RUNTIME_DEP_PKGS += CSWpmtk
+RUNTIME_DEP_PKGS += CSWpmx11protocol
+# RUNTIME_DEP_PKGS += CSWossh
 
 ARCHALL = 1
 

Modified: csw/mgar/pkg/cmake/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cmake/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cmake/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -21,8 +21,8 @@
 CATALOGNAME_CSWcmake = cmake
 SPKG_DESC_CSWcmake = $(DESCRIPTION)
 
-REQUIRED_PKGS_CSWcmake  = CSWcurlrt CSWexpat CSWlibidn CSWoldaprt
-REQUIRED_PKGS_CSWcmake += CSWosslrt CSWxmlrpc-c CSWzlib 
+RUNTIME_DEP_PKGS_CSWcmake  = CSWcurlrt CSWexpat CSWlibidn CSWoldaprt
+RUNTIME_DEP_PKGS_CSWcmake += CSWosslrt CSWxmlrpc-c CSWzlib 
 
 # We define upstream file regex so we can be notifed of 
 # new upstream software release

Modified: csw/mgar/pkg/colordiff/trunk/Makefile
===================================================================
--- csw/mgar/pkg/colordiff/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/colordiff/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -16,7 +16,7 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
-REQUIRED_PKGS = CSWdiffutils CSWperl CSWless
+RUNTIME_DEP_PKGS = CSWdiffutils CSWperl CSWless
 
 CONFIGURE_SCRIPTS = 
 BUILD_ARGS = doc

Modified: csw/mgar/pkg/colormake/trunk/Makefile
===================================================================
--- csw/mgar/pkg/colormake/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/colormake/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -13,7 +13,7 @@
 
 ARCHALL = 1
 
-REQUIRED_PKGS = CSWgmake CSWshutils CSWperl CSWless
+RUNTIME_DEP_PKGS = CSWgmake CSWshutils CSWperl CSWless
 
 # We define upstream file regex so we can be notifed of new upstream
 # software release

Modified: csw/mgar/pkg/coreutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/coreutils/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/coreutils/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -12,7 +12,7 @@
 
 SHELL = /opt/csw/bin/bash
 
-PREREQUISITE_PKGS = CSWbash
+BUILD_DEP_PKGS = CSWbash
 
 DESCRIPTION = GNU core utilities
 define BLURB
@@ -25,8 +25,8 @@
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
 PATCHFILES = 0001-Fix-solaris-acl-support-breakage.patch
 
-PREREQUISITE_PKGS =  CSWautomake CSWautoconf CSWbison CSWggettext CSWgit
-PREREQUISITE_PKGS += CSWgperf CSWgzip CSWperl CSWrsync CSWgtar CSWbash
+BUILD_DEP_PKGS =  CSWautomake CSWautoconf CSWbison CSWggettext CSWgit
+BUILD_DEP_PKGS += CSWgperf CSWgzip CSWperl CSWrsync CSWgtar CSWbash
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz

Modified: csw/mgar/pkg/cpan/Algorithm-Annotate/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Algorithm-Annotate/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/Algorithm-Annotate/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -9,7 +9,7 @@
   simliar to cvs annotate.
 endef
 
-REQUIRED_PKGS = CSWpmalgdiff
+RUNTIME_DEP_PKGS = CSWpmalgdiff
 
 PACKAGES = CSWpmalgannotate
 CATALOGNAME = pm_algorithmannotate

Modified: csw/mgar/pkg/cpan/Algorithm-Depedency/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Algorithm-Depedency/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/Algorithm-Depedency/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -13,8 +13,8 @@
 PACKAGES = CSWpmalgorithmdep
 CATALOGNAME = pm_algorithmdep
 
-PREREQUISITE_PKGS = CSWpmtestclassapi
-REQUIRED_PKGS = CSWpmparamsutil
+BUILD_DEP_PKGS = CSWpmtestclassapi
+RUNTIME_DEP_PKGS = CSWpmparamsutil
 
 ARCHALL = 1
 

Modified: csw/mgar/pkg/cpan/Apache-Test/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Apache-Test/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/Apache-Test/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -10,8 +10,8 @@
 endef
 
 # depends
-REQUIRED_PKGS     = CSWap2prefork
-PREREQUISITE_PKGS = CSWap2prefork
+RUNTIME_DEP_PKGS     = CSWap2prefork
+BUILD_DEP_PKGS = CSWap2prefork
 
 PACKAGES = CSWpmapachetst
 CATALOGNAME = pm_apachetst

Modified: csw/mgar/pkg/cpan/Apache2-AuthzNIS/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Apache2-AuthzNIS/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/Apache2-AuthzNIS/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -12,7 +12,7 @@
 CATALOGNAME = pm_ap2authznis
 ARCHALL = 1
 
-REQUIRED_PKGS = CSWpmnetnis CSWap2_modperl
+RUNTIME_DEP_PKGS = CSWpmnetnis CSWap2_modperl
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/cpan/App-CLI/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/App-CLI/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/App-CLI/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -12,7 +12,7 @@
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
 DISTFILES += $(call admfiles,CSWpmappcli,)
 
-REQUIRED_PKGS = CSWpmlclemktxtsimple CSWpmpodsimple
+RUNTIME_DEP_PKGS = CSWpmlclemktxtsimple CSWpmpodsimple
 
 DEPENDS += cpan/Locale-Maketext-Simple
 DEPENDS += cpan/Pod-Simple

Modified: csw/mgar/pkg/cpan/Archive-Tar/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Archive-Tar/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/Archive-Tar/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -12,7 +12,7 @@
   compressed or gzipped tar files.
 endef
 
-REQUIRED_PKGS = CSWpmiozlib CSWpmiocompress CSWpmpkgconst CSWpmtextdiff
+RUNTIME_DEP_PKGS = CSWpmiozlib CSWpmiocompress CSWpmpkgconst CSWpmtextdiff
 
 PACKAGES = CSWpmarchivetar
 CATALOGNAME = pm_archivetar

Modified: csw/mgar/pkg/cpan/Archive-Zip/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Archive-Zip/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/Archive-Zip/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -22,7 +22,7 @@
 ARCHALL = 1
 LICENSE = LICENSE
 
-REQUIRED_PKGS = CSWpmiocompress
+RUNTIME_DEP_PKGS = CSWpmiocompress
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz

Modified: csw/mgar/pkg/cpan/Authen-SASL/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Authen-SASL/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/Authen-SASL/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -15,8 +15,8 @@
 PACKAGES = CSWpmauthensasl
 CATALOGNAME = pm_authensasl
 
-REQUIRED_PKGS = CSWpmgssapi CSWpmdigesthmac
-PREREQUISITE_PKGS = CSWperl
+RUNTIME_DEP_PKGS = CSWpmgssapi CSWpmdigesthmac
+BUILD_DEP_PKGS = CSWperl
 
 ARCHALL = 1
 

Modified: csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -16,6 +16,6 @@
 NOISALIST = 1
 EXTRA_LIB = /opt/csw/bdb47/lib
 
-REQUIRED_PKGS = CSWbdb47
+RUNTIME_DEP_PKGS = CSWbdb47
 
 include gar/category.mk

Modified: csw/mgar/pkg/cpan/Bit-Vector/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Bit-Vector/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/Bit-Vector/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -10,7 +10,7 @@
 PACKAGES = CSWpmbitvec
 CATALOGNAME = pm_bitvec
 
-REQUIRED_PKGS = CSWpmcarpclan
-PREREQUISITE_PKGS = CSWpmcarpclan
+RUNTIME_DEP_PKGS = CSWpmcarpclan
+BUILD_DEP_PKGS = CSWpmcarpclan
 
 include gar/category.mk

Modified: csw/mgar/pkg/cpan/Cairo/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Cairo/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/Cairo/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -9,8 +9,8 @@
 
 # 3/73 skipped: Test::Number::Delta not available
 # all skipped: need Cairo with FreeType support and Font::FreeType
-PREREQUISITE_PKGS = CSWlibcairodevel
-REQUIRED_PKGS = CSWfconfig CSWftype2 CSWlibcairo CSWzlib
+BUILD_DEP_PKGS = CSWlibcairodevel
+RUNTIME_DEP_PKGS = CSWfconfig CSWftype2 CSWlibcairo CSWzlib
 
 PACKAGES = CSWpmcairo
 CATALOGNAME = pm_cairo

Modified: csw/mgar/pkg/cpan/Capitalization/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Capitalization/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/Capitalization/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -7,7 +7,7 @@
 define BLURB
 endef
 
-REQUIRED_PKGS = CSWpmdevelsymdump
+RUNTIME_DEP_PKGS = CSWpmdevelsymdump
 
 PACKAGES = CSWpmcapitalization
 CATALOGNAME = pm_capitalization

Modified: csw/mgar/pkg/cpan/Chart/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Chart/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/Chart/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -9,7 +9,7 @@
   and Pareto.
 endef
 
-REQUIRED_PKGS = CSWpmgd
+RUNTIME_DEP_PKGS = CSWpmgd
 
 PACKAGES = CSWpmchart
 CATALOGNAME = pm_chart

Modified: csw/mgar/pkg/cpan/Class-Container/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Class-Container/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/Class-Container/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -13,7 +13,7 @@
   any of these objects.
 endef
 
-REQUIRED_PKGS = CSWpmprmsvldt
+RUNTIME_DEP_PKGS = CSWpmprmsvldt
 
 PACKAGES = CSWpmclscontainer
 CATALOGNAME = pm_clscontainer

Modified: csw/mgar/pkg/cpan/Class-ReturnValue/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Class-ReturnValue/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/Class-ReturnValue/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -10,8 +10,8 @@
   return values)
 endef
 
-PREREQUISITE_PKGS = CSWpmtestinline
-REQUIRED_PKGS = CSWpmdevstacktrace
+BUILD_DEP_PKGS = CSWpmtestinline
+RUNTIME_DEP_PKGS = CSWpmdevstacktrace
 
 PACKAGES = CSWpmclassretval
 CATALOGNAME = pm_classretval

Modified: csw/mgar/pkg/cpan/Compress-Bzip2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Compress-Bzip2/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/Compress-Bzip2/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -7,7 +7,7 @@
 define BLURB
 endef
 
-REQUIRED_PKGS = CSWbzip2
+RUNTIME_DEP_PKGS = CSWbzip2
 
 PACKAGES = CSWpmcompressbzip2
 CATALOGNAME = pm_compressbzip2

Modified: csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -9,7 +9,7 @@
   compression library.
 endef
 
-REQUIRED_PKGS = CSWzlib
+RUNTIME_DEP_PKGS = CSWzlib
 
 CATALOGNAME = pm_compressrawzlib
 PACKAGES = CSWpmcompressrawzlib

Modified: csw/mgar/pkg/cpan/Compress-Zlib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Compress-Zlib/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/Compress-Zlib/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -14,7 +14,7 @@
 TEST_SCRIPTS =
 INSTALL_SCRIPTS =
 
-REQUIRED_PKGS = CSWpmiocompress
+RUNTIME_DEP_PKGS = CSWpmiocompress
 
 CATALOGNAME = pm_compresszlib
 PACKAGES = CSWpmcompresszlib

Modified: csw/mgar/pkg/cpan/Crypt-OpenSSL-Bignum/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Crypt-OpenSSL-Bignum/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/Crypt-OpenSSL-Bignum/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -16,6 +16,6 @@
 PACKAGES = CSWpmcryptosslbignum
 CATALOGNAME = pm_cryptosslbignum
 
-REQUIRED_PKGS = CSWosslrt
+RUNTIME_DEP_PKGS = CSWosslrt
 
 include gar/category.mk

Modified: csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -13,7 +13,7 @@
 PACKAGES = CSWpmcryptosslrsa
 CATALOGNAME = pm_osslrsa
 
-REQUIRED_PKGS = CSWpmcryptosslrandom
-PREREQUISITE_PKGS = CSWpmcryptosslrandom
+RUNTIME_DEP_PKGS = CSWpmcryptosslrandom
+BUILD_DEP_PKGS = CSWpmcryptosslrandom
 
 include gar/category.mk

Modified: csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -12,6 +12,6 @@
 PACKAGES = CSWpmcryptosslrandom
 CATALOGNAME = pm_osslrandom
 
-REQUIRED_PKGS = CSWosslrt
+RUNTIME_DEP_PKGS = CSWosslrt
 
 include gar/category.mk

Modified: csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -16,8 +16,8 @@
 PACKAGES = CSWpmcryptssleay
 CATALOGNAME = pm_cryptssleay
 
-REQUIRED_PKGS     = CSWosslrt
-PREREQUISITE_PKGS = CSWosslrt CSWpmmimebase64
+RUNTIME_DEP_PKGS     = CSWosslrt
+BUILD_DEP_PKGS = CSWosslrt CSWpmmimebase64
 
 CONFIGURE_ARGS = --lib=$(prefix)
 

Modified: csw/mgar/pkg/cpan/DBD-SQLite/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/DBD-SQLite/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/DBD-SQLite/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -13,7 +13,7 @@
 
 PACKAGES = CSWpmdbdsqlite
 CATALOGNAME = pm_dbdsqlite
-REQUIRED_PKGS = CSWpmdbi
+RUNTIME_DEP_PKGS = CSWpmdbi
 
 LICENSE = LICENSE
 

Modified: csw/mgar/pkg/cpan/DBI/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/DBI/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/DBI/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -18,6 +18,6 @@
 PACKAGES = CSWpmdbi
 CATALOGNAME = pm_dbi
 
-#REQUIRED_PKGS = CSWpmplrpc
+#RUNTIME_DEP_PKGS = CSWpmplrpc
 
 include gar/category.mk

Modified: csw/mgar/pkg/cpan/Data-Hierarchy/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Data-Hierarchy/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/Data-Hierarchy/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -9,8 +9,8 @@
   data attached to a hierarchical environment (like filesystem).
 endef
 
-PREREQUISITE_PKGS = CSWpmtstexcept
-REQUIRED_PKGS = CSWpmclone
+BUILD_DEP_PKGS = CSWpmtstexcept
+RUNTIME_DEP_PKGS = CSWpmclone
 
 PACKAGES = CSWpmdatahier
 CATALOGNAME = pm_datahier

Modified: csw/mgar/pkg/cpan/Date-Calc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Date-Calc/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/Date-Calc/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -15,7 +15,7 @@
 PACKAGES = CSWpmdatecalc
 CATALOGNAME = pm_datecalc
 
-PREREQUISITE_PKGS = CSWpmbitvec CSWpmcarpclan
+BUILD_DEP_PKGS = CSWpmbitvec CSWpmcarpclan
 REQUIRES = CSWpmbitvec CSWpmcarpclan
 
 include gar/category.mk

Modified: csw/mgar/pkg/cpan/DateTime/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/DateTime/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/DateTime/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -14,8 +14,8 @@
 PACKAGES = CSWpmdatetime
 CATALOGNAME = pm_datetime
 
-REQUIRED_PKGS  = CSWpmdatetimetimezone
-REQUIRED_PKGS += CSWpmdatetimelocale
+RUNTIME_DEP_PKGS  = CSWpmdatetimetimezone
+RUNTIME_DEP_PKGS += CSWpmdatetimelocale
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/cpan/DateTime-Locale/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/DateTime-Locale/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/DateTime-Locale/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -14,7 +14,7 @@
 CATALOGNAME = pm_datetimelocale
 ARCHALL = 1
 
-REQUIRED_PKGS = CSWpmlistmoreutils
+RUNTIME_DEP_PKGS = CSWpmlistmoreutils
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/cpan/DateTime-TimeZone/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/DateTime-TimeZone/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/DateTime-TimeZone/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -17,8 +17,8 @@
 CATALOGNAME = pm_datetimetimezone
 ARCHALL = 1
 
-REQUIRED_PKGS  = CSWpmclasssingleton
-REQUIRED_PKGS += CSWpmparamsvalidate
+RUNTIME_DEP_PKGS  = CSWpmclasssingleton
+RUNTIME_DEP_PKGS += CSWpmparamsvalidate
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/cpan/Devel-Caller/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Devel-Caller/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/Devel-Caller/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -10,8 +10,8 @@
 PACKAGES = CSWpmdevelcaller
 CATALOGNAME = pm_develcaller
 
-REQUIRED_PKGS = CSWpmpadwalker
-PREREQUISITE_PKGS = CSWpmpadwalker
+RUNTIME_DEP_PKGS = CSWpmpadwalker
+BUILD_DEP_PKGS = CSWpmpadwalker
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/cpan/Devel-LexAlias/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Devel-LexAlias/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/Devel-LexAlias/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -12,8 +12,8 @@
 PACKAGES = CSWpmdevellexalias
 CATALOGNAME = pm_devellexalias
 
-REQUIRED_PKGS = CSWpmdevelcaller CSWpmpadwalker
-PREREQUISITE_PKGS = CSWpmdevelcaller CSWpmpadwalker
+RUNTIME_DEP_PKGS = CSWpmdevelcaller CSWpmpadwalker
+BUILD_DEP_PKGS = CSWpmdevelcaller CSWpmpadwalker
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/cpan/Email-Simple/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Email-Simple/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/Email-Simple/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -7,7 +7,7 @@
 define BLURB
 endef
 
-REQUIRED_PKGS = CSWpmemaildateformat
+RUNTIME_DEP_PKGS = CSWpmemaildateformat
 
 PACKAGES = CSWpmemailsimple
 CATALOGNAME = pm_emailsimple

Modified: csw/mgar/pkg/cpan/Event-Lib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Event-Lib/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/Event-Lib/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -14,8 +14,8 @@
 PACKAGES = CSWpmeventlib
 CATALOGNAME = pm_eventlib
 
-PREREQUISITE_PKGS = CSWlibevent-devel
-REQUIRED_PKGS = CSWlibevent
+BUILD_DEP_PKGS = CSWlibevent-devel
+RUNTIME_DEP_PKGS = CSWlibevent
 
 # Sun cc inline function patch
 PATCHFILES = inline.diff

Modified: csw/mgar/pkg/cpan/ExtUtils-ParseXS/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/ExtUtils-ParseXS/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/ExtUtils-ParseXS/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -17,7 +17,7 @@
 
 ARCHALL = 1
 
-REQUIRED_PKGS = CSWpmextutcbuilder
+RUNTIME_DEP_PKGS = CSWpmextutcbuilder
 
 SPKG_VERSION = 2.20.02
 

Modified: csw/mgar/pkg/cpan/Font-Freetype/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Font-Freetype/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/Font-Freetype/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -7,7 +7,7 @@
 define BLURB
 endef
 
-REQUIRED_PKGS = CSWftype2
+RUNTIME_DEP_PKGS = CSWftype2
 
 PACKAGES = CSWpmfontfreetype
 CATALOGNAME = pm_fontfreetype

Modified: csw/mgar/pkg/cpan/GD/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/GD/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/GD/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -13,8 +13,8 @@
 PACKAGES = CSWpmgd
 CATALOGNAME = pm_gd
 
-REQUIRED_PKGS = CSWftype2 CSWgd CSWiconv CSWjpeg CSWpng
-REQUIRED_PKGS += CSWxpm CSWzlib CSWfconfig
+RUNTIME_DEP_PKGS = CSWftype2 CSWgd CSWiconv CSWjpeg CSWpng
+RUNTIME_DEP_PKGS += CSWxpm CSWzlib CSWfconfig
 
 CONFIGURE_ARGS  = lib_gd_path $(libdir)
 CONFIGURE_ARGS += lib_ft_path $(libdir)

Modified: csw/mgar/pkg/cpan/GSSAPI/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/GSSAPI/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/GSSAPI/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -13,6 +13,6 @@
 PACKAGES = CSWpmgssapi
 CATALOGNAME = pm_gssapi
 
-REQUIRED_PKGS = CSWkrb5lib
+RUNTIME_DEP_PKGS = CSWkrb5lib
 
 include gar/category.mk

Modified: csw/mgar/pkg/cpan/Geo-IP-PurePerl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Geo-IP-PurePerl/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/Geo-IP-PurePerl/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -16,7 +16,7 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
-REQUIRED_PKGS = CSWgeolitedb
+RUNTIME_DEP_PKGS = CSWgeolitedb
 
 EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod
 

Modified: csw/mgar/pkg/cpan/Gimp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Gimp/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/Gimp/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -15,7 +15,7 @@
 DEPENDS += cpan/PDL cpan/Gtk2
 
 
-PREREQUISITE_PKGS       = CSWpmpdl CSWpmgtk2 
+BUILD_DEP_PKGS       = CSWpmpdl CSWpmgtk2 
 PKGS_REQUIRED_CSWpmglib = CSWpmpdl CSWpmgtk2 CSWgimplibs
 
 CATALOGNAME = pm_gimp

Modified: csw/mgar/pkg/cpan/Glib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Glib/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/Glib/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -12,8 +12,8 @@
   environment, and are used in many unrelated projects.
 endef
 
-PREREQUISITE_PKGS 	= CSWpmextutilsdepends CSWpmextutpkgconf
-REQUIRED_PKGS_CSWpmglib = CSWpmextutilsdepends CSWpmextutpkgconf CSWggettextrt CSWglib2
+BUILD_DEP_PKGS 	= CSWpmextutilsdepends CSWpmextutpkgconf
+RUNTIME_DEP_PKGS_CSWpmglib = CSWpmextutilsdepends CSWpmextutpkgconf CSWggettextrt CSWglib2
 
 CATALOGNAME 	= pm_glib
 PACKAGES	= CSWpmglib

Modified: csw/mgar/pkg/cpan/HTML-Mason/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/HTML-Mason/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/HTML-Mason/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -15,7 +15,7 @@
 PACKAGES = CSWpmhtmlmason
 CATALOGNAME = pm_htmlmason
 
-REQUIRED_PKGS  = CSWpmexceptcls CSWpmclscontainer CSWpmprmsvldt CSWpmcachecache
+RUNTIME_DEP_PKGS  = CSWpmexceptcls CSWpmclscontainer CSWpmprmsvldt CSWpmcachecache
 
 ARCHALL = 1
 

Modified: csw/mgar/pkg/cpan/HTML-Parser/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/HTML-Parser/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/HTML-Parser/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -16,7 +16,7 @@
 PACKAGES = CSWpmhtmlparser
 CATALOGNAME = pm_htmlparser
 
-REQUIRED_PKGS = CSWpmhtmltagset
+RUNTIME_DEP_PKGS = CSWpmhtmltagset
 
 CONFIGURE_ARGS = -n
 

Modified: csw/mgar/pkg/cpan/IO-Compress/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/IO-Compress/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/IO-Compress/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -21,8 +21,8 @@
 
 endef
 
-REQUIRED_PKGS  = CSWpmcompressrawzlib
-REQUIRED_PKGS += CSWpmcompressrawbz2
+RUNTIME_DEP_PKGS  = CSWpmcompressrawzlib
+RUNTIME_DEP_PKGS += CSWpmcompressrawbz2
 
 PACKAGES = CSWpmiocompress
 CATALOGNAME = pm_iocompress

Modified: csw/mgar/pkg/cpan/IO-Compress-Base/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/IO-Compress-Base/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/IO-Compress-Base/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -14,7 +14,7 @@
 TEST_SCRIPTS =
 INSTALL_SCRIPTS =
 
-REQUIRED_PKGS = CSWpmiocompress
+RUNTIME_DEP_PKGS = CSWpmiocompress
 
 CATALOGNAME = pm_iocompressbase
 PACKAGES = CSWpmiocompressbase

Modified: csw/mgar/pkg/cpan/IO-Compress-Zlib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/IO-Compress-Zlib/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/IO-Compress-Zlib/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -14,7 +14,7 @@
 TEST_SCRIPTS =
 INSTALL_SCRIPTS =
 
-REQUIRED_PKGS = CSWpmiocompress
+RUNTIME_DEP_PKGS = CSWpmiocompress
 
 CATALOGNAME = pm_iocompresszlib
 PACKAGES = CSWpmiocompresszlib

Modified: csw/mgar/pkg/cpan/IO-Digest/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/IO-Digest/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/IO-Digest/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -10,7 +10,7 @@
   the digests after written a file.
 endef
 
-REQUIRED_PKGS = pm_perlioviadyn
+RUNTIME_DEP_PKGS = pm_perlioviadyn
 
 PACKAGES = CSWpmiodigest
 CATALOGNAME = pm_iodigest

Modified: csw/mgar/pkg/cpan/IO-Zlib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/IO-Zlib/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/IO-Zlib/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -10,7 +10,7 @@
   IO::Handle interface.
 endef
 
-REQUIRED_PKGS = CSWpmcompresszlib
+RUNTIME_DEP_PKGS = CSWpmcompresszlib
 
 PACKAGES = CSWpmiozlib
 CATALOGNAME = pm_iozlib

Modified: csw/mgar/pkg/cpan/IPC-Cmd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/IPC-Cmd/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/IPC-Cmd/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -13,7 +13,7 @@
 CATALOGNAME = pm_ipccmd 
 ARCHALL = 1
 
-REQUIRED_PKGS = CSWpmlclemktxtsimple CSWpmmodloadcond CSWpmprmscheck
+RUNTIME_DEP_PKGS = CSWpmlclemktxtsimple CSWpmmodloadcond CSWpmprmscheck
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/cpan/Lexical-Persistence/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Lexical-Persistence/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/Lexical-Persistence/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -11,7 +11,7 @@
 CATALOGNAME = pm_lexicalpersist
 ARCHALL = 1
 
-REQUIRED_PKGS = CSWpmpadwalker CSWpmdevellexalias
+RUNTIME_DEP_PKGS = CSWpmpadwalker CSWpmdevellexalias
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/cpan/Locale-Gettext/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Locale-Gettext/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/Locale-Gettext/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -13,7 +13,7 @@
 PACKAGES = CSWpmlocalegettext
 CATALOGNAME = pm_localegettext
 
-REQUIRED_PKGS = CSWggettextrt
+RUNTIME_DEP_PKGS = CSWggettextrt
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/cpan/Locale-Maketext-Simple/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Locale-Maketext-Simple/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/Locale-Maketext-Simple/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -20,7 +20,7 @@
 CATALOGNAME = pm_lclemktxtsimple 
 ARCHALL = 1
 
-REQUIRED_PKGS = CSWpmlclemktxtlex
+RUNTIME_DEP_PKGS = CSWpmlclemktxtlex
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/cpan/Log-Dispatch/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Log-Dispatch/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/Log-Dispatch/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -9,7 +9,7 @@
   and remove output objects as desired.
 endef
 
-REQUIRED_PKGS = CSWpmprmsvldt CSWpmunivrequire
+RUNTIME_DEP_PKGS = CSWpmprmsvldt CSWpmunivrequire
 
 PACKAGES = CSWpmlogdispatch
 CATALOGNAME = pm_logdispatch

Modified: csw/mgar/pkg/cpan/Log-Message/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Log-Message/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/Log-Message/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -17,7 +17,7 @@
 CATALOGNAME = pm_logmessage 
 ARCHALL = 1
 
-REQUIRED_PKGS = CSWpmlclemktxtsimple CSWpmprmscheck CSWpmmodload
+RUNTIME_DEP_PKGS = CSWpmlclemktxtsimple CSWpmprmscheck CSWpmmodload
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/cpan/Log-Message-Simple/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Log-Message-Simple/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/Log-Message-Simple/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -13,7 +13,7 @@
 CATALOGNAME = pm_logmsgsimple 
 ARCHALL = 1
 
-REQUIRED_PKGS = CSWpmlogmessage
+RUNTIME_DEP_PKGS = CSWpmlogmessage
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/cpan/MIME-Lite/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/MIME-Lite/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/MIME-Lite/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -14,8 +14,8 @@
 PACKAGES = CSWpmmimelite
 CATALOGNAME = pm_mimelite
 
-REQUIRED_PKGS = CSWpmmimetypes CSWpmmailtools CSWpmemaildateformat
-PREREQUISITE_PKGS = $(REQUIRED_PKGS)
+RUNTIME_DEP_PKGS = CSWpmmimetypes CSWpmmailtools CSWpmemaildateformat
+BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS)
 
 # Do not prompt for stuff
 PATCHFILES = 0001-Skip-prompting.patch

Modified: csw/mgar/pkg/cpan/MIME-Types/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/MIME-Types/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/MIME-Types/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -14,7 +14,7 @@
 PACKAGES = CSWpmmimetypes
 CATALOGNAME = pm_mimetypes
 
-PREREQUISITE_PKGS = CSWpmtestpod
+BUILD_DEP_PKGS = CSWpmtestpod
 
 ARCHALL = 1
 

Modified: csw/mgar/pkg/cpan/Mail-DKIM/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Mail-DKIM/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/Mail-DKIM/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -22,12 +22,12 @@
 DEPENDS += cpan/MailTools
 DEPENDS += cpan/Net-DNS
 
-REQUIRED_PKGS += CSWpmcryptosslrsa
-REQUIRED_PKGS += CSWpmdigestsha
-REQUIRED_PKGS += CSWpmdigestsha1
-REQUIRED_PKGS += CSWpmerror
-REQUIRED_PKGS += CSWpmmailtools
-REQUIRED_PKGS += CSWpmmimebase64
-REQUIRED_PKGS += CSWpmnetdns
+RUNTIME_DEP_PKGS += CSWpmcryptosslrsa
+RUNTIME_DEP_PKGS += CSWpmdigestsha
+RUNTIME_DEP_PKGS += CSWpmdigestsha1
+RUNTIME_DEP_PKGS += CSWpmerror
+RUNTIME_DEP_PKGS += CSWpmmailtools
+RUNTIME_DEP_PKGS += CSWpmmimebase64
+RUNTIME_DEP_PKGS += CSWpmnetdns
 
 include gar/category.mk

Modified: csw/mgar/pkg/cpan/Mail-SPF/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Mail-SPF/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/Mail-SPF/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -16,7 +16,7 @@
 # Required packages due to bug reports
 #   http://www.opencsw.org/mantis/view.php?id=4139
 #   http://www.opencsw.org/mantis/view.php?id=4140
-REQUIRED_PKGS = CSWpmversion CSWpmnetaddrip
+RUNTIME_DEP_PKGS = CSWpmversion CSWpmnetaddrip
 
 ARCHALL = 1
 

Modified: csw/mgar/pkg/cpan/Module-Build/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Module-Build/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/Module-Build/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -16,8 +16,8 @@
 PACKAGES = CSWpmmodulebuild
 CATALOGNAME = pm_modulebuild
 
-REQUIRED_PKGS = CSWpmarchivetar CSWpmextutparsexs CSWpmextutcbuilder CSWpmmodulesign
-PREREQUISITE_PKGS = CSWperl
+RUNTIME_DEP_PKGS = CSWpmarchivetar CSWpmextutparsexs CSWpmextutcbuilder CSWpmmodulesign
+BUILD_DEP_PKGS = CSWperl
 
 ARCHALL = 1
 

Modified: csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -11,7 +11,7 @@
 
 DISTFILES += $(call admfiles,CSWpmmodloadcond,)
 
-REQUIRED_PKGS = CSWpmprmscheck CSWpmmodload CSWpmlclemktxtsimple
+RUNTIME_DEP_PKGS = CSWpmprmscheck CSWpmmodload CSWpmlclemktxtsimple
 
 #SKIPTEST = 1
 

Modified: csw/mgar/pkg/cpan/Net-Analysis/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Net-Analysis/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/Net-Analysis/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -14,6 +14,6 @@
 CATALOGNAME = pm_netanalysis
 
 # depends
-PREREQUISITE_PKGS = CSWpmnetpcap CSWpmnetpacket CSWpmtstmockobject
+BUILD_DEP_PKGS = CSWpmnetpcap CSWpmnetpacket CSWpmtstmockobject
 
 include gar/category.mk

Modified: csw/mgar/pkg/cpan/Net-DNS/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Net-DNS/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/Net-DNS/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -15,7 +15,7 @@
 
 DISTFILES += COPYING
 
-REQUIRED_PKGS = CSWpmdigesthmac CSWpmnetip
+RUNTIME_DEP_PKGS = CSWpmdigesthmac CSWpmnetip
 
 DEPENDS += cpan/Net-IP
 

Modified: csw/mgar/pkg/cpan/Net-NIS/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Net-NIS/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/Net-NIS/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -11,7 +11,7 @@
 PACKAGES = CSWpmnetnis
 CATALOGNAME = pm_netnis
 
-REQUIRED_PKGS = SUNWnisu
+RUNTIME_DEP_PKGS = SUNWnisu
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/cpan/Net-Pcap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Net-Pcap/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/Net-Pcap/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -13,7 +13,7 @@
 CATALOGNAME = pm_netpcap
 
 # depends
-REQUIRED_PKGS     = CSWlibpcap
-PREREQUISITE_PKGS = CSWlibpcap CSWlibpcapdevel
+RUNTIME_DEP_PKGS     = CSWlibpcap
+BUILD_DEP_PKGS = CSWlibpcap CSWlibpcapdevel
 
 include gar/category.mk

Modified: csw/mgar/pkg/cpan/Net-SMTP-SSL/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Net-SMTP-SSL/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/Net-SMTP-SSL/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -19,8 +19,8 @@
 PACKAGES = CSWpmnetsmtpssl
 CATALOGNAME_CSWpmnetsmtpssl = pm_netsmtpssl
 
-PREREQUISITE_PKGS = CSWperl
-REQUIRED_PKGS = CSWpmiosocketssl
+BUILD_DEP_PKGS = CSWperl
+RUNTIME_DEP_PKGS = CSWpmiosocketssl
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/cpan/Net-SSLeay/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Net-SSLeay/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/Net-SSLeay/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -17,8 +17,8 @@
 PACKAGES = CSWpmnetssleay
 CATALOGNAME = pm_netssleay
 
-REQUIRED_PKGS = CSWosslrt
-PREREQUISITE_PKGS = CSWossldevel
+RUNTIME_DEP_PKGS = CSWosslrt
+BUILD_DEP_PKGS = CSWossldevel
 
 PERL_CONFIGURE_ARGS = $(prefix) INSTALLDIRS=vendor
 

Modified: csw/mgar/pkg/cpan/Object-Accessor/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Object-Accessor/trunk/Makefile	2010-02-03 16:53:31 UTC (rev 8334)
+++ csw/mgar/pkg/cpan/Object-Accessor/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
@@ -14,7 +14,7 @@
 
 ARCHALL_CSWpmobjaccessor = 1
 
-REQUIRED_PKGS_CSWpmobjaccessor += CSWpmprmscheck
+RUNTIME_DEP_PKGS_CSWpmobjaccessor += CSWpmprmscheck
 
 LICENSE = README
 

Modified: csw/mgar/pkg/cpan/PDF-API2/trunk/Makefile
===================================================================

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


More information about the devel mailing list