pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Simply and speed up buildlink3.mk files and processing.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/e051c1cb735c
branches:  trunk
changeset: 556376:e051c1cb735c
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Mar 20 19:23:50 2009 +0000

description:
Simply and speed up buildlink3.mk files and processing.
This changes the buildlink3.mk files to use an include guard for the
recursive include. The use of BUILDLINK_DEPTH, BUILDLINK_DEPENDS,
BUILDLINK_PACKAGES and BUILDLINK_ORDER is handled by a single new
variable BUILDLINK_TREE. Each buildlink3.mk file adds a pair of
enter/exit marker, which can be used to reconstruct the tree and
to determine first level includes. Avoiding := for large variables
(BUILDLINK_ORDER) speeds up parse time as += has linear complexity.
The include guard reduces system time by avoiding reading files over and
over again. For complex packages this reduces both %user and %sys time to
half of the former time.

diffstat:

 archivers/bzip2/buildlink3.mk                     |  19 ++----
 archivers/libarchive/buildlink3.mk                |  19 ++----
 archivers/libcomprex/buildlink3.mk                |  19 ++----
 archivers/liblzo/buildlink3.mk                    |  19 ++----
 archivers/libzip/buildlink3.mk                    |  19 ++----
 archivers/lzmalib/buildlink3.mk                   |  19 ++----
 archivers/lzo/buildlink3.mk                       |  19 ++----
 archivers/szip/buildlink3.mk                      |  19 ++----
 archivers/zziplib/buildlink3.mk                   |  19 ++----
 audio/SDL_mixer/buildlink3.mk                     |  19 ++----
 audio/SDL_sound/buildlink3.mk                     |  19 ++----
 audio/adplug/buildlink3.mk                        |  19 ++----
 audio/akode/buildlink3.mk                         |  19 ++----
 audio/alsa-lib/buildlink3.mk                      |  19 ++----
 audio/arts/buildlink3.mk                          |  19 ++----
 audio/audacious/buildlink3.mk                     |  19 ++----
 audio/bmp/buildlink3.mk                           |  19 ++----
 audio/cddb-bundle/buildlink3.mk                   |  19 ++----
 audio/cdparanoia/buildlink3.mk                    |  19 ++----
 audio/cdplayer/buildlink3.mk                      |  19 ++----
 audio/celt/buildlink3.mk                          |  19 ++----
 audio/esound/buildlink3.mk                        |  19 ++----
 audio/espeak/buildlink3.mk                        |  19 ++----
 audio/faac/buildlink3.mk                          |  19 ++----
 audio/faad2/buildlink3.mk                         |  19 ++----
 audio/flac/buildlink3.mk                          |  19 ++----
 audio/fluidsynth/buildlink3.mk                    |  19 ++----
 audio/freealut/buildlink3.mk                      |  19 ++----
 audio/gnome-speech/buildlink3.mk                  |  19 ++----
 audio/goom/buildlink3.mk                          |  19 ++----
 audio/gsm/buildlink3.mk                           |  19 ++----
 audio/id3lib/buildlink3.mk                        |  19 ++----
 audio/jack/buildlink3.mk                          |  19 ++----
 audio/ladspa/buildlink3.mk                        |  19 ++----
 audio/lame/buildlink3.mk                          |  19 ++----
 audio/liba52/buildlink3.mk                        |  19 ++----
 audio/libao/buildlink3.mk                         |  19 ++----
 audio/libaudiofile/buildlink3.mk                  |  19 ++----
 audio/libcanberra/buildlink3.mk                   |  19 ++----
 audio/libcdaudio/buildlink3.mk                    |  19 ++----
 audio/libcddb/buildlink3.mk                       |  19 ++----
 audio/libdca/buildlink3.mk                        |  19 ++----
 audio/libdiscid/buildlink3.mk                     |  19 ++----
 audio/libgpod/buildlink3.mk                       |  19 ++----
 audio/libhydrogen/buildlink3.mk                   |  19 ++----
 audio/libid3tag/buildlink3.mk                     |  19 ++----
 audio/libmad/buildlink3.mk                        |  19 ++----
 audio/libmikmod/buildlink3.mk                     |  19 ++----
 audio/libmodplug/buildlink3.mk                    |  19 ++----
 audio/libmp3splt/buildlink3.mk                    |  19 ++----
 audio/libmpcdec/buildlink3.mk                     |  19 ++----
 audio/libmpd/buildlink3.mk                        |  19 ++----
 audio/libmpg123/buildlink3.mk                     |  19 ++----
 audio/libmusepack/buildlink3.mk                   |  19 ++----
 audio/libmusicbrainz/buildlink3.mk                |  19 ++----
 audio/libofa/buildlink3.mk                        |  19 ++----
 audio/libopenspc/buildlink3.mk                    |  19 ++----
 audio/libsamplerate/buildlink3.mk                 |  19 ++----
 audio/libshout/buildlink3.mk                      |  19 ++----
 audio/libsidplay/buildlink3.mk                    |  19 ++----
 audio/libsidplay2/buildlink3.mk                   |  19 ++----
 audio/libsndfile/buildlink3.mk                    |  19 ++----
 audio/libspiff/buildlink3.mk                      |  19 ++----
 audio/libtunepimp/buildlink3.mk                   |  19 ++----
 audio/libvisual/buildlink3.mk                     |  19 ++----
 audio/libvisual0.2/buildlink3.mk                  |  19 ++----
 audio/libvorbis/buildlink3.mk                     |  19 ++----
 audio/mac/buildlink3.mk                           |  19 ++----
 audio/musicbrainz/buildlink3.mk                   |  19 ++----
 audio/nas/buildlink3.mk                           |  19 ++----
 audio/openal/buildlink3.mk                        |  19 ++----
 audio/portaudio-devel/buildlink3.mk               |  19 ++----
 audio/portaudio/buildlink3.mk                     |  19 ++----
 audio/pulseaudio/buildlink3.mk                    |  19 ++----
 audio/py-mpd/buildlink3.mk                        |  19 ++----
 audio/py-mutagen/buildlink3.mk                    |  19 ++----
 audio/py-ogg/buildlink3.mk                        |  19 ++----
 audio/rplay/buildlink3.mk                         |  19 ++----
 audio/speex/buildlink3.mk                         |  19 ++----
 audio/streamtuner/buildlink3.mk                   |  19 ++----
 audio/sweep/buildlink3.mk                         |  19 ++----
 audio/taglib/buildlink3.mk                        |  19 ++----
 audio/tremor/buildlink3.mk                        |  19 ++----
 audio/twolame/buildlink3.mk                       |  19 ++----
 audio/wavpack/buildlink3.mk                       |  19 ++----
 audio/wsoundserver/buildlink3.mk                  |  19 ++----
 audio/xfce4-mixer/buildlink3.mk                   |  19 ++----
 audio/xfce4-xmms-plugin/buildlink3.mk             |  19 ++----
 audio/xmms-meta-input/buildlink3.mk               |  19 ++----
 audio/xmms/buildlink3.mk                          |  19 ++----
 cad/gplcver/buildlink3.mk                         |  19 ++----
 cad/libgeda/buildlink3.mk                         |  19 ++----
 cad/libwcalc/buildlink3.mk                        |  19 ++----
 cad/verilog-current/buildlink3.mk                 |  19 ++----
 cad/verilog/buildlink3.mk                         |  19 ++----
 chat/ekg/buildlink3.mk                            |  19 ++----
 chat/empathy/buildlink3.mk                        |  19 ++----
 chat/gale/buildlink3.mk                           |  19 ++----
 chat/jabberd/buildlink3.mk                        |  19 ++----
 chat/libirc/buildlink3.mk                         |  19 ++----
 chat/libmsn/buildlink3.mk                         |  19 ++----
 chat/libotr/buildlink3.mk                         |  19 ++----
 chat/libpurple/buildlink3.mk                      |  19 ++----
 chat/libtelepathy/buildlink3.mk                   |  19 ++----
 chat/libtlen/buildlink3.mk                        |  19 ++----
 chat/loudmouth/buildlink3.mk                      |  19 ++----
 chat/meanwhile/buildlink3.mk                      |  19 ++----
 chat/pidgin/buildlink3.mk                         |  19 ++----
 chat/riece/buildlink3.mk                          |  19 ++----
 chat/telepathy-glib/buildlink3.mk                 |  19 ++----
 chat/telepathy-mission-control/buildlink3.mk      |  19 ++----
 chat/zephyr/buildlink3.mk                         |  19 ++----
 comms/gnome-pilot/buildlink3.mk                   |  19 ++----
 comms/jpilot/buildlink3.mk                        |  19 ++----
 comms/libmal/buildlink3.mk                        |  19 ++----
 comms/libopensync/buildlink3.mk                   |  19 ++----
 comms/libsyncml/buildlink3.mk                     |  19 ++----
 comms/obexftp/buildlink3.mk                       |  19 ++----
 comms/openobex/buildlink3.mk                      |  19 ++----
 comms/pilot-link-libs/buildlink3.mk               |  19 ++----
 comms/synce-librapi2/buildlink3.mk                |  19 ++----
 comms/synce-libsynce/buildlink3.mk                |  19 ++----
 comms/zaptel-netbsd/buildlink3.mk                 |  19 ++----
 converters/TECkit/buildlink3.mk                   |  19 ++----
 converters/fribidi/buildlink3.mk                  |  19 ++----
 converters/libiconv/buildlink3.mk                 |  19 ++----
 converters/libwpd/buildlink3.mk                   |  19 ++----
 converters/psiconv/buildlink3.mk                  |  19 ++----
 converters/qrencode/buildlink3.mk                 |  19 ++----
 converters/recode/buildlink3.mk                   |  19 ++----
 converters/uulib/buildlink3.mk                    |  19 ++----
 converters/wv/buildlink3.mk                       |  19 ++----
 converters/wv2/buildlink3.mk                      |  19 ++----
 cross/binutils/buildlink3.mk                      |  19 ++----
 databases/bdb-xml/buildlink3.mk                   |  19 ++----
 databases/db/buildlink3.mk                        |  19 ++----
 databases/db3/buildlink3.mk                       |  19 ++----
 databases/db4/buildlink3.mk                       |  19 ++----
 databases/db46/buildlink3.mk                      |  19 ++----
 databases/dbh/buildlink3.mk                       |  19 ++----
 databases/edb/buildlink3.mk                       |  19 ++----
 databases/freetds/buildlink3.mk                   |  19 ++----
 databases/gdbm/buildlink3.mk                      |  19 ++----
 databases/gnome-mime-data/buildlink3.mk           |  22 ++-----
 databases/iodbc/buildlink3.mk                     |  19 ++----
 databases/libgda/buildlink3.mk                    |  19 ++----
 databases/libgnomedb/buildlink3.mk                |  19 ++----
 databases/libpqxx/buildlink3.mk                   |  19 ++----
 databases/metakit-lib/buildlink3.mk               |  19 ++----
 databases/mysql4-client/buildlink3.mk             |  19 ++----
 databases/mysql5-client/buildlink3.mk             |  19 ++----
 databases/openldap-client/buildlink3.mk           |  19 ++----
 databases/p5-DBI/buildlink3.mk                    |  19 ++----
 databases/php-pdo/buildlink3.mk                   |  19 ++----
 databases/postgresql81-client/buildlink3.mk       |  19 ++----
 databases/postgresql82-client/buildlink3.mk       |  19 ++----
 databases/postgresql83-client/buildlink3.mk       |  19 ++----
 databases/py-ZODB/buildlink3.mk                   |  19 ++----
 databases/py-bsddb3/buildlink3.mk                 |  19 ++----
 databases/py-ldap/buildlink3.mk                   |  19 ++----
 databases/py-metakit/buildlink3.mk                |  19 ++----
 databases/py-psycopg/buildlink3.mk                |  19 ++----
 databases/py-sqlite2/buildlink3.mk                |  19 ++----
 databases/qdbm/buildlink3.mk                      |  19 ++----
 databases/rrdtool/buildlink3.mk                   |  19 ++----
 databases/rrdtool12/buildlink3.mk                 |  19 ++----
 databases/sdbm/buildlink3.mk                      |  19 ++----
 databases/shared-mime-info/buildlink3.mk          |  19 ++----
 databases/sqlite/buildlink3.mk                    |  19 ++----
 databases/sqlite3/buildlink3.mk                   |  19 ++----
 databases/tdb/buildlink3.mk                       |  19 ++----
 databases/tinycdb/buildlink3.mk                   |  19 ++----
 databases/tokyocabinet/buildlink3.mk              |  19 ++----
 databases/unixodbc/buildlink3.mk                  |  19 ++----
 devel/GConf-ui/buildlink3.mk                      |  19 ++----
 devel/GConf/buildlink3.mk                         |  21 ++-----
 devel/Renaissance/buildlink3.mk                   |  19 ++----
 devel/SDL/buildlink3.mk                           |  19 ++----
 devel/SDL_Pango/buildlink3.mk                     |  19 ++----
 devel/SDL_gfx/buildlink3.mk                       |  19 ++----
 devel/SDL_ttf/buildlink3.mk                       |  19 ++----
 devel/SDLmm/buildlink3.mk                         |  19 ++----
 devel/allegro/buildlink3.mk                       |  19 ++----
 devel/apel/buildlink3.mk                          |  19 ++----
 devel/apr-util/buildlink3.mk                      |  19 ++----
 devel/apr/buildlink3.mk                           |  20 ++----
 devel/apr0/buildlink3.mk                          |  20 ++----
 devel/argp/buildlink3.mk                          |  19 ++----
 devel/at-spi/buildlink3.mk                        |  19 ++----
 devel/atk/buildlink3.mk                           |  19 ++----
 devel/bglibs/buildlink3.mk                        |  19 ++----
 devel/binutils/buildlink3.mk                      |  19 ++----
 devel/blib/buildlink3.mk                          |  19 ++----
 devel/boehm-gc/buildlink3.mk                      |  19 ++----
 devel/boost-build/buildlink3.mk                   |  19 ++----
 devel/boost-headers/buildlink3.mk                 |  19 ++----
 devel/boost-jam/buildlink3.mk                     |  19 ++----
 devel/boost-libs/buildlink3.mk                    |  19 ++----
 devel/boost-python/buildlink3.mk                  |  19 ++----
 devel/buddy/buildlink3.mk                         |  19 ++----
 devel/cdk/buildlink3.mk                           |  19 ++----
 devel/cfitsio/buildlink3.mk                       |  19 ++----
 devel/check/buildlink3.mk                         |  19 ++----
 devel/chmlib/buildlink3.mk                        |  19 ++----
 devel/cmake/buildlink3.mk                         |  19 ++----
 devel/compiz-bcop/buildlink3.mk                   |  19 ++----
 devel/confuse/buildlink3.mk                       |  19 ++----
 devel/cppunit/buildlink3.mk                       |  19 ++----
 devel/cunit/buildlink3.mk                         |  19 ++----
 devel/darts/buildlink3.mk                         |  19 ++----
 devel/devIL/buildlink3.mk                         |  19 ++----
 devel/devhelp/buildlink3.mk                       |  19 ++----
 devel/dlcompat/buildlink3.mk                      |  19 ++----
 devel/dmalloc/buildlink3.mk                       |  19 ++----
 devel/edcommon/buildlink3.mk                      |  19 ++----
 devel/eel/buildlink3.mk                           |  19 ++----
 devel/eet/buildlink3.mk                           |  19 ++----
 devel/elib/buildlink3.mk                          |  19 ++----
 devel/exempi/buildlink3.mk                        |  19 ++----
 devel/fann-devel/buildlink3.mk                    |  19 ++----
 devel/fann/buildlink3.mk                          |  20 ++----
 devel/ffcall/buildlink3.mk                        |  19 ++----
 devel/flex/buildlink3.mk                          |  19 ++----
 devel/flim/buildlink3.mk                          |  19 ++----
 devel/florist/buildlink3.mk                       |  19 ++----
 devel/g-wrap/buildlink3.mk                        |  19 ++----
 devel/gconfmm/buildlink3.mk                       |  19 ++----
 devel/gdbada/buildlink3.mk                        |  19 ++----
 devel/gdl/buildlink3.mk                           |  19 ++----
 devel/gettext-asprintf/buildlink3.mk              |  19 ++----
 devel/gettext-lib/buildlink3.mk                   |  19 ++----
 devel/giblib/buildlink3.mk                        |  19 ++----
 devel/glade3/buildlink3.mk                        |  19 ++----
 devel/glib/buildlink3.mk                          |  19 ++----
 devel/glib2/buildlink3.mk                         |  19 ++----
 devel/glibmm/buildlink3.mk                        |  19 ++----
 devel/gmp/buildlink3.mk                           |  19 ++----
 devel/gnome-build/buildlink3.mk                   |  19 ++----
 devel/gnustep-base/buildlink3.mk                  |  20 ++----
 devel/gnustep-make/buildlink3.mk                  |  20 ++----
 devel/gnustep-objc-lf2/buildlink3.mk              |  19 ++----
 devel/gnustep-objc/buildlink3.mk                  |  19 ++----
 devel/gob2/buildlink3.mk                          |  19 ++----
 devel/gperf/buildlink3.mk                         |  19 ++----
 devel/gtl/buildlink3.mk                           |  19 ++----
 devel/guile-gtk/buildlink3.mk                     |  19 ++----
 devel/guile16-gtk/buildlink3.mk                   |  19 ++----
 devel/hdf/buildlink3.mk                           |  19 ++----
 devel/hdf5/buildlink3.mk                          |  19 ++----
 devel/kdesdk3/buildlink3.mk                       |  19 ++----
 devel/ldapsdk/buildlink3.mk                       |  19 ++----
 devel/libFoundation/buildlink3.mk                 |  22 ++-----
 devel/libargparse/buildlink3.mk                   |  19 ++----
 devel/libast/buildlink3.mk                        |  19 ++----
 devel/libatomic_ops/buildlink3.mk                 |  19 ++----
 devel/libbegemot/buildlink3.mk                    |  19 ++----
 devel/libbinio/buildlink3.mk                      |  19 ++----
 devel/libbonobo/buildlink3.mk                     |  19 ++----
 devel/libbonoboui/buildlink3.mk                   |  19 ++----
 devel/libcfg+/buildlink3.mk                       |  19 ++----
 devel/libcompizconfig/buildlink3.mk               |  19 ++----
 devel/libconfig/buildlink3.mk                     |  19 ++----
 devel/libdaemon/buildlink3.mk                     |  19 ++----
 devel/libdatrie/buildlink3.mk                     |  19 ++----
 devel/libdnsres/buildlink3.mk                     |  19 ++----
 devel/libdockapp/buildlink3.mk                    |  19 ++----
 devel/libebml/buildlink3.mk                       |  19 ++----
 devel/libelf/buildlink3.mk                        |  19 ++----
 devel/libetm/buildlink3.mk                        |  19 ++----
 devel/libevent/buildlink3.mk                      |  19 ++----
 devel/libextractor/buildlink3.mk                  |  19 ++----
 devel/libffi/buildlink3.mk                        |  19 ++----
 devel/libfirm/buildlink3.mk                       |  19 ++----
 devel/libgail-gnome/buildlink3.mk                 |  19 ++----
 devel/libgcroots/buildlink3.mk                    |  19 ++----
 devel/libgee/buildlink3.mk                        |  19 ++----
 devel/libgetopt/buildlink3.mk                     |  19 ++----
 devel/libglade/buildlink3.mk                      |  19 ++----
 devel/libglademm/buildlink3.mk                    |  19 ++----
 devel/libgnome/buildlink3.mk                      |  19 ++----
 devel/libgnomemm/buildlink3.mk                    |  19 ++----
 devel/libgnomeui/buildlink3.mk                    |  19 ++----
 devel/libgnomeuimm/buildlink3.mk                  |  19 ++----
 devel/libgphoto2/buildlink3.mk                    |  19 ++----
 devel/libgsf/buildlink3.mk                        |  19 ++----
 devel/libgweather/buildlink3.mk                   |  19 ++----
 devel/libhfs/buildlink3.mk                        |  19 ++----
 devel/libiberty/buildlink3.mk                     |  19 ++----
 devel/libidn/buildlink3.mk                        |  19 ++----
 devel/libixp/buildlink3.mk                        |  19 ++----
 devel/libjit/buildlink3.mk                        |  19 ++----
 devel/libjudy/buildlink3.mk                       |  19 ++----
 devel/libltdl/buildlink3.mk                       |  20 ++----
 devel/libmaa/buildlink3.mk                        |  19 ++----
 devel/libmatchbox/buildlink3.mk                   |  19 ++----
 devel/libmcs/buildlink3.mk                        |  19 ++----
 devel/libmemcache/buildlink3.mk                   |  19 ++----
 devel/libmemmgr/buildlink3.mk                     |  19 ++----
 devel/libmimedir/buildlink3.mk                    |  19 ++----
 devel/libmm/buildlink3.mk                         |  19 ++----
 devel/libmowgli/buildlink3.mk                     |  19 ++----
 devel/libmtp/buildlink3.mk                        |  19 ++----
 devel/libnet10/buildlink3.mk                      |  19 ++----
 devel/libnet11/buildlink3.mk                      |  19 ++----
 devel/libntlm/buildlink3.mk                       |  19 ++----
 devel/liboil/buildlink3.mk                        |  19 ++----
 devel/liboop/buildlink3.mk                        |  19 ++----
 devel/libosip/buildlink3.mk                       |  19 ++----
 devel/libowfat/buildlink3.mk                      |  19 ++----
 devel/libportlib/buildlink3.mk                    |  19 ++----
 devel/libproplist/buildlink3.mk                   |  19 ++----
 devel/librfuncs/buildlink3.mk                     |  19 ++----
 devel/librlog/buildlink3.mk                       |  19 ++----
 devel/librsync/buildlink3.mk                      |  19 ++----
 devel/librxspencer/buildlink3.mk                  |  19 ++----
 devel/libscsi/buildlink3.mk                       |  19 ++----
 devel/libsexy/buildlink3.mk                       |  19 ++----
 devel/libsexymm/buildlink3.mk                     |  19 ++----
 devel/libsigc++/buildlink3.mk                     |  19 ++----
 devel/libsigc++1/buildlink3.mk                    |  19 ++----
 devel/libsigsegv/buildlink3.mk                    |  19 ++----
 devel/libsigsegv25/buildlink3.mk                  |  19 ++----
 devel/libslang/buildlink3.mk                      |  19 ++----
 devel/libslang2/buildlink3.mk                     |  19 ++----
 devel/libsmi/buildlink3.mk                        |  19 ++----
 devel/libstatgrab/buildlink3.mk                   |  19 ++----
 devel/libstroke/buildlink3.mk                     |  19 ++----
 devel/libtai/buildlink3.mk                        |  19 ++----
 devel/libtar/buildlink3.mk                        |  19 ++----
 devel/libtecla/buildlink3.mk                      |  19 ++----
 devel/libthai/buildlink3.mk                       |  19 ++----
 devel/libts/buildlink3.mk                         |  19 ++----
 devel/libusb/buildlink3.mk                        |  19 ++----
 devel/libvolume_id/buildlink3.mk                  |  19 ++----
 devel/libwnck/buildlink3.mk                       |  19 ++----
 devel/lwp/buildlink3.mk                           |  19 ++----
 devel/m17n-lib/buildlink3.mk                      |  19 ++----
 devel/mell/buildlink3.mk                          |  19 ++----
 devel/mono-addins/buildlink3.mk                   |  19 ++----
 devel/mono-tools/buildlink3.mk                    |  19 ++----
 devel/ncurses/buildlink3.mk                       |  20 ++----
 devel/ncursesw/buildlink3.mk                      |  19 ++----
 devel/netcdf/buildlink3.mk                        |  19 ++----
 devel/newt/buildlink3.mk                          |  19 ++----
 devel/nspr/buildlink3.mk                          |  21 ++-----
 devel/nss/buildlink3.mk                           |  22 ++-----
 devel/ode/buildlink3.mk                           |  19 ++----
 devel/ogre/buildlink3.mk                          |  19 ++----
 devel/opal/buildlink3.mk                          |  19 ++----
 devel/ossp-uuid/buildlink3.mk                     |  19 ++----
 devel/p5-B-Hooks-OP-Check/buildlink3.mk           |  19 ++----
 devel/p5-B-Hooks-OP-PPAddr/buildlink3.mk          |  19 ++----
 devel/p5-B-Hooks-Parser/buildlink3.mk             |  19 ++----
 devel/p5-glib2/buildlink3.mk                      |  19 ++----
 devel/pango/buildlink3.mk                         |  19 ++----
 devel/pangomm/buildlink3.mk                       |  19 ++----
 devel/pccts/buildlink3.mk                         |  19 ++----
 devel/pcre++/buildlink3.mk                        |  19 ++----
 devel/pcre-ocaml/buildlink3.mk                    |  19 ++----
 devel/pcre/buildlink3.mk                          |  19 ++----
 devel/pdcurses/buildlink3.mk                      |  20 ++----
 devel/physfs/buildlink3.mk                        |  19 ++----
 devel/popt/buildlink3.mk                          |  19 ++----
 devel/pth/buildlink3.mk                           |  19 ++----
 devel/pthread-sem/buildlink3.mk                   |  19 ++----
 devel/pthread-stublib/buildlink3.mk               |  19 ++----
 devel/ptlib/buildlink3.mk                         |  19 ++----
 devel/pwlib/buildlink3.mk                         |  19 ++----
 devel/py-at-spi/buildlink3.mk                     |  19 ++----
 devel/py-compizconfig/buildlink3.mk               |  20 ++----
 devel/py-ctypes/buildlink3.mk                     |  19 ++----
 devel/py-curses/buildlink3.mk                     |  19 ++----
 devel/py-cursespanel/buildlink3.mk                |  19 ++----
 devel/py-game/buildlink3.mk                       |  20 ++----
 devel/py-gobject-shared/buildlink3.mk             |  19 ++----
 devel/py-gobject/buildlink3.mk                    |  19 ++----
 devel/py-pexpect/buildlink3.mk                    |  19 ++----
 devel/py-readline/buildlink3.mk                   |  21 ++-----
 devel/qof/buildlink3.mk                           |  19 ++----
 devel/readline/buildlink3.mk                      |  19 ++----
 devel/rpc2/buildlink3.mk                          |  19 ++----
 devel/ruby-gnome2-glib/buildlink3.mk              |  19 ++----
 devel/ruby-gnome2-pango/buildlink3.mk             |  19 ++----
 devel/rudiments/buildlink3.mk                     |  16 +---
 devel/rvm/buildlink3.mk                           |  19 ++----
 devel/rx/buildlink3.mk                            |  19 ++----
 devel/sapnwrfcsdk/buildlink3.mk                   |  20 ++----
 devel/semantic/buildlink3.mk                      |  19 ++----
 devel/semi/buildlink3.mk                          |  19 ++----
 devel/sgb/buildlink3.mk                           |  19 ++----
 devel/silc-toolkit/buildlink3.mk                  |  19 ++----
 devel/subversion-base/buildlink3.mk               |  20 ++----
 devel/swig/buildlink3.mk                          |  19 ++----
 devel/syncdir/buildlink3.mk                       |  19 ++----
 devel/sysexits/buildlink3.mk                      |  19 ++----
 devel/tcl-tclcl/buildlink3.mk                     |  19 ++----
 devel/teem/buildlink3.mk                          |  20 ++----
 devel/tre/buildlink3.mk                           |  19 ++----
 devel/ucl/buildlink3.mk                           |  19 ++----
 devel/vanessa_adt/buildlink3.mk                   |  19 ++----
 devel/vanessa_logger/buildlink3.mk                |  19 ++----
 devel/vanessa_socket/buildlink3.mk                |  19 ++----
 devel/xfce4-dev-tools/buildlink3.mk               |  19 ++----
 devel/zlib/buildlink3.mk                          |  19 ++----
 editors/emacs-nox11/buildlink3.mk                 |  19 ++----
 editors/emacs/buildlink3.mk                       |  19 ++----
 editors/emacs20/buildlink3.mk                     |  19 ++----
 editors/emacs21-nox11/buildlink3.mk               |  19 ++----
 editors/emacs21/buildlink3.mk                     |  19 ++----
 editors/gedit/buildlink3.mk                       |  19 ++----
 editors/mule-ucs/buildlink3.mk                    |  19 ++----
 editors/obby/buildlink3.mk                        |  19 ++----
 editors/pico/buildlink3.mk                        |  19 ++----
 editors/sam/buildlink3.mk                         |  19 ++----
 editors/speedbar/buildlink3.mk                    |  19 ++----
 editors/xemacs-current-nox11/buildlink3.mk        |  19 ++----
 editors/xemacs-current/buildlink3.mk              |  19 ++----
 editors/xemacs-nox11/buildlink3.mk                |  19 ++----
 editors/xemacs/buildlink3.mk                      |  19 ++----
 editors/xfce4-mousepad/buildlink3.mk              |  19 ++----
 emulators/DatLib/buildlink3.mk                    |  19 ++----
 emulators/cygwin_lib/buildlink3.mk                |  19 ++----
 emulators/gpsim-devel/buildlink3.mk               |  19 ++----
 emulators/libspectrum/buildlink3.mk               |  19 ++----
 emulators/lrmi/buildlink3.mk                      |  19 ++----
 emulators/wine-devel/buildlink3.mk                |  19 ++----
 emulators/wine/buildlink3.mk                      |  19 ++----
 filesystems/fuse/buildlink3.mk                    |  19 ++----
 filesystems/py-fuse-bindings/buildlink3.mk        |  19 ++----
 finance/gnucash/buildlink3.mk                     |  19 ++----
 finance/libofx/buildlink3.mk                      |  19 ++----
 fonts/Xft2/buildlink3.mk                          |  19 ++----
 fonts/font-util/buildlink3.mk                     |  19 ++----
 fonts/fontconfig/buildlink3.mk                    |  19 ++----
 fonts/gucharmap/buildlink3.mk                     |  19 ++----
 fonts/libfontenc/buildlink3.mk                    |  19 ++----
 fonts/mftrace/buildlink3.mk                       |  19 ++----
 fonts/t1lib/buildlink3.mk                         |  19 ++----
 games/ggz-client-libs/buildlink3.mk               |  19 ++----
 games/kdegames3/buildlink3.mk                     |  19 ++----
 games/libggz/buildlink3.mk                        |  19 ++----
 games/plib/buildlink3.mk                          |  19 ++----
 games/simgear/buildlink3.mk                       |  19 ++----
 geography/gdal-lib/buildlink3.mk                  |  19 ++----
 geography/geos/buildlink3.mk                      |  19 ++----
 geography/gpsd/buildlink3.mk                      |  19 ++----
 geography/shapelib/buildlink3.mk                  |  19 ++----
 graphics/Coin/buildlink3.mk                       |  18 +----
 graphics/GLXKit/buildlink3.mk                     |  19 ++----
 graphics/GUIlib/buildlink3.mk                     |  19 ++----
 graphics/GeometryKit/buildlink3.mk                |  19 ++----
 graphics/GlutKit/buildlink3.mk                    |  19 ++----
 graphics/GraphicsMagick/buildlink3.mk             |  19 ++----
 graphics/ImageMagick/buildlink3.mk                |  19 ++----
 graphics/MesaLib/buildlink3.mk                    |  20 ++----
 graphics/MesaLib/builtin.mk                       |   6 +-
 graphics/OpenRM/buildlink3.mk                     |  19 ++----
 graphics/RenderKit/buildlink3.mk                  |  19 ++----
 graphics/SDLKit/buildlink3.mk                     |  19 ++----
 graphics/SDL_image/buildlink3.mk                  |  19 ++----
 graphics/aalib/buildlink3.mk                      |  19 ++----
 graphics/agg/buildlink3.mk                        |  19 ++----
 graphics/babl/buildlink3.mk                       |  19 ++----
 graphics/cairo/buildlink3.mk                      |  19 ++----
 graphics/cairomm/buildlink3.mk                    |  19 ++----
 graphics/cal3d/buildlink3.mk                      |  19 ++----
 graphics/camlimages/buildlink3.mk                 |  19 ++----
 graphics/clutter-cairo/buildlink3.mk              |  19 ++----
 graphics/clutter-gtk/buildlink3.mk                |  19 ++----
 graphics/clutter/buildlink3.mk                    |  19 ++----
 graphics/compface/buildlink3.mk                   |  19 ++----
 graphics/digikam/buildlink3.mk                    |  19 ++----
 graphics/djvulibre-lib/buildlink3.mk              |  19 ++----
 graphics/epeg/buildlink3.mk                       |  18 ++----
 graphics/evas-buffer/buildlink3.mk                |  19 ++----
 graphics/evas-software-x11/buildlink3.mk          |  19 ++----
 graphics/evas/buildlink3.mk                       |  19 ++----
 graphics/exiv2/buildlink3.mk                      |  19 ++----
 graphics/fnlib/buildlink3.mk                      |  19 ++----
 graphics/freeglut/buildlink3.mk                   |  19 ++----
 graphics/freetype-lib/buildlink3.mk               |  19 ++----
 graphics/freetype2/buildlink3.mk                  |  20 ++----
 graphics/gd/buildlink3.mk                         |  19 ++----
 graphics/gdchart/buildlink3.mk                    |  19 ++----
 graphics/gdk-pixbuf/buildlink3.mk                 |  19 ++----
 graphics/gegl/buildlink3.mk                       |  19 ++----
 graphics/gimp/buildlink3.mk                       |  19 ++----
 graphics/gimp1-base/buildlink3.mk                 |  19 ++----
 graphics/gle/buildlink3.mk                        |  19 ++----
 graphics/glew/buildlink3.mk                       |  19 ++----
 graphics/glitz/buildlink3.mk                      |  19 ++----
 graphics/glu/buildlink3.mk                        |  19 ++----
 graphics/glut/buildlink3.mk                       |  19 ++----
 graphics/gnome-icon-theme/buildlink3.mk           |  19 ++----
 graphics/goocanvas/buildlink3.mk                  |  19 ++----
 graphics/graphviz/buildlink3.mk                   |  19 ++----
 graphics/gtkglext/buildlink3.mk                   |  19 ++----
 graphics/gtkimageview/buildlink3.mk               |  19 ++----
 graphics/guile-cairo/buildlink3.mk                |  20 ++----
 graphics/hermes/buildlink3.mk                     |  19 ++----
 graphics/hicolor-icon-theme/buildlink3.mk         |  19 ++----
 graphics/icon-naming-utils/buildlink3.mk          |  19 ++----
 graphics/ilmbase/buildlink3.mk                    |  19 ++----
 graphics/imlib/buildlink3.mk                      |  19 ++----
 graphics/imlib2/buildlink3.mk                     |  19 ++----
 graphics/jasper/buildlink3.mk                     |  19 ++----
 graphics/jpeg/buildlink3.mk                       |  19 ++----
 graphics/kdegraphics3/buildlink3.mk               |  19 ++----
 graphics/kipi-plugins/buildlink3.mk               |  19 ++----
 graphics/lcms/buildlink3.mk                       |  20 ++----
 graphics/lib3ds/buildlink3.mk                     |  19 ++----
 graphics/libart/buildlink3.mk                     |  19 ++----
 graphics/libexif-gtk/buildlink3.mk                |  19 ++----
 graphics/libexif/buildlink3.mk                    |  19 ++----
 graphics/libgdiplus/buildlink3.mk                 |  19 ++----
 graphics/libggi/buildlink3.mk                     |  19 ++----
 graphics/libggiwmh/buildlink3.mk                  |  19 ++----
 graphics/libgii/buildlink3.mk                     |  19 ++----
 graphics/libgnomecanvas/buildlink3.mk             |  19 ++----
 graphics/libgnomecanvasmm/buildlink3.mk           |  19 ++----
 graphics/libkdcraw/buildlink3.mk                  |  19 ++----
 graphics/libkexif/buildlink3.mk                   |  19 ++----
 graphics/libkexiv2/buildlink3.mk                  |  19 ++----
 graphics/libkipi/buildlink3.mk                    |  19 ++----
 graphics/liblqr/buildlink3.mk                     |  19 ++----
 graphics/libotf/buildlink3.mk                     |  19 ++----
 graphics/libpuzzle/buildlink3.mk                  |  19 ++----
 graphics/librsvg/buildlink3.mk                    |  19 ++----
 graphics/libscigraphica/buildlink3.mk             |  19 ++----
 graphics/libungif/buildlink3.mk                   |  19 ++----
 graphics/libv4l/buildlink3.mk                     |  19 ++----
 graphics/libvideogfx/buildlink3.mk                |  19 ++----
 graphics/libwmf/buildlink3.mk                     |  19 ++----
 graphics/mng/buildlink3.mk                        |  19 ++----
 graphics/netpbm/buildlink3.mk                     |  19 ++----
 graphics/openexr/buildlink3.mk                    |  19 ++----
 graphics/p5-cairo/buildlink3.mk                   |  19 ++----
 graphics/pfstools/buildlink3.mk                   |  19 ++----
 graphics/plotutils-nox11/buildlink3.mk            |  19 ++----
 graphics/plotutils/buildlink3.mk                  |  19 ++----
 graphics/png/buildlink3.mk                        |  19 ++----
 graphics/py-cairo/buildlink3.mk                   |  19 ++----
 graphics/py-imaging/buildlink3.mk                 |  19 ++----
 graphics/py-matplotlib/buildlink3.mk              |  19 ++----
 graphics/qimageblitz/buildlink3.mk                |  19 ++----
 graphics/quesoglc/buildlink3.mk                   |  19 ++----
 graphics/ruby-rcairo/buildlink3.mk                |  20 ++----
 graphics/sane-backends/buildlink3.mk              |  19 ++----
 graphics/silgraphite-ft/buildlink3.mk             |  19 ++----
 graphics/silgraphite-xft/buildlink3.mk            |  19 ++----
 graphics/silgraphite/buildlink3.mk                |  19 ++----
 graphics/simage/buildlink3.mk                     |  19 ++----
 graphics/tiff/buildlink3.mk                       |  19 ++----
 graphics/unicap/buildlink3.mk                     |  19 ++----
 graphics/urt/buildlink3.mk                        |  19 ++----
 graphics/wxsvg/buildlink3.mk                      |  19 ++----
 graphics/xfce4-icon-theme/buildlink3.mk           |  19 ++----
 graphics/xpm/buildlink3.mk                        |  19 ++----
 ham/gnuradio-core/buildlink3.mk                   |  19 ++----
 ham/gnuradio-wxgui/buildlink3.mk                  |  19 ++----
 ham/hamlib/buildlink3.mk                          |  19 ++----
 ham/usrp/buildlink3.mk                            |  19 ++----
 inputmethod/anthy/buildlink3.mk                   |  19 ++----
 inputmethod/canna-lib/buildlink3.mk               |  20 ++----
 inputmethod/ja-freewnn-lib/buildlink3.mk          |  19 ++----
 inputmethod/libchewing/buildlink3.mk              |  19 ++----
 inputmethod/libhangul/buildlink3.mk               |  19 ++----
 inputmethod/libtabe/buildlink3.mk                 |  19 ++----
 inputmethod/m17n-im-config/buildlink3.mk          |  19 ++----
 inputmethod/prime/buildlink3.mk                   |  19 ++----
 inputmethod/sj3-lib/buildlink3.mk                 |  19 ++----
 inputmethod/tomoe-gtk/buildlink3.mk               |  19 ++----
 inputmethod/tomoe/buildlink3.mk                   |  19 ++----
 inputmethod/uim/buildlink3.mk                     |  19 ++----
 inputmethod/unicon-im/buildlink3.mk               |  19 ++----
 lang/Cg-compiler/buildlink3.mk                    |  19 ++----
 lang/camlp5/buildlink3.mk                         |  19 ++----
 lang/cdl3/buildlink3.mk                           |  19 ++----
 lang/ecl/buildlink3.mk                            |  19 ++----
 lang/eieio/buildlink3.mk                          |  19 ++----
 lang/elk/buildlink3.mk                            |  19 ++----
 lang/embryo/buildlink3.mk                         |  19 ++----
 lang/erlang/buildlink3.mk                         |  19 ++----
 lang/ezm3/buildlink3.mk                           |  19 ++----
 lang/f2c/buildlink3.mk                            |  19 ++----
 lang/g95/buildlink3.mk                            |  19 ++----
 lang/gambc/buildlink3.mk                          |  19 ++----
 lang/gauche/buildlink3.mk                         |  19 ++----
 lang/gcc/buildlink3.mk                            |  19 ++----
 lang/gcc3-ada/buildlink3.mk                       |  18 ++----
 lang/gcc3-c++/buildlink3.mk                       |  19 ++----
 lang/gcc3-c/buildlink3.mk                         |  19 ++----
 lang/gcc3-f77/buildlink3.mk                       |  19 ++----
 lang/gcc3-java/buildlink3.mk                      |  19 ++----
 lang/gcc3-objc/buildlink3.mk                      |  19 ++----
 lang/gcc34-ada/buildlink3.mk                      |  18 ++----
 lang/gcc34/buildlink3.mk                          |  19 ++----
 lang/ghc/buildlink3.mk                            |  19 ++----
 lang/guile/buildlink3.mk                          |  19 ++----
 lang/guile16/buildlink3.mk                        |  19 ++----
 lang/hugs/buildlink3.mk                           |  19 ++----
 lang/jdk/buildlink3.mk                            |  19 ++----
 lang/kaffe/buildlink3.mk                          |  19 ++----
 lang/librep/buildlink3.mk                         |  19 ++----
 lang/libtcl-nothread/buildlink3.mk                |  20 ++----
 lang/lua/buildlink3.mk                            |  19 ++----
 lang/mono/buildlink3.mk                           |  19 ++----
 lang/ocaml/buildlink3.mk                          |  21 ++-----
 lang/ossp-js/buildlink3.mk                        |  19 ++----
 lang/parrot/buildlink3.mk                         |  19 ++----
 lang/perl5/buildlink3.mk                          |  19 ++----
 lang/php5/buildlink3.mk                           |  19 ++----
 lang/pnet/buildlink3.mk                           |  19 ++----
 lang/pnetC/buildlink3.mk                          |  19 ++----
 lang/pnetlib/buildlink3.mk                        |  19 ++----
 lang/python23/buildlink3.mk                       |  20 ++----
 lang/python24/buildlink3.mk                       |  20 ++----
 lang/python25/buildlink3.mk                       |  20 ++----
 lang/ruby/buildlink3.mk                           |  21 ++-----
 lang/see/buildlink3.mk                            |  19 ++----
 lang/sigscheme/buildlink3.mk                      |  19 ++----
 lang/spidermonkey/buildlink3.mk                   |  19 ++----
 lang/sun-jdk14/buildlink3.mk                      |  21 ++-----
 lang/sun-jdk15/buildlink3.mk                      |  21 ++-----
 lang/sun-jdk6/buildlink3.mk                       |  21 ++-----
 lang/sun-jre14/buildlink3.mk                      |  19 ++----
 lang/sun-jre15/buildlink3.mk                      |  19 ++----
 lang/sun-jre6/buildlink3.mk                       |  19 ++----
 lang/swi-prolog-lite/buildlink3.mk                |  19 ++----
 lang/tcl-expect/buildlink3.mk                     |  19 ++----
 lang/tcl-itcl-current/buildlink3.mk               |  20 ++----
 lang/tcl-itcl/buildlink3.mk                       |  19 ++----
 lang/tcl-otcl/buildlink3.mk                       |  19 ++----
 lang/tcl-tclX/buildlink3.mk                       |  19 ++----
 lang/tcl/buildlink3.mk                            |  19 ++----
 lang/tcl83/buildlink3.mk                          |  20 ++----
 lang/vala/buildlink3.mk                           |  19 ++----
 mail/Pantomime/buildlink3.mk                      |  22 ++-----
 mail/akonadi/buildlink3.mk                        |  19 ++----
 mail/clamav/buildlink3.mk                         |  19 ++----
 mail/claws-mail-pgpcore/buildlink3.mk             |  19 ++----
 mail/claws-mail/buildlink3.mk                     |  19 ++----
 mail/dovecot/buildlink3.mk                        |  19 ++----
 mail/drac/buildlink3.mk                           |  19 ++----
 mail/evolution-data-server/buildlink3.mk          |  19 ++----
 mail/evolution/buildlink3.mk                      |  19 ++----
 mail/faces/buildlink3.mk                          |  19 ++----
 mail/gmime/buildlink3.mk                          |  19 ++----
 mail/gmime24/buildlink3.mk                        |  19 ++----
 mail/imap-uw/buildlink3.mk                        |  19 ++----
 mail/libesmtp/buildlink3.mk                       |  22 ++-----
 mail/libetpan/buildlink3.mk                       |  19 ++----
 mail/libmilter/buildlink3.mk                      |  19 ++----
 mail/libsieve/buildlink3.mk                       |  19 ++----
 mail/libspf-alt/buildlink3.mk                     |  19 ++----
 mail/libspf2/buildlink3.mk                        |  19 ++----
 mail/libsylph/buildlink3.mk                       |  19 ++----
 mail/libytnef/buildlink3.mk                       |  19 ++----
 mail/mew/buildlink3.mk                            |  19 ++----
 mail/perdition/buildlink3.mk                      |  19 ++----
 mail/squirrelmail/buildlink3.mk                   |  19 ++----
 math/R/buildlink3.mk                              |  19 ++----
 math/blas/buildlink3.mk                           |  19 ++----
 math/cln/buildlink3.mk                            |  19 ++----
 math/djbfft/buildlink3.mk                         |  19 ++----
 math/eigen2/buildlink3.mk                         |  19 ++----
 math/fftw/buildlink3.mk                           |  19 ++----
 math/fftw2/buildlink3.mk                          |  19 ++----
 math/fftwf/buildlink3.mk                          |  19 ++----
 math/glpk/buildlink3.mk                           |  19 ++----
 math/gsl/buildlink3.mk                            |  19 ++----
 math/lapack/buildlink3.mk                         |  19 ++----
 math/libffm/buildlink3.mk                         |  19 ++----
 math/libmatheval/buildlink3.mk                    |  19 ++----
 math/ltm/buildlink3.mk                            |  19 ++----
 math/mpfr/buildlink3.mk                           |  19 ++----
 math/ntl/buildlink3.mk                            |  19 ++----
 math/octave-forge/buildlink3.mk                   |  19 ++----
 math/octave/buildlink3.mk                         |  19 ++----
 math/pari/buildlink3.mk                           |  19 ++----
 math/py-Numeric/buildlink3.mk                     |  19 ++----
 math/py-ephem/buildlink3.mk                       |  19 ++----
 math/py-fpconst/buildlink3.mk                     |  19 ++----
 math/py-numarray/buildlink3.mk                    |  19 ++----
 math/py-numpy/buildlink3.mk                       |  19 ++----
 math/qalculate/buildlink3.mk                      |  19 ++----
 math/qhull/buildlink3.mk                          |  19 ++----
 math/scilab/buildlink3.mk                         |  19 ++----
 math/slatec/buildlink3.mk                         |  19 ++----
 math/superlu/buildlink3.mk                        |  19 ++----
 math/tasp-vsipl/buildlink3.mk                     |  19 ++----
 math/udunits/buildlink3.mk                        |  19 ++----
 math/yorick/buildlink3.mk                         |  19 ++----
 mbone/common-mml/buildlink3.mk                    |  19 ++----
 meta-pkgs/xfce4/buildlink3.mk                     |  19 ++----
 misc/Addresses/buildlink3.mk                      |  22 ++-----
 misc/bbdb/buildlink3.mk                           |  19 ++----
 misc/dialog/buildlink3.mk                         |  19 ++----
 misc/goffice0.6/buildlink3.mk                     |  19 ++----
 misc/kdepim3/buildlink3.mk                        |  19 ++----
 misc/koffice/buildlink3.mk                        |  19 ++----
 misc/libcdio/buildlink3.mk                        |  19 ++----
 misc/libutf/buildlink3.mk                         |  19 ++----
 misc/lookup/buildlink3.mk                         |  19 ++----
 misc/m17n-db/buildlink3.mk                        |  19 ++----
 misc/pciids/buildlink3.mk                         |  19 ++----
 misc/proj/buildlink3.mk                           |  19 ++----
 misc/rpm/buildlink3.mk                            |  19 ++----
 misc/usbids/buildlink3.mk                         |  19 ++----
 misc/xfce4-weather-plugin/buildlink3.mk           |  19 ++----
 mk/bdb.buildlink3.mk                              |   6 +-
 mk/bsd.pkg.mk                                     |   7 ++-
 mk/buildlink3/bsd.buildlink3.mk                   |  67 ++++++++++++++--------
 mk/buildlink3/bsd.builtin.mk                      |   6 +-
 mk/buildlink3/show-buildlink3.sh                  |  24 +++----
 mk/curses.buildlink3.mk                           |   6 +-
 mk/defaults/mk.conf                               |   4 +-
 mk/dlopen.buildlink3.mk                           |   6 +-
 mk/dlopen.builtin.mk                              |   4 +-
 mk/oss.buildlink3.mk                              |   6 +-
 mk/pam.buildlink3.mk                              |   6 +-
 mk/pkg-build-options.mk                           |  25 ++++++--
 mk/pthread.buildlink3.mk                          |   6 +-
 mk/resolv.buildlink3.mk                           |   6 +-
 mk/termcap.buildlink3.mk                          |   6 +-
 mk/termcap.builtin.mk                             |   4 +-
 multimedia/bsdav/buildlink3.mk                    |  19 ++----
 multimedia/clutter-gst/buildlink3.mk              |  19 ++----
 multimedia/dirac/buildlink3.mk                    |  20 ++----
 multimedia/ffmpeg/buildlink3.mk                   |  20 ++----
 multimedia/gnome-media/buildlink3.mk              |  19 ++----
 multimedia/gpac/buildlink3.mk                     |  19 ++----
 multimedia/gst-plugins0.10-bad/buildlink3.mk      |  19 ++----
 multimedia/gst-plugins0.10-base/buildlink3.mk     |  19 ++----
 multimedia/gst-plugins0.10-gnonlin/buildlink3.mk  |  19 ++----
 multimedia/gst-plugins0.10-good/buildlink3.mk     |  19 ++----
 multimedia/gst-plugins0.10-ugly/buildlink3.mk     |  19 ++----
 multimedia/gstreamer0.10/buildlink3.mk            |  19 ++----
 multimedia/kdemultimedia3/buildlink3.mk           |  19 ++----
 multimedia/libassetml/buildlink3.mk               |  19 ++----
 multimedia/libdv/buildlink3.mk                    |  19 ++----
 multimedia/libdvbpsi/buildlink3.mk                |  19 ++----
 multimedia/libdvdcss/buildlink3.mk                |  19 ++----
 multimedia/libdvdnav/buildlink3.mk                |  19 ++----
 multimedia/libdvdplay/buildlink3.mk               |  19 ++----
 multimedia/libdvdread/buildlink3.mk               |  19 ++----
 multimedia/libflash/buildlink3.mk                 |  19 ++----
 multimedia/libmatroska/buildlink3.mk              |  19 ++----
 multimedia/libmp4v2/buildlink3.mk                 |  19 ++----
 multimedia/libmpeg2/buildlink3.mk                 |  19 ++----
 multimedia/libmpeg3/buildlink3.mk                 |  19 ++----
 multimedia/libnms/buildlink3.mk                   |  19 ++----
 multimedia/libogg/buildlink3.mk                   |  19 ++----
 multimedia/libtheora/buildlink3.mk                |  19 ++----
 multimedia/ming/buildlink3.mk                     |  19 ++----
 multimedia/mjpegtools/buildlink3.mk               |  19 ++----
 multimedia/mpeg-lib/buildlink3.mk                 |  19 ++----
 multimedia/mpeg4ip/buildlink3.mk                  |  19 ++----
 multimedia/ogle/buildlink3.mk                     |  19 ++----
 multimedia/openquicktime/buildlink3.mk            |  19 ++----
 multimedia/p5-GStreamer/buildlink3.mk             |  19 ++----
 multimedia/phonon/buildlink3.mk                   |  19 ++----
 multimedia/py-gstreamer0.10/buildlink3.mk         |  19 ++----
 multimedia/smpeg/buildlink3.mk                    |  19 ++----
 multimedia/swfdec/buildlink3.mk                   |  19 ++----
 multimedia/totem-pl-parser/buildlink3.mk          |  19 ++----
 multimedia/totem/buildlink3.mk                    |  19 ++----
 multimedia/vlc/buildlink3.mk                      |  19 ++----
 multimedia/vlc08/buildlink3.mk                    |  19 ++----
 multimedia/x264-devel/buildlink3.mk               |  19 ++----
 multimedia/xfce4-mpc-plugin/buildlink3.mk         |  19 ++----
 multimedia/xine-lib/buildlink3.mk                 |  19 ++----
 multimedia/xvidcore/buildlink3.mk                 |  19 ++----
 net/GeoIP/buildlink3.mk                           |  19 ++----
 net/ORBit/buildlink3.mk                           |  19 ++----
 net/ORBit2/buildlink3.mk                          |  19 ++----
 net/SDL_net/buildlink3.mk                         |  19 ++----
 net/adns/buildlink3.mk                            |  19 ++----
 net/avahi/buildlink3.mk                           |  19 ++----
 net/bind9/buildlink3.mk                           |  19 ++----
 net/bind95/buildlink3.mk                          |  19 ++----
 net/bind96/buildlink3.mk                          |  19 ++----
 net/boinc3-libs/buildlink3.mk                     |  19 ++----
 net/dante/buildlink3.mk                           |  19 ++----
 net/flow-tools/buildlink3.mk                      |  19 ++----
 net/freewais-sf/buildlink3.mk                     |  19 ++----
 net/gift/buildlink3.mk                            |  19 ++----
 net/gnet/buildlink3.mk                            |  19 ++----
 net/gnet1/buildlink3.mk                           |  19 ++----
 net/gsnmp/buildlink3.mk                           |  19 ++----
 net/hesiod/buildlink3.mk                          |  19 ++----
 net/howl/buildlink3.mk                            |  19 ++----
 net/isc-dhcp/buildlink3.mk                        |  19 ++----
 net/isc-dhcp4/buildlink3.mk                       |  19 ++----
 net/kdenetwork3/buildlink3.mk                     |  19 ++----
 net/ldns/buildlink3.mk                            |  19 ++----
 net/libIDL/buildlink3.mk                          |  19 ++----
 net/libares/buildlink3.mk                         |  19 ++----
 net/libcares/buildlink3.mk                        |  19 ++----
 net/libdnet/buildlink3.mk                         |  19 ++----
 net/libfetch/buildlink3.mk                        |  19 ++----
 net/liblive/buildlink3.mk                         |  19 ++----
 net/libmms/buildlink3.mk                          |  19 ++----
 net/libnids/buildlink3.mk                         |  19 ++----
 net/libnipper/buildlink3.mk                       |  19 ++----
 net/libpcap/buildlink3.mk                         |  20 ++----
 net/libradius/buildlink3.mk                       |  19 ++----
 net/libsoup24/buildlink3.mk                       |  19 ++----
 net/libtorrent/buildlink3.mk                      |  19 ++----
 net/libupnp/buildlink3.mk                         |  19 ++----
 net/libvncserver/buildlink3.mk                    |  19 ++----
 net/linc/buildlink3.mk                            |  19 ++----
 net/mDNSResponder/buildlink3.mk                   |  19 ++----
 net/monotorrent/buildlink3.mk                     |  19 ++----
 net/net-snmp/buildlink3.mk                        |  19 ++----
 net/net6/buildlink3.mk                            |  19 ++----
 net/netatalk/buildlink3.mk                        |  19 ++----
 net/openh323/buildlink3.mk                        |  19 ++----
 net/openslp/buildlink3.mk                         |  19 ++----
 net/py-ORBit/buildlink3.mk                        |  19 ++----
 net/py-boto/buildlink3.mk                         |  19 ++----
 net/py-libdnet/buildlink3.mk                      |  20 ++----
 net/py-libpcap/buildlink3.mk                      |  21 ++-----
 net/py-soappy/buildlink3.mk                       |  19 ++----
 net/radiusclient-ng/buildlink3.mk                 |  19 ++----
 net/samba/buildlink3.mk                           |  19 ++----
 net/socks4/buildlink3.mk                          |  20 ++----
 net/socks5/buildlink3.mk                          |  19 ++----
 net/solaris-tap/buildlink3.mk                     |  19 ++----
 net/spread/buildlink3.mk                          |  19 ++----
 net/tcl-scotty/buildlink3.mk                      |  19 ++----
 net/whoson/buildlink3.mk                          |  19 ++----
 net/xfce4-wavelan-plugin/buildlink3.mk            |  19 ++----
 net/yaz/buildlink3.mk                             |  19 ++----
 news/inn/buildlink3.mk                            |  20 ++----
 parallel/mpi-ch/buildlink3.mk                     |  19 ++----
 parallel/pvm3/buildlink3.mk                       |  20 ++----
 pkgtools/compat_headers/buildlink3.mk             |  19 ++----
 pkgtools/createbuildlink/Makefile                 |   4 +-
 pkgtools/createbuildlink/files/createbuildlink    |  27 ++------
 pkgtools/packagekit/buildlink3.mk                 |  19 ++----
 pkgtools/x11-links/buildlink3.mk                  |  27 +++-----
 pkgtools/x11-links/xfree.mk                       |   6 +-
 pkgtools/x11-links/xorg.mk                        |   6 +-
 print/a2ps/buildlink3.mk                          |  19 ++----
 print/auctex/buildlink3.mk                        |  19 ++----
 print/cups/buildlink3.mk                          |  19 ++----
 print/evince/buildlink3.mk                        |  19 ++----
 print/ghostscript/buildlink3.mk                   |  19 ++----
 print/gimp-print-lib/buildlink3.mk                |  19 ++----
 print/gutenprint-lib/buildlink3.mk                |  19 ++----
 print/ijs/buildlink3.mk                           |  19 ++----
 print/ja-vflib-lib/buildlink3.mk                  |  19 ++----
 print/kpathsea/buildlink3.mk                      |  19 ++----
 print/libgnomecups/buildlink3.mk                  |  19 ++----
 print/libgnomeprint/buildlink3.mk                 |  19 ++----
 print/libgnomeprintui/buildlink3.mk               |  19 ++----
 print/libpaper/buildlink3.mk                      |  19 ++----
 print/libspectre/buildlink3.mk                    |  19 ++----
 print/pdflib-lite/buildlink3.mk                   |  19 ++----
 print/pdflib/buildlink3.mk                        |  19 ++----
 print/poppler-glib/buildlink3.mk                  |  19 ++----
 print/poppler-includes/buildlink3.mk              |  19 ++----
 print/poppler-qt/buildlink3.mk                    |  19 ++----
 print/poppler-qt4/buildlink3.mk                   |  19 ++----
 print/poppler/buildlink3.mk                       |  19 ++----
 print/pslib/buildlink3.mk                         |  19 ++----
 print/py-cups/buildlink3.mk                       |  19 ++----
 print/ruby-gnome2-gnomeprint/buildlink3.mk        |  19 ++----
 print/teTeX3-bin/buildlink3.mk                    |  19 ++----
 print/transfig/buildlink3.mk                      |  19 ++----
 print/xfce4-print/buildlink3.mk                   |  19 ++----
 security/PAM/buildlink3.mk                        |  19 ++----
 security/beecrypt/buildlink3.mk                   |  19 ++----
 security/botan/buildlink3.mk                      |  19 ++----
 security/ccid/buildlink3.mk                       |  19 ++----
 security/courier-authlib/buildlink3.mk            |  19 ++----
 security/crypto++/buildlink3.mk                   |  19 ++----
 security/cvm/buildlink3.mk                        |  19 ++----
 security/cyrus-sasl/buildlink3.mk                 |  19 ++----
 security/dirmngr/buildlink3.mk                    |  19 ++----
 security/gnome-keyring/buildlink3.mk              |  20 ++----
 security/gnupg2/buildlink3.mk                     |  19 ++----
 security/gnutls/buildlink3.mk                     |  19 ++----
 security/gpgme/buildlink3.mk                      |  19 ++----
 security/gsasl/buildlink3.mk                      |  19 ++----
 security/gss/buildlink3.mk                        |  19 ++----
 security/heimdal/buildlink3.mk                    |  19 ++----
 security/kth-krb4/buildlink3.mk                   |  19 ++----
 security/lasso/buildlink3.mk                      |  19 ++----
 security/libassuan/buildlink3.mk                  |  19 ++----
 security/libcrack/buildlink3.mk                   |  19 ++----
 security/libdes/buildlink3.mk                     |  19 ++----
 security/libfprint/buildlink3.mk                  |  19 ++----
 security/libfwbuilder/buildlink3.mk               |  19 ++----
 security/libfwbuilder21/buildlink3.mk             |  19 ++----
 security/libgcrypt/buildlink3.mk                  |  19 ++----
 security/libgpg-error/buildlink3.mk               |  19 ++----
 security/libidea/buildlink3.mk                    |  19 ++----
 security/libident/buildlink3.mk                   |  19 ++----
 security/libksba/buildlink3.mk                    |  19 ++----
 security/libksba04/buildlink3.mk                  |  19 ++----
 security/libmcrypt/buildlink3.mk                  |  19 ++----
 security/libnasl/buildlink3.mk                    |  19 ++----
 security/libp11/buildlink3.mk                     |  19 ++----
 security/libprelude/buildlink3.mk                 |  19 ++----
 security/libpreludedb/buildlink3.mk               |  19 ++----
 security/libssh/buildlink3.mk                     |  19 ++----
 security/libssh2/buildlink3.mk                    |  19 ++----
 security/libtasn1/buildlink3.mk                   |  19 ++----
 security/libtcpa/buildlink3.mk                    |  19 ++----
 security/mhash/buildlink3.mk                      |  19 ++----
 security/mit-krb5/buildlink3.mk                   |  19 ++----
 security/nessus-core/buildlink3.mk                |  19 ++----
 security/nessus-libraries/buildlink3.mk           |  19 ++----
 security/ocaml-ssl/buildlink3.mk                  |  19 ++----
 security/opencdk/buildlink3.mk                    |  19 ++----
 security/openct/buildlink3.mk                     |  19 ++----
 security/openpam/buildlink3.mk                    |  19 ++----
 security/opensc/buildlink3.mk                     |  19 ++----
 security/openssl/buildlink3.mk                    |  20 ++----
 security/openvas-libnasl/buildlink3.mk            |  19 ++----
 security/openvas-libraries/buildlink3.mk          |  19 ++----
 security/openvas-server/buildlink3.mk             |  19 ++----
 security/pakchois/buildlink3.mk                   |  19 ++----
 security/pcsc-lite/buildlink3.mk                  |  19 ++----
 security/pinentry/buildlink3.mk                   |  19 ++----
 security/policykit-gnome/buildlink3.mk            |  19 ++----
 security/policykit/buildlink3.mk                  |  19 ++----
 security/py-SSLCrypto/buildlink3.mk               |  19 ++----
 security/py-amkCrypto/buildlink3.mk               |  19 ++----
 security/py-gnupg/buildlink3.mk                   |  19 ++----
 security/qca/buildlink3.mk                        |  18 ++----
 security/qca2/buildlink3.mk                       |  18 ++----
 security/rsaref/buildlink3.mk                     |  19 ++----
 security/seahorse/buildlink3.mk                   |  19 ++----
 security/skey/buildlink3.mk                       |  19 ++----
 security/tcl-tls/buildlink3.mk                    |  19 ++----
 security/tcp_wrappers/buildlink3.mk               |  19 ++----
 security/xmlsec1/buildlink3.mk                    |  19 ++----
 sysutils/amanda-common/buildlink3.mk              |  19 ++----
 sysutils/brasero/buildlink3.mk                    |  19 ++----
 sysutils/consolekit/buildlink3.mk                 |  19 ++----
 sysutils/dbus-glib/buildlink3.mk                  |  19 ++----
 sysutils/dbus-qt3/buildlink3.mk                   |  19 ++----
 sysutils/dbus/buildlink3.mk                       |  19 ++----
 sysutils/desktop-file-utils/buildlink3.mk         |  21 ++-----
 sysutils/fam/buildlink3.mk                        |  19 ++----
 sysutils/file/buildlink3.mk                       |  20 ++----
 sysutils/gkrellm/buildlink3.mk                    |  19 ++----
 sysutils/gnome-menus/buildlink3.mk                |  19 ++----
 sysutils/gnome-mount/buildlink3.mk                |  19 ++----
 sysutils/gnome-settings-daemon/buildlink3.mk      |  19 ++----
 sysutils/gnome-vfs/buildlink3.mk                  |  19 ++----
 sysutils/gnome-vfsmm/buildlink3.mk                |  19 ++----
 sysutils/hal-info/buildlink3.mk                   |  19 ++----
 sysutils/hal/buildlink3.mk                        |  19 ++----
 sysutils/ipa/buildlink3.mk                        |  19 ++----
 sysutils/libgamin/buildlink3.mk                   |  19 ++----
 sysutils/libgksu/buildlink3.mk                    |  19 ++----
 sysutils/libgtop/buildlink3.mk                    |  19 ++----
 sysutils/libnotify/buildlink3.mk                  |  19 ++----
 sysutils/libol/buildlink3.mk                      |  19 ++----
 sysutils/liboobs/buildlink3.mk                    |  19 ++----
 sysutils/libpciaccess/buildlink3.mk               |  19 ++----
 sysutils/nautilus-cd-burner/buildlink3.mk         |  19 ++----
 sysutils/nautilus/buildlink3.mk                   |  19 ++----
 sysutils/ndesk-dbus-glib/buildlink3.mk            |  19 ++----
 sysutils/ndesk-dbus/buildlink3.mk                 |  19 ++----
 sysutils/pciutils/buildlink3.mk                   |  19 ++----
 sysutils/py-dbus/buildlink3.mk                    |  19 ++----
 sysutils/py-gnome-menus/buildlink3.mk             |  19 ++----
 sysutils/py-notify/buildlink3.mk                  |  19 ++----
 sysutils/strigi/buildlink3.mk                     |  19 ++----
 sysutils/system-tools-backends/buildlink3.mk      |  19 ++----
 sysutils/vcdimager-devel/buildlink3.mk            |  19 ++----
 sysutils/xentools3/buildlink3.mk                  |  19 ++----
 sysutils/xfce4-appfinder/buildlink3.mk            |  19 ++----
 sysutils/xfce4-battery-plugin/buildlink3.mk       |  19 ++----
 sysutils/xfce4-cpugraph-plugin/buildlink3.mk      |  19 ++----
 sysutils/xfce4-diskperf-plugin/buildlink3.mk      |  19 ++----
 sysutils/xfce4-fsguard-plugin/buildlink3.mk       |  19 ++----
 sysutils/xfce4-genmon-plugin/buildlink3.mk        |  19 ++----
 sysutils/xfce4-netload-plugin/buildlink3.mk       |  19 ++----
 sysutils/xfce4-quicklauncher-plugin/buildlink3.mk |  19 ++----
 sysutils/xfce4-systemload-plugin/buildlink3.mk    |  19 ++----
 sysutils/xfce4-thunar/buildlink3.mk               |  19 ++----
 sysutils/xfce4-xarchiver/buildlink3.mk            |  19 ++----
 sysutils/xfce4-xkb-plugin/buildlink3.mk           |  19 ++----
 textproc/aiksaurus/buildlink3.mk                  |  19 ++----
 textproc/aspell/buildlink3.mk                     |  19 ++----
 textproc/btparse/buildlink3.mk                    |  19 ++----
 textproc/chasen-base/buildlink3.mk                |  19 ++----
 textproc/chasen/buildlink3.mk                     |  19 ++----
 textproc/eb/buildlink3.mk                         |  19 ++----
 textproc/ebook-tools/buildlink3.mk                |  19 ++----
 textproc/enca/buildlink3.mk                       |  19 ++----
 textproc/enchant/buildlink3.mk                    |  19 ++----
 textproc/expat/buildlink3.mk                      |  19 ++----
 textproc/gdome2/buildlink3.mk                     |  19 ++----
 textproc/gnome-doc-utils/buildlink3.mk            |  19 ++----
 textproc/gnome-spell/buildlink3.mk                |  19 ++----
 textproc/gtk-doc/buildlink3.mk                    |  19 ++----
 textproc/gtkspell/buildlink3.mk                   |  19 ++----
 textproc/hre/buildlink3.mk                        |  19 ++----
 textproc/hunspell/buildlink3.mk                   |  19 ++----
 textproc/hyperestraier/buildlink3.mk              |  19 ++----
 textproc/icu/buildlink3.mk                        |  19 ++----
 textproc/iso-codes/buildlink3.mk                  |  19 ++----
 textproc/jade/buildlink3.mk                       |  19 ++----
 textproc/json-glib/buildlink3.mk                  |  19 ++----
 textproc/kakasi/buildlink3.mk                     |  19 ++----
 textproc/libclucene/buildlink3.mk                 |  19 ++----
 textproc/libcroco/buildlink3.mk                   |  19 ++----
 textproc/liblinebreak/buildlink3.mk               |  19 ++----
 textproc/liblrdf/buildlink3.mk                    |  19 ++----
 textproc/libpathan/buildlink3.mk                  |  19 ++----
 textproc/libunicode/buildlink3.mk                 |  19 ++----
 textproc/libxml++/buildlink3.mk                   |  19 ++----
 textproc/libxml++1/buildlink3.mk                  |  19 ++----
 textproc/libxml/buildlink3.mk                     |  19 ++----
 textproc/libxml2/buildlink3.mk                    |  19 ++----
 textproc/libxslt/buildlink3.mk                    |  19 ++----
 textproc/link-grammar/buildlink3.mk               |  19 ++----
 textproc/mecab-base/buildlink3.mk                 |  19 ++----
 textproc/mecab/buildlink3.mk                      |  19 ++----
 textproc/mxml/buildlink3.mk                       |  19 ++----
 textproc/oniguruma/buildlink3.mk                  |  19 ++----
 textproc/opensp/buildlink3.mk                     |  19 ++----
 textproc/py-elementtree/buildlink3.mk             |  19 ++----
 textproc/py-libxml2/buildlink3.mk                 |  19 ++----
 textproc/py-xml/buildlink3.mk                     |  19 ++----
 textproc/raptor/buildlink3.mk                     |  19 ++----
 textproc/rarian/buildlink3.mk                     |  21 ++-----
 textproc/rasqal/buildlink3.mk                     |  19 ++----
 textproc/redland/buildlink3.mk                    |  19 ++----
 textproc/ruby-eruby/buildlink3.mk                 |  19 ++----
 textproc/ruby-rdtool/buildlink3.mk                |  19 +----
 textproc/sablotron/buildlink3.mk                  |  19 ++----
 textproc/sary/buildlink3.mk                       |  19 ++----
 textproc/soprano/buildlink3.mk                    |  19 ++----
 textproc/sublib/buildlink3.mk                     |  19 ++----
 textproc/tokyodystopia/buildlink3.mk              |  19 ++----
 textproc/uriparser/buildlink3.mk                  |  19 ++----
 textproc/wbxml2/buildlink3.mk                     |  19 ++----
 textproc/xalan-c/buildlink3.mk                    |  19 ++----
 textproc/xapian/buildlink3.mk                     |  19 ++----
 textproc/xerces-c/buildlink3.mk                   |  19 ++----
 textproc/xfce4-dict-plugin/buildlink3.mk          |  19 ++----
 textproc/xmlcatmgr/buildlink3.mk                  |  20 ++----
 textproc/xmlrpc-c/buildlink3.mk                   |  19 ++----
 time/libical/buildlink3.mk                        |  19 ++----
 time/py-mxDateTime/buildlink3.mk                  |  19 ++----
 time/xfce4-datetime-plugin/buildlink3.mk          |  19 ++----
 time/xfce4-orage/buildlink3.mk                    |  19 ++----
 time/xfce4-timer-plugin/buildlink3.mk             |  19 ++----
 wm/blackbox70/buildlink3.mk                       |  19 ++----
 wm/compiz-fusion-plugins-main/buildlink3.mk       |  19 ++----
 wm/compiz/buildlink3.mk                           |  20 ++----
 wm/metacity/buildlink3.mk                         |  19 ++----
 wm/openbox/buildlink3.mk                          |  19 ++----
 wm/windowmaker/buildlink3.mk                      |  19 ++----
 wm/xfce4-wm-themes/buildlink3.mk                  |  19 ++----
 wm/xfce4-wm/buildlink3.mk                         |  19 ++----
 www/ap-perl/buildlink3.mk                         |  19 ++----
 www/ap2-perl/buildlink3.mk                        |  19 ++----
 www/apache/buildlink3.mk                          |  20 ++----
 www/apache2/buildlink3.mk                         |  19 ++----
 www/apache22/buildlink3.mk                        |  19 ++----
 www/cgic/buildlink3.mk                            |  19 ++----
 www/cgilib/buildlink3.mk                          |  19 ++----
 www/clearsilver/buildlink3.mk                     |  19 ++----
 www/curl/buildlink3.mk                            |  19 ++----
 www/emacs-w3m/buildlink3.mk                       |  19 ++----
 www/epiphany/buildlink3.mk                        |  15 +---
 www/fcgi/buildlink3.mk                            |  19 ++----
 www/firefox-gtk1/buildlink3.mk                    |  19 ++----
 www/firefox/buildlink3.mk                         |  19 ++----
 www/firefox3/buildlink3.mk                        |  19 ++----
 www/gtkhtml314/buildlink3.mk                      |  19 ++----
 www/libghttp/buildlink3.mk                        |  19 ++----
 www/libgtkhtml/buildlink3.mk                      |  19 ++----
 www/libproxy/buildlink3.mk                        |  19 ++----
 www/libwww/buildlink3.mk                          |  19 ++----
 www/mono-xsp/buildlink3.mk                        |  19 ++----
 www/neon/buildlink3.mk                            |  19 ++----
 www/php4/buildlink3.mk                            |  19 ++----
 www/py-gdata/buildlink3.mk                        |  19 ++----
 www/seamonkey-gtk1/buildlink3.mk                  |  19 ++----
 www/seamonkey/buildlink3.mk                       |  19 ++----
 www/serf/buildlink3.mk                            |  19 ++----
 www/sope/buildlink3.mk                            |  19 ++----
 www/swish-e/buildlink3.mk                         |  19 ++----
 www/tidy/buildlink3.mk                            |  19 ++----
 www/w3/buildlink3.mk                              |  19 ++----
 www/webkit-gtk/buildlink3.mk                      |  19 ++----
 x11/Xaw-Xpm/buildlink3.mk                         |  20 ++----
 x11/Xaw3d/buildlink3.mk                           |  19 ++----
 x11/Xbae/buildlink3.mk                            |  19 ++----
 x11/Xcomposite/buildlink3.mk                      |  19 ++----
 x11/Xfixes/buildlink3.mk                          |  19 ++----
 x11/XmHTML/buildlink3.mk                          |  19 ++----
 x11/Xrender/buildlink3.mk                         |  19 ++----
 x11/bigreqsproto/buildlink3.mk                    |  19 ++----
 x11/blt/buildlink3.mk                             |  19 ++----
 x11/compositeproto/buildlink3.mk                  |  19 ++----
 x11/damageproto/buildlink3.mk                     |  19 ++----
 x11/efltk/buildlink3.mk                           |  19 ++----
 x11/evieext/buildlink3.mk                         |  19 ++----
 x11/fixesproto/buildlink3.mk                      |  20 ++----
 x11/fltk/buildlink3.mk                            |  19 ++----
 x11/fltk2/buildlink3.mk                           |  19 ++----
 x11/fontcacheproto/buildlink3.mk                  |  19 ++----
 x11/fontsproto/buildlink3.mk                      |  19 ++----
 x11/fox/buildlink3.mk                             |  19 ++----
 x11/glproto/buildlink3.mk                         |  19 ++----
 x11/gnome-control-center/buildlink3.mk            |  19 ++----
 x11/gnome-desktop-sharp/buildlink3.mk             |  19 ++----
 x11/gnome-desktop/buildlink3.mk                   |  19 ++----
 x11/gnome-mag/buildlink3.mk                       |  19 ++----
 x11/gnome-panel/buildlink3.mk                     |  19 ++----
 x11/gnome-sharp/buildlink3.mk                     |  19 ++----
 x11/gnustep-back/buildlink3.mk                    |  19 ++----
 x11/gnustep-gui/buildlink3.mk                     |  20 ++----
 x11/gnustep-preferences/buildlink3.mk             |  19 ++----
 x11/gtk+extra/buildlink3.mk                       |  19 ++----
 x11/gtk-sharp/buildlink3.mk                       |  19 ++----
 x11/gtk/buildlink3.mk                             |  19 ++----
 x11/gtk2+extra/buildlink3.mk                      |  19 ++----
 x11/gtk2-engines/buildlink3.mk                    |  19 ++----
 x11/gtk2/buildlink3.mk                            |  19 ++----
 x11/gtkglarea/buildlink3.mk                       |  19 ++----
 x11/gtkmm/buildlink3.mk                           |  19 ++----
 x11/gtksourceview-sharp2/buildlink3.mk            |  19 ++----
 x11/gtksourceview/buildlink3.mk                   |  19 ++----
 x11/gtksourceview2/buildlink3.mk                  |  19 ++----
 x11/inputproto/buildlink3.mk                      |  19 ++----
 x11/kbproto/buildlink3.mk                         |  19 ++----
 x11/kdebase3/buildlink3.mk                        |  19 ++----
 x11/kdebindings-ruby/buildlink3.mk                |  19 ++----
 x11/kdelibs3/buildlink3.mk                        |  19 ++----
 x11/lablgtk/buildlink3.mk                         |  19 ++----
 x11/lablgtk1/buildlink3.mk                        |  19 ++----
 x11/lesstif/buildlink3.mk                         |  19 ++----
 x11/libFS/buildlink3.mk                           |  19 ++----
 x11/libICE/buildlink3.mk                          |  19 ++----
 x11/libSM/buildlink3.mk                           |  19 ++----
 x11/libX11/buildlink3.mk                          |  19 ++----
 x11/libXScrnSaver/buildlink3.mk                   |  19 ++----
 x11/libXTrap/buildlink3.mk                        |  19 ++----
 x11/libXau/buildlink3.mk                          |  19 ++----
 x11/libXaw/buildlink3.mk                          |  19 ++----
 x11/libXcomposite/buildlink3.mk                   |  19 ++----
 x11/libXcursor/buildlink3.mk                      |  19 ++----
 x11/libXdamage/buildlink3.mk                      |  19 ++----
 x11/libXdmcp/buildlink3.mk                        |  19 ++----
 x11/libXevie/buildlink3.mk                        |  19 ++----
 x11/libXext/buildlink3.mk                         |  19 ++----
 x11/libXfixes/buildlink3.mk                       |  19 ++----
 x11/libXfont/buildlink3.mk                        |  19 ++----
 x11/libXft/buildlink3.mk                          |  19 ++----
 x11/libXi/buildlink3.mk                           |  19 ++----
 x11/libXinerama/buildlink3.mk                     |  19 ++----
 x11/libXmu/buildlink3.mk                          |  19 ++----
 x11/libXp/buildlink3.mk                           |  19 ++----
 x11/libXpm/buildlink3.mk                          |  19 ++----
 x11/libXprintUtil/buildlink3.mk                   |  19 ++----
 x11/libXrandr/buildlink3.mk                       |  19 ++----
 x11/libXrender/buildlink3.mk                      |  19 ++----
 x11/libXres/buildlink3.mk                         |  19 ++----
 x11/libXt/buildlink3.mk                           |  19 ++----
 x11/libXtst/buildlink3.mk                         |  19 ++----
 x11/libXv/buildlink3.mk                           |  19 ++----
 x11/libXvMC/buildlink3.mk                         |  19 ++----
 x11/libXxf86dga/buildlink3.mk                     |  19 ++----
 x11/libXxf86misc/buildlink3.mk                    |  19 ++----
 x11/libXxf86vm/buildlink3.mk                      |  19 ++----
 x11/libdrm/buildlink3.mk                          |  21 ++----
 x11/libgnomekbd/buildlink3.mk                     |  19 ++----
 x11/liblbxutil/buildlink3.mk                      |  19 ++----
 x11/liboldXrandr/buildlink3.mk                    |  19 ++----
 x11/libunique/buildlink3.mk                       |  19 ++----
 x11/libxfce4gui/buildlink3.mk                     |  19 ++----
 x11/libxfce4mcs/buildlink3.mk                     |  19 ++----
 x11/libxfce4util/buildlink3.mk                    |  19 ++----
 x11/libxkbfile/buildlink3.mk                      |  19 ++----
 x11/libxkbui/buildlink3.mk                        |  19 ++----
 x11/libxklavier/buildlink3.mk                     |  19 ++----
 x11/modular-xorg-server/buildlink3.mk             |  20 ++----
 x11/mowitz/buildlink3.mk                          |  19 ++----
 x11/neXtaw/buildlink3.mk                          |  20 ++----
 x11/nucleo/buildlink3.mk                          |  19 ++----
 x11/ocaml-graphics/buildlink3.mk                  |  19 ++----
 x11/openmotif/buildlink3.mk                       |  19 ++----
 x11/p5-gtk2/buildlink3.mk                         |  19 ++----
 x11/paragui/buildlink3.mk                         |  19 ++----
 x11/pixman/buildlink3.mk                          |  19 ++----
 x11/printproto/buildlink3.mk                      |  19 ++----
 x11/py-Pmw/buildlink3.mk                          |  19 ++----
 x11/py-Tk/buildlink3.mk                           |  19 ++----
 x11/py-Xlib/buildlink3.mk                         |  19 ++----
 x11/py-gnome2-desktop/buildlink3.mk               |  19 ++----
 x11/py-gnome2-extras/buildlink3.mk                |  19 ++----
 x11/py-gnome2/buildlink3.mk                       |  19 ++----
 x11/py-gtk2/buildlink3.mk                         |  19 ++----
 x11/py-kiwi/buildlink3.mk                         |  19 ++----
 x11/py-qt3-base/buildlink3.mk                     |  19 ++----
 x11/py-qt3-modules/buildlink3.mk                  |  19 ++----
 x11/py-qt4/buildlink3.mk                          |  19 ++----
 x11/py-sip/buildlink3.mk                          |  19 ++----
 x11/py-wxWidgets/buildlink3.mk                    |  20 ++----
 x11/qt3-libs/buildlink3.mk                        |  19 ++----
 x11/qt3-qscintilla/buildlink3.mk                  |  19 ++----
 x11/qt3-tools/buildlink3.mk                       |  19 ++----
 x11/qt4-libs/buildlink3.mk                        |  19 ++----
 x11/qt4-qdbus/buildlink3.mk                       |  19 ++----
 x11/qt4-tools/buildlink3.mk                       |  19 ++----
 x11/randrproto/buildlink3.mk                      |  19 ++----
 x11/recordproto/buildlink3.mk                     |  19 ++----
 x11/renderproto/buildlink3.mk                     |  19 ++----
 x11/resourceproto/buildlink3.mk                   |  19 ++----
 x11/ruby-gnome2-gtk/buildlink3.mk                 |  19 ++----
 x11/scrnsaverproto/buildlink3.mk                  |  19 ++----
 x11/startup-notification/buildlink3.mk            |  19 ++----
 x11/tk-BWidget/buildlink3.mk                      |  19 ++----
 x11/tk/buildlink3.mk                              |  19 ++----
 x11/tk83/buildlink3.mk                            |  19 ++----
 x11/trapproto/buildlink3.mk                       |  19 ++----
 x11/videoproto/buildlink3.mk                      |  19 ++----
 x11/vte/buildlink3.mk                             |  19 ++----
 x11/wxGTK24/buildlink3.mk                         |  19 ++----
 x11/wxGTK26-contrib/buildlink3.mk                 |  20 ++----
 x11/wxGTK26/buildlink3.mk                         |  19 ++----
 x11/wxGTK28-contrib/buildlink3.mk                 |  19 ++----
 x11/wxGTK28/buildlink3.mk                         |  19 ++----
 x11/xbitmaps/buildlink3.mk                        |  19 ++----
 x11/xcmiscproto/buildlink3.mk                     |  19 ++----
 x11/xcursor/buildlink3.mk                         |  19 ++----
 x11/xcursor/builtin.mk                            |   4 +-
 x11/xextproto/buildlink3.mk                       |  19 ++----
 x11/xf86bigfontproto/buildlink3.mk                |  19 ++----
 x11/xf86dgaproto/buildlink3.mk                    |  19 ++----
 x11/xf86driproto/buildlink3.mk                    |  19 ++----
 x11/xf86miscproto/buildlink3.mk                   |  19 ++----
 x11/xf86vidmodeproto/buildlink3.mk                |  19 ++----
 x11/xfce4-clipman-plugin/buildlink3.mk            |  19 ++----
 x11/xfce4-desktop/buildlink3.mk                   |  19 ++----
 x11/xfce4-exo/buildlink3.mk                       |  19 ++----
 x11/xfce4-eyes-plugin/buildlink3.mk               |  19 ++----
 x11/xfce4-gtk2-engine/buildlink3.mk               |  19 ++----
 x11/xfce4-mcs-manager/buildlink3.mk               |  19 ++----
 x11/xfce4-mcs-plugins/buildlink3.mk               |  19 ++----
 x11/xfce4-notes-plugin/buildlink3.mk              |  19 ++----
 x11/xfce4-panel/buildlink3.mk                     |  19 ++----
 x11/xfce4-places-plugin/buildlink3.mk             |  19 ++----
 x11/xfce4-screenshooter-plugin/buildlink3.mk      |  19 ++----
 x11/xfce4-session/buildlink3.mk                   |  19 ++----
 x11/xfce4-terminal/buildlink3.mk                  |  19 ++----
 x11/xfce4-utils/buildlink3.mk                     |  19 ++----
 x11/xforms/buildlink3.mk                          |  19 ++----
 x11/xineramaproto/buildlink3.mk                   |  19 ++----
 x11/xlt/buildlink3.mk                             |  19 ++----
 x11/xosd/buildlink3.mk                            |  19 ++----
 x11/xproto/buildlink3.mk                          |  17 +----
 x11/xproxymanagementprotocol/buildlink3.mk        |  19 ++----
 x11/xscreensaver/buildlink3.mk                    |  19 ++----
 x11/xtrans/buildlink3.mk                          |  19 ++----
 x11/xview-lib/buildlink3.mk                       |  19 ++----
 1268 files changed, 7603 insertions(+), 16393 deletions(-)

diffs (truncated from 41776 to 300 lines):

diff -r ee604c817b1d -r e051c1cb735c archivers/bzip2/buildlink3.mk
--- a/archivers/bzip2/buildlink3.mk     Fri Mar 20 18:57:18 2009 +0000
+++ b/archivers/bzip2/buildlink3.mk     Fri Mar 20 19:23:50 2009 +0000
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.20 2006/07/08 23:10:35 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2009/03/20 19:23:50 joerg Exp $
 
-BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
-BZIP2_BUILDLINK3_MK:=  ${BZIP2_BUILDLINK3_MK}+
+BUILDLINK_TREE+=       bzip2
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=    bzip2
-.endif
+.if !defined(BZIP2_BUILDLINK3_MK)
+BZIP2_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=   ${BUILDLINK_PACKAGES:Nbzip2}
-BUILDLINK_PACKAGES+=   bzip2
-BUILDLINK_ORDER:=      ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}bzip2
-
-.if !empty(BZIP2_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.bzip2+=  bzip2>=1.0.1
 BUILDLINK_PKGSRCDIR.bzip2?=    ../../archivers/bzip2
 BUILDLINK_ABI_DEPENDS.bzip2+=  bzip2>=1.0.3
-.endif # BZIP2_BUILDLINK3_MK
+.endif # BZIP2_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=       -bzip2
diff -r ee604c817b1d -r e051c1cb735c archivers/libarchive/buildlink3.mk
--- a/archivers/libarchive/buildlink3.mk        Fri Mar 20 18:57:18 2009 +0000
+++ b/archivers/libarchive/buildlink3.mk        Fri Mar 20 19:23:50 2009 +0000
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.2 2007/07/29 17:35:14 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:23:50 joerg Exp $
 
-BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
-LIBARCHIVE_BUILDLINK3_MK:=     ${LIBARCHIVE_BUILDLINK3_MK}+
+BUILDLINK_TREE+=       libarchive
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=    libarchive
-.endif
+.if !defined(LIBARCHIVE_BUILDLINK3_MK)
+LIBARCHIVE_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=   ${BUILDLINK_PACKAGES:Nlibarchive}
-BUILDLINK_PACKAGES+=   libarchive
-BUILDLINK_ORDER:=      ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libarchive
-
-.if ${LIBARCHIVE_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libarchive+=     libarchive>=2.2
 BUILDLINK_PKGSRCDIR.libarchive?=       ../../archivers/libarchive
-.endif # LIBARCHIVE_BUILDLINK3_MK
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.endif # LIBARCHIVE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=       -libarchive
diff -r ee604c817b1d -r e051c1cb735c archivers/libcomprex/buildlink3.mk
--- a/archivers/libcomprex/buildlink3.mk        Fri Mar 20 18:57:18 2009 +0000
+++ b/archivers/libcomprex/buildlink3.mk        Fri Mar 20 19:23:50 2009 +0000
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.12 2008/01/18 05:06:19 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:23:51 joerg Exp $
 
-BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
-LIBCOMPREX_BUILDLINK3_MK:=     ${LIBCOMPREX_BUILDLINK3_MK}+
+BUILDLINK_TREE+=       libcomprex
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=    libcomprex
-.endif
+.if !defined(LIBCOMPREX_BUILDLINK3_MK)
+LIBCOMPREX_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=   ${BUILDLINK_PACKAGES:Nlibcomprex}
-BUILDLINK_PACKAGES+=   libcomprex
-BUILDLINK_ORDER:=      ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libcomprex
-
-.if !empty(LIBCOMPREX_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libcomprex+=             libcomprex>=0.3.2
 BUILDLINK_ABI_DEPENDS.libcomprex+=     libcomprex>=0.3.3nb3
 BUILDLINK_PKGSRCDIR.libcomprex?=       ../../archivers/libcomprex
-.endif # LIBCOMPREX_BUILDLINK3_MK
 
 .include "../../www/curl/buildlink3.mk"
+.endif # LIBCOMPREX_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=       -libcomprex
diff -r ee604c817b1d -r e051c1cb735c archivers/liblzo/buildlink3.mk
--- a/archivers/liblzo/buildlink3.mk    Fri Mar 20 18:57:18 2009 +0000
+++ b/archivers/liblzo/buildlink3.mk    Fri Mar 20 19:23:50 2009 +0000
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:35 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:23:51 joerg Exp $
 
-BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
-LIBLZO_BUILDLINK3_MK:= ${LIBLZO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=       liblzo
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=    liblzo
-.endif
+.if !defined(LIBLZO_BUILDLINK3_MK)
+LIBLZO_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=   ${BUILDLINK_PACKAGES:Nliblzo}
-BUILDLINK_PACKAGES+=   liblzo
-BUILDLINK_ORDER:=      ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}liblzo
-
-.if !empty(LIBLZO_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.liblzo+= liblzo>=1.08
 BUILDLINK_PKGSRCDIR.liblzo?=   ../../archivers/liblzo
 BUILDLINK_ABI_DEPENDS.liblzo+= liblzo>=1.08nb1
-.endif # LIBLZO_BUILDLINK3_MK
+.endif # LIBLZO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=       -liblzo
diff -r ee604c817b1d -r e051c1cb735c archivers/libzip/buildlink3.mk
--- a/archivers/libzip/buildlink3.mk    Fri Mar 20 18:57:18 2009 +0000
+++ b/archivers/libzip/buildlink3.mk    Fri Mar 20 19:23:50 2009 +0000
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:35 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:23:51 joerg Exp $
 
-BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
-LIBZIP_BUILDLINK3_MK:= ${LIBZIP_BUILDLINK3_MK}+
+BUILDLINK_TREE+=       libzip
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=    libzip
-.endif
+.if !defined(LIBZIP_BUILDLINK3_MK)
+LIBZIP_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=   ${BUILDLINK_PACKAGES:Nlibzip}
-BUILDLINK_PACKAGES+=   libzip
-BUILDLINK_ORDER:=      ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libzip
-
-.if !empty(LIBZIP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libzip+= libzip>=0.7.1
 BUILDLINK_PKGSRCDIR.libzip?=   ../../archivers/libzip
-.endif # LIBZIP_BUILDLINK3_MK
 
 .include "../../devel/zlib/buildlink3.mk"
+.endif # LIBZIP_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=       -libzip
diff -r ee604c817b1d -r e051c1cb735c archivers/lzmalib/buildlink3.mk
--- a/archivers/lzmalib/buildlink3.mk   Fri Mar 20 18:57:18 2009 +0000
+++ b/archivers/lzmalib/buildlink3.mk   Fri Mar 20 19:23:50 2009 +0000
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/09/04 12:07:15 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:23:51 joerg Exp $
 
-BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
-LZMALIB_BUILDLINK3_MK:=        ${LZMALIB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=       lzmalib
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=    lzmalib
-.endif
+.if !defined(LZMALIB_BUILDLINK3_MK)
+LZMALIB_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=   ${BUILDLINK_PACKAGES:Nlzmalib}
-BUILDLINK_PACKAGES+=   lzmalib
-BUILDLINK_ORDER:=      ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}lzmalib
-
-.if ${LZMALIB_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.lzmalib+=        lzmalib>=0.0.1
 BUILDLINK_PKGSRCDIR.lzmalib?=  ../../archivers/lzmalib
-.endif # LZMALIB_BUILDLINK3_MK
+.endif # LZMALIB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=       -lzmalib
diff -r ee604c817b1d -r e051c1cb735c archivers/lzo/buildlink3.mk
--- a/archivers/lzo/buildlink3.mk       Fri Mar 20 18:57:18 2009 +0000
+++ b/archivers/lzo/buildlink3.mk       Fri Mar 20 19:23:50 2009 +0000
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:35 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:23:51 joerg Exp $
 
-BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
-LZO_BUILDLINK3_MK:=    ${LZO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=       lzo
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=    lzo
-.endif
+.if !defined(LZO_BUILDLINK3_MK)
+LZO_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=   ${BUILDLINK_PACKAGES:Nlzo}
-BUILDLINK_PACKAGES+=   lzo
-BUILDLINK_ORDER:=      ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}lzo
-
-.if !empty(LZO_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.lzo+=            lzo>=2.01
 BUILDLINK_PKGSRCDIR.lzo?=      ../../archivers/lzo
-.endif # LZO_BUILDLINK3_MK
+.endif # LZO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=       -lzo
diff -r ee604c817b1d -r e051c1cb735c archivers/szip/buildlink3.mk
--- a/archivers/szip/buildlink3.mk      Fri Mar 20 18:57:18 2009 +0000
+++ b/archivers/szip/buildlink3.mk      Fri Mar 20 19:23:50 2009 +0000
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:35 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:23:51 joerg Exp $
 
-BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
-SZIP_BUILDLINK3_MK:=   ${SZIP_BUILDLINK3_MK}+
+BUILDLINK_TREE+=       szip
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=    szip
-.endif
+.if !defined(SZIP_BUILDLINK3_MK)
+SZIP_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=   ${BUILDLINK_PACKAGES:Nszip}
-BUILDLINK_PACKAGES+=   szip
-BUILDLINK_ORDER:=      ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}szip
-
-.if !empty(SZIP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.szip+=   szip>=2.0
 BUILDLINK_PKGSRCDIR.szip?=     ../../archivers/szip
-.endif # SZIP_BUILDLINK3_MK
+.endif # SZIP_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=       -szip
diff -r ee604c817b1d -r e051c1cb735c archivers/zziplib/buildlink3.mk
--- a/archivers/zziplib/buildlink3.mk   Fri Mar 20 18:57:18 2009 +0000
+++ b/archivers/zziplib/buildlink3.mk   Fri Mar 20 19:23:50 2009 +0000
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:35 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:23:51 joerg Exp $
 
-BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
-ZZIPLIB_BUILDLINK3_MK:=        ${ZZIPLIB_BUILDLINK3_MK}+
+BUILDLINK_TREE+=       zziplib
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=    zziplib
-.endif
+.if !defined(ZZIPLIB_BUILDLINK3_MK)
+ZZIPLIB_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=   ${BUILDLINK_PACKAGES:Nzziplib}
-BUILDLINK_PACKAGES+=   zziplib
-BUILDLINK_ORDER:=      ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}zziplib
-
-.if !empty(ZZIPLIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.zziplib+=        zziplib>=0.10.82
 BUILDLINK_PKGSRCDIR.zziplib?=  ../../archivers/zziplib
-.endif # ZZIPLIB_BUILDLINK3_MK
 
 .include "../../devel/zlib/buildlink3.mk"
+.endif # ZZIPLIB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=       -zziplib
diff -r ee604c817b1d -r e051c1cb735c audio/SDL_mixer/buildlink3.mk
--- a/audio/SDL_mixer/buildlink3.mk     Fri Mar 20 18:57:18 2009 +0000
+++ b/audio/SDL_mixer/buildlink3.mk     Fri Mar 20 19:23:50 2009 +0000
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/07/08 23:10:35 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 19:23:51 joerg Exp $
 
-BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
-SDL_MIXER_BUILDLINK3_MK:=      ${SDL_MIXER_BUILDLINK3_MK}+
+BUILDLINK_TREE+=       SDL_mixer
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=    SDL_mixer
-.endif
+.if !defined(SDL_MIXER_BUILDLINK3_MK)
+SDL_MIXER_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=   ${BUILDLINK_PACKAGES:NSDL_mixer}
-BUILDLINK_PACKAGES+=   SDL_mixer
-BUILDLINK_ORDER:=      ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}SDL_mixer
-
-.if !empty(SDL_MIXER_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.SDL_mixer+=      SDL_mixer>=1.2.5nb2
 BUILDLINK_ABI_DEPENDS.SDL_mixer+=      SDL_mixer>=1.2.6nb5
 BUILDLINK_PKGSRCDIR.SDL_mixer?=        ../../audio/SDL_mixer
 BUILDLINK_INCDIRS.SDL_mixer?=  include/SDL
-.endif # SDL_MIXER_BUILDLINK3_MK




Home | Main Index | Thread Index | Old Index