summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorreed <reed@pkgsrc.org>2006-04-06 06:21:32 +0000
committerreed <reed@pkgsrc.org>2006-04-06 06:21:32 +0000
commit5abef9be142e900cceace758044a1b2ee493daf3 (patch)
treeb6b5d2edfcc0b5a529e9754c567a2a58025e05f8
parentd4d013cda2a033b026f37936932a1fbee6613fbc (diff)
downloadpkgsrc-5abef9be142e900cceace758044a1b2ee493daf3.tar.gz
Over 1200 files touched but no revisions bumped :)
RECOMMENDED is removed. It becomes ABI_DEPENDS. BUILDLINK_RECOMMENDED.foo becomes BUILDLINK_ABI_DEPENDS.foo. BUILDLINK_DEPENDS.foo becomes BUILDLINK_API_DEPENDS.foo. BUILDLINK_DEPENDS does not change. IGNORE_RECOMMENDED (which defaulted to "no") becomes USE_ABI_DEPENDS which defaults to "yes". Added to obsolete.mk checking for IGNORE_RECOMMENDED. I did not manually go through and fix any aesthetic tab/spacing issues. I have tested the above patch on DragonFly building and packaging subversion and pkglint and their many dependencies. I have also tested USE_ABI_DEPENDS=no on my NetBSD workstation (where I have used IGNORE_RECOMMENDED for a long time). I have been an active user of IGNORE_RECOMMENDED since it was available. As suggested, I removed the documentation sentences suggesting bumping for "security" issues. As discussed on tech-pkg. I will commit to revbump, pkglint, pkg_install, createbuildlink separately. Note that if you use wip, it will fail! I will commit to pkgsrc-wip later (within day).
-rw-r--r--archivers/bzip2/buildlink3.mk6
-rw-r--r--archivers/bzip2/builtin.mk4
-rw-r--r--archivers/file-roller/Makefile8
-rw-r--r--archivers/gsharutils/Makefile4
-rw-r--r--archivers/libcomprex/buildlink3.mk6
-rw-r--r--archivers/liblzo/buildlink3.mk6
-rw-r--r--archivers/libzip/buildlink3.mk4
-rw-r--r--archivers/lzo/buildlink3.mk4
-rw-r--r--archivers/szip/buildlink3.mk4
-rw-r--r--archivers/ucl/buildlink3.mk4
-rw-r--r--archivers/zziplib/buildlink3.mk4
-rw-r--r--audio/SDL-nas/Makefile4
-rw-r--r--audio/SDL_mixer/buildlink3.mk6
-rw-r--r--audio/SDL_sound/buildlink3.mk6
-rw-r--r--audio/amarok/Makefile8
-rw-r--r--audio/arts/buildlink3.mk6
-rw-r--r--audio/bmp/buildlink3.mk6
-rw-r--r--audio/cddb-bundle/buildlink3.mk6
-rw-r--r--audio/cdparanoia/buildlink3.mk6
-rw-r--r--audio/cdplayer/buildlink3.mk6
-rw-r--r--audio/esound/buildlink3.mk6
-rw-r--r--audio/faac/buildlink3.mk6
-rw-r--r--audio/faad2/buildlink3.mk6
-rw-r--r--audio/flac/buildlink3.mk6
-rw-r--r--audio/fluidsynth/buildlink3.mk4
-rw-r--r--audio/gkrellm-xmms/Makefile4
-rw-r--r--audio/gnome-speech/buildlink3.mk6
-rw-r--r--audio/goom/buildlink3.mk4
-rw-r--r--audio/gsm/buildlink3.mk6
-rw-r--r--audio/gst-plugins0.8-artsd/buildlink3.mk6
-rw-r--r--audio/gst-plugins0.8-esound/buildlink3.mk6
-rw-r--r--audio/gst-plugins0.8-mad/buildlink3.mk6
-rw-r--r--audio/gtkpod/Makefile4
-rw-r--r--audio/id3lib/buildlink3.mk6
-rw-r--r--audio/ladspa/buildlink3.mk6
-rw-r--r--audio/lame/buildlink3.mk6
-rw-r--r--audio/liba52/buildlink3.mk6
-rw-r--r--audio/libao-macosx/Makefile4
-rw-r--r--audio/libao-oss/Makefile4
-rw-r--r--audio/libao-sun/Makefile4
-rw-r--r--audio/libao/buildlink3.mk6
-rw-r--r--audio/libaudiofile/buildlink3.mk6
-rw-r--r--audio/libcdaudio/buildlink3.mk6
-rw-r--r--audio/libcddb/buildlink3.mk6
-rw-r--r--audio/libdca/buildlink3.mk4
-rw-r--r--audio/libhydrogen/buildlink3.mk6
-rw-r--r--audio/libid3tag/buildlink3.mk6
-rw-r--r--audio/libmad/buildlink3.mk6
-rw-r--r--audio/libmikmod/buildlink3.mk6
-rw-r--r--audio/libmodplug/buildlink3.mk6
-rw-r--r--audio/libmpd/buildlink3.mk4
-rw-r--r--audio/libmusepack/buildlink3.mk4
-rw-r--r--audio/libopendaap/buildlink3.mk6
-rw-r--r--audio/libsamplerate/Makefile4
-rw-r--r--audio/libsamplerate/buildlink3.mk6
-rw-r--r--audio/libshout/buildlink3.mk6
-rw-r--r--audio/libsidplay/buildlink3.mk6
-rw-r--r--audio/libsndfile/buildlink3.mk6
-rw-r--r--audio/libvisual/buildlink3.mk6
-rw-r--r--audio/libvorbis/buildlink3.mk6
-rw-r--r--audio/musicbrainz/buildlink3.mk6
-rw-r--r--audio/nas/buildlink3.mk6
-rw-r--r--audio/openal/buildlink3.mk6
-rw-r--r--audio/portaudio/buildlink3.mk6
-rw-r--r--audio/py-ogg/buildlink3.mk6
-rw-r--r--audio/rplay/buildlink3.mk6
-rw-r--r--audio/speex/buildlink3.mk6
-rw-r--r--audio/streamtuner/buildlink3.mk6
-rw-r--r--audio/sweep/buildlink3.mk6
-rw-r--r--audio/taglib/buildlink3.mk6
-rw-r--r--audio/tremor/buildlink3.mk6
-rw-r--r--audio/tunepimp/buildlink3.mk6
-rw-r--r--audio/tunesbrowser/Makefile4
-rw-r--r--audio/wsoundserver/buildlink3.mk6
-rw-r--r--audio/xfce4-mixer/buildlink3.mk6
-rw-r--r--audio/xfce4-xmms-plugin/buildlink3.mk6
-rw-r--r--audio/xmms-esound/Makefile4
-rw-r--r--audio/xmms-mad/Makefile4
-rw-r--r--audio/xmms-meta-input/buildlink3.mk6
-rw-r--r--audio/xmms/buildlink3.mk6
-rw-r--r--bootstrap/files/packages.cat76
-rw-r--r--cad/gplcver/buildlink3.mk4
-rw-r--r--cad/libgeda/buildlink3.mk6
-rw-r--r--cad/libwcalc/buildlink3.mk6
-rw-r--r--cad/spice/Makefile4
-rw-r--r--cad/verilog-current/buildlink3.mk6
-rw-r--r--cad/verilog/buildlink3.mk4
-rw-r--r--chat/ekg/buildlink3.mk6
-rw-r--r--chat/gaim/buildlink3.mk6
-rw-r--r--chat/gale/buildlink3.mk6
-rw-r--r--chat/jabberd/buildlink3.mk6
-rw-r--r--chat/jabberd2/Makefile4
-rw-r--r--chat/libirc/buildlink3.mk6
-rw-r--r--chat/libotr/buildlink3.mk4
-rw-r--r--chat/libtlen/buildlink3.mk6
-rw-r--r--chat/licq-gui-qt/Makefile4
-rw-r--r--chat/loudmouth/Makefile4
-rw-r--r--chat/loudmouth/buildlink3.mk6
-rw-r--r--chat/psi/Makefile4
-rw-r--r--chat/unrealircd/Makefile6
-rw-r--r--chat/zephyr/buildlink3.mk6
-rw-r--r--comms/gnome-pilot/buildlink3.mk6
-rw-r--r--comms/jpilot/buildlink3.mk6
-rw-r--r--comms/libmal/buildlink3.mk6
-rw-r--r--comms/openobex/buildlink3.mk6
-rw-r--r--comms/p5-pilot-link/Makefile4
-rw-r--r--comms/pilot-link-libs/buildlink3.mk6
-rw-r--r--comms/pilot-link/Makefile4
-rw-r--r--comms/synce-librapi2/buildlink3.mk4
-rw-r--r--comms/synce-libsynce/buildlink3.mk4
-rw-r--r--comms/zaptel-netbsd/buildlink3.mk6
-rw-r--r--converters/fribidi/buildlink3.mk6
-rw-r--r--converters/libiconv/buildlink3.mk6
-rw-r--r--converters/libiconv/builtin.mk4
-rw-r--r--converters/libwpd/buildlink3.mk6
-rw-r--r--converters/psiconv/buildlink3.mk6
-rw-r--r--converters/recode/buildlink3.mk6
-rw-r--r--converters/uulib/buildlink3.mk6
-rw-r--r--converters/wv/buildlink3.mk6
-rw-r--r--converters/wv2/buildlink3.mk6
-rw-r--r--cross/binutils/buildlink3.mk4
-rw-r--r--databases/bdb-xml/buildlink3.mk6
-rw-r--r--databases/db/buildlink3.mk6
-rw-r--r--databases/db3/buildlink3.mk6
-rw-r--r--databases/db4/buildlink3.mk6
-rw-r--r--databases/dbh/buildlink3.mk4
-rw-r--r--databases/edb/buildlink3.mk6
-rw-r--r--databases/freetds/buildlink3.mk6
-rw-r--r--databases/gdbm/buildlink3.mk6
-rw-r--r--databases/geneweb/Makefile4
-rw-r--r--databases/gnome-mime-data/buildlink3.mk6
-rw-r--r--databases/iodbc/buildlink3.mk4
-rw-r--r--databases/libgda/buildlink3.mk6
-rw-r--r--databases/libgnomedb/buildlink3.mk6
-rw-r--r--databases/libpqxx/buildlink3.mk6
-rw-r--r--databases/metakit-lib/buildlink3.mk6
-rw-r--r--databases/mysql4-client/buildlink3.mk6
-rw-r--r--databases/mysql5-client/buildlink3.mk6
-rw-r--r--databases/openldap/buildlink3.mk4
-rw-r--r--databases/openldap/options.mk4
-rw-r--r--databases/p5-DBD-Google/Makefile4
-rw-r--r--databases/p5-DBD-mysql/Makefile4
-rw-r--r--databases/p5-DBI-Shell/Makefile4
-rw-r--r--databases/p5-DBI/buildlink3.mk4
-rw-r--r--databases/p5-DBIWrapper/Makefile4
-rw-r--r--databases/php-pdo/buildlink3.mk6
-rw-r--r--databases/php-pdo_dblib/Makefile4
-rw-r--r--databases/postgresql73-lib/buildlink3.mk6
-rw-r--r--databases/postgresql73/Makefile.common6
-rw-r--r--databases/postgresql74-lib/buildlink3.mk6
-rw-r--r--databases/postgresql74/Makefile.common6
-rw-r--r--databases/postgresql80-client/buildlink3.mk6
-rw-r--r--databases/postgresql80/Makefile.common4
-rw-r--r--databases/postgresql81-client/buildlink3.mk4
-rw-r--r--databases/postgresql81/Makefile.common4
-rw-r--r--databases/py-ZODB/buildlink3.mk6
-rw-r--r--databases/py-bsddb3/buildlink3.mk6
-rw-r--r--databases/py-ldap/buildlink3.mk6
-rw-r--r--databases/py-metakit/buildlink3.mk6
-rw-r--r--databases/py-mssql/Makefile4
-rw-r--r--databases/py-psycopg/buildlink3.mk6
-rw-r--r--databases/qdbm/buildlink3.mk4
-rw-r--r--databases/rrdtool/buildlink3.mk6
-rw-r--r--databases/sdbm/buildlink3.mk4
-rw-r--r--databases/shared-mime-info/buildlink3.mk6
-rw-r--r--databases/sqlite/buildlink3.mk6
-rw-r--r--databases/sqlite3-tcl/Makefile4
-rw-r--r--databases/sqlite3/buildlink3.mk6
-rw-r--r--databases/tcl-postgresql73/buildlink3.mk6
-rw-r--r--databases/tcl-postgresql74/buildlink3.mk6
-rw-r--r--databases/tdb/buildlink3.mk6
-rw-r--r--databases/tinycdb/buildlink3.mk4
-rw-r--r--databases/unixodbc/buildlink3.mk6
-rw-r--r--devel/GConf/buildlink3.mk6
-rw-r--r--devel/GConf2-ui/Makefile4
-rw-r--r--devel/GConf2-ui/buildlink3.mk6
-rw-r--r--devel/GConf2/Makefile.common4
-rw-r--r--devel/GConf2/buildlink3.mk6
-rw-r--r--devel/Gorm/Makefile6
-rw-r--r--devel/Renaissance/buildlink3.mk6
-rw-r--r--devel/SDL/buildlink3.mk6
-rw-r--r--devel/SDL_gfx/buildlink3.mk6
-rw-r--r--devel/SDL_ttf/buildlink3.mk6
-rw-r--r--devel/SDLmm/buildlink3.mk6
-rw-r--r--devel/allegro/buildlink3.mk6
-rw-r--r--devel/apr/buildlink3.mk6
-rw-r--r--devel/at-spi/buildlink3.mk6
-rw-r--r--devel/atk/Makefile4
-rw-r--r--devel/atk/buildlink3.mk6
-rw-r--r--devel/bglibs/buildlink3.mk4
-rw-r--r--devel/binutils/buildlink3.mk4
-rw-r--r--devel/binutils/builtin.mk4
-rw-r--r--devel/blib/buildlink3.mk6
-rw-r--r--devel/boehm-gc/buildlink3.mk6
-rw-r--r--devel/bonobo/Makefile4
-rw-r--r--devel/bonobo/buildlink3.mk6
-rw-r--r--devel/boost-build/buildlink3.mk4
-rw-r--r--devel/boost-headers/buildlink3.mk4
-rw-r--r--devel/boost-libs/buildlink3.mk4
-rw-r--r--devel/boost-python/buildlink3.mk6
-rw-r--r--devel/buddy/buildlink3.mk4
-rw-r--r--devel/buildtool/buildlink3.mk4
-rw-r--r--devel/cdk/buildlink3.mk6
-rw-r--r--devel/cdk/builtin.mk4
-rw-r--r--devel/chmlib/buildlink3.mk6
-rw-r--r--devel/cmake/buildlink3.mk6
-rw-r--r--devel/cppunit/buildlink3.mk6
-rw-r--r--devel/darts/buildlink3.mk4
-rw-r--r--devel/devIL/buildlink3.mk6
-rw-r--r--devel/dlcompat/buildlink3.mk4
-rw-r--r--devel/dlcompat/builtin.mk4
-rw-r--r--devel/dmalloc/buildlink3.mk4
-rw-r--r--devel/edcommon/buildlink3.mk6
-rw-r--r--devel/eel2/buildlink3.mk6
-rw-r--r--devel/eet/buildlink3.mk4
-rw-r--r--devel/ffcall/buildlink3.mk6
-rw-r--r--devel/flex/buildlink3.mk4
-rw-r--r--devel/florist/buildlink3.mk6
-rw-r--r--devel/g-wrap/buildlink3.mk6
-rw-r--r--devel/g-wrap1/buildlink3.mk8
-rw-r--r--devel/gail/buildlink3.mk6
-rw-r--r--devel/gal/buildlink3.mk6
-rw-r--r--devel/gconfmm/buildlink3.mk6
-rw-r--r--devel/gdbada/buildlink3.mk6
-rw-r--r--devel/gettext-asprintf/buildlink3.mk4
-rw-r--r--devel/gettext-lib/buildlink3.mk4
-rw-r--r--devel/gettext-lib/builtin.mk8
-rw-r--r--devel/gettext-tools/Makefile4
-rw-r--r--devel/gettext/Makefile4
-rw-r--r--devel/giblib/buildlink3.mk6
-rw-r--r--devel/glib/buildlink3.mk6
-rw-r--r--devel/glib2/buildlink3.mk6
-rw-r--r--devel/glibmm/Makefile4
-rw-r--r--devel/glibmm/buildlink3.mk6
-rw-r--r--devel/gmp/buildlink3.mk6
-rw-r--r--devel/gnustep-base/buildlink3.mk6
-rw-r--r--devel/gnustep-make/buildlink3.mk6
-rw-r--r--devel/gnustep-objc-lf2/buildlink3.mk6
-rw-r--r--devel/gnustep-objc/buildlink3.mk6
-rw-r--r--devel/gob2/buildlink3.mk6
-rw-r--r--devel/gperf/buildlink3.mk4
-rw-r--r--devel/gtl/buildlink3.mk4
-rw-r--r--devel/guile-gtk/buildlink3.mk6
-rw-r--r--devel/guile14-gtk/buildlink3.mk6
-rw-r--r--devel/hdf/buildlink3.mk6
-rw-r--r--devel/hdf5/buildlink3.mk6
-rw-r--r--devel/kdesdk3/buildlink3.mk6
-rw-r--r--devel/ldapsdk/buildlink3.mk6
-rw-r--r--devel/libFoundation/buildlink3.mk6
-rw-r--r--devel/libargparse/buildlink3.mk6
-rw-r--r--devel/libast/buildlink3.mk6
-rw-r--r--devel/libaura/buildlink3.mk4
-rw-r--r--devel/libbegemot/buildlink3.mk4
-rw-r--r--devel/libbonobo/buildlink3.mk6
-rw-r--r--devel/libbonoboui/Makefile6
-rw-r--r--devel/libbonoboui/buildlink3.mk6
-rw-r--r--devel/libcfg+/buildlink3.mk6
-rw-r--r--devel/libdfui/buildlink3.mk4
-rw-r--r--devel/libdnsres/Makefile4
-rw-r--r--devel/libdnsres/buildlink3.mk4
-rw-r--r--devel/libdockapp/buildlink3.mk6
-rw-r--r--devel/libebml/buildlink3.mk6
-rw-r--r--devel/libelf/buildlink3.mk4
-rw-r--r--devel/libetm/buildlink3.mk4
-rw-r--r--devel/libevent/buildlink3.mk4
-rw-r--r--devel/libevent/builtin.mk4
-rw-r--r--devel/libextractor/buildlink3.mk6
-rw-r--r--devel/libffi/buildlink3.mk6
-rw-r--r--devel/libgail-gnome/buildlink3.mk6
-rw-r--r--devel/libgetopt/buildlink3.mk4
-rw-r--r--devel/libgetopt/builtin.mk4
-rw-r--r--devel/libglade/buildlink3.mk6
-rw-r--r--devel/libglade2/Makefile8
-rw-r--r--devel/libglade2/buildlink3.mk6
-rw-r--r--devel/libglademm/buildlink3.mk6
-rw-r--r--devel/libgnome/Makefile4
-rw-r--r--devel/libgnome/buildlink3.mk6
-rw-r--r--devel/libgnomemm/buildlink3.mk6
-rw-r--r--devel/libgnomeui/Makefile8
-rw-r--r--devel/libgnomeui/buildlink3.mk6
-rw-r--r--devel/libgnomeuimm/buildlink3.mk6
-rw-r--r--devel/libgphoto2/buildlink3.mk6
-rw-r--r--devel/libgsf/buildlink3.mk6
-rw-r--r--devel/libhfs/buildlink3.mk4
-rw-r--r--devel/libiberty/buildlink3.mk6
-rw-r--r--devel/libidn/buildlink3.mk6
-rw-r--r--devel/libinstaller/buildlink3.mk4
-rw-r--r--devel/libjit/buildlink3.mk6
-rw-r--r--devel/libltdl/buildlink3.mk4
-rw-r--r--devel/libmatchbox/buildlink3.mk6
-rw-r--r--devel/libmemcache/buildlink3.mk4
-rw-r--r--devel/libmemmgr/buildlink3.mk4
-rw-r--r--devel/libmimedir/buildlink3.mk4
-rw-r--r--devel/libmm/buildlink3.mk6
-rw-r--r--devel/libnet/buildlink3.mk6
-rw-r--r--devel/libnet11/buildlink3.mk4
-rw-r--r--devel/libntlm/buildlink3.mk6
-rw-r--r--devel/liboil/buildlink3.mk4
-rw-r--r--devel/libole2/buildlink3.mk6
-rw-r--r--devel/liboop/buildlink3.mk6
-rw-r--r--devel/libosip/buildlink3.mk6
-rw-r--r--devel/libportlib/buildlink3.mk4
-rw-r--r--devel/libproplist/buildlink3.mk6
-rw-r--r--devel/librfuncs/buildlink3.mk4
-rw-r--r--devel/librsync/buildlink3.mk6
-rw-r--r--devel/libscsi/buildlink3.mk4
-rw-r--r--devel/libsigc++/buildlink3.mk6
-rw-r--r--devel/libsigc++2/buildlink3.mk6
-rw-r--r--devel/libsigsegv/buildlink3.mk4
-rw-r--r--devel/libslang/buildlink3.mk6
-rw-r--r--devel/libstatgrab/buildlink3.mk6
-rw-r--r--devel/libstroke/buildlink3.mk6
-rw-r--r--devel/libtar/buildlink3.mk4
-rw-r--r--devel/libtecla/buildlink3.mk6
-rw-r--r--devel/libts/buildlink3.mk4
-rw-r--r--devel/libusb/buildlink3.mk6
-rw-r--r--devel/libwnck/buildlink3.mk6
-rw-r--r--devel/lwp/buildlink3.mk6
-rw-r--r--devel/nbitools/buildlink3.mk4
-rw-r--r--devel/ncurses/buildlink3.mk6
-rw-r--r--devel/ncurses/builtin.mk4
-rw-r--r--devel/netcdf/buildlink3.mk6
-rw-r--r--devel/newt/buildlink3.mk6
-rw-r--r--devel/nspr/buildlink3.mk6
-rw-r--r--devel/nss/Makefile4
-rw-r--r--devel/nss/buildlink3.mk6
-rw-r--r--devel/oaf/buildlink3.mk6
-rw-r--r--devel/ode/buildlink3.mk6
-rw-r--r--devel/ogre/buildlink3.mk6
-rw-r--r--devel/p5-glib2/buildlink3.mk6
-rw-r--r--devel/pango/Makefile6
-rw-r--r--devel/pango/buildlink3.mk6
-rw-r--r--devel/pccts/buildlink3.mk6
-rw-r--r--devel/pcre++/buildlink3.mk4
-rw-r--r--devel/pcre/buildlink3.mk6
-rw-r--r--devel/physfs/buildlink3.mk6
-rw-r--r--devel/popt/buildlink3.mk6
-rw-r--r--devel/pth/buildlink3.mk6
-rw-r--r--devel/pthread-sem/buildlink3.mk4
-rw-r--r--devel/pthread-stublib/buildlink3.mk4
-rw-r--r--devel/pwlib/buildlink3.mk6
-rw-r--r--devel/py-curses/Makefile4
-rw-r--r--devel/py-curses/buildlink3.mk6
-rw-r--r--devel/py-cursespanel/buildlink3.mk6
-rw-r--r--devel/py-game/buildlink3.mk6
-rw-r--r--devel/py-gobject/buildlink3.mk4
-rw-r--r--devel/py-readline/buildlink3.mk6
-rw-r--r--devel/readline/buildlink3.mk6
-rw-r--r--devel/readline/builtin.mk4
-rw-r--r--devel/rpc2/buildlink3.mk6
-rw-r--r--devel/ruby-gnome2-pango/buildlink3.mk6
-rw-r--r--devel/rudiments/buildlink3.mk6
-rw-r--r--devel/rvm/buildlink3.mk6
-rw-r--r--devel/rx/buildlink3.mk4
-rw-r--r--devel/silc-toolkit/buildlink3.mk6
-rw-r--r--devel/subversion-base/Makefile6
-rw-r--r--devel/subversion-base/buildlink3.mk6
-rw-r--r--devel/subversion/Makefile.common4
-rw-r--r--devel/swig/buildlink3.mk6
-rw-r--r--devel/syncdir/buildlink3.mk6
-rw-r--r--devel/sysexits/buildlink3.mk4
-rw-r--r--devel/sysexits/builtin.mk4
-rw-r--r--devel/tcl-tclcl/buildlink3.mk6
-rw-r--r--devel/teem/buildlink3.mk6
-rw-r--r--devel/tre/buildlink3.mk4
-rw-r--r--devel/ucl/buildlink3.mk6
-rw-r--r--devel/vanessa_adt/buildlink3.mk6
-rw-r--r--devel/vanessa_logger/buildlink3.mk6
-rw-r--r--devel/vanessa_socket/buildlink3.mk6
-rw-r--r--devel/zlib/buildlink3.mk6
-rw-r--r--devel/zlib/builtin.mk4
-rw-r--r--doc/guide/files/buildlink.xml28
-rw-r--r--doc/guide/files/configuring.xml4
-rw-r--r--doc/guide/files/fixes.xml23
-rw-r--r--editors/emacs/Makefile4
-rw-r--r--editors/gconf-editor/Makefile4
-rw-r--r--editors/gedit/Makefile10
-rw-r--r--editors/gedit/buildlink3.mk4
-rw-r--r--editors/mule-ucs/Makefile4
-rw-r--r--editors/pico/Makefile4
-rw-r--r--editors/pico/buildlink3.mk4
-rw-r--r--editors/sam/buildlink3.mk6
-rw-r--r--emulators/DatLib/buildlink3.mk6
-rw-r--r--emulators/DatUtil/Makefile4
-rw-r--r--emulators/MAMEDiff/Makefile4
-rw-r--r--emulators/ROMInfo/Makefile4
-rw-r--r--emulators/ZIPIdent/Makefile4
-rw-r--r--emulators/cygwin_lib/buildlink3.mk4
-rw-r--r--emulators/gpsim-devel/buildlink3.mk6
-rw-r--r--emulators/libspectrum/buildlink3.mk6
-rw-r--r--emulators/lrmi/buildlink3.mk4
-rw-r--r--emulators/simh/Makefile4
-rw-r--r--emulators/wine/buildlink3.mk6
-rw-r--r--finance/gnucash-devel/Makefile8
-rw-r--r--finance/libofx/buildlink3.mk4
-rw-r--r--finance/xquote/Makefile4
-rw-r--r--fonts/Xft2/Makefile6
-rw-r--r--fonts/Xft2/buildlink3.mk6
-rw-r--r--fonts/Xft2/builtin.mk6
-rw-r--r--fonts/fontconfig/Makefile4
-rw-r--r--fonts/fontconfig/buildlink3.mk6
-rw-r--r--fonts/fontconfig/builtin.mk8
-rw-r--r--fonts/gucharmap/buildlink3.mk6
-rw-r--r--fonts/mftrace/buildlink3.mk6
-rw-r--r--fonts/t1lib/buildlink3.mk6
-rw-r--r--games/freeciv-server/Makefile4
-rw-r--r--games/gnome2-games/Makefile10
-rw-r--r--games/kdegames3/buildlink3.mk6
-rw-r--r--games/plib/buildlink3.mk6
-rw-r--r--games/wesnoth/Makefile6
-rw-r--r--geography/geos/buildlink3.mk4
-rw-r--r--geography/shapelib/buildlink3.mk4
-rw-r--r--graphics/Coin/buildlink3.mk6
-rw-r--r--graphics/GLXKit/buildlink3.mk6
-rw-r--r--graphics/GUIlib/buildlink3.mk6
-rw-r--r--graphics/GeometryKit/buildlink3.mk6
-rw-r--r--graphics/GlutKit/buildlink3.mk6
-rw-r--r--graphics/ImageMagick/buildlink3.mk6
-rw-r--r--graphics/ImageMagick/options.mk4
-rw-r--r--graphics/MesaLib/buildlink3.mk6
-rw-r--r--graphics/MesaLib/builtin.mk4
-rw-r--r--graphics/OpenRM/buildlink3.mk6
-rw-r--r--graphics/RenderKit/buildlink3.mk6
-rw-r--r--graphics/SDLKit/buildlink3.mk6
-rw-r--r--graphics/SDL_image/buildlink3.mk6
-rw-r--r--graphics/TiffIO/Makefile4
-rw-r--r--graphics/aalib/buildlink3.mk6
-rw-r--r--graphics/cairo/Makefile12
-rw-r--r--graphics/cairo/buildlink3.mk12
-rw-r--r--graphics/cal3d/buildlink3.mk6
-rw-r--r--graphics/camlimages/Makefile4
-rw-r--r--graphics/camlimages/buildlink3.mk6
-rw-r--r--graphics/cinepaint/Makefile4
-rw-r--r--graphics/compface/buildlink3.mk6
-rw-r--r--graphics/digikam/Makefile6
-rw-r--r--graphics/digikam/buildlink3.mk4
-rw-r--r--graphics/eog2/Makefile4
-rw-r--r--graphics/epeg/buildlink3.mk4
-rw-r--r--graphics/feh/Makefile6
-rw-r--r--graphics/fnlib/buildlink3.mk6
-rw-r--r--graphics/freeglut/buildlink3.mk6
-rw-r--r--graphics/freetype-lib/buildlink3.mk8
-rw-r--r--graphics/freetype-utils/Makefile4
-rw-r--r--graphics/freetype2/buildlink3.mk6
-rw-r--r--graphics/freetype2/builtin.mk6
-rw-r--r--graphics/gd/buildlink3.mk6
-rw-r--r--graphics/gdchart/buildlink3.mk6
-rw-r--r--graphics/gdk-pixbuf-gnome/buildlink3.mk6
-rw-r--r--graphics/gdk-pixbuf/buildlink3.mk6
-rw-r--r--graphics/gimp/Makefile6
-rw-r--r--graphics/gimp/buildlink3.mk6
-rw-r--r--graphics/gimp1-base/buildlink3.mk6
-rw-r--r--graphics/gimp24/Makefile6
-rw-r--r--graphics/gimp24/buildlink3.mk6
-rw-r--r--graphics/gle/buildlink3.mk6
-rw-r--r--graphics/glitz/buildlink3.mk6
-rw-r--r--graphics/glu/Makefile4
-rw-r--r--graphics/glu/buildlink3.mk6
-rw-r--r--graphics/glu/builtin.mk6
-rw-r--r--graphics/glut/Makefile6
-rw-r--r--graphics/glut/buildlink3.mk6
-rw-r--r--graphics/gnome-icon-theme/Makefile4
-rw-r--r--graphics/gnome-icon-theme/buildlink3.mk6
-rw-r--r--graphics/graphviz/buildlink3.mk6
-rw-r--r--graphics/gst-plugins0.8-opengl/Makefile4
-rw-r--r--graphics/gst-plugins0.8-png/Makefile4
-rw-r--r--graphics/gthumb/Makefile4
-rw-r--r--graphics/gtkglext/buildlink3.mk4
-rw-r--r--graphics/hermes/buildlink3.mk6
-rw-r--r--graphics/hicolor-icon-theme/buildlink3.mk6
-rw-r--r--graphics/imlib/buildlink3.mk6
-rw-r--r--graphics/imlib2/buildlink3.mk6
-rw-r--r--graphics/inkscape/Makefile4
-rw-r--r--graphics/jasper/buildlink3.mk6
-rw-r--r--graphics/jpeg/buildlink3.mk6
-rw-r--r--graphics/kbarcode/Makefile4
-rw-r--r--graphics/kdegraphics3/Makefile4
-rw-r--r--graphics/kdegraphics3/buildlink3.mk6
-rw-r--r--graphics/lcms/buildlink3.mk6
-rw-r--r--graphics/lib3ds/buildlink3.mk6
-rw-r--r--graphics/libart2/buildlink3.mk6
-rw-r--r--graphics/libexif-gtk/buildlink3.mk6
-rw-r--r--graphics/libexif/buildlink3.mk6
-rw-r--r--graphics/libgdgeda/buildlink3.mk6
-rw-r--r--graphics/libgdiplus/Makefile8
-rw-r--r--graphics/libgdiplus/buildlink3.mk6
-rw-r--r--graphics/libggi/buildlink3.mk6
-rw-r--r--graphics/libggiwmh/buildlink3.mk6
-rw-r--r--graphics/libgii/buildlink3.mk6
-rw-r--r--graphics/libgnomecanvas/buildlink3.mk6
-rw-r--r--graphics/libgnomecanvasmm/buildlink3.mk6
-rw-r--r--graphics/libkexif/buildlink3.mk6
-rw-r--r--graphics/libkipi/buildlink3.mk6
-rw-r--r--graphics/libpixman/buildlink3.mk4
-rw-r--r--graphics/librsvg/buildlink3.mk6
-rw-r--r--graphics/librsvg2/Makefile4
-rw-r--r--graphics/librsvg2/buildlink3.mk6
-rw-r--r--graphics/libungif/buildlink3.mk6
-rw-r--r--graphics/libvideogfx/buildlink3.mk6
-rw-r--r--graphics/libwmf/buildlink3.mk6
-rw-r--r--graphics/mng/buildlink3.mk6
-rw-r--r--graphics/netpbm/buildlink3.mk6
-rw-r--r--graphics/openexr/buildlink3.mk6
-rw-r--r--graphics/optipng/Makefile4
-rw-r--r--graphics/p5-GD/Makefile4
-rw-r--r--graphics/p5-Image-Imlib2/Makefile4
-rw-r--r--graphics/p5-PerlMagick/Makefile4
-rw-r--r--graphics/plotutils-nox11/buildlink3.mk4
-rw-r--r--graphics/plotutils/buildlink3.mk6
-rw-r--r--graphics/png/buildlink3.mk6
-rw-r--r--graphics/povray/Makefile4
-rw-r--r--graphics/py-imaging/buildlink3.mk6
-rw-r--r--graphics/py-imagingtk/Makefile4
-rw-r--r--graphics/ruby-imlib2/Makefile4
-rw-r--r--graphics/sane-backends/buildlink3.mk6
-rw-r--r--graphics/sane-frontends/Makefile4
-rw-r--r--graphics/simage/buildlink3.mk6
-rw-r--r--graphics/tiff/buildlink3.mk6
-rw-r--r--graphics/tuxpaint/Makefile8
-rw-r--r--graphics/urt/buildlink3.mk6
-rw-r--r--graphics/wxsvg/buildlink3.mk6
-rw-r--r--graphics/xfce4-artwork/buildlink3.mk6
-rw-r--r--graphics/xfce4-icon-theme/buildlink3.mk6
-rw-r--r--graphics/xfce4-iconbox/buildlink3.mk6
-rw-r--r--graphics/xfig/Makefile4
-rw-r--r--graphics/xpm/buildlink3.mk6
-rw-r--r--graphics/xpm/builtin.mk4
-rw-r--r--ham/gnuradio-core/buildlink3.mk6
-rw-r--r--ham/gnuradio-wxgui/buildlink3.mk6
-rw-r--r--ham/hamlib/buildlink3.mk6
-rw-r--r--ham/usrp/buildlink3.mk6
-rw-r--r--inputmethod/anthy/buildlink3.mk6
-rw-r--r--inputmethod/canna-lib/buildlink3.mk4
-rw-r--r--inputmethod/ja-freewnn-lib/buildlink3.mk4
-rw-r--r--inputmethod/libchewing/buildlink3.mk6
-rw-r--r--inputmethod/libtabe/buildlink3.mk6
-rw-r--r--inputmethod/sj3-lib/buildlink3.mk4
-rw-r--r--inputmethod/uim/buildlink3.mk6
-rw-r--r--inputmethod/unicon-im/buildlink3.mk6
-rw-r--r--lang/Cg-compiler/buildlink3.mk6
-rw-r--r--lang/blackdown-jdk13/buildlink3.mk4
-rw-r--r--lang/blackdown-jre13/buildlink3.mk4
-rw-r--r--lang/cdl3/buildlink3.mk6
-rw-r--r--lang/clisp/Makefile4
-rw-r--r--lang/coq/Makefile4
-rw-r--r--lang/elk/buildlink3.mk4
-rw-r--r--lang/erlang/buildlink3.mk6
-rw-r--r--lang/ezm3/buildlink3.mk6
-rw-r--r--lang/f2c/buildlink3.mk6
-rw-r--r--lang/gauche/buildlink3.mk4
-rw-r--r--lang/gawk/Makefile4
-rw-r--r--lang/gcc/buildlink3.mk6
-rw-r--r--lang/gcc3-ada/buildlink3.mk6
-rw-r--r--lang/gcc3-c++/buildlink3.mk6
-rw-r--r--lang/gcc3-c/buildlink3.mk6
-rw-r--r--lang/gcc3-f77/buildlink3.mk6
-rw-r--r--lang/gcc3-java/Makefile4
-rw-r--r--lang/gcc3-java/buildlink3.mk6
-rw-r--r--lang/gcc3-objc/buildlink3.mk6
-rw-r--r--lang/gcc3/language.mk4
-rw-r--r--lang/gcc34-ada/buildlink3.mk6
-rw-r--r--lang/gcc34/buildlink3.mk6
-rw-r--r--lang/ghc/buildlink3.mk6
-rw-r--r--lang/guile/buildlink3.mk6
-rw-r--r--lang/guile14/buildlink3.mk6
-rw-r--r--lang/jdk/buildlink3.mk4
-rw-r--r--lang/kaffe/buildlink3.mk6
-rw-r--r--lang/librep/buildlink3.mk6
-rw-r--r--lang/libtcl-nothread/buildlink3.mk6
-rw-r--r--lang/lua/buildlink3.mk6
-rw-r--r--lang/lua4/buildlink3.mk4
-rw-r--r--lang/mono/buildlink3.mk6
-rw-r--r--lang/ocaml/buildlink3.mk6
-rw-r--r--lang/onyx/Makefile4
-rw-r--r--lang/parrot/buildlink3.mk6
-rw-r--r--lang/perl5/buildlink3.mk4
-rw-r--r--lang/php5/buildlink3.mk6
-rw-r--r--lang/pnet/buildlink3.mk6
-rw-r--r--lang/pnetC/buildlink3.mk6
-rw-r--r--lang/pnetlib/buildlink3.mk6
-rw-r--r--lang/py-extclass/buildlink3.mk6
-rw-r--r--lang/python/pyversion.mk26
-rw-r--r--lang/python15/buildlink3.mk4
-rw-r--r--lang/python20/buildlink3.mk6
-rw-r--r--lang/python21/buildlink3.mk4
-rw-r--r--lang/python22/buildlink3.mk4
-rw-r--r--lang/python23-nth/buildlink3.mk6
-rw-r--r--lang/python23/buildlink3.mk6
-rw-r--r--lang/python24/buildlink3.mk6
-rw-r--r--lang/ruby/buildlink3.mk6
-rw-r--r--lang/spidermonkey/buildlink3.mk6
-rw-r--r--lang/sun-jdk13/buildlink3.mk6
-rw-r--r--lang/sun-jdk14/buildlink3.mk6
-rw-r--r--lang/sun-jdk15/buildlink3.mk6
-rw-r--r--lang/sun-jre13/buildlink3.mk6
-rw-r--r--lang/sun-jre14/buildlink3.mk6
-rw-r--r--lang/sun-jre15/buildlink3.mk6
-rw-r--r--lang/swi-prolog-lite/buildlink3.mk4
-rw-r--r--lang/tcl-expect/buildlink3.mk6
-rw-r--r--lang/tcl-itcl-current/buildlink3.mk6
-rw-r--r--lang/tcl-itcl/buildlink3.mk6
-rw-r--r--lang/tcl-otcl/buildlink3.mk6
-rw-r--r--lang/tcl-tclX/Makefile4
-rw-r--r--lang/tcl-tclX/buildlink3.mk6
-rw-r--r--lang/tcl/buildlink3.mk6
-rw-r--r--lang/tcl83/buildlink3.mk4
-rw-r--r--lang/win32-jdk/buildlink3.mk4
-rw-r--r--mail/Pantomime/buildlink3.mk6
-rw-r--r--mail/balsa2/Makefile4
-rw-r--r--mail/clamav/Makefile4
-rw-r--r--mail/clamav/buildlink3.mk6
-rw-r--r--mail/dk-milter/Makefile4
-rw-r--r--mail/dkim-milter/Makefile4
-rw-r--r--mail/drac/buildlink3.mk4
-rw-r--r--mail/evolution-data-server/Makefile4
-rw-r--r--mail/evolution-data-server/buildlink3.mk6
-rw-r--r--mail/evolution/Makefile10
-rw-r--r--mail/evolution/buildlink3.mk4
-rw-r--r--mail/faces/buildlink3.mk6
-rw-r--r--mail/gmime/buildlink3.mk6
-rw-r--r--mail/imap-uw-utils/Makefile4
-rw-r--r--mail/imap-uw/buildlink3.mk6
-rw-r--r--mail/libesmtp/buildlink3.mk6
-rw-r--r--mail/libetpan/buildlink3.mk6
-rw-r--r--mail/libmilter/buildlink3.mk4
-rw-r--r--mail/libmilter/builtin.mk4
-rw-r--r--mail/libmilter812/buildlink3.mk4
-rw-r--r--mail/libmilter812/builtin.mk4
-rw-r--r--mail/libspf-alt/Makefile4
-rw-r--r--mail/libspf-alt/buildlink3.mk6
-rw-r--r--mail/p5-Mail-ClamAV/Makefile4
-rw-r--r--mail/perdition/buildlink3.mk6
-rw-r--r--mail/pine/Makefile4
-rw-r--r--mail/squirrelmail/buildlink3.mk6
-rw-r--r--mail/sylpheed-claws/buildlink3.mk6
-rw-r--r--math/R/Makefile4
-rw-r--r--math/R/buildlink3.mk6
-rw-r--r--math/blas/buildlink3.mk6
-rw-r--r--math/cln/buildlink3.mk6
-rw-r--r--math/djbfft/buildlink3.mk4
-rw-r--r--math/fftw/buildlink3.mk6
-rw-r--r--math/fftw2/buildlink3.mk6
-rw-r--r--math/fftwf/buildlink3.mk6
-rw-r--r--math/glpk/buildlink3.mk6
-rw-r--r--math/gnumeric/Makefile6
-rw-r--r--math/gsl/buildlink3.mk6
-rw-r--r--math/guppi/buildlink3.mk6
-rw-r--r--math/lapack/buildlink3.mk6
-rw-r--r--math/libffm/buildlink3.mk6
-rw-r--r--math/libmatheval/buildlink3.mk6
-rw-r--r--math/ltm/buildlink3.mk6
-rw-r--r--math/mathomatic/Makefile4
-rw-r--r--math/mpfr/buildlink3.mk4
-rw-r--r--math/ntl/buildlink3.mk6
-rw-r--r--math/octave-current/buildlink3.mk6
-rw-r--r--math/octave-forge/buildlink3.mk6
-rw-r--r--math/octave/buildlink3.mk6
-rw-r--r--math/pari/buildlink3.mk6
-rw-r--r--math/py-Numeric/buildlink3.mk6
-rw-r--r--math/py-Scientific/Makefile6
-rw-r--r--math/py-fpconst/buildlink3.mk6
-rw-r--r--math/py-numarray/buildlink3.mk6
-rw-r--r--math/py-rpy/Makefile4
-rw-r--r--math/qalculate/buildlink3.mk6
-rw-r--r--math/scilab/buildlink3.mk6
-rw-r--r--math/slatec/buildlink3.mk6
-rw-r--r--math/superlu/buildlink3.mk4
-rw-r--r--math/tasp-vsipl/buildlink3.mk6
-rw-r--r--math/udunits/buildlink3.mk4
-rw-r--r--math/yorick/buildlink3.mk6
-rw-r--r--mbone/common-mml/buildlink3.mk4
-rw-r--r--meta-pkgs/kde3/kde3.mk4
-rw-r--r--meta-pkgs/xfce4/buildlink3.mk6
-rw-r--r--misc/Addresses/buildlink3.mk6
-rw-r--r--misc/gnome2-utils/Makefile10
-rw-r--r--misc/goffice/Makefile6
-rw-r--r--misc/goffice/buildlink3.mk6
-rw-r--r--misc/kdepim3/Makefile4
-rw-r--r--misc/kdepim3/buildlink3.mk6
-rw-r--r--misc/koffice/buildlink3.mk6
-rw-r--r--misc/libcdio/buildlink3.mk6
-rw-r--r--misc/libutf/buildlink3.mk6
-rw-r--r--misc/proj/buildlink3.mk6
-rw-r--r--misc/rpm/buildlink3.mk6
-rw-r--r--misc/xfce4-weather-plugin/buildlink3.mk6
-rw-r--r--misc/yelp/Makefile6
-rw-r--r--mk/apache.mk6
-rw-r--r--mk/bsd.pkg.mk14
-rw-r--r--mk/buildlink3/bsd.buildlink3.mk28
-rw-r--r--mk/buildlink3/bsd.builtin.mk4
-rw-r--r--mk/db1.builtin.mk4
-rw-r--r--mk/defaults/mk.conf12
-rw-r--r--mk/java-vm.mk26
-rw-r--r--mk/oss.builtin.mk4
-rw-r--r--mk/pthread.buildlink3.mk4
-rw-r--r--mk/solaris-pam.builtin.mk4
-rw-r--r--mk/tex.buildlink3.mk14
-rw-r--r--mk/tools/replace.mk6
-rw-r--r--multimedia/dirac/buildlink3.mk4
-rw-r--r--multimedia/dvdrip/Makefile4
-rw-r--r--multimedia/ffmpeg/buildlink3.mk6
-rw-r--r--multimedia/gnome2-media/buildlink3.mk6
-rw-r--r--multimedia/gst-plugins0.10-base/buildlink3.mk6
-rw-r--r--multimedia/gst-plugins0.10-good/buildlink3.mk6
-rw-r--r--multimedia/gst-plugins0.8-xvid/Makefile4
-rw-r--r--multimedia/gst-plugins0.8/Makefile.common4
-rw-r--r--multimedia/gst-plugins0.8/buildlink3.mk6
-rw-r--r--multimedia/gstreamer0.10/Makefile4
-rw-r--r--multimedia/gstreamer0.10/buildlink3.mk6
-rw-r--r--multimedia/gstreamer0.8/Makefile4
-rw-r--r--multimedia/gstreamer0.8/buildlink3.mk6
-rw-r--r--multimedia/gstreamer0.8/plugins.mk4
-rw-r--r--multimedia/kdemultimedia3/Makefile4
-rw-r--r--multimedia/kdemultimedia3/buildlink3.mk6
-rw-r--r--multimedia/libassetml/buildlink3.mk6
-rw-r--r--multimedia/libdv-tools/Makefile4
-rw-r--r--multimedia/libdv/buildlink3.mk6
-rw-r--r--multimedia/libdvbpsi/buildlink3.mk6
-rw-r--r--multimedia/libdvdcss/buildlink3.mk6
-rw-r--r--multimedia/libdvdnav/buildlink3.mk6
-rw-r--r--multimedia/libdvdplay/buildlink3.mk6
-rw-r--r--multimedia/libdvdread/buildlink3.mk6
-rw-r--r--multimedia/libflash/buildlink3.mk6
-rw-r--r--multimedia/libmatroska/buildlink3.mk6
-rw-r--r--multimedia/libmpeg2/buildlink3.mk6
-rw-r--r--multimedia/libmpeg3/buildlink3.mk6
-rw-r--r--multimedia/libogg/buildlink3.mk6
-rw-r--r--multimedia/libtheora/buildlink3.mk6
-rw-r--r--multimedia/lsdvd/Makefile4
-rw-r--r--multimedia/ming/buildlink3.mk4
-rw-r--r--multimedia/mjpegtools/buildlink3.mk6
-rw-r--r--multimedia/mpeg-lib/buildlink3.mk6
-rw-r--r--multimedia/ogle/buildlink3.mk6
-rw-r--r--multimedia/openquicktime/buildlink3.mk6
-rw-r--r--multimedia/smpeg/buildlink3.mk6
-rw-r--r--multimedia/swfdec/buildlink3.mk6
-rw-r--r--multimedia/totem/Makefile.common6
-rw-r--r--multimedia/vlc/Makefile6
-rw-r--r--multimedia/vlc/buildlink3.mk6
-rw-r--r--multimedia/x264-devel/buildlink3.mk4
-rw-r--r--multimedia/xine-lib/Makefile6
-rw-r--r--multimedia/xine-lib/buildlink3.mk8
-rw-r--r--multimedia/xine-ui/Makefile4
-rw-r--r--multimedia/xvidcore/buildlink3.mk6
-rw-r--r--net/GeoIP/buildlink3.mk6
-rw-r--r--net/ORBit/buildlink3.mk6
-rw-r--r--net/ORBit2/buildlink3.mk6
-rw-r--r--net/SDL_net/buildlink3.mk6
-rw-r--r--net/adns/buildlink3.mk6
-rw-r--r--net/bind9/buildlink3.mk6
-rw-r--r--net/bind9/builtin.mk4
-rw-r--r--net/boinc3-libs/buildlink3.mk4
-rw-r--r--net/btpd/Makefile4
-rw-r--r--net/cdpd/Makefile4
-rw-r--r--net/dante/buildlink3.mk6
-rw-r--r--net/ettercap-NG/Makefile4
-rw-r--r--net/firewalk/Makefile4
-rw-r--r--net/flodo/Makefile4
-rw-r--r--net/freeradius/Makefile4
-rw-r--r--net/freewais-sf/buildlink3.mk6
-rw-r--r--net/gift/buildlink3.mk6
-rw-r--r--net/gnet/buildlink3.mk6
-rw-r--r--net/gnet1/buildlink3.mk6
-rw-r--r--net/hesiod/buildlink3.mk4
-rw-r--r--net/howl/buildlink3.mk6
-rw-r--r--net/kdenetwork3/buildlink3.mk6
-rw-r--r--net/libIDL/buildlink3.mk6
-rw-r--r--net/libares/buildlink3.mk4
-rw-r--r--net/libcares/buildlink3.mk4
-rw-r--r--net/libdnet/buildlink3.mk6
-rw-r--r--net/liblive/buildlink3.mk6
-rw-r--r--net/libnids/buildlink3.mk4
-rw-r--r--net/libpcap/buildlink3.mk4
-rw-r--r--net/libpcap/builtin.mk4
-rw-r--r--net/libradius/buildlink3.mk4
-rw-r--r--net/libsoup-devel/buildlink3.mk6
-rw-r--r--net/libsoup/buildlink3.mk6
-rw-r--r--net/libtorrent/buildlink3.mk6
-rw-r--r--net/linc/buildlink3.mk6
-rw-r--r--net/mDNSResponder/buildlink3.mk6
-rw-r--r--net/mldonkey-gui/options.mk4
-rw-r--r--net/nemesis/Makefile4
-rw-r--r--net/net-snmp/buildlink3.mk6
-rw-r--r--net/netatalk/buildlink3.mk6
-rw-r--r--net/netatalk1/buildlink3.mk6
-rw-r--r--net/netbsd-tap/buildlink3.mk4
-rw-r--r--net/netbsd-tap/builtin.mk4
-rw-r--r--net/ns/Makefile6
-rw-r--r--net/nsd/Makefile4
-rw-r--r--net/ntop/Makefile4
-rw-r--r--net/openh323/buildlink3.mk6
-rw-r--r--net/openslp/buildlink3.mk6
-rw-r--r--net/p5-Net-Packet/Makefile4
-rw-r--r--net/p5-Net-Pcap/Makefile4
-rw-r--r--net/py-ORBit/Makefile4
-rw-r--r--net/py-ORBit/buildlink3.mk6
-rw-r--r--net/py-libdnet/buildlink3.mk6
-rw-r--r--net/py-libpcap/Makefile4
-rw-r--r--net/py-libpcap/buildlink3.mk6
-rw-r--r--net/py-soappy/buildlink3.mk6
-rw-r--r--net/samba/buildlink3.mk4
-rw-r--r--net/scdp/Makefile4
-rw-r--r--net/scli/Makefile4
-rw-r--r--net/socks4/buildlink3.mk4
-rw-r--r--net/socks5/buildlink3.mk4
-rw-r--r--net/soup/buildlink3.mk6
-rw-r--r--net/spread/buildlink3.mk4
-rw-r--r--net/tcl-scotty/Makefile4
-rw-r--r--net/tcl-scotty/buildlink3.mk6
-rw-r--r--net/tcpdump/Makefile4
-rw-r--r--net/tcpreplay/Makefile4
-rw-r--r--net/tcptraceroute/Makefile4
-rw-r--r--net/tor/Makefile4
-rw-r--r--net/trafshow/Makefile4
-rw-r--r--net/ucarp/Makefile4
-rw-r--r--net/unison-devel/Makefile4
-rw-r--r--net/unison/Makefile4
-rw-r--r--net/whoson/buildlink3.mk4
-rw-r--r--net/xfce4-wavelan-plugin/buildlink3.mk6
-rw-r--r--net/xipdump/Makefile4
-rw-r--r--net/yaz/buildlink3.mk6
-rw-r--r--news/inn/buildlink3.mk4
-rw-r--r--parallel/mpi-ch/buildlink3.mk6
-rw-r--r--parallel/pvm3/buildlink3.mk6
-rw-r--r--pkgtools/libnbcompat/buildlink3.mk4
-rw-r--r--pkgtools/x11-links/buildlink3.mk4
-rw-r--r--print/a2ps/buildlink3.mk6
-rw-r--r--print/cups/buildlink3.mk6
-rw-r--r--print/dvipng/Makefile4
-rw-r--r--print/gimp-print-lib/buildlink3.mk6
-rw-r--r--print/gnome-print/buildlink3.mk6
-rw-r--r--print/ijs/buildlink3.mk6
-rw-r--r--print/ja-vflib-lib/buildlink3.mk6
-rw-r--r--print/ja-vflib-utils/Makefile4
-rw-r--r--print/libgnomecups/buildlink3.mk6
-rw-r--r--print/libgnomeprint/Makefile4
-rw-r--r--print/libgnomeprint/buildlink3.mk6
-rw-r--r--print/libgnomeprintui/Makefile4
-rw-r--r--print/libgnomeprintui/buildlink3.mk6
-rw-r--r--print/lilypond/Makefile4
-rw-r--r--print/pdflib/buildlink3.mk6
-rw-r--r--print/poppler-glib/Makefile4
-rw-r--r--print/poppler-glib/buildlink3.mk4
-rw-r--r--print/poppler-qt/Makefile4
-rw-r--r--print/poppler-qt/buildlink3.mk4
-rw-r--r--print/poppler/buildlink3.mk4
-rw-r--r--print/pslib/buildlink3.mk6
-rw-r--r--print/py-reportlab-renderPM/buildlink3.mk6
-rw-r--r--print/py-reportlab/buildlink3.mk6
-rw-r--r--print/tcl-pdflib/Makefile4
-rw-r--r--print/teTeX-bin/buildlink3.mk6
-rw-r--r--print/teTeX/module.mk4
-rw-r--r--print/teTeX1-bin/buildlink3.mk6
-rw-r--r--print/teTeX3-bin/buildlink3.mk6
-rw-r--r--print/transfig/buildlink3.mk6
-rw-r--r--print/xfce4-print/buildlink3.mk6
-rw-r--r--security/PAM/buildlink3.mk6
-rw-r--r--security/PAM/builtin.mk4
-rw-r--r--security/aide/Makefile4
-rw-r--r--security/beecrypt/buildlink3.mk6
-rw-r--r--security/botan/buildlink3.mk4
-rw-r--r--security/courier-authlib/buildlink3.mk6
-rw-r--r--security/crypto++/buildlink3.mk6
-rw-r--r--security/cvm/buildlink3.mk4
-rw-r--r--security/cyrus-sasl2/buildlink3.mk6
-rw-r--r--security/dirb/Makefile4
-rw-r--r--security/dirmngr/buildlink3.mk6
-rw-r--r--security/dsniff/Makefile.common4
-rw-r--r--security/gnome-keyring/Makefile6
-rw-r--r--security/gnome-keyring/buildlink3.mk6
-rw-r--r--security/gnupg-devel/Makefile4
-rw-r--r--security/gnupg-devel/buildlink3.mk6
-rw-r--r--security/gnutls/Makefile8
-rw-r--r--security/gnutls/buildlink3.mk6
-rw-r--r--security/gpgme/Makefile4
-rw-r--r--security/gpgme/buildlink3.mk6
-rw-r--r--security/gpgme03/buildlink3.mk6
-rw-r--r--security/gsasl/buildlink3.mk6
-rw-r--r--security/gss/buildlink3.mk6
-rw-r--r--security/heimdal/buildlink3.mk6
-rw-r--r--security/heimdal/builtin.mk6
-rw-r--r--security/hydra/Makefile4
-rw-r--r--security/kth-krb4/buildlink3.mk8
-rw-r--r--security/libassuan/Makefile4
-rw-r--r--security/libassuan/buildlink3.mk6
-rw-r--r--security/libcrack/buildlink3.mk6
-rw-r--r--security/libdes/buildlink3.mk4
-rw-r--r--security/libdes/builtin.mk4
-rw-r--r--security/libfwbuilder/Makefile4
-rw-r--r--security/libfwbuilder/buildlink3.mk6
-rw-r--r--security/libgcrypt/buildlink3.mk6
-rw-r--r--security/libgpg-error/buildlink3.mk6
-rw-r--r--security/libidea/buildlink3.mk4
-rw-r--r--security/libident/buildlink3.mk6
-rw-r--r--security/libksba/buildlink3.mk6
-rw-r--r--security/libksba04/buildlink3.mk6
-rw-r--r--security/libmcrypt/buildlink3.mk6
-rw-r--r--security/libnasl/buildlink3.mk6
-rw-r--r--security/libprelude/buildlink3.mk6
-rw-r--r--security/libpreludedb/buildlink3.mk6
-rw-r--r--security/libssh/buildlink3.mk4
-rw-r--r--security/libtasn1/buildlink3.mk6
-rw-r--r--security/libtcpa/buildlink3.mk6
-rw-r--r--security/mhash/buildlink3.mk6
-rw-r--r--security/mit-krb5/buildlink3.mk6
-rw-r--r--security/mixminion/Makefile4
-rw-r--r--security/nessus-core/buildlink3.mk6
-rw-r--r--security/nessus-libraries/buildlink3.mk4
-rw-r--r--security/opencdk/buildlink3.mk6
-rw-r--r--security/openpam/buildlink3.mk4
-rw-r--r--security/openpam/builtin.mk4
-rw-r--r--security/openssl/buildlink3.mk6
-rw-r--r--security/openssl/builtin.mk4
-rw-r--r--security/p5-Net-DNS-SEC/Makefile4
-rw-r--r--security/pakemon/Makefile4
-rw-r--r--security/pflkm/buildlink3.mk4
-rw-r--r--security/pflkm/builtin.mk4
-rw-r--r--security/pinentry/Makefile4
-rw-r--r--security/pinentry/buildlink3.mk6
-rw-r--r--security/py-m2crypto/Makefile4
-rw-r--r--security/qca-tls/Makefile4
-rw-r--r--security/qca/Makefile4
-rw-r--r--security/qca/buildlink3.mk6
-rw-r--r--security/rsaref/buildlink3.mk6
-rw-r--r--security/seahorse-gedit/Makefile4
-rw-r--r--security/seahorse-nautilus/Makefile4
-rw-r--r--security/seahorse/Makefile4
-rw-r--r--security/seahorse/buildlink3.mk4
-rw-r--r--security/skey/buildlink3.mk6
-rw-r--r--security/skey/builtin.mk4
-rw-r--r--security/tcl-tls/buildlink3.mk4
-rw-r--r--security/tcp_wrappers/buildlink3.mk6
-rw-r--r--security/tcp_wrappers/builtin.mk4
-rw-r--r--security/tinyca/Makefile4
-rw-r--r--shells/bash/Makefile4
-rw-r--r--shells/bash2/Makefile4
-rw-r--r--sysutils/amanda-common/buildlink3.mk6
-rw-r--r--sysutils/dbus-glib/buildlink3.mk4
-rw-r--r--sysutils/dbus/Makefile.common4
-rw-r--r--sysutils/dbus/buildlink3.mk4
-rw-r--r--sysutils/desktop-file-utils/buildlink3.mk6
-rw-r--r--sysutils/duplicity/Makefile4
-rw-r--r--sysutils/fam/buildlink3.mk6
-rw-r--r--sysutils/fam/builtin.mk4
-rw-r--r--sysutils/file/buildlink3.mk6
-rw-r--r--sysutils/file/builtin.mk4
-rw-r--r--sysutils/gamin/buildlink3.mk6
-rw-r--r--sysutils/gkrellm/buildlink3.mk6
-rw-r--r--sysutils/gkrellm1/buildlink3.mk6
-rw-r--r--sysutils/gnome-menus/Makefile6
-rw-r--r--sysutils/gnome-menus/buildlink3.mk4
-rw-r--r--sysutils/gnome-vfs/Makefile4
-rw-r--r--sysutils/gnome-vfs/buildlink3.mk6
-rw-r--r--sysutils/gnome-vfs2/Makefile4
-rw-r--r--sysutils/gnome-vfs2/Makefile.common4
-rw-r--r--sysutils/gnome-vfs2/buildlink3.mk6
-rw-r--r--sysutils/gnome-vfsmm/buildlink3.mk6
-rw-r--r--sysutils/gst-plugins0.8-gnomevfs/buildlink3.mk6
-rw-r--r--sysutils/libgtop2/Makefile4
-rw-r--r--sysutils/libgtop2/buildlink3.mk4
-rw-r--r--sysutils/libol/buildlink3.mk4
-rw-r--r--sysutils/medusa/buildlink3.mk6
-rw-r--r--sysutils/nautilus-cd-burner/buildlink3.mk6
-rw-r--r--sysutils/nautilus/Makefile10
-rw-r--r--sysutils/nautilus/buildlink3.mk6
-rw-r--r--sysutils/pciutils/buildlink3.mk6
-rw-r--r--sysutils/py-dbus/buildlink3.mk6
-rw-r--r--sysutils/rdiff-backup/Makefile4
-rw-r--r--sysutils/vcdimager-devel/Makefile4
-rw-r--r--sysutils/vcdimager-devel/buildlink3.mk6
-rw-r--r--sysutils/xfce4-appfinder/buildlink3.mk6
-rw-r--r--sysutils/xfce4-cpugraph-plugin/buildlink3.mk6
-rw-r--r--sysutils/xfce4-diskperf-plugin/buildlink3.mk6
-rw-r--r--sysutils/xfce4-fm/buildlink3.mk6
-rw-r--r--sysutils/xfce4-fsguard-plugin/buildlink3.mk6
-rw-r--r--sysutils/xfce4-minicmd-plugin/buildlink3.mk6
-rw-r--r--sysutils/xfce4-netload-plugin/buildlink3.mk6
-rw-r--r--sysutils/xfce4-quicklauncher-plugin/buildlink3.mk6
-rw-r--r--sysutils/xfce4-showdesktop-plugin/buildlink3.mk6
-rw-r--r--sysutils/xfce4-systemload-plugin/buildlink3.mk6
-rw-r--r--sysutils/xfce4-systray/buildlink3.mk6
-rw-r--r--sysutils/xfce4-xkb-plugin/buildlink3.mk6
-rw-r--r--textproc/aiksaurus/buildlink3.mk4
-rw-r--r--textproc/aspell-czech/Makefile4
-rw-r--r--textproc/aspell/buildlink3.mk6
-rw-r--r--textproc/btparse/buildlink3.mk4
-rw-r--r--textproc/chasen-base/buildlink3.mk6
-rw-r--r--textproc/chasen/buildlink3.mk4
-rw-r--r--textproc/eb/buildlink3.mk6
-rw-r--r--textproc/enchant/buildlink3.mk6
-rw-r--r--textproc/expat/buildlink3.mk6
-rw-r--r--textproc/expat/builtin.mk6
-rw-r--r--textproc/gdome2/buildlink3.mk6
-rw-r--r--textproc/gnome-doc-utils/Makefile4
-rw-r--r--textproc/gnome-doc-utils/buildlink3.mk4
-rw-r--r--textproc/gnome-spell/Makefile4
-rw-r--r--textproc/gnome-spell/buildlink3.mk6
-rw-r--r--textproc/gtk-doc/buildlink3.mk4
-rw-r--r--textproc/gtkspell/buildlink3.mk6
-rw-r--r--textproc/hre/buildlink3.mk6
-rw-r--r--textproc/icu/buildlink3.mk6
-rw-r--r--textproc/intltool/buildlink3.mk6
-rw-r--r--textproc/iso-codes/buildlink3.mk4
-rw-r--r--textproc/jade/buildlink3.mk6
-rw-r--r--textproc/kakasi/buildlink3.mk6
-rw-r--r--textproc/libcroco/buildlink3.mk6
-rw-r--r--textproc/libpathan/buildlink3.mk6
-rw-r--r--textproc/libunicode/buildlink3.mk6
-rw-r--r--textproc/libxml++2/buildlink3.mk6
-rw-r--r--textproc/libxml/buildlink3.mk6
-rw-r--r--textproc/libxml2/buildlink3.mk6
-rw-r--r--textproc/libxslt/Makefile4
-rw-r--r--textproc/libxslt/buildlink3.mk6
-rw-r--r--textproc/opensp/buildlink3.mk6
-rw-r--r--textproc/p5-XML-Xerces/Makefile4
-rw-r--r--textproc/py-libxml2/Makefile4
-rw-r--r--textproc/py-libxslt/Makefile4
-rw-r--r--textproc/py-xml/Makefile4
-rw-r--r--textproc/py-xml/buildlink3.mk6
-rw-r--r--textproc/raptor/buildlink3.mk6
-rw-r--r--textproc/ruby-eruby/buildlink3.mk4
-rw-r--r--textproc/ruby-rdtool/buildlink3.mk4
-rw-r--r--textproc/sablotron/buildlink3.mk6
-rw-r--r--textproc/scrollkeeper/buildlink3.mk6
-rw-r--r--textproc/xalan-c/buildlink3.mk6
-rw-r--r--textproc/xerces-c/buildlink3.mk6
-rw-r--r--textproc/xmlcatmgr/buildlink3.mk4
-rw-r--r--textproc/xmlstarlet/Makefile6
-rw-r--r--time/py-mxDateTime/buildlink3.mk6
-rw-r--r--time/xfce4-calendar/buildlink3.mk6
-rw-r--r--time/xfce4-datetime-plugin/buildlink3.mk6
-rw-r--r--wm/metacity/buildlink3.mk6
-rw-r--r--wm/openbox/buildlink3.mk6
-rw-r--r--wm/windowmaker/buildlink3.mk6
-rw-r--r--wm/xfce4-wm-themes/buildlink3.mk6
-rw-r--r--wm/xfce4-wm/buildlink3.mk6
-rw-r--r--www/ap-dav/Makefile4
-rw-r--r--www/ap-perl/Makefile4
-rw-r--r--www/ap-perl/buildlink3.mk6
-rw-r--r--www/ap-ssl/Makefile4
-rw-r--r--www/ap2-auth-ldap/Makefile4
-rw-r--r--www/ap2-perl/buildlink3.mk6
-rw-r--r--www/ap2-subversion/Makefile4
-rw-r--r--www/apache/buildlink3.mk6
-rw-r--r--www/apache2/Makefile4
-rw-r--r--www/apache2/buildlink3.mk6
-rw-r--r--www/cgic/buildlink3.mk4
-rw-r--r--www/cgilib/buildlink3.mk6
-rw-r--r--www/clearsilver/buildlink3.mk6
-rw-r--r--www/curl/buildlink3.mk6
-rw-r--r--www/drivel/Makefile4
-rw-r--r--www/epiphany-extensions/Makefile4
-rw-r--r--www/epiphany/Makefile10
-rw-r--r--www/epiphany/buildlink3.mk6
-rw-r--r--www/fcgi/buildlink3.mk6
-rw-r--r--www/firefox-gtk1/buildlink3.mk6
-rw-r--r--www/firefox/buildlink3.mk6
-rw-r--r--www/glibwww/buildlink3.mk6
-rw-r--r--www/gtkhtml/buildlink3.mk6
-rw-r--r--www/gtkhtml38/buildlink3.mk6
-rw-r--r--www/libghttp/buildlink3.mk6
-rw-r--r--www/libgtkhtml/buildlink3.mk6
-rw-r--r--www/libwww/buildlink3.mk6
-rw-r--r--www/mozilla-gtk2/buildlink3.mk6
-rw-r--r--www/mozilla/buildlink3.mk6
-rw-r--r--www/mozilla/gecko-depends.mk4
-rw-r--r--www/neon/buildlink3.mk6
-rw-r--r--www/p5-libapreq2/Makefile6
-rw-r--r--www/php4/buildlink3.mk6
-rw-r--r--www/py-curl/Makefile4
-rw-r--r--www/sope/buildlink3.mk6
-rw-r--r--www/tidy/buildlink3.mk6
-rw-r--r--www/zope25-CMFPlone/Makefile4
-rw-r--r--www/zope25-EasyImage/Makefile4
-rw-r--r--www/zope25-JPicture/Makefile4
-rw-r--r--www/zope25-PropertyFolder/Makefile4
-rw-r--r--www/zope25-ZPhotoSlides/Makefile4
-rw-r--r--www/zope25/product.mk6
-rw-r--r--x11/XFree86-libs/buildlink3.mk6
-rw-r--r--x11/XFree86-libs/builtin.mk4
-rw-r--r--x11/Xaw-Xpm/buildlink3.mk6
-rw-r--r--x11/Xaw3d/buildlink3.mk6
-rw-r--r--x11/Xbae/buildlink3.mk6
-rw-r--r--x11/Xcomposite/buildlink3.mk6
-rw-r--r--x11/Xcomposite/builtin.mk4
-rw-r--r--x11/Xfixes/buildlink3.mk6
-rw-r--r--x11/Xfixes/builtin.mk4
-rw-r--r--x11/XmHTML/buildlink3.mk6
-rw-r--r--x11/Xrandr-mixedcase/Makefile6
-rw-r--r--x11/Xrandr-mixedcase/buildlink3.mk6
-rw-r--r--x11/Xrandr-mixedcase/builtin.mk8
-rw-r--r--x11/Xrender/buildlink3.mk6
-rw-r--r--x11/Xrender/builtin.mk8
-rw-r--r--x11/blt/buildlink3.mk6
-rw-r--r--x11/compositeext/buildlink3.mk6
-rw-r--r--x11/compositeext/builtin.mk4
-rw-r--r--x11/control-center/buildlink3.mk6
-rw-r--r--x11/devilspie/Makefile4
-rw-r--r--x11/efltk/buildlink3.mk6
-rw-r--r--x11/fixesext/buildlink3.mk6
-rw-r--r--x11/fixesext/builtin.mk4
-rw-r--r--x11/fltk/buildlink3.mk6
-rw-r--r--x11/fox/buildlink3.mk6
-rw-r--r--x11/gdm/Makefile4
-rw-r--r--x11/gnome-desktop/Makefile4
-rw-r--r--x11/gnome-desktop/buildlink3.mk4
-rw-r--r--x11/gnome-libs/buildlink3.mk6
-rw-r--r--x11/gnome-mag/buildlink3.mk6
-rw-r--r--x11/gnome-panel/Makefile10
-rw-r--r--x11/gnome-panel/buildlink3.mk6
-rw-r--r--x11/gnome-session/Makefile6
-rw-r--r--x11/gnome-themes-extras/Makefile4
-rw-r--r--x11/gnome2-applets/Makefile8
-rw-r--r--x11/gnome2-control-center/Makefile6
-rw-r--r--x11/gnome2-control-center/buildlink3.mk6
-rw-r--r--x11/gnome2-terminal/Makefile4
-rw-r--r--x11/gnopernicus/Makefile4
-rw-r--r--x11/gnustep-back/buildlink3.mk6
-rw-r--r--x11/gnustep-gui/buildlink3.mk6
-rw-r--r--x11/gnustep-preferences/buildlink3.mk6
-rw-r--r--x11/gtk+extra/buildlink3.mk6
-rw-r--r--x11/gtk/buildlink3.mk6
-rw-r--r--x11/gtk2+extra/buildlink3.mk6
-rw-r--r--x11/gtk2-engines/Makefile4
-rw-r--r--x11/gtk2-engines/buildlink3.mk6
-rw-r--r--x11/gtk2/Makefile8
-rw-r--r--x11/gtk2/buildlink3.mk6
-rw-r--r--x11/gtkglarea/buildlink3.mk6
-rw-r--r--x11/gtkglarea2/buildlink3.mk6
-rw-r--r--x11/gtkmm/Makefile4
-rw-r--r--x11/gtkmm/buildlink3.mk6
-rw-r--r--x11/gtksourceview/buildlink3.mk6
-rw-r--r--x11/gtoolkit/buildlink3.mk8
-rw-r--r--x11/kdebase3/Makefile6
-rw-r--r--x11/kdebase3/buildlink3.mk8
-rw-r--r--x11/kdelibs3/buildlink3.mk6
-rw-r--r--x11/lablgtk/Makefile4
-rw-r--r--x11/lablgtk/buildlink3.mk6
-rw-r--r--x11/lablgtk2/buildlink3.mk6
-rw-r--r--x11/lesstif/buildlink3.mk6
-rw-r--r--x11/libexo/buildlink3.mk6
-rw-r--r--x11/libxfce4gui/buildlink3.mk6
-rw-r--r--x11/libxfce4mcs/buildlink3.mk6
-rw-r--r--x11/libxfce4util/buildlink3.mk6
-rw-r--r--x11/libxklavier/buildlink3.mk6
-rw-r--r--x11/libzvt/buildlink3.mk6
-rw-r--r--x11/mowitz/buildlink3.mk6
-rw-r--r--x11/neXtaw/buildlink3.mk6
-rw-r--r--x11/ocaml-graphics/buildlink3.mk6
-rw-r--r--x11/openmotif/buildlink3.mk6
-rw-r--r--x11/paragui/buildlink3.mk6
-rw-r--r--x11/py-Pmw/buildlink3.mk6
-rw-r--r--x11/py-Tk/buildlink3.mk6
-rw-r--r--x11/py-Xlib/buildlink3.mk6
-rw-r--r--x11/py-gnome2-extras/Makefile4
-rw-r--r--x11/py-gnome2-extras/buildlink3.mk6
-rw-r--r--x11/py-gnome2/Makefile10
-rw-r--r--x11/py-gnome2/buildlink3.mk6
-rw-r--r--x11/py-gtk2/buildlink3.mk4
-rw-r--r--x11/py-qt2-sip/buildlink3.mk6
-rw-r--r--x11/py-qt2/Makefile4
-rw-r--r--x11/py-qt3-base/Makefile4
-rw-r--r--x11/py-qt3-base/buildlink3.mk6
-rw-r--r--x11/py-qt3-modules/buildlink3.mk6
-rw-r--r--x11/py-qt3-sip/buildlink3.mk6
-rw-r--r--x11/py-wxWidgets/buildlink3.mk6
-rw-r--r--x11/pygtk/buildlink3.mk6
-rw-r--r--x11/qt1/buildlink3.mk6
-rw-r--r--x11/qt2-designer/buildlink3.mk6
-rw-r--r--x11/qt2-libs/buildlink3.mk6
-rw-r--r--x11/qt3-libs/buildlink3.mk6
-rw-r--r--x11/qt3-qscintilla/buildlink3.mk6
-rw-r--r--x11/qt3-tools/buildlink3.mk6
-rw-r--r--x11/qt4-libs/buildlink3.mk4
-rw-r--r--x11/qt4-tools/buildlink3.mk4
-rw-r--r--x11/randrext/buildlink3.mk6
-rw-r--r--x11/randrext/builtin.mk6
-rw-r--r--x11/renderext/buildlink3.mk4
-rw-r--r--x11/renderext/builtin.mk6
-rw-r--r--x11/startup-notification/buildlink3.mk6
-rw-r--r--x11/tk-BWidget/buildlink3.mk6
-rw-r--r--x11/tk/buildlink3.mk6
-rw-r--r--x11/tk83/buildlink3.mk6
-rw-r--r--x11/vte/Makefile4
-rw-r--r--x11/vte/buildlink3.mk6
-rw-r--r--x11/wxGTK-contrib/buildlink3.mk6
-rw-r--r--x11/wxGTK/buildlink3.mk6
-rw-r--r--x11/wxGTK24/buildlink3.mk6
-rw-r--r--x11/xcursor/Makefile4
-rw-r--r--x11/xcursor/buildlink3.mk6
-rw-r--r--x11/xcursor/builtin.mk8
-rw-r--r--x11/xextensions/buildlink3.mk4
-rw-r--r--x11/xextensions/builtin.mk4
-rw-r--r--x11/xfce4-clipman-plugin/buildlink3.mk6
-rw-r--r--x11/xfce4-desktop/buildlink3.mk6
-rw-r--r--x11/xfce4-gtk2-engine/buildlink3.mk6
-rw-r--r--x11/xfce4-mcs-manager/buildlink3.mk6
-rw-r--r--x11/xfce4-mcs-plugins/buildlink3.mk6
-rw-r--r--x11/xfce4-notes-plugin/buildlink3.mk6
-rw-r--r--x11/xfce4-panel/buildlink3.mk6
-rw-r--r--x11/xfce4-session/buildlink3.mk6
-rw-r--r--x11/xfce4-taskbar-plugin/buildlink3.mk6
-rw-r--r--x11/xfce4-toys/buildlink3.mk6
-rw-r--r--x11/xfce4-trigger-launcher/buildlink3.mk6
-rw-r--r--x11/xfce4-utils/buildlink3.mk6
-rw-r--r--x11/xfce4-windowlist-plugin/buildlink3.mk6
-rw-r--r--x11/xforms/buildlink3.mk6
-rw-r--r--x11/xorg-libs/buildlink3.mk6
-rw-r--r--x11/xorg-libs/builtin.mk4
-rw-r--r--x11/xosd/buildlink3.mk6
-rw-r--r--x11/xscreensaver/Makefile.common4
-rw-r--r--x11/xscreensaver/buildlink3.mk6
-rw-r--r--x11/xview-lib/buildlink3.mk6
-rw-r--r--x11/zenity/Makefile4
1214 files changed, 3333 insertions, 3338 deletions
diff --git a/archivers/bzip2/buildlink3.mk b/archivers/bzip2/buildlink3.mk
index d1f369cccb4..c88b33447d5 100644
--- a/archivers/bzip2/buildlink3.mk
+++ b/archivers/bzip2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2005/05/26 15:03:11 salo Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2006/04/06 06:21:32 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
BZIP2_BUILDLINK3_MK:= ${BZIP2_BUILDLINK3_MK}+
@@ -11,9 +11,9 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nbzip2}
BUILDLINK_PACKAGES+= bzip2
.if !empty(BZIP2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.bzip2+= bzip2>=1.0.1
+BUILDLINK_API_DEPENDS.bzip2+= bzip2>=1.0.1
BUILDLINK_PKGSRCDIR.bzip2?= ../../archivers/bzip2
-BUILDLINK_RECOMMENDED.bzip2+= bzip2>=1.0.3
+BUILDLINK_ABI_DEPENDS.bzip2+= bzip2>=1.0.3
.endif # BZIP2_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/archivers/bzip2/builtin.mk b/archivers/bzip2/builtin.mk
index 8c76957760f..9bf465dd605 100644
--- a/archivers/bzip2/builtin.mk
+++ b/archivers/bzip2/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.5 2006/03/30 18:06:17 jlam Exp $
+# $NetBSD: builtin.mk,v 1.6 2006/04/06 06:21:32 reed Exp $
BUILTIN_PKG:= bzip2
@@ -32,7 +32,7 @@ USE_BUILTIN.bzip2= ${IS_BUILTIN.bzip2}
. if defined(BUILTIN_PKG.bzip2) && \
!empty(IS_BUILTIN.bzip2:M[yY][eE][sS])
USE_BUILTIN.bzip2= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.bzip2}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.bzip2}
. if !empty(USE_BUILTIN.bzip2:M[yY][eE][sS])
USE_BUILTIN.bzip2!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.bzip2:Q}; then \
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index 96d39034a41..3a342971486 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2006/03/30 21:28:13 jmmv Exp $
+# $NetBSD: Makefile,v 1.57 2006/04/06 06:21:32 reed Exp $
#
DISTNAME= file-roller-2.14.0
@@ -24,9 +24,9 @@ USE_PKGLOCALEDIR= yes
GCONF2_SCHEMAS= file-roller.schemas
-BUILDLINK_DEPENDS.glib2+= glib2>=2.6.0
-BUILDLINK_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.10.0
-BUILDLINK_DEPENDS.libglade2+= libglade2>=2.4.0
+BUILDLINK_API_DEPENDS.glib2+= glib2>=2.6.0
+BUILDLINK_API_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.10.0
+BUILDLINK_API_DEPENDS.libglade2+= libglade2>=2.4.0
.include "../../devel/GConf2/schemas.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/archivers/gsharutils/Makefile b/archivers/gsharutils/Makefile
index 97be5451a11..36a4f1aa765 100644
--- a/archivers/gsharutils/Makefile
+++ b/archivers/gsharutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2006/03/30 03:44:41 jlam Exp $
+# $NetBSD: Makefile,v 1.38 2006/04/06 06:21:32 reed Exp $
DISTNAME= sharutils-4.2.1
PKGNAME= g${DISTNAME}
@@ -35,7 +35,7 @@ CONFIGURE_ENV+= SH=${TOOLS_SH:Q}
# XXX ...but don't do this on Linux, where glibc-internalized gettext
# always uses the non-prefixed symbols.
#
-BUILDLINK_DEPENDS.gettext+= gettext-lib>=0.11
+BUILDLINK_API_DEPENDS.gettext+= gettext-lib>=0.11
CPPFLAGS+= -D_nl_default_dirname=libintl_nl_default_dirname
.endif
diff --git a/archivers/libcomprex/buildlink3.mk b/archivers/libcomprex/buildlink3.mk
index f60ee51862b..e4be5381553 100644
--- a/archivers/libcomprex/buildlink3.mk
+++ b/archivers/libcomprex/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:08:04 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:21:33 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBCOMPREX_BUILDLINK3_MK:= ${LIBCOMPREX_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibcomprex}
BUILDLINK_PACKAGES+= libcomprex
.if !empty(LIBCOMPREX_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libcomprex+= libcomprex>=0.3.2
-BUILDLINK_RECOMMENDED.libcomprex+= libcomprex>=0.3.3nb1
+BUILDLINK_API_DEPENDS.libcomprex+= libcomprex>=0.3.2
+BUILDLINK_ABI_DEPENDS.libcomprex+= libcomprex>=0.3.3nb1
BUILDLINK_PKGSRCDIR.libcomprex?= ../../archivers/libcomprex
.endif # LIBCOMPREX_BUILDLINK3_MK
diff --git a/archivers/liblzo/buildlink3.mk b/archivers/liblzo/buildlink3.mk
index 168cb00cd04..de0bfac1d34 100644
--- a/archivers/liblzo/buildlink3.mk
+++ b/archivers/liblzo/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/10/03 00:13:04 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:33 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBLZO_BUILDLINK3_MK:= ${LIBLZO_BUILDLINK3_MK}+
@@ -11,9 +11,9 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nliblzo}
BUILDLINK_PACKAGES+= liblzo
.if !empty(LIBLZO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.liblzo+= liblzo>=1.08
+BUILDLINK_API_DEPENDS.liblzo+= liblzo>=1.08
BUILDLINK_PKGSRCDIR.liblzo?= ../../archivers/liblzo
-BUILDLINK_RECOMMENDED.liblzo+= liblzo>=1.08nb1
+BUILDLINK_ABI_DEPENDS.liblzo+= liblzo>=1.08nb1
.endif # LIBLZO_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/archivers/libzip/buildlink3.mk b/archivers/libzip/buildlink3.mk
index c94749f07d8..8217d8b8d23 100644
--- a/archivers/libzip/buildlink3.mk
+++ b/archivers/libzip/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/06/22 21:11:39 dillo Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:33 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBZIP_BUILDLINK3_MK:= ${LIBZIP_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibzip}
BUILDLINK_PACKAGES+= libzip
.if !empty(LIBZIP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libzip+= libzip>=0.6
+BUILDLINK_API_DEPENDS.libzip+= libzip>=0.6
BUILDLINK_PKGSRCDIR.libzip?= ../../archivers/libzip
.endif # LIBZIP_BUILDLINK3_MK
diff --git a/archivers/lzo/buildlink3.mk b/archivers/lzo/buildlink3.mk
index 263104be18c..b9e8f565f44 100644
--- a/archivers/lzo/buildlink3.mk
+++ b/archivers/lzo/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2005/07/14 20:05:17 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:33 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LZO_BUILDLINK3_MK:= ${LZO_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlzo}
BUILDLINK_PACKAGES+= lzo
.if !empty(LZO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.lzo+= lzo>=2.01
+BUILDLINK_API_DEPENDS.lzo+= lzo>=2.01
BUILDLINK_PKGSRCDIR.lzo?= ../../archivers/lzo
.endif # LZO_BUILDLINK3_MK
diff --git a/archivers/szip/buildlink3.mk b/archivers/szip/buildlink3.mk
index 5a624582f4d..1bfed76cbf4 100644
--- a/archivers/szip/buildlink3.mk
+++ b/archivers/szip/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2005/02/24 16:20:25 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:33 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SZIP_BUILDLINK3_MK:= ${SZIP_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nszip}
BUILDLINK_PACKAGES+= szip
.if !empty(SZIP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.szip+= szip>=2.0
+BUILDLINK_API_DEPENDS.szip+= szip>=2.0
BUILDLINK_PKGSRCDIR.szip?= ../../archivers/szip
.endif # SZIP_BUILDLINK3_MK
diff --git a/archivers/ucl/buildlink3.mk b/archivers/ucl/buildlink3.mk
index ae9c3811d12..6b7464e7aa6 100644
--- a/archivers/ucl/buildlink3.mk
+++ b/archivers/ucl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/02/15 16:58:21 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:33 reed Exp $
# XXX
# XXX This file was created automatically using createbuildlink-3.10.
# XXX After this file has been verified as correct, the comment lines
@@ -21,7 +21,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nucl}
BUILDLINK_PACKAGES+= ucl
.if !empty(UCL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ucl+= ucl>=1.03
+BUILDLINK_API_DEPENDS.ucl+= ucl>=1.03
BUILDLINK_PKGSRCDIR.ucl?= ../../archivers/ucl
.endif # UCL_BUILDLINK3_MK
diff --git a/archivers/zziplib/buildlink3.mk b/archivers/zziplib/buildlink3.mk
index 69fb3564a63..6ca1f8ea6ad 100644
--- a/archivers/zziplib/buildlink3.mk
+++ b/archivers/zziplib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:08 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:33 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ZZIPLIB_BUILDLINK3_MK:= ${ZZIPLIB_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nzziplib}
BUILDLINK_PACKAGES+= zziplib
.if !empty(ZZIPLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.zziplib+= zziplib>=0.10.82
+BUILDLINK_API_DEPENDS.zziplib+= zziplib>=0.10.82
BUILDLINK_PKGSRCDIR.zziplib?= ../../archivers/zziplib
.endif # ZZIPLIB_BUILDLINK3_MK
diff --git a/audio/SDL-nas/Makefile b/audio/SDL-nas/Makefile
index 749798019b8..38b507dd825 100644
--- a/audio/SDL-nas/Makefile
+++ b/audio/SDL-nas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/02/05 23:08:05 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2006/04/06 06:21:33 reed Exp $
.include "../../devel/SDL/Makefile.common"
@@ -20,7 +20,7 @@ do-install:
cd ${WRKSRC}/src/audio/nas && ${SHLIBTOOL} --mode=install \
${INSTALL_DATA} libaudio_nas.la ${PREFIX}/lib
-BUILDLINK_DEPENDS.SDL+= SDL>=1.2.5nb6
+BUILDLINK_API_DEPENDS.SDL+= SDL>=1.2.5nb6
.include "../../audio/nas/buildlink3.mk"
.include "../../devel/SDL/buildlink3.mk"
diff --git a/audio/SDL_mixer/buildlink3.mk b/audio/SDL_mixer/buildlink3.mk
index b088073022f..a5a868e7c0b 100644
--- a/audio/SDL_mixer/buildlink3.mk
+++ b/audio/SDL_mixer/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/02/05 23:08:05 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/04/06 06:21:33 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SDL_MIXER_BUILDLINK3_MK:= ${SDL_MIXER_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NSDL_mixer}
BUILDLINK_PACKAGES+= SDL_mixer
.if !empty(SDL_MIXER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.SDL_mixer+= SDL_mixer>=1.2.5nb2
-BUILDLINK_RECOMMENDED.SDL_mixer+= SDL_mixer>=1.2.6nb4
+BUILDLINK_API_DEPENDS.SDL_mixer+= SDL_mixer>=1.2.5nb2
+BUILDLINK_ABI_DEPENDS.SDL_mixer+= SDL_mixer>=1.2.6nb4
BUILDLINK_PKGSRCDIR.SDL_mixer?= ../../audio/SDL_mixer
BUILDLINK_INCDIRS.SDL_mixer?= include/SDL
.endif # SDL_MIXER_BUILDLINK3_MK
diff --git a/audio/SDL_sound/buildlink3.mk b/audio/SDL_sound/buildlink3.mk
index 3db4ff7d74d..af628c30e32 100644
--- a/audio/SDL_sound/buildlink3.mk
+++ b/audio/SDL_sound/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:08:05 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:21:33 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SDL_SOUND_BUILDLINK3_MK:= ${SDL_SOUND_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NSDL_sound}
BUILDLINK_PACKAGES+= SDL_sound
.if !empty(SDL_SOUND_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.SDL_sound+= SDL_sound>=1.0.1
-BUILDLINK_RECOMMENDED.SDL_sound+= SDL_sound>=1.0.1nb4
+BUILDLINK_API_DEPENDS.SDL_sound+= SDL_sound>=1.0.1
+BUILDLINK_ABI_DEPENDS.SDL_sound+= SDL_sound>=1.0.1nb4
BUILDLINK_PKGSRCDIR.SDL_sound?= ../../audio/SDL_sound
.endif # SDL_SOUND_BUILDLINK3_MK
diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index ce96d06d7e0..11438c8f026 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/04/04 20:13:55 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2006/04/06 06:21:33 reed Exp $
DISTNAME= amarok-1.3.9
CATEGORIES= audio kde
@@ -22,9 +22,9 @@ CONFIGURE_ARGS+= --without-arts # disable aRts engine
LIBS+= ${LIBOSSAUDIO}
-BUILDLINK_DEPENDS.kdebase+= kdebase>=3.3.0
-BUILDLINK_DEPENDS.kdelibs+= kdelibs>=3.3.0
-BUILDLINK_DEPENDS.taglib+= taglib>=1.4
+BUILDLINK_API_DEPENDS.kdebase+= kdebase>=3.3.0
+BUILDLINK_API_DEPENDS.kdelibs+= kdelibs>=3.3.0
+BUILDLINK_API_DEPENDS.taglib+= taglib>=1.4
.include "../../audio/libvisual/buildlink3.mk"
.include "../../audio/taglib/buildlink3.mk"
diff --git a/audio/arts/buildlink3.mk b/audio/arts/buildlink3.mk
index 5084efbc84f..71f2861699f 100644
--- a/audio/arts/buildlink3.mk
+++ b/audio/arts/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/03/09 21:04:39 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2006/04/06 06:21:33 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ARTS_BUILDLINK3_MK:= ${ARTS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Narts}
BUILDLINK_PACKAGES+= arts
.if !empty(ARTS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.arts+= arts>=1.1.4nb1
-BUILDLINK_RECOMMENDED.arts+= arts>=1.5.1nb1
+BUILDLINK_API_DEPENDS.arts+= arts>=1.1.4nb1
+BUILDLINK_ABI_DEPENDS.arts+= arts>=1.5.1nb1
BUILDLINK_PKGSRCDIR.arts?= ../../audio/arts
PRINT_PLIST_AWK+= /^@dirrm include\/arts$$/ \
diff --git a/audio/bmp/buildlink3.mk b/audio/bmp/buildlink3.mk
index 9a0fc803103..49ce09284eb 100644
--- a/audio/bmp/buildlink3.mk
+++ b/audio/bmp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:05 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:33 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
BMP_BUILDLINK3_MK:= ${BMP_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nbmp}
BUILDLINK_PACKAGES+= bmp
.if !empty(BMP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.bmp+= bmp>=0.9.7rc2nb3
-BUILDLINK_RECOMMENDED.bmp?= bmp>=0.9.7nb4
+BUILDLINK_API_DEPENDS.bmp+= bmp>=0.9.7rc2nb3
+BUILDLINK_ABI_DEPENDS.bmp?= bmp>=0.9.7nb4
BUILDLINK_PKGSRCDIR.bmp?= ../../audio/bmp
PRINT_PLIST_AWK+= /^@dirrm lib\/bmp\/Input$$/ \
diff --git a/audio/cddb-bundle/buildlink3.mk b/audio/cddb-bundle/buildlink3.mk
index 86e2d15d39e..1fa509462e1 100644
--- a/audio/cddb-bundle/buildlink3.mk
+++ b/audio/cddb-bundle/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:08:06 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:33 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
CDDB_BUNDLE_BUILDLINK3_MK:= ${CDDB_BUNDLE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncddb-bundle}
BUILDLINK_PACKAGES+= cddb-bundle
.if !empty(CDDB_BUNDLE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.cddb-bundle+= cddb-bundle>=0.2
-BUILDLINK_RECOMMENDED.cddb-bundle?= cddb-bundle>=0.2nb1
+BUILDLINK_API_DEPENDS.cddb-bundle+= cddb-bundle>=0.2
+BUILDLINK_ABI_DEPENDS.cddb-bundle?= cddb-bundle>=0.2nb1
BUILDLINK_PKGSRCDIR.cddb-bundle?= ../../audio/cddb-bundle
.endif # CDDB_BUNDLE_BUILDLINK3_MK
diff --git a/audio/cdparanoia/buildlink3.mk b/audio/cdparanoia/buildlink3.mk
index 0771fe4598b..de37ea99fcc 100644
--- a/audio/cdparanoia/buildlink3.mk
+++ b/audio/cdparanoia/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/03/07 06:30:55 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:33 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
CDPARANOIA_BUILDLINK3_MK:= ${CDPARANOIA_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncdparanoia}
BUILDLINK_PACKAGES+= cdparanoia
.if !empty(CDPARANOIA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.cdparanoia+= cdparanoia>=3.0
-BUILDLINK_RECOMMENDED.cdparanoia?= cdparanoia>=3.0.9.8nb5
+BUILDLINK_API_DEPENDS.cdparanoia+= cdparanoia>=3.0
+BUILDLINK_ABI_DEPENDS.cdparanoia?= cdparanoia>=3.0.9.8nb5
BUILDLINK_PKGSRCDIR.cdparanoia?= ../../audio/cdparanoia
.endif # CDPARANOIA_BUILDLINK3_MK
diff --git a/audio/cdplayer/buildlink3.mk b/audio/cdplayer/buildlink3.mk
index f8bdb1f660f..4f2888a9fd6 100644
--- a/audio/cdplayer/buildlink3.mk
+++ b/audio/cdplayer/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:06 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:33 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
CDPLAYER_BUILDLINK3_MK:= ${CDPLAYER_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncdplayer}
BUILDLINK_PACKAGES+= cdplayer
.if !empty(CDPLAYER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.cdplayer+= cdplayer>=0.4.2
-BUILDLINK_RECOMMENDED.cdplayer?= cdplayer>=0.4.2nb3
+BUILDLINK_API_DEPENDS.cdplayer+= cdplayer>=0.4.2
+BUILDLINK_ABI_DEPENDS.cdplayer?= cdplayer>=0.4.2nb3
BUILDLINK_PKGSRCDIR.cdplayer?= ../../audio/cdplayer
.endif # CDPLAYER_BUILDLINK3_MK
diff --git a/audio/esound/buildlink3.mk b/audio/esound/buildlink3.mk
index f0c13f46e43..726d8851d47 100644
--- a/audio/esound/buildlink3.mk
+++ b/audio/esound/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2004/10/03 00:13:05 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:21:34 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ESOUND_BUILDLINK3_MK:= ${ESOUND_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nesound}
BUILDLINK_PACKAGES+= esound
.if !empty(ESOUND_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.esound+= esound>=0.2.18
-BUILDLINK_RECOMMENDED.esound+= esound>=0.2.35nb1
+BUILDLINK_API_DEPENDS.esound+= esound>=0.2.18
+BUILDLINK_ABI_DEPENDS.esound+= esound>=0.2.35nb1
BUILDLINK_PKGSRCDIR.esound?= ../../audio/esound
.endif # ESOUND_BUILDLINK3_MK
diff --git a/audio/faac/buildlink3.mk b/audio/faac/buildlink3.mk
index 2eabf833558..b1f81189e28 100644
--- a/audio/faac/buildlink3.mk
+++ b/audio/faac/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:05 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:34 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
FAAC_BUILDLINK3_MK:= ${FAAC_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfaac}
BUILDLINK_PACKAGES+= faac
.if !empty(FAAC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.faac+= faac>=1.24
-BUILDLINK_RECOMMENDED.faac+= faac>=1.24nb1
+BUILDLINK_API_DEPENDS.faac+= faac>=1.24
+BUILDLINK_ABI_DEPENDS.faac+= faac>=1.24nb1
BUILDLINK_PKGSRCDIR.faac?= ../../audio/faac
.endif # FAAC_BUILDLINK3_MK
diff --git a/audio/faad2/buildlink3.mk b/audio/faad2/buildlink3.mk
index 2203fa0fbbd..484e80c3b94 100644
--- a/audio/faad2/buildlink3.mk
+++ b/audio/faad2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:08:06 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:21:34 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
FAAD2_BUILDLINK3_MK:= ${FAAD2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfaad2}
BUILDLINK_PACKAGES+= faad2
.if !empty(FAAD2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.faad2+= faad2>=2.0nb3
-BUILDLINK_RECOMMENDED.faad2?= faad2>=2.0nb5
+BUILDLINK_API_DEPENDS.faad2+= faad2>=2.0nb3
+BUILDLINK_ABI_DEPENDS.faad2?= faad2>=2.0nb5
BUILDLINK_PKGSRCDIR.faad2?= ../../audio/faad2
BUILDLINK_INCDIRS.faad2?= include/faad2
.endif # FAAD2_BUILDLINK3_MK
diff --git a/audio/flac/buildlink3.mk b/audio/flac/buildlink3.mk
index 8ab51408864..b8f6e67757e 100644
--- a/audio/flac/buildlink3.mk
+++ b/audio/flac/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:08:08 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:21:34 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
FLAC_BUILDLINK3_MK:= ${FLAC_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nflac}
BUILDLINK_PACKAGES+= flac
.if !empty(FLAC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.flac+= flac>=1.1.0nb1
-BUILDLINK_RECOMMENDED.flac+= flac>=1.1.2nb1
+BUILDLINK_API_DEPENDS.flac+= flac>=1.1.0nb1
+BUILDLINK_ABI_DEPENDS.flac+= flac>=1.1.2nb1
BUILDLINK_PKGSRCDIR.flac?= ../../audio/flac
.endif # FLAC_BUILDLINK3_MK
diff --git a/audio/fluidsynth/buildlink3.mk b/audio/fluidsynth/buildlink3.mk
index e2620861f3b..f693cc35f9d 100644
--- a/audio/fluidsynth/buildlink3.mk
+++ b/audio/fluidsynth/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/19 18:26:43 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:34 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
FLUIDSYNTH_BUILDLINK3_MK:= ${FLUIDSYNTH_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfluidsynth}
BUILDLINK_PACKAGES+= fluidsynth
.if !empty(FLUIDSYNTH_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.fluidsynth+= fluidsynth>=1.0.5
+BUILDLINK_API_DEPENDS.fluidsynth+= fluidsynth>=1.0.5
BUILDLINK_PKGSRCDIR.fluidsynth?= ../../audio/fluidsynth
.endif # FLUIDSYNTH_BUILDLINK3_MK
diff --git a/audio/gkrellm-xmms/Makefile b/audio/gkrellm-xmms/Makefile
index 50427d01f40..deecd3f2ad7 100644
--- a/audio/gkrellm-xmms/Makefile
+++ b/audio/gkrellm-xmms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/03/28 16:24:21 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2006/04/06 06:21:34 reed Exp $
#
DISTNAME= gkrellmms-2.1.20
@@ -15,7 +15,7 @@ USE_TOOLS+= gmake pkg-config
USE_PKGLOCALEDIR= YES
BUILD_USES_MSGFMT= YES
-BUILDLINK_DEPENDS.gkrellm+= gkrellm>=2.2.0
+BUILDLINK_API_DEPENDS.gkrellm+= gkrellm>=2.2.0
WRKSRC= ${WRKDIR}/gkrellmms
MAKE_ENV+= LOCALEDIR=${PREFIX}/${PKGLOCALEDIR}/locale \
diff --git a/audio/gnome-speech/buildlink3.mk b/audio/gnome-speech/buildlink3.mk
index a79794127cb..f7c12dd495d 100644
--- a/audio/gnome-speech/buildlink3.mk
+++ b/audio/gnome-speech/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:08:08 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:21:34 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNOME_SPEECH_BUILDLINK3_MK:= ${GNOME_SPEECH_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-speech}
BUILDLINK_PACKAGES+= gnome-speech
.if !empty(GNOME_SPEECH_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-speech+= gnome-speech>=0.3.2
-BUILDLINK_RECOMMENDED.gnome-speech+= gnome-speech>=0.3.9nb2
+BUILDLINK_API_DEPENDS.gnome-speech+= gnome-speech>=0.3.2
+BUILDLINK_ABI_DEPENDS.gnome-speech+= gnome-speech>=0.3.9nb2
BUILDLINK_PKGSRCDIR.gnome-speech?= ../../audio/gnome-speech
.endif # GNOME_SPEECH_BUILDLINK3_MK
diff --git a/audio/goom/buildlink3.mk b/audio/goom/buildlink3.mk
index d243cdfa53d..ac5bdc05f56 100644
--- a/audio/goom/buildlink3.mk
+++ b/audio/goom/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/02/20 14:59:24 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:34 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GOOM_BUILDLINK3_MK:= ${GOOM_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngoom}
BUILDLINK_PACKAGES+= goom
.if !empty(GOOM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.goom+= goom>=2004.0
+BUILDLINK_API_DEPENDS.goom+= goom>=2004.0
BUILDLINK_PKGSRCDIR.goom?= ../../audio/goom
.endif # GOOM_BUILDLINK3_MK
diff --git a/audio/gsm/buildlink3.mk b/audio/gsm/buildlink3.mk
index 0ff04e76312..035a75f934f 100644
--- a/audio/gsm/buildlink3.mk
+++ b/audio/gsm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:13:06 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:34 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GSM_BUILDLINK3_MK:= ${GSM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngsm}
BUILDLINK_PACKAGES+= gsm
.if !empty(GSM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gsm+= gsm>=1.0.10
-BUILDLINK_RECOMMENDED.gsm+= gsm>=1.0.10nb1
+BUILDLINK_API_DEPENDS.gsm+= gsm>=1.0.10
+BUILDLINK_ABI_DEPENDS.gsm+= gsm>=1.0.10nb1
BUILDLINK_PKGSRCDIR.gsm?= ../../audio/gsm
.endif # GSM_BUILDLINK3_MK
diff --git a/audio/gst-plugins0.8-artsd/buildlink3.mk b/audio/gst-plugins0.8-artsd/buildlink3.mk
index 26e9b7f71d5..a8f26fd11cd 100644
--- a/audio/gst-plugins0.8-artsd/buildlink3.mk
+++ b/audio/gst-plugins0.8-artsd/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:09 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:34 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GST_PLUGINS0.8_ARTSD_BUILDLINK3_MK:= ${GST_PLUGINS0.8_ARTSD_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngst-plugins0.8-artsd}
BUILDLINK_PACKAGES+= gst-plugins0.8-artsd
.if !empty(GST_PLUGINS0.8_ARTSD_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gst-plugins0.8-artsd+= gst-plugins0.8-artsd>=0.8.11
-BUILDLINK_RECOMMENDED.gst-plugins0.8-artsd?= gst-plugins0.8-artsd>=0.8.11nb2
+BUILDLINK_API_DEPENDS.gst-plugins0.8-artsd+= gst-plugins0.8-artsd>=0.8.11
+BUILDLINK_ABI_DEPENDS.gst-plugins0.8-artsd?= gst-plugins0.8-artsd>=0.8.11nb2
BUILDLINK_PKGSRCDIR.gst-plugins0.8-artsd?= ../../audio/gst-plugins0.8-artsd
.endif # GST_PLUGINS0.8_ARTSD_BUILDLINK3_MK
diff --git a/audio/gst-plugins0.8-esound/buildlink3.mk b/audio/gst-plugins0.8-esound/buildlink3.mk
index e4e08cd65e5..b2276051efc 100644
--- a/audio/gst-plugins0.8-esound/buildlink3.mk
+++ b/audio/gst-plugins0.8-esound/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:09 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:34 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GST_PLUGINS0.8_ESOUND_BUILDLINK3_MK:= ${GST_PLUGINS0.8_ESOUND_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngst-plugins0.8-esound}
BUILDLINK_PACKAGES+= gst-plugins0.8-esound
.if !empty(GST_PLUGINS0.8_ESOUND_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gst-plugins0.8-esound+= gst-plugins0.8-esound>=0.8.11
-BUILDLINK_RECOMMENDED.gst-plugins0.8-esound?= gst-plugins0.8-esound>=0.8.11nb2
+BUILDLINK_API_DEPENDS.gst-plugins0.8-esound+= gst-plugins0.8-esound>=0.8.11
+BUILDLINK_ABI_DEPENDS.gst-plugins0.8-esound?= gst-plugins0.8-esound>=0.8.11nb2
BUILDLINK_PKGSRCDIR.gst-plugins0.8-esound?= ../../audio/gst-plugins0.8-esound
.endif # GST_PLUGINS0.8_ESOUND_BUILDLINK3_MK
diff --git a/audio/gst-plugins0.8-mad/buildlink3.mk b/audio/gst-plugins0.8-mad/buildlink3.mk
index 4c4199eceb3..2de671f0d15 100644
--- a/audio/gst-plugins0.8-mad/buildlink3.mk
+++ b/audio/gst-plugins0.8-mad/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:09 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:34 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GST_PLUGINS0.8_MAD_BUILDLINK3_MK:= ${GST_PLUGINS0.8_MAD_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngst-plugins0.8-mad}
BUILDLINK_PACKAGES+= gst-plugins0.8-mad
.if !empty(GST_PLUGINS0.8_MAD_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gst-plugins0.8-mad+= gst-plugins0.8-mad>=0.8.11
-BUILDLINK_RECOMMENDED.gst-plugins0.8-mad?= gst-plugins0.8-mad>=0.8.11nb2
+BUILDLINK_API_DEPENDS.gst-plugins0.8-mad+= gst-plugins0.8-mad>=0.8.11
+BUILDLINK_ABI_DEPENDS.gst-plugins0.8-mad?= gst-plugins0.8-mad>=0.8.11nb2
BUILDLINK_PKGSRCDIR.gst-plugins0.8-mad?= ../../audio/gst-plugins0.8-mad
.endif # GST_PLUGINS0.8_MAD_BUILDLINK3_MK
diff --git a/audio/gtkpod/Makefile b/audio/gtkpod/Makefile
index 77c4dc58965..c2d5c4fb071 100644
--- a/audio/gtkpod/Makefile
+++ b/audio/gtkpod/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/03/25 14:25:01 smb Exp $
+# $NetBSD: Makefile,v 1.10 2006/04/06 06:21:34 reed Exp $
#
DISTNAME= gtkpod-0.94.0
@@ -20,7 +20,7 @@ USE_TOOLS+= pkg-config perl:run
REPLACE_PERL+= scripts/mab2vcard
-BUILDLINK_DEPENDS.gtk2+= gtk2+>=2.4.0
+BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.4.0
.include "options.mk"
diff --git a/audio/id3lib/buildlink3.mk b/audio/id3lib/buildlink3.mk
index 0cf2c92266e..1fff0ff57ea 100644
--- a/audio/id3lib/buildlink3.mk
+++ b/audio/id3lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/10/03 00:13:06 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:34 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ID3LIB_BUILDLINK3_MK:= ${ID3LIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nid3lib}
BUILDLINK_PACKAGES+= id3lib
.if !empty(ID3LIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.id3lib+= id3lib>=3.8.3
-BUILDLINK_RECOMMENDED.id3lib+= id3lib>=3.8.3nb1
+BUILDLINK_API_DEPENDS.id3lib+= id3lib>=3.8.3
+BUILDLINK_ABI_DEPENDS.id3lib+= id3lib>=3.8.3nb1
BUILDLINK_PKGSRCDIR.id3lib?= ../../audio/id3lib
.endif # ID3LIB_BUILDLINK3_MK
diff --git a/audio/ladspa/buildlink3.mk b/audio/ladspa/buildlink3.mk
index b562f545e2e..500e682ced2 100644
--- a/audio/ladspa/buildlink3.mk
+++ b/audio/ladspa/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:10 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:34 reed Exp $
#
# This Makefile fragment is included by packages that use ladspa.
#
@@ -14,8 +14,8 @@ BUILDLINK_DEPENDS+= ladspa
.if !empty(LADSPA_BUILDLINK3_MK:M+)
BUILDLINK_PACKAGES+= ladspa
-BUILDLINK_DEPENDS.ladspa+= ladspa>=1.12
-BUILDLINK_RECOMMENDED.ladspa?= ladspa>=1.12nb1
+BUILDLINK_API_DEPENDS.ladspa+= ladspa>=1.12
+BUILDLINK_ABI_DEPENDS.ladspa?= ladspa>=1.12nb1
BUILDLINK_PKGSRCDIR.ladspa?= ../../audio/ladspa
.endif # LADSPA_BUILDLINK3_MK
diff --git a/audio/lame/buildlink3.mk b/audio/lame/buildlink3.mk
index 6bb25ee0294..9c7e0a1ef80 100644
--- a/audio/lame/buildlink3.mk
+++ b/audio/lame/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:08:10 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:34 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LAME_BUILDLINK3_MK:= ${LAME_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlame}
BUILDLINK_PACKAGES+= lame
.if !empty(LAME_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.lame+= lame>=3.93.1nb2
-BUILDLINK_RECOMMENDED.lame+= lame>=3.96.1nb4
+BUILDLINK_API_DEPENDS.lame+= lame>=3.93.1nb2
+BUILDLINK_ABI_DEPENDS.lame+= lame>=3.96.1nb4
BUILDLINK_PKGSRCDIR.lame?= ../../audio/lame
.endif # LAME_BUILDLINK3_MK
diff --git a/audio/liba52/buildlink3.mk b/audio/liba52/buildlink3.mk
index 94b336a1a9b..547c93a215e 100644
--- a/audio/liba52/buildlink3.mk
+++ b/audio/liba52/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:13:06 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:34 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBA52_BUILDLINK3_MK:= ${LIBA52_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nliba52}
BUILDLINK_PACKAGES+= liba52
.if !empty(LIBA52_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.liba52+= liba52>=0.7.4
-BUILDLINK_RECOMMENDED.liba52+= liba52>=0.7.4nb3
+BUILDLINK_API_DEPENDS.liba52+= liba52>=0.7.4
+BUILDLINK_ABI_DEPENDS.liba52+= liba52>=0.7.4nb3
BUILDLINK_PKGSRCDIR.liba52?= ../../audio/liba52
.endif # LIBA52_BUILDLINK3_MK
diff --git a/audio/libao-macosx/Makefile b/audio/libao-macosx/Makefile
index db4fdb2219c..8405b44b0dc 100644
--- a/audio/libao-macosx/Makefile
+++ b/audio/libao-macosx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/02/05 23:08:10 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2006/04/06 06:21:34 reed Exp $
.include "../../audio/libao/Makefile.common"
@@ -13,7 +13,7 @@ CONFIGURE_ARGS:= ${CONFIGURE_ARGS:S/ENABLE_MACOSX=no/ENABLE_MACOSX=yes/g}
BUILD_DIRS= ${WRKSRC}/src/plugins/macosx
INSTALL_DIRS= ${WRKSRC}/src/plugins/macosx
-BUILDLINK_DEPENDS.libao+= libao>=0.8.6nb1
+BUILDLINK_API_DEPENDS.libao+= libao>=0.8.6nb1
_LIBAO_BUILDING_PLUGIN= yes
diff --git a/audio/libao-oss/Makefile b/audio/libao-oss/Makefile
index 8cb9f7f4d36..d969cb859a9 100644
--- a/audio/libao-oss/Makefile
+++ b/audio/libao-oss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/03/09 21:04:40 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2006/04/06 06:21:35 reed Exp $
.include "../../audio/libao/Makefile.common"
@@ -20,7 +20,7 @@ SUBST_FILES.oss= src/plugins/oss/ao_oss.c
SUBST_SED.oss= -e 's|/dev/dsp|${DEVOSSAUDIO}|g'
SUBST_SED.oss+= -e 's|/dev/sound/dsp|${DEVOSSAUDIO}|g'
-BUILDLINK_DEPENDS.libao+= libao>=0.8.6nb1
+BUILDLINK_API_DEPENDS.libao+= libao>=0.8.6nb1
_LIBAO_BUILDING_PLUGIN= yes
diff --git a/audio/libao-sun/Makefile b/audio/libao-sun/Makefile
index 53a49387377..70d76a12f15 100644
--- a/audio/libao-sun/Makefile
+++ b/audio/libao-sun/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/02/05 23:08:10 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2006/04/06 06:21:35 reed Exp $
.include "../../audio/libao/Makefile.common"
@@ -13,7 +13,7 @@ CONFIGURE_ARGS:= ${CONFIGURE_ARGS:S/ENABLE_SUN_AUDIO=no/ENABLE_SUN_AUDIO=yes/g}
BUILD_DIRS= ${WRKSRC}/src/plugins/sun
INSTALL_DIRS= ${WRKSRC}/src/plugins/sun
-BUILDLINK_DEPENDS.libao+= libao>=0.8.6nb1
+BUILDLINK_API_DEPENDS.libao+= libao>=0.8.6nb1
_LIBAO_BUILDING_PLUGIN= yes
diff --git a/audio/libao/buildlink3.mk b/audio/libao/buildlink3.mk
index 1d55079e6da..831aa1276ad 100644
--- a/audio/libao/buildlink3.mk
+++ b/audio/libao/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:08:10 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:21:34 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBAO_BUILDLINK3_MK:= ${LIBAO_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibao}
BUILDLINK_PACKAGES+= libao
.if !empty(LIBAO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libao+= libao>=0.8.4
-BUILDLINK_RECOMMENDED.libao+= libao>=0.8.6nb3
+BUILDLINK_API_DEPENDS.libao+= libao>=0.8.4
+BUILDLINK_ABI_DEPENDS.libao+= libao>=0.8.6nb3
BUILDLINK_PKGSRCDIR.libao?= ../../audio/libao
. if !defined(_LIBAO_BUILDING_PLUGIN)
diff --git a/audio/libaudiofile/buildlink3.mk b/audio/libaudiofile/buildlink3.mk
index 04efb44535a..b7b355daa84 100644
--- a/audio/libaudiofile/buildlink3.mk
+++ b/audio/libaudiofile/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2004/10/03 00:13:07 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:21:35 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
AUDIOFILE_BUILDLINK3_MK:= ${AUDIOFILE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Naudiofile}
BUILDLINK_PACKAGES+= audiofile
.if !empty(AUDIOFILE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.audiofile+= libaudiofile>=0.2.1
-BUILDLINK_RECOMMENDED.audiofile+= libaudiofile>=0.2.6nb1
+BUILDLINK_API_DEPENDS.audiofile+= libaudiofile>=0.2.1
+BUILDLINK_ABI_DEPENDS.audiofile+= libaudiofile>=0.2.6nb1
BUILDLINK_PKGSRCDIR.audiofile?= ../../audio/libaudiofile
.endif # AUDIOFILE_BUILDLINK3_MK
diff --git a/audio/libcdaudio/buildlink3.mk b/audio/libcdaudio/buildlink3.mk
index 95b862c3aed..ce395276a3d 100644
--- a/audio/libcdaudio/buildlink3.mk
+++ b/audio/libcdaudio/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2005/05/16 09:48:30 rh Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:35 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBCDAUDIO_BUILDLINK3_MK:= ${LIBCDAUDIO_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibcdaudio}
BUILDLINK_PACKAGES+= libcdaudio
.if !empty(LIBCDAUDIO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libcdaudio+= libcdaudio>=0.99.4nb1
-BUILDLINK_RECOMMENDED.libcdaudio+= libcdaudio>=0.99.12nb1
+BUILDLINK_API_DEPENDS.libcdaudio+= libcdaudio>=0.99.4nb1
+BUILDLINK_ABI_DEPENDS.libcdaudio+= libcdaudio>=0.99.12nb1
BUILDLINK_PKGSRCDIR.libcdaudio?= ../../audio/libcdaudio
.endif # LIBCDAUDIO_BUILDLINK3_MK
diff --git a/audio/libcddb/buildlink3.mk b/audio/libcddb/buildlink3.mk
index ee0641b6b3b..2b4b7592f6d 100644
--- a/audio/libcddb/buildlink3.mk
+++ b/audio/libcddb/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2005/04/29 19:46:52 kristerw Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:21:35 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBCDDB_BUILDLINK3_MK:= ${LIBCDDB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibcddb}
BUILDLINK_PACKAGES+= libcddb
.if !empty(LIBCDDB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libcddb+= libcddb>=0.9.4
-BUILDLINK_RECOMMENDED.libcddb+= libcddb>=0.9.5nb1
+BUILDLINK_API_DEPENDS.libcddb+= libcddb>=0.9.4
+BUILDLINK_ABI_DEPENDS.libcddb+= libcddb>=0.9.5nb1
BUILDLINK_PKGSRCDIR.libcddb?= ../../audio/libcddb
.endif # LIBCDDB_BUILDLINK3_MK
diff --git a/audio/libdca/buildlink3.mk b/audio/libdca/buildlink3.mk
index 1a44d0f760b..2cbb939cb41 100644
--- a/audio/libdca/buildlink3.mk
+++ b/audio/libdca/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/12/09 17:21:02 salo Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:35 reed Exp $
#
BUILDLINK_DEPMETHOD.libdca?= build
@@ -14,7 +14,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibdca}
BUILDLINK_PACKAGES+= libdca
.if !empty(LIBDTS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libdca+= libdca>=0.0.2
+BUILDLINK_API_DEPENDS.libdca+= libdca>=0.0.2
BUILDLINK_PKGSRCDIR.libdca?= ../../audio/libdca
.endif # LIBDTS_BUILDLINK3_MK
diff --git a/audio/libhydrogen/buildlink3.mk b/audio/libhydrogen/buildlink3.mk
index 0b96d245882..440d709a42e 100644
--- a/audio/libhydrogen/buildlink3.mk
+++ b/audio/libhydrogen/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:10 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:35 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBHYDROGEN_BUILDLINK3_MK:= ${LIBHYDROGEN_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibhydrogen}
BUILDLINK_PACKAGES+= libhydrogen
.if !empty(LIBHYDROGEN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libhydrogen+= libhydrogen>=0.8.0
-BUILDLINK_RECOMMENDED.libhydrogen+= libhydrogen>=0.8.0nb2
+BUILDLINK_API_DEPENDS.libhydrogen+= libhydrogen>=0.8.0
+BUILDLINK_ABI_DEPENDS.libhydrogen+= libhydrogen>=0.8.0nb2
BUILDLINK_PKGSRCDIR.libhydrogen?= ../../audio/libhydrogen
.endif # LIBHYDROGEN_BUILDLINK3_MK
diff --git a/audio/libid3tag/buildlink3.mk b/audio/libid3tag/buildlink3.mk
index 6ab0dc6624f..063de0955dc 100644
--- a/audio/libid3tag/buildlink3.mk
+++ b/audio/libid3tag/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/10/03 00:13:07 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:35 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBID3TAG_BUILDLINK3_MK:= ${LIBID3TAG_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibid3tag}
BUILDLINK_PACKAGES+= libid3tag
.if !empty(LIBID3TAG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libid3tag+= libid3tag>=0.15.0b
-BUILDLINK_RECOMMENDED.libid3tag+= libid3tag>=0.15.1bnb1
+BUILDLINK_API_DEPENDS.libid3tag+= libid3tag>=0.15.0b
+BUILDLINK_ABI_DEPENDS.libid3tag+= libid3tag>=0.15.1bnb1
BUILDLINK_PKGSRCDIR.libid3tag?= ../../audio/libid3tag
.endif # LIBID3TAG_BUILDLINK3_MK
diff --git a/audio/libmad/buildlink3.mk b/audio/libmad/buildlink3.mk
index 2849775cf96..9b2158d558a 100644
--- a/audio/libmad/buildlink3.mk
+++ b/audio/libmad/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/10/03 00:13:07 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:35 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBMAD_BUILDLINK3_MK:= ${LIBMAD_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmad}
BUILDLINK_PACKAGES+= libmad
.if !empty(LIBMAD_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmad+= libmad>=0.15.0b
-BUILDLINK_RECOMMENDED.libmad+= libmad>=0.15.1bnb1
+BUILDLINK_API_DEPENDS.libmad+= libmad>=0.15.0b
+BUILDLINK_ABI_DEPENDS.libmad+= libmad>=0.15.1bnb1
BUILDLINK_PKGSRCDIR.libmad?= ../../audio/libmad
.endif # LIBMAD_BUILDLINK3_MK
diff --git a/audio/libmikmod/buildlink3.mk b/audio/libmikmod/buildlink3.mk
index 80899b09961..6422f6fe914 100644
--- a/audio/libmikmod/buildlink3.mk
+++ b/audio/libmikmod/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:08:11 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:21:35 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBMIKMOD_BUILDLINK3_MK:= ${LIBMIKMOD_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmikmod}
BUILDLINK_PACKAGES+= libmikmod
.if !empty(LIBMIKMOD_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmikmod+= libmikmod>=3.1.9
-BUILDLINK_RECOMMENDED.libmikmod+= libmikmod>=3.1.11.1nb2
+BUILDLINK_API_DEPENDS.libmikmod+= libmikmod>=3.1.9
+BUILDLINK_ABI_DEPENDS.libmikmod+= libmikmod>=3.1.11.1nb2
BUILDLINK_PKGSRCDIR.libmikmod?= ../../audio/libmikmod
.endif # LIBMIKMOD_BUILDLINK3_MK
diff --git a/audio/libmodplug/buildlink3.mk b/audio/libmodplug/buildlink3.mk
index 95052654a13..1c370a12a8d 100644
--- a/audio/libmodplug/buildlink3.mk
+++ b/audio/libmodplug/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/10/03 00:13:07 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:35 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBMODPLUG_BUILDLINK3_MK:= ${LIBMODPLUG_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmodplug}
BUILDLINK_PACKAGES+= libmodplug
.if !empty(LIBMODPLUG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmodplug+= libmodplug>=0.7
-BUILDLINK_RECOMMENDED.libmodplug+= libmodplug>=0.7nb1
+BUILDLINK_API_DEPENDS.libmodplug+= libmodplug>=0.7
+BUILDLINK_ABI_DEPENDS.libmodplug+= libmodplug>=0.7nb1
BUILDLINK_PKGSRCDIR.libmodplug?= ../../audio/libmodplug
.endif # LIBMODPLUG_BUILDLINK3_MK
diff --git a/audio/libmpd/buildlink3.mk b/audio/libmpd/buildlink3.mk
index 2cbaa35e385..bf0fdf46406 100644
--- a/audio/libmpd/buildlink3.mk
+++ b/audio/libmpd/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/11/22 19:26:08 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:35 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBMPD_BUILDLINK3_MK:= ${LIBMPD_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmpd}
BUILDLINK_PACKAGES+= libmpd
.if !empty(LIBMPD_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmpd+= libmpd>=0.01
+BUILDLINK_API_DEPENDS.libmpd+= libmpd>=0.01
BUILDLINK_PKGSRCDIR.libmpd?= ../../audio/libmpd
.endif # LIBMPD_BUILDLINK3_MK
diff --git a/audio/libmusepack/buildlink3.mk b/audio/libmusepack/buildlink3.mk
index 559dc42b9f8..548bc0b0e45 100644
--- a/audio/libmusepack/buildlink3.mk
+++ b/audio/libmusepack/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/12/04 20:28:32 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:35 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBMUSEPACK_BUILDLINK3_MK:= ${LIBMUSEPACK_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmusepack}
BUILDLINK_PACKAGES+= libmusepack
.if !empty(LIBMUSEPACK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmusepack+= libmusepack>=1.0.3
+BUILDLINK_API_DEPENDS.libmusepack+= libmusepack>=1.0.3
BUILDLINK_PKGSRCDIR.libmusepack?= ../../audio/libmusepack
.endif # LIBMUSEPACK_BUILDLINK3_MK
diff --git a/audio/libopendaap/buildlink3.mk b/audio/libopendaap/buildlink3.mk
index d2aa13bdde5..aae1f11f4db 100644
--- a/audio/libopendaap/buildlink3.mk
+++ b/audio/libopendaap/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2005/03/19 15:36:19 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:35 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBOPENDAAP_BUILDLINK3_MK:= ${LIBOPENDAAP_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibopendaap}
BUILDLINK_PACKAGES+= libopendaap
.if !empty(LIBOPENDAAP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libopendaap+= libopendaap>=0.2.1
-BUILDLINK_RECOMMENDED.libopendaap+= libopendaap>=0.2.1nb1
+BUILDLINK_API_DEPENDS.libopendaap+= libopendaap>=0.2.1
+BUILDLINK_ABI_DEPENDS.libopendaap+= libopendaap>=0.2.1nb1
BUILDLINK_PKGSRCDIR.libopendaap?= ../../audio/libopendaap
.endif # LIBOPENDAAP_BUILDLINK3_MK
diff --git a/audio/libsamplerate/Makefile b/audio/libsamplerate/Makefile
index 9fe98307f44..8d6bdae7c56 100644
--- a/audio/libsamplerate/Makefile
+++ b/audio/libsamplerate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:28:56 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2006/04/06 06:21:35 reed Exp $
#
DISTNAME= libsamplerate-0.1.2
@@ -16,7 +16,7 @@ PKGCONFIG_OVERRIDE+= ${WRKSRC}/samplerate.pc.in
TEST_TARGET= check
-BUILDLINK_DEPENDS.libsndfile+= libsndfile>=1.0.2
+BUILDLINK_API_DEPENDS.libsndfile+= libsndfile>=1.0.2
.include "../../audio/libsndfile/buildlink3.mk"
.include "../../math/fftw/buildlink3.mk"
diff --git a/audio/libsamplerate/buildlink3.mk b/audio/libsamplerate/buildlink3.mk
index a2e703d6ae4..c06c33b3972 100644
--- a/audio/libsamplerate/buildlink3.mk
+++ b/audio/libsamplerate/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:08:11 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:35 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBSAMPLERATE_BUILDLINK3_MK:= ${LIBSAMPLERATE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibsamplerate}
BUILDLINK_PACKAGES+= libsamplerate
.if !empty(LIBSAMPLERATE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libsamplerate+= libsamplerate>=0.0.13nb1
-BUILDLINK_RECOMMENDED.libsamplerate+= libsamplerate>=0.1.2nb2
+BUILDLINK_API_DEPENDS.libsamplerate+= libsamplerate>=0.0.13nb1
+BUILDLINK_ABI_DEPENDS.libsamplerate+= libsamplerate>=0.1.2nb2
BUILDLINK_PKGSRCDIR.libsamplerate?= ../../audio/libsamplerate
.endif # LIBSAMPLERATE_BUILDLINK3_MK
diff --git a/audio/libshout/buildlink3.mk b/audio/libshout/buildlink3.mk
index dfaf29a6ac1..fd30b15e921 100644
--- a/audio/libshout/buildlink3.mk
+++ b/audio/libshout/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2005/02/28 02:21:20 kim Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:35 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBSHOUT_BUILDLINK3_MK:= ${LIBSHOUT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibshout}
BUILDLINK_PACKAGES+= libshout
.if !empty(LIBSHOUT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libshout+= libshout>=2.0
-BUILDLINK_RECOMMENDED.libshout+=libshout>=2.0nb1
+BUILDLINK_API_DEPENDS.libshout+= libshout>=2.0
+BUILDLINK_ABI_DEPENDS.libshout+=libshout>=2.0nb1
BUILDLINK_PKGSRCDIR.libshout?= ../../audio/libshout
.endif # LIBSHOUT_BUILDLINK3_MK
diff --git a/audio/libsidplay/buildlink3.mk b/audio/libsidplay/buildlink3.mk
index b503f92a015..71f41581cbb 100644
--- a/audio/libsidplay/buildlink3.mk
+++ b/audio/libsidplay/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:11 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:36 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBSIDPLAY_BUILDLINK3_MK:= ${LIBSIDPLAY_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibsidplay}
BUILDLINK_PACKAGES+= libsidplay
.if !empty(LIBSIDPLAY_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libsidplay+= libsidplay>=1.36.38
-BUILDLINK_RECOMMENDED.libsidplay+= libsidplay>=1.36.59nb2
+BUILDLINK_API_DEPENDS.libsidplay+= libsidplay>=1.36.38
+BUILDLINK_ABI_DEPENDS.libsidplay+= libsidplay>=1.36.59nb2
BUILDLINK_PKGSRCDIR.libsidplay?= ../../audio/libsidplay
.endif # LIBSIDPLAY_BUILDLINK3_MK
diff --git a/audio/libsndfile/buildlink3.mk b/audio/libsndfile/buildlink3.mk
index c3dfb1fe4f2..4cc67e6eaf3 100644
--- a/audio/libsndfile/buildlink3.mk
+++ b/audio/libsndfile/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:08:11 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:21:36 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBSNDFILE_BUILDLINK3_MK:= ${LIBSNDFILE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibsndfile}
BUILDLINK_PACKAGES+= libsndfile
.if !empty(LIBSNDFILE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libsndfile+= libsndfile>=1.0.0
-BUILDLINK_RECOMMENDED.libsndfile+= libsndfile>=1.0.13nb1
+BUILDLINK_API_DEPENDS.libsndfile+= libsndfile>=1.0.0
+BUILDLINK_ABI_DEPENDS.libsndfile+= libsndfile>=1.0.13nb1
BUILDLINK_PKGSRCDIR.libsndfile?= ../../audio/libsndfile
.endif # LIBSNDFILE_BUILDLINK3_MK
diff --git a/audio/libvisual/buildlink3.mk b/audio/libvisual/buildlink3.mk
index 017e398f094..c45349b6565 100644
--- a/audio/libvisual/buildlink3.mk
+++ b/audio/libvisual/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:11 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:36 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBVISUAL_BUILDLINK3_MK:= ${LIBVISUAL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibvisual}
BUILDLINK_PACKAGES+= libvisual
.if !empty(LIBVISUAL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libvisual+= libvisual>=0.2.0
-BUILDLINK_RECOMMENDED.libvisual?= libvisual>=0.2.0nb1
+BUILDLINK_API_DEPENDS.libvisual+= libvisual>=0.2.0
+BUILDLINK_ABI_DEPENDS.libvisual?= libvisual>=0.2.0nb1
BUILDLINK_PKGSRCDIR.libvisual?= ../../audio/libvisual
.endif # LIBVISUAL_BUILDLINK3_MK
diff --git a/audio/libvorbis/buildlink3.mk b/audio/libvorbis/buildlink3.mk
index a71838229a3..c7aeafc2ced 100644
--- a/audio/libvorbis/buildlink3.mk
+++ b/audio/libvorbis/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/10/03 00:13:07 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:21:36 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBVORBIS_BUILDLINK3_MK:= ${LIBVORBIS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibvorbis}
BUILDLINK_PACKAGES+= libvorbis
.if !empty(LIBVORBIS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libvorbis+= libvorbis>=1.0.1
-BUILDLINK_RECOMMENDED.libvorbis+= libvorbis>=1.1.0nb1
+BUILDLINK_API_DEPENDS.libvorbis+= libvorbis>=1.0.1
+BUILDLINK_ABI_DEPENDS.libvorbis+= libvorbis>=1.1.0nb1
BUILDLINK_PKGSRCDIR.libvorbis?= ../../audio/libvorbis
.endif # LIBVORBIS_BUILDLINK3_MK
diff --git a/audio/musicbrainz/buildlink3.mk b/audio/musicbrainz/buildlink3.mk
index 090753e67d9..f49d9a00391 100644
--- a/audio/musicbrainz/buildlink3.mk
+++ b/audio/musicbrainz/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/05 23:08:12 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:21:36 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
MUSICBRAINZ_BUILDLINK3_MK:= ${MUSICBRAINZ_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmusicbrainz}
BUILDLINK_PACKAGES+= musicbrainz
.if !empty(MUSICBRAINZ_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.musicbrainz+= musicbrainz>=2.0.2
-BUILDLINK_RECOMMENDED.musicbrainz+= musicbrainz>=2.1.2nb2
+BUILDLINK_API_DEPENDS.musicbrainz+= musicbrainz>=2.0.2
+BUILDLINK_ABI_DEPENDS.musicbrainz+= musicbrainz>=2.1.2nb2
BUILDLINK_PKGSRCDIR.musicbrainz?= ../../audio/musicbrainz
.endif # MUSICBRAINZ_BUILDLINK3_MK
diff --git a/audio/nas/buildlink3.mk b/audio/nas/buildlink3.mk
index fc9fea4fbf3..6e283245ac0 100644
--- a/audio/nas/buildlink3.mk
+++ b/audio/nas/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:08:12 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:36 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
NAS_BUILDLINK3_MK:= ${NAS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nnas}
BUILDLINK_PACKAGES+= nas
.if !empty(NAS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.nas+= nas>=1.4.2
-BUILDLINK_RECOMMENDED.nas?= nas>=1.7bnb2
+BUILDLINK_API_DEPENDS.nas+= nas>=1.4.2
+BUILDLINK_ABI_DEPENDS.nas?= nas>=1.7bnb2
BUILDLINK_PKGSRCDIR.nas?= ../../audio/nas
.endif # NAS_BUILDLINK3_MK
diff --git a/audio/openal/buildlink3.mk b/audio/openal/buildlink3.mk
index e9b3d548df2..b9abf86ea3c 100644
--- a/audio/openal/buildlink3.mk
+++ b/audio/openal/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:08:13 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:36 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OPENAL_BUILDLINK3_MK:= ${OPENAL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nopenal}
BUILDLINK_PACKAGES+= openal
.if !empty(OPENAL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.openal+= openal>=20030125nb1
-BUILDLINK_RECOMMENDED.openal?= openal>=20040816nb1
+BUILDLINK_API_DEPENDS.openal+= openal>=20030125nb1
+BUILDLINK_ABI_DEPENDS.openal?= openal>=20040816nb1
BUILDLINK_PKGSRCDIR.openal?= ../../audio/openal
.endif # OPENAL_BUILDLINK3_MK
diff --git a/audio/portaudio/buildlink3.mk b/audio/portaudio/buildlink3.mk
index b5a56e881f5..edfc55e74d1 100644
--- a/audio/portaudio/buildlink3.mk
+++ b/audio/portaudio/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:13 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:36 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PORTAUDIO_BUILDLINK3_MK:= ${PORTAUDIO_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nportaudio}
BUILDLINK_PACKAGES+= portaudio
.if !empty(PORTAUDIO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.portaudio+= portaudio>=18.1
-BUILDLINK_RECOMMENDED.portaudio?= portaudio>=18.1nb2
+BUILDLINK_API_DEPENDS.portaudio+= portaudio>=18.1
+BUILDLINK_ABI_DEPENDS.portaudio?= portaudio>=18.1nb2
BUILDLINK_PKGSRCDIR.portaudio?= ../../audio/portaudio
.endif # PORTAUDIO_BUILDLINK3_MK
diff --git a/audio/py-ogg/buildlink3.mk b/audio/py-ogg/buildlink3.mk
index d7611bb11e5..34a4b558655 100644
--- a/audio/py-ogg/buildlink3.mk
+++ b/audio/py-ogg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/05 23:08:13 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:21:36 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_OGG_BUILDLINK3_MK:= ${PY_OGG_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npyogg}
BUILDLINK_PACKAGES+= pyogg
.if !empty(PY_OGG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pyogg+= ${PYPKGPREFIX}-ogg>=1.3
-BUILDLINK_RECOMMENDED.pyogg?= ${PYPKGPREFIX}-ogg>=1.3nb2
+BUILDLINK_API_DEPENDS.pyogg+= ${PYPKGPREFIX}-ogg>=1.3
+BUILDLINK_ABI_DEPENDS.pyogg?= ${PYPKGPREFIX}-ogg>=1.3nb2
BUILDLINK_PKGSRCDIR.pyogg?= ../../audio/py-ogg
.endif # PY_OGG_BUILDLINK3_MK
diff --git a/audio/rplay/buildlink3.mk b/audio/rplay/buildlink3.mk
index 0f113ec2f23..d2e17b7c594 100644
--- a/audio/rplay/buildlink3.mk
+++ b/audio/rplay/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/10/03 00:13:09 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:36 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
RPLAY_BUILDLINK3_MK:= ${RPLAY_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nrplay}
BUILDLINK_PACKAGES+= rplay
.if !empty(RPLAY_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.rplay+= rplay>=3.3.2nb1
-BUILDLINK_RECOMMENDED.rplay+= rplay>=3.3.2nb2
+BUILDLINK_API_DEPENDS.rplay+= rplay>=3.3.2nb1
+BUILDLINK_ABI_DEPENDS.rplay+= rplay>=3.3.2nb2
BUILDLINK_PKGSRCDIR.rplay?= ../../audio/rplay
.endif # RPLAY_BUILDLINK3_MK
diff --git a/audio/speex/buildlink3.mk b/audio/speex/buildlink3.mk
index 2d772af7b47..97927c137d9 100644
--- a/audio/speex/buildlink3.mk
+++ b/audio/speex/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/10/03 00:13:09 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:21:36 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SPEEX_BUILDLINK3_MK:= ${SPEEX_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nspeex}
BUILDLINK_PACKAGES+= speex
.if !empty(SPEEX_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.speex+= speex>=1.0.4
-BUILDLINK_RECOMMENDED.speex+= speex>=1.0.4nb1
+BUILDLINK_API_DEPENDS.speex+= speex>=1.0.4
+BUILDLINK_ABI_DEPENDS.speex+= speex>=1.0.4nb1
BUILDLINK_PKGSRCDIR.speex?= ../../audio/speex
.endif # SPEEX_BUILDLINK3_MK
diff --git a/audio/streamtuner/buildlink3.mk b/audio/streamtuner/buildlink3.mk
index 238abebbc8e..4c353acf7c2 100644
--- a/audio/streamtuner/buildlink3.mk
+++ b/audio/streamtuner/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:08:14 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:37 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
STREAMTUNER_BUILDLINK3_MK:= ${STREAMTUNER_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nstreamtuner}
BUILDLINK_PACKAGES+= streamtuner
.if !empty(STREAMTUNER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.streamtuner+= streamtuner>=0.99
-BUILDLINK_RECOMMENDED.streamtuner?= streamtuner>=0.99.99nb2
+BUILDLINK_API_DEPENDS.streamtuner+= streamtuner>=0.99
+BUILDLINK_ABI_DEPENDS.streamtuner?= streamtuner>=0.99.99nb2
BUILDLINK_PKGSRCDIR.streamtuner?= ../../audio/streamtuner
.endif # STREAMTUNER_BUILDLINK3_MK
diff --git a/audio/sweep/buildlink3.mk b/audio/sweep/buildlink3.mk
index 0a2858fc371..d20fb54eb6a 100644
--- a/audio/sweep/buildlink3.mk
+++ b/audio/sweep/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:08:14 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:37 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SWEEP_BUILDLINK3_MK:= ${SWEEP_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsweep}
BUILDLINK_PACKAGES+= sweep
.if !empty(SWEEP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.sweep+= sweep>=0.8.2nb6
-BUILDLINK_RECOMMENDED.sweep+= sweep>=0.8.3nb3
+BUILDLINK_API_DEPENDS.sweep+= sweep>=0.8.2nb6
+BUILDLINK_ABI_DEPENDS.sweep+= sweep>=0.8.3nb3
BUILDLINK_PKGSRCDIR.sweep?= ../../audio/sweep
.endif # SWEEP_BUILDLINK3_MK
diff --git a/audio/taglib/buildlink3.mk b/audio/taglib/buildlink3.mk
index 642b9e4511c..5bf31ee2d01 100644
--- a/audio/taglib/buildlink3.mk
+++ b/audio/taglib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/10/06 00:09:02 chris Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:21:37 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
TAGLIB_BUILDLINK3_MK:= ${TAGLIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntaglib}
BUILDLINK_PACKAGES+= taglib
.if !empty(TAGLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.taglib+= taglib>=1.0
-BUILDLINK_RECOMMENDED.taglib+= taglib>=1.3
+BUILDLINK_API_DEPENDS.taglib+= taglib>=1.0
+BUILDLINK_ABI_DEPENDS.taglib+= taglib>=1.3
BUILDLINK_PKGSRCDIR.taglib?= ../../audio/taglib
.endif # TAGLIB_BUILDLINK3_MK
diff --git a/audio/tremor/buildlink3.mk b/audio/tremor/buildlink3.mk
index 8d1e2ba40e8..022e0d49223 100644
--- a/audio/tremor/buildlink3.mk
+++ b/audio/tremor/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:14 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:37 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
TREMOR_BUILDLINK3_MK:= ${TREMOR_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntremor}
BUILDLINK_PACKAGES+= tremor
.if !empty(TREMOR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tremor+= tremor>=1.0.2
-BUILDLINK_RECOMMENDED.tremor+= tremor>=1.0.2nb5
+BUILDLINK_API_DEPENDS.tremor+= tremor>=1.0.2
+BUILDLINK_ABI_DEPENDS.tremor+= tremor>=1.0.2nb5
BUILDLINK_PKGSRCDIR.tremor?= ../../audio/tremor
.endif # TREMOR_BUILDLINK3_MK
diff --git a/audio/tunepimp/buildlink3.mk b/audio/tunepimp/buildlink3.mk
index 6222b8896ba..e149eab0576 100644
--- a/audio/tunepimp/buildlink3.mk
+++ b/audio/tunepimp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:08:14 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:37 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
TUNEPIMP_BUILDLINK3_MK:= ${TUNEPIMP_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntunepimp}
BUILDLINK_PACKAGES+= tunepimp
.if !empty(TUNEPIMP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tunepimp+= tunepimp>=0.3.0
-BUILDLINK_RECOMMENDED.tunepimp+= tunepimp>=0.3.0nb4
+BUILDLINK_API_DEPENDS.tunepimp+= tunepimp>=0.3.0
+BUILDLINK_ABI_DEPENDS.tunepimp+= tunepimp>=0.3.0nb4
BUILDLINK_PKGSRCDIR.tunepimp?= ../../audio/tunepimp
.endif # TUNEPIMP_BUILDLINK3_MK
diff --git a/audio/tunesbrowser/Makefile b/audio/tunesbrowser/Makefile
index a3b1545f00b..b6acac7d675 100644
--- a/audio/tunesbrowser/Makefile
+++ b/audio/tunesbrowser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/03/06 00:18:14 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2006/04/06 06:21:37 reed Exp $
#
DISTNAME= tunesbrowser-0.3.0
@@ -20,7 +20,7 @@ CONFIGURE_ARGS+= --datadir=${PREFIX}/share/tunesbrowser
DEPENDS+= gst-plugins0.8-esound>=0.8.1:../../audio/gst-plugins0.8-esound
DEPENDS+= gst-plugins0.8-mad>=0.8.1:../../audio/gst-plugins0.8-mad
-BUILDLINK_DEPENDS.libopendaap+= libopendaap>=0.4.0
+BUILDLINK_API_DEPENDS.libopendaap+= libopendaap>=0.4.0
.include "../../multimedia/gst-plugins0.8/buildlink3.mk"
.include "../../audio/libopendaap/buildlink3.mk"
diff --git a/audio/wsoundserver/buildlink3.mk b/audio/wsoundserver/buildlink3.mk
index 40d12cbe8c8..c698377c59f 100644
--- a/audio/wsoundserver/buildlink3.mk
+++ b/audio/wsoundserver/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/03/10 22:32:21 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:21:37 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
WSOUNDSERVER_BUILDLINK3_MK:= ${WSOUNDSERVER_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nwsoundserver}
BUILDLINK_PACKAGES+= wsoundserver
.if !empty(WSOUNDSERVER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.wsoundserver+= wsoundserver>=0.4.0nb4
-BUILDLINK_RECOMMENDED.wsoundserver+= wsoundserver>=0.4.0nb7
+BUILDLINK_API_DEPENDS.wsoundserver+= wsoundserver>=0.4.0nb4
+BUILDLINK_ABI_DEPENDS.wsoundserver+= wsoundserver>=0.4.0nb7
BUILDLINK_PKGSRCDIR.wsoundserver?= ../../audio/wsoundserver
.endif # WSOUNDSERVER_BUILDLINK3_MK
diff --git a/audio/xfce4-mixer/buildlink3.mk b/audio/xfce4-mixer/buildlink3.mk
index cff0f0adb54..3facdf5532a 100644
--- a/audio/xfce4-mixer/buildlink3.mk
+++ b/audio/xfce4-mixer/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/02/17 06:49:23 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/04/06 06:21:37 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_MIXER_BUILDLINK3_MK:= ${XFCE4_MIXER_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-mixer}
BUILDLINK_PACKAGES+= xfce4-mixer
.if !empty(XFCE4_MIXER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-mixer+= xfce4-mixer>=4.2.3
-BUILDLINK_RECOMMENDED.xfce4-mixer?= xfce4-mixer>=4.2.3nb2
+BUILDLINK_API_DEPENDS.xfce4-mixer+= xfce4-mixer>=4.2.3
+BUILDLINK_ABI_DEPENDS.xfce4-mixer?= xfce4-mixer>=4.2.3nb2
BUILDLINK_PKGSRCDIR.xfce4-mixer?= ../../audio/xfce4-mixer
.endif # XFCE4_MIXER_BUILDLINK3_MK
diff --git a/audio/xfce4-xmms-plugin/buildlink3.mk b/audio/xfce4-xmms-plugin/buildlink3.mk
index f200ca98077..1309b2a48d7 100644
--- a/audio/xfce4-xmms-plugin/buildlink3.mk
+++ b/audio/xfce4-xmms-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/17 06:49:24 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:21:37 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_XMMS_PLUGIN_BUILDLINK3_MK:= ${XFCE4_XMMS_PLUGIN_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-xmms-plugin}
BUILDLINK_PACKAGES+= xfce4-xmms-plugin
.if !empty(XFCE4_XMMS_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-xmms-plugin+= xfce4-xmms-plugin>=0.3.1
-BUILDLINK_RECOMMENDED.xfce4-xmms-plugin?= xfce4-xmms-plugin>=0.3.1nb2
+BUILDLINK_API_DEPENDS.xfce4-xmms-plugin+= xfce4-xmms-plugin>=0.3.1
+BUILDLINK_ABI_DEPENDS.xfce4-xmms-plugin?= xfce4-xmms-plugin>=0.3.1nb2
BUILDLINK_PKGSRCDIR.xfce4-xmms-plugin?= ../../audio/xfce4-xmms-plugin
.endif # XFCE4_XMMS_PLUGIN_BUILDLINK3_MK
diff --git a/audio/xmms-esound/Makefile b/audio/xmms-esound/Makefile
index 749dddbc5a8..e1665af3d4d 100644
--- a/audio/xmms-esound/Makefile
+++ b/audio/xmms-esound/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/02/05 23:08:17 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2006/04/06 06:21:37 reed Exp $
#
.include "../../audio/xmms/Makefile.common"
@@ -11,7 +11,7 @@ COMMENT= XMMS plugin to output sound through the esound daemon
CONFLICTS+= xmms<=1.2.7nb8
-BUILDLINK_DEPENDS.xmms+= xmms>=1.2.7nb9
+BUILDLINK_API_DEPENDS.xmms+= xmms>=1.2.7nb9
BUILD_DIRS= ${WRKSRC}/Output/esd
INSTALL_DIRS= ${WRKSRC}/Output/esd
diff --git a/audio/xmms-mad/Makefile b/audio/xmms-mad/Makefile
index 036590934a6..b2c27529986 100644
--- a/audio/xmms-mad/Makefile
+++ b/audio/xmms-mad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/02/05 23:08:18 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2006/04/06 06:21:37 reed Exp $
#
DISTNAME= xmms-mad-0.5.5
@@ -15,7 +15,7 @@ USE_TOOLS+= pkg-config
CPPFLAGS.NetBSD+= -DHAVE_NANOSLEEP=1
-BUILDLINK_DEPENDS.libmad+= libmad>=0.15.0bnb1
+BUILDLINK_API_DEPENDS.libmad+= libmad>=0.15.0bnb1
.include "../../audio/libid3tag/buildlink3.mk"
.include "../../audio/libmad/buildlink3.mk"
diff --git a/audio/xmms-meta-input/buildlink3.mk b/audio/xmms-meta-input/buildlink3.mk
index b85f385a4ac..0727eb9a690 100644
--- a/audio/xmms-meta-input/buildlink3.mk
+++ b/audio/xmms-meta-input/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:18 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:37 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XMMS_META_INPUT_BUILDLINK3_MK:= ${XMMS_META_INPUT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxmms-meta-input}
BUILDLINK_PACKAGES+= xmms-meta-input
.if !empty(XMMS_META_INPUT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xmms-meta-input+= xmms-meta-input>=0.4
-BUILDLINK_RECOMMENDED.xmms-meta-input?= xmms-meta-input>=0.4nb2
+BUILDLINK_API_DEPENDS.xmms-meta-input+= xmms-meta-input>=0.4
+BUILDLINK_ABI_DEPENDS.xmms-meta-input?= xmms-meta-input>=0.4nb2
BUILDLINK_PKGSRCDIR.xmms-meta-input?= ../../audio/xmms-meta-input
.endif # XMMS_META_INPUT_BUILDLINK3_MK
diff --git a/audio/xmms/buildlink3.mk b/audio/xmms/buildlink3.mk
index 1a9206765db..a2759e3c58a 100644
--- a/audio/xmms/buildlink3.mk
+++ b/audio/xmms/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:08:17 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:37 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XMMS_BUILDLINK3_MK:= ${XMMS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxmms}
BUILDLINK_PACKAGES+= xmms
.if !empty(XMMS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xmms+= xmms>=1.2.7nb10
-BUILDLINK_RECOMMENDED.xmms?= xmms>=1.2.10nb6
+BUILDLINK_API_DEPENDS.xmms+= xmms>=1.2.7nb10
+BUILDLINK_ABI_DEPENDS.xmms?= xmms>=1.2.10nb6
BUILDLINK_PKGSRCDIR.xmms?= ../../audio/xmms
.endif # XMMS_BUILDLINK3_MK
diff --git a/bootstrap/files/packages.cat7 b/bootstrap/files/packages.cat7
index 75779a276d1..4ab395f073a 100644
--- a/bootstrap/files/packages.cat7
+++ b/bootstrap/files/packages.cat7
@@ -477,15 +477,15 @@ PPAACCKKAAGGEE SSPPEECCIIFFIICC VVAARRIIAABBLLEESS
this for packages that install identical set of files.
The format of this entry is ``pkgname''.
- RECOMMENDED
+ ABI_DEPENDS
A list of recommended versions of pre-requisite packages.
This should be used together with ``DEPENDS'' to denote
which version of a pre-requisite is required and which
version is recommended. The format of this entry is
``pkgname:dir'', the same as for ``DEPENDS''.
- IGNORE_RECOMMENDED
- If this is set to ``NO'' (the default), then RECOMMENDED
+ IGNORE_ABI_DEPENDS
+ If this is set to ``NO'' (the default), then ABI_DEPENDS
pre-requisites will be turned into dependencies. If set
to ``YES'', recommendations will be ignored and a warning
will be printed that packages created with this option
diff --git a/cad/gplcver/buildlink3.mk b/cad/gplcver/buildlink3.mk
index 4722b6f22a0..94a88e102f2 100644
--- a/cad/gplcver/buildlink3.mk
+++ b/cad/gplcver/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/02/10 16:37:51 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:38 reed Exp $
# XXX
# XXX This file was created automatically using createbuildlink-3.10.
# XXX After this file has been verified as correct, the comment lines
@@ -21,7 +21,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngplcver}
BUILDLINK_PACKAGES+= gplcver
.if !empty(GPLCVER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gplcver+= gplcver>=2.11a
+BUILDLINK_API_DEPENDS.gplcver+= gplcver>=2.11a
BUILDLINK_PKGSRCDIR.gplcver?= ../../cad/gplcver
.endif # GPLCVER_BUILDLINK3_MK
diff --git a/cad/libgeda/buildlink3.mk b/cad/libgeda/buildlink3.mk
index 79e7d523b9c..55c13b80290 100644
--- a/cad/libgeda/buildlink3.mk
+++ b/cad/libgeda/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/02/11 02:40:49 dmcmahill Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2006/04/06 06:21:38 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGEDA_BUILDLINK3_MK:= ${LIBGEDA_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgeda}
BUILDLINK_PACKAGES+= libgeda
.if !empty(LIBGEDA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgeda+= libgeda-20060123{,nb[0-9]*}
-BUILDLINK_RECOMMENDED.libgeda?= libgeda>=20060123nb1
+BUILDLINK_API_DEPENDS.libgeda+= libgeda-20060123{,nb[0-9]*}
+BUILDLINK_ABI_DEPENDS.libgeda?= libgeda>=20060123nb1
BUILDLINK_PKGSRCDIR.libgeda?= ../../cad/libgeda
.endif # LIBGEDA_BUILDLINK3_MK
diff --git a/cad/libwcalc/buildlink3.mk b/cad/libwcalc/buildlink3.mk
index 9ae49141ed3..7b543fe4d3c 100644
--- a/cad/libwcalc/buildlink3.mk
+++ b/cad/libwcalc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:22 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:38 reed Exp $
#
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibwcalc}
BUILDLINK_PACKAGES+= libwcalc
.if !empty(LIBWCALC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libwcalc+= libwcalc-1.0*
-BUILDLINK_RECOMMENDED.libwcalc?= libwcalc>=1.0nb1
+BUILDLINK_API_DEPENDS.libwcalc+= libwcalc-1.0*
+BUILDLINK_ABI_DEPENDS.libwcalc?= libwcalc>=1.0nb1
BUILDLINK_PKGSRCDIR.libwcalc?= ../../cad/libwcalc
.endif # LIBWCALC_BUILDLINK3_MK
diff --git a/cad/spice/Makefile b/cad/spice/Makefile
index 7a7054c1068..f2bed6f9482 100644
--- a/cad/spice/Makefile
+++ b/cad/spice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2006/02/05 23:08:22 joerg Exp $
+# $NetBSD: Makefile,v 1.34 2006/04/06 06:21:38 reed Exp $
DISTNAME= sp3f4.kit
PKGNAME= spice-3f5.1
@@ -15,7 +15,7 @@ COMMENT= General-purpose circuit simulation program
WRKSRC= ${WRKDIR}
# GPL license used by GNU readline is not compatible
# with 4 clause BSD license used by spice.
-#BUILDLINK_DEPENDS.readline= readline>=4.0
+#BUILDLINK_API_DEPENDS.readline= readline>=4.0
#USE_GNU_READLINE= uses rl_* interface
# documentation in ftp://ic.eecs.berkeley.edu/pub/Spice3/um.3f3.ps
diff --git a/cad/verilog-current/buildlink3.mk b/cad/verilog-current/buildlink3.mk
index 1095e4cf003..7fa05c0b2c0 100644
--- a/cad/verilog-current/buildlink3.mk
+++ b/cad/verilog-current/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:23 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:38 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
VERILOG_CURRENT_BUILDLINK3_MK:= ${VERILOG_CURRENT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nverilog-current}
BUILDLINK_PACKAGES+= verilog-current
.if !empty(VERILOG_CURRENT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.verilog-current+= verilog-current>=20021019
-BUILDLINK_RECOMMENDED.verilog-current?= verilog-current>=20060124nb1
+BUILDLINK_API_DEPENDS.verilog-current+= verilog-current>=20021019
+BUILDLINK_ABI_DEPENDS.verilog-current?= verilog-current>=20060124nb1
BUILDLINK_PKGSRCDIR.verilog-current?= ../../cad/verilog-current
.endif # VERILOG_CURRENT_BUILDLINK3_MK
diff --git a/cad/verilog/buildlink3.mk b/cad/verilog/buildlink3.mk
index 735d56d97ae..2f2acdb2fb0 100644
--- a/cad/verilog/buildlink3.mk
+++ b/cad/verilog/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2006/02/10 16:53:36 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:38 reed Exp $
# XXX
# XXX This file was created automatically using createbuildlink-3.10.
# XXX After this file has been verified as correct, the comment lines
@@ -21,7 +21,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nverilog}
BUILDLINK_PACKAGES+= verilog
.if !empty(VERILOG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.verilog+= verilog>=0.8.1nb1
+BUILDLINK_API_DEPENDS.verilog+= verilog>=0.8.1nb1
BUILDLINK_PKGSRCDIR.verilog?= ../../cad/verilog
.endif # VERILOG_BUILDLINK3_MK
diff --git a/chat/ekg/buildlink3.mk b/chat/ekg/buildlink3.mk
index 51813f2c3b3..3417ad1e3c2 100644
--- a/chat/ekg/buildlink3.mk
+++ b/chat/ekg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/02/05 23:08:23 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2006/04/06 06:21:38 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
EKG_BUILDLINK3_MK:= ${EKG_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nekg}
BUILDLINK_PACKAGES+= ekg
.if !empty(EKG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ekg+= ekg>=1.6
-BUILDLINK_RECOMMENDED.ekg?= ekg>=1.6nb4
+BUILDLINK_API_DEPENDS.ekg+= ekg>=1.6
+BUILDLINK_ABI_DEPENDS.ekg?= ekg>=1.6nb4
BUILDLINK_PKGSRCDIR.ekg?= ../../chat/ekg
.endif # EKG_BUILDLINK3_MK
diff --git a/chat/gaim/buildlink3.mk b/chat/gaim/buildlink3.mk
index 3c8320a1856..373ef36a4d4 100644
--- a/chat/gaim/buildlink3.mk
+++ b/chat/gaim/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/05 23:08:24 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:21:38 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GAIM_BUILDLINK3_MK:= ${GAIM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngaim}
BUILDLINK_PACKAGES+= gaim
.if !empty(GAIM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gaim+= gaim>=1.1.2
-BUILDLINK_RECOMMENDED.gaim+= gaim>=1.5.0nb4
+BUILDLINK_API_DEPENDS.gaim+= gaim>=1.1.2
+BUILDLINK_ABI_DEPENDS.gaim+= gaim>=1.5.0nb4
BUILDLINK_PKGSRCDIR.gaim?= ../../chat/gaim
PRINT_PLIST_AWK+= /^@dirrm lib\/gaim$$/ \
diff --git a/chat/gale/buildlink3.mk b/chat/gale/buildlink3.mk
index da96fdc6022..b574ae31d4a 100644
--- a/chat/gale/buildlink3.mk
+++ b/chat/gale/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:08:24 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:38 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GALE_BUILDLINK3_MK:= ${GALE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngale}
BUILDLINK_PACKAGES+= gale
.if !empty(GALE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gale+= gale>=0.99f
-BUILDLINK_RECOMMENDED.gale?= gale>=0.99fnb1
+BUILDLINK_API_DEPENDS.gale+= gale>=0.99f
+BUILDLINK_ABI_DEPENDS.gale?= gale>=0.99fnb1
BUILDLINK_PKGSRCDIR.gale?= ../../chat/gale
.endif # GALE_BUILDLINK3_MK
diff --git a/chat/jabberd/buildlink3.mk b/chat/jabberd/buildlink3.mk
index ecd540d7ccb..10472dae1a8 100644
--- a/chat/jabberd/buildlink3.mk
+++ b/chat/jabberd/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:08:24 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:21:38 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
JABBERD_BUILDLINK3_MK:= ${JABBERD_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Njabberd}
BUILDLINK_PACKAGES+= jabberd
.if !empty(JABBERD_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.jabberd+= jabberd>=1.4.2
-BUILDLINK_RECOMMENDED.jabberd?= jabberd>=1.4.2nb5
+BUILDLINK_API_DEPENDS.jabberd+= jabberd>=1.4.2
+BUILDLINK_ABI_DEPENDS.jabberd?= jabberd>=1.4.2nb5
BUILDLINK_PKGSRCDIR.jabberd?= ../../chat/jabberd
.endif # JABBERD_BUILDLINK3_MK
diff --git a/chat/jabberd2/Makefile b/chat/jabberd2/Makefile
index 04ca5b6da4c..68a9e58120e 100644
--- a/chat/jabberd2/Makefile
+++ b/chat/jabberd2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2006/02/05 23:08:25 joerg Exp $
+# $NetBSD: Makefile,v 1.30 2006/04/06 06:21:38 reed Exp $
#
DISTNAME= jabberd-2.0s10
@@ -15,7 +15,7 @@ CONFLICTS= jabberd-[0-9]*:../../chat/jabberd
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-BUILDLINK_DEPENDS.openssl+= openssl>=0.9.6b
+BUILDLINK_API_DEPENDS.openssl+= openssl>=0.9.6b
BUILDLINK_TRANSFORM.db4= -e "s,/db4/,/,g"
SUBST_CLASSES+= path
diff --git a/chat/libirc/buildlink3.mk b/chat/libirc/buildlink3.mk
index 9b5d7557224..467b3b7df29 100644
--- a/chat/libirc/buildlink3.mk
+++ b/chat/libirc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:15 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:38 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBIRC_BUILDLINK3_MK:= ${LIBIRC_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibirc}
BUILDLINK_PACKAGES+= libirc
.if !empty(LIBIRC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libirc+= libirc>=0.2nb1
-BUILDLINK_RECOMMENDED.libirc+= libirc>=0.2nb2
+BUILDLINK_API_DEPENDS.libirc+= libirc>=0.2nb1
+BUILDLINK_ABI_DEPENDS.libirc+= libirc>=0.2nb2
BUILDLINK_PKGSRCDIR.libirc?= ../../chat/libirc
.endif # LIBIRC_BUILDLINK3_MK
diff --git a/chat/libotr/buildlink3.mk b/chat/libotr/buildlink3.mk
index 2825c07cb7d..42a2ae80cbd 100644
--- a/chat/libotr/buildlink3.mk
+++ b/chat/libotr/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/13 14:44:31 salo Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:38 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBOTR_BUILDLINK3_MK:= ${LIBOTR_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibotr}
BUILDLINK_PACKAGES+= libotr
.if !empty(LIBOTR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libotr+= libotr>=3.0.0
+BUILDLINK_API_DEPENDS.libotr+= libotr>=3.0.0
BUILDLINK_PKGSRCDIR.libotr?= ../../chat/libotr
.endif # LIBOTR_BUILDLINK3_MK
diff --git a/chat/libtlen/buildlink3.mk b/chat/libtlen/buildlink3.mk
index 5457c28b04a..10c3b10c83b 100644
--- a/chat/libtlen/buildlink3.mk
+++ b/chat/libtlen/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 18:55:22 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:38 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBTLEN_BUILDLINK3_MK:= ${LIBTLEN_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibtlen}
BUILDLINK_PACKAGES+= libtlen
.if !empty(LIBTLEN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libtlen+= libtlen>=20040212
-BUILDLINK_RECOMMENDED.libtlen+= libtlen>=20040212nb1
+BUILDLINK_API_DEPENDS.libtlen+= libtlen>=20040212
+BUILDLINK_ABI_DEPENDS.libtlen+= libtlen>=20040212nb1
BUILDLINK_PKGSRCDIR.libtlen?= ../../chat/libtlen
.endif # LIBTLEN_BUILDLINK3_MK
diff --git a/chat/licq-gui-qt/Makefile b/chat/licq-gui-qt/Makefile
index facec246cf0..b65fa006175 100644
--- a/chat/licq-gui-qt/Makefile
+++ b/chat/licq-gui-qt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/03/04 21:29:03 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2006/04/06 06:21:38 reed Exp $
#
DISTNAME= licq-1.2.6
@@ -12,7 +12,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.licq.org/
COMMENT= Qt GUI for licq
-BUILDLINK_DEPENDS.qt3-libs?= qt3-libs>=3.0
+BUILDLINK_API_DEPENDS.qt3-libs?= qt3-libs>=3.0
DEPENDS+= licq-core-[0-9]*:../../chat/licq-core
.include "../../mk/bsd.prefs.mk"
diff --git a/chat/loudmouth/Makefile b/chat/loudmouth/Makefile
index 2fe99a5d94d..e12be7a99a1 100644
--- a/chat/loudmouth/Makefile
+++ b/chat/loudmouth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/03/06 00:18:10 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2006/04/06 06:21:39 reed Exp $
DISTNAME= loudmouth-1.0.1
PKGREVISION= 3
@@ -20,7 +20,7 @@ CONFIGURE_ARGS+= --disable-debug
CONFIGURE_ARGS+= --disable-gtk-doc
CONFIGURE_ARGS+= --disable-mono
-BUILDLINK_DEPENDS.gnutls+= gnutls>=1.2.0
+BUILDLINK_API_DEPENDS.gnutls+= gnutls>=1.2.0
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
diff --git a/chat/loudmouth/buildlink3.mk b/chat/loudmouth/buildlink3.mk
index 1b7dddb2f71..4b7187bdbd1 100644
--- a/chat/loudmouth/buildlink3.mk
+++ b/chat/loudmouth/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/05 23:08:25 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:21:39 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LOUDMOUTH_BUILDLINK3_MK:= ${LOUDMOUTH_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nloudmouth}
BUILDLINK_PACKAGES+= loudmouth
.if !empty(LOUDMOUTH_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.loudmouth+= loudmouth>=1.0
-BUILDLINK_RECOMMENDED.loudmouth?= loudmouth>=1.0.1nb2
+BUILDLINK_API_DEPENDS.loudmouth+= loudmouth>=1.0
+BUILDLINK_ABI_DEPENDS.loudmouth?= loudmouth>=1.0.1nb2
BUILDLINK_PKGSRCDIR.loudmouth?= ../../chat/loudmouth
.endif # LOUDMOUTH_BUILDLINK3_MK
diff --git a/chat/psi/Makefile b/chat/psi/Makefile
index cdcb91cd815..fe5805ecf88 100644
--- a/chat/psi/Makefile
+++ b/chat/psi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2006/03/23 02:24:58 minskim Exp $
+# $NetBSD: Makefile,v 1.40 2006/04/06 06:21:39 reed Exp $
PSI_VERSION= 0.10
DISTNAME= psi-${PSI_VERSION}
@@ -76,6 +76,6 @@ do-install:
.include "../../devel/zlib/buildlink3.mk"
.include "../../security/qca/buildlink3.mk"
.include "../../x11/qt3-libs/buildlink3.mk"
-BUILDLINK_DEPENDS.qt3-tools+= qt3-tools>=3.3.5nb6
+BUILDLINK_API_DEPENDS.qt3-tools+= qt3-tools>=3.3.5nb6
.include "../../x11/qt3-tools/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/chat/unrealircd/Makefile b/chat/unrealircd/Makefile
index c648fbc17b5..87f1aeefdf0 100644
--- a/chat/unrealircd/Makefile
+++ b/chat/unrealircd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/03/07 17:23:51 adrianp Exp $
+# $NetBSD: Makefile,v 1.12 2006/04/06 06:21:39 reed Exp $
DISTNAME= Unreal3.2.4
PKGNAME= unrealircd-3.2.4
@@ -21,8 +21,8 @@ WRKSRC= ${WRKDIR}/Unreal3.2
TRE_NEEDED= 0.7.2
CARES_NEEDED= 1.3.0
-BUILDLINK_DEPENDS.tre+= tre-${TRE_NEEDED}
-BUILDLINK_DEPENDS.libcares+= libcares-${CARES_NEEDED}
+BUILDLINK_API_DEPENDS.tre+= tre-${TRE_NEEDED}
+BUILDLINK_API_DEPENDS.libcares+= libcares-${CARES_NEEDED}
.include "../../mk/bsd.prefs.mk"
diff --git a/chat/zephyr/buildlink3.mk b/chat/zephyr/buildlink3.mk
index 73fe0bc9a49..51cd27561da 100644
--- a/chat/zephyr/buildlink3.mk
+++ b/chat/zephyr/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:26 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:39 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ZEPHYR_BUILDLINK3_MK:= ${ZEPHYR_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nzephyr}
BUILDLINK_PACKAGES+= zephyr
.if !empty(ZEPHYR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.zephyr+= zephyr>=20010518nb1
-BUILDLINK_RECOMMENDED.zephyr?= zephyr>=20010518nb4
+BUILDLINK_API_DEPENDS.zephyr+= zephyr>=20010518nb1
+BUILDLINK_ABI_DEPENDS.zephyr?= zephyr>=20010518nb4
BUILDLINK_PKGSRCDIR.zephyr?= ../../chat/zephyr
BUILDLINK_DEPMETHOD.zephyr?= build
.endif # ZEPHYR_BUILDLINK3_MK
diff --git a/comms/gnome-pilot/buildlink3.mk b/comms/gnome-pilot/buildlink3.mk
index 04b18256583..8d2b667f4de 100644
--- a/comms/gnome-pilot/buildlink3.mk
+++ b/comms/gnome-pilot/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/05 23:08:27 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:21:39 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNOME_PILOT_BUILDLINK3_MK:= ${GNOME_PILOT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-pilot}
BUILDLINK_PACKAGES+= gnome-pilot
.if !empty(GNOME_PILOT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-pilot?= gnome-pilot>=2.0.12nb2
-BUILDLINK_RECOMMENDED.gnome-pilot?= gnome-pilot>=2.0.12nb4
+BUILDLINK_API_DEPENDS.gnome-pilot?= gnome-pilot>=2.0.12nb2
+BUILDLINK_ABI_DEPENDS.gnome-pilot?= gnome-pilot>=2.0.12nb4
BUILDLINK_PKGSRCDIR.gnome-pilot?= ../../comms/gnome-pilot
.endif # GNOME_PILOT_BUILDLINK3_MK
diff --git a/comms/jpilot/buildlink3.mk b/comms/jpilot/buildlink3.mk
index b773dfa2929..9d19d791d9a 100644
--- a/comms/jpilot/buildlink3.mk
+++ b/comms/jpilot/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:08:27 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:21:39 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
JPILOT_BUILDLINK3_MK:= ${JPILOT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Njpilot}
BUILDLINK_PACKAGES+= jpilot
.if !empty(JPILOT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.jpilot+= jpilot>=0.99.5nb4
-BUILDLINK_RECOMMENDED.jpilot+= jpilot>=0.99.7nb2
+BUILDLINK_API_DEPENDS.jpilot+= jpilot>=0.99.5nb4
+BUILDLINK_ABI_DEPENDS.jpilot+= jpilot>=0.99.7nb2
BUILDLINK_PKGSRCDIR.jpilot?= ../../comms/jpilot
.endif # JPILOT_BUILDLINK3_MK
diff --git a/comms/libmal/buildlink3.mk b/comms/libmal/buildlink3.mk
index c01b517260b..da69caaf82f 100644
--- a/comms/libmal/buildlink3.mk
+++ b/comms/libmal/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:27 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:39 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBMAL_BUILDLINK3_MK:= ${LIBMAL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmal}
BUILDLINK_PACKAGES+= libmal
.if !empty(LIBMAL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmal+= libmal>=0.40
-BUILDLINK_RECOMMENDED.libmal+= libmal>=0.40nb2
+BUILDLINK_API_DEPENDS.libmal+= libmal>=0.40
+BUILDLINK_ABI_DEPENDS.libmal+= libmal>=0.40nb2
BUILDLINK_PKGSRCDIR.libmal?= ../../comms/libmal
.endif # LIBMAL_BUILDLINK3_MK
diff --git a/comms/openobex/buildlink3.mk b/comms/openobex/buildlink3.mk
index 7be380b34e3..fbc41fd74dd 100644
--- a/comms/openobex/buildlink3.mk
+++ b/comms/openobex/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:28 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:39 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OPENOBEX_BUILDLINK3_MK:= ${OPENOBEX_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nopenobex}
BUILDLINK_PACKAGES+= openobex
.if !empty(OPENOBEX_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.openobex+= openobex>=1.0.1
-BUILDLINK_RECOMMENDED.openobex+= openobex>=1.0.1nb2
+BUILDLINK_API_DEPENDS.openobex+= openobex>=1.0.1
+BUILDLINK_ABI_DEPENDS.openobex+= openobex>=1.0.1nb2
BUILDLINK_PKGSRCDIR.openobex?= ../../comms/openobex
.endif # OPENOBEX_BUILDLINK3_MK
diff --git a/comms/p5-pilot-link/Makefile b/comms/p5-pilot-link/Makefile
index 26f4c3bcb7a..e96af56ee27 100644
--- a/comms/p5-pilot-link/Makefile
+++ b/comms/p5-pilot-link/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2006/02/05 23:08:28 joerg Exp $
+# $NetBSD: Makefile,v 1.31 2006/04/06 06:21:39 reed Exp $
#
.include "../../comms/pilot-link/Makefile.common"
@@ -8,7 +8,7 @@ PKGREVISION= 5
COMMENT= Perl bindings for pilot-link
-BUILDLINK_DEPENDS.pilot-link-libs= pilot-link-libs>=${PILOT_LINK_VERS}
+BUILDLINK_API_DEPENDS.pilot-link-libs= pilot-link-libs>=${PILOT_LINK_VERS}
USE_TOOLS+= gmake
diff --git a/comms/pilot-link-libs/buildlink3.mk b/comms/pilot-link-libs/buildlink3.mk
index 11c0189c9c4..1d60550cf7f 100644
--- a/comms/pilot-link-libs/buildlink3.mk
+++ b/comms/pilot-link-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/10/03 00:13:16 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:39 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PILOT_LINK_LIBS_BUILDLINK3_MK:= ${PILOT_LINK_LIBS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npilot-link-libs}
BUILDLINK_PACKAGES+= pilot-link-libs
.if !empty(PILOT_LINK_LIBS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pilot-link-libs+= pilot-link-libs>=0.11.7nb1
-BUILDLINK_RECOMMENDED.pilot-link-libs+= pilot-link-libs>=0.11.7nb2
+BUILDLINK_API_DEPENDS.pilot-link-libs+= pilot-link-libs>=0.11.7nb1
+BUILDLINK_ABI_DEPENDS.pilot-link-libs+= pilot-link-libs>=0.11.7nb2
BUILDLINK_PKGSRCDIR.pilot-link-libs?= ../../comms/pilot-link-libs
.endif # PILOT_LINK_LIBS_BUILDLINK3_MK
diff --git a/comms/pilot-link/Makefile b/comms/pilot-link/Makefile
index 55383be6c5b..c4ee835c12a 100644
--- a/comms/pilot-link/Makefile
+++ b/comms/pilot-link/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2006/02/05 23:08:28 joerg Exp $
+# $NetBSD: Makefile,v 1.44 2006/04/06 06:21:39 reed Exp $
.include "../../comms/pilot-link/Makefile.common"
@@ -6,7 +6,7 @@ PKGREVISION= 4
COMMENT= Tools to talk to the 3Com Pilot PDA
-BUILDLINK_DEPENDS.pilot-link-libs= pilot-link-libs>=${PILOT_LINK_VERS}
+BUILDLINK_API_DEPENDS.pilot-link-libs= pilot-link-libs>=${PILOT_LINK_VERS}
USE_TOOLS+= gmake perl:run
USE_GNU_READLINE= YES
diff --git a/comms/synce-librapi2/buildlink3.mk b/comms/synce-librapi2/buildlink3.mk
index c5f65b93858..05ff1ccd445 100644
--- a/comms/synce-librapi2/buildlink3.mk
+++ b/comms/synce-librapi2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/10/13 15:03:42 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:39 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SYNCE_LIBRAPI2_BUILDLINK3_MK:= ${SYNCE_LIBRAPI2_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsynce-librapi2}
BUILDLINK_PACKAGES+= synce-librapi2
.if !empty(SYNCE_LIBRAPI2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.synce-librapi2+= synce-librapi2>=0.9.1
+BUILDLINK_API_DEPENDS.synce-librapi2+= synce-librapi2>=0.9.1
BUILDLINK_PKGSRCDIR.synce-librapi2?= ../../comms/synce-librapi2
.endif # SYNCE_LIBRAPI2_BUILDLINK3_MK
diff --git a/comms/synce-libsynce/buildlink3.mk b/comms/synce-libsynce/buildlink3.mk
index d2abbd51fdf..82ce95f06bd 100644
--- a/comms/synce-libsynce/buildlink3.mk
+++ b/comms/synce-libsynce/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/10/13 15:00:13 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:39 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SYNCE_LIBSYNCE_BUILDLINK3_MK:= ${SYNCE_LIBSYNCE_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsynce-libsynce}
BUILDLINK_PACKAGES+= synce-libsynce
.if !empty(SYNCE_LIBSYNCE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.synce-libsynce+= synce-libsynce>=0.9.1
+BUILDLINK_API_DEPENDS.synce-libsynce+= synce-libsynce>=0.9.1
BUILDLINK_PKGSRCDIR.synce-libsynce?= ../../comms/synce-libsynce
.endif # SYNCE_LIBSYNCE_BUILDLINK3_MK
diff --git a/comms/zaptel-netbsd/buildlink3.mk b/comms/zaptel-netbsd/buildlink3.mk
index 79151ea113c..b8354d7c4d1 100644
--- a/comms/zaptel-netbsd/buildlink3.mk
+++ b/comms/zaptel-netbsd/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:28 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:39 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ZAPTEL_NETBSD_BUILDLINK3_MK:= ${ZAPTEL_NETBSD_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nzaptel-netbsd}
BUILDLINK_PACKAGES+= zaptel-netbsd
.if !empty(ZAPTEL_NETBSD_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.zaptel-netbsd+= zaptel-netbsd>=20050314
-BUILDLINK_RECOMMENDED.zaptel-netbsd?= zaptel-netbsd>=20060127nb1
+BUILDLINK_API_DEPENDS.zaptel-netbsd+= zaptel-netbsd>=20050314
+BUILDLINK_ABI_DEPENDS.zaptel-netbsd?= zaptel-netbsd>=20060127nb1
BUILDLINK_PKGSRCDIR.zaptel-netbsd?= ../../comms/zaptel-netbsd
BUILDLINK_DEPMETHOD.zaptel-netbsd?= build
.endif # ZAPTEL_NETBSD_BUILDLINK3_MK
diff --git a/converters/fribidi/buildlink3.mk b/converters/fribidi/buildlink3.mk
index 400f1143c47..5dbe7332d07 100644
--- a/converters/fribidi/buildlink3.mk
+++ b/converters/fribidi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:13:17 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:39 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
FRIBIDI_BUILDLINK3_MK:= ${FRIBIDI_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfribidi}
BUILDLINK_PACKAGES+= fribidi
.if !empty(FRIBIDI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.fribidi+= fribidi>=0.10.4
-BUILDLINK_RECOMMENDED.fribidi+= fribidi>=0.10.4nb1
+BUILDLINK_API_DEPENDS.fribidi+= fribidi>=0.10.4
+BUILDLINK_ABI_DEPENDS.fribidi+= fribidi>=0.10.4nb1
BUILDLINK_PKGSRCDIR.fribidi?= ../../converters/fribidi
.endif # FRIBIDI_BUILDLINK3_MK
diff --git a/converters/libiconv/buildlink3.mk b/converters/libiconv/buildlink3.mk
index ea1338534b0..236721d0c43 100644
--- a/converters/libiconv/buildlink3.mk
+++ b/converters/libiconv/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.21 2004/10/03 00:13:17 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2006/04/06 06:21:40 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ICONV_BUILDLINK3_MK:= ${ICONV_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Niconv}
BUILDLINK_PACKAGES+= iconv
.if !empty(ICONV_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.iconv+= libiconv>=1.9.1
-BUILDLINK_RECOMMENDED.iconv+= libiconv>=1.9.1nb4
+BUILDLINK_API_DEPENDS.iconv+= libiconv>=1.9.1
+BUILDLINK_ABI_DEPENDS.iconv+= libiconv>=1.9.1nb4
BUILDLINK_PKGSRCDIR.iconv?= ../../converters/libiconv
.endif # ICONV_BUILDLINK3_MK
diff --git a/converters/libiconv/builtin.mk b/converters/libiconv/builtin.mk
index 59d24953110..134ba9792cf 100644
--- a/converters/libiconv/builtin.mk
+++ b/converters/libiconv/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.15 2006/03/30 18:06:17 jlam Exp $
+# $NetBSD: builtin.mk,v 1.16 2006/04/06 06:21:40 reed Exp $
BUILTIN_PKG:= iconv
@@ -63,7 +63,7 @@ USE_BUILTIN.iconv= ${IS_BUILTIN.iconv}
. if defined(BUILTIN_PKG.iconv) && \
!empty(IS_BUILTIN.iconv:M[yY][eE][sS])
USE_BUILTIN.iconv= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.iconv}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.iconv}
. if !empty(USE_BUILTIN.iconv:M[yY][eE][sS])
USE_BUILTIN.iconv!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.iconv:Q}; then \
diff --git a/converters/libwpd/buildlink3.mk b/converters/libwpd/buildlink3.mk
index 7a234052ff3..5f3a5a19c72 100644
--- a/converters/libwpd/buildlink3.mk
+++ b/converters/libwpd/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/08 09:42:53 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:21:40 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBWPD_BUILDLINK3_MK:= ${LIBWPD_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibwpd}
BUILDLINK_PACKAGES+= libwpd
.if !empty(LIBWPD_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libwpd+= libwpd>=0.8.1nb1
-BUILDLINK_RECOMMENDED.libwpd?= libwpd>=0.8.4
+BUILDLINK_API_DEPENDS.libwpd+= libwpd>=0.8.1nb1
+BUILDLINK_ABI_DEPENDS.libwpd?= libwpd>=0.8.4
BUILDLINK_PKGSRCDIR.libwpd?= ../../converters/libwpd
.endif # LIBWPD_BUILDLINK3_MK
diff --git a/converters/psiconv/buildlink3.mk b/converters/psiconv/buildlink3.mk
index 0eedace4165..48ef17ad656 100644
--- a/converters/psiconv/buildlink3.mk
+++ b/converters/psiconv/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/12/28 23:18:18 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:40 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PSICONV_BUILDLINK3_MK:= ${PSICONV_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npsiconv}
BUILDLINK_PACKAGES+= psiconv
.if !empty(PSICONV_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.psiconv+= psiconv>=0.8.3nb1
-BUILDLINK_RECOMMENDED.psiconv+= psiconv>=0.9.6nb1
+BUILDLINK_API_DEPENDS.psiconv+= psiconv>=0.8.3nb1
+BUILDLINK_ABI_DEPENDS.psiconv+= psiconv>=0.9.6nb1
BUILDLINK_PKGSRCDIR.psiconv?= ../../converters/psiconv
.endif # PSICONV_BUILDLINK3_MK
diff --git a/converters/recode/buildlink3.mk b/converters/recode/buildlink3.mk
index 460040d1b50..405b5453626 100644
--- a/converters/recode/buildlink3.mk
+++ b/converters/recode/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:29 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:40 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
RECODE_BUILDLINK3_MK:= ${RECODE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nrecode}
BUILDLINK_PACKAGES+= recode
.if !empty(RECODE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.recode+= recode>=3.6nb1
-BUILDLINK_RECOMMENDED.recode+= recode>=3.6nb3
+BUILDLINK_API_DEPENDS.recode+= recode>=3.6nb1
+BUILDLINK_ABI_DEPENDS.recode+= recode>=3.6nb3
BUILDLINK_PKGSRCDIR.recode?= ../../converters/recode
.endif # RECODE_BUILDLINK3_MK
diff --git a/converters/uulib/buildlink3.mk b/converters/uulib/buildlink3.mk
index 50cabfad9c0..f9cb327a38c 100644
--- a/converters/uulib/buildlink3.mk
+++ b/converters/uulib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:17 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:40 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
UULIB_BUILDLINK3_MK:= ${UULIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nuulib}
BUILDLINK_PACKAGES+= uulib
.if !empty(UULIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.uulib+= uulib>=0.5.20
-BUILDLINK_RECOMMENDED.uulib+= uulib>=0.5.20nb2
+BUILDLINK_API_DEPENDS.uulib+= uulib>=0.5.20
+BUILDLINK_ABI_DEPENDS.uulib+= uulib>=0.5.20nb2
BUILDLINK_PKGSRCDIR.uulib?= ../../converters/uulib
.endif # UULIB_BUILDLINK3_MK
diff --git a/converters/wv/buildlink3.mk b/converters/wv/buildlink3.mk
index c8fcff4357f..79d20af8a4d 100644
--- a/converters/wv/buildlink3.mk
+++ b/converters/wv/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/02/05 23:08:29 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/04/06 06:21:40 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
WV_BUILDLINK3_MK:= ${WV_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nwv}
BUILDLINK_PACKAGES+= wv
.if !empty(WV_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.wv+= wv>=1.0.0
-BUILDLINK_RECOMMENDED.wv+= wv>=1.2.0nb2
+BUILDLINK_API_DEPENDS.wv+= wv>=1.0.0
+BUILDLINK_ABI_DEPENDS.wv+= wv>=1.2.0nb2
BUILDLINK_PKGSRCDIR.wv?= ../../converters/wv
.endif # WV_BUILDLINK3_MK
diff --git a/converters/wv2/buildlink3.mk b/converters/wv2/buildlink3.mk
index ec5eaf4d1ef..ecc6e45dbb0 100644
--- a/converters/wv2/buildlink3.mk
+++ b/converters/wv2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:08:29 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:21:40 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
WV2_BUILDLINK3_MK:= ${WV2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nwv2}
BUILDLINK_PACKAGES+= wv2
.if !empty(WV2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.wv2?= wv2>=0.2.2nb1
-BUILDLINK_RECOMMENDED.wv2?= wv2>=0.2.2nb4
+BUILDLINK_API_DEPENDS.wv2?= wv2>=0.2.2nb1
+BUILDLINK_ABI_DEPENDS.wv2?= wv2>=0.2.2nb4
BUILDLINK_PKGSRCDIR.wv2?= ../../converters/wv2
.endif # WV2_BUILDLINK3_MK
diff --git a/cross/binutils/buildlink3.mk b/cross/binutils/buildlink3.mk
index 9240dfc1956..498ec772ad1 100644
--- a/cross/binutils/buildlink3.mk
+++ b/cross/binutils/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2005/04/05 11:04:20 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:40 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
CROSS_BINUTILS_BUILDLINK3_MK:= ${CROSS_BINUTILS_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncross-binutils}
BUILDLINK_PACKAGES+= cross-binutils
.if !empty(CROSS_BINUTILS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.cross-binutils+= cross-binutils>=2.15.0.0nb3
+BUILDLINK_API_DEPENDS.cross-binutils+= cross-binutils>=2.15.0.0nb3
BUILDLINK_PKGSRCDIR.cross-binutils?= ../../cross/binutils
.endif # CROSS_BINUTILS_BUILDLINK3_MK
diff --git a/databases/bdb-xml/buildlink3.mk b/databases/bdb-xml/buildlink3.mk
index 438b8c3b539..36a67e72b22 100644
--- a/databases/bdb-xml/buildlink3.mk
+++ b/databases/bdb-xml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:30 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:40 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
BDB_XML_BUILDLINK3_MK:= ${BDB_XML_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nbdb-xml}
BUILDLINK_PACKAGES+= bdb-xml
.if !empty(BDB_XML_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.bdb-xml+= bdb-xml>=1.2.1nb3
-BUILDLINK_RECOMMENDED.bdb-xml?= bdb-xml>=1.2.1nb4
+BUILDLINK_API_DEPENDS.bdb-xml+= bdb-xml>=1.2.1nb3
+BUILDLINK_ABI_DEPENDS.bdb-xml?= bdb-xml>=1.2.1nb4
BUILDLINK_PKGSRCDIR.bdb-xml?= ../../databases/bdb-xml
.endif # BDB_XML_BUILDLINK3_MK
diff --git a/databases/db/buildlink3.mk b/databases/db/buildlink3.mk
index 49d0fc9b8dc..0582af9ced8 100644
--- a/databases/db/buildlink3.mk
+++ b/databases/db/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2004/11/15 17:54:49 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2006/04/06 06:21:40 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
DB_BUILDLINK3_MK:= ${DB_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndb2}
BUILDLINK_PACKAGES+= db2
.if !empty(DB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.db2+= db>=2.7.3
-BUILDLINK_RECOMMENDED.db2+= db>=2.7.7nb2
+BUILDLINK_API_DEPENDS.db2+= db>=2.7.3
+BUILDLINK_ABI_DEPENDS.db2+= db>=2.7.7nb2
BUILDLINK_PKGSRCDIR.db2?= ../../databases/db
BUILDLINK_INCDIRS.db2?= include/db2
BUILDLINK_LDADD.db2= -ldb2
diff --git a/databases/db3/buildlink3.mk b/databases/db3/buildlink3.mk
index c0b26fd7bdd..db91a2dbe1b 100644
--- a/databases/db3/buildlink3.mk
+++ b/databases/db3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2004/11/15 17:54:49 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2006/04/06 06:21:40 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
DB3_BUILDLINK3_MK:= ${DB3_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndb3}
BUILDLINK_PACKAGES+= db3
.if !empty(DB3_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.db3+= db3>=2.9.2
-BUILDLINK_RECOMMENDED.db3+= db3>=3.11.2nb3
+BUILDLINK_API_DEPENDS.db3+= db3>=2.9.2
+BUILDLINK_ABI_DEPENDS.db3+= db3>=3.11.2nb3
BUILDLINK_PKGSRCDIR.db3?= ../../databases/db3
BUILDLINK_INCDIRS.db3?= include/db3
BUILDLINK_LDADD.db3= -ldb3
diff --git a/databases/db4/buildlink3.mk b/databases/db4/buildlink3.mk
index 43545e75f91..326a640d089 100644
--- a/databases/db4/buildlink3.mk
+++ b/databases/db4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.25 2006/01/06 15:08:47 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.26 2006/04/06 06:21:40 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
DB4_BUILDLINK3_MK:= ${DB4_BUILDLINK3_MK}+
@@ -13,7 +13,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndb4}
BUILDLINK_PACKAGES+= db4
.if !empty(DB4_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.db4+= db4>=4.4.16
+BUILDLINK_API_DEPENDS.db4+= db4>=4.4.16
BUILDLINK_PKGSRCDIR.db4?= ../../databases/db4
BUILDLINK_INCDIRS.db4?= include/db4
BUILDLINK_LDADD.db4= -ldb4
@@ -23,7 +23,7 @@ BUILDLINK_TRANSFORM+= l:db-4:db4
#
# Older db4 packages didn't enable the db-1.85 compatibility API.
#
-BUILDLINK_DEPENDS.db4+= db4>=4.2.52nb1
+BUILDLINK_API_DEPENDS.db4+= db4>=4.2.52nb1
BUILDLINK_LIBS.db4= ${BUILDLINK_LDADD.db4}
BUILDLINK_TRANSFORM+= l:db:db4
. endif
diff --git a/databases/dbh/buildlink3.mk b/databases/dbh/buildlink3.mk
index d8266d11080..d03ff74bd2e 100644
--- a/databases/dbh/buildlink3.mk
+++ b/databases/dbh/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2005/03/16 13:29:46 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:40 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
DBH_BUILDLINK3_MK:= ${DBH_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndbh}
BUILDLINK_PACKAGES+= dbh
.if !empty(DBH_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.dbh+= dbh>=1.0.22
+BUILDLINK_API_DEPENDS.dbh+= dbh>=1.0.22
BUILDLINK_PKGSRCDIR.dbh?= ../../databases/dbh
.endif # DBH_BUILDLINK3_MK
diff --git a/databases/edb/buildlink3.mk b/databases/edb/buildlink3.mk
index 7ee06ce8ead..7e77ae83489 100644
--- a/databases/edb/buildlink3.mk
+++ b/databases/edb/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:30 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:40 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
EDB_BUILDLINK3_MK:= ${EDB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nedb}
BUILDLINK_PACKAGES+= edb
.if !empty(EDB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.edb+= edb>=1.0.3nb3
-BUILDLINK_RECOMMENDED.edb+= edb>=1.0.3nb5
+BUILDLINK_API_DEPENDS.edb+= edb>=1.0.3nb3
+BUILDLINK_ABI_DEPENDS.edb+= edb>=1.0.3nb5
BUILDLINK_PKGSRCDIR.edb?= ../../databases/edb
.endif # EDB_BUILDLINK3_MK
diff --git a/databases/freetds/buildlink3.mk b/databases/freetds/buildlink3.mk
index 1b7fdbda0cb..079518c52f8 100644
--- a/databases/freetds/buildlink3.mk
+++ b/databases/freetds/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:08:30 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:21:41 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
FREETDS_BUILDLINK3_MK:= ${FREETDS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfreetds}
BUILDLINK_PACKAGES+= freetds
.if !empty(FREETDS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.freetds+= freetds>=0.63nb2
-BUILDLINK_RECOMMENDED.freetds?= freetds>=0.63nb4
+BUILDLINK_API_DEPENDS.freetds+= freetds>=0.63nb2
+BUILDLINK_ABI_DEPENDS.freetds?= freetds>=0.63nb4
BUILDLINK_PKGSRCDIR.freetds?= ../../databases/freetds
.endif # FREETDS_BUILDLINK3_MK
diff --git a/databases/gdbm/buildlink3.mk b/databases/gdbm/buildlink3.mk
index 67f5950197a..2d0b584c3f0 100644
--- a/databases/gdbm/buildlink3.mk
+++ b/databases/gdbm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:13:18 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:41 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GDBM_BUILDLINK3_MK:= ${GDBM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngdbm}
BUILDLINK_PACKAGES+= gdbm
.if !empty(GDBM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gdbm+= gdbm>=1.8.3
-BUILDLINK_RECOMMENDED.gdbm+= gdbm>=1.8.3nb1
+BUILDLINK_API_DEPENDS.gdbm+= gdbm>=1.8.3
+BUILDLINK_ABI_DEPENDS.gdbm+= gdbm>=1.8.3nb1
BUILDLINK_PKGSRCDIR.gdbm?= ../../databases/gdbm
.endif # GDBM_BUILDLINK3_MK
diff --git a/databases/geneweb/Makefile b/databases/geneweb/Makefile
index 82f7129cfe7..0a5ec89e770 100644
--- a/databases/geneweb/Makefile
+++ b/databases/geneweb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2006/03/09 10:35:49 tonio Exp $
+# $NetBSD: Makefile,v 1.30 2006/04/06 06:21:41 reed Exp $
#
DISTNAME= geneweb-4.10
@@ -23,7 +23,7 @@ BUILD_TARGET= out
# needed for patch-ab to work:
# since 3.09.0, camlp4 uses _loc instead of loc
-BUILDLINK_DEPENDS.ocaml+= ocaml>=3.09.0
+BUILDLINK_API_DEPENDS.ocaml+= ocaml>=3.09.0
# sysutils/coreutils a 'gwc' program, so conflict with it if
# ${GNU_PROGRAM_PREFIX} == "g"
diff --git a/databases/gnome-mime-data/buildlink3.mk b/databases/gnome-mime-data/buildlink3.mk
index df4edcfe365..5f0294667d9 100644
--- a/databases/gnome-mime-data/buildlink3.mk
+++ b/databases/gnome-mime-data/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:08:31 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:21:41 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNOME_MIME_DATA_BUILDLINK3_MK:= ${GNOME_MIME_DATA_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-mime-data}
BUILDLINK_PACKAGES+= gnome-mime-data
.if !empty(GNOME_MIME_DATA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-mime-data+= gnome-mime-data>=2.4.0
-BUILDLINK_RECOMMENDED.gnome-mime-data?= gnome-mime-data>=2.4.2nb2
+BUILDLINK_API_DEPENDS.gnome-mime-data+= gnome-mime-data>=2.4.0
+BUILDLINK_ABI_DEPENDS.gnome-mime-data?= gnome-mime-data>=2.4.2nb2
BUILDLINK_PKGSRCDIR.gnome-mime-data?= ../../databases/gnome-mime-data
# intltool-{extract,merge,update} are Perl scripts included in the sources
diff --git a/databases/iodbc/buildlink3.mk b/databases/iodbc/buildlink3.mk
index 29f19f77272..bf36c4009b6 100644
--- a/databases/iodbc/buildlink3.mk
+++ b/databases/iodbc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2005/12/30 21:03:59 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:41 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
IODBC_BUILDLINK3_MK:= ${IODBC_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Niodbc}
BUILDLINK_PACKAGES+= iodbc
.if !empty(IODBC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.iodbc+= iodbc>=3.52.3
+BUILDLINK_API_DEPENDS.iodbc+= iodbc>=3.52.3
BUILDLINK_PKGSRCDIR.iodbc?= ../../databases/iodbc
.endif # IODBC_BUILDLINK3_MK
diff --git a/databases/libgda/buildlink3.mk b/databases/libgda/buildlink3.mk
index be06aa7c07e..1fbaafd77b9 100644
--- a/databases/libgda/buildlink3.mk
+++ b/databases/libgda/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/05 23:08:31 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:21:41 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGDA_BUILDLINK3_MK:= ${LIBGDA_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgda}
BUILDLINK_PACKAGES+= libgda
.if !empty(LIBGDA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgda+= libgda>=1.9.100
-BUILDLINK_RECOMMENDED.libgda?= libgda>=1.9.100nb1
+BUILDLINK_API_DEPENDS.libgda+= libgda>=1.9.100
+BUILDLINK_ABI_DEPENDS.libgda?= libgda>=1.9.100nb1
BUILDLINK_PKGSRCDIR.libgda?= ../../databases/libgda
PRINT_PLIST_AWK+= /^@dirrm lib\/libgda-1.9\/providers$$/ \
diff --git a/databases/libgnomedb/buildlink3.mk b/databases/libgnomedb/buildlink3.mk
index 777763eb225..73d5ec4cf19 100644
--- a/databases/libgnomedb/buildlink3.mk
+++ b/databases/libgnomedb/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/02/05 23:08:32 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/04/06 06:21:41 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGNOMEDB_BUILDLINK3_MK:= ${LIBGNOMEDB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgnomedb}
BUILDLINK_PACKAGES+= libgnomedb
.if !empty(LIBGNOMEDB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgnomedb+= libgnomedb>=1.9.100
-BUILDLINK_RECOMMENDED.libgnomedb?= libgnomedb>=1.9.100nb1
+BUILDLINK_API_DEPENDS.libgnomedb+= libgnomedb>=1.9.100
+BUILDLINK_ABI_DEPENDS.libgnomedb?= libgnomedb>=1.9.100nb1
BUILDLINK_PKGSRCDIR.libgnomedb?= ../../databases/libgnomedb
.endif # LIBGNOMEDB_BUILDLINK3_MK
diff --git a/databases/libpqxx/buildlink3.mk b/databases/libpqxx/buildlink3.mk
index 2074e32bcac..7e758e932cb 100644
--- a/databases/libpqxx/buildlink3.mk
+++ b/databases/libpqxx/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:08:32 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:41 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBPQXX_BUILDLINK3_MK:= ${LIBPQXX_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibpqxx}
BUILDLINK_PACKAGES+= libpqxx
.if !empty(LIBPQXX_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libpqxx+= libpqxx>=2.5.0
-BUILDLINK_RECOMMENDED.libpqxx?= libpqxx>=2.5.4nb1
+BUILDLINK_API_DEPENDS.libpqxx+= libpqxx>=2.5.0
+BUILDLINK_ABI_DEPENDS.libpqxx?= libpqxx>=2.5.4nb1
BUILDLINK_PKGSRCDIR.libpqxx?= ../../databases/libpqxx
.endif # LIBPQXX_BUILDLINK3_MK
diff --git a/databases/metakit-lib/buildlink3.mk b/databases/metakit-lib/buildlink3.mk
index 590d0e23ace..c65f8a90c9e 100644
--- a/databases/metakit-lib/buildlink3.mk
+++ b/databases/metakit-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:21 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:41 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
METAKIT_LIB_BUILDLINK3_MK:= ${METAKIT_LIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmetakit-lib}
BUILDLINK_PACKAGES+= metakit-lib
.if !empty(METAKIT_LIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.metakit-lib+= metakit-lib>=2.4.8
-BUILDLINK_RECOMMENDED.metakit-lib+= metakit-lib>=2.4.9.3nb1
+BUILDLINK_API_DEPENDS.metakit-lib+= metakit-lib>=2.4.8
+BUILDLINK_ABI_DEPENDS.metakit-lib+= metakit-lib>=2.4.9.3nb1
BUILDLINK_PKGSRCDIR.metakit-lib?= ../../databases/metakit-lib
.endif # METAKIT_LIB_BUILDLINK3_MK
diff --git a/databases/mysql4-client/buildlink3.mk b/databases/mysql4-client/buildlink3.mk
index 864b939f727..e3cc260b4a7 100644
--- a/databases/mysql4-client/buildlink3.mk
+++ b/databases/mysql4-client/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/02/05 23:08:32 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2006/04/06 06:21:41 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
MYSQL_CLIENT_BUILDLINK3_MK:= ${MYSQL_CLIENT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmysql-client}
BUILDLINK_PACKAGES+= mysql-client
.if !empty(MYSQL_CLIENT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.mysql-client+= mysql-client>=4.1.7
-BUILDLINK_RECOMMENDED.mysql-client+= mysql-client>=4.1.15nb1
+BUILDLINK_API_DEPENDS.mysql-client+= mysql-client>=4.1.7
+BUILDLINK_ABI_DEPENDS.mysql-client+= mysql-client>=4.1.15nb1
BUILDLINK_PKGSRCDIR.mysql-client?= ../../databases/mysql4-client
BUILDLINK_LIBDIRS.mysql-client?= lib/mysql
BUILDLINK_INCDIRS.mysql-client?= include/mysql
diff --git a/databases/mysql5-client/buildlink3.mk b/databases/mysql5-client/buildlink3.mk
index 75ceffad5ea..99920948420 100644
--- a/databases/mysql5-client/buildlink3.mk
+++ b/databases/mysql5-client/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:08:32 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:41 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
MYSQL_CLIENT_BUILDLINK3_MK:= ${MYSQL_CLIENT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmysql-client}
BUILDLINK_PACKAGES+= mysql-client
.if !empty(MYSQL_CLIENT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.mysql-client+= mysql-client>=5.0.15
-BUILDLINK_RECOMMENDED.mysql-client?= mysql-client>=5.0.18nb1
+BUILDLINK_API_DEPENDS.mysql-client+= mysql-client>=5.0.15
+BUILDLINK_ABI_DEPENDS.mysql-client?= mysql-client>=5.0.18nb1
BUILDLINK_PKGSRCDIR.mysql-client?= ../../databases/mysql5-client
BUILDLINK_LIBDIRS.mysql-client?= lib/mysql
BUILDLINK_INCDIRS.mysql-client?= include/mysql
diff --git a/databases/openldap/buildlink3.mk b/databases/openldap/buildlink3.mk
index b918f81acf4..b3c678d27b3 100644
--- a/databases/openldap/buildlink3.mk
+++ b/databases/openldap/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.22 2006/01/06 15:10:02 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2006/04/06 06:21:41 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OPENLDAP_BUILDLINK3_MK:= ${OPENLDAP_BUILDLINK3_MK}+
@@ -13,7 +13,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nopenldap}
BUILDLINK_PACKAGES+= openldap
.if !empty(OPENLDAP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.openldap+= openldap>=2.3.11nb2
+BUILDLINK_API_DEPENDS.openldap+= openldap>=2.3.11nb2
BUILDLINK_PKGSRCDIR.openldap?= ../../databases/openldap
# Export the deprecated API from the openldap-2.2.x releases.
diff --git a/databases/openldap/options.mk b/databases/openldap/options.mk
index 708bb709c27..a688793fcf9 100644
--- a/databases/openldap/options.mk
+++ b/databases/openldap/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.15 2005/12/29 20:10:23 ghen Exp $
+# $NetBSD: options.mk,v 1.16 2006/04/06 06:21:41 reed Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.openldap
PKG_SUPPORTED_OPTIONS= bdb kerberos sasl slp
@@ -61,7 +61,7 @@ PKG_OPTIONS+= sasl
###
.if !empty(PKG_OPTIONS:Msasl)
CONFIGURE_ARGS+= --with-cyrus-sasl
-BUILDLINK_DEPENDS.cyrus-sasl+= cyrus-sasl>=2.1.15
+BUILDLINK_API_DEPENDS.cyrus-sasl+= cyrus-sasl>=2.1.15
. include "../../security/cyrus-sasl2/buildlink3.mk"
.else
CONFIGURE_ARGS+= --without-cyrus-sasl
diff --git a/databases/p5-DBD-Google/Makefile b/databases/p5-DBD-Google/Makefile
index 8568c9bce68..dfd8a1c9cf2 100644
--- a/databases/p5-DBD-Google/Makefile
+++ b/databases/p5-DBD-Google/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/03/04 21:29:09 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2006/04/06 06:21:41 reed Exp $
#
DISTNAME= DBD-Google-0.11
@@ -14,7 +14,7 @@ DEPENDS+= p5-Net-Google>=0.61:../../net/p5-Net-Google
PERL5_PACKLIST= auto/DBD/Google/.packlist
-BUILDLINK_DEPENDS.p5-DBI?= p5-DBI>=1.39
+BUILDLINK_API_DEPENDS.p5-DBI?= p5-DBI>=1.39
.include "../../databases/p5-DBI/buildlink3.mk"
diff --git a/databases/p5-DBD-mysql/Makefile b/databases/p5-DBD-mysql/Makefile
index 119617121a9..b342be564ee 100644
--- a/databases/p5-DBD-mysql/Makefile
+++ b/databases/p5-DBD-mysql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2006/02/05 23:08:32 joerg Exp $
+# $NetBSD: Makefile,v 1.35 2006/04/06 06:21:41 reed Exp $
#
DISTNAME= DBD-mysql-3.0002
@@ -14,7 +14,7 @@ COMMENT= Perl DBI/DBD driver for MySQL databases
DEPENDS+= p5-Data-ShowTable>=3.3:../../devel/p5-Data-ShowTable
-BUILDLINK_DEPENDS.mysql-client?= mysql-client>=3.23.49nb1
+BUILDLINK_API_DEPENDS.mysql-client?= mysql-client>=3.23.49nb1
PERL5_PACKLIST= auto/DBD/mysql/.packlist
diff --git a/databases/p5-DBI-Shell/Makefile b/databases/p5-DBI-Shell/Makefile
index 0879b4c14c1..35787d91c53 100644
--- a/databases/p5-DBI-Shell/Makefile
+++ b/databases/p5-DBI-Shell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/08/06 06:19:06 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2006/04/06 06:21:41 reed Exp $
#
DISTNAME= DBI-Shell-11.93
@@ -19,7 +19,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
PERL5_PACKLIST= auto/DBI/Shell/.packlist
-BUILDLINK_DEPENDS.p5-DBI+= p5-DBI>=1.37
+BUILDLINK_API_DEPENDS.p5-DBI+= p5-DBI>=1.37
.include "../../databases/p5-DBI/buildlink3.mk"
.include "../../lang/perl5/module.mk"
diff --git a/databases/p5-DBI/buildlink3.mk b/databases/p5-DBI/buildlink3.mk
index 55b2950e722..03f09b2c525 100644
--- a/databases/p5-DBI/buildlink3.mk
+++ b/databases/p5-DBI/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2005/08/06 06:19:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:21:41 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
P5_DBI_BUILDLINK3_MK:= ${P5_DBI_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Np5-DBI}
BUILDLINK_PACKAGES+= p5-DBI
.if !empty(P5_DBI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.p5-DBI+= p5-DBI>=1.48nb1
+BUILDLINK_API_DEPENDS.p5-DBI+= p5-DBI>=1.48nb1
BUILDLINK_PKGSRCDIR.p5-DBI?= ../../databases/p5-DBI
BUILDLINK_INCDIRS.p5-DBI?= ${PERL5_SUB_INSTALLVENDORARCH}/auto/DBI
diff --git a/databases/p5-DBIWrapper/Makefile b/databases/p5-DBIWrapper/Makefile
index 77b737cdaff..db14ea53129 100644
--- a/databases/p5-DBIWrapper/Makefile
+++ b/databases/p5-DBIWrapper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/02/05 23:08:33 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2006/04/06 06:21:42 reed Exp $
#
DISTNAME= libdbiwrapper-perl-${VERSION}
@@ -20,7 +20,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
PERL5_PACKLIST= auto/DBIWrapper/.packlist
-BUILDLINK_DEPENDS.p5-DBI+= p5-DBI>=1.37
+BUILDLINK_API_DEPENDS.p5-DBI+= p5-DBI>=1.37
.include "../../databases/p5-DBI/buildlink3.mk"
.include "../../lang/perl5/module.mk"
diff --git a/databases/php-pdo/buildlink3.mk b/databases/php-pdo/buildlink3.mk
index 2bb6b7799fb..1f7ecb5f931 100644
--- a/databases/php-pdo/buildlink3.mk
+++ b/databases/php-pdo/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:33 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:42 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PHP_PDO_BUILDLINK3_MK:= ${PHP_PDO_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nphp-pdo}
BUILDLINK_PACKAGES+= php-pdo
.if !empty(PHP_PDO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.php-pdo+= php-pdo-5.*
-BUILDLINK_RECOMMENDED.php-pdo?= php-pdo>=5.1.1.1.0.2nb1
+BUILDLINK_API_DEPENDS.php-pdo+= php-pdo-5.*
+BUILDLINK_ABI_DEPENDS.php-pdo?= php-pdo>=5.1.1.1.0.2nb1
BUILDLINK_PKGSRCDIR.php-pdo?= ../../databases/php-pdo
BUILDLINK_INCDIRS.php-pdo?= include/php/ext/pdo
.endif # PHP_PDO_BUILDLINK3_MK
diff --git a/databases/php-pdo_dblib/Makefile b/databases/php-pdo_dblib/Makefile
index c148225c071..6f6e6004c54 100644
--- a/databases/php-pdo_dblib/Makefile
+++ b/databases/php-pdo_dblib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/02/05 23:08:33 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2006/04/06 06:21:42 reed Exp $
PDO_DRIVER= dblib
PDO_COMMENT= FreeTDS/Sybase/MS SQL
@@ -10,7 +10,7 @@ PKGREVISION= 2
CONFIGURE_ARGS+= --with-${PKGMODNAME}=shared,${BUILDLINK_DIR}
# requires 0.63 version to compile, doesn't compile with 0.61
-BUILDLINK_DEPENDS.freetds+= freetds>=0.63
+BUILDLINK_API_DEPENDS.freetds+= freetds>=0.63
.include "../../databases/freetds/buildlink3.mk"
.include "../../databases/php-pdo/buildlink3.mk"
diff --git a/databases/postgresql73-lib/buildlink3.mk b/databases/postgresql73-lib/buildlink3.mk
index 8328331cda2..3a6902daaf5 100644
--- a/databases/postgresql73-lib/buildlink3.mk
+++ b/databases/postgresql73-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:34 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:42 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
POSTGRESQL73_LIB_BUILDLINK3_MK:= ${POSTGRESQL73_LIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npostgresql73-lib}
BUILDLINK_PACKAGES+= postgresql73-lib
.if !empty(POSTGRESQL73_LIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.postgresql73-lib+= postgresql73-lib>=7.3.10
-BUILDLINK_RECOMMENDED.postgresql73-lib?= postgresql73-lib>=7.3.10nb2
+BUILDLINK_API_DEPENDS.postgresql73-lib+= postgresql73-lib>=7.3.10
+BUILDLINK_ABI_DEPENDS.postgresql73-lib?= postgresql73-lib>=7.3.10nb2
BUILDLINK_PKGSRCDIR.postgresql73-lib?= ../../databases/postgresql73-lib
BUILDLINK_INCDIRS.postgresql73-lib?= include/postgresql
BUILDLINK_FILES.postgresql73-lib+= include/pgsql/*
diff --git a/databases/postgresql73/Makefile.common b/databases/postgresql73/Makefile.common
index db8405a4b87..09b1ec54123 100644
--- a/databases/postgresql73/Makefile.common
+++ b/databases/postgresql73/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.16 2006/03/04 21:29:10 jlam Exp $
+# $NetBSD: Makefile.common,v 1.17 2006/04/06 06:21:42 reed Exp $
#
# This Makefile fragment is included by all PostgreSQL packages built from
# the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -36,8 +36,8 @@ PATCHDIR?= ${.CURDIR}/../postgresql73/patches
DIST_VERS?= 7.3.14
BASE_VERS?= ${DIST_VERS}
-BUILDLINK_DEPENDS.postgresql73-lib?= postgresql73-lib>=${BASE_VERS}
-BUILDLINK_DEPENDS.tcl-postgresql73?= tcl-postgresql73>=${BASE_VERS}
+BUILDLINK_API_DEPENDS.postgresql73-lib?= postgresql73-lib>=${BASE_VERS}
+BUILDLINK_API_DEPENDS.tcl-postgresql73?= tcl-postgresql73>=${BASE_VERS}
USE_TOOLS+= autoconf gmake
GNU_CONFIGURE= YES
diff --git a/databases/postgresql74-lib/buildlink3.mk b/databases/postgresql74-lib/buildlink3.mk
index 53ddbf94655..062a638ef18 100644
--- a/databases/postgresql74-lib/buildlink3.mk
+++ b/databases/postgresql74-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:08:35 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:21:42 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
POSTGRESQL74_LIB_BUILDLINK3_MK:= ${POSTGRESQL74_LIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npostgresql74-lib}
BUILDLINK_PACKAGES+= postgresql74-lib
.if !empty(POSTGRESQL74_LIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.postgresql74-lib+= postgresql{74,}-lib>=7.4.0
-BUILDLINK_RECOMMENDED.postgresql74-lib+= postgresql74-lib>=7.4.8nb3
+BUILDLINK_API_DEPENDS.postgresql74-lib+= postgresql{74,}-lib>=7.4.0
+BUILDLINK_ABI_DEPENDS.postgresql74-lib+= postgresql74-lib>=7.4.8nb3
BUILDLINK_PKGSRCDIR.postgresql74-lib?= ../../databases/postgresql74-lib
BUILDLINK_INCDIRS.postgresql74-lib?= include/postgresql
diff --git a/databases/postgresql74/Makefile.common b/databases/postgresql74/Makefile.common
index e47cb2cf2b4..3cc55b334f0 100644
--- a/databases/postgresql74/Makefile.common
+++ b/databases/postgresql74/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.32 2006/03/08 02:29:06 grant Exp $
+# $NetBSD: Makefile.common,v 1.33 2006/04/06 06:21:42 reed Exp $
#
# This Makefile fragment is included by all PostgreSQL packages built from
# the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -38,8 +38,8 @@ PATCHDIR?= ${.CURDIR}/../postgresql74/patches
DIST_VERS?= 7.4.12
BASE_VERS?= ${DIST_VERS}
-BUILDLINK_DEPENDS.postgresql74-lib?= postgresql74-lib>=${BASE_VERS}
-#BUILDLINK_DEPENDS.tcl-postgresql74?= tcl-postgresq74l>=${BASE_VERS}
+BUILDLINK_API_DEPENDS.postgresql74-lib?= postgresql74-lib>=${BASE_VERS}
+#BUILDLINK_API_DEPENDS.tcl-postgresql74?= tcl-postgresq74l>=${BASE_VERS}
GNU_CONFIGURE= yes
BUILD_USES_MSGFMT= yes
diff --git a/databases/postgresql80-client/buildlink3.mk b/databases/postgresql80-client/buildlink3.mk
index 5cd1e78bfdc..b1bec7959df 100644
--- a/databases/postgresql80-client/buildlink3.mk
+++ b/databases/postgresql80-client/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:35 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:42 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
POSTGRESQL80_CLIENT_BUILDLINK3_MK:= ${POSTGRESQL80_CLIENT_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npostgresql80-client}
BUILDLINK_PACKAGES+= postgresql80-client
.if !empty(POSTGRESQL80_CLIENT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.postgresql80-client+= postgresql80-client>=8.0.2
-BUILDLINK_RECOMMENDED.postgresql80-client?= postgresql80-client>=8.0.5nb1
+BUILDLINK_API_DEPENDS.postgresql80-client+= postgresql80-client>=8.0.2
+BUILDLINK_ABI_DEPENDS.postgresql80-client?= postgresql80-client>=8.0.5nb1
BUILDLINK_PKGSRCDIR.postgresql80-client?= ../../databases/postgresql80-client
. if defined(PG_SUBPREFIX) && !empty(PG_SUBPREFIX)
diff --git a/databases/postgresql80/Makefile.common b/databases/postgresql80/Makefile.common
index 4d38794d05d..71535830652 100644
--- a/databases/postgresql80/Makefile.common
+++ b/databases/postgresql80/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.19 2006/03/14 16:23:46 joerg Exp $
+# $NetBSD: Makefile.common,v 1.20 2006/04/06 06:21:42 reed Exp $
#
# This Makefile fragment is included by all PostgreSQL packages built from
# the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -35,7 +35,7 @@ PATCHDIR?= ${.CURDIR}/../postgresql80/patches
DIST_VERS?= 8.0.7
BASE_VERS?= ${DIST_VERS}
-BUILDLINK_DEPENDS.postgresql80-client+= postgresql80-client>=${BASE_VERS}
+BUILDLINK_API_DEPENDS.postgresql80-client+= postgresql80-client>=${BASE_VERS}
GNU_CONFIGURE= yes
BUILD_USES_MSGFMT= yes
diff --git a/databases/postgresql81-client/buildlink3.mk b/databases/postgresql81-client/buildlink3.mk
index dd710dfd693..390e5df56e9 100644
--- a/databases/postgresql81-client/buildlink3.mk
+++ b/databases/postgresql81-client/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/03/21 06:39:33 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:42 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
POSTGRESQL81_CLIENT_BUILDLINK3_MK:= ${POSTGRESQL81_CLIENT_BUILDLINK3_MK}+
@@ -13,7 +13,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npostgresql81-client}
BUILDLINK_PACKAGES+= postgresql81-client
.if !empty(POSTGRESQL81_CLIENT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.postgresql81-client+= postgresql81-client>=8.1.0
+BUILDLINK_API_DEPENDS.postgresql81-client+= postgresql81-client>=8.1.0
BUILDLINK_PKGSRCDIR.postgresql81-client?= ../../databases/postgresql81-client
. if defined(PG_SUBPREFIX) && !empty(PG_SUBPREFIX)
diff --git a/databases/postgresql81/Makefile.common b/databases/postgresql81/Makefile.common
index b2d017e3c8a..ec2df511544 100644
--- a/databases/postgresql81/Makefile.common
+++ b/databases/postgresql81/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2006/03/28 19:48:22 joerg Exp $
+# $NetBSD: Makefile.common,v 1.4 2006/04/06 06:21:42 reed Exp $
#
# This Makefile fragment is included by all PostgreSQL packages built from
# the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -35,7 +35,7 @@ PATCHDIR?= ${.CURDIR}/../postgresql81/patches
DIST_VERS?= 8.1.3
BASE_VERS?= ${DIST_VERS}
-BUILDLINK_DEPENDS.postgresql81-client+= postgresql81-client>=${BASE_VERS}
+BUILDLINK_API_DEPENDS.postgresql81-client+= postgresql81-client>=${BASE_VERS}
GNU_CONFIGURE= yes
BUILD_USES_MSGFMT= yes
diff --git a/databases/py-ZODB/buildlink3.mk b/databases/py-ZODB/buildlink3.mk
index 62d93577e5b..a975c1b8bb7 100644
--- a/databases/py-ZODB/buildlink3.mk
+++ b/databases/py-ZODB/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:08:35 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:42 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_ZODB_BUILDLINK3_MK:= ${PY_ZODB_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NpyZODB}
BUILDLINK_PACKAGES+= pyZODB
.if !empty(PY_ZODB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pyZODB+= ${PYPKGPREFIX}-ZODB>=3.2nb1
-BUILDLINK_RECOMMENDED.pyZODB?= ${PYPKGPREFIX}-ZODB>=3.2.1nb2
+BUILDLINK_API_DEPENDS.pyZODB+= ${PYPKGPREFIX}-ZODB>=3.2nb1
+BUILDLINK_ABI_DEPENDS.pyZODB?= ${PYPKGPREFIX}-ZODB>=3.2.1nb2
BUILDLINK_PKGSRCDIR.pyZODB?= ../../databases/py-ZODB
.endif # PY_ZODB_BUILDLINK3_MK
diff --git a/databases/py-bsddb3/buildlink3.mk b/databases/py-bsddb3/buildlink3.mk
index 1af1027fa7a..0568ea16416 100644
--- a/databases/py-bsddb3/buildlink3.mk
+++ b/databases/py-bsddb3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:35 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:42 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_BSDDB3_BUILDLINK3_MK:= ${PY_BSDDB3_BUILDLINK3_MK}+
@@ -17,8 +17,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npy-bsddb3}
BUILDLINK_PACKAGES+= py-bsddb3
.if !empty(PY_BSDDB3_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.py-bsddb3+= ${PYPKGPREFIX}-bsddb3>=4.3.3nb1
-BUILDLINK_RECOMMENDED.py-bsddb3?= ${PYPKGPREFIX}-bsddb3>=4.3.3nb2
+BUILDLINK_API_DEPENDS.py-bsddb3+= ${PYPKGPREFIX}-bsddb3>=4.3.3nb1
+BUILDLINK_ABI_DEPENDS.py-bsddb3?= ${PYPKGPREFIX}-bsddb3>=4.3.3nb2
BUILDLINK_PKGSRCDIR.py-bsddb3?= ../../databases/py-bsddb3
.endif # PY_BSDDB3_BUILDLINK3_MK
diff --git a/databases/py-ldap/buildlink3.mk b/databases/py-ldap/buildlink3.mk
index 7829c998db9..9054dc25935 100644
--- a/databases/py-ldap/buildlink3.mk
+++ b/databases/py-ldap/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:36 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:42 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_LDAP_BUILDLINK3_MK:= ${PY_LDAP_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npyldap}
BUILDLINK_PACKAGES+= pyldap
.if !empty(PY_LDAP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pyldap+= ${PYPKGPREFIX}-ldap>=2.0.10nb1
-BUILDLINK_RECOMMENDED.pyldap?= ${PYPKGPREFIX}-ldap>=2.0.10nb2
+BUILDLINK_API_DEPENDS.pyldap+= ${PYPKGPREFIX}-ldap>=2.0.10nb1
+BUILDLINK_ABI_DEPENDS.pyldap?= ${PYPKGPREFIX}-ldap>=2.0.10nb2
BUILDLINK_PKGSRCDIR.pyldap?= ../../databases/py-ldap
.endif # PY_LDAP_BUILDLINK3_MK
diff --git a/databases/py-metakit/buildlink3.mk b/databases/py-metakit/buildlink3.mk
index 39f1ee34f98..bffa4ebae08 100644
--- a/databases/py-metakit/buildlink3.mk
+++ b/databases/py-metakit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:08:36 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:42 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_METAKIT_BUILDLINK3_MK:= ${PY_METAKIT_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npymetakit}
BUILDLINK_PACKAGES+= pymetakit
.if !empty(PY_METAKIT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pymetakit+= ${PYPKGPREFIX}-metakit-*
-BUILDLINK_RECOMMENDED.pymetakit?= ${PYPKGPREFIX}-metakit>=2.4.9.3nb2
+BUILDLINK_API_DEPENDS.pymetakit+= ${PYPKGPREFIX}-metakit-*
+BUILDLINK_ABI_DEPENDS.pymetakit?= ${PYPKGPREFIX}-metakit>=2.4.9.3nb2
BUILDLINK_PKGSRCDIR.pymetakit?= ../../databases/py-metakit
.endif # PY_METAKIT_BUILDLINK3_MK
diff --git a/databases/py-mssql/Makefile b/databases/py-mssql/Makefile
index dfd1beff4a6..e7569ee60f9 100644
--- a/databases/py-mssql/Makefile
+++ b/databases/py-mssql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/03/13 12:52:03 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2006/04/06 06:21:42 reed Exp $
#
DISTNAME= pymssql-0.7.4
@@ -10,7 +10,7 @@ MAINTAINER= bartosz@atom.eu.org
HOMEPAGE= http://pymssql.sourceforge.net/
COMMENT= Python interface to MS SQL
-BUILDLINK_DEPENDS.freetds+= freetds>=0.63
+BUILDLINK_API_DEPENDS.freetds+= freetds>=0.63
PYTHON_VERSION_REQD= 24
PYBINMODULE= yes
diff --git a/databases/py-psycopg/buildlink3.mk b/databases/py-psycopg/buildlink3.mk
index 7016a00bc31..af713de3768 100644
--- a/databases/py-psycopg/buildlink3.mk
+++ b/databases/py-psycopg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:36 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:42 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_PSYCOPG_BUILDLINK3_MK:= ${PY_PSYCOPG_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npsycopg}
BUILDLINK_PACKAGES+= psycopg
.if !empty(PY_PSYCOPG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.psycopg+= ${PYPKGPREFIX}-psycopg>=1.1.21
-BUILDLINK_RECOMMENDED.psycopg?= ${PYPKGPREFIX}-psycopg>=1.1.21nb1
+BUILDLINK_API_DEPENDS.psycopg+= ${PYPKGPREFIX}-psycopg>=1.1.21
+BUILDLINK_ABI_DEPENDS.psycopg?= ${PYPKGPREFIX}-psycopg>=1.1.21nb1
BUILDLINK_PKGSRCDIR.psycopg?= ../../databases/py-psycopg
.endif # PY_PSYCOPG_BUILDLINK3_MK
diff --git a/databases/qdbm/buildlink3.mk b/databases/qdbm/buildlink3.mk
index 76ed5e3fac6..0bda52ac75d 100644
--- a/databases/qdbm/buildlink3.mk
+++ b/databases/qdbm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/04/02 20:13:54 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:43 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
QDBM_BUILDLINK3_MK:= ${QDBM_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nqdbm}
BUILDLINK_PACKAGES+= qdbm
.if !empty(QDBM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.qdbm+= qdbm>=1.8.40
+BUILDLINK_API_DEPENDS.qdbm+= qdbm>=1.8.40
BUILDLINK_PKGSRCDIR.qdbm?= ../../databases/qdbm
.endif # QDBM_BUILDLINK3_MK
diff --git a/databases/rrdtool/buildlink3.mk b/databases/rrdtool/buildlink3.mk
index abea63762b6..51ba201c9b2 100644
--- a/databases/rrdtool/buildlink3.mk
+++ b/databases/rrdtool/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/05 23:08:37 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:21:43 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
RRDTOOL_BUILDLINK3_MK:= ${RRDTOOL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nrrdtool}
BUILDLINK_PACKAGES+= rrdtool
.if !empty(RRDTOOL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.rrdtool+= rrdtool>=1.2.9
-BUILDLINK_RECOMMENDED.rrdtool+= rrdtool>=1.2.12nb1
+BUILDLINK_API_DEPENDS.rrdtool+= rrdtool>=1.2.9
+BUILDLINK_ABI_DEPENDS.rrdtool+= rrdtool>=1.2.12nb1
BUILDLINK_PKGSRCDIR.rrdtool?= ../../databases/rrdtool
.endif # RRDTOOL_BUILDLINK3_MK
diff --git a/databases/sdbm/buildlink3.mk b/databases/sdbm/buildlink3.mk
index 0f52e9e091f..bb9133aa370 100644
--- a/databases/sdbm/buildlink3.mk
+++ b/databases/sdbm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2005/04/05 10:24:41 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:43 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SDBM_BUILDLINK3_MK:= ${SDBM_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsdbm}
BUILDLINK_PACKAGES+= sdbm
.if !empty(SDBM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.sdbm+= sdbm>=90.12.1
+BUILDLINK_API_DEPENDS.sdbm+= sdbm>=90.12.1
BUILDLINK_PKGSRCDIR.sdbm?= ../../databases/sdbm
.endif # SDBM_BUILDLINK3_MK
diff --git a/databases/shared-mime-info/buildlink3.mk b/databases/shared-mime-info/buildlink3.mk
index 21eee90402e..c421e833a47 100644
--- a/databases/shared-mime-info/buildlink3.mk
+++ b/databases/shared-mime-info/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:37 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:43 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SHARED_MIME_INFO_BUILDLINK3_MK:= ${SHARED_MIME_INFO_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nshared-mime-info}
BUILDLINK_PACKAGES+= shared-mime-info
.if !empty(SHARED_MIME_INFO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.shared-mime-info+= shared-mime-info>=0.15
-BUILDLINK_RECOMMENDED.shared-mime-info?= shared-mime-info>=0.16nb2
+BUILDLINK_API_DEPENDS.shared-mime-info+= shared-mime-info>=0.15
+BUILDLINK_ABI_DEPENDS.shared-mime-info?= shared-mime-info>=0.16nb2
BUILDLINK_PKGSRCDIR.shared-mime-info?= ../../databases/shared-mime-info
.endif # SHARED_MIME_INFO_BUILDLINK3_MK
diff --git a/databases/sqlite/buildlink3.mk b/databases/sqlite/buildlink3.mk
index 75921a6d0d9..e9d2b8f3710 100644
--- a/databases/sqlite/buildlink3.mk
+++ b/databases/sqlite/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:37 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:43 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SQLITE_BUILDLINK3_MK:= ${SQLITE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsqlite}
BUILDLINK_PACKAGES+= sqlite
.if !empty(SQLITE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.sqlite+= sqlite>=2.8.0
-BUILDLINK_RECOMMENDED.sqlite+= sqlite>=2.8.16nb1
+BUILDLINK_API_DEPENDS.sqlite+= sqlite>=2.8.0
+BUILDLINK_ABI_DEPENDS.sqlite+= sqlite>=2.8.16nb1
BUILDLINK_PKGSRCDIR.sqlite?= ../../databases/sqlite
.endif # SQLITE_BUILDLINK3_MK
diff --git a/databases/sqlite3-tcl/Makefile b/databases/sqlite3-tcl/Makefile
index 47aa723e14e..3b08acaea0c 100644
--- a/databases/sqlite3-tcl/Makefile
+++ b/databases/sqlite3-tcl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/02/15 19:50:52 drochner Exp $
+# $NetBSD: Makefile,v 1.5 2006/04/06 06:21:43 reed Exp $
.include "../../databases/sqlite3/Makefile.common"
@@ -10,7 +10,7 @@ BUILD_TARGET= libtclsqlite3.la
INSTALL_TARGET= tcl_install
TEST_TARGET= test
-BUILDLINK_DEPENDS.sqlite3+= sqlite3>=3.2.7
+BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.2.7
.include "../../databases/sqlite3/buildlink3.mk"
.include "../../lang/tcl/buildlink3.mk"
diff --git a/databases/sqlite3/buildlink3.mk b/databases/sqlite3/buildlink3.mk
index e6796d8d811..5f1b2d8f0f6 100644
--- a/databases/sqlite3/buildlink3.mk
+++ b/databases/sqlite3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:08:37 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:43 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SQLITE3_BUILDLINK3_MK:= ${SQLITE3_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsqlite3}
BUILDLINK_PACKAGES+= sqlite3
.if !empty(SQLITE3_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.sqlite3+= sqlite3>=3.0.8
-BUILDLINK_RECOMMENDED.sqlite3?= sqlite3>=3.2.7nb1
+BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.0.8
+BUILDLINK_ABI_DEPENDS.sqlite3?= sqlite3>=3.2.7nb1
BUILDLINK_PKGSRCDIR.sqlite3?= ../../databases/sqlite3
.endif # SQLITE3_BUILDLINK3_MK
diff --git a/databases/tcl-postgresql73/buildlink3.mk b/databases/tcl-postgresql73/buildlink3.mk
index ceda7a55dbd..42975cc29ed 100644
--- a/databases/tcl-postgresql73/buildlink3.mk
+++ b/databases/tcl-postgresql73/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:38 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:43 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
TCL_POSTGRESQL73_BUILDLINK3_MK:= ${TCL_POSTGRESQL73_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntcl-postgresql73}
BUILDLINK_PACKAGES+= tcl-postgresql73
.if !empty(TCL_POSTGRESQL73_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tcl-postgresql73+= tcl-postgresql73>=7.3.6
-BUILDLINK_RECOMMENDED.tcl-postgresql73?= tcl-postgresql73>=7.3.10nb2
+BUILDLINK_API_DEPENDS.tcl-postgresql73+= tcl-postgresql73>=7.3.6
+BUILDLINK_ABI_DEPENDS.tcl-postgresql73?= tcl-postgresql73>=7.3.10nb2
BUILDLINK_PKGSRCDIR.tcl-postgresql73?= ../../databases/tcl-postgresql73
.endif # TCL_POSTGRESQL73_BUILDLINK3_MK
diff --git a/databases/tcl-postgresql74/buildlink3.mk b/databases/tcl-postgresql74/buildlink3.mk
index 7a3398260da..cdd131d2cab 100644
--- a/databases/tcl-postgresql74/buildlink3.mk
+++ b/databases/tcl-postgresql74/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:08:38 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:43 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
TCL_POSTGRESQL73_BUILDLINK3_MK:= ${TCL_POSTGRESQL73_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntcl-postgresql73}
BUILDLINK_PACKAGES+= tcl-postgresql73
.if !empty(TCL_POSTGRESQL73_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tcl-postgresql73+= tcl-postgresql73>=7.3.6
-BUILDLINK_RECOMMENDED.tcl-postgresql73?= tcl-postgresql74>=7.4.8nb1
+BUILDLINK_API_DEPENDS.tcl-postgresql73+= tcl-postgresql73>=7.3.6
+BUILDLINK_ABI_DEPENDS.tcl-postgresql73?= tcl-postgresql74>=7.4.8nb1
BUILDLINK_PKGSRCDIR.tcl-postgresql73?= ../../databases/tcl-postgresql73
.endif # TCL_POSTGRESQL73_BUILDLINK3_MK
diff --git a/databases/tdb/buildlink3.mk b/databases/tdb/buildlink3.mk
index 5c4fd7299d7..d5701c5c41c 100644
--- a/databases/tdb/buildlink3.mk
+++ b/databases/tdb/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:38 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:43 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
TDB_BUILDLINK3_MK:= ${TDB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntdb}
BUILDLINK_PACKAGES+= tdb
.if !empty(TDB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tdb+= tdb>=1.0.6
-BUILDLINK_RECOMMENDED.tdb+= tdb>=1.0.6nb2
+BUILDLINK_API_DEPENDS.tdb+= tdb>=1.0.6
+BUILDLINK_ABI_DEPENDS.tdb+= tdb>=1.0.6nb2
BUILDLINK_PKGSRCDIR.tdb?= ../../databases/tdb
.endif # TDB_BUILDLINK3_MK
diff --git a/databases/tinycdb/buildlink3.mk b/databases/tinycdb/buildlink3.mk
index 0e45f827b00..cffa7c20b38 100644
--- a/databases/tinycdb/buildlink3.mk
+++ b/databases/tinycdb/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2006/01/19 04:40:36 schmonz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:43 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
TINYCDB_BUILDLINK3_MK:= ${TINYCDB_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntinycdb}
BUILDLINK_PACKAGES+= tinycdb
.if !empty(TINYCDB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tinycdb+= tinycdb>=0.75
+BUILDLINK_API_DEPENDS.tinycdb+= tinycdb>=0.75
BUILDLINK_DEPMETHOD.tinycdb?= build
BUILDLINK_PKGSRCDIR.tinycdb?= ../../databases/tinycdb
.endif # TINYCDB_BUILDLINK3_MK
diff --git a/databases/unixodbc/buildlink3.mk b/databases/unixodbc/buildlink3.mk
index b6f8e0851bd..16bc234a169 100644
--- a/databases/unixodbc/buildlink3.mk
+++ b/databases/unixodbc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/15 11:54:10 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:43 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
UNIXODBC_BUILDLINK3_MK:= ${UNIXODBC_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nunixodbc}
BUILDLINK_PACKAGES+= unixodbc
.if !empty(UNIXODBC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.unixodbc+= unixodbc>=2.0.11nb1
-BUILDLINK_RECOMMENDED.unixodbc+= unixodbc>=2.0.11nb3
+BUILDLINK_API_DEPENDS.unixodbc+= unixodbc>=2.0.11nb1
+BUILDLINK_ABI_DEPENDS.unixodbc+= unixodbc>=2.0.11nb3
BUILDLINK_PKGSRCDIR.unixodbc?= ../../databases/unixodbc
.endif # UNIXODBC_BUILDLINK3_MK
diff --git a/devel/GConf/buildlink3.mk b/devel/GConf/buildlink3.mk
index 796f2fa5eec..68849b11d36 100644
--- a/devel/GConf/buildlink3.mk
+++ b/devel/GConf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:08:38 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:21:43 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GCONF_BUILDLINK3_MK:= ${GCONF_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NGConf}
BUILDLINK_PACKAGES+= GConf
.if !empty(GCONF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.GConf+= GConf>=1.0.9nb7
-BUILDLINK_RECOMMENDED.GConf?= GConf>=1.0.9nb8
+BUILDLINK_API_DEPENDS.GConf+= GConf>=1.0.9nb7
+BUILDLINK_ABI_DEPENDS.GConf?= GConf>=1.0.9nb8
BUILDLINK_PKGSRCDIR.GConf?= ../../devel/GConf
.endif # GCONF_BUILDLINK3_MK
diff --git a/devel/GConf2-ui/Makefile b/devel/GConf2-ui/Makefile
index 3da14a8b159..c7043fd6016 100644
--- a/devel/GConf2-ui/Makefile
+++ b/devel/GConf2-ui/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.25 2006/03/30 20:50:02 jmmv Exp $
+# $NetBSD: Makefile,v 1.26 2006/04/06 06:21:43 reed Exp $
#
.include "../../devel/GConf2/Makefile.common"
PKGNAME= ${DISTNAME:S/GConf/GConf2-ui/}
-BUILDLINK_DEPENDS.GConf2+= GConf2>=${GCONF2_VERSION}
+BUILDLINK_API_DEPENDS.GConf2+= GConf2>=${GCONF2_VERSION}
CONFIGURE_ARGS+= --enable-gtk
diff --git a/devel/GConf2-ui/buildlink3.mk b/devel/GConf2-ui/buildlink3.mk
index d59d9acec03..78afb64d838 100644
--- a/devel/GConf2-ui/buildlink3.mk
+++ b/devel/GConf2-ui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:08:38 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:21:43 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GCONF2_UI_BUILDLINK3_MK:= ${GCONF2_UI_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NGConf2-ui}
BUILDLINK_PACKAGES+= GConf2-ui
.if !empty(GCONF2_UI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.GConf2-ui+= GConf2-ui>=2.8.0.1
-BUILDLINK_RECOMMENDED.GConf2-ui?= GConf2-ui>=2.12.1nb2
+BUILDLINK_API_DEPENDS.GConf2-ui+= GConf2-ui>=2.8.0.1
+BUILDLINK_ABI_DEPENDS.GConf2-ui?= GConf2-ui>=2.12.1nb2
BUILDLINK_PKGSRCDIR.GConf2-ui?= ../../devel/GConf2-ui
.endif # GCONF2_UI_BUILDLINK3_MK
diff --git a/devel/GConf2/Makefile.common b/devel/GConf2/Makefile.common
index b66e2f31f5f..847881ed68c 100644
--- a/devel/GConf2/Makefile.common
+++ b/devel/GConf2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.37 2006/03/30 20:50:02 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.38 2006/04/06 06:21:43 reed Exp $
#
GCONF2_VERSION= 2.14.0
@@ -36,7 +36,7 @@ CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc
CONFIGURE_ARGS+= --disable-gtk-doc
CONFIGURE_ARGS+= --enable-gconf-source=xml::${PKG_SYSCONFDIR}/gconf.xml.defaults
-BUILDLINK_DEPENDS.glib2+= glib2>=2.10.0
+BUILDLINK_API_DEPENDS.glib2+= glib2>=2.10.0
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
diff --git a/devel/GConf2/buildlink3.mk b/devel/GConf2/buildlink3.mk
index c2c2066dfc3..5775f1ae15e 100644
--- a/devel/GConf2/buildlink3.mk
+++ b/devel/GConf2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:08:38 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:21:43 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GCONF2_BUILDLINK3_MK:= ${GCONF2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NGConf2}
BUILDLINK_PACKAGES+= GConf2
.if !empty(GCONF2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.GConf2+= GConf2>=2.8.0.1
-BUILDLINK_RECOMMENDED.GConf2?= GConf2>=2.12.1nb1
+BUILDLINK_API_DEPENDS.GConf2+= GConf2>=2.8.0.1
+BUILDLINK_ABI_DEPENDS.GConf2?= GConf2>=2.12.1nb1
BUILDLINK_PKGSRCDIR.GConf2?= ../../devel/GConf2
.endif # GCONF2_BUILDLINK3_MK
diff --git a/devel/Gorm/Makefile b/devel/Gorm/Makefile
index 0ee6c7c62f7..3aa17dda2f6 100644
--- a/devel/Gorm/Makefile
+++ b/devel/Gorm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/02/05 23:08:38 joerg Exp $
+# $NetBSD: Makefile,v 1.33 2006/04/06 06:21:43 reed Exp $
DISTNAME= Gorm-1.0.4
PKGREVISION= 1
@@ -9,8 +9,8 @@ MAINTAINER= rh@NetBSD.org
HOMEPAGE= http://www.gnustep.org/
COMMENT= Graphical user interface builder for GNUstep
-BUILDLINK_DEPENDS.gnustep-base+= gnustep-base>=1.11.1
-BUILDLINK_DEPENDS.gnustep-gui+= gnustep-gui>=0.10.1
+BUILDLINK_API_DEPENDS.gnustep-base+= gnustep-base>=1.11.1
+BUILDLINK_API_DEPENDS.gnustep-gui+= gnustep-gui>=0.10.1
NO_CONFIGURE= yes
diff --git a/devel/Renaissance/buildlink3.mk b/devel/Renaissance/buildlink3.mk
index 3099d5d48bd..515138f751c 100644
--- a/devel/Renaissance/buildlink3.mk
+++ b/devel/Renaissance/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:39 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:43 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
RENAISSANCE_BUILDLINK3_MK:= ${RENAISSANCE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NRenaissance}
BUILDLINK_PACKAGES+= Renaissance
.if !empty(RENAISSANCE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.Renaissance+= Renaissance>=0.7.0
-BUILDLINK_RECOMMENDED.Renaissance+= Renaissance>=0.8.0nb4
+BUILDLINK_API_DEPENDS.Renaissance+= Renaissance>=0.7.0
+BUILDLINK_ABI_DEPENDS.Renaissance+= Renaissance>=0.8.0nb4
BUILDLINK_PKGSRCDIR.Renaissance?= ../../devel/Renaissance
.endif # RENAISSANCE_BUILDLINK3_MK
diff --git a/devel/SDL/buildlink3.mk b/devel/SDL/buildlink3.mk
index bd678a6a26b..c60c3722f25 100644
--- a/devel/SDL/buildlink3.mk
+++ b/devel/SDL/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/02/05 23:08:39 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2006/04/06 06:21:43 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SDL_BUILDLINK3_MK:= ${SDL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NSDL}
BUILDLINK_PACKAGES+= SDL
.if !empty(SDL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.SDL+= SDL>=1.2.5nb5
-BUILDLINK_RECOMMENDED.SDL+= SDL>=1.2.9nb2
+BUILDLINK_API_DEPENDS.SDL+= SDL>=1.2.5nb5
+BUILDLINK_ABI_DEPENDS.SDL+= SDL>=1.2.9nb2
BUILDLINK_PKGSRCDIR.SDL?= ../../devel/SDL
.endif # SDL_BUILDLINK3_MK
diff --git a/devel/SDL_gfx/buildlink3.mk b/devel/SDL_gfx/buildlink3.mk
index 3d44772b918..d756c0e8669 100644
--- a/devel/SDL_gfx/buildlink3.mk
+++ b/devel/SDL_gfx/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:39 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:44 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SDL_GFX_BUILDLINK3_MK:= ${SDL_GFX_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NSDL_gfx}
BUILDLINK_PACKAGES+= SDL_gfx
.if !empty(SDL_GFX_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.SDL_gfx+= SDL_gfx>=2.0.3nb2
-BUILDLINK_RECOMMENDED.SDL_gfx?= SDL_gfx>=2.0.13nb3
+BUILDLINK_API_DEPENDS.SDL_gfx+= SDL_gfx>=2.0.3nb2
+BUILDLINK_ABI_DEPENDS.SDL_gfx?= SDL_gfx>=2.0.13nb3
BUILDLINK_PKGSRCDIR.SDL_gfx?= ../../devel/SDL_gfx
.endif # SDL_GFX_BUILDLINK3_MK
diff --git a/devel/SDL_ttf/buildlink3.mk b/devel/SDL_ttf/buildlink3.mk
index ddcf61a92fa..ed02fa61096 100644
--- a/devel/SDL_ttf/buildlink3.mk
+++ b/devel/SDL_ttf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/06 23:16:07 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:44 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SDL_TTF_BUILDLINK3_MK:= ${SDL_TTF_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NSDL_ttf}
BUILDLINK_PACKAGES+= SDL_ttf
.if !empty(SDL_TTF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.SDL_ttf+= SDL_ttf>=2.0.3nb3
-BUILDLINK_RECOMMENDED.SDL_ttf?= SDL_ttf>=2.0.7nb3
+BUILDLINK_API_DEPENDS.SDL_ttf+= SDL_ttf>=2.0.3nb3
+BUILDLINK_ABI_DEPENDS.SDL_ttf?= SDL_ttf>=2.0.7nb3
BUILDLINK_PKGSRCDIR.SDL_ttf?= ../../devel/SDL_ttf
.endif # SDL_TTF_BUILDLINK3_MK
diff --git a/devel/SDLmm/buildlink3.mk b/devel/SDLmm/buildlink3.mk
index e2e40fb0a45..153638d5569 100644
--- a/devel/SDLmm/buildlink3.mk
+++ b/devel/SDLmm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:39 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:44 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SDLMM_BUILDLINK3_MK:= ${SDLMM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NSDLmm}
BUILDLINK_PACKAGES+= SDLmm
.if !empty(SDLMM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.SDLmm+= SDLmm>=0.1.8nb1
-BUILDLINK_RECOMMENDED.SDLmm?= SDLmm>=0.1.8nb5
+BUILDLINK_API_DEPENDS.SDLmm+= SDLmm>=0.1.8nb1
+BUILDLINK_ABI_DEPENDS.SDLmm?= SDLmm>=0.1.8nb5
BUILDLINK_PKGSRCDIR.SDLmm?= ../../devel/SDLmm
.endif # SDLMM_BUILDLINK3_MK
diff --git a/devel/allegro/buildlink3.mk b/devel/allegro/buildlink3.mk
index 50939834a6f..5a3d3332d26 100644
--- a/devel/allegro/buildlink3.mk
+++ b/devel/allegro/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:39 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:44 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ALLEGRO_BUILDLINK3_MK:= ${ALLEGRO_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nallegro}
BUILDLINK_PACKAGES+= allegro
.if !empty(ALLEGRO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.allegro+= allegro>=4.1.13
-BUILDLINK_RECOMMENDED.allegro?= allegro>=4.2.0nb1
+BUILDLINK_API_DEPENDS.allegro+= allegro>=4.1.13
+BUILDLINK_ABI_DEPENDS.allegro?= allegro>=4.2.0nb1
BUILDLINK_PKGSRCDIR.allegro?= ../../devel/allegro
.endif # ALLEGRO_BUILDLINK3_MK
diff --git a/devel/apr/buildlink3.mk b/devel/apr/buildlink3.mk
index 36c1d1399b4..1e0b5242506 100644
--- a/devel/apr/buildlink3.mk
+++ b/devel/apr/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2006/02/05 23:08:39 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2006/04/06 06:21:44 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
APR_BUILDLINK3_MK:= ${APR_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Napr}
BUILDLINK_PACKAGES+= apr
.if !empty(APR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.apr+= apr>=0.9.5.2.0.51nb1
-BUILDLINK_RECOMMENDED.apr+= apr>=0.9.7.2.0.55nb2
+BUILDLINK_API_DEPENDS.apr+= apr>=0.9.5.2.0.51nb1
+BUILDLINK_ABI_DEPENDS.apr+= apr>=0.9.7.2.0.55nb2
BUILDLINK_PKGSRCDIR.apr?= ../../devel/apr
WRAPPER_REORDER_CMDS+= reorder:l:aprutil-0:crypt
diff --git a/devel/at-spi/buildlink3.mk b/devel/at-spi/buildlink3.mk
index 73b6e468056..218c1c818df 100644
--- a/devel/at-spi/buildlink3.mk
+++ b/devel/at-spi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/05 23:08:39 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:21:44 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
AT_SPI_BUILDLINK3_MK:= ${AT_SPI_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nat-spi}
BUILDLINK_PACKAGES+= at-spi
.if !empty(AT_SPI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.at-spi+= at-spi>=1.6.0
-BUILDLINK_RECOMMENDED.at-spi+= at-spi>=1.6.6nb2
+BUILDLINK_API_DEPENDS.at-spi+= at-spi>=1.6.0
+BUILDLINK_ABI_DEPENDS.at-spi+= at-spi>=1.6.6nb2
BUILDLINK_PKGSRCDIR.at-spi?= ../../devel/at-spi
.endif # AT_SPI_BUILDLINK3_MK
diff --git a/devel/atk/Makefile b/devel/atk/Makefile
index 0851e42cdc1..5a7a7bd5298 100644
--- a/devel/atk/Makefile
+++ b/devel/atk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2006/04/02 17:47:54 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2006/04/06 06:21:44 reed Exp $
#
DISTNAME= atk-1.11.4
@@ -27,7 +27,7 @@ CONFIGURE_ENV+= F77=${FALSE:Q}
# glib-mkenums overflows a 2048kb stack on atkobject.h
UNLIMIT_RESOURCES= stacksize
-BUILDLINK_DEPENDS.glib2+= glib2>=2.6.3
+BUILDLINK_API_DEPENDS.glib2+= glib2>=2.6.3
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
diff --git a/devel/atk/buildlink3.mk b/devel/atk/buildlink3.mk
index 7159c284ed3..bb9c9647abf 100644
--- a/devel/atk/buildlink3.mk
+++ b/devel/atk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:08:39 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:21:44 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ATK_BUILDLINK3_MK:= ${ATK_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Natk}
BUILDLINK_PACKAGES+= atk
.if !empty(ATK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.atk+= atk>=1.8.0
-BUILDLINK_RECOMMENDED.atk+= atk>=1.10.3nb1
+BUILDLINK_API_DEPENDS.atk+= atk>=1.8.0
+BUILDLINK_ABI_DEPENDS.atk+= atk>=1.10.3nb1
BUILDLINK_PKGSRCDIR.atk?= ../../devel/atk
.endif # ATK_BUILDLINK3_MK
diff --git a/devel/bglibs/buildlink3.mk b/devel/bglibs/buildlink3.mk
index 59c8b09f407..50b35f97bec 100644
--- a/devel/bglibs/buildlink3.mk
+++ b/devel/bglibs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/20 02:59:52 schmonz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:44 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
BGLIBS_BUILDLINK3_MK:= ${BGLIBS_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nbglibs}
BUILDLINK_PACKAGES+= bglibs
.if !empty(BGLIBS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.bglibs+= bglibs>=1.040
+BUILDLINK_API_DEPENDS.bglibs+= bglibs>=1.040
BUILDLINK_PKGSRCDIR.bglibs?= ../../devel/bglibs
BUILDLINK_DEPMETHOD.bglibs?= build
.endif # BGLIBS_BUILDLINK3_MK
diff --git a/devel/binutils/buildlink3.mk b/devel/binutils/buildlink3.mk
index 69211144c9a..a31733bcba8 100644
--- a/devel/binutils/buildlink3.mk
+++ b/devel/binutils/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2004/06/30 16:18:03 shannonjr Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2006/04/06 06:21:44 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
BINUTILS_BUILDLINK3_MK:= ${BINUTILS_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nbinutils}
BUILDLINK_PACKAGES+= binutils
.if !empty(BINUTILS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.binutils+= binutils>=2.15.0
+BUILDLINK_API_DEPENDS.binutils+= binutils>=2.15.0
BUILDLINK_PKGSRCDIR.binutils?= ../../devel/binutils
BUILDLINK_DEPMETHOD.binutils?= build
.endif # BINUTILS_BUILDLINK3_MK
diff --git a/devel/binutils/builtin.mk b/devel/binutils/builtin.mk
index d5c9cbded2c..82926dfc012 100644
--- a/devel/binutils/builtin.mk
+++ b/devel/binutils/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.3 2005/06/01 18:02:43 jlam Exp $
+# $NetBSD: builtin.mk,v 1.4 2006/04/06 06:21:44 reed Exp $
BUILTIN_PKG:= binutils
.include "../../mk/buildlink3/bsd.builtin.mk"
@@ -22,7 +22,7 @@ USE_BUILTIN.binutils= ${IS_BUILTIN.binutils}
. if defined(BUILTIN_PKG.binutils) && \
!empty(IS_BUILTIN.binutils:M[yY][eE][sS])
USE_BUILTIN.binutils= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.binutils}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.binutils}
. if !empty(USE_BUILTIN.binutils:M[yY][eE][sS])
USE_BUILTIN.binutils!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.binutils:Q}; then \
diff --git a/devel/blib/buildlink3.mk b/devel/blib/buildlink3.mk
index 31e5538455c..bedebbde9da 100644
--- a/devel/blib/buildlink3.mk
+++ b/devel/blib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:39 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:45 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
BLIB_BUILDLINK3_MK:= ${BLIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nblib}
BUILDLINK_PACKAGES+= blib
.if !empty(BLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.blib+= blib>=1.0.2nb1
-BUILDLINK_RECOMMENDED.blib+= blib>=1.0.2nb4
+BUILDLINK_API_DEPENDS.blib+= blib>=1.0.2nb1
+BUILDLINK_ABI_DEPENDS.blib+= blib>=1.0.2nb4
BUILDLINK_PKGSRCDIR.blib?= ../../devel/blib
.endif # BLIB_BUILDLINK3_MK
diff --git a/devel/boehm-gc/buildlink3.mk b/devel/boehm-gc/buildlink3.mk
index d04fc592489..b5c1f448046 100644
--- a/devel/boehm-gc/buildlink3.mk
+++ b/devel/boehm-gc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:08:39 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:21:45 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
BOEHM_GC_BUILDLINK3_MK:= ${BOEHM_GC_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nboehm-gc}
BUILDLINK_PACKAGES+= boehm-gc
.if !empty(BOEHM_GC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.boehm-gc+= boehm-gc>=6.3nb1
-BUILDLINK_RECOMMENDED.boehm-gc+= boehm-gc>=6.6nb1
+BUILDLINK_API_DEPENDS.boehm-gc+= boehm-gc>=6.3nb1
+BUILDLINK_ABI_DEPENDS.boehm-gc+= boehm-gc>=6.6nb1
BUILDLINK_PKGSRCDIR.boehm-gc?= ../../devel/boehm-gc
.endif # BOEHM_GC_BUILDLINK3_MK
diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index 2f0baf31872..5505d81d504 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2006/03/04 21:29:12 jlam Exp $
+# $NetBSD: Makefile,v 1.56 2006/04/06 06:21:45 reed Exp $
DISTNAME= bonobo-1.0.22
PKGREVISION= 1
@@ -12,7 +12,7 @@ COMMENT= Architecture for creating reusable software components
BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison
-BUILDLINK_DEPENDS.libxml= libxml>1.8.15
+BUILDLINK_API_DEPENDS.libxml= libxml>1.8.15
BROKEN_GETTEXT_DETECTION= yes
BUILD_USES_MSGFMT= yes
diff --git a/devel/bonobo/buildlink3.mk b/devel/bonobo/buildlink3.mk
index e36bc7b0bac..358ab5e4e2f 100644
--- a/devel/bonobo/buildlink3.mk
+++ b/devel/bonobo/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:40 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:45 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
BONOBO_BUILDLINK3_MK:= ${BONOBO_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nbonobo}
BUILDLINK_PACKAGES+= bonobo
.if !empty(BONOBO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.bonobo+= bonobo>=1.0.18nb7
-BUILDLINK_RECOMMENDED.bonobo+= bonobo>=1.0.22nb1
+BUILDLINK_API_DEPENDS.bonobo+= bonobo>=1.0.18nb7
+BUILDLINK_ABI_DEPENDS.bonobo+= bonobo>=1.0.22nb1
BUILDLINK_PKGSRCDIR.bonobo?= ../../devel/bonobo
.endif # BONOBO_BUILDLINK3_MK
diff --git a/devel/boost-build/buildlink3.mk b/devel/boost-build/buildlink3.mk
index f2c97cda5a2..2901f2a801d 100644
--- a/devel/boost-build/buildlink3.mk
+++ b/devel/boost-build/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2005/09/22 22:06:08 kristerw Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:45 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
BOOST_BUILD_BUILDLINK3_MK:= ${BOOST_BUILD_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nboost-build}
BUILDLINK_PACKAGES+= boost-build
.if !empty(BOOST_BUILD_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.boost-build+= boost-build-1.33.*
+BUILDLINK_API_DEPENDS.boost-build+= boost-build-1.33.*
BUILDLINK_DEPMETHOD.boost-build?= build
BUILDLINK_PKGSRCDIR.boost-build?= ../../devel/boost-build
.endif # BOOST_BUILD_BUILDLINK3_MK
diff --git a/devel/boost-headers/buildlink3.mk b/devel/boost-headers/buildlink3.mk
index 7aa55ee276e..ebc7804af78 100644
--- a/devel/boost-headers/buildlink3.mk
+++ b/devel/boost-headers/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2005/08/12 20:58:45 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:45 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
BOOST_HEADERS_BUILDLINK3_MK:= ${BOOST_HEADERS_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= boost-headers
.if !empty(BOOST_HEADERS_BUILDLINK3_MK:M+)
# Use a dependency pattern that guarantees the proper ABI.
-BUILDLINK_DEPENDS.boost-headers+= boost-headers-1.33.*
+BUILDLINK_API_DEPENDS.boost-headers+= boost-headers-1.33.*
BUILDLINK_DEPMETHOD.boost-headers?= build
BUILDLINK_PKGSRCDIR.boost-headers?= ../../devel/boost-headers
.endif # BOOST_HEADERS_BUILDLINK3_MK
diff --git a/devel/boost-libs/buildlink3.mk b/devel/boost-libs/buildlink3.mk
index 4c4463fc7b4..4498ce08452 100644
--- a/devel/boost-libs/buildlink3.mk
+++ b/devel/boost-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2005/08/12 20:58:45 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:45 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
BOOST_LIBS_BUILDLINK3_MK:= ${BOOST_LIBS_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= boost-libs
.if !empty(BOOST_LIBS_BUILDLINK3_MK:M+)
# Use a dependency pattern that guarantees the proper ABI.
-BUILDLINK_DEPENDS.boost-libs+= boost-libs-1.33.*
+BUILDLINK_API_DEPENDS.boost-libs+= boost-libs-1.33.*
BUILDLINK_PKGSRCDIR.boost-libs?= ../../devel/boost-libs
.endif # BOOST_LIBS_BUILDLINK3_MK
diff --git a/devel/boost-python/buildlink3.mk b/devel/boost-python/buildlink3.mk
index 073192f25af..54415039318 100644
--- a/devel/boost-python/buildlink3.mk
+++ b/devel/boost-python/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:08:40 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:21:45 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
BOOST_PYTHON_BUILDLINK3_MK:= ${BOOST_PYTHON_BUILDLINK3_MK}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES+= boost-python
.if !empty(BOOST_PYTHON_BUILDLINK3_MK:M+)
# Use a dependency pattern that guarantees the proper ABI.
-BUILDLINK_DEPENDS.boost-python+= boost-python-1.33.*
-BUILDLINK_RECOMMENDED.boost-python?= boost-python>=1.33.1nb1
+BUILDLINK_API_DEPENDS.boost-python+= boost-python-1.33.*
+BUILDLINK_ABI_DEPENDS.boost-python?= boost-python>=1.33.1nb1
BUILDLINK_PKGSRCDIR.boost-python?= ../../devel/boost-python
.include "../../devel/boost-headers/buildlink3.mk"
diff --git a/devel/buddy/buildlink3.mk b/devel/buddy/buildlink3.mk
index cfb22608912..c68147893c2 100644
--- a/devel/buddy/buildlink3.mk
+++ b/devel/buddy/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/03/14 20:23:07 kristerw Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:46 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
BUDDY_BUILDLINK3_MK:= ${BUDDY_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nbuddy}
BUILDLINK_PACKAGES+= buddy
.if !empty(BUDDY_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.buddy+= buddy>=2.4
+BUILDLINK_API_DEPENDS.buddy+= buddy>=2.4
BUILDLINK_PKGSRCDIR.buddy?= ../../devel/buddy
.endif # BUDDY_BUILDLINK3_MK
diff --git a/devel/buildtool/buildlink3.mk b/devel/buildtool/buildlink3.mk
index 3be21ffb927..e4b4e89358e 100644
--- a/devel/buildtool/buildlink3.mk
+++ b/devel/buildtool/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2005/12/05 23:55:05 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:21:46 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
BUILDTOOL_BUILDLINK3_MK:= ${BUILDTOOL_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nbuildtool}
BUILDLINK_PACKAGES+= buildtool
.if !empty(BUILDTOOL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.buildtool+= buildtool>=0.16
+BUILDLINK_API_DEPENDS.buildtool+= buildtool>=0.16
BUILDLINK_PKGSRCDIR.buildtool?= ../../devel/buildtool
BUILDLINK_DEPMETHOD.buildtool?= build
diff --git a/devel/cdk/buildlink3.mk b/devel/cdk/buildlink3.mk
index a30c40af5f4..6f70e3d7f29 100644
--- a/devel/cdk/buildlink3.mk
+++ b/devel/cdk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:25 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:47 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
CDK_BUILDLINK3_MK:= ${CDK_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncdk}
BUILDLINK_PACKAGES+= cdk
.if !empty(CDK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.cdk+= cdk>=4.9.9nb1
-BUILDLINK_RECOMMENDED.cdk+= cdk>=4.9.9nb2
+BUILDLINK_API_DEPENDS.cdk+= cdk>=4.9.9nb1
+BUILDLINK_ABI_DEPENDS.cdk+= cdk>=4.9.9nb2
BUILDLINK_PKGSRCDIR.cdk?= ../../devel/cdk
.endif # CDK_BUILDLINK3_MK
diff --git a/devel/cdk/builtin.mk b/devel/cdk/builtin.mk
index 372d0a1e650..145e3e7bd53 100644
--- a/devel/cdk/builtin.mk
+++ b/devel/cdk/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.3 2006/03/30 18:06:17 jlam Exp $
+# $NetBSD: builtin.mk,v 1.4 2006/04/06 06:21:47 reed Exp $
BUILTIN_PKG:= cdk
@@ -31,7 +31,7 @@ USE_BUILTIN.cdk= ${IS_BUILTIN.cdk}
. if defined(BUILTIN_PKG.cdk) && \
!empty(IS_BUILTIN.cdk:M[yY][eE][sS])
USE_BUILTIN.cdk= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.cdk}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.cdk}
. if !empty(USE_BUILTIN.cdk:M[yY][eE][sS])
USE_BUILTIN.cdk!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.cdk:Q}; then \
diff --git a/devel/chmlib/buildlink3.mk b/devel/chmlib/buildlink3.mk
index 1ca7f62d0d1..0712a9f93af 100644
--- a/devel/chmlib/buildlink3.mk
+++ b/devel/chmlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:08:40 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:47 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
CHMLIB_BUILDLINK3_MK:= ${CHMLIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nchmlib}
BUILDLINK_PACKAGES+= chmlib
.if !empty(CHMLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.chmlib+= chmlib>=0.31
-BUILDLINK_RECOMMENDED.chmlib+= chmlib>=0.37.4nb2
+BUILDLINK_API_DEPENDS.chmlib+= chmlib>=0.31
+BUILDLINK_ABI_DEPENDS.chmlib+= chmlib>=0.37.4nb2
BUILDLINK_PKGSRCDIR.chmlib?= ../../devel/chmlib
.endif # CHMLIB_BUILDLINK3_MK
diff --git a/devel/cmake/buildlink3.mk b/devel/cmake/buildlink3.mk
index 6fb42767a26..1bfdc6ad7d1 100644
--- a/devel/cmake/buildlink3.mk
+++ b/devel/cmake/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:08:40 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:47 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
CMAKE_BUILDLINK3_MK:= ${CMAKE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncmake}
BUILDLINK_PACKAGES+= cmake
.if !empty(CMAKE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.cmake+= cmake>=2.0.2
-BUILDLINK_RECOMMENDED.cmake?= cmake>=2.0.5nb2
+BUILDLINK_API_DEPENDS.cmake+= cmake>=2.0.2
+BUILDLINK_ABI_DEPENDS.cmake?= cmake>=2.0.5nb2
BUILDLINK_PKGSRCDIR.cmake?= ../../devel/cmake
BUILDLINK_DEPMETHOD.cmake?= build
.endif # CMAKE_BUILDLINK3_MK
diff --git a/devel/cppunit/buildlink3.mk b/devel/cppunit/buildlink3.mk
index a513e6942fa..cdcecab8a47 100644
--- a/devel/cppunit/buildlink3.mk
+++ b/devel/cppunit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:40 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:47 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
CPPUNIT_BUILDLINK3_MK:= ${CPPUNIT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncppunit}
BUILDLINK_PACKAGES+= cppunit
.if !empty(CPPUNIT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.cppunit+= cppunit>=1.10.2
-BUILDLINK_RECOMMENDED.cppunit?= cppunit>=1.10.2nb5
+BUILDLINK_API_DEPENDS.cppunit+= cppunit>=1.10.2
+BUILDLINK_ABI_DEPENDS.cppunit?= cppunit>=1.10.2nb5
BUILDLINK_PKGSRCDIR.cppunit?= ../../devel/cppunit
BUILDLINK_CPPFLAGS.cppunit+= -I${BUILDLINK_PREFIX.cppunit}/include/cppunit
.endif # CPPUNIT_BUILDLINK3_MK
diff --git a/devel/darts/buildlink3.mk b/devel/darts/buildlink3.mk
index dfd9b4129c7..363737ded91 100644
--- a/devel/darts/buildlink3.mk
+++ b/devel/darts/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/05/08 21:34:43 kristerw Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:47 reed Exp $
BUILDLINK_DEPMETHOD.darts?= build
@@ -13,7 +13,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndarts}
BUILDLINK_PACKAGES+= darts
.if !empty(DARTS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.darts+= darts>=0.2
+BUILDLINK_API_DEPENDS.darts+= darts>=0.2
BUILDLINK_PKGSRCDIR.darts?= ../../devel/darts
.endif # DARTS_BUILDLINK3_MK
diff --git a/devel/devIL/buildlink3.mk b/devel/devIL/buildlink3.mk
index c73c57f2074..cf9e206d7af 100644
--- a/devel/devIL/buildlink3.mk
+++ b/devel/devIL/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:08:41 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:21:48 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
DEVIL_BUILDLINK3_MK:= ${DEVIL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NdevIL}
BUILDLINK_PACKAGES+= devIL
.if !empty(DEVIL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.devIL+= devIL>=1.6.6nb1
-BUILDLINK_RECOMMENDED.devIL+= devIL>=1.6.6nb6
+BUILDLINK_API_DEPENDS.devIL+= devIL>=1.6.6nb1
+BUILDLINK_ABI_DEPENDS.devIL+= devIL>=1.6.6nb6
BUILDLINK_PKGSRCDIR.devIL?= ../../devel/devIL
.endif # DEVIL_BUILDLINK3_MK
diff --git a/devel/dlcompat/buildlink3.mk b/devel/dlcompat/buildlink3.mk
index 653b550f9f4..9cc91428df4 100644
--- a/devel/dlcompat/buildlink3.mk
+++ b/devel/dlcompat/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2004/11/26 09:39:30 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:21:48 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
DLCOMPAT_BUILDLINK3_MK:= ${DLCOMPAT_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndlcompat}
BUILDLINK_PACKAGES+= dlcompat
.if !empty(DLCOMPAT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.dlcompat+= dlcompat>=20030629
+BUILDLINK_API_DEPENDS.dlcompat+= dlcompat>=20030629
BUILDLINK_PKGSRCDIR.dlcompat?= ../../devel/dlcompat
.endif # DLCOMPAT_BUILDLINK3_MK
diff --git a/devel/dlcompat/builtin.mk b/devel/dlcompat/builtin.mk
index b158e625103..5e8dceff9f3 100644
--- a/devel/dlcompat/builtin.mk
+++ b/devel/dlcompat/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.8 2006/03/30 18:06:17 jlam Exp $
+# $NetBSD: builtin.mk,v 1.9 2006/04/06 06:21:48 reed Exp $
BUILTIN_PKG:= dlcompat
@@ -46,7 +46,7 @@ USE_BUILTIN.dlcompat= ${IS_BUILTIN.dlcompat}
. if defined(BUILTIN_PKG.dlcompat) && \
!empty(IS_BUILTIN.dlcompat:M[yY][eE][sS])
USE_BUILTIN.dlcompat= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.dlcompat}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.dlcompat}
. if !empty(USE_BUILTIN.dlcompat:M[yY][eE][sS])
USE_BUILTIN.dlcompat!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.dlcompat:Q}; then \
diff --git a/devel/dmalloc/buildlink3.mk b/devel/dmalloc/buildlink3.mk
index 3891135fe73..0e2d136d12a 100644
--- a/devel/dmalloc/buildlink3.mk
+++ b/devel/dmalloc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/04/27 03:09:58 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:48 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
DMALLOC_BUILDLINK3_MK:= ${DMALLOC_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndmalloc}
BUILDLINK_PACKAGES+= dmalloc
.if !empty(DMALLOC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.dmalloc+= dmalloc>=4.8.2nb2
+BUILDLINK_API_DEPENDS.dmalloc+= dmalloc>=4.8.2nb2
BUILDLINK_PKGSRCDIR.dmalloc?= ../../devel/dmalloc
BUILDLINK_DEPMETHOD.dmalloc?= build
.endif # DMALLOC_BUILDLINK3_MK
diff --git a/devel/edcommon/buildlink3.mk b/devel/edcommon/buildlink3.mk
index 64306175855..948251d11cb 100644
--- a/devel/edcommon/buildlink3.mk
+++ b/devel/edcommon/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:41 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:48 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
EDCOMMON_BUILDLINK3_MK:= ${EDCOMMON_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nedcommon}
BUILDLINK_PACKAGES+= edcommon
.if !empty(EDCOMMON_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.edcommon+= edcommon>=32
-BUILDLINK_RECOMMENDED.edcommon?= edcommon>=32nb2
+BUILDLINK_API_DEPENDS.edcommon+= edcommon>=32
+BUILDLINK_ABI_DEPENDS.edcommon?= edcommon>=32nb2
BUILDLINK_PKGSRCDIR.edcommon?= ../../devel/edcommon
.endif # EDCOMMON_BUILDLINK3_MK
diff --git a/devel/eel2/buildlink3.mk b/devel/eel2/buildlink3.mk
index 60d63e84764..5769a6d57b2 100644
--- a/devel/eel2/buildlink3.mk
+++ b/devel/eel2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/02/05 23:08:41 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/04/06 06:21:48 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
EEL2_BUILDLINK3_MK:= ${EEL2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Neel2}
BUILDLINK_PACKAGES+= eel2
.if !empty(EEL2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.eel2+= eel2>=2.10.0
-BUILDLINK_RECOMMENDED.eel2?= eel2>=2.12.2nb2
+BUILDLINK_API_DEPENDS.eel2+= eel2>=2.10.0
+BUILDLINK_ABI_DEPENDS.eel2?= eel2>=2.12.2nb2
BUILDLINK_PKGSRCDIR.eel2?= ../../devel/eel2
.endif # EEL2_BUILDLINK3_MK
diff --git a/devel/eet/buildlink3.mk b/devel/eet/buildlink3.mk
index 59ade78b2b9..2b7f708bacf 100644
--- a/devel/eet/buildlink3.mk
+++ b/devel/eet/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/15 11:31:48 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:48 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
EET_BUILDLINK3_MK:= ${EET_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Neet}
BUILDLINK_PACKAGES+= eet
.if !empty(EET_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.eet+= eet>=0.9.9
+BUILDLINK_API_DEPENDS.eet+= eet>=0.9.9
BUILDLINK_PKGSRCDIR.eet?= ../../devel/eet
.endif # EET_BUILDLINK3_MK
diff --git a/devel/ffcall/buildlink3.mk b/devel/ffcall/buildlink3.mk
index adc16c2d067..df04c7743c8 100644
--- a/devel/ffcall/buildlink3.mk
+++ b/devel/ffcall/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:13:26 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:48 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
FFCALL_BUILDLINK3_MK:= ${FFCALL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nffcall}
BUILDLINK_PACKAGES+= ffcall
.if !empty(FFCALL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ffcall+= ffcall>=1.9
-BUILDLINK_RECOMMENDED.ffcall+= ffcall>=1.10nb1
+BUILDLINK_API_DEPENDS.ffcall+= ffcall>=1.9
+BUILDLINK_ABI_DEPENDS.ffcall+= ffcall>=1.10nb1
BUILDLINK_PKGSRCDIR.ffcall?= ../../devel/ffcall
.endif # FFCALL_BUILDLINK3_MK
diff --git a/devel/flex/buildlink3.mk b/devel/flex/buildlink3.mk
index 12eac561bb8..72aec4aece4 100644
--- a/devel/flex/buildlink3.mk
+++ b/devel/flex/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/04/27 21:00:14 dmcmahill Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:48 reed Exp $
#
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nflex}
BUILDLINK_PACKAGES+= flex
.if !empty(FLEX_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.flex+= flex>=2.5.4a
+BUILDLINK_API_DEPENDS.flex+= flex>=2.5.4a
BUILDLINK_PKGSRCDIR.flex?= ../../devel/flex
BUILDLINK_DEPMETHOD.flex?= build
.endif # FLEX_BUILDLINK3_MK
diff --git a/devel/florist/buildlink3.mk b/devel/florist/buildlink3.mk
index 33ab7db7d67..2aabd8cf8f8 100644
--- a/devel/florist/buildlink3.mk
+++ b/devel/florist/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:42 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:48 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
FLORIST_BUILDLINK3_MK:= ${FLORIST_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nflorist}
BUILDLINK_PACKAGES+= florist
.if !empty(FLORIST_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.florist+= florist>=3.15p
-BUILDLINK_RECOMMENDED.florist?= florist>=3.15pnb2
+BUILDLINK_API_DEPENDS.florist+= florist>=3.15p
+BUILDLINK_ABI_DEPENDS.florist?= florist>=3.15pnb2
BUILDLINK_PKGSRCDIR.florist?= ../../devel/florist
.endif # FLORIST_BUILDLINK3_MK
diff --git a/devel/g-wrap/buildlink3.mk b/devel/g-wrap/buildlink3.mk
index 5b1fc7be53d..ffd4f125d90 100644
--- a/devel/g-wrap/buildlink3.mk
+++ b/devel/g-wrap/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:08:42 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:21:48 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
G_WRAP_BUILDLINK3_MK:= ${G_WRAP_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ng-wrap}
BUILDLINK_PACKAGES+= g-wrap
.if !empty(G_WRAP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.g-wrap+= g-wrap>=1.9.5
-BUILDLINK_RECOMMENDED.g-wrap?= g-wrap>=1.9.6nb1
+BUILDLINK_API_DEPENDS.g-wrap+= g-wrap>=1.9.5
+BUILDLINK_ABI_DEPENDS.g-wrap?= g-wrap>=1.9.6nb1
BUILDLINK_PKGSRCDIR.g-wrap?= ../../devel/g-wrap
.endif # G_WRAP_BUILDLINK3_MK
diff --git a/devel/g-wrap1/buildlink3.mk b/devel/g-wrap1/buildlink3.mk
index 3f2acd7bf7a..41ce07e7f6f 100644
--- a/devel/g-wrap1/buildlink3.mk
+++ b/devel/g-wrap1/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:42 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:48 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
G_WRAP_BUILDLINK3_MK:= ${G_WRAP_BUILDLINK3_MK}+
@@ -11,9 +11,9 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ng-wrap}
BUILDLINK_PACKAGES+= g-wrap
.if !empty(G_WRAP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.g-wrap+= g-wrap>=1.3.4nb6
-BUILDLINK_DEPENDS.g-wrap+= g-wrap<1.4
-BUILDLINK_RECOMMENDED.g-wrap?= g-wrap>=1.3.4nb7
+BUILDLINK_API_DEPENDS.g-wrap+= g-wrap>=1.3.4nb6
+BUILDLINK_API_DEPENDS.g-wrap+= g-wrap<1.4
+BUILDLINK_ABI_DEPENDS.g-wrap?= g-wrap>=1.3.4nb7
BUILDLINK_PKGSRCDIR.g-wrap?= ../../devel/g-wrap1
.endif # G_WRAP_BUILDLINK3_MK
diff --git a/devel/gail/buildlink3.mk b/devel/gail/buildlink3.mk
index 814bab0cdef..2cfc055c6db 100644
--- a/devel/gail/buildlink3.mk
+++ b/devel/gail/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:08:42 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:21:48 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GAIL_BUILDLINK3_MK:= ${GAIL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngail}
BUILDLINK_PACKAGES+= gail
.if !empty(GAIL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gail+= gail>=1.8.0
-BUILDLINK_RECOMMENDED.gail+= gail>=1.8.8nb2
+BUILDLINK_API_DEPENDS.gail+= gail>=1.8.0
+BUILDLINK_ABI_DEPENDS.gail+= gail>=1.8.8nb2
BUILDLINK_PKGSRCDIR.gail?= ../../devel/gail
.endif # GAIL_BUILDLINK3_MK
diff --git a/devel/gal/buildlink3.mk b/devel/gal/buildlink3.mk
index aeb594fce90..42b1e1845ce 100644
--- a/devel/gal/buildlink3.mk
+++ b/devel/gal/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:08:42 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:48 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GAL_BUILDLINK3_MK:= ${GAL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngal}
BUILDLINK_PACKAGES+= gal
.if !empty(GAL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gal+= gal>=0.22nb6
-BUILDLINK_RECOMMENDED.gal?= gal>=0.24nb2
+BUILDLINK_API_DEPENDS.gal+= gal>=0.22nb6
+BUILDLINK_ABI_DEPENDS.gal?= gal>=0.24nb2
BUILDLINK_PKGSRCDIR.gal?= ../../devel/gal
.endif # GAL_BUILDLINK3_MK
diff --git a/devel/gconfmm/buildlink3.mk b/devel/gconfmm/buildlink3.mk
index 091ce59f25a..dc814f10f58 100644
--- a/devel/gconfmm/buildlink3.mk
+++ b/devel/gconfmm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:08:42 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:48 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GCONFMM_BUILDLINK3_MK:= ${GCONFMM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngconfmm}
BUILDLINK_PACKAGES+= gconfmm
.if !empty(GCONFMM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gconfmm+= gconfmm>=2.10.0
-BUILDLINK_RECOMMENDED.gconfmm?= gconfmm>=2.12.0nb2
+BUILDLINK_API_DEPENDS.gconfmm+= gconfmm>=2.10.0
+BUILDLINK_ABI_DEPENDS.gconfmm?= gconfmm>=2.12.0nb2
BUILDLINK_PKGSRCDIR.gconfmm?= ../../devel/gconfmm
.endif # GCONFMM_BUILDLINK3_MK
diff --git a/devel/gdbada/buildlink3.mk b/devel/gdbada/buildlink3.mk
index 3dafc3b91d3..3d135ac1c98 100644
--- a/devel/gdbada/buildlink3.mk
+++ b/devel/gdbada/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:42 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:48 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GDBADA_BUILDLINK3_MK:= ${GDBADA_BUILDLINK3_MK}+
@@ -9,8 +9,8 @@ BUILDLINK_DEPENDS+= gdbada
.if !empty(GDBADA_BUILDLINK3_MK:M+)
BUILDLINK_PACKAGES+= gdbada
-BUILDLINK_DEPENDS.gdbada+= gdbada>=5.3
-BUILDLINK_RECOMMENDED.gdbada+= gdbada>=6.3nb1
+BUILDLINK_API_DEPENDS.gdbada+= gdbada>=5.3
+BUILDLINK_ABI_DEPENDS.gdbada+= gdbada>=6.3nb1
BUILDLINK_PKGSRCDIR.gdbada?= ../../devel/gdbada
.include "../../mk/pthread.buildlink3.mk"
diff --git a/devel/gettext-asprintf/buildlink3.mk b/devel/gettext-asprintf/buildlink3.mk
index 09f3e92aa2b..f1d21e8ae9c 100644
--- a/devel/gettext-asprintf/buildlink3.mk
+++ b/devel/gettext-asprintf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2006/02/04 18:03:57 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:49 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GETTEXT_ASPRINTF_BUILDLINK3_MK:= ${GETTEXT_ASPRINTF_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngettext-asprintf}
BUILDLINK_PACKAGES+= gettext-asprintf
.if !empty(GETTEXT_ASPRINTF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gettext-asprintf+= gettext-asprintf>=0.14.5
+BUILDLINK_API_DEPENDS.gettext-asprintf+= gettext-asprintf>=0.14.5
BUILDLINK_PKGSRCDIR.gettext-asprintf?= ../../devel/gettext-asprintf
.endif # GETTEXT_ASPRINTF_BUILDLINK3_MK
diff --git a/devel/gettext-lib/buildlink3.mk b/devel/gettext-lib/buildlink3.mk
index d4f037aafd3..ba4c45fbe9e 100644
--- a/devel/gettext-lib/buildlink3.mk
+++ b/devel/gettext-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.24 2006/02/05 22:45:54 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2006/04/06 06:21:49 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GETTEXT_BUILDLINK3_MK:= ${GETTEXT_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngettext}
BUILDLINK_PACKAGES+= gettext
.if !empty(GETTEXT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gettext+= gettext-lib>=0.14.5
+BUILDLINK_API_DEPENDS.gettext+= gettext-lib>=0.14.5
BUILDLINK_PKGSRCDIR.gettext?= ../../devel/gettext-lib
.endif # GETTEXT_BUILDLINK3_MK
diff --git a/devel/gettext-lib/builtin.mk b/devel/gettext-lib/builtin.mk
index 3e84044b1fb..8503d268d27 100644
--- a/devel/gettext-lib/builtin.mk
+++ b/devel/gettext-lib/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.30 2006/03/30 18:38:19 jlam Exp $
+# $NetBSD: builtin.mk,v 1.31 2006/04/06 06:21:49 reed Exp $
BUILTIN_PKG:= gettext
@@ -49,7 +49,7 @@ USE_BUILTIN.gettext= ${IS_BUILTIN.gettext}
. if defined(BUILTIN_PKG.gettext) && \
!empty(IS_BUILTIN.gettext:M[yY][eE][sS])
USE_BUILTIN.gettext= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.gettext}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.gettext}
. if !empty(USE_BUILTIN.gettext:M[yY][eE][sS])
USE_BUILTIN.gettext!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.gettext:Q}; then \
@@ -143,7 +143,7 @@ _BLTN_LIBINTL= -lintl
_BLTN_GETTEXT_ICONV_DEPENDS= gettext-lib>=0.11.5nb1
. if !defined(_BLTN_GETTEXT_NEEDS_ICONV)
_BLTN_GETTEXT_NEEDS_ICONV?= no
-. for _dep_ in ${BUILDLINK_DEPENDS.gettext}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.gettext}
. if !empty(_BLTN_GETTEXT_NEEDS_ICONV:M[nN][oO])
_BLTN_GETTEXT_NEEDS_ICONV!= \
pkg=`${PKG_BEST_EXISTS} ${_dep_:Q}`; \
@@ -165,7 +165,7 @@ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
. sinclude "../../converters/libiconv/${_mkfile_}"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
. endfor
-BUILDLINK_DEPENDS.gettext+= ${_BLTN_GETTEXT_ICONV_DEPENDS}
+BUILDLINK_API_DEPENDS.gettext+= ${_BLTN_GETTEXT_ICONV_DEPENDS}
_BLTN_LIBINTL+= ${BUILDLINK_LDADD.iconv}
. endif
. endif
diff --git a/devel/gettext-tools/Makefile b/devel/gettext-tools/Makefile
index a5c392f598d..7fc95b32fc0 100644
--- a/devel/gettext-tools/Makefile
+++ b/devel/gettext-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/03/30 03:44:42 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2006/04/06 06:21:49 reed Exp $
DISTNAME= gettext-0.14.5
PKGNAME= gettext-tools-0.14.5
@@ -9,7 +9,7 @@ MAINTAINER= joerg@NetBSD.org
HOMEPAGE= http://www.gnu.org/software/gettext/gettext.html
COMMENT= Tools for providing messages in different languages
-BUILDLINK_DEPENDS.gettext+= gettext-lib>=0.14.5
+BUILDLINK_API_DEPENDS.gettext+= gettext-lib>=0.14.5
CONFLICTS= gettext<0.14.5
USE_PKGLOCALEDIR= yes
diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile
index 24d4a27e680..83b90664838 100644
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2006/02/20 14:04:45 joerg Exp $
+# $NetBSD: Makefile,v 1.72 2006/04/06 06:21:49 reed Exp $
DISTNAME= gettext-0.14.5
CATEGORIES= devel
@@ -10,7 +10,7 @@ COMMENT= Tools for providing messages in different languages
DEPENDS+= gettext-m4-0.14.5:../../devel/gettext-m4
DEPENDS+= gettext-tools-0.14.5:../../devel/gettext-tools
-BUILDLINK_DEPENDS.gettext+= gettext-lib>=0.14.5
+BUILDLINK_API_DEPENDS.gettext+= gettext-lib>=0.14.5
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
diff --git a/devel/giblib/buildlink3.mk b/devel/giblib/buildlink3.mk
index a7256047a0b..94e47b664e1 100644
--- a/devel/giblib/buildlink3.mk
+++ b/devel/giblib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:08:42 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:49 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GIBLIB_BUILDLINK3_MK:= ${GIBLIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngiblib}
BUILDLINK_PACKAGES+= giblib
.if !empty(GIBLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.giblib+= giblib>=1.2.3nb3
-BUILDLINK_RECOMMENDED.giblib+= giblib>=1.2.4nb3
+BUILDLINK_API_DEPENDS.giblib+= giblib>=1.2.3nb3
+BUILDLINK_ABI_DEPENDS.giblib+= giblib>=1.2.4nb3
BUILDLINK_PKGSRCDIR.giblib?= ../../devel/giblib
.endif # GIBLIB_BUILDLINK3_MK
diff --git a/devel/glib/buildlink3.mk b/devel/glib/buildlink3.mk
index 5a475e394a2..b03d0afe291 100644
--- a/devel/glib/buildlink3.mk
+++ b/devel/glib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2004/10/03 00:13:27 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:21:49 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GLIB_BUILDLINK3_MK:= ${GLIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nglib}
BUILDLINK_PACKAGES+= glib
.if !empty(GLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.glib+= glib>=1.2.10nb5
-BUILDLINK_RECOMMENDED.glib+= glib>=1.2.10nb7
+BUILDLINK_API_DEPENDS.glib+= glib>=1.2.10nb5
+BUILDLINK_ABI_DEPENDS.glib+= glib>=1.2.10nb7
BUILDLINK_PKGSRCDIR.glib?= ../../devel/glib
.endif # GLIB_BUILDLINK3_MK
diff --git a/devel/glib2/buildlink3.mk b/devel/glib2/buildlink3.mk
index 6e059e1c30d..d2f40601b58 100644
--- a/devel/glib2/buildlink3.mk
+++ b/devel/glib2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/05 23:08:42 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:21:49 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GLIB2_BUILDLINK3_MK:= ${GLIB2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nglib2}
BUILDLINK_PACKAGES+= glib2
.if !empty(GLIB2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.glib2+= glib2>=2.4.0
-BUILDLINK_RECOMMENDED.glib2+= glib2>=2.8.6nb1
+BUILDLINK_API_DEPENDS.glib2+= glib2>=2.4.0
+BUILDLINK_ABI_DEPENDS.glib2+= glib2>=2.8.6nb1
BUILDLINK_PKGSRCDIR.glib2?= ../../devel/glib2
.endif # GLIB2_BUILDLINK3_MK
diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile
index 94f2c2553b5..ed2fa8f2671 100644
--- a/devel/glibmm/Makefile
+++ b/devel/glibmm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/03/12 21:09:45 adam Exp $
+# $NetBSD: Makefile,v 1.9 2006/04/06 06:21:49 reed Exp $
DISTNAME= glibmm-2.8.5
CATEGORIES= devel
@@ -16,7 +16,7 @@ USE_TOOLS+= gmake pkg-config
PKGCONFIG_OVERRIDE+= ${WRKSRC:Q}/glib/glibmm-2.4.pc.in
GNU_CONFIGURE= yes
-BUILDLINK_DEPENDS.glib2+= glib2>=2.8.0
+BUILDLINK_API_DEPENDS.glib2+= glib2>=2.8.0
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libsigc++2/buildlink3.mk"
diff --git a/devel/glibmm/buildlink3.mk b/devel/glibmm/buildlink3.mk
index 02669b4a4e7..1275df948de 100644
--- a/devel/glibmm/buildlink3.mk
+++ b/devel/glibmm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:42 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:49 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GLIBMM_BUILDLINK3_MK:= ${GLIBMM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nglibmm}
BUILDLINK_PACKAGES+= glibmm
.if !empty(GLIBMM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.glibmm+= glibmm>=2.6.1
-BUILDLINK_RECOMMENDED.glibmm?= glibmm>=2.8.3nb1
+BUILDLINK_API_DEPENDS.glibmm+= glibmm>=2.6.1
+BUILDLINK_ABI_DEPENDS.glibmm?= glibmm>=2.8.3nb1
BUILDLINK_PKGSRCDIR.glibmm?= ../../devel/glibmm
.endif # GLIBMM_BUILDLINK3_MK
diff --git a/devel/gmp/buildlink3.mk b/devel/gmp/buildlink3.mk
index f3ba3a02536..2f2c1d1fa00 100644
--- a/devel/gmp/buildlink3.mk
+++ b/devel/gmp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/10/03 00:13:28 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:49 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GMP_BUILDLINK3_MK:= ${GMP_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngmp}
BUILDLINK_PACKAGES+= gmp
.if !empty(GMP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gmp+= gmp>=4.1.2
-BUILDLINK_RECOMMENDED.gmp+= gmp>=4.1.3nb1
+BUILDLINK_API_DEPENDS.gmp+= gmp>=4.1.2
+BUILDLINK_ABI_DEPENDS.gmp+= gmp>=4.1.3nb1
BUILDLINK_PKGSRCDIR.gmp?= ../../devel/gmp
.endif # GMP_BUILDLINK3_MK
diff --git a/devel/gnustep-base/buildlink3.mk b/devel/gnustep-base/buildlink3.mk
index 639057655bd..1e6d1411450 100644
--- a/devel/gnustep-base/buildlink3.mk
+++ b/devel/gnustep-base/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:08:43 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:21:49 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNUSTEP_BASE_BUILDLINK3_MK:= ${GNUSTEP_BASE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnustep-base}
BUILDLINK_PACKAGES+= gnustep-base
.if !empty(GNUSTEP_BASE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnustep-base+= gnustep-base>=1.9.1
-BUILDLINK_RECOMMENDED.gnustep-base+= gnustep-base>=1.11.2nb1
+BUILDLINK_API_DEPENDS.gnustep-base+= gnustep-base>=1.9.1
+BUILDLINK_ABI_DEPENDS.gnustep-base+= gnustep-base>=1.11.2nb1
BUILDLINK_PKGSRCDIR.gnustep-base?= ../../devel/gnustep-base
PRINT_PLIST_AWK+= /^@dirrm share\/GNUstep\/System\/Library\/Headers\/Foundation$$/ { print "@comment in devel/gnustep-base: " $$0; next; }
diff --git a/devel/gnustep-make/buildlink3.mk b/devel/gnustep-make/buildlink3.mk
index 7c433448db5..6cb6f59c6aa 100644
--- a/devel/gnustep-make/buildlink3.mk
+++ b/devel/gnustep-make/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:08:43 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:21:49 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNUSTEP_MAKE_BUILDLINK3_MK:= ${GNUSTEP_MAKE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnustep-make}
BUILDLINK_PACKAGES+= gnustep-make
.if !empty(GNUSTEP_MAKE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnustep-make+= gnustep-make>=1.9.1
-BUILDLINK_RECOMMENDED.gnustep-make?= gnustep-make>=1.11.2nb1
+BUILDLINK_API_DEPENDS.gnustep-make+= gnustep-make>=1.9.1
+BUILDLINK_ABI_DEPENDS.gnustep-make?= gnustep-make>=1.11.2nb1
BUILDLINK_PKGSRCDIR.gnustep-make?= ../../devel/gnustep-make
.include "../../devel/gnustep-make/gnustep.mk"
diff --git a/devel/gnustep-objc-lf2/buildlink3.mk b/devel/gnustep-objc-lf2/buildlink3.mk
index 7d2219a908b..bc1259b78ec 100644
--- a/devel/gnustep-objc-lf2/buildlink3.mk
+++ b/devel/gnustep-objc-lf2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:08:43 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:49 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNUSTEP_OBJC_LF2_BUILDLINK3_MK:= ${GNUSTEP_OBJC_LF2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnustep-objc-lf2}
BUILDLINK_PACKAGES+= gnustep-objc-lf2
.if !empty(GNUSTEP_OBJC_LF2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnustep-objc-lf2+= gnustep-objc-lf2>=2.95.3.88
-BUILDLINK_RECOMMENDED.gnustep-objc-lf2?= gnustep-objc-lf2>=2.95.3.88nb1
+BUILDLINK_API_DEPENDS.gnustep-objc-lf2+= gnustep-objc-lf2>=2.95.3.88
+BUILDLINK_ABI_DEPENDS.gnustep-objc-lf2?= gnustep-objc-lf2>=2.95.3.88nb1
BUILDLINK_PKGSRCDIR.gnustep-objc-lf2?= ../../devel/gnustep-objc-lf2
BUILDLINK_TRANSFORM.gnustep-objc-lf2?= -e "s|Headers/objc_lf2/|Headers/objc/|g"
BUILDLINK_TRANSFORM+= l:objc:objc_lf2
diff --git a/devel/gnustep-objc/buildlink3.mk b/devel/gnustep-objc/buildlink3.mk
index d7b4b16beba..409e0bab1d3 100644
--- a/devel/gnustep-objc/buildlink3.mk
+++ b/devel/gnustep-objc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:08:43 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:49 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNUSTEP_OBJC_BUILDLINK3_MK:= ${GNUSTEP_OBJC_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnustep-objc}
BUILDLINK_PACKAGES+= gnustep-objc
.if !empty(GNUSTEP_OBJC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnustep-objc+= gnustep-objc>=1.3.0
-BUILDLINK_RECOMMENDED.gnustep-objc?= gnustep-objc>=1.3.0nb1
+BUILDLINK_API_DEPENDS.gnustep-objc+= gnustep-objc>=1.3.0
+BUILDLINK_ABI_DEPENDS.gnustep-objc?= gnustep-objc>=1.3.0nb1
BUILDLINK_PKGSRCDIR.gnustep-objc?= ../../devel/gnustep-objc
.endif # GNUSTEP_OBJC_BUILDLINK3_MK
diff --git a/devel/gob2/buildlink3.mk b/devel/gob2/buildlink3.mk
index 8e68455a486..833f5bf6a8a 100644
--- a/devel/gob2/buildlink3.mk
+++ b/devel/gob2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:43 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:49 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GOB2_BUILDLINK3_MK:= ${GOB2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngob2}
BUILDLINK_PACKAGES+= gob2
.if !empty(GOB2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gob2+= gob2>=2.0.10
-BUILDLINK_RECOMMENDED.gob2?= gob2>=2.0.12nb1
+BUILDLINK_API_DEPENDS.gob2+= gob2>=2.0.10
+BUILDLINK_ABI_DEPENDS.gob2?= gob2>=2.0.12nb1
BUILDLINK_PKGSRCDIR.gob2?= ../../devel/gob2
.endif # GOB2_BUILDLINK3_MK
diff --git a/devel/gperf/buildlink3.mk b/devel/gperf/buildlink3.mk
index e4fc203276b..5e190931114 100644
--- a/devel/gperf/buildlink3.mk
+++ b/devel/gperf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:49 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GPERF_BUILDLINK3_MK:= ${GPERF_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngperf}
BUILDLINK_PACKAGES+= gperf
.if !empty(GPERF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gperf+= gperf>=3.0.1
+BUILDLINK_API_DEPENDS.gperf+= gperf>=3.0.1
BUILDLINK_PKGSRCDIR.gperf?= ../../devel/gperf
BUILDLINK_DEPMETHOD.gperf?= build
.endif # GPERF_BUILDLINK3_MK
diff --git a/devel/gtl/buildlink3.mk b/devel/gtl/buildlink3.mk
index 2d64a5df0dd..616df1fcd22 100644
--- a/devel/gtl/buildlink3.mk
+++ b/devel/gtl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/11/02 20:36:50 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:49 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GTL_BUILDLINK3_MK:= ${GTL_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtl}
BUILDLINK_PACKAGES+= gtl
.if !empty(GTL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gtl+= gtl>=1.2.0
+BUILDLINK_API_DEPENDS.gtl+= gtl>=1.2.0
BUILDLINK_PKGSRCDIR.gtl?= ../../devel/gtl
.endif # GTL_BUILDLINK3_MK
diff --git a/devel/guile-gtk/buildlink3.mk b/devel/guile-gtk/buildlink3.mk
index d2f98cee579..afbbde9550c 100644
--- a/devel/guile-gtk/buildlink3.mk
+++ b/devel/guile-gtk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:43 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:49 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GUILE_GTK_BUILDLINK3_MK:= ${GUILE_GTK_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nguile-gtk}
BUILDLINK_PACKAGES+= guile-gtk
.if !empty(GUILE_GTK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.guile-gtk+= guile-gtk>=0.40
-BUILDLINK_RECOMMENDED.guile-gtk?= guile-gtk>=0.40.91nb1
+BUILDLINK_API_DEPENDS.guile-gtk+= guile-gtk>=0.40
+BUILDLINK_ABI_DEPENDS.guile-gtk?= guile-gtk>=0.40.91nb1
BUILDLINK_PKGSRCDIR.guile-gtk?= ../../devel/guile-gtk
.endif # GUILE_GTK_BUILDLINK3_MK
diff --git a/devel/guile14-gtk/buildlink3.mk b/devel/guile14-gtk/buildlink3.mk
index 7a65a0f6452..2fa5fe86603 100644
--- a/devel/guile14-gtk/buildlink3.mk
+++ b/devel/guile14-gtk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:08:43 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:49 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GUILE_GTK_BUILDLINK3_MK:= ${GUILE_GTK_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nguile-gtk}
BUILDLINK_PACKAGES+= guile-gtk
.if !empty(GUILE_GTK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.guile-gtk+= guile-gtk>=0.19nb4
-BUILDLINK_RECOMMENDED.guile-gtk+= guile-gtk>=0.19nb7
+BUILDLINK_API_DEPENDS.guile-gtk+= guile-gtk>=0.19nb4
+BUILDLINK_ABI_DEPENDS.guile-gtk+= guile-gtk>=0.19nb7
BUILDLINK_PKGSRCDIR.guile-gtk?= ../../devel/guile14-gtk
.endif # GUILE_GTK_BUILDLINK3_MK
diff --git a/devel/hdf/buildlink3.mk b/devel/hdf/buildlink3.mk
index 22838c957d5..007748866b8 100644
--- a/devel/hdf/buildlink3.mk
+++ b/devel/hdf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:08:43 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:50 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
HDF_BUILDLINK3_MK:= ${HDF_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nhdf}
BUILDLINK_PACKAGES+= hdf
.if !empty(HDF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.hdf+= hdf>=4.1r5
-BUILDLINK_RECOMMENDED.hdf?= hdf>=4.2r1nb1
+BUILDLINK_API_DEPENDS.hdf+= hdf>=4.1r5
+BUILDLINK_ABI_DEPENDS.hdf?= hdf>=4.2r1nb1
BUILDLINK_PKGSRCDIR.hdf?= ../../devel/hdf
.endif # HDF_BUILDLINK3_MK
diff --git a/devel/hdf5/buildlink3.mk b/devel/hdf5/buildlink3.mk
index 04cf2e1ca09..93b5805ba24 100644
--- a/devel/hdf5/buildlink3.mk
+++ b/devel/hdf5/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/10 19:56:13 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:21:50 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
HDF5_BUILDLINK3_MK:= ${HDF5_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nhdf5}
BUILDLINK_PACKAGES+= hdf5
.if !empty(HDF5_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.hdf5+= hdf5>=1.6.2
-BUILDLINK_RECOMMENDED.hdf5+= hdf5>=1.6.5nb1
+BUILDLINK_API_DEPENDS.hdf5+= hdf5>=1.6.2
+BUILDLINK_ABI_DEPENDS.hdf5+= hdf5>=1.6.5nb1
BUILDLINK_PKGSRCDIR.hdf5?= ../../devel/hdf5
.endif # HDF5_BUILDLINK3_MK
diff --git a/devel/kdesdk3/buildlink3.mk b/devel/kdesdk3/buildlink3.mk
index 888105bf968..8000566716d 100644
--- a/devel/kdesdk3/buildlink3.mk
+++ b/devel/kdesdk3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:08:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:21:50 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
KDESDK_BUILDLINK3_MK:= ${KDESDK_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nkdesdk}
BUILDLINK_PACKAGES+= kdesdk
.if !empty(KDESDK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.kdesdk+= kdesdk>=3.5.0nb1
-BUILDLINK_RECOMMENDED.kdesdk?= kdesdk>=3.5.1nb1
+BUILDLINK_API_DEPENDS.kdesdk+= kdesdk>=3.5.0nb1
+BUILDLINK_ABI_DEPENDS.kdesdk?= kdesdk>=3.5.1nb1
BUILDLINK_PKGSRCDIR.kdesdk?= ../../devel/kdesdk3
.endif # KDESDK_BUILDLINK3_MK
diff --git a/devel/ldapsdk/buildlink3.mk b/devel/ldapsdk/buildlink3.mk
index aa68a1f1baa..a68971c223f 100644
--- a/devel/ldapsdk/buildlink3.mk
+++ b/devel/ldapsdk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:08:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:50 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LDAPSDK_BUILDLINK3_MK:= ${LDAPSDK_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nldapsdk}
BUILDLINK_PACKAGES+= ldapsdk
.if !empty(LDAPSDK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ldapsdk+= ldapsdk>=12311998
-BUILDLINK_RECOMMENDED.ldapsdk?= ldapsdk>=12311998nb2
+BUILDLINK_API_DEPENDS.ldapsdk+= ldapsdk>=12311998
+BUILDLINK_ABI_DEPENDS.ldapsdk?= ldapsdk>=12311998nb2
BUILDLINK_PKGSRCDIR.ldapsdk?= ../../devel/ldapsdk
.endif # LDAPSDK_BUILDLINK3_MK
diff --git a/devel/libFoundation/buildlink3.mk b/devel/libFoundation/buildlink3.mk
index f6e4c21524c..16d12b2f0be 100644
--- a/devel/libFoundation/buildlink3.mk
+++ b/devel/libFoundation/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:50 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBFOUNDATION_BUILDLINK3_MK:= ${LIBFOUNDATION_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NlibFoundation}
BUILDLINK_PACKAGES+= libFoundation
.if !empty(LIBFOUNDATION_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libFoundation+= libFoundation>=1.0.72.107nb1
-BUILDLINK_RECOMMENDED.libFoundation?= libFoundation>=1.0.72.107nb2
+BUILDLINK_API_DEPENDS.libFoundation+= libFoundation>=1.0.72.107nb1
+BUILDLINK_ABI_DEPENDS.libFoundation?= libFoundation>=1.0.72.107nb2
BUILDLINK_PKGSRCDIR.libFoundation?= ../../devel/libFoundation
PRINT_PLIST_AWK+= /^@dirrm share\/GNUstep\/System\/Libraries$$/ { print "@comment in devel/libFoundation: " $$0; next; }
diff --git a/devel/libargparse/buildlink3.mk b/devel/libargparse/buildlink3.mk
index b5339b5eca1..1a034823510 100644
--- a/devel/libargparse/buildlink3.mk
+++ b/devel/libargparse/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:29 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:50 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBARGPARSE_BUILDLINK3_MK:= ${LIBARGPARSE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibargparse}
BUILDLINK_PACKAGES+= libargparse
.if !empty(LIBARGPARSE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libargparse+= libargparse>=0.1.0000
-BUILDLINK_RECOMMENDED.libargparse+= libargparse>=0.1.0000nb1
+BUILDLINK_API_DEPENDS.libargparse+= libargparse>=0.1.0000
+BUILDLINK_ABI_DEPENDS.libargparse+= libargparse>=0.1.0000nb1
BUILDLINK_PKGSRCDIR.libargparse?= ../../devel/libargparse
.endif # LIBARGPARSE_BUILDLINK3_MK
diff --git a/devel/libast/buildlink3.mk b/devel/libast/buildlink3.mk
index 831723f54f7..7e0e7f579dd 100644
--- a/devel/libast/buildlink3.mk
+++ b/devel/libast/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:08:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:50 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBAST_BUILDLINK3_MK:= ${LIBAST_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibast}
BUILDLINK_PACKAGES+= libast
.if !empty(LIBAST_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libast+= libast>=0.5nb5
-BUILDLINK_RECOMMENDED.libast+= libast>=0.6.1nb1
+BUILDLINK_API_DEPENDS.libast+= libast>=0.5nb5
+BUILDLINK_ABI_DEPENDS.libast+= libast>=0.6.1nb1
BUILDLINK_PKGSRCDIR.libast?= ../../devel/libast
.endif # LIBAST_BUILDLINK3_MK
diff --git a/devel/libaura/buildlink3.mk b/devel/libaura/buildlink3.mk
index 75b337ec9cd..04312fd7aa4 100644
--- a/devel/libaura/buildlink3.mk
+++ b/devel/libaura/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/02/09 05:40:28 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:50 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBAURA_BUILDLINK3_MK:= ${LIBAURA_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibaura}
BUILDLINK_PACKAGES+= libaura
.if !empty(LIBAURA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libaura+= libaura>=2.0
+BUILDLINK_API_DEPENDS.libaura+= libaura>=2.0
BUILDLINK_PKGSRCDIR.libaura?= ../../devel/libaura
.endif # LIBAURA_BUILDLINK3_MK
diff --git a/devel/libbegemot/buildlink3.mk b/devel/libbegemot/buildlink3.mk
index 91ad7f04a00..00f37be9c5e 100644
--- a/devel/libbegemot/buildlink3.mk
+++ b/devel/libbegemot/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2005/04/05 11:13:12 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:50 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBBEGEMOT_BUILDLINK3_MK:= ${LIBBEGEMOT_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibbegemot}
BUILDLINK_PACKAGES+= libbegemot
.if !empty(LIBBEGEMOT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libbegemot+= libbegemot>=1.9nb1
+BUILDLINK_API_DEPENDS.libbegemot+= libbegemot>=1.9nb1
BUILDLINK_PKGSRCDIR.libbegemot?= ../../devel/libbegemot
.endif # LIBBEGEMOT_BUILDLINK3_MK
diff --git a/devel/libbonobo/buildlink3.mk b/devel/libbonobo/buildlink3.mk
index 6e61a345632..264c34ee603 100644
--- a/devel/libbonobo/buildlink3.mk
+++ b/devel/libbonobo/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/02/05 23:08:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/04/06 06:21:50 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBBONOBO_BUILDLINK3_MK:= ${LIBBONOBO_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibbonobo}
BUILDLINK_PACKAGES+= libbonobo
.if !empty(LIBBONOBO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libbonobo+= libbonobo>=2.8.0
-BUILDLINK_RECOMMENDED.libbonobo+= libbonobo>=2.10.1nb2
+BUILDLINK_API_DEPENDS.libbonobo+= libbonobo>=2.8.0
+BUILDLINK_ABI_DEPENDS.libbonobo+= libbonobo>=2.10.1nb2
BUILDLINK_PKGSRCDIR.libbonobo?= ../../devel/libbonobo
BUILDLINK_FILES.libbonobo+= share/idl/bonobo-2.0/*
diff --git a/devel/libbonoboui/Makefile b/devel/libbonoboui/Makefile
index 0da0cdd323c..be4899eb217 100644
--- a/devel/libbonoboui/Makefile
+++ b/devel/libbonoboui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2006/03/30 21:09:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.50 2006/04/06 06:21:50 reed Exp $
#
DISTNAME= libbonoboui-2.14.0
@@ -22,8 +22,8 @@ PKGCONFIG_OVERRIDE= bonobo/libbonoboui-2.0.pc.in
CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc
-BUILDLINK_DEPENDS.libbonobo+= libbonobo>=2.14.0
-BUILDLINK_DEPENDS.libgnome+= libgnome>=2.13.7
+BUILDLINK_API_DEPENDS.libbonobo+= libbonobo>=2.14.0
+BUILDLINK_API_DEPENDS.libgnome+= libgnome>=2.13.7
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/GConf2/buildlink3.mk"
diff --git a/devel/libbonoboui/buildlink3.mk b/devel/libbonoboui/buildlink3.mk
index 6caf44a21a1..79c8315c5c8 100644
--- a/devel/libbonoboui/buildlink3.mk
+++ b/devel/libbonoboui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/02/05 23:08:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/04/06 06:21:50 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBBONOBOUI_BUILDLINK3_MK:= ${LIBBONOBOUI_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibbonoboui}
BUILDLINK_PACKAGES+= libbonoboui
.if !empty(LIBBONOBOUI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libbonoboui+= libbonoboui>=2.8.0
-BUILDLINK_RECOMMENDED.libbonoboui+= libbonoboui>=2.10.1nb3
+BUILDLINK_API_DEPENDS.libbonoboui+= libbonoboui>=2.8.0
+BUILDLINK_ABI_DEPENDS.libbonoboui+= libbonoboui>=2.10.1nb3
BUILDLINK_PKGSRCDIR.libbonoboui?= ../../devel/libbonoboui
.endif # LIBBONOBOUI_BUILDLINK3_MK
diff --git a/devel/libcfg+/buildlink3.mk b/devel/libcfg+/buildlink3.mk
index 0065a95abd8..67f036f4bf2 100644
--- a/devel/libcfg+/buildlink3.mk
+++ b/devel/libcfg+/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:08:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:50 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBCFG_BUILDLINK3_MK:= ${LIBCFG_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibcfg}
BUILDLINK_PACKAGES+= libcfg
.if !empty(LIBCFG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libcfg+= libcfg+>=0.6.2nb1
-BUILDLINK_RECOMMENDED.libcfg++= libcfg+>=0.6.2nb3
+BUILDLINK_API_DEPENDS.libcfg+= libcfg+>=0.6.2nb1
+BUILDLINK_ABI_DEPENDS.libcfg++= libcfg+>=0.6.2nb3
BUILDLINK_PKGSRCDIR.libcfg?= ../../devel/libcfg+
.endif # LIBCFG_BUILDLINK3_MK
diff --git a/devel/libdfui/buildlink3.mk b/devel/libdfui/buildlink3.mk
index 29dcdb3e347..84d42f55a97 100644
--- a/devel/libdfui/buildlink3.mk
+++ b/devel/libdfui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/02/09 05:41:36 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:50 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBDFUI_BUILDLINK3_MK:= ${LIBDFUI_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibdfui}
BUILDLINK_PACKAGES+= libdfui
.if !empty(LIBDFUI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libdfui+= libdfui>=3.0
+BUILDLINK_API_DEPENDS.libdfui+= libdfui>=3.0
BUILDLINK_PKGSRCDIR.libdfui?= ../../devel/libdfui
.endif # LIBDFUI_BUILDLINK3_MK
diff --git a/devel/libdnsres/Makefile b/devel/libdnsres/Makefile
index ec4546b89b4..59678101e1b 100644
--- a/devel/libdnsres/Makefile
+++ b/devel/libdnsres/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/02/26 17:05:08 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2006/04/06 06:21:50 reed Exp $
#
DISTNAME= libdnsres-0.1a
@@ -15,7 +15,7 @@ USE_LIBTOOL= YES
GNU_CONFIGURE= YES
# uses event_once
-BUILDLINK_DEPENDS.libevent+= libevent>=0.9
+BUILDLINK_API_DEPENDS.libevent+= libevent>=0.9
.include "../../devel/libevent/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/libdnsres/buildlink3.mk b/devel/libdnsres/buildlink3.mk
index f728c3a31e7..364687abe69 100644
--- a/devel/libdnsres/buildlink3.mk
+++ b/devel/libdnsres/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/02/19 17:11:06 adrianp Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:50 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBDNSRES_BUILDLINK3_MK:= ${LIBDNSRES_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibdnsres}
BUILDLINK_PACKAGES+= libdnsres
.if !empty(LIBDNSRES_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libdnsres+= libdnsres>=0.1a
+BUILDLINK_API_DEPENDS.libdnsres+= libdnsres>=0.1a
BUILDLINK_PKGSRCDIR.libdnsres?= ../../devel/libdnsres
.endif # LIBDNSRES_BUILDLINK3_MK
diff --git a/devel/libdockapp/buildlink3.mk b/devel/libdockapp/buildlink3.mk
index f947a7d31c0..840ad486eb9 100644
--- a/devel/libdockapp/buildlink3.mk
+++ b/devel/libdockapp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:50 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBDOCKAPP_BUILDLINK3_MK:= ${LIBDOCKAPP_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibdockapp}
BUILDLINK_PACKAGES+= libdockapp
.if !empty(LIBDOCKAPP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libdockapp+= libdockapp>=0.4.0
-BUILDLINK_RECOMMENDED.libdockapp+= libdockapp>=0.4.0nb2
+BUILDLINK_API_DEPENDS.libdockapp+= libdockapp>=0.4.0
+BUILDLINK_ABI_DEPENDS.libdockapp+= libdockapp>=0.4.0nb2
BUILDLINK_PKGSRCDIR.libdockapp?= ../../devel/libdockapp
.endif # LIBDOCKAPP_BUILDLINK3_MK
diff --git a/devel/libebml/buildlink3.mk b/devel/libebml/buildlink3.mk
index 53bc9fdec64..543553774c7 100644
--- a/devel/libebml/buildlink3.mk
+++ b/devel/libebml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/05 23:08:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:21:50 reed Exp $
#
# This Makefile fragment is included by packages that use libebml.
#
@@ -16,8 +16,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibebml}
BUILDLINK_PACKAGES+= libebml
.if !empty(LIBEBML_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libebml+= libebml>=0.7.6
-BUILDLINK_RECOMMENDED.libebml?= libebml>=0.7.6nb1
+BUILDLINK_API_DEPENDS.libebml+= libebml>=0.7.6
+BUILDLINK_ABI_DEPENDS.libebml?= libebml>=0.7.6nb1
BUILDLINK_PKGSRCDIR.libebml?= ../../devel/libebml
.endif # LIBEBML_BUILDLINK3_MK
diff --git a/devel/libelf/buildlink3.mk b/devel/libelf/buildlink3.mk
index 7dd845e4de8..c980a7448dc 100644
--- a/devel/libelf/buildlink3.mk
+++ b/devel/libelf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/08/13 07:09:01 cube Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:50 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBELF_BUILDLINK3_MK:= ${LIBELF_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibelf}
BUILDLINK_PACKAGES+= libelf
.if !empty(LIBELF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libelf+= libelf>=0.8.5
+BUILDLINK_API_DEPENDS.libelf+= libelf>=0.8.5
BUILDLINK_PKGSRCDIR.libelf?= ../../devel/libelf
BUILDLINK_DEPMETHOD.libelf?= build
.endif # LIBELF_BUILDLINK3_MK
diff --git a/devel/libetm/buildlink3.mk b/devel/libetm/buildlink3.mk
index dbe71c2ff21..b4713990b69 100644
--- a/devel/libetm/buildlink3.mk
+++ b/devel/libetm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2005/04/05 11:10:27 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:50 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBETM_BUILDLINK3_MK:= ${LIBETM_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibetm}
BUILDLINK_PACKAGES+= libetm
.if !empty(LIBETM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libetm+= libetm>=1.09
+BUILDLINK_API_DEPENDS.libetm+= libetm>=1.09
BUILDLINK_PKGSRCDIR.libetm?= ../../devel/libetm
BUILDLINK_DEPMETHOD.libetm?= build
.endif # LIBETM_BUILDLINK3_MK
diff --git a/devel/libevent/buildlink3.mk b/devel/libevent/buildlink3.mk
index b029edc9d9e..88e6d3e0560 100644
--- a/devel/libevent/buildlink3.mk
+++ b/devel/libevent/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2005/09/16 14:46:43 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:50 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBEVENT_BUILDLINK3_MK:= ${LIBEVENT_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibevent}
BUILDLINK_PACKAGES+= libevent
.if !empty(LIBEVENT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libevent+= libevent>=0.6
+BUILDLINK_API_DEPENDS.libevent+= libevent>=0.6
BUILDLINK_PKGSRCDIR.libevent?= ../../devel/libevent
.endif # LIBEVENT_BUILDLINK3_MK
diff --git a/devel/libevent/builtin.mk b/devel/libevent/builtin.mk
index 974625a06fc..394ba1ee65c 100644
--- a/devel/libevent/builtin.mk
+++ b/devel/libevent/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.4 2006/03/30 18:06:17 jlam Exp $
+# $NetBSD: builtin.mk,v 1.5 2006/04/06 06:21:50 reed Exp $
BUILTIN_PKG:= libevent
@@ -31,7 +31,7 @@ USE_BUILTIN.libevent= ${IS_BUILTIN.libevent}
. if defined(BUILTIN_PKG.libevent) && \
!empty(IS_BUILTIN.libevent:M[yY][eE][sS])
USE_BUILTIN.libevent= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.libevent}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.libevent}
. if !empty(USE_BUILTIN.libevent:M[yY][eE][sS])
USE_BUILTIN.libevent!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.libevent:Q}; then \
diff --git a/devel/libextractor/buildlink3.mk b/devel/libextractor/buildlink3.mk
index 09ebc6154b4..b9780185db1 100644
--- a/devel/libextractor/buildlink3.mk
+++ b/devel/libextractor/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/03/05 22:06:38 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:51 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBEXTRACTOR_BUILDLINK3_MK:= ${LIBEXTRACTOR_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibextractor}
BUILDLINK_PACKAGES+= libextractor
.if !empty(LIBEXTRACTOR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libextractor+= libextractor>=0.3.10
-BUILDLINK_RECOMMENDED.libextractor+= libextractor>=0.5.3nb3
+BUILDLINK_API_DEPENDS.libextractor+= libextractor>=0.3.10
+BUILDLINK_ABI_DEPENDS.libextractor+= libextractor>=0.5.3nb3
BUILDLINK_PKGSRCDIR.libextractor?= ../../devel/libextractor
.endif # LIBEXTRACTOR_BUILDLINK3_MK
diff --git a/devel/libffi/buildlink3.mk b/devel/libffi/buildlink3.mk
index 876d947f8c1..9f4cc91a47d 100644
--- a/devel/libffi/buildlink3.mk
+++ b/devel/libffi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:29 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:51 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBFFI_BUILDLINK3_MK:= ${LIBFFI_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibffi}
BUILDLINK_PACKAGES+= libffi
.if !empty(LIBFFI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libffi+= libffi>=1.20
-BUILDLINK_RECOMMENDED.libffi+= libffi>=2.0betanb1
+BUILDLINK_API_DEPENDS.libffi+= libffi>=1.20
+BUILDLINK_ABI_DEPENDS.libffi+= libffi>=2.0betanb1
BUILDLINK_PKGSRCDIR.libffi?= ../../devel/libffi
.endif # LIBFFI_BUILDLINK3_MK
diff --git a/devel/libgail-gnome/buildlink3.mk b/devel/libgail-gnome/buildlink3.mk
index 474a5b6bc04..984a653bf8d 100644
--- a/devel/libgail-gnome/buildlink3.mk
+++ b/devel/libgail-gnome/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/03/06 00:18:12 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:21:51 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGAIL_GNOME_BUILDLINK3_MK:= ${LIBGAIL_GNOME_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgail-gnome}
BUILDLINK_PACKAGES+= libgail-gnome
.if !empty(LIBGAIL_GNOME_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgail-gnome+= libgail-gnome>=1.1.1nb2
-BUILDLINK_RECOMMENDED.libgail-gnome?= libgail-gnome>=1.1.3
+BUILDLINK_API_DEPENDS.libgail-gnome+= libgail-gnome>=1.1.1nb2
+BUILDLINK_ABI_DEPENDS.libgail-gnome?= libgail-gnome>=1.1.3
BUILDLINK_PKGSRCDIR.libgail-gnome?= ../../devel/libgail-gnome
.endif # LIBGAIL_GNOME_BUILDLINK3_MK
diff --git a/devel/libgetopt/buildlink3.mk b/devel/libgetopt/buildlink3.mk
index 09b9b67275d..cc2ad10fda1 100644
--- a/devel/libgetopt/buildlink3.mk
+++ b/devel/libgetopt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2004/05/17 21:32:34 seb Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:21:51 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGETOPT_BUILDLINK3_MK:= ${LIBGETOPT_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngetopt}
BUILDLINK_PACKAGES+= getopt
.if !empty(LIBGETOPT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.getopt+= libgetopt>=1.3
+BUILDLINK_API_DEPENDS.getopt+= libgetopt>=1.3
BUILDLINK_PKGSRCDIR.getopt?= ../../devel/libgetopt
.endif # LIBGETOPT_BUILDLINK3_MK
diff --git a/devel/libgetopt/builtin.mk b/devel/libgetopt/builtin.mk
index 6a7e28684d7..daa285eb9ba 100644
--- a/devel/libgetopt/builtin.mk
+++ b/devel/libgetopt/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.5 2006/03/30 18:06:17 jlam Exp $
+# $NetBSD: builtin.mk,v 1.6 2006/04/06 06:21:51 reed Exp $
BUILTIN_PKG:= getopt
@@ -32,7 +32,7 @@ USE_BUILTIN.getopt= ${IS_BUILTIN.getopt}
. if defined(BUILTIN_PKG.getopt) && \
!empty(IS_BUILTIN.getopt:M[yY][eE][sS])
USE_BUILTIN.getopt= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.getopt}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.getopt}
. if !empty(USE_BUILTIN.getopt:M[yY][eE][sS])
USE_BUILTIN.getopt!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.getopt:Q}; then \
diff --git a/devel/libglade/buildlink3.mk b/devel/libglade/buildlink3.mk
index 2080e21b736..b424e80c648 100644
--- a/devel/libglade/buildlink3.mk
+++ b/devel/libglade/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:08:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:51 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGLADE_BUILDLINK3_MK:= ${LIBGLADE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibglade}
BUILDLINK_PACKAGES+= libglade
.if !empty(LIBGLADE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libglade+= libglade>=0.17nb5
-BUILDLINK_RECOMMENDED.libglade+= libglade>=0.17nb8
+BUILDLINK_API_DEPENDS.libglade+= libglade>=0.17nb5
+BUILDLINK_ABI_DEPENDS.libglade+= libglade>=0.17nb8
BUILDLINK_PKGSRCDIR.libglade?= ../../devel/libglade
.endif # LIBGLADE_BUILDLINK3_MK
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index 5342063061e..2da21c66aac 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2006/03/21 06:00:44 jlam Exp $
+# $NetBSD: Makefile,v 1.44 2006/04/06 06:21:51 reed Exp $
#
DISTNAME= libglade-2.5.1
@@ -25,9 +25,9 @@ CONFIGURE_ARGS+= --without-xml-catalog
XML_ENTRIES= system http://glade.gnome.org/glade-2.0.dtd \
${PREFIX}/share/xml/libglade/glade-2.0.dtd
-BUILDLINK_DEPENDS.atk+= atk>=1.9.0
-BUILDLINK_DEPENDS.glib2+= glib2>=2.6.0
-BUILDLINK_DEPENDS.gtk2+= gtk2+>=2.6.0
+BUILDLINK_API_DEPENDS.atk+= atk>=1.9.0
+BUILDLINK_API_DEPENDS.glib2+= glib2>=2.6.0
+BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.6.0
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/lib/libglade/2.0
diff --git a/devel/libglade2/buildlink3.mk b/devel/libglade2/buildlink3.mk
index fbf72a77ceb..6e122ba578a 100644
--- a/devel/libglade2/buildlink3.mk
+++ b/devel/libglade2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/02/05 23:08:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/04/06 06:21:51 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGLADE2_BUILDLINK3_MK:= ${LIBGLADE2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibglade2}
BUILDLINK_PACKAGES+= libglade2
.if !empty(LIBGLADE2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libglade2+= libglade2>=2.3.6
-BUILDLINK_RECOMMENDED.libglade2+= libglade2>=2.5.1nb2
+BUILDLINK_API_DEPENDS.libglade2+= libglade2>=2.3.6
+BUILDLINK_ABI_DEPENDS.libglade2+= libglade2>=2.5.1nb2
BUILDLINK_PKGSRCDIR.libglade2?= ../../devel/libglade2
PRINT_PLIST_AWK+= /^@dirrm lib\/libglade$$/ { next; }
diff --git a/devel/libglademm/buildlink3.mk b/devel/libglademm/buildlink3.mk
index fad553d8de7..abd63fe0ec8 100644
--- a/devel/libglademm/buildlink3.mk
+++ b/devel/libglademm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:51 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGLADEMM_BUILDLINK3_MK:= ${LIBGLADEMM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibglademm}
BUILDLINK_PACKAGES+= libglademm
.if !empty(LIBGLADEMM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libglademm+= libglademm>=2.6.0
-BUILDLINK_RECOMMENDED.libglademm?= libglademm>=2.6.1nb2
+BUILDLINK_API_DEPENDS.libglademm+= libglademm>=2.6.0
+BUILDLINK_ABI_DEPENDS.libglademm?= libglademm>=2.6.1nb2
BUILDLINK_PKGSRCDIR.libglademm?= ../../devel/libglademm
.endif # LIBGLADEMM_BUILDLINK3_MK
diff --git a/devel/libgnome/Makefile b/devel/libgnome/Makefile
index 4d09bec84ca..1ff5a0ffc62 100644
--- a/devel/libgnome/Makefile
+++ b/devel/libgnome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2006/04/04 18:07:16 jlam Exp $
+# $NetBSD: Makefile,v 1.54 2006/04/06 06:21:51 reed Exp $
#
DISTNAME= libgnome-2.14.0
@@ -13,7 +13,7 @@ COMMENT= Core GNOME2 library (non-graphical)
BUILD_USES_MSGFMT= YES
-BUILDLINK_DEPENDS.esound+= esound>=0.2.26
+BUILDLINK_API_DEPENDS.esound+= esound>=0.2.26
GNU_CONFIGURE= YES
USE_TOOLS+= gmake pkg-config
diff --git a/devel/libgnome/buildlink3.mk b/devel/libgnome/buildlink3.mk
index a0d2697bff7..ffe253c4bab 100644
--- a/devel/libgnome/buildlink3.mk
+++ b/devel/libgnome/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/02/05 23:08:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/04/06 06:21:51 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGNOME_BUILDLINK3_MK:= ${LIBGNOME_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgnome}
BUILDLINK_PACKAGES+= libgnome
.if !empty(LIBGNOME_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgnome+= libgnome>=2.8.0
-BUILDLINK_RECOMMENDED.libgnome+= libgnome>=2.12.0.1nb3
+BUILDLINK_API_DEPENDS.libgnome+= libgnome>=2.8.0
+BUILDLINK_ABI_DEPENDS.libgnome+= libgnome>=2.12.0.1nb3
BUILDLINK_PKGSRCDIR.libgnome?= ../../devel/libgnome
.endif # LIBGNOME_BUILDLINK3_MK
diff --git a/devel/libgnomemm/buildlink3.mk b/devel/libgnomemm/buildlink3.mk
index ca9bb22fb55..c88167c4860 100644
--- a/devel/libgnomemm/buildlink3.mk
+++ b/devel/libgnomemm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:08:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:51 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGNOMEMM_BUILDLINK3_MK:= ${LIBGNOMEMM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgnomemm}
BUILDLINK_PACKAGES+= libgnomemm
.if !empty(LIBGNOMEMM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgnomemm+= libgnomemm>=2.10.0
-BUILDLINK_RECOMMENDED.libgnomemm?= libgnomemm>=2.12.1nb2
+BUILDLINK_API_DEPENDS.libgnomemm+= libgnomemm>=2.10.0
+BUILDLINK_ABI_DEPENDS.libgnomemm?= libgnomemm>=2.12.1nb2
BUILDLINK_PKGSRCDIR.libgnomemm?= ../../devel/libgnomemm
.endif # LIBGNOMEMM_BUILDLINK3_MK
diff --git a/devel/libgnomeui/Makefile b/devel/libgnomeui/Makefile
index 10cc71b833e..1eb62464cba 100644
--- a/devel/libgnomeui/Makefile
+++ b/devel/libgnomeui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2006/03/31 10:57:20 jmmv Exp $
+# $NetBSD: Makefile,v 1.57 2006/04/06 06:21:51 reed Exp $
#
DISTNAME= libgnomeui-2.14.0
@@ -27,9 +27,9 @@ CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc
PKGCONFIG_BASE= ${WRKSRC}/libgnomeui/libgnomeui-2.0.pc
PKGCONFIG_OVERRIDE= ${PKGCONFIG_BASE}.in
-BUILDLINK_DEPENDS.gtk2= gtk2+>=2.8.0
-BUILDLINK_DEPENDS.libbonoboui= libgnome>=2.13.1
-BUILDLINK_DEPENDS.libgnome= libgnome>=2.13.7
+BUILDLINK_API_DEPENDS.gtk2= gtk2+>=2.8.0
+BUILDLINK_API_DEPENDS.libbonoboui= libgnome>=2.13.1
+BUILDLINK_API_DEPENDS.libgnome= libgnome>=2.13.7
# Needed because part of the pc files doesn't get filled in till after
# configure does its pass
diff --git a/devel/libgnomeui/buildlink3.mk b/devel/libgnomeui/buildlink3.mk
index d3957ff48e5..c493c387f28 100644
--- a/devel/libgnomeui/buildlink3.mk
+++ b/devel/libgnomeui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/03/06 00:18:12 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/04/06 06:21:51 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGNOMEUI_BUILDLINK3_MK:= ${LIBGNOMEUI_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgnomeui}
BUILDLINK_PACKAGES+= libgnomeui
.if !empty(LIBGNOMEUI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgnomeui+= libgnomeui>=2.8.0
-BUILDLINK_RECOMMENDED.libgnomeui+= libgnomeui>=2.12.1
+BUILDLINK_API_DEPENDS.libgnomeui+= libgnomeui>=2.8.0
+BUILDLINK_ABI_DEPENDS.libgnomeui+= libgnomeui>=2.12.1
BUILDLINK_PKGSRCDIR.libgnomeui?= ../../devel/libgnomeui
.endif # LIBGNOMEUI_BUILDLINK3_MK
diff --git a/devel/libgnomeuimm/buildlink3.mk b/devel/libgnomeuimm/buildlink3.mk
index 3720ffc5014..ae9a4927083 100644
--- a/devel/libgnomeuimm/buildlink3.mk
+++ b/devel/libgnomeuimm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:51 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGNOMEUIMM_BUILDLINK3_MK:= ${LIBGNOMEUIMM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgnomeuimm}
BUILDLINK_PACKAGES+= libgnomeuimm
.if !empty(LIBGNOMEUIMM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgnomeuimm+= libgnomeuimm>=2.10.0
-BUILDLINK_RECOMMENDED.libgnomeuimm?= libgnomeuimm>=2.12.0nb3
+BUILDLINK_API_DEPENDS.libgnomeuimm+= libgnomeuimm>=2.10.0
+BUILDLINK_ABI_DEPENDS.libgnomeuimm?= libgnomeuimm>=2.12.0nb3
BUILDLINK_PKGSRCDIR.libgnomeuimm?= ../../devel/libgnomeuimm
.endif # LIBGNOMEUIMM_BUILDLINK3_MK
diff --git a/devel/libgphoto2/buildlink3.mk b/devel/libgphoto2/buildlink3.mk
index 35e7fbd0aa0..40e4cfb0823 100644
--- a/devel/libgphoto2/buildlink3.mk
+++ b/devel/libgphoto2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:08:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:21:51 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGPHOTO2_BUILDLINK3_MK:= ${LIBGPHOTO2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgphoto2}
BUILDLINK_PACKAGES+= libgphoto2
.if !empty(LIBGPHOTO2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgphoto2+= libgphoto2>=2.1.2
-BUILDLINK_RECOMMENDED.libgphoto2+= libgphoto2>=2.1.6nb1
+BUILDLINK_API_DEPENDS.libgphoto2+= libgphoto2>=2.1.2
+BUILDLINK_ABI_DEPENDS.libgphoto2+= libgphoto2>=2.1.6nb1
BUILDLINK_PKGSRCDIR.libgphoto2?= ../../devel/libgphoto2
.endif # LIBGPHOTO2_BUILDLINK3_MK
diff --git a/devel/libgsf/buildlink3.mk b/devel/libgsf/buildlink3.mk
index 8f0198e13fb..9afbd6ad9a0 100644
--- a/devel/libgsf/buildlink3.mk
+++ b/devel/libgsf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/03/06 00:18:11 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/04/06 06:21:51 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGSF_BUILDLINK3_MK:= ${LIBGSF_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgsf}
BUILDLINK_PACKAGES+= libgsf
.if !empty(LIBGSF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgsf+= libgsf>=1.13.3
-BUILDLINK_RECOMMENDED.libgsf?= libgsf>=1.14.0
+BUILDLINK_API_DEPENDS.libgsf+= libgsf>=1.13.3
+BUILDLINK_ABI_DEPENDS.libgsf?= libgsf>=1.14.0
BUILDLINK_PKGSRCDIR.libgsf?= ../../devel/libgsf
.endif # LIBGSF_BUILDLINK3_MK
diff --git a/devel/libhfs/buildlink3.mk b/devel/libhfs/buildlink3.mk
index 2f90a1ce651..d54a3daf771 100644
--- a/devel/libhfs/buildlink3.mk
+++ b/devel/libhfs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2005/01/03 01:56:15 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:51 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBHFS_BUILDLINK3_MK:= ${LIBHFS_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibhfs}
BUILDLINK_PACKAGES+= libhfs
.if !empty(LIBHFS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libhfs+= libhfs>=3.2.6nb1
+BUILDLINK_API_DEPENDS.libhfs+= libhfs>=3.2.6nb1
BUILDLINK_PKGSRCDIR.libhfs?= ../../devel/libhfs
.endif # LIBHFS_BUILDLINK3_MK
diff --git a/devel/libiberty/buildlink3.mk b/devel/libiberty/buildlink3.mk
index 7c1313d83f1..e9badbd7f28 100644
--- a/devel/libiberty/buildlink3.mk
+++ b/devel/libiberty/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:51 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBIBERTY_BUILDLINK3_MK:= ${LIBIBERTY_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibiberty}
BUILDLINK_PACKAGES+= libiberty
.if !empty(LIBIBERTY_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libiberty+= libiberty>=1.0nb1
-BUILDLINK_RECOMMENDED.libiberty?= libiberty>=1.0nb2
+BUILDLINK_API_DEPENDS.libiberty+= libiberty>=1.0nb1
+BUILDLINK_ABI_DEPENDS.libiberty?= libiberty>=1.0nb2
BUILDLINK_PKGSRCDIR.libiberty?= ../../devel/libiberty
.endif # LIBIBERTY_BUILDLINK3_MK
BUILDLINK_DEPMETHOD.libiberty?= build
diff --git a/devel/libidn/buildlink3.mk b/devel/libidn/buildlink3.mk
index 6ee2071a4e1..1688dbbe37f 100644
--- a/devel/libidn/buildlink3.mk
+++ b/devel/libidn/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:08:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:21:51 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBIDN_BUILDLINK3_MK:= ${LIBIDN_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibidn}
BUILDLINK_PACKAGES+= libidn
.if !empty(LIBIDN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libidn+= libidn>=0.4.6
-BUILDLINK_RECOMMENDED.libidn+= libidn>=0.6.1nb1
+BUILDLINK_API_DEPENDS.libidn+= libidn>=0.4.6
+BUILDLINK_ABI_DEPENDS.libidn+= libidn>=0.6.1nb1
BUILDLINK_PKGSRCDIR.libidn?= ../../devel/libidn
.endif # LIBIDN_BUILDLINK3_MK
diff --git a/devel/libinstaller/buildlink3.mk b/devel/libinstaller/buildlink3.mk
index 5c50b2bbc41..60e29b7e791 100644
--- a/devel/libinstaller/buildlink3.mk
+++ b/devel/libinstaller/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/02/09 05:44:18 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:51 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBINSTALLER_BUILDLINK3_MK:= ${LIBINSTALLER_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibinstaller}
BUILDLINK_PACKAGES+= libinstaller
.if !empty(LIBINSTALLER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libinstaller+= libinstaller>=4.0
+BUILDLINK_API_DEPENDS.libinstaller+= libinstaller>=4.0
BUILDLINK_PKGSRCDIR.libinstaller?= ../../devel/libinstaller
.endif # LIBINSTALLER_BUILDLINK3_MK
diff --git a/devel/libjit/buildlink3.mk b/devel/libjit/buildlink3.mk
index ade877551d8..e7c2cfb9a48 100644
--- a/devel/libjit/buildlink3.mk
+++ b/devel/libjit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:51 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBJIT_BUILDLINK3_MK:= ${LIBJIT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibjit}
BUILDLINK_PACKAGES+= libjit
.if !empty(LIBJIT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libjit+= libjit>=0.0.2
-BUILDLINK_RECOMMENDED.libjit+= libjit>=0.0.4nb1
+BUILDLINK_API_DEPENDS.libjit+= libjit>=0.0.2
+BUILDLINK_ABI_DEPENDS.libjit+= libjit>=0.0.4nb1
BUILDLINK_PKGSRCDIR.libjit?= ../../devel/libjit
.endif # LIBJIT_BUILDLINK3_MK
diff --git a/devel/libltdl/buildlink3.mk b/devel/libltdl/buildlink3.mk
index 461dc677b49..866788bbe95 100644
--- a/devel/libltdl/buildlink3.mk
+++ b/devel/libltdl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/11/25 22:55:54 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:52 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBLTDL_BUILDLINK3_MK:= ${LIBLTDL_BUILDLINK3_MK}+
@@ -19,7 +19,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibltdl}
BUILDLINK_PACKAGES+= libltdl
.if !empty(LIBLTDL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libltdl+= libltdl>=1.5.10
+BUILDLINK_API_DEPENDS.libltdl+= libltdl>=1.5.10
BUILDLINK_PKGSRCDIR.libltdl?= ../../devel/libltdl
.endif # LIBLTDL_BUILDLINK3_MK
diff --git a/devel/libmatchbox/buildlink3.mk b/devel/libmatchbox/buildlink3.mk
index d28040785df..620a07a0a2d 100644
--- a/devel/libmatchbox/buildlink3.mk
+++ b/devel/libmatchbox/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:08:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:21:52 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBMATCHBOX_BUILDLINK3_MK:= ${LIBMATCHBOX_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmatchbox}
BUILDLINK_PACKAGES+= libmatchbox
.if !empty(LIBMATCHBOX_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmatchbox+= libmatchbox>=1.4
-BUILDLINK_RECOMMENDED.libmatchbox+= libmatchbox>=1.7nb2
+BUILDLINK_API_DEPENDS.libmatchbox+= libmatchbox>=1.4
+BUILDLINK_ABI_DEPENDS.libmatchbox+= libmatchbox>=1.7nb2
BUILDLINK_PKGSRCDIR.libmatchbox?= ../../devel/libmatchbox
.endif # LIBMATCHBOX_BUILDLINK3_MK
diff --git a/devel/libmemcache/buildlink3.mk b/devel/libmemcache/buildlink3.mk
index 14cca604376..8d684df0f9d 100644
--- a/devel/libmemcache/buildlink3.mk
+++ b/devel/libmemcache/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/10/11 15:31:20 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:52 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBMEMCACHE_BUILDLINK3_MK:= ${LIBMEMCACHE_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmemcache}
BUILDLINK_PACKAGES+= libmemcache
.if !empty(LIBMEMCACHE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmemcache+= libmemcache>=1.4.0beta5
+BUILDLINK_API_DEPENDS.libmemcache+= libmemcache>=1.4.0beta5
BUILDLINK_PKGSRCDIR.libmemcache?= ../../devel/libmemcache
.endif # LIBMEMCACHE_BUILDLINK3_MK
diff --git a/devel/libmemmgr/buildlink3.mk b/devel/libmemmgr/buildlink3.mk
index d6e38548c64..cb274e9544c 100644
--- a/devel/libmemmgr/buildlink3.mk
+++ b/devel/libmemmgr/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2005/04/09 18:37:08 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:52 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBMEMMGR_BUILDLINK3_MK:= ${LIBMEMMGR_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmemmgr}
BUILDLINK_PACKAGES+= libmemmgr
.if !empty(LIBMEMMGR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmemmgr+= libmemmgr>=1.04
+BUILDLINK_API_DEPENDS.libmemmgr+= libmemmgr>=1.04
BUILDLINK_PKGSRCDIR.libmemmgr?= ../../devel/libmemmgr
BUILDLINK_DEPMETHOD.libmemmgr?= build
.endif # LIBMEMMGR_BUILDLINK3_MK
diff --git a/devel/libmimedir/buildlink3.mk b/devel/libmimedir/buildlink3.mk
index a0ac2c6b1bb..a039dcbfcbb 100644
--- a/devel/libmimedir/buildlink3.mk
+++ b/devel/libmimedir/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2005/10/13 20:41:51 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:52 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBMIMEDIR_BUILDLINK3_MK:= ${LIBMIMEDIR_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmimedir}
BUILDLINK_PACKAGES+= libmimedir
.if !empty(LIBMIMEDIR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmimedir+= libmimedir>=0.4nb1
+BUILDLINK_API_DEPENDS.libmimedir+= libmimedir>=0.4nb1
BUILDLINK_PKGSRCDIR.libmimedir?= ../../devel/libmimedir
.endif # LIBMIMEDIR_BUILDLINK3_MK
diff --git a/devel/libmm/buildlink3.mk b/devel/libmm/buildlink3.mk
index 1bce5d5b813..e343ca526ba 100644
--- a/devel/libmm/buildlink3.mk
+++ b/devel/libmm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/10/03 00:13:30 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:21:52 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBMM_BUILDLINK3_MK:= ${LIBMM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmm}
BUILDLINK_PACKAGES+= libmm
.if !empty(LIBMM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmm+= libmm>=1.2.1
-BUILDLINK_RECOMMENDED.libmm+= libmm>=1.2.2nb1
+BUILDLINK_API_DEPENDS.libmm+= libmm>=1.2.1
+BUILDLINK_ABI_DEPENDS.libmm+= libmm>=1.2.2nb1
BUILDLINK_PKGSRCDIR.libmm?= ../../devel/libmm
.endif # LIBMM_BUILDLINK3_MK
diff --git a/devel/libnet/buildlink3.mk b/devel/libnet/buildlink3.mk
index b900dca7de4..0cef0192989 100644
--- a/devel/libnet/buildlink3.mk
+++ b/devel/libnet/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:30 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:52 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBNET_BUILDLINK3_MK:= ${LIBNET_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibnet}
BUILDLINK_PACKAGES+= libnet
.if !empty(LIBNET_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libnet+= libnet>=1.0.1bnb3
-BUILDLINK_RECOMMENDED.libnet+= libnet>=1.0.1bnb4
+BUILDLINK_API_DEPENDS.libnet+= libnet>=1.0.1bnb3
+BUILDLINK_ABI_DEPENDS.libnet+= libnet>=1.0.1bnb4
BUILDLINK_PKGSRCDIR.libnet?= ../../devel/libnet
.endif # LIBNET_BUILDLINK3_MK
diff --git a/devel/libnet11/buildlink3.mk b/devel/libnet11/buildlink3.mk
index ee78ef262f0..d01ee045f45 100644
--- a/devel/libnet11/buildlink3.mk
+++ b/devel/libnet11/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/01/20 18:04:58 adrianp Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:52 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBNET_BUILDLINK3_MK:= ${LIBNET_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibnet}
BUILDLINK_PACKAGES+= libnet
.if !empty(LIBNET_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libnet+= libnet>=1.1.2.1
+BUILDLINK_API_DEPENDS.libnet+= libnet>=1.1.2.1
BUILDLINK_PKGSRCDIR.libnet?= ../../devel/libnet11
.endif # LIBNET_BUILDLINK3_MK
diff --git a/devel/libntlm/buildlink3.mk b/devel/libntlm/buildlink3.mk
index 81b0662b4ec..71b48bf6740 100644
--- a/devel/libntlm/buildlink3.mk
+++ b/devel/libntlm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:13:30 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:52 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBNTLM_BUILDLINK3_MK:= ${LIBNTLM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibntlm}
BUILDLINK_PACKAGES+= libntlm
.if !empty(LIBNTLM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libntlm+= libntlm>=0.3.2
-BUILDLINK_RECOMMENDED.libntlm+= libntlm>=0.3.6nb1
+BUILDLINK_API_DEPENDS.libntlm+= libntlm>=0.3.2
+BUILDLINK_ABI_DEPENDS.libntlm+= libntlm>=0.3.6nb1
BUILDLINK_PKGSRCDIR.libntlm?= ../../devel/libntlm
.endif # LIBNTLM_BUILDLINK3_MK
diff --git a/devel/liboil/buildlink3.mk b/devel/liboil/buildlink3.mk
index dd2d2dd1521..3d55c3d00cb 100644
--- a/devel/liboil/buildlink3.mk
+++ b/devel/liboil/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2006/01/16 18:21:19 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:52 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBOIL_BUILDLINK3_MK:= ${LIBOIL_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nliboil}
BUILDLINK_PACKAGES+= liboil
.if !empty(LIBOIL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.liboil+= liboil>=0.3.6
+BUILDLINK_API_DEPENDS.liboil+= liboil>=0.3.6
BUILDLINK_PKGSRCDIR.liboil?= ../../devel/liboil
.endif # LIBOIL_BUILDLINK3_MK
diff --git a/devel/libole2/buildlink3.mk b/devel/libole2/buildlink3.mk
index d471a3db3b3..df19be935de 100644
--- a/devel/libole2/buildlink3.mk
+++ b/devel/libole2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:30 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:52 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBOLE2_BUILDLINK3_MK:= ${LIBOLE2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibole2}
BUILDLINK_PACKAGES+= libole2
.if !empty(LIBOLE2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libole2+= libole2>=0.2.4nb1
-BUILDLINK_RECOMMENDED.libole2+= libole2>=0.2.4nb2
+BUILDLINK_API_DEPENDS.libole2+= libole2>=0.2.4nb1
+BUILDLINK_ABI_DEPENDS.libole2+= libole2>=0.2.4nb2
BUILDLINK_PKGSRCDIR.libole2?= ../../devel/libole2
.endif # LIBOLE2_BUILDLINK3_MK
diff --git a/devel/liboop/buildlink3.mk b/devel/liboop/buildlink3.mk
index 5d00bfa30d7..5892f822997 100644
--- a/devel/liboop/buildlink3.mk
+++ b/devel/liboop/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:30 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:52 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBOOP_BUILDLINK3_MK:= ${LIBOOP_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nliboop}
BUILDLINK_PACKAGES+= liboop
.if !empty(LIBOOP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.liboop+= liboop>=0.9
-BUILDLINK_RECOMMENDED.liboop+= liboop>=1.0nb1
+BUILDLINK_API_DEPENDS.liboop+= liboop>=0.9
+BUILDLINK_ABI_DEPENDS.liboop+= liboop>=1.0nb1
BUILDLINK_PKGSRCDIR.liboop?= ../../devel/liboop
.endif # LIBOOP_BUILDLINK3_MK
diff --git a/devel/libosip/buildlink3.mk b/devel/libosip/buildlink3.mk
index 0062d5272e5..fff3befc7ca 100644
--- a/devel/libosip/buildlink3.mk
+++ b/devel/libosip/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2005/04/01 19:50:42 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:52 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBOSIP2_BUILDLINK3_MK:= ${LIBOSIP2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibosip2}
BUILDLINK_PACKAGES+= libosip2
.if !empty(LIBOSIP2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libosip2+= libosip2>=2.2.0
-BUILDLINK_RECOMMENDED.libosip2+= libosip2>=2.2.0
+BUILDLINK_API_DEPENDS.libosip2+= libosip2>=2.2.0
+BUILDLINK_ABI_DEPENDS.libosip2+= libosip2>=2.2.0
BUILDLINK_PKGSRCDIR.libosip2?= ../../devel/libosip
.endif # LIBOSIP2_BUILDLINK3_MK
diff --git a/devel/libportlib/buildlink3.mk b/devel/libportlib/buildlink3.mk
index 9bc3572e49b..47de17794a0 100644
--- a/devel/libportlib/buildlink3.mk
+++ b/devel/libportlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2005/04/09 18:38:10 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:53 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBPORTLIB_BUILDLINK3_MK:= ${LIBPORTLIB_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibportlib}
BUILDLINK_PACKAGES+= libportlib
.if !empty(LIBPORTLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libportlib+= libportlib>=1.01
+BUILDLINK_API_DEPENDS.libportlib+= libportlib>=1.01
BUILDLINK_PKGSRCDIR.libportlib?= ../../devel/libportlib
BUILDLINK_DEPMETHOD.libportlib?= build
.endif # LIBPORTLIB_BUILDLINK3_MK
diff --git a/devel/libproplist/buildlink3.mk b/devel/libproplist/buildlink3.mk
index 522800052ea..cb9f7fffeaa 100644
--- a/devel/libproplist/buildlink3.mk
+++ b/devel/libproplist/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:13:30 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:53 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBPROPLIST_BUILDLINK3_MK:= ${LIBPROPLIST_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibproplist}
BUILDLINK_PACKAGES+= libproplist
.if !empty(LIBPROPLIST_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libproplist+= libproplist>=0.10.1
-BUILDLINK_RECOMMENDED.libproplist+= libproplist>=0.10.1nb1
+BUILDLINK_API_DEPENDS.libproplist+= libproplist>=0.10.1
+BUILDLINK_ABI_DEPENDS.libproplist+= libproplist>=0.10.1nb1
BUILDLINK_PKGSRCDIR.libproplist?= ../../devel/libproplist
.endif # LIBPROPLIST_BUILDLINK3_MK
diff --git a/devel/librfuncs/buildlink3.mk b/devel/librfuncs/buildlink3.mk
index 4a28ee9944b..755a431ca8a 100644
--- a/devel/librfuncs/buildlink3.mk
+++ b/devel/librfuncs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/01/26 18:47:06 shannonjr Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:53 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBRFUNCS_BUILDLINK3_MK:= ${LIBRFUNCS_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibrfuncs}
BUILDLINK_PACKAGES+= librfuncs
.if !empty(LIBRFUNCS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.librfuncs+= librfuncs>=1.0.4
+BUILDLINK_API_DEPENDS.librfuncs+= librfuncs>=1.0.4
BUILDLINK_PKGSRCDIR.librfuncs?= ../../devel/librfuncs
.endif # LIBRFUNCS_BUILDLINK3_MK
diff --git a/devel/librsync/buildlink3.mk b/devel/librsync/buildlink3.mk
index f7d083b3977..4af1b4630a6 100644
--- a/devel/librsync/buildlink3.mk
+++ b/devel/librsync/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:53 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBRSYNC_BUILDLINK3_MK:= ${LIBRSYNC_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibrsync}
BUILDLINK_PACKAGES+= librsync
.if !empty(LIBRSYNC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.librsync+= librsync>=0.9.6nb2
-BUILDLINK_RECOMMENDED.librsync+= librsync>=0.9.7nb1
+BUILDLINK_API_DEPENDS.librsync+= librsync>=0.9.6nb2
+BUILDLINK_ABI_DEPENDS.librsync+= librsync>=0.9.7nb1
BUILDLINK_PKGSRCDIR.librsync?= ../../devel/librsync
.endif # LIBRSYNC_BUILDLINK3_MK
diff --git a/devel/libscsi/buildlink3.mk b/devel/libscsi/buildlink3.mk
index 925490dfe5e..e6c44a2c810 100644
--- a/devel/libscsi/buildlink3.mk
+++ b/devel/libscsi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/05/31 17:13:26 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:53 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBSCSI_BUILDLINK3_MK:= ${LIBSCSI_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibscsi}
BUILDLINK_PACKAGES+= libscsi
.if !empty(LIBSCSI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libscsi+= libscsi>=1.6
+BUILDLINK_API_DEPENDS.libscsi+= libscsi>=1.6
BUILDLINK_PKGSRCDIR.libscsi?= ../../devel/libscsi
BUILDLINK_DEPMETHOD.libscsi?= build
.endif # LIBSCSI_BUILDLINK3_MK
diff --git a/devel/libsigc++/buildlink3.mk b/devel/libsigc++/buildlink3.mk
index 2ee27d042ca..37dd254971d 100644
--- a/devel/libsigc++/buildlink3.mk
+++ b/devel/libsigc++/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:08:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:53 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBSIGC++_BUILDLINK3_MK:= ${LIBSIGC++_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibsigcxx}
BUILDLINK_PACKAGES+= libsigcxx
.if !empty(LIBSIGC++_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libsigcxx+= libsigc++>=1.2.3nb1
-BUILDLINK_RECOMMENDED.libsigcxx+= libsigc++>=1.2.7nb1
+BUILDLINK_API_DEPENDS.libsigcxx+= libsigc++>=1.2.3nb1
+BUILDLINK_ABI_DEPENDS.libsigcxx+= libsigc++>=1.2.7nb1
BUILDLINK_PKGSRCDIR.libsigcxx?= ../../devel/libsigc++
.endif # LIBSIGC++_BUILDLINK3_MK
diff --git a/devel/libsigc++2/buildlink3.mk b/devel/libsigc++2/buildlink3.mk
index 994aeecb167..8a6c21e9480 100644
--- a/devel/libsigc++2/buildlink3.mk
+++ b/devel/libsigc++2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:53 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBSIGC++_BUILDLINK3_MK:= ${LIBSIGC++_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibsigcxx}
BUILDLINK_PACKAGES+= libsigcxx
.if !empty(LIBSIGC++_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libsigcxx+= libsigc++2>=2.0.3
-BUILDLINK_RECOMMENDED.libsigcxx+= libsigc++2>=2.0.17nb1
+BUILDLINK_API_DEPENDS.libsigcxx+= libsigc++2>=2.0.3
+BUILDLINK_ABI_DEPENDS.libsigcxx+= libsigc++2>=2.0.17nb1
BUILDLINK_PKGSRCDIR.libsigcxx?= ../../devel/libsigc++2
.endif # LIBSIGC++_BUILDLINK3_MK
diff --git a/devel/libsigsegv/buildlink3.mk b/devel/libsigsegv/buildlink3.mk
index 8f4a4064fc5..280dcb8f2c2 100644
--- a/devel/libsigsegv/buildlink3.mk
+++ b/devel/libsigsegv/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/03/11 22:03:52 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:53 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBSIGSEGV_BUILDLINK3_MK:= ${LIBSIGSEGV_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibsigsegv}
BUILDLINK_PACKAGES+= libsigsegv
.if !empty(LIBSIGSEGV_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libsigsegv+= libsigsegv>=2.2
+BUILDLINK_API_DEPENDS.libsigsegv+= libsigsegv>=2.2
BUILDLINK_PKGSRCDIR.libsigsegv?= ../../devel/libsigsegv
# only installs a static library
BUILDLINK_DEPMETHOD.libsigsegv?= build
diff --git a/devel/libslang/buildlink3.mk b/devel/libslang/buildlink3.mk
index 7653b0c811f..1adda9d8dcb 100644
--- a/devel/libslang/buildlink3.mk
+++ b/devel/libslang/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:08:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:21:53 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBSLANG_BUILDLINK3_MK:= ${LIBSLANG_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibslang}
BUILDLINK_PACKAGES+= libslang
.if !empty(LIBSLANG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libslang+= libslang>=1.4.9nb1
-BUILDLINK_RECOMMENDED.libslang+= libslang>=1.4.9nb4
+BUILDLINK_API_DEPENDS.libslang+= libslang>=1.4.9nb1
+BUILDLINK_ABI_DEPENDS.libslang+= libslang>=1.4.9nb4
BUILDLINK_PKGSRCDIR.libslang?= ../../devel/libslang
.endif # LIBSLANG_BUILDLINK3_MK
diff --git a/devel/libstatgrab/buildlink3.mk b/devel/libstatgrab/buildlink3.mk
index bcc57b9bbf8..b8427f068d2 100644
--- a/devel/libstatgrab/buildlink3.mk
+++ b/devel/libstatgrab/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/10/30 00:30:29 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:53 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBSTATGRAB_BUILDLINK3_MK:= ${LIBSTATGRAB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibstatgrab}
BUILDLINK_PACKAGES+= libstatgrab
.if !empty(LIBSTATGRAB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libstatgrab+= libstatgrab>=0.10
-BUILDLINK_RECOMMENDED.libstatgrab+= libstatgrab>=0.10.3nb1
+BUILDLINK_API_DEPENDS.libstatgrab+= libstatgrab>=0.10
+BUILDLINK_ABI_DEPENDS.libstatgrab+= libstatgrab>=0.10.3nb1
BUILDLINK_PKGSRCDIR.libstatgrab?= ../../devel/libstatgrab
.endif # LIBSTATGRAB_BUILDLINK3_MK
diff --git a/devel/libstroke/buildlink3.mk b/devel/libstroke/buildlink3.mk
index 7f28fd90947..405d5f8bed0 100644
--- a/devel/libstroke/buildlink3.mk
+++ b/devel/libstroke/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:08:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:21:53 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBSTROKE_BUILDLINK3_MK:= ${LIBSTROKE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibstroke}
BUILDLINK_PACKAGES+= libstroke
.if !empty(LIBSTROKE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libstroke+= libstroke>=0.5.1
-BUILDLINK_RECOMMENDED.libstroke+= libstroke>=0.5.1nb2
+BUILDLINK_API_DEPENDS.libstroke+= libstroke>=0.5.1
+BUILDLINK_ABI_DEPENDS.libstroke+= libstroke>=0.5.1nb2
BUILDLINK_PKGSRCDIR.libstroke?= ../../devel/libstroke
.endif # LIBSTROKE_BUILDLINK3_MK
diff --git a/devel/libtar/buildlink3.mk b/devel/libtar/buildlink3.mk
index 5c7df57a76f..b3337b4060b 100644
--- a/devel/libtar/buildlink3.mk
+++ b/devel/libtar/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:53 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBTAR_BUILDLINK3_MK:= ${LIBTAR_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibtar}
BUILDLINK_PACKAGES+= libtar
.if !empty(LIBTAR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libtar+= libtar>=1.2.11
+BUILDLINK_API_DEPENDS.libtar+= libtar>=1.2.11
BUILDLINK_PKGSRCDIR.libtar?= ../../devel/libtar
.endif # LIBTAR_BUILDLINK3_MK
diff --git a/devel/libtecla/buildlink3.mk b/devel/libtecla/buildlink3.mk
index 25e13976b8a..ad20a8042ae 100644
--- a/devel/libtecla/buildlink3.mk
+++ b/devel/libtecla/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:08:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:53 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBTECLA_BUILDLINK3_MK:= ${LIBTECLA_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibtecla}
BUILDLINK_PACKAGES+= libtecla
.if !empty(LIBTECLA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libtecla+= libtecla>=1.5.0
-BUILDLINK_RECOMMENDED.libtecla?= libtecla>=1.6.1nb1
+BUILDLINK_API_DEPENDS.libtecla+= libtecla>=1.5.0
+BUILDLINK_ABI_DEPENDS.libtecla?= libtecla>=1.6.1nb1
BUILDLINK_PKGSRCDIR.libtecla?= ../../devel/libtecla
.endif # LIBTECLA_BUILDLINK3_MK
diff --git a/devel/libts/buildlink3.mk b/devel/libts/buildlink3.mk
index dc1e145d656..9efc891b2ee 100644
--- a/devel/libts/buildlink3.mk
+++ b/devel/libts/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2005/03/31 01:03:12 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:53 reed Exp $
BUILDLINK_DEPMETHOD.libts?= build
@@ -13,7 +13,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibts}
BUILDLINK_PACKAGES+= libts
.if !empty(LIBTS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libts+= libts>=1.08
+BUILDLINK_API_DEPENDS.libts+= libts>=1.08
BUILDLINK_PKGSRCDIR.libts?= ../../devel/libts
.endif # LIBTS_BUILDLINK3_MK
diff --git a/devel/libusb/buildlink3.mk b/devel/libusb/buildlink3.mk
index 1a2e5882de1..534268c9b74 100644
--- a/devel/libusb/buildlink3.mk
+++ b/devel/libusb/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/03/11 08:34:13 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:53 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBUSB_BUILDLINK3_MK:= ${LIBUSB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibusb}
BUILDLINK_PACKAGES+= libusb
.if !empty(LIBUSB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libusb+= libusb>=0.1.7
-BUILDLINK_RECOMMENDED.libusb+= libusb>=0.1.8nb2
+BUILDLINK_API_DEPENDS.libusb+= libusb>=0.1.7
+BUILDLINK_ABI_DEPENDS.libusb+= libusb>=0.1.8nb2
BUILDLINK_PKGSRCDIR.libusb?= ../../devel/libusb
.endif # LIBUSB_BUILDLINK3_MK
diff --git a/devel/libwnck/buildlink3.mk b/devel/libwnck/buildlink3.mk
index bffee127fb8..92492c68835 100644
--- a/devel/libwnck/buildlink3.mk
+++ b/devel/libwnck/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/05 23:08:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:21:53 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBWNCK_BUILDLINK3_MK:= ${LIBWNCK_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibwnck}
BUILDLINK_PACKAGES+= libwnck
.if !empty(LIBWNCK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libwnck+= libwnck>=2.10.0
-BUILDLINK_RECOMMENDED.libwnck?= libwnck>=2.12.2nb2
+BUILDLINK_API_DEPENDS.libwnck+= libwnck>=2.10.0
+BUILDLINK_ABI_DEPENDS.libwnck?= libwnck>=2.12.2nb2
BUILDLINK_PKGSRCDIR.libwnck?= ../../devel/libwnck
.endif # LIBWNCK_BUILDLINK3_MK
diff --git a/devel/lwp/buildlink3.mk b/devel/lwp/buildlink3.mk
index 765ac7ad094..5e032c19435 100644
--- a/devel/lwp/buildlink3.mk
+++ b/devel/lwp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:31 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:53 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LWP_BUILDLINK3_MK:= ${LWP_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlwp}
BUILDLINK_PACKAGES+= lwp
.if !empty(LWP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.lwp+= lwp>=1.6
-BUILDLINK_RECOMMENDED.lwp+= lwp>=1.10nb1
+BUILDLINK_API_DEPENDS.lwp+= lwp>=1.6
+BUILDLINK_ABI_DEPENDS.lwp+= lwp>=1.10nb1
BUILDLINK_PKGSRCDIR.lwp?= ../../devel/lwp
.endif # LWP_BUILDLINK3_MK
diff --git a/devel/nbitools/buildlink3.mk b/devel/nbitools/buildlink3.mk
index a07fd1e6391..f1d1e5fee42 100644
--- a/devel/nbitools/buildlink3.mk
+++ b/devel/nbitools/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2005/05/22 20:07:53 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:53 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
NBITOOLS_BUILDLINK3_MK:= ${NBITOOLS_BUILDLINK3_MK}+
@@ -13,7 +13,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nnbitools}
BUILDLINK_PACKAGES+= nbitools
.if !empty(NBITOOLS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.nbitools+= nbitools>=6.3
+BUILDLINK_API_DEPENDS.nbitools+= nbitools>=6.3
BUILDLINK_PKGSRCDIR.nbitools?= ../../devel/nbitools
BUILDLINK_DEPMETHOD.nbitools?= build
diff --git a/devel/ncurses/buildlink3.mk b/devel/ncurses/buildlink3.mk
index 719b98f2100..d847c469bdc 100644
--- a/devel/ncurses/buildlink3.mk
+++ b/devel/ncurses/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.24 2004/10/03 00:13:31 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2006/04/06 06:21:53 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
NCURSES_BUILDLINK3_MK:= ${NCURSES_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nncurses}
BUILDLINK_PACKAGES+= ncurses
.if !empty(NCURSES_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ncurses+= ncurses>=5.3nb1
-BUILDLINK_RECOMMENDED.ncurses+= ncurses>=5.4nb1
+BUILDLINK_API_DEPENDS.ncurses+= ncurses>=5.3nb1
+BUILDLINK_ABI_DEPENDS.ncurses+= ncurses>=5.4nb1
BUILDLINK_PKGSRCDIR.ncurses?= ../../devel/ncurses
.endif # NCURSES_BUILDLINK3_MK
diff --git a/devel/ncurses/builtin.mk b/devel/ncurses/builtin.mk
index 674bf08b6df..3297d8aa5a2 100644
--- a/devel/ncurses/builtin.mk
+++ b/devel/ncurses/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.10 2006/04/04 19:11:33 jlam Exp $
+# $NetBSD: builtin.mk,v 1.11 2006/04/06 06:21:54 reed Exp $
BUILTIN_PKG:= ncurses
@@ -53,7 +53,7 @@ USE_BUILTIN.ncurses= ${IS_BUILTIN.ncurses}
. if defined(BUILTIN_PKG.ncurses) && \
!empty(IS_BUILTIN.ncurses:M[yY][eE][sS])
USE_BUILTIN.ncurses= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.ncurses}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.ncurses}
. if !empty(USE_BUILTIN.ncurses:M[yY][eE][sS])
USE_BUILTIN.ncurses!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.ncurses:Q}; then \
diff --git a/devel/netcdf/buildlink3.mk b/devel/netcdf/buildlink3.mk
index 31a0407872e..f52f58c53fd 100644
--- a/devel/netcdf/buildlink3.mk
+++ b/devel/netcdf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:31 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:54 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
NETCDF_BUILDLINK3_MK:= ${NETCDF_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nnetcdf}
BUILDLINK_PACKAGES+= netcdf
.if !empty(NETCDF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.netcdf+= netcdf>=3.5
-BUILDLINK_RECOMMENDED.netcdf+= netcdf>=3.5.0nb2
+BUILDLINK_API_DEPENDS.netcdf+= netcdf>=3.5
+BUILDLINK_ABI_DEPENDS.netcdf+= netcdf>=3.5.0nb2
BUILDLINK_PKGSRCDIR.netcdf?= ../../devel/netcdf
.endif # NETCDF_BUILDLINK3_MK
diff --git a/devel/newt/buildlink3.mk b/devel/newt/buildlink3.mk
index c458f5c3065..6b4837408c5 100644
--- a/devel/newt/buildlink3.mk
+++ b/devel/newt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:08:49 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:54 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
NEWT_BUILDLINK3_MK:= ${NEWT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nnewt}
BUILDLINK_PACKAGES+= newt
.if !empty(NEWT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.newt+= newt>=0.51.6
-BUILDLINK_RECOMMENDED.newt?= newt>=0.51.6nb2
+BUILDLINK_API_DEPENDS.newt+= newt>=0.51.6
+BUILDLINK_ABI_DEPENDS.newt?= newt>=0.51.6nb2
BUILDLINK_PKGSRCDIR.newt?= ../../devel/newt
.endif # NEWT_BUILDLINK3_MK
diff --git a/devel/nspr/buildlink3.mk b/devel/nspr/buildlink3.mk
index 53689973fbb..015107f4e24 100644
--- a/devel/nspr/buildlink3.mk
+++ b/devel/nspr/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:49 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:54 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
NSPR_BUILDLINK3_MK:= ${NSPR_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nnspr}
BUILDLINK_PACKAGES+= nspr
.if !empty(NSPR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.nspr+= nspr>=4.4.1nb1
-BUILDLINK_RECOMMENDED.nspr+= nspr>=4.6.1nb1
+BUILDLINK_API_DEPENDS.nspr+= nspr>=4.4.1nb1
+BUILDLINK_ABI_DEPENDS.nspr+= nspr>=4.6.1nb1
BUILDLINK_PKGSRCDIR.nspr?= ../../devel/nspr
BUILDLINK_FILES.nspr+= lib/nspr/*
diff --git a/devel/nss/Makefile b/devel/nss/Makefile
index 7d03d715996..e0ca39d2ec1 100644
--- a/devel/nss/Makefile
+++ b/devel/nss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/02/05 23:08:49 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2006/04/06 06:21:54 reed Exp $
DISTNAME= nss-3.9.2
PKGREVISION= 4
@@ -77,7 +77,7 @@ do-install:
"-lnss3 -lsmime3 -lssl3 -lsoftokn3 ${BUILDLINK_LIBS.pthread}"; \
} >${PREFIX}/lib/pkgconfig/nss.pc
-BUILDLINK_DEPENDS.nspr+= nspr>=4.4.1nb2
+BUILDLINK_API_DEPENDS.nspr+= nspr>=4.4.1nb2
.include "../../devel/nspr/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
diff --git a/devel/nss/buildlink3.mk b/devel/nss/buildlink3.mk
index b06ca0d4fae..ae049cdd4b6 100644
--- a/devel/nss/buildlink3.mk
+++ b/devel/nss/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:08:49 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:54 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
NSS_BUILDLINK3_MK:= ${NSS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nnss}
BUILDLINK_PACKAGES+= nss
.if !empty(NSS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.nss+= nss>=3.9.2nb1
-BUILDLINK_RECOMMENDED.nss+= nss>=3.9.2nb4
+BUILDLINK_API_DEPENDS.nss+= nss>=3.9.2nb1
+BUILDLINK_ABI_DEPENDS.nss+= nss>=3.9.2nb4
BUILDLINK_PKGSRCDIR.nss?= ../../devel/nss
BUILDLINK_FILES.nss+= lib/nss/*
diff --git a/devel/oaf/buildlink3.mk b/devel/oaf/buildlink3.mk
index 1aee02f2234..957aba0f1cd 100644
--- a/devel/oaf/buildlink3.mk
+++ b/devel/oaf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:08:49 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:54 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OAF_BUILDLINK3_MK:= ${OAF_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Noaf}
BUILDLINK_PACKAGES+= oaf
.if !empty(OAF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.oaf+= oaf>=0.6.10nb4
-BUILDLINK_RECOMMENDED.oaf+= oaf>=0.6.10nb7
+BUILDLINK_API_DEPENDS.oaf+= oaf>=0.6.10nb4
+BUILDLINK_ABI_DEPENDS.oaf+= oaf>=0.6.10nb7
BUILDLINK_PKGSRCDIR.oaf?= ../../devel/oaf
.endif # OAF_BUILDLINK3_MK
diff --git a/devel/ode/buildlink3.mk b/devel/ode/buildlink3.mk
index 8909fc337c9..7ecdedc9b2c 100644
--- a/devel/ode/buildlink3.mk
+++ b/devel/ode/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/10 20:35:28 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:54 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ODE_BUILDLINK3_MK:= ${ODE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Node}
BUILDLINK_PACKAGES+= ode
.if !empty(ODE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ode+= ode>=0.5nb2
-BUILDLINK_RECOMMENDED.ode?= ode>=0.5nb2
+BUILDLINK_API_DEPENDS.ode+= ode>=0.5nb2
+BUILDLINK_ABI_DEPENDS.ode?= ode>=0.5nb2
BUILDLINK_PKGSRCDIR.ode?= ../../devel/ode
.endif # ODE_BUILDLINK3_MK
diff --git a/devel/ogre/buildlink3.mk b/devel/ogre/buildlink3.mk
index 6fba6bf9fff..89d9a13f9df 100644
--- a/devel/ogre/buildlink3.mk
+++ b/devel/ogre/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:08:49 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:21:54 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OGRE_BUILDLINK3_MK:= ${OGRE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nogre}
BUILDLINK_PACKAGES+= ogre
.if !empty(OGRE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ogre+= ogre>=0.12.1nb1
-BUILDLINK_RECOMMENDED.ogre+= ogre>=0.12.1nb6
+BUILDLINK_API_DEPENDS.ogre+= ogre>=0.12.1nb1
+BUILDLINK_ABI_DEPENDS.ogre+= ogre>=0.12.1nb6
BUILDLINK_PKGSRCDIR.ogre?= ../../devel/ogre
.endif # OGRE_BUILDLINK3_MK
diff --git a/devel/p5-glib2/buildlink3.mk b/devel/p5-glib2/buildlink3.mk
index 08dbc4a9f8a..6aa4dd57a08 100644
--- a/devel/p5-glib2/buildlink3.mk
+++ b/devel/p5-glib2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:08:50 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:54 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
P5_GLIB2_BUILDLINK3_MK:= ${P5_GLIB2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Np5-glib2}
BUILDLINK_PACKAGES+= p5-glib2
.if !empty(P5_GLIB2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.p5-glib2+= p5-glib2>=1.103
-BUILDLINK_RECOMMENDED.p5-glib2?= p5-glib2>=1.103nb1
+BUILDLINK_API_DEPENDS.p5-glib2+= p5-glib2>=1.103
+BUILDLINK_ABI_DEPENDS.p5-glib2?= p5-glib2>=1.103nb1
BUILDLINK_PKGSRCDIR.p5-glib2?= ../../devel/p5-glib2
.endif # P5_GLIB2_BUILDLINK3_MK
diff --git a/devel/pango/Makefile b/devel/pango/Makefile
index da76de763ce..97dc9c3f967 100644
--- a/devel/pango/Makefile
+++ b/devel/pango/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2006/03/14 19:50:15 tron Exp $
+# $NetBSD: Makefile,v 1.73 2006/04/06 06:21:54 reed Exp $
DISTNAME= pango-1.12.0
CATEGORIES= devel fonts
@@ -40,8 +40,8 @@ CONFIGURE_ARGS+= --with-qt=no
# Avoid an ICE in gcc2 on sparc64
CONFIGURE_ENV+= F77=${FALSE:Q}
-BUILDLINK_DEPENDS.Xrender+= Xrender>=0.8
-BUILDLINK_DEPENDS.glib2+= glib2>=2.6.0
+BUILDLINK_API_DEPENDS.Xrender+= Xrender>=0.8
+BUILDLINK_API_DEPENDS.glib2+= glib2>=2.6.0
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
diff --git a/devel/pango/buildlink3.mk b/devel/pango/buildlink3.mk
index 2fcdbf43486..55083664459 100644
--- a/devel/pango/buildlink3.mk
+++ b/devel/pango/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/02/05 23:08:50 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/04/06 06:21:54 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PANGO_BUILDLINK3_MK:= ${PANGO_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npango}
BUILDLINK_PACKAGES+= pango
.if !empty(PANGO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pango+= pango>=1.6.0
-BUILDLINK_RECOMMENDED.pango+= pango>=1.10.2nb2
+BUILDLINK_API_DEPENDS.pango+= pango>=1.6.0
+BUILDLINK_ABI_DEPENDS.pango+= pango>=1.10.2nb2
BUILDLINK_PKGSRCDIR.pango?= ../../devel/pango
.endif # PANGO_BUILDLINK3_MK
diff --git a/devel/pccts/buildlink3.mk b/devel/pccts/buildlink3.mk
index 08000bf0d7d..6c7a3742144 100644
--- a/devel/pccts/buildlink3.mk
+++ b/devel/pccts/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:08:50 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:54 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PCCTS_BUILDLINK3_MK:= ${PCCTS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npccts}
BUILDLINK_PACKAGES+= pccts
.if !empty(PCCTS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pccts+= pccts>=1.33.22
-BUILDLINK_RECOMMENDED.pccts?= pccts>=1.33.22nb1
+BUILDLINK_API_DEPENDS.pccts+= pccts>=1.33.22
+BUILDLINK_ABI_DEPENDS.pccts?= pccts>=1.33.22nb1
BUILDLINK_PKGSRCDIR.pccts?= ../../devel/pccts
BUILDLINK_DEPMETHOD.pccts?= build
.endif # PCCTS_BUILDLINK3_MK
diff --git a/devel/pcre++/buildlink3.mk b/devel/pcre++/buildlink3.mk
index f2c9b8b7df8..8b123a47254 100644
--- a/devel/pcre++/buildlink3.mk
+++ b/devel/pcre++/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/12/26 22:09:50 zuntum Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:54 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PCRE++_BUILDLINK3_MK:= ${PCRE++_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npcrexx}
BUILDLINK_PACKAGES+= pcrexx
.if !empty(PCRE++_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pcrexx+= pcre++>=0.9.5
+BUILDLINK_API_DEPENDS.pcrexx+= pcre++>=0.9.5
BUILDLINK_PKGSRCDIR.pcrexx?= ../../devel/pcre++
.endif # PCRE++_BUILDLINK3_MK
diff --git a/devel/pcre/buildlink3.mk b/devel/pcre/buildlink3.mk
index 988d1b051e8..b15583eb6ff 100644
--- a/devel/pcre/buildlink3.mk
+++ b/devel/pcre/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2005/08/30 12:34:07 salo Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:21:54 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PCRE_BUILDLINK3_MK:= ${PCRE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npcre}
BUILDLINK_PACKAGES+= pcre
.if !empty(PCRE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pcre+= pcre>=3.4nb1
-BUILDLINK_RECOMMENDED.pcre+= pcre>=6.2
+BUILDLINK_API_DEPENDS.pcre+= pcre>=3.4nb1
+BUILDLINK_ABI_DEPENDS.pcre+= pcre>=6.2
BUILDLINK_PKGSRCDIR.pcre?= ../../devel/pcre
.endif # PCRE_BUILDLINK3_MK
diff --git a/devel/physfs/buildlink3.mk b/devel/physfs/buildlink3.mk
index daf7bd084f5..4a07ec86d92 100644
--- a/devel/physfs/buildlink3.mk
+++ b/devel/physfs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2005/07/25 12:12:53 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:21:54 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PHYSFS_BUILDLINK3_MK:= ${PHYSFS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nphysfs}
BUILDLINK_PACKAGES+= physfs
.if !empty(PHYSFS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.physfs+= physfs>=1.0.0
-BUILDLINK_RECOMMENDED.physfs+= physfs>=1.0.1
+BUILDLINK_API_DEPENDS.physfs+= physfs>=1.0.0
+BUILDLINK_ABI_DEPENDS.physfs+= physfs>=1.0.1
BUILDLINK_PKGSRCDIR.physfs?= ../../devel/physfs
.endif # PHYSFS_BUILDLINK3_MK
diff --git a/devel/popt/buildlink3.mk b/devel/popt/buildlink3.mk
index 55ee1698549..0df0227ae78 100644
--- a/devel/popt/buildlink3.mk
+++ b/devel/popt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:08:50 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:21:55 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
POPT_BUILDLINK3_MK:= ${POPT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npopt}
BUILDLINK_PACKAGES+= popt
.if !empty(POPT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.popt+= popt>=1.7nb3
-BUILDLINK_RECOMMENDED.popt+= popt>=1.7nb6
+BUILDLINK_API_DEPENDS.popt+= popt>=1.7nb3
+BUILDLINK_ABI_DEPENDS.popt+= popt>=1.7nb6
BUILDLINK_PKGSRCDIR.popt?= ../../devel/popt
.endif # POPT_BUILDLINK3_MK
diff --git a/devel/pth/buildlink3.mk b/devel/pth/buildlink3.mk
index b24b5f4bf58..b9f0b128a51 100644
--- a/devel/pth/buildlink3.mk
+++ b/devel/pth/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/10/03 00:13:32 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:21:55 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PTH_BUILDLINK3_MK:= ${PTH_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npth}
BUILDLINK_PACKAGES+= pth
.if !empty(PTH_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pth+= pth>=2.0.0
-BUILDLINK_RECOMMENDED.pth+= pth>=2.0.0nb2
+BUILDLINK_API_DEPENDS.pth+= pth>=2.0.0
+BUILDLINK_ABI_DEPENDS.pth+= pth>=2.0.0nb2
BUILDLINK_PKGSRCDIR.pth?= ../../devel/pth
.endif # PTH_BUILDLINK3_MK
diff --git a/devel/pthread-sem/buildlink3.mk b/devel/pthread-sem/buildlink3.mk
index acaf80fe272..50c43b2a2a1 100644
--- a/devel/pthread-sem/buildlink3.mk
+++ b/devel/pthread-sem/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:12 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:55 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PTHREAD_SEM_BUILDLINK3_MK:= ${PTHREAD_SEM_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npthread-sem}
BUILDLINK_PACKAGES+= pthread-sem
.if !empty(PTHREAD_SEM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pthread-sem+= pthread-sem>=1.0
+BUILDLINK_API_DEPENDS.pthread-sem+= pthread-sem>=1.0
BUILDLINK_PKGSRCDIR.pthread-sem?= ../../devel/pthread-sem
.endif # PTHREAD_SEM_BUILDLINK3_MK
diff --git a/devel/pthread-stublib/buildlink3.mk b/devel/pthread-stublib/buildlink3.mk
index d2e72fc9e81..5d960c4a167 100644
--- a/devel/pthread-stublib/buildlink3.mk
+++ b/devel/pthread-stublib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/03/23 11:40:30 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:55 reed Exp $
# XXX
# XXX This file was created automatically using createbuildlink-3.10.
# XXX After this file has been verified as correct, the comment lines
@@ -21,7 +21,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npthread-stublib}
BUILDLINK_PACKAGES+= pthread-stublib
.if !empty(PTHREAD_STUBLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pthread-stublib+= pthread-stublib>=1.0
+BUILDLINK_API_DEPENDS.pthread-stublib+= pthread-stublib>=1.0
BUILDLINK_PKGSRCDIR.pthread-stublib?= ../../devel/pthread-stublib
.endif # PTHREAD_STUBLIB_BUILDLINK3_MK
diff --git a/devel/pwlib/buildlink3.mk b/devel/pwlib/buildlink3.mk
index 3d5e9893785..f35d773e439 100644
--- a/devel/pwlib/buildlink3.mk
+++ b/devel/pwlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:08:50 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:21:55 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PWLIB_BUILDLINK3_MK:= ${PWLIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npwlib}
BUILDLINK_PACKAGES+= pwlib
.if !empty(PWLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pwlib+= pwlib>=1.8.3nb1
-BUILDLINK_RECOMMENDED.pwlib?= pwlib>=1.8.3nb3
+BUILDLINK_API_DEPENDS.pwlib+= pwlib>=1.8.3nb1
+BUILDLINK_ABI_DEPENDS.pwlib?= pwlib>=1.8.3nb3
BUILDLINK_PKGSRCDIR.pwlib?= ../../devel/pwlib
.endif # PWLIB_BUILDLINK3_MK
diff --git a/devel/py-curses/Makefile b/devel/py-curses/Makefile
index bc872482764..38352bafa1d 100644
--- a/devel/py-curses/Makefile
+++ b/devel/py-curses/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2006/02/05 23:08:51 joerg Exp $
+# $NetBSD: Makefile,v 1.30 2006/04/06 06:21:55 reed Exp $
#
PKGNAME= ${PYPKGPREFIX}-curses-0
@@ -20,7 +20,7 @@ PY_PATCHPLIST= yes
PY_SETUP_SUBST= NCURSESPREFIX=${BUILDLINK_PREFIX.ncurses}
-BUILDLINK_DEPENDS.python23+= python23>=2.3nb2
+BUILDLINK_API_DEPENDS.python23+= python23>=2.3nb2
# ignore errors due to missing files (EXTRACT_ELEMENTS!)
do-patch:
diff --git a/devel/py-curses/buildlink3.mk b/devel/py-curses/buildlink3.mk
index 394901f1d3f..5c673d981d5 100644
--- a/devel/py-curses/buildlink3.mk
+++ b/devel/py-curses/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:08:51 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:55 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_CURSES_BUILDLINK3_MK:= ${PY_CURSES_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npycurses}
BUILDLINK_PACKAGES+= pycurses
.if !empty(PY_CURSES_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pycurses+= ${PYPKGPREFIX}-curses-[0-9]*
-BUILDLINK_RECOMMENDED.pycurses?= ${PYPKGPREFIX}-curses>=0nb4
+BUILDLINK_API_DEPENDS.pycurses+= ${PYPKGPREFIX}-curses-[0-9]*
+BUILDLINK_ABI_DEPENDS.pycurses?= ${PYPKGPREFIX}-curses>=0nb4
BUILDLINK_PKGSRCDIR.pycurses?= ../../devel/py-curses
.endif # PY_CURSES_BUILDLINK3_MK
diff --git a/devel/py-cursespanel/buildlink3.mk b/devel/py-cursespanel/buildlink3.mk
index 1e384787b68..2c4aaaee149 100644
--- a/devel/py-cursespanel/buildlink3.mk
+++ b/devel/py-cursespanel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:08:51 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:55 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_CURSESPANEL_BUILDLINK3_MK:= ${PY_CURSESPANEL_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npycursespanel}
BUILDLINK_PACKAGES+= pycursespanel
.if !empty(PY_CURSESPANEL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pycursespanel+= ${PYPKGPREFIX}-cursespanel-[0-9]*
-BUILDLINK_RECOMMENDED.pycursespanel?= ${PYPKGPREFIX}-cursespanel>=0nb3
+BUILDLINK_API_DEPENDS.pycursespanel+= ${PYPKGPREFIX}-cursespanel-[0-9]*
+BUILDLINK_ABI_DEPENDS.pycursespanel?= ${PYPKGPREFIX}-cursespanel>=0nb3
BUILDLINK_PKGSRCDIR.pycursespanel?= ../../devel/py-cursespanel
.endif # PY_CURSESPANEL_BUILDLINK3_MK
diff --git a/devel/py-game/buildlink3.mk b/devel/py-game/buildlink3.mk
index b3c0968000a..c59fbd8d995 100644
--- a/devel/py-game/buildlink3.mk
+++ b/devel/py-game/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:51 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:55 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_GAME_BUILDLINK3_MK:= ${PY_GAME_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:N${PYPKGPREFIX}-game}
BUILDLINK_PACKAGES+= ${PYPKGPREFIX}-game
.if !empty(PY_GAME_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.${PYPKGPREFIX}-game+= ${PYPKGPREFIX}-game>=1.6
-BUILDLINK_RECOMMENDED.${PYPKGPREFIX}-game?= ${PYPKGPREFIX}-game>=1.7.1nb2
+BUILDLINK_API_DEPENDS.${PYPKGPREFIX}-game+= ${PYPKGPREFIX}-game>=1.6
+BUILDLINK_ABI_DEPENDS.${PYPKGPREFIX}-game?= ${PYPKGPREFIX}-game>=1.7.1nb2
BUILDLINK_PKGSRCDIR.${PYPKGPREFIX}-game?= ../../devel/py-game
.include "../../audio/SDL_mixer/buildlink3.mk"
diff --git a/devel/py-gobject/buildlink3.mk b/devel/py-gobject/buildlink3.mk
index e143afd6d2a..f05f434fccb 100644
--- a/devel/py-gobject/buildlink3.mk
+++ b/devel/py-gobject/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/02/07 18:59:59 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:55 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_GOBJECT_BUILDLINK3_MK:= ${PY_GOBJECT_BUILDLINK3_MK}+
@@ -13,7 +13,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npygobject}
BUILDLINK_PACKAGES+= pygobject
.if !empty(PY_GOBJECT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pygobject+= ${PYPKGPREFIX}-gobject>=2.9.1
+BUILDLINK_API_DEPENDS.pygobject+= ${PYPKGPREFIX}-gobject>=2.9.1
BUILDLINK_PKGSRCDIR.pygobject?= ../../devel/py-gobject
.endif # PY_GOBJECT_BUILDLINK3_MK
diff --git a/devel/py-readline/buildlink3.mk b/devel/py-readline/buildlink3.mk
index dfed2fcc0d5..177199f1bea 100644
--- a/devel/py-readline/buildlink3.mk
+++ b/devel/py-readline/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:08:51 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:55 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PYREADLINE_BUILDLINK3_MK:= ${PYREADLINE_BUILDLINK3_MK}+
@@ -14,8 +14,8 @@ BUILDLINK_PACKAGES+= pyreadline
.include "../../lang/python/pyversion.mk"
-BUILDLINK_DEPENDS.pyreadline+= ${PYPKGPREFIX}-readline-[0-9]*
-BUILDLINK_RECOMMENDED.pyreadline?= ${PYPKGPREFIX}-readline>=0nb2
+BUILDLINK_API_DEPENDS.pyreadline+= ${PYPKGPREFIX}-readline-[0-9]*
+BUILDLINK_ABI_DEPENDS.pyreadline?= ${PYPKGPREFIX}-readline>=0nb2
BUILDLINK_PKGSRCDIR.pyreadline?= ../../devel/py-readline
.endif # PYREADLINE_BUILDLINK3_MK
diff --git a/devel/readline/buildlink3.mk b/devel/readline/buildlink3.mk
index 71365d4bd9b..870adf22aa9 100644
--- a/devel/readline/buildlink3.mk
+++ b/devel/readline/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.21 2005/11/04 16:53:24 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2006/04/06 06:21:55 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
READLINE_BUILDLINK3_MK:= ${READLINE_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nreadline}
BUILDLINK_PACKAGES+= readline
.if !empty(READLINE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.readline+= readline>=2.2
-BUILDLINK_RECOMMENDED.readline+= readline>=5.0
+BUILDLINK_API_DEPENDS.readline+= readline>=2.2
+BUILDLINK_ABI_DEPENDS.readline+= readline>=5.0
BUILDLINK_PKGSRCDIR.readline?= ../../devel/readline
BUILDLINK_FILES.readline+= include/history.h
diff --git a/devel/readline/builtin.mk b/devel/readline/builtin.mk
index 075a731ea28..0fffdfe6bd1 100644
--- a/devel/readline/builtin.mk
+++ b/devel/readline/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.13 2006/03/30 18:39:57 jlam Exp $
+# $NetBSD: builtin.mk,v 1.14 2006/04/06 06:21:55 reed Exp $
BUILTIN_PKG:= readline
@@ -55,7 +55,7 @@ USE_BUILTIN.readline= ${IS_BUILTIN.readline}
. if defined(BUILTIN_PKG.readline) && \
!empty(IS_BUILTIN.readline:M[yY][eE][sS])
USE_BUILTIN.readline= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.readline}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.readline}
. if !empty(USE_BUILTIN.readline:M[yY][eE][sS])
USE_BUILTIN.readline!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.readline:Q}; then \
diff --git a/devel/rpc2/buildlink3.mk b/devel/rpc2/buildlink3.mk
index 7da97647e93..7b5cb2fc8b4 100644
--- a/devel/rpc2/buildlink3.mk
+++ b/devel/rpc2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:52 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:56 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
RPC2_BUILDLINK3_MK:= ${RPC2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nrpc2}
BUILDLINK_PACKAGES+= rpc2
.if !empty(RPC2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.rpc2+= rpc2>=1.10
-BUILDLINK_RECOMMENDED.rpc2+= rpc2>=1.27nb1
+BUILDLINK_API_DEPENDS.rpc2+= rpc2>=1.10
+BUILDLINK_ABI_DEPENDS.rpc2+= rpc2>=1.27nb1
BUILDLINK_PKGSRCDIR.rpc2?= ../../devel/rpc2
.endif # RPC2_BUILDLINK3_MK
diff --git a/devel/ruby-gnome2-pango/buildlink3.mk b/devel/ruby-gnome2-pango/buildlink3.mk
index ac9f6970c4d..d78218511a9 100644
--- a/devel/ruby-gnome2-pango/buildlink3.mk
+++ b/devel/ruby-gnome2-pango/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:53 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:56 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
RUBY_GNOME2_PANGO_BUILDLINK3_MK:= ${RUBY_GNOME2_PANGO_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nruby-gnome2-pango}
BUILDLINK_PACKAGES+= ruby-gnome2-pango
.if !empty(RUBY_GNOME2_PANGO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ruby-gnome2-pango+= ruby-gnome2-pango>=0.14.1
-BUILDLINK_RECOMMENDED.ruby-gnome2-pango?= ruby-gnome2-pango>=0.14.1nb2
+BUILDLINK_API_DEPENDS.ruby-gnome2-pango+= ruby-gnome2-pango>=0.14.1
+BUILDLINK_ABI_DEPENDS.ruby-gnome2-pango?= ruby-gnome2-pango>=0.14.1nb2
BUILDLINK_PKGSRCDIR.ruby-gnome2-pango?= ../../devel/ruby-gnome2-pango
.endif # RUBY_GNOME2_PANGO_BUILDLINK3_MK
diff --git a/devel/rudiments/buildlink3.mk b/devel/rudiments/buildlink3.mk
index efc9ac6678a..a0bc7bf5189 100644
--- a/devel/rudiments/buildlink3.mk
+++ b/devel/rudiments/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/03/11 02:41:51 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:56 reed Exp $
#
# This Makefile fragment is included by packages that use rudiments.
#
@@ -14,8 +14,8 @@ BUILDLINK_DEPENDS+= rudiments
.if !empty(RUDIMENTS_BUILDLINK3_MK:M+)
BUILDLINK_PACKAGES+= rudiments
-BUILDLINK_DEPENDS.rudiments+= rudiments>=0.25.1
-BUILDLINK_RECOMMENDED.rudiments+= rudiments>=0.28.2nb1
+BUILDLINK_API_DEPENDS.rudiments+= rudiments>=0.25.1
+BUILDLINK_ABI_DEPENDS.rudiments+= rudiments>=0.28.2nb1
BUILDLINK_PKGSRCDIR.rudiments?= ../../devel/rudiments
.endif # RUDIMENTS_BUILDLINK3_MK
diff --git a/devel/rvm/buildlink3.mk b/devel/rvm/buildlink3.mk
index 67d555ae118..4bcca887445 100644
--- a/devel/rvm/buildlink3.mk
+++ b/devel/rvm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:53 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:56 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
RVM_BUILDLINK3_MK:= ${RVM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nrvm}
BUILDLINK_PACKAGES+= rvm
.if !empty(RVM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.rvm+= rvm>=1.3
-BUILDLINK_RECOMMENDED.rvm+= rvm>=1.11nb1
+BUILDLINK_API_DEPENDS.rvm+= rvm>=1.3
+BUILDLINK_ABI_DEPENDS.rvm+= rvm>=1.11nb1
BUILDLINK_PKGSRCDIR.rvm?= ../../devel/rvm
.endif # RVM_BUILDLINK3_MK
diff --git a/devel/rx/buildlink3.mk b/devel/rx/buildlink3.mk
index d4215c389ef..95926621fae 100644
--- a/devel/rx/buildlink3.mk
+++ b/devel/rx/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:12 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:56 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
RX_BUILDLINK3_MK:= ${RX_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nrx}
BUILDLINK_PACKAGES+= rx
.if !empty(RX_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.rx+= rx>=1.5
+BUILDLINK_API_DEPENDS.rx+= rx>=1.5
BUILDLINK_PKGSRCDIR.rx?= ../../devel/rx
.endif # RX_BUILDLINK3_MK
diff --git a/devel/silc-toolkit/buildlink3.mk b/devel/silc-toolkit/buildlink3.mk
index 9dbcae91c51..06237065e65 100644
--- a/devel/silc-toolkit/buildlink3.mk
+++ b/devel/silc-toolkit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:33 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:56 reed Exp $
#
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsilc-toolkit}
BUILDLINK_PACKAGES+= silc-toolkit
.if !empty(SILC_TOOLKIT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.silc-toolkit+= silc-toolkit>=0.9.12
-BUILDLINK_RECOMMENDED.silc-toolkit+= silc-toolkit>=0.9.12nb1
+BUILDLINK_API_DEPENDS.silc-toolkit+= silc-toolkit>=0.9.12
+BUILDLINK_ABI_DEPENDS.silc-toolkit+= silc-toolkit>=0.9.12nb1
BUILDLINK_PKGSRCDIR.silc-toolkit?= ../../devel/silc-toolkit
.endif # SILC_TOOLKIT_BUILDLINK3_MK
diff --git a/devel/subversion-base/Makefile b/devel/subversion-base/Makefile
index 2328ea0f697..817b133d045 100644
--- a/devel/subversion-base/Makefile
+++ b/devel/subversion-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2006/04/05 01:42:00 epg Exp $
+# $NetBSD: Makefile,v 1.34 2006/04/06 06:21:56 reed Exp $
PKGNAME= subversion-base-${SVNVER}
COMMENT= Version control system, base programs and libraries
@@ -14,8 +14,8 @@ BUILD_DEFS+= PKG_BUILD_OPTIONS.apr
CONFIGURE_ARGS+= --without-apache
CONFIGURE_ARGS+= --without-apxs
-BUILDLINK_DEPENDS.apr+= apr>=0.9.5
-BUILDLINK_DEPENDS.neon+= neon>=0.24.7
+BUILDLINK_API_DEPENDS.apr+= apr>=0.9.5
+BUILDLINK_API_DEPENDS.neon+= neon>=0.24.7
.include "../../devel/apr/buildlink3.mk"
.include "../../www/neon/buildlink3.mk"
diff --git a/devel/subversion-base/buildlink3.mk b/devel/subversion-base/buildlink3.mk
index d8ee57a3edf..b38b9863c79 100644
--- a/devel/subversion-base/buildlink3.mk
+++ b/devel/subversion-base/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2006/02/07 19:58:06 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:56 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SUBVERSION_BASE_BUILDLINK3_MK:= ${SUBVERSION_BASE_BUILDLINK3_MK}+
@@ -14,8 +14,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsubversion-base}
BUILDLINK_PACKAGES+= subversion-base
.if !empty(SUBVERSION_BASE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.subversion-base+= subversion-base>=1.0.0
-BUILDLINK_RECOMMENDED.subversion-base?= subversion-base>=1.3.0nb2
+BUILDLINK_API_DEPENDS.subversion-base+= subversion-base>=1.0.0
+BUILDLINK_ABI_DEPENDS.subversion-base?= subversion-base>=1.3.0nb2
BUILDLINK_PKGSRCDIR.subversion-base?= ../../devel/subversion-base
BUILDLINK_FILES.subversion-base+= bin/svn-config
diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common
index 3bfa3e262c6..964272c6b65 100644
--- a/devel/subversion/Makefile.common
+++ b/devel/subversion/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.23 2006/04/04 03:36:32 reed Exp $
+# $NetBSD: Makefile.common,v 1.24 2006/04/06 06:21:56 reed Exp $
DISTNAME= subversion-${SVNVER}
CATEGORIES= devel
@@ -27,6 +27,6 @@ CONFIGURE_ARGS+= --with-ssl
# workaround: does not install info file, but does create directory
CONFIGURE_ARGS+= --infodir=${PREFIX}/${PKGINFODIR}
-BUILDLINK_DEPENDS.subversion-base+= subversion-base>=${SVNVER}
+BUILDLINK_API_DEPENDS.subversion-base+= subversion-base>=${SVNVER}
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/devel/swig/buildlink3.mk b/devel/swig/buildlink3.mk
index 6ddf2738e6a..1c8f15a1c0b 100644
--- a/devel/swig/buildlink3.mk
+++ b/devel/swig/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:54 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:56 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SWIG_BUILDLINK3_MK:= ${SWIG_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nswig}
BUILDLINK_PACKAGES+= swig
.if !empty(SWIG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.swig+= swig>=1.3.24
-BUILDLINK_RECOMMENDED.swig?= swig>=1.3.24nb2
+BUILDLINK_API_DEPENDS.swig+= swig>=1.3.24
+BUILDLINK_ABI_DEPENDS.swig?= swig>=1.3.24nb2
BUILDLINK_PKGSRCDIR.swig?= ../../devel/swig
# only contains a static library
BUILDLINK_DEPMETHOD.swig?= build
diff --git a/devel/syncdir/buildlink3.mk b/devel/syncdir/buildlink3.mk
index bebf6d69038..213a838fb01 100644
--- a/devel/syncdir/buildlink3.mk
+++ b/devel/syncdir/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:33 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:56 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SYNCDIR_BUILDLINK3_MK:= ${SYNCDIR_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsyncdir}
BUILDLINK_PACKAGES+= syncdir
.if !empty(SYNCDIR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.syncdir+= syncdir>=1.0
-BUILDLINK_RECOMMENDED.syncdir+= syncdir>=1.0nb1
+BUILDLINK_API_DEPENDS.syncdir+= syncdir>=1.0
+BUILDLINK_ABI_DEPENDS.syncdir+= syncdir>=1.0nb1
BUILDLINK_PKGSRCDIR.syncdir?= ../../devel/syncdir
.endif # SYNCDIR_BUILDLINK3_MK
diff --git a/devel/sysexits/buildlink3.mk b/devel/sysexits/buildlink3.mk
index ff4088be5e2..5de4f98ef54 100644
--- a/devel/sysexits/buildlink3.mk
+++ b/devel/sysexits/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2005/11/08 13:34:39 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:56 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SYSEXITS_BUILDLINK3_MK:= ${SYSEXITS_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsysexits}
BUILDLINK_PACKAGES+= sysexits
.if !empty(SYSEXITS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.sysexits+= sysexits>=1.1
+BUILDLINK_API_DEPENDS.sysexits+= sysexits>=1.1
BUILDLINK_DEPMETHOD.sysexits?= build
BUILDLINK_PKGSRCDIR.sysexits?= ../../devel/sysexits
.endif # SYSEXITS_BUILDLINK3_MK
diff --git a/devel/sysexits/builtin.mk b/devel/sysexits/builtin.mk
index 741ff7d8d5f..dc0145156d0 100644
--- a/devel/sysexits/builtin.mk
+++ b/devel/sysexits/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.2 2006/03/30 18:06:17 jlam Exp $
+# $NetBSD: builtin.mk,v 1.3 2006/04/06 06:21:56 reed Exp $
BUILTIN_PKG:= sysexits
@@ -31,7 +31,7 @@ USE_BUILTIN.sysexits= ${IS_BUILTIN.sysexits}
. if defined(BUILTIN_PKG.sysexits) && \
!empty(IS_BUILTIN.sysexits:M[yY][eE][sS])
USE_BUILTIN.sysexits= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.sysexits}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.sysexits}
. if !empty(USE_BUILTIN.sysexits:M[yY][eE][sS])
USE_BUILTIN.sysexits!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.sysexits:Q}; then \
diff --git a/devel/tcl-tclcl/buildlink3.mk b/devel/tcl-tclcl/buildlink3.mk
index f77cdeb292d..6eded7b33ac 100644
--- a/devel/tcl-tclcl/buildlink3.mk
+++ b/devel/tcl-tclcl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:54 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:56 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
TCL_TCLCL_BUILDLINK3_MK:= ${TCL_TCLCL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntcl-tclcl}
BUILDLINK_PACKAGES+= tcl-tclcl
.if !empty(TCL_TCLCL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tcl-tclcl+= tcl-tclcl>=1.15
-BUILDLINK_RECOMMENDED.tcl-tclcl+= tcl-tclcl>=1.17nb2
+BUILDLINK_API_DEPENDS.tcl-tclcl+= tcl-tclcl>=1.15
+BUILDLINK_ABI_DEPENDS.tcl-tclcl+= tcl-tclcl>=1.17nb2
BUILDLINK_PKGSRCDIR.tcl-tclcl?= ../../devel/tcl-tclcl
.endif # TCL_TCLCL_BUILDLINK3_MK
diff --git a/devel/teem/buildlink3.mk b/devel/teem/buildlink3.mk
index 70b696d5e67..e5004087eb6 100644
--- a/devel/teem/buildlink3.mk
+++ b/devel/teem/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:08:54 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:56 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
TEEM_BUILDLINK3_MK:= ${TEEM_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nteem}
BUILDLINK_PACKAGES+= teem
.if !empty(TEEM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.teem+= teem>=1.8.0
-BUILDLINK_RECOMMENDED.teem?= teem>=1.8.0nb1
+BUILDLINK_API_DEPENDS.teem+= teem>=1.8.0
+BUILDLINK_ABI_DEPENDS.teem?= teem>=1.8.0nb1
BUILDLINK_PKGSRCDIR.teem?= ../../devel/teem
BUILDLINK_FILES.teem+= include/teem/*
diff --git a/devel/tre/buildlink3.mk b/devel/tre/buildlink3.mk
index 57c76d4e0cd..ac72743dac0 100644
--- a/devel/tre/buildlink3.mk
+++ b/devel/tre/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/11/29 19:12:04 adrianp Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:56 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
TRE_BUILDLINK3_MK:= ${TRE_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntre}
BUILDLINK_PACKAGES+= tre
.if !empty(TRE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tre+= tre>=0.7.2
+BUILDLINK_API_DEPENDS.tre+= tre>=0.7.2
BUILDLINK_PKGSRCDIR.tre?= ../../devel/tre
BUILDLINK_DEPMETHOD.tre?= build
.endif # TRE_BUILDLINK3_MK
diff --git a/devel/ucl/buildlink3.mk b/devel/ucl/buildlink3.mk
index 0503bda6a51..ecd4384f1d0 100644
--- a/devel/ucl/buildlink3.mk
+++ b/devel/ucl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:34 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:56 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
UCL_BUILDLINK3_MK:= ${UCL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nucl}
BUILDLINK_PACKAGES+= ucl
.if !empty(UCL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ucl+= ucl>=1.02
-BUILDLINK_RECOMMENDED.ucl+= ucl>=1.02nb2
+BUILDLINK_API_DEPENDS.ucl+= ucl>=1.02
+BUILDLINK_ABI_DEPENDS.ucl+= ucl>=1.02nb2
BUILDLINK_PKGSRCDIR.ucl?= ../../devel/ucl
.endif # UCL_BUILDLINK3_MK
diff --git a/devel/vanessa_adt/buildlink3.mk b/devel/vanessa_adt/buildlink3.mk
index 15cb65bd5fb..d464ad3376c 100644
--- a/devel/vanessa_adt/buildlink3.mk
+++ b/devel/vanessa_adt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:34 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:56 reed Exp $
#
# This file was created automatically using createbuildlink-3.5.
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nvanessa_adt}
BUILDLINK_PACKAGES+= vanessa_adt
.if !empty(VANESSA_ADT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.vanessa_adt+= vanessa_adt>=0.0.6
-BUILDLINK_RECOMMENDED.vanessa_adt+= vanessa_adt>=0.0.6nb1
+BUILDLINK_API_DEPENDS.vanessa_adt+= vanessa_adt>=0.0.6
+BUILDLINK_ABI_DEPENDS.vanessa_adt+= vanessa_adt>=0.0.6nb1
BUILDLINK_PKGSRCDIR.vanessa_adt?= ../../devel/vanessa_adt
.endif # VANESSA_ADT_BUILDLINK3_MK
diff --git a/devel/vanessa_logger/buildlink3.mk b/devel/vanessa_logger/buildlink3.mk
index c125c1e36cb..2cd4c34620d 100644
--- a/devel/vanessa_logger/buildlink3.mk
+++ b/devel/vanessa_logger/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:34 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:56 reed Exp $
#
# This file was created automatically using createbuildlink-3.5.
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nvanessa_logger}
BUILDLINK_PACKAGES+= vanessa_logger
.if !empty(VANESSA_LOGGER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.vanessa_logger+= vanessa_logger>=0.0.7
-BUILDLINK_RECOMMENDED.vanessa_logger+= vanessa_logger>=0.0.7nb1
+BUILDLINK_API_DEPENDS.vanessa_logger+= vanessa_logger>=0.0.7
+BUILDLINK_ABI_DEPENDS.vanessa_logger+= vanessa_logger>=0.0.7nb1
BUILDLINK_PKGSRCDIR.vanessa_logger?= ../../devel/vanessa_logger
.endif # VANESSA_LOGGER_BUILDLINK3_MK
diff --git a/devel/vanessa_socket/buildlink3.mk b/devel/vanessa_socket/buildlink3.mk
index df80c3748c0..86980b275d9 100644
--- a/devel/vanessa_socket/buildlink3.mk
+++ b/devel/vanessa_socket/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:54 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:57 reed Exp $
#
# This file was created automatically using createbuildlink-3.5.
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nvanessa_socket}
BUILDLINK_PACKAGES+= vanessa_socket
.if !empty(VANESSA_SOCKET_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.vanessa_socket+= vanessa_socket>=0.0.7nb2
-BUILDLINK_RECOMMENDED.vanessa_socket?= vanessa_socket>=0.0.7nb3
+BUILDLINK_API_DEPENDS.vanessa_socket+= vanessa_socket>=0.0.7nb2
+BUILDLINK_ABI_DEPENDS.vanessa_socket?= vanessa_socket>=0.0.7nb3
BUILDLINK_PKGSRCDIR.vanessa_socket?= ../../devel/vanessa_socket
.endif # VANESSA_SOCKET_BUILDLINK3_MK
diff --git a/devel/zlib/buildlink3.mk b/devel/zlib/buildlink3.mk
index c94b0b636ea..e84fcfe97f5 100644
--- a/devel/zlib/buildlink3.mk
+++ b/devel/zlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2005/07/22 16:04:43 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2006/04/06 06:21:57 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ZLIB_BUILDLINK3_MK:= ${ZLIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nzlib}
BUILDLINK_PACKAGES+= zlib
.if !empty(ZLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.zlib+= zlib>=1.1.4nb1
-BUILDLINK_RECOMMENDED.zlib+= zlib>=1.2.3
+BUILDLINK_API_DEPENDS.zlib+= zlib>=1.1.4nb1
+BUILDLINK_ABI_DEPENDS.zlib+= zlib>=1.2.3
BUILDLINK_PKGSRCDIR.zlib?= ../../devel/zlib
.endif # ZLIB_BUILDLINK3_MK
diff --git a/devel/zlib/builtin.mk b/devel/zlib/builtin.mk
index 26080ad9a86..ddfd89f581c 100644
--- a/devel/zlib/builtin.mk
+++ b/devel/zlib/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.4 2006/03/30 18:06:17 jlam Exp $
+# $NetBSD: builtin.mk,v 1.5 2006/04/06 06:21:57 reed Exp $
BUILTIN_PKG:= zlib
@@ -69,7 +69,7 @@ USE_BUILTIN.zlib= ${IS_BUILTIN.zlib}
. if defined(BUILTIN_PKG.zlib) && \
!empty(IS_BUILTIN.zlib:M[yY][eE][sS])
USE_BUILTIN.zlib= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.zlib}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.zlib}
. if !empty(USE_BUILTIN.zlib:M[yY][eE][sS])
USE_BUILTIN.zlib!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.zlib:Q}; then \
diff --git a/doc/guide/files/buildlink.xml b/doc/guide/files/buildlink.xml
index 8f33b4a3995..2730d069d02 100644
--- a/doc/guide/files/buildlink.xml
+++ b/doc/guide/files/buildlink.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: buildlink.xml,v 1.13 2006/03/09 21:45:51 jlam Exp $ -->
+<!-- $NetBSD: buildlink.xml,v 1.14 2006/04/06 06:21:57 reed Exp $ -->
<chapter id="buildlink">
<title>Buildlink methodology</title>
@@ -85,7 +85,7 @@
</para>
<programlisting>
- BUILDLINK_DEPENDS.foo+= foo>=1.1.0
+ BUILDLINK_API_DEPENDS.foo+= foo>=1.1.0
.include "../../category/foo/buildlink3.mk"
</programlisting>
@@ -197,7 +197,7 @@
BUILDLINK_PACKAGES+= tiff
.if !empty(TIFF_BUILDLINK3_MK:M+)
- BUILDLINK_DEPENDS.tiff+= tiff>=3.6.1
+ BUILDLINK_API_DEPENDS.tiff+= tiff>=3.6.1
BUILDLINK_PKGSRCDIR.tiff?= ../../graphics/tiff
.endif # TIFF_BUILDLINK3_MK
@@ -235,7 +235,7 @@
<itemizedlist>
<listitem>
- <para> <varname>BUILDLINK_DEPENDS.<replaceable>pkg</replaceable></varname>
+ <para> <varname>BUILDLINK_API_DEPENDS.<replaceable>pkg</replaceable></varname>
is the actual dependency recorded in the installed
package; this should always be set using
<command>+=</command> to ensure that
@@ -363,12 +363,12 @@
</sect2>
<sect2 id="updating-buildlink-depends">
- <title>Updating <varname>BUILDLINK_DEPENDS.<replaceable>pkg</replaceable></varname> in <filename>buildlink3.mk</filename> files</title>
+ <title>Updating <varname>BUILDLINK_API_DEPENDS.<replaceable>pkg</replaceable></varname> in <filename>buildlink3.mk</filename> files</title>
<para>
There are two situations that require increasing the
dependency listed in
- <varname>BUILDLINK_DEPENDS.<replaceable>pkg</replaceable></varname>
+ <varname>BUILDLINK_API_DEPENDS.<replaceable>pkg</replaceable></varname>
after a package update: </para>
<orderedlist>
@@ -383,27 +383,27 @@
</orderedlist>
<para> In these cases,
- <varname>BUILDLINK_DEPENDS.<replaceable>pkg</replaceable></varname>
+ <varname>BUILDLINK_API_DEPENDS.<replaceable>pkg</replaceable></varname>
should be adjusted to require at least the new package
version. In some cases, the packages that depend on this new
version may need their <varname>PKGREVISION</varname>s
increased and, if they have <filename>buildlink3.mk</filename>
files, their
- <varname>BUILDLINK_DEPENDS.<replaceable>pkg</replaceable></varname>
+ <varname>BUILDLINK_API_DEPENDS.<replaceable>pkg</replaceable></varname>
adjusted, too. This is needed so that binary packages made
using it will require the correct package dependency and not
settle for an older one which will not contain the necessary
shared libraries. </para>
<para> Please take careful consideration before adjusting
- <varname>BUILDLINK_DEPENDS.<replaceable>pkg</replaceable></varname>
+ <varname>BUILDLINK_API_DEPENDS.<replaceable>pkg</replaceable></varname>
as we don't want to cause unneeded package deletions and
rebuilds. In many cases, new versions of packages work just
fine with older dependencies. See <xref
linkend="dependencies"/> for
more information about dependencies on other packages,
- including the <varname>BUILDLINK_RECOMMENDED</varname> and
- <varname>RECOMMENDED</varname> definitions. </para>
+ including the <varname>BUILDLINK_ABI_DEPENDS</varname> and
+ <varname>ABI_DEPENDS</varname> definitions. </para>
</sect2>
</sect1>
@@ -473,7 +473,7 @@
.if !defined(USE_BUILTIN.foo)
USE_BUILTIN.foo?= ${IS_BUILTIN.foo}
. if defined(BUILTIN_PKG.foo)
- . for _depend_ in ${BUILDLINK_DEPENDS.foo}
+ . for _depend_ in ${BUILDLINK_API_DEPENDS.foo}
. if !empty(USE_BUILTIN.foo:M[yY][eE][sS])
USE_BUILTIN.foo!= \
if ${PKG_ADMIN} pmatch '${_depend_}' ${BUILTIN_PKG.foo}; then \
@@ -519,11 +519,11 @@
<filename>builtin.mk</filename> files. The code in this
section must make the determination whether the built-in
software is adequate to satisfy the dependencies listed in
- <varname>BUILDLINK_DEPENDS.<replaceable>pkg</replaceable></varname>.
+ <varname>BUILDLINK_API_DEPENDS.<replaceable>pkg</replaceable></varname>.
This is typically done by comparing
<varname>BUILTIN_PKG.<replaceable>pkg</replaceable></varname>
against each of the dependencies in
- <varname>BUILDLINK_DEPENDS.<replaceable>pkg</replaceable></varname>.
+ <varname>BUILDLINK_API_DEPENDS.<replaceable>pkg</replaceable></varname>.
<varname>USE_BUILTIN.<replaceable>pkg</replaceable></varname>
<emphasis>must</emphasis> be set to the correct value by the
end of the <filename>builtin.mk</filename> file. Note that
diff --git a/doc/guide/files/configuring.xml b/doc/guide/files/configuring.xml
index 22470cc0b02..7a9cda67baf 100644
--- a/doc/guide/files/configuring.xml
+++ b/doc/guide/files/configuring.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: configuring.xml,v 1.12 2006/02/28 11:50:07 rillig Exp $ -->
+<!-- $NetBSD: configuring.xml,v 1.13 2006/04/06 06:21:57 reed Exp $ -->
<chapter id="configuring">
<title>Configuring pkgsrc</title>
@@ -106,7 +106,7 @@
<sect1 id="developer-advanced-settings">
<title>Developer/advanced settings</title>
- <!-- IGNORE_RECOMMENDED -->
+ <!-- USE_ABI_DEPENDS -->
<para>XXX
<itemizedlist>
<listitem><para><varname>PKG_DEVELOPER</varname>:
diff --git a/doc/guide/files/fixes.xml b/doc/guide/files/fixes.xml
index 4279ecaab96..dcd8f53d879 100644
--- a/doc/guide/files/fixes.xml
+++ b/doc/guide/files/fixes.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: fixes.xml,v 1.48 2006/03/20 01:48:57 jlam Exp $ -->
+<!-- $NetBSD: fixes.xml,v 1.49 2006/04/06 06:21:57 reed Exp $ -->
<chapter id="fixes"> <?dbhtml filename="fixes.html"?>
<title>Making your package work</title>
@@ -221,25 +221,25 @@
<para>Please note that such dependencies should only be
updated if a package requires a newer pre-requisite, but
- not to denote recommendations such as security updates or
+ not to denote recommendations such as
ABI changes that do not prevent a package from building
correctly. Such recommendations can be expressed using
- <varname>RECOMMENDED</varname>:</para>
+ <varname>ABI_DEPENDS</varname>:</para>
<programlisting>
- RECOMMENDED+= tiff>=3.6.1:../../graphics/tiff
+ ABI_DEPENDS+= tiff>=3.6.1:../../graphics/tiff
</programlisting>
<para>In addition to the above <varname>DEPENDS</varname>
line, this denotes that while a package will build against
tiff&gt;=3.5.4, at least version 3.6.1 is recommended.
- <varname>RECOMMENDED</varname> entries will be turned into
+ <varname>ABI_DEPENDS</varname> entries will be turned into
dependencies unless explicitly ignored (in which case a
warning will be printed).</para>
- <para>To ignore these dependency recommendations and just
+ <para>To ignore these ABI dependency recommendations and just
use the required <varname>DEPENDS</varname>, set
- <varname>IGNORE_RECOMMENDED=YES</varname>. This may make
+ <varname>USE_ABI_DEPENDS=NO</varname>. This may make
it easier and faster to update packages built using pkgsrc,
since older compatible dependencies can continue to be
used. This is useful for people who watch their rebuilds
@@ -254,8 +254,7 @@
different versions of binary packages installed.</para>
<para>For security fixes, please update the package
- vulnerabilities file as well as setting
- <varname>RECOMMENDED</varname>, see <xref
+ vulnerabilities file. See <xref
linkend="security-handling"/> for more
information.</para>
</listitem>
@@ -379,11 +378,7 @@
<para>After fixing the vulnerability by a patch, its
<varname>PKGREVISION</varname> should be increased (this
is of course not necessary if the problem is fixed by using
- a newer release of the software). In addition, if a
- <filename>buildlink3.mk</filename> file exists for an
- affected package, a corresponding
- <varname>BUILDLINK_RECOMMENDED.<replaceable>pkg</replaceable></varname>
- entry should be added or updated in it.</para>
+ a newer release of the software).</para>
<para>Also, if the fix should be applied to the stable pkgsrc
branch, be sure to submit a pullup request!</para>
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index a7ff624edc6..423e45aed6b 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.92 2006/04/05 22:22:16 markd Exp $
+# $NetBSD: Makefile,v 1.93 2006/04/06 06:21:58 reed Exp $
DISTNAME= emacs-${EMACSVERSION}a
PKGREVISION= 3
@@ -19,7 +19,7 @@ CONFIGURE_ARGS+= --with-jpeg
.include "../../graphics/tiff/buildlink3.mk"
CONFIGURE_ARGS+= --with-tiff
# need 4.1.0b1 or higher (a bug in 4.1.0 can crash Emacs)
-BUILDLINK_DEPENDS.libungif+= libungif>=4.1.0.1
+BUILDLINK_API_DEPENDS.libungif+= libungif>=4.1.0.1
.include "../../graphics/libungif/buildlink3.mk"
CONFIGURE_ARGS+= --with-gif
.include "../../graphics/png/buildlink3.mk"
diff --git a/editors/gconf-editor/Makefile b/editors/gconf-editor/Makefile
index 55d4f112a95..9f220be10e3 100644
--- a/editors/gconf-editor/Makefile
+++ b/editors/gconf-editor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2006/03/30 21:28:52 jmmv Exp $
+# $NetBSD: Makefile,v 1.46 2006/04/06 06:21:58 reed Exp $
#
DISTNAME= gconf-editor-2.14.0
@@ -23,7 +23,7 @@ CONFIGURE_ARGS+= --with-gconf-mandatory-source=${GCONF2_CONFIG_SOURCE:S/gconf.xm
GCONF2_SCHEMAS= gconf-editor.schemas
-BUILDLINK_DEPENDS.GConf2+= GConf2>=2.14.0
+BUILDLINK_API_DEPENDS.GConf2+= GConf2>=2.14.0
.include "../../devel/GConf2/schemas.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index a2765baafbd..6629bd2cb22 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2006/03/30 21:29:09 jmmv Exp $
+# $NetBSD: Makefile,v 1.60 2006/04/06 06:21:58 reed Exp $
#
DISTNAME= gedit-2.14.0
@@ -25,10 +25,10 @@ GCONF2_SCHEMAS= gedit.schemas
CONFIGURE_ARGS+= --enable-schemas-install
-BUILDLINK_DEPENDS.glib2+= glib2>=2.6.0
-BUILDLINK_DEPENDS.libglade2+= libglade2>=2.4.0
-BUILDLINK_DEPENDS.libgnomeui+= libgnomeui>=2.13.0
-BUILDLINK_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.13.4
+BUILDLINK_API_DEPENDS.glib2+= glib2>=2.6.0
+BUILDLINK_API_DEPENDS.libglade2+= libglade2>=2.4.0
+BUILDLINK_API_DEPENDS.libgnomeui+= libgnomeui>=2.13.0
+BUILDLINK_API_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.13.4
.include "../../devel/GConf2/schemas.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/editors/gedit/buildlink3.mk b/editors/gedit/buildlink3.mk
index 0c239ec2a31..9668e85b801 100644
--- a/editors/gedit/buildlink3.mk
+++ b/editors/gedit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2006/03/14 14:22:36 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:58 reed Exp $
# XXX
# XXX This file was created automatically using createbuildlink-3.10.
# XXX After this file has been verified as correct, the comment lines
@@ -21,7 +21,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngedit}
BUILDLINK_PACKAGES+= gedit
.if !empty(GEDIT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gedit+= gedit>=2.12.1nb4
+BUILDLINK_API_DEPENDS.gedit+= gedit>=2.12.1nb4
BUILDLINK_PKGSRCDIR.gedit?= ../../editors/gedit
.endif # GEDIT_BUILDLINK3_MK
diff --git a/editors/mule-ucs/Makefile b/editors/mule-ucs/Makefile
index 8c78c9405ea..dbc0c4f4229 100644
--- a/editors/mule-ucs/Makefile
+++ b/editors/mule-ucs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/02/05 23:08:57 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2006/04/06 06:21:58 reed Exp $
DISTNAME= Mule-UCS-0.84
PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT= Another encoding conversion mechanism for Emacs
# Mule 4.1 feature required by Mule-UCS was added to 20.7nb1.
EMACS_VERSIONS_ACCEPTED= emacs21 emacs21nox emacs20
-BUILDLINK_DEPENDS.emacs20+= emacs>=20.7nb1
+BUILDLINK_API_DEPENDS.emacs20+= emacs>=20.7nb1
do-build:
@cd ${WRKSRC}; \
diff --git a/editors/pico/Makefile b/editors/pico/Makefile
index fe785efb16b..838fa2e1728 100644
--- a/editors/pico/Makefile
+++ b/editors/pico/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.68 2006/03/04 21:29:32 jlam Exp $
+# $NetBSD: Makefile,v 1.69 2006/04/06 06:21:58 reed Exp $
#
# NOTE:
# When updating, it is necessary to change the shlib version, located in
# several files in patches/. If you do not KNOW that the new version is
# backwards ABI compatible (usually not), bump the major version,
-# and then bump the BUILDLINK_DEPENDS in buildlink3.mk.
+# and then bump the BUILDLINK_API_DEPENDS in buildlink3.mk.
DISTNAME= pine4.64
PKGNAME= pico-4.10
diff --git a/editors/pico/buildlink3.mk b/editors/pico/buildlink3.mk
index 8297929c906..86a2bf29be1 100644
--- a/editors/pico/buildlink3.mk
+++ b/editors/pico/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/01/12 21:00:52 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:21:58 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PICO_BUILDLINK3_MK:= ${PICO_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npico}
BUILDLINK_PACKAGES+= pico
.if !empty(PICO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pico+= pico>=4.10
+BUILDLINK_API_DEPENDS.pico+= pico>=4.10
BUILDLINK_PKGSRCDIR.pico?= ../../editors/pico
.endif # PICO_BUILDLINK3_MK
diff --git a/editors/sam/buildlink3.mk b/editors/sam/buildlink3.mk
index 685cf4aba9b..c2b395f53e5 100644
--- a/editors/sam/buildlink3.mk
+++ b/editors/sam/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:08:57 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:58 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SAM_BUILDLINK3_MK:= ${SAM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsam}
BUILDLINK_PACKAGES+= sam
.if !empty(SAM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.sam+= sam>=4.3nb1
-BUILDLINK_RECOMMENDED.sam?= sam>=4.3nb3
+BUILDLINK_API_DEPENDS.sam+= sam>=4.3nb1
+BUILDLINK_ABI_DEPENDS.sam?= sam>=4.3nb3
BUILDLINK_PKGSRCDIR.sam?= ../../editors/sam
BUILDLINK_DEPMETHOD.sam?= build
.endif # SAM_BUILDLINK3_MK
diff --git a/emulators/DatLib/buildlink3.mk b/emulators/DatLib/buildlink3.mk
index 56597aefe11..f602cca516d 100644
--- a/emulators/DatLib/buildlink3.mk
+++ b/emulators/DatLib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:59 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:58 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
DATLIB_BUILDLINK3_MK:= ${DATLIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NDatLib}
BUILDLINK_PACKAGES+= DatLib
.if !empty(DATLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.DatLib+= DatLib>=2.8
-BUILDLINK_RECOMMENDED.DatLib?= DatLib>=2.15nb1
+BUILDLINK_API_DEPENDS.DatLib+= DatLib>=2.8
+BUILDLINK_ABI_DEPENDS.DatLib?= DatLib>=2.15nb1
BUILDLINK_PKGSRCDIR.DatLib?= ../../emulators/DatLib
.endif # DATLIB_BUILDLINK3_MK
diff --git a/emulators/DatUtil/Makefile b/emulators/DatUtil/Makefile
index fd216f5706c..615cd2a4e6d 100644
--- a/emulators/DatUtil/Makefile
+++ b/emulators/DatUtil/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/02/05 23:08:59 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2006/04/06 06:21:58 reed Exp $
#
DISTNAME= dutil227
@@ -20,7 +20,7 @@ EXTRACT_OPTS_ZIP= -Laaqo
INSTALLATION_DIRS= bin
-BUILDLINK_DEPENDS.DatLib+= DatLib>=2.15
+BUILDLINK_API_DEPENDS.DatLib+= DatLib>=2.15
post-extract:
${MKDIR} ${WRKSRC}/obj
diff --git a/emulators/MAMEDiff/Makefile b/emulators/MAMEDiff/Makefile
index 45a0471f6af..1057e72b59a 100644
--- a/emulators/MAMEDiff/Makefile
+++ b/emulators/MAMEDiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/02/05 23:08:59 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2006/04/06 06:21:58 reed Exp $
#
DISTNAME= mdiff224
@@ -19,7 +19,7 @@ BUILD_TARGET= mamediff
EXTRACT_OPTS_ZIP= -Laaqo
INSTALLATION_DIRS= bin
-BUILDLINK_DEPENDS.DatLib+= DatLib>=2.13
+BUILDLINK_API_DEPENDS.DatLib+= DatLib>=2.13
post-extract:
${MKDIR} ${WRKSRC}/obj
diff --git a/emulators/ROMInfo/Makefile b/emulators/ROMInfo/Makefile
index 51c3624277f..2e7b660f766 100644
--- a/emulators/ROMInfo/Makefile
+++ b/emulators/ROMInfo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/02/05 23:09:00 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2006/04/06 06:21:58 reed Exp $
#
DISTNAME= rinfo26
@@ -19,7 +19,7 @@ BUILD_TARGET= rominfo
EXTRACT_OPTS_ZIP= -Laaqo
INSTALLATION_DIRS= bin
-BUILDLINK_DEPENDS.DatLib+= DatLib>=2.13
+BUILDLINK_API_DEPENDS.DatLib+= DatLib>=2.13
post-extract:
${MKDIR} ${WRKSRC}/obj
diff --git a/emulators/ZIPIdent/Makefile b/emulators/ZIPIdent/Makefile
index 27d770bcb52..afb53fb7493 100644
--- a/emulators/ZIPIdent/Makefile
+++ b/emulators/ZIPIdent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/02/05 23:09:00 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2006/04/06 06:21:58 reed Exp $
#
DISTNAME= zident27
@@ -19,7 +19,7 @@ BUILD_TARGET= zipident
EXTRACT_OPTS_ZIP= -Laaqo
INSTALLATION_DIRS= bin
-BUILDLINK_DEPENDS.DatLib+= DatLib>=2.13
+BUILDLINK_API_DEPENDS.DatLib+= DatLib>=2.13
post-extract:
${MKDIR} ${WRKSRC}/obj
diff --git a/emulators/cygwin_lib/buildlink3.mk b/emulators/cygwin_lib/buildlink3.mk
index 4dbee03907a..f87084c91ef 100644
--- a/emulators/cygwin_lib/buildlink3.mk
+++ b/emulators/cygwin_lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/10/11 20:08:11 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:58 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
CYGWIN_LIB_BUILDLINK3_MK:= ${CYGWIN_LIB_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncygwin_lib}
BUILDLINK_PACKAGES+= cygwin_lib
.if !empty(CYGWIN_LIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.cygwin_lib+= cygwin_lib>=1.5.11.1
+BUILDLINK_API_DEPENDS.cygwin_lib+= cygwin_lib>=1.5.11.1
BUILDLINK_PKGSRCDIR.cygwin_lib?= ../../emulators/cygwin_lib
.endif # CYGWIN_LIB_BUILDLINK3_MK
diff --git a/emulators/gpsim-devel/buildlink3.mk b/emulators/gpsim-devel/buildlink3.mk
index 7257bc4f63c..842e5b7b3fa 100644
--- a/emulators/gpsim-devel/buildlink3.mk
+++ b/emulators/gpsim-devel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:09:01 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:59 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GPSIM_BUILDLINK3_MK:= ${GPSIM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngpsim}
BUILDLINK_PACKAGES+= gpsim
.if !empty(GPSIM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gpsim+= gpsim>=20050905
-BUILDLINK_RECOMMENDED.gpsim+= gpsim>=20050905nb2
+BUILDLINK_API_DEPENDS.gpsim+= gpsim>=20050905
+BUILDLINK_ABI_DEPENDS.gpsim+= gpsim>=20050905nb2
BUILDLINK_PKGSRCDIR.gpsim?= ../../emulators/gpsim-devel
.endif # GPSIM_BUILDLINK3_MK
diff --git a/emulators/libspectrum/buildlink3.mk b/emulators/libspectrum/buildlink3.mk
index 6a111cf26f9..ac22531eb9f 100644
--- a/emulators/libspectrum/buildlink3.mk
+++ b/emulators/libspectrum/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:09:01 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:21:59 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBSPECTRUM_BUILDLINK3_MK:= ${LIBSPECTRUM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibspectrum}
BUILDLINK_PACKAGES+= libspectrum
.if !empty(LIBSPECTRUM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libspectrum+= libspectrum>=0.2.2
-BUILDLINK_RECOMMENDED.libspectrum+= libspectrum>=0.2.2nb2
+BUILDLINK_API_DEPENDS.libspectrum+= libspectrum>=0.2.2
+BUILDLINK_ABI_DEPENDS.libspectrum+= libspectrum>=0.2.2nb2
BUILDLINK_PKGSRCDIR.libspectrum?= ../../emulators/libspectrum
.endif # LIBSPECTRUM_BUILDLINK3_MK
diff --git a/emulators/lrmi/buildlink3.mk b/emulators/lrmi/buildlink3.mk
index 2eaa9c79882..87c36dcdfa8 100644
--- a/emulators/lrmi/buildlink3.mk
+++ b/emulators/lrmi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2005/04/05 10:42:07 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:59 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LRMI_BUILDLINK3_MK:= ${LRMI_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlrmi}
BUILDLINK_PACKAGES+= lrmi
.if !empty(LRMI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.lrmi+= lrmi>=0.8nb1
+BUILDLINK_API_DEPENDS.lrmi+= lrmi>=0.8nb1
BUILDLINK_PKGSRCDIR.lrmi?= ../../emulators/lrmi
.endif # LRMI_BUILDLINK3_MK
diff --git a/emulators/simh/Makefile b/emulators/simh/Makefile
index 923dd0b1dd3..72084fd5261 100644
--- a/emulators/simh/Makefile
+++ b/emulators/simh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/03/04 21:29:35 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2006/04/06 06:21:59 reed Exp $
#
DISTNAME= simhv33-0
@@ -13,7 +13,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://simh.trailing-edge.com/
COMMENT= Bob Supnik's historical computer simulator
-BUILDLINK_DEPENDS.libpcap+= libpcap>=0.6
+BUILDLINK_API_DEPENDS.libpcap+= libpcap>=0.6
EXTRACT_OPTS_ZIP= -aoq
WRKSRC= ${WRKDIR}
diff --git a/emulators/wine/buildlink3.mk b/emulators/wine/buildlink3.mk
index 13b30e3be8b..22891236b27 100644
--- a/emulators/wine/buildlink3.mk
+++ b/emulators/wine/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:09:05 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:59 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
WINE_BUILDLINK3_MK:= ${WINE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nwine}
BUILDLINK_PACKAGES+= wine
.if !empty(WINE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.wine+= wine>=0.9nb1
-BUILDLINK_RECOMMENDED.wine?= wine>=0.9.6nb1
+BUILDLINK_API_DEPENDS.wine+= wine>=0.9nb1
+BUILDLINK_ABI_DEPENDS.wine?= wine>=0.9.6nb1
BUILDLINK_PKGSRCDIR.wine?= ../../emulators/wine
.endif # WINE_BUILDLINK3_MK
diff --git a/finance/gnucash-devel/Makefile b/finance/gnucash-devel/Makefile
index bbf78f1f982..d6c34aeb53e 100644
--- a/finance/gnucash-devel/Makefile
+++ b/finance/gnucash-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/04/04 14:45:44 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2006/04/06 06:21:59 reed Exp $
#
DISTNAME= gnucash-1.9.3
@@ -51,20 +51,20 @@ INFO_FILES= # PLIST
.include "../../devel/libgsf/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-BUILDLINK_DEPENDS.pango+= pango>=1.8.0
+BUILDLINK_API_DEPENDS.pango+= pango>=1.8.0
.include "../../devel/pango/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../finance/libofx/buildlink3.mk"
.include "../../lang/guile/buildlink3.mk"
.include "../../lang/perl5/buildlink3.mk"
-BUILDLINK_DEPENDS.goffice+= goffice>=0.1.2
+BUILDLINK_API_DEPENDS.goffice+= goffice>=0.1.2
.include "../../misc/goffice/buildlink3.mk"
.include "../../print/libgnomeprint/buildlink3.mk"
.include "../../print/libgnomeprintui/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
-BUILDLINK_DEPENDS.gtk2+= gtk2+>=2.6.0
+BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.6.0
.include "../../www/gtkhtml38/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/finance/libofx/buildlink3.mk b/finance/libofx/buildlink3.mk
index 47f8ff7d95c..c71d9050f1f 100644
--- a/finance/libofx/buildlink3.mk
+++ b/finance/libofx/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/02/05 22:25:01 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:59 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBOFX_BUILDLINK3_MK:= ${OPENSP_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibofx}
BUILDLINK_PACKAGES+= libofx
.if !empty(LIBOFX_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libofx+= libofx>=0.8.0
+BUILDLINK_API_DEPENDS.libofx+= libofx>=0.8.0
BUILDLINK_PKGSRCDIR.libofx?= ../../finance/libofx
.endif # LIBOFX_BUILDLINK3_MK
diff --git a/finance/xquote/Makefile b/finance/xquote/Makefile
index 96f50b1da98..7d120862d57 100644
--- a/finance/xquote/Makefile
+++ b/finance/xquote/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/02/05 23:09:06 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2006/04/06 06:21:59 reed Exp $
DISTNAME= xquote-2.6.10
PKGREVISION= 2
@@ -13,7 +13,7 @@ USE_IMAKE= YES
NO_INSTALL_MANPAGES= YES
# needs a symbol that appeared after 4.9.1
-BUILDLINK_DEPENDS.Xbae+= Xbae>=4.50
+BUILDLINK_API_DEPENDS.Xbae+= Xbae>=4.50
.include "../../graphics/xpm/buildlink3.mk"
.include "../../x11/Xbae/buildlink3.mk"
diff --git a/fonts/Xft2/Makefile b/fonts/Xft2/Makefile
index f54261ba45f..2a91e9f0257 100644
--- a/fonts/Xft2/Makefile
+++ b/fonts/Xft2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2006/03/04 21:29:38 jlam Exp $
+# $NetBSD: Makefile,v 1.46 2006/04/06 06:21:59 reed Exp $
DISTNAME= libXft-2.1.7
PKGNAME= Xft2-2.1.7
@@ -20,8 +20,8 @@ USE_TOOLS+= gmake pkg-config
PKGCONFIG_OVERRIDE= xft.pc.in
MAKE_ENV+= EGREP=${EGREP:Q}
-BUILDLINK_DEPENDS.Xrender+= Xrender>=0.8.2
-BUILDLINK_DEPENDS.fontconfig+= fontconfig>=2.2
+BUILDLINK_API_DEPENDS.Xrender+= Xrender>=0.8.2
+BUILDLINK_API_DEPENDS.fontconfig+= fontconfig>=2.2
.include "../../devel/zlib/buildlink3.mk"
.include "../../fonts/fontconfig/buildlink3.mk"
diff --git a/fonts/Xft2/buildlink3.mk b/fonts/Xft2/buildlink3.mk
index 1aa1aed85a5..e479ee70fd4 100644
--- a/fonts/Xft2/buildlink3.mk
+++ b/fonts/Xft2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/02/05 23:09:06 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2006/04/06 06:21:59 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFT2_BUILDLINK3_MK:= ${XFT2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NXft2}
BUILDLINK_PACKAGES+= Xft2
.if !empty(XFT2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.Xft2+= Xft2>=2.1
-BUILDLINK_RECOMMENDED.Xft2+= Xft2>=2.1.7nb2
+BUILDLINK_API_DEPENDS.Xft2+= Xft2>=2.1
+BUILDLINK_ABI_DEPENDS.Xft2+= Xft2>=2.1.7nb2
BUILDLINK_PKGSRCDIR.Xft2?= ../../fonts/Xft2
.endif # XFT2_BUILDLINK3_MK
diff --git a/fonts/Xft2/builtin.mk b/fonts/Xft2/builtin.mk
index 25849ccb8e4..6e44047b21a 100644
--- a/fonts/Xft2/builtin.mk
+++ b/fonts/Xft2/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.13 2006/03/30 18:06:17 jlam Exp $
+# $NetBSD: builtin.mk,v 1.14 2006/04/06 06:21:59 reed Exp $
BUILTIN_PKG:= Xft2
@@ -67,7 +67,7 @@ USE_BUILTIN.Xft2= ${IS_BUILTIN.Xft2}
. if defined(BUILTIN_PKG.Xft2) && \
!empty(IS_BUILTIN.Xft2:M[yY][eE][sS])
USE_BUILTIN.Xft2= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.Xft2}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.Xft2}
. if !empty(USE_BUILTIN.Xft2:M[yY][eE][sS])
USE_BUILTIN.Xft2!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.Xft2:Q}; then \
@@ -90,7 +90,7 @@ CHECK_BUILTIN.Xft2?= no
.if !empty(CHECK_BUILTIN.Xft2:M[nN][oO])
. if !empty(USE_BUILTIN.Xft2:M[nN][oO])
-BUILDLINK_DEPENDS.Xft2+= Xft2>=2.1nb2
+BUILDLINK_API_DEPENDS.Xft2+= Xft2>=2.1nb2
. endif
. if !empty(USE_BUILTIN.Xft2:M[yY][eE][sS])
diff --git a/fonts/fontconfig/Makefile b/fonts/fontconfig/Makefile
index dd80518e81a..735e0a04b90 100644
--- a/fonts/fontconfig/Makefile
+++ b/fonts/fontconfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2006/03/04 21:29:38 jlam Exp $
+# $NetBSD: Makefile,v 1.51 2006/04/06 06:21:59 reed Exp $
#
DISTNAME= fontconfig-2.3.2
@@ -12,7 +12,7 @@ COMMENT= Library for configuring and customizing font access
# This can use 2.0.5 but things which use it (ala pango) require 2.0.9 so make
# sure to keep in step
-BUILDLINK_DEPENDS.freetype2+= freetype2>=2.0.9
+BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.0.9
PKG_INSTALLATION_TYPES= overwrite pkgviews
diff --git a/fonts/fontconfig/buildlink3.mk b/fonts/fontconfig/buildlink3.mk
index 5fd9568b855..0d28f5de2b8 100644
--- a/fonts/fontconfig/buildlink3.mk
+++ b/fonts/fontconfig/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2006/02/05 23:09:09 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2006/04/06 06:21:59 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
FONTCONFIG_BUILDLINK3_MK:= ${FONTCONFIG_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfontconfig}
BUILDLINK_PACKAGES+= fontconfig
.if !empty(FONTCONFIG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.fontconfig+= fontconfig>=1.0.1
-BUILDLINK_RECOMMENDED.fontconfig+= fontconfig>=2.3.2nb2
+BUILDLINK_API_DEPENDS.fontconfig+= fontconfig>=1.0.1
+BUILDLINK_ABI_DEPENDS.fontconfig+= fontconfig>=2.3.2nb2
BUILDLINK_PKGSRCDIR.fontconfig?= ../../fonts/fontconfig
.endif # FONTCONFIG_BUILDLINK3_MK
diff --git a/fonts/fontconfig/builtin.mk b/fonts/fontconfig/builtin.mk
index 16bb9522ae1..d046f36709a 100644
--- a/fonts/fontconfig/builtin.mk
+++ b/fonts/fontconfig/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.8 2006/03/30 18:06:17 jlam Exp $
+# $NetBSD: builtin.mk,v 1.9 2006/04/06 06:21:59 reed Exp $
BUILTIN_PKG:= fontconfig
@@ -66,7 +66,7 @@ USE_BUILTIN.fontconfig= ${IS_BUILTIN.fontconfig}
. if defined(BUILTIN_PKG.fontconfig) && \
!empty(IS_BUILTIN.fontconfig:M[yY][eE][sS])
USE_BUILTIN.fontconfig= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.fontconfig}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.fontconfig}
. if !empty(USE_BUILTIN.fontconfig:M[yY][eE][sS])
USE_BUILTIN.fontconfig!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.fontconfig:Q}; then \
@@ -89,8 +89,8 @@ CHECK_BUILTIN.fontconfig?= no
.if !empty(CHECK_BUILTIN.fontconfig:M[nN][oO])
. if !empty(USE_BUILTIN.fontconfig:M[nN][oO])
-BUILDLINK_DEPENDS.fontconfig+= fontconfig>=2.1nb2
-BUILDLINK_DEPENDS.freetype2+= freetype2>=2.1.3
+BUILDLINK_API_DEPENDS.fontconfig+= fontconfig>=2.1nb2
+BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.1.3
. endif
. if !empty(USE_BUILTIN.fontconfig:M[yY][eE][sS])
diff --git a/fonts/gucharmap/buildlink3.mk b/fonts/gucharmap/buildlink3.mk
index 2380cc743a9..aefb736a9ab 100644
--- a/fonts/gucharmap/buildlink3.mk
+++ b/fonts/gucharmap/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/02/05 23:09:09 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/04/06 06:21:59 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GUCHARMAP_BUILDLINK3_MK:= ${GUCHARMAP_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngucharmap}
BUILDLINK_PACKAGES+= gucharmap
.if !empty(GUCHARMAP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gucharmap+= gucharmap>=1.4.0
-BUILDLINK_RECOMMENDED.gucharmap+= gucharmap>=1.4.4nb3
+BUILDLINK_API_DEPENDS.gucharmap+= gucharmap>=1.4.0
+BUILDLINK_ABI_DEPENDS.gucharmap+= gucharmap>=1.4.4nb3
BUILDLINK_PKGSRCDIR.gucharmap?= ../../fonts/gucharmap
.endif # GUCHARMAP_BUILDLINK3_MK
diff --git a/fonts/mftrace/buildlink3.mk b/fonts/mftrace/buildlink3.mk
index 37bf0926901..98b977e7c09 100644
--- a/fonts/mftrace/buildlink3.mk
+++ b/fonts/mftrace/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:09:10 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:59 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
MFTRACE_BUILDLINK3_MK:= ${MFTRACE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmftrace}
BUILDLINK_PACKAGES+= mftrace
.if !empty(MFTRACE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.mftrace+= mftrace>=1.0.19
-BUILDLINK_RECOMMENDED.mftrace?= mftrace>=1.1.1nb3
+BUILDLINK_API_DEPENDS.mftrace+= mftrace>=1.0.19
+BUILDLINK_ABI_DEPENDS.mftrace?= mftrace>=1.1.1nb3
BUILDLINK_PKGSRCDIR.mftrace?= ../../fonts/mftrace
.endif # MFTRACE_BUILDLINK3_MK
diff --git a/fonts/t1lib/buildlink3.mk b/fonts/t1lib/buildlink3.mk
index 116968c22f5..06a188a3e51 100644
--- a/fonts/t1lib/buildlink3.mk
+++ b/fonts/t1lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:09:11 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:59 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
T1LIB_BUILDLINK3_MK:= ${T1LIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nt1lib}
BUILDLINK_PACKAGES+= t1lib
.if !empty(T1LIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.t1lib+= t1lib>=5.0.1
-BUILDLINK_RECOMMENDED.t1lib+= t1lib>=5.1.0nb5
+BUILDLINK_API_DEPENDS.t1lib+= t1lib>=5.0.1
+BUILDLINK_ABI_DEPENDS.t1lib+= t1lib>=5.1.0nb5
BUILDLINK_PKGSRCDIR.t1lib?= ../../fonts/t1lib
.endif # T1LIB_BUILDLINK3_MK
diff --git a/games/freeciv-server/Makefile b/games/freeciv-server/Makefile
index 1626820d40a..537cb3b1bf6 100644
--- a/games/freeciv-server/Makefile
+++ b/games/freeciv-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/02/05 23:09:14 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2006/04/06 06:21:59 reed Exp $
PKGNAME= ${DISTNAME:S/-/-server-/}
PKGREVISION= 1
@@ -13,7 +13,7 @@ CONFIGURE_ARGS+= --with-readline
LIBS+= -ltermcap
# Uses rl_filename_completion_function() which was introduced in readline-4.2
-BUILDLINK_DEPENDS.readline+= readline>=4.2
+BUILDLINK_API_DEPENDS.readline+= readline>=4.2
.include "../../games/freeciv-share/Makefile.common"
diff --git a/games/gnome2-games/Makefile b/games/gnome2-games/Makefile
index 2cc748eab67..992eddc085e 100644
--- a/games/gnome2-games/Makefile
+++ b/games/gnome2-games/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2006/03/30 21:32:20 jmmv Exp $
+# $NetBSD: Makefile,v 1.67 2006/04/06 06:22:00 reed Exp $
DISTNAME= gnome-games-2.14.0
CATEGORIES= games gnome
@@ -57,10 +57,10 @@ GCONF2_SCHEMAS+= same-gnome.schemas
PYTHON_PATCH_SCRIPTS= libgames-support/games-server.py
-BUILDLINK_DEPENDS.glib2+= glib2>=2.6.3
-BUILDLINK_DEPENDS.howl+= howl>=0.9.6
-BUILDLINK_DEPENDS.libgnome+= libgnome>=2.10.0
-BUILDLINK_DEPENDS.librsvg2+= librsvg2>=2.12.6
+BUILDLINK_API_DEPENDS.glib2+= glib2>=2.6.3
+BUILDLINK_API_DEPENDS.howl+= howl>=0.9.6
+BUILDLINK_API_DEPENDS.libgnome+= libgnome>=2.10.0
+BUILDLINK_API_DEPENDS.librsvg2+= librsvg2>=2.12.6
.include "../../audio/esound/buildlink3.mk"
.include "../../devel/GConf2/schemas.mk"
diff --git a/games/kdegames3/buildlink3.mk b/games/kdegames3/buildlink3.mk
index 102afa15a45..34331ef465e 100644
--- a/games/kdegames3/buildlink3.mk
+++ b/games/kdegames3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:09:16 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:00 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
KDEGAMES_BUILDLINK3_MK:= ${KDEGAMES_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nkdegames}
BUILDLINK_PACKAGES+= kdegames
.if !empty(KDEGAMES_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.kdegames+= kdegames>=3.5.0nb1
-BUILDLINK_RECOMMENDED.kdegames?= kdegames>=3.5.1nb1
+BUILDLINK_API_DEPENDS.kdegames+= kdegames>=3.5.0nb1
+BUILDLINK_ABI_DEPENDS.kdegames?= kdegames>=3.5.1nb1
BUILDLINK_PKGSRCDIR.kdegames?= ../../games/kdegames3
.endif # KDEGAMES_BUILDLINK3_MK
diff --git a/games/plib/buildlink3.mk b/games/plib/buildlink3.mk
index e7639c56e1f..730927d319c 100644
--- a/games/plib/buildlink3.mk
+++ b/games/plib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:09:21 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:00 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PLIB_BUILDLINK3_MK:= ${PLIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nplib}
BUILDLINK_PACKAGES+= plib
.if !empty(PLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.plib+= plib>=1.6.0
-BUILDLINK_RECOMMENDED.plib?= plib>=1.6.0nb3
+BUILDLINK_API_DEPENDS.plib+= plib>=1.6.0
+BUILDLINK_ABI_DEPENDS.plib?= plib>=1.6.0nb3
BUILDLINK_PKGSRCDIR.plib?= ../../games/plib
BUILDLINK_DEPMETHOD.plib?= build
.endif # PLIB_BUILDLINK3_MK
diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile
index 5cbab1c5263..21664e5a284 100644
--- a/games/wesnoth/Makefile
+++ b/games/wesnoth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2006/03/12 12:30:05 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2006/04/06 06:22:00 reed Exp $
DISTNAME= wesnoth-1.0.2
PKGREVISION= 4
@@ -18,8 +18,8 @@ UNLIMIT_RESOURCES+= datasize
REPLACE_PERL+= utils/wmlxgettext
USE_TOOLS+= perl:run
-BUILDLINK_DEPENDS.SDL+= SDL>=1.2.7
-BUILDLINK_DEPENDS.SDL_mixer+= SDL_mixer>=1.2.5nb3
+BUILDLINK_API_DEPENDS.SDL+= SDL>=1.2.7
+BUILDLINK_API_DEPENDS.SDL_mixer+= SDL_mixer>=1.2.5nb3
.include "../../audio/SDL_mixer/buildlink3.mk"
.include "../../devel/SDL/buildlink3.mk"
diff --git a/geography/geos/buildlink3.mk b/geography/geos/buildlink3.mk
index 997746631b1..7291ad62eb8 100644
--- a/geography/geos/buildlink3.mk
+++ b/geography/geos/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/11/06 10:36:46 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:00 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GEOS_BUILDLINK3_MK:= ${GEOS_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngeos}
BUILDLINK_PACKAGES+= geos
.if !empty(GEOS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.geos+= geos>=2.0.0
+BUILDLINK_API_DEPENDS.geos+= geos>=2.0.0
BUILDLINK_PKGSRCDIR.geos?= ../../geography/geos
.endif # GEOS_BUILDLINK3_MK
diff --git a/geography/shapelib/buildlink3.mk b/geography/shapelib/buildlink3.mk
index 3be42163a75..727bb924ce4 100644
--- a/geography/shapelib/buildlink3.mk
+++ b/geography/shapelib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/03/27 21:18:06 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:00 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SHAPELIB_BUILDLINK3_MK:= ${SHAPELIB_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nshapelib}
BUILDLINK_PACKAGES+= shapelib
.if !empty(SHAPELIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.shapelib+= shapelib>=1.2.10
+BUILDLINK_API_DEPENDS.shapelib+= shapelib>=1.2.10
BUILDLINK_PKGSRCDIR.shapelib?= ../../geography/shapelib
.endif # SHAPELIB_BUILDLINK3_MK
diff --git a/graphics/Coin/buildlink3.mk b/graphics/Coin/buildlink3.mk
index 9183f204811..0554260f8c3 100644
--- a/graphics/Coin/buildlink3.mk
+++ b/graphics/Coin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:09:26 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:00 reed Exp $
#
# This Makefile fragment is included by packages that use Coin.
#
@@ -14,8 +14,8 @@ BUILDLINK_DEPENDS+= Coin
.if !empty(COIN_BUILDLINK3_MK:M+)
BUILDLINK_PACKAGES+= Coin
-BUILDLINK_DEPENDS.Coin+= Coin>=2.2.1
-BUILDLINK_RECOMMENDED.Coin?= Coin>=2.4.4nb1
+BUILDLINK_API_DEPENDS.Coin+= Coin>=2.2.1
+BUILDLINK_ABI_DEPENDS.Coin?= Coin>=2.4.4nb1
BUILDLINK_PKGSRCDIR.Coin?= ../../graphics/Coin
.include "../../graphics/simage/buildlink3.mk"
diff --git a/graphics/GLXKit/buildlink3.mk b/graphics/GLXKit/buildlink3.mk
index a1563bfbea5..c279fb5ef59 100644
--- a/graphics/GLXKit/buildlink3.mk
+++ b/graphics/GLXKit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:09:27 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:00 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GLXKIT_BUILDLINK3_MK:= ${GLXKIT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NGLXKit}
BUILDLINK_PACKAGES+= GLXKit
.if !empty(GLXKIT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.GLXKit+= GLXKit>=0.3.1r2nb3
-BUILDLINK_RECOMMENDED.GLXKit?= GLXKit>=0.3.1r2nb9
+BUILDLINK_API_DEPENDS.GLXKit+= GLXKit>=0.3.1r2nb3
+BUILDLINK_ABI_DEPENDS.GLXKit?= GLXKit>=0.3.1r2nb9
BUILDLINK_PKGSRCDIR.GLXKit?= ../../graphics/GLXKit
.endif # GLXKIT_BUILDLINK3_MK
diff --git a/graphics/GUIlib/buildlink3.mk b/graphics/GUIlib/buildlink3.mk
index e09d4e08021..928a5ee39ef 100644
--- a/graphics/GUIlib/buildlink3.mk
+++ b/graphics/GUIlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:09:27 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:00 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GUILIB_BUILDLINK3_MK:= ${GUILIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NGUIlib}
BUILDLINK_PACKAGES+= GUIlib
.if !empty(GUILIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.GUIlib+= GUIlib>=1.1.0nb2
-BUILDLINK_RECOMMENDED.GUIlib+= GUIlib>=1.1.0nb6
+BUILDLINK_API_DEPENDS.GUIlib+= GUIlib>=1.1.0nb2
+BUILDLINK_ABI_DEPENDS.GUIlib+= GUIlib>=1.1.0nb6
BUILDLINK_PKGSRCDIR.GUIlib?= ../../graphics/GUIlib
.endif # GUILIB_BUILDLINK3_MK
diff --git a/graphics/GeometryKit/buildlink3.mk b/graphics/GeometryKit/buildlink3.mk
index cde7f8fa6d6..103e76f3f44 100644
--- a/graphics/GeometryKit/buildlink3.mk
+++ b/graphics/GeometryKit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:09:27 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:00 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GEOMETRYKIT_BUILDLINK3_MK:= ${GEOMETRYKIT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NGeometryKit}
BUILDLINK_PACKAGES+= GeometryKit
.if !empty(GEOMETRYKIT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.GeometryKit+= GeometryKit>=0.3.1r2nb3
-BUILDLINK_RECOMMENDED.GeometryKit?= GeometryKit>=0.3.1r2nb9
+BUILDLINK_API_DEPENDS.GeometryKit+= GeometryKit>=0.3.1r2nb3
+BUILDLINK_ABI_DEPENDS.GeometryKit?= GeometryKit>=0.3.1r2nb9
BUILDLINK_PKGSRCDIR.GeometryKit?= ../../graphics/GeometryKit
.endif # GEOMETRYKIT_BUILDLINK3_MK
diff --git a/graphics/GlutKit/buildlink3.mk b/graphics/GlutKit/buildlink3.mk
index 8d75af82345..b7075b35a78 100644
--- a/graphics/GlutKit/buildlink3.mk
+++ b/graphics/GlutKit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:09:27 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:00 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GLUTKIT_BUILDLINK3_MK:= ${GLUTKIT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NGlutKit}
BUILDLINK_PACKAGES+= GlutKit
.if !empty(GLUTKIT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.GlutKit+= GlutKit>=0.3.1r2nb4
-BUILDLINK_RECOMMENDED.GlutKit?= GlutKit>=0.3.1r2nb11
+BUILDLINK_API_DEPENDS.GlutKit+= GlutKit>=0.3.1r2nb4
+BUILDLINK_ABI_DEPENDS.GlutKit?= GlutKit>=0.3.1r2nb11
BUILDLINK_PKGSRCDIR.GlutKit?= ../../graphics/GlutKit
.endif # GLUTKIT_BUILDLINK3_MK
diff --git a/graphics/ImageMagick/buildlink3.mk b/graphics/ImageMagick/buildlink3.mk
index 3f0c20c183a..0ac4b0ce30a 100644
--- a/graphics/ImageMagick/buildlink3.mk
+++ b/graphics/ImageMagick/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/02/05 23:09:27 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/04/06 06:22:00 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
IMAGEMAGICK_BUILDLINK3_MK:= ${IMAGEMAGICK_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NImageMagick}
BUILDLINK_PACKAGES+= ImageMagick
.if !empty(IMAGEMAGICK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ImageMagick+= ImageMagick>=5.5.7.11nb1
-BUILDLINK_RECOMMENDED.ImageMagick+= ImageMagick>=6.2.6.0nb2
+BUILDLINK_API_DEPENDS.ImageMagick+= ImageMagick>=5.5.7.11nb1
+BUILDLINK_ABI_DEPENDS.ImageMagick+= ImageMagick>=6.2.6.0nb2
BUILDLINK_PKGSRCDIR.ImageMagick?= ../../graphics/ImageMagick
.endif # IMAGEMAGICK_BUILDLINK3_MK
diff --git a/graphics/ImageMagick/options.mk b/graphics/ImageMagick/options.mk
index 186034be76a..5e7352f36c4 100644
--- a/graphics/ImageMagick/options.mk
+++ b/graphics/ImageMagick/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2006/02/08 12:19:38 tv Exp $
+# $NetBSD: options.mk,v 1.6 2006/04/06 06:22:00 reed Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.ImageMagick
PKG_SUPPORTED_OPTIONS= x11
@@ -7,7 +7,7 @@ PKG_SUGGESTED_OPTIONS= x11
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mx11)
-BUILDLINK_DEPENDS.jasper+= jasper>=1.701.0
+BUILDLINK_API_DEPENDS.jasper+= jasper>=1.701.0
DEPENDS+= mpeg2codec>=1.2:../../graphics/mpeg2codec
.include "../../graphics/jasper/buildlink3.mk"
diff --git a/graphics/MesaLib/buildlink3.mk b/graphics/MesaLib/buildlink3.mk
index 7dd32a26e5b..974377e5c88 100644
--- a/graphics/MesaLib/buildlink3.mk
+++ b/graphics/MesaLib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.33 2006/03/21 22:18:55 kristerw Exp $
+# $NetBSD: buildlink3.mk,v 1.34 2006/04/06 06:22:00 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
MESALIB_BUILDLINK3_MK:= ${MESALIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NMesaLib}
BUILDLINK_PACKAGES+= MesaLib
.if !empty(MESALIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.MesaLib+= MesaLib>=3.4.2
-BUILDLINK_RECOMMENDED.MesaLib+= MesaLib>=6.4.1nb1
+BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=3.4.2
+BUILDLINK_ABI_DEPENDS.MesaLib+= MesaLib>=6.4.1nb1
BUILDLINK_PKGSRCDIR.MesaLib?= ../../graphics/MesaLib
.if !defined(BUILDING_MESA)
diff --git a/graphics/MesaLib/builtin.mk b/graphics/MesaLib/builtin.mk
index dac3b0dc577..317a10a45e7 100644
--- a/graphics/MesaLib/builtin.mk
+++ b/graphics/MesaLib/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.13 2006/03/30 18:06:17 jlam Exp $
+# $NetBSD: builtin.mk,v 1.14 2006/04/06 06:22:00 reed Exp $
BUILTIN_PKG:= MesaLib
@@ -45,7 +45,7 @@ USE_BUILTIN.MesaLib= ${IS_BUILTIN.MesaLib}
. if defined(BUILTIN_PKG.MesaLib) && \
!empty(IS_BUILTIN.MesaLib:M[yY][eE][sS])
USE_BUILTIN.MesaLib= yes
-. for dep in ${BUILDLINK_DEPENDS.MesaLib}
+. for dep in ${BUILDLINK_API_DEPENDS.MesaLib}
. if !empty(USE_BUILTIN.MesaLib:M[yY][eE][sS])
USE_BUILTIN.MesaLib!= \
if ${PKG_ADMIN} pmatch ${dep:Q} ${BUILTIN_PKG.MesaLib:Q}; then \
diff --git a/graphics/OpenRM/buildlink3.mk b/graphics/OpenRM/buildlink3.mk
index 8033d69134e..98c7b81e181 100644
--- a/graphics/OpenRM/buildlink3.mk
+++ b/graphics/OpenRM/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:09:27 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:01 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OPENRM_BUILDLINK3_MK:= ${OPENRM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NOpenRM}
BUILDLINK_PACKAGES+= OpenRM
.if !empty(OPENRM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.OpenRM+= OpenRM>=1.5.1
-BUILDLINK_RECOMMENDED.OpenRM?= OpenRM>=1.5.2nb3
+BUILDLINK_API_DEPENDS.OpenRM+= OpenRM>=1.5.1
+BUILDLINK_ABI_DEPENDS.OpenRM?= OpenRM>=1.5.2nb3
BUILDLINK_PKGSRCDIR.OpenRM?= ../../graphics/OpenRM
.endif # OPENRM_BUILDLINK3_MK
diff --git a/graphics/RenderKit/buildlink3.mk b/graphics/RenderKit/buildlink3.mk
index 0a30e135742..069e3dd1169 100644
--- a/graphics/RenderKit/buildlink3.mk
+++ b/graphics/RenderKit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:09:27 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:01 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
RENDERKIT_BUILDLINK3_MK:= ${RENDERKIT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NRenderKit}
BUILDLINK_PACKAGES+= RenderKit
.if !empty(RENDERKIT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.RenderKit+= RenderKit>=0.3.1r2nb3
-BUILDLINK_RECOMMENDED.RenderKit?= RenderKit>=0.3.1r2nb9
+BUILDLINK_API_DEPENDS.RenderKit+= RenderKit>=0.3.1r2nb3
+BUILDLINK_ABI_DEPENDS.RenderKit?= RenderKit>=0.3.1r2nb9
BUILDLINK_PKGSRCDIR.RenderKit?= ../../graphics/RenderKit
.endif # RENDERKIT_BUILDLINK3_MK
diff --git a/graphics/SDLKit/buildlink3.mk b/graphics/SDLKit/buildlink3.mk
index bc1efe3eb83..1afbfbd28c4 100644
--- a/graphics/SDLKit/buildlink3.mk
+++ b/graphics/SDLKit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:09:27 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:01 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SDLKIT_BUILDLINK3_MK:= ${SDLKIT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NSDLKit}
BUILDLINK_PACKAGES+= SDLKit
.if !empty(SDLKIT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.SDLKit+= SDLKit>=0.3.1r2nb5
-BUILDLINK_RECOMMENDED.SDLKit?= SDLKit>=0.3.1r2nb13
+BUILDLINK_API_DEPENDS.SDLKit+= SDLKit>=0.3.1r2nb5
+BUILDLINK_ABI_DEPENDS.SDLKit?= SDLKit>=0.3.1r2nb13
BUILDLINK_PKGSRCDIR.SDLKit?= ../../graphics/SDLKit
.endif # SDLKIT_BUILDLINK3_MK
diff --git a/graphics/SDL_image/buildlink3.mk b/graphics/SDL_image/buildlink3.mk
index 17cd83d2209..117950263fd 100644
--- a/graphics/SDL_image/buildlink3.mk
+++ b/graphics/SDL_image/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/02/05 23:09:27 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/04/06 06:22:01 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SDL_IMAGE_BUILDLINK3_MK:= ${SDL_IMAGE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NSDL_image}
BUILDLINK_PACKAGES+= SDL_image
.if !empty(SDL_IMAGE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.SDL_image+= SDL_image>=1.2.3nb1
-BUILDLINK_RECOMMENDED.SDL_image+= SDL_image>=1.2.4nb3
+BUILDLINK_API_DEPENDS.SDL_image+= SDL_image>=1.2.3nb1
+BUILDLINK_ABI_DEPENDS.SDL_image+= SDL_image>=1.2.4nb3
BUILDLINK_PKGSRCDIR.SDL_image?= ../../graphics/SDL_image
BUILDLINK_INCDIRS.SDL_image?= include/SDL
.endif # SDL_IMAGE_BUILDLINK3_MK
diff --git a/graphics/TiffIO/Makefile b/graphics/TiffIO/Makefile
index a6da2b232ec..523fb52b60e 100644
--- a/graphics/TiffIO/Makefile
+++ b/graphics/TiffIO/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/03/23 03:25:12 minskim Exp $
+# $NetBSD: Makefile,v 1.9 2006/04/06 06:22:01 reed Exp $
#
DISTNAME= TiffIO-120e
@@ -17,7 +17,7 @@ USE_LANGUAGES= c c++
BUILD_ENV+= QTDIR=${QTDIR:Q}
.include "../../devel/zlib/buildlink3.mk"
-BUILDLINK_DEPENDS.tiff+= tiff>=3.8.1
+BUILDLINK_API_DEPENDS.tiff+= tiff>=3.8.1
.include "../../graphics/jpeg/buildlink3.mk"
.include "../../graphics/tiff/buildlink3.mk"
.include "../../x11/qt3-libs/buildlink3.mk"
diff --git a/graphics/aalib/buildlink3.mk b/graphics/aalib/buildlink3.mk
index 3d6182de179..1cffeab3100 100644
--- a/graphics/aalib/buildlink3.mk
+++ b/graphics/aalib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:09:28 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:01 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
AALIB_BUILDLINK3_MK:= ${AALIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Naalib}
BUILDLINK_PACKAGES+= aalib
.if !empty(AALIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.aalib+= aalib>=1.4.0.4
-BUILDLINK_RECOMMENDED.aalib+= aalib>=1.4.0.5nb2
+BUILDLINK_API_DEPENDS.aalib+= aalib>=1.4.0.4
+BUILDLINK_ABI_DEPENDS.aalib+= aalib>=1.4.0.5nb2
BUILDLINK_PKGSRCDIR.aalib?= ../../graphics/aalib
.endif # AALIB_BUILDLINK3_MK
diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index 7ada3ab723c..e3466ed8b89 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/04/02 19:59:13 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2006/04/06 06:22:01 reed Exp $
DISTNAME= cairo-1.0.4
CATEGORIES= graphics
@@ -29,11 +29,11 @@ PLIST_SUBST+= QUARTZ=
PLIST_SUBST+= QUARTZ="@comment "
.endif
-BUILDLINK_DEPENDS.freetype2+= freetype2>=2.1.5
-BUILDLINK_DEPENDS.Xft2+= Xft2>=2.1.2
-BUILDLINK_DEPENDS.Xrender+= Xrender>=0.8
-BUILDLINK_DEPENDS.glitz+= glitz>=0.4.4
-BUILDLINK_DEPENDS.libpixman+= libpixman>=0.1.5
+BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.1.5
+BUILDLINK_API_DEPENDS.Xft2+= Xft2>=2.1.2
+BUILDLINK_API_DEPENDS.Xrender+= Xrender>=0.8
+BUILDLINK_API_DEPENDS.glitz+= glitz>=0.4.4
+BUILDLINK_API_DEPENDS.libpixman+= libpixman>=0.1.5
.include "../../mk/compiler.mk"
diff --git a/graphics/cairo/buildlink3.mk b/graphics/cairo/buildlink3.mk
index 417eda7bfb0..3568376887a 100644
--- a/graphics/cairo/buildlink3.mk
+++ b/graphics/cairo/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/02/05 23:09:28 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2006/04/06 06:22:01 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
CAIRO_BUILDLINK3_MK:= ${CAIRO_BUILDLINK3_MK}+
@@ -11,13 +11,13 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncairo}
BUILDLINK_PACKAGES+= cairo
.if !empty(CAIRO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.cairo+= cairo>=1.0.0nb2
-BUILDLINK_RECOMMENDED.cairo?= cairo>=1.0.2nb3
+BUILDLINK_API_DEPENDS.cairo+= cairo>=1.0.0nb2
+BUILDLINK_ABI_DEPENDS.cairo?= cairo>=1.0.2nb3
BUILDLINK_PKGSRCDIR.cairo?= ../../graphics/cairo
-BUILDLINK_DEPENDS.freetype2+= freetype2>=2.1.5
-BUILDLINK_DEPENDS.Xft2+= Xft2>=2.1.2
-BUILDLINK_DEPENDS.Xrender+= Xrender>=0.8
+BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.1.5
+BUILDLINK_API_DEPENDS.Xft2+= Xft2>=2.1.2
+BUILDLINK_API_DEPENDS.Xrender+= Xrender>=0.8
.endif # CAIRO_BUILDLINK3_MK
.include "../../devel/zlib/buildlink3.mk"
diff --git a/graphics/cal3d/buildlink3.mk b/graphics/cal3d/buildlink3.mk
index 9a04a18c9c8..d147301d9fe 100644
--- a/graphics/cal3d/buildlink3.mk
+++ b/graphics/cal3d/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:09:28 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:01 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
CAL3D_BUILDLINK3_MK:= ${CAL3D_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncal3d}
BUILDLINK_PACKAGES+= cal3d
.if !empty(CAL3D_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.cal3d+= cal3d>=0.9.1
-BUILDLINK_RECOMMENDED.cal3d+= cal3d>=0.9.1nb2
+BUILDLINK_API_DEPENDS.cal3d+= cal3d>=0.9.1
+BUILDLINK_ABI_DEPENDS.cal3d+= cal3d>=0.9.1nb2
BUILDLINK_PKGSRCDIR.cal3d?= ../../graphics/cal3d
.endif # CAL3D_BUILDLINK3_MK
diff --git a/graphics/camlimages/Makefile b/graphics/camlimages/Makefile
index 0ed47b29aeb..8eb57f06dd8 100644
--- a/graphics/camlimages/Makefile
+++ b/graphics/camlimages/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:29:46 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2006/04/06 06:22:01 reed Exp $
DISTNAME= camlimages-2.2.0
PKGREVISION= 1
@@ -10,7 +10,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://pauillac.inria.fr/camlimages/
COMMENT= Image processing library for Objective Caml
-BUILDLINK_DEPENDS.ocaml+= ocaml>=3.0.6
+BUILDLINK_API_DEPENDS.ocaml+= ocaml>=3.0.6
WRKSRC= ${WRKDIR}/camlimages-2.2
USE_PKGLOCALEDIR= yes
diff --git a/graphics/camlimages/buildlink3.mk b/graphics/camlimages/buildlink3.mk
index 7784c8f74a2..409913ec065 100644
--- a/graphics/camlimages/buildlink3.mk
+++ b/graphics/camlimages/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:09:28 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:01 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
CAMLIMAGES_BUILDLINK3_MK:= ${CAMLIMAGES_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncamlimages}
BUILDLINK_PACKAGES+= camlimages
.if !empty(CAMLIMAGES_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.camlimages+= camlimages>=2.2.0
-BUILDLINK_RECOMMENDED.camlimages?= camlimages>=2.2.0nb1
+BUILDLINK_API_DEPENDS.camlimages+= camlimages>=2.2.0
+BUILDLINK_ABI_DEPENDS.camlimages?= camlimages>=2.2.0nb1
BUILDLINK_PKGSRCDIR.camlimages?= ../../graphics/camlimages
.endif # CAMLIMAGES_BUILDLINK3_MK
diff --git a/graphics/cinepaint/Makefile b/graphics/cinepaint/Makefile
index c7e51cf1d56..3430b868a69 100644
--- a/graphics/cinepaint/Makefile
+++ b/graphics/cinepaint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/02/17 23:42:35 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2006/04/06 06:22:01 reed Exp $
DISTNAME= cinepaint-0.20-2
PKGNAME= cinepaint-0.20.2
@@ -19,7 +19,7 @@ USE_TOOLS+= pkg-config
PKGCONFIG_OVERRIDE= cinepaint-gtk.pc.in
-BUILDLINK_DEPENDS.lcms+= lcms>=1.13 # needs _cmsLCMScolorSpace
+BUILDLINK_API_DEPENDS.lcms+= lcms>=1.13 # needs _cmsLCMScolorSpace
.include "../../graphics/lcms/buildlink3.mk"
.include "../../graphics/openexr/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
diff --git a/graphics/compface/buildlink3.mk b/graphics/compface/buildlink3.mk
index dd6c902233c..a5304c67c5b 100644
--- a/graphics/compface/buildlink3.mk
+++ b/graphics/compface/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:09:28 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:01 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
COMPFACE_BUILDLINK3_MK:= ${COMPFACE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncompface}
BUILDLINK_PACKAGES+= compface
.if !empty(COMPFACE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.compface+= compface>=1.4
-BUILDLINK_RECOMMENDED.compface?= compface>=1.5.1nb1
+BUILDLINK_API_DEPENDS.compface+= compface>=1.4
+BUILDLINK_ABI_DEPENDS.compface?= compface>=1.5.1nb1
BUILDLINK_PKGSRCDIR.compface?= ../../graphics/compface
.endif # COMPFACE_BUILDLINK3_MK
diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile
index bd6453021cc..22576e707c9 100644
--- a/graphics/digikam/Makefile
+++ b/graphics/digikam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/03/30 03:20:04 markd Exp $
+# $NetBSD: Makefile,v 1.22 2006/04/06 06:22:01 reed Exp $
DISTNAME= digikam-0.8.1
PKGREVISION= 2
@@ -17,8 +17,8 @@ USE_LIBTOOL= yes
GNU_CONFIGURE= yes
BUILD_USES_MSGFMT= yes
-BUILDLINK_DEPENDS.imlib2+= imlib2>=1.2
-BUILDLINK_DEPENDS.kdelibs+= kdelibs>=3.5.2
+BUILDLINK_API_DEPENDS.imlib2+= imlib2>=1.2
+BUILDLINK_API_DEPENDS.kdelibs+= kdelibs>=3.5.2
.include "../../databases/sqlite3/buildlink3.mk"
.include "../../devel/libgphoto2/buildlink3.mk"
diff --git a/graphics/digikam/buildlink3.mk b/graphics/digikam/buildlink3.mk
index f8b926a3688..03406d46b7a 100644
--- a/graphics/digikam/buildlink3.mk
+++ b/graphics/digikam/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/02/20 09:15:44 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/04/06 06:22:01 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
DIGIKAM_BUILDLINK3_MK:= ${DIGIKAM_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndigikam}
BUILDLINK_PACKAGES+= digikam
.if !empty(DIGIKAM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.digikam+= digikam>=0.8.1
+BUILDLINK_API_DEPENDS.digikam+= digikam>=0.8.1
BUILDLINK_PKGSRCDIR.digikam?= ../../graphics/digikam
.endif # DIGIKAM_BUILDLINK3_MK
diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile
index 9a36e67f9da..dc4ed4ff9ef 100644
--- a/graphics/eog2/Makefile
+++ b/graphics/eog2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2006/03/30 21:27:56 jmmv Exp $
+# $NetBSD: Makefile,v 1.56 2006/04/06 06:22:01 reed Exp $
#
DISTNAME= eog-2.14.0
@@ -20,7 +20,7 @@ USE_PKGLOCALEDIR= YES
GCONF2_SCHEMAS= eog.schemas
-BUILDLINK_DEPENDS.libart2+= libart2>=2.3.16
+BUILDLINK_API_DEPENDS.libart2+= libart2>=2.3.16
.include "../../devel/GConf2/schemas.mk"
.include "../../devel/glib2/buildlink3.mk"
diff --git a/graphics/epeg/buildlink3.mk b/graphics/epeg/buildlink3.mk
index d396b386ce4..f896b2c8f03 100644
--- a/graphics/epeg/buildlink3.mk
+++ b/graphics/epeg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/12/28 21:54:35 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:01 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
EPEG_BUILDLINK3_MK:= ${EPEG_BUILDLINK3_MK}+
@@ -10,7 +10,7 @@ BUILDLINK_DEPENDS+= epeg
BUILDLINK_PACKAGES+= epeg
.if !empty(EPEG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.epeg+= epeg>=0.9.0
+BUILDLINK_API_DEPENDS.epeg+= epeg>=0.9.0
BUILDLINK_PKGSRCDIR.epeg?= ../../graphics/epeg
.endif # EPEG_BUILDLINK3_MK
diff --git a/graphics/feh/Makefile b/graphics/feh/Makefile
index e38f221b794..6241c285935 100644
--- a/graphics/feh/Makefile
+++ b/graphics/feh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2006/02/05 23:09:29 joerg Exp $
+# $NetBSD: Makefile,v 1.28 2006/04/06 06:22:01 reed Exp $
#
DISTNAME= feh-1.3.4
@@ -17,8 +17,8 @@ GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --program-transform-name=s,cam,feh_cam,
REPLACE_PERL= cam/cam
-BUILDLINK_DEPENDS.giblib+= giblib>=1.2.4
-BUILDLINK_DEPENDS.jpeg+= jpeg>=6bnb3 # includes jpegint.h
+BUILDLINK_API_DEPENDS.giblib+= giblib>=1.2.4
+BUILDLINK_API_DEPENDS.jpeg+= jpeg>=6bnb3 # includes jpegint.h
.include "../../devel/giblib/buildlink3.mk"
.include "../../mk/x11.buildlink3.mk"
diff --git a/graphics/fnlib/buildlink3.mk b/graphics/fnlib/buildlink3.mk
index c859d8d3f0e..4b597d57698 100644
--- a/graphics/fnlib/buildlink3.mk
+++ b/graphics/fnlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:09:30 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:01 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
FNLIB_BUILDLINK3_MK:= ${FNLIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfnlib}
BUILDLINK_PACKAGES+= fnlib
.if !empty(FNLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.fnlib+= fnlib>=0.5nb6
-BUILDLINK_RECOMMENDED.fnlib+= fnlib>=0.5nb9
+BUILDLINK_API_DEPENDS.fnlib+= fnlib>=0.5nb6
+BUILDLINK_ABI_DEPENDS.fnlib+= fnlib>=0.5nb9
BUILDLINK_PKGSRCDIR.fnlib?= ../../graphics/fnlib
.endif # FNLIB_BUILDLINK3_MK
diff --git a/graphics/freeglut/buildlink3.mk b/graphics/freeglut/buildlink3.mk
index e35dd42342a..13fd78dd7da 100644
--- a/graphics/freeglut/buildlink3.mk
+++ b/graphics/freeglut/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:09:30 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:01 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
FREEGLUT_BUILDLINK3_MK:= ${FREEGLUT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfreeglut}
BUILDLINK_PACKAGES+= freeglut
.if !empty(FREEGLUT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.freeglut+= freeglut>=2.2.0
-BUILDLINK_RECOMMENDED.freeglut+= freeglut>=2.2.0nb3
+BUILDLINK_API_DEPENDS.freeglut+= freeglut>=2.2.0
+BUILDLINK_ABI_DEPENDS.freeglut+= freeglut>=2.2.0nb3
BUILDLINK_PKGSRCDIR.freeglut?= ../../graphics/freeglut
.endif # FREEGLUT_BUILDLINK3_MK
diff --git a/graphics/freetype-lib/buildlink3.mk b/graphics/freetype-lib/buildlink3.mk
index 35eaea90573..be747faea39 100644
--- a/graphics/freetype-lib/buildlink3.mk
+++ b/graphics/freetype-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/02/05 23:09:30 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/04/06 06:22:02 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
FREETYPE_BUILDLINK3_MK:= ${FREETYPE_BUILDLINK3_MK}+
@@ -11,9 +11,9 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfreetype}
BUILDLINK_PACKAGES+= freetype
.if !empty(FREETYPE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.freetype+= freetype-lib>=1.3.1nb1
-BUILDLINK_RECOMMENDED.freetype+=freetype-lib>=1.3.1nb2
-BUILDLINK_RECOMMENDED.freetype?= freetype-lib>=1.3.1nb3
+BUILDLINK_API_DEPENDS.freetype+= freetype-lib>=1.3.1nb1
+BUILDLINK_ABI_DEPENDS.freetype+=freetype-lib>=1.3.1nb2
+BUILDLINK_ABI_DEPENDS.freetype?= freetype-lib>=1.3.1nb3
BUILDLINK_PKGSRCDIR.freetype?= ../../graphics/freetype-lib
.endif # FREETYPE_BUILDLINK3_MK
diff --git a/graphics/freetype-utils/Makefile b/graphics/freetype-utils/Makefile
index ea2c25ece1c..336879032d3 100644
--- a/graphics/freetype-utils/Makefile
+++ b/graphics/freetype-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/02/05 23:09:30 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2006/04/06 06:22:02 reed Exp $
.include "../../graphics/freetype-lib/Makefile.common"
@@ -6,7 +6,7 @@ PKGNAME= freetype-utils-${FT_VERS}
PKGREVISION= 2
COMMENT= Utilities for manipulating TrueType fonts
-BUILDLINK_DEPENDS.freetype= freetype-lib>=${FT_VERS}
+BUILDLINK_API_DEPENDS.freetype= freetype-lib>=${FT_VERS}
CONFIGURE_ARGS+= --with-x
diff --git a/graphics/freetype2/buildlink3.mk b/graphics/freetype2/buildlink3.mk
index b946e4acdb2..a2cc3811dd2 100644
--- a/graphics/freetype2/buildlink3.mk
+++ b/graphics/freetype2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.25 2006/02/05 23:09:30 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.26 2006/04/06 06:22:02 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
FREETYPE2_BUILDLINK3_MK:= ${FREETYPE2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfreetype2}
BUILDLINK_PACKAGES+= freetype2
.if !empty(FREETYPE2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.freetype2+= freetype2>=2.1.8
-BUILDLINK_RECOMMENDED.freetype2+= freetype2>=2.1.10nb1
+BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.1.8
+BUILDLINK_ABI_DEPENDS.freetype2+= freetype2>=2.1.10nb1
BUILDLINK_PKGSRCDIR.freetype2?= ../../graphics/freetype2
BUILDLINK_INCDIRS.freetype2?= include/freetype2
diff --git a/graphics/freetype2/builtin.mk b/graphics/freetype2/builtin.mk
index 8afcae8d44c..5cc02b3a736 100644
--- a/graphics/freetype2/builtin.mk
+++ b/graphics/freetype2/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.8 2006/03/30 18:06:17 jlam Exp $
+# $NetBSD: builtin.mk,v 1.9 2006/04/06 06:22:02 reed Exp $
BUILTIN_PKG:= freetype2
@@ -51,7 +51,7 @@ USE_BUILTIN.freetype2= ${IS_BUILTIN.freetype2}
. if defined(BUILTIN_PKG.freetype2) && \
!empty(IS_BUILTIN.freetype2:M[yY][eE][sS])
USE_BUILTIN.freetype2= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.freetype2}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.freetype2}
. if !empty(USE_BUILTIN.freetype2:M[yY][eE][sS])
USE_BUILTIN.freetype2!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.freetype2:Q}; then \
@@ -74,7 +74,7 @@ CHECK_BUILTIN.freetype2?= no
.if !empty(CHECK_BUILTIN.freetype2:M[nN][oO])
. if !empty(USE_BUILTIN.freetype2:M[nN][oO])
-BUILDLINK_DEPENDS.freetype2+= freetype2>=2.1.3
+BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.1.3
. endif
. if !empty(USE_BUILTIN.freetype2:M[yY][eE][sS])
diff --git a/graphics/gd/buildlink3.mk b/graphics/gd/buildlink3.mk
index 96238f4b09b..ef227f769bb 100644
--- a/graphics/gd/buildlink3.mk
+++ b/graphics/gd/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/02/05 23:09:30 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/04/06 06:22:02 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GD_BUILDLINK3_MK:= ${GD_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngd}
BUILDLINK_PACKAGES+= gd
.if !empty(GD_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gd+= gd>=2.0.15nb1
-BUILDLINK_RECOMMENDED.gd+= gd>=2.0.33nb2
+BUILDLINK_API_DEPENDS.gd+= gd>=2.0.15nb1
+BUILDLINK_ABI_DEPENDS.gd+= gd>=2.0.33nb2
BUILDLINK_PKGSRCDIR.gd?= ../../graphics/gd
.endif # GD_BUILDLINK3_MK
diff --git a/graphics/gdchart/buildlink3.mk b/graphics/gdchart/buildlink3.mk
index c17df052b4f..25bdfc426be 100644
--- a/graphics/gdchart/buildlink3.mk
+++ b/graphics/gdchart/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/10 12:17:05 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:02 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GDCHART_BUILDLINK3_MK:= ${GDCHART_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngdchart}
BUILDLINK_PACKAGES+= gdchart
.if !empty(GDCHART_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gdchart+= gdchart>=0.11.4nb1
-BUILDLINK_RECOMMENDED.gdchart+= gdchart>=0.11.5nb1
+BUILDLINK_API_DEPENDS.gdchart+= gdchart>=0.11.4nb1
+BUILDLINK_ABI_DEPENDS.gdchart+= gdchart>=0.11.5nb1
BUILDLINK_PKGSRCDIR.gdchart?= ../../graphics/gdchart
.endif # GDCHART_BUILDLINK3_MK
diff --git a/graphics/gdk-pixbuf-gnome/buildlink3.mk b/graphics/gdk-pixbuf-gnome/buildlink3.mk
index fbfe519c312..530972375e1 100644
--- a/graphics/gdk-pixbuf-gnome/buildlink3.mk
+++ b/graphics/gdk-pixbuf-gnome/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:09:30 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:02 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GDK_PIXBUF_GNOME_BUILDLINK3_MK:= ${GDK_PIXBUF_GNOME_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngdk-pixbuf-gnome}
BUILDLINK_PACKAGES+= gdk-pixbuf-gnome
.if !empty(GDK_PIXBUF_GNOME_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gdk-pixbuf-gnome+= gdk-pixbuf-gnome>=0.22.0nb2
-BUILDLINK_RECOMMENDED.gdk-pixbuf-gnome?= gdk-pixbuf-gnome>=0.22.0nb4
+BUILDLINK_API_DEPENDS.gdk-pixbuf-gnome+= gdk-pixbuf-gnome>=0.22.0nb2
+BUILDLINK_ABI_DEPENDS.gdk-pixbuf-gnome?= gdk-pixbuf-gnome>=0.22.0nb4
BUILDLINK_PKGSRCDIR.gdk-pixbuf-gnome?= ../../graphics/gdk-pixbuf-gnome
.endif # GDK_PIXBUF_GNOME_BUILDLINK3_MK
diff --git a/graphics/gdk-pixbuf/buildlink3.mk b/graphics/gdk-pixbuf/buildlink3.mk
index 46bdf8add5e..e50e9ae1e1b 100644
--- a/graphics/gdk-pixbuf/buildlink3.mk
+++ b/graphics/gdk-pixbuf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:09:30 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:22:02 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GDK_PIXBUF_BUILDLINK3_MK:= ${GDK_PIXBUF_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngdk-pixbuf}
BUILDLINK_PACKAGES+= gdk-pixbuf
.if !empty(GDK_PIXBUF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gdk-pixbuf+= gdk-pixbuf>=0.22.0nb2
-BUILDLINK_RECOMMENDED.gdk-pixbuf+= gdk-pixbuf>=0.22.0nb7
+BUILDLINK_API_DEPENDS.gdk-pixbuf+= gdk-pixbuf>=0.22.0nb2
+BUILDLINK_ABI_DEPENDS.gdk-pixbuf+= gdk-pixbuf>=0.22.0nb7
BUILDLINK_PKGSRCDIR.gdk-pixbuf?= ../../graphics/gdk-pixbuf
BUILDLINK_CPPFLAGS.gdk-pixbuf+= \
-I${BUILDLINK_PREFIX.gdk-pixbuf}/include/gdk-pixbuf-1.0
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 068febda730..e3c24e2db45 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.135 2006/03/08 09:50:12 itohy Exp $
+# $NetBSD: Makefile,v 1.136 2006/04/06 06:22:02 reed Exp $
DISTNAME= gimp-2.2.10
PKGREVISION= 3
@@ -31,9 +31,9 @@ PKGCONFIG_OVERRIDE+= gimpui.pc.in
.include "../../mk/bsd.prefs.mk"
USE_BUILTIN.fontconfig= no
-BUILDLINK_DEPENDS.fontconfig+= fontconfig>=2.2.0
+BUILDLINK_API_DEPENDS.fontconfig+= fontconfig>=2.2.0
-BUILDLINK_DEPENDS.lcms+= lcms>=1.12
+BUILDLINK_API_DEPENDS.lcms+= lcms>=1.12
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-perl
diff --git a/graphics/gimp/buildlink3.mk b/graphics/gimp/buildlink3.mk
index 920087068c9..3ffa6f319e3 100644
--- a/graphics/gimp/buildlink3.mk
+++ b/graphics/gimp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:09:31 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:02 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GIMP_BUILDLINK3_MK:= ${GIMP_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngimp}
BUILDLINK_PACKAGES+= gimp
.if !empty(GIMP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gimp+= gimp>=2.2.9nb1
-BUILDLINK_RECOMMENDED.gimp?= gimp>=2.2.10nb2
+BUILDLINK_API_DEPENDS.gimp+= gimp>=2.2.9nb1
+BUILDLINK_ABI_DEPENDS.gimp?= gimp>=2.2.10nb2
BUILDLINK_PKGSRCDIR.gimp?= ../../graphics/gimp
.endif # GIMP_BUILDLINK3_MK
diff --git a/graphics/gimp1-base/buildlink3.mk b/graphics/gimp1-base/buildlink3.mk
index 187128748f2..6bf9cb7a7e8 100644
--- a/graphics/gimp1-base/buildlink3.mk
+++ b/graphics/gimp1-base/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:09:31 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:02 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GIMP_BASE_BUILDLINK3_MK:= ${GIMP_BASE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngimp-base}
BUILDLINK_PACKAGES+= gimp-base
.if !empty(GIMP_BASE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gimp-base+= gimp-base>=1.2.5nb2
-BUILDLINK_RECOMMENDED.gimp-base+= gimp-base>=1.2.5nb5
+BUILDLINK_API_DEPENDS.gimp-base+= gimp-base>=1.2.5nb2
+BUILDLINK_ABI_DEPENDS.gimp-base+= gimp-base>=1.2.5nb5
BUILDLINK_PKGSRCDIR.gimp-base?= ../../graphics/gimp1-base
.endif # GIMP_BASE_BUILDLINK3_MK
diff --git a/graphics/gimp24/Makefile b/graphics/gimp24/Makefile
index 6c3ead3226a..5d12e56a0d2 100644
--- a/graphics/gimp24/Makefile
+++ b/graphics/gimp24/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/04/02 09:49:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.16 2006/04/06 06:22:02 reed Exp $
DISTNAME= gimp-2.3.7
PKGREVISION= 3
@@ -32,8 +32,8 @@ PKGCONFIG_OVERRIDE+= gimpui-2.0.pc.in
.include "../../mk/bsd.prefs.mk"
USE_BUILTIN.fontconfig= no
-BUILDLINK_DEPENDS.fontconfig+= fontconfig>=2.2.0
-BUILDLINK_DEPENDS.lcms+= lcms>=1.12
+BUILDLINK_API_DEPENDS.fontconfig+= fontconfig>=2.2.0
+BUILDLINK_API_DEPENDS.lcms+= lcms>=1.12
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-perl
diff --git a/graphics/gimp24/buildlink3.mk b/graphics/gimp24/buildlink3.mk
index 29a1d24b5e9..6d0b889a52b 100644
--- a/graphics/gimp24/buildlink3.mk
+++ b/graphics/gimp24/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/03/06 00:18:11 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:02 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GIMP_BUILDLINK3_MK:= ${GIMP_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngimp}
BUILDLINK_PACKAGES+= gimp
.if !empty(GIMP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gimp+= gimp>=2.3.4nb1
-BUILDLINK_RECOMMENDED.gimp?= gimp>=2.3.7nb1
+BUILDLINK_API_DEPENDS.gimp+= gimp>=2.3.4nb1
+BUILDLINK_ABI_DEPENDS.gimp?= gimp>=2.3.7nb1
BUILDLINK_PKGSRCDIR.gimp?= ../../graphics/gimp24
.endif # GIMP_BUILDLINK3_MK
diff --git a/graphics/gle/buildlink3.mk b/graphics/gle/buildlink3.mk
index c1a0eb93eb3..d7fb585f3f2 100644
--- a/graphics/gle/buildlink3.mk
+++ b/graphics/gle/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:09:31 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:02 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GLE_BUILDLINK3_MK:= ${GLE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngle}
BUILDLINK_PACKAGES+= gle
.if !empty(GLE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gle+= gle>=3.0.3
-BUILDLINK_RECOMMENDED.gle+= gle>=3.1.0nb2
+BUILDLINK_API_DEPENDS.gle+= gle>=3.0.3
+BUILDLINK_ABI_DEPENDS.gle+= gle>=3.1.0nb2
BUILDLINK_PKGSRCDIR.gle?= ../../graphics/gle
.endif # GLE_BUILDLINK3_MK
diff --git a/graphics/glitz/buildlink3.mk b/graphics/glitz/buildlink3.mk
index 3c95dd67764..9b20a17457a 100644
--- a/graphics/glitz/buildlink3.mk
+++ b/graphics/glitz/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:09:31 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:02 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GLITZ_BUILDLINK3_MK:= ${GLITZ_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nglitz}
BUILDLINK_PACKAGES+= glitz
.if !empty(GLITZ_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.glitz+= glitz>=0.4.4
-BUILDLINK_RECOMMENDED.glitz+= glitz>=0.4.4nb2
+BUILDLINK_API_DEPENDS.glitz+= glitz>=0.4.4
+BUILDLINK_ABI_DEPENDS.glitz+= glitz>=0.4.4nb2
BUILDLINK_PKGSRCDIR.glitz?= ../../graphics/glitz
.endif # GLITZ_BUILDLINK3_MK
diff --git a/graphics/glu/Makefile b/graphics/glu/Makefile
index 1c07706c81f..f8896d4cb33 100644
--- a/graphics/glu/Makefile
+++ b/graphics/glu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2006/02/09 12:27:42 adam Exp $
+# $NetBSD: Makefile,v 1.45 2006/04/06 06:22:02 reed Exp $
PKGNAME= ${DISTNAME:C/MesaLib/glu/}
COMMENT= GLU polygon tessellation facility for Mesa
@@ -12,7 +12,7 @@ USE_LANGUAGES= c c++
INSTLIBS= ${WRKSRC}/src/glu/sgi/libGLU.la
-BUILDLINK_DEPENDS.MesaLib+= MesaLib>=${MESA_VERSION}
+BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=${MESA_VERSION}
.include "../../graphics/MesaLib/buildlink3.mk"
pre-build:
diff --git a/graphics/glu/buildlink3.mk b/graphics/glu/buildlink3.mk
index 083b084ed33..54cbadf846b 100644
--- a/graphics/glu/buildlink3.mk
+++ b/graphics/glu/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.28 2006/02/05 23:09:32 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.29 2006/04/06 06:22:02 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GLU_BUILDLINK3_MK:= ${GLU_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nglu}
BUILDLINK_PACKAGES+= glu
.if !empty(GLU_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.glu+= glu>=3.4.2
-BUILDLINK_RECOMMENDED.glu+= glu>=6.4.1nb1
+BUILDLINK_API_DEPENDS.glu+= glu>=3.4.2
+BUILDLINK_ABI_DEPENDS.glu+= glu>=6.4.1nb1
BUILDLINK_PKGSRCDIR.glu?= ../../graphics/glu
.endif # GLU_BUILDLINK3_MK
diff --git a/graphics/glu/builtin.mk b/graphics/glu/builtin.mk
index 474b0050a0b..b1b963b23dd 100644
--- a/graphics/glu/builtin.mk
+++ b/graphics/glu/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.10 2006/03/30 18:06:17 jlam Exp $
+# $NetBSD: builtin.mk,v 1.11 2006/04/06 06:22:02 reed Exp $
BUILTIN_PKG:= glu
@@ -45,7 +45,7 @@ USE_BUILTIN.glu= ${IS_BUILTIN.glu}
. if defined(BUILTIN_PKG.glu) && \
!empty(IS_BUILTIN.glu:M[yY][eE][sS])
USE_BUILTIN.glu= yes
-. for dep in ${BUILDLINK_DEPENDS.glu}
+. for dep in ${BUILDLINK_API_DEPENDS.glu}
. if !empty(USE_BUILTIN.glu:M[yY][eE][sS])
USE_BUILTIN.glu!= \
if ${PKG_ADMIN} pmatch ${dep:Q} ${BUILTIN_PKG.glu:Q}; then \
@@ -68,7 +68,7 @@ CHECK_BUILTIN.glu?= no
.if !empty(CHECK_BUILTIN.glu:M[nN][oO])
. if !empty(USE_BUILTIN.glu:M[nN][oO])
-BUILDLINK_DEPENDS.glu+= glu>=6.0
+BUILDLINK_API_DEPENDS.glu+= glu>=6.0
. endif
. if !empty(USE_BUILTIN.glu:M[yY][eE][sS])
diff --git a/graphics/glut/Makefile b/graphics/glut/Makefile
index a068e665a94..541b1291d98 100644
--- a/graphics/glut/Makefile
+++ b/graphics/glut/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2006/02/09 12:27:42 adam Exp $
+# $NetBSD: Makefile,v 1.44 2006/04/06 06:22:02 reed Exp $
PKGNAME= ${DISTNAME:S/MesaLib/glut/}
COMMENT= GLUT Graphics library similar to SGI's OpenGL
@@ -8,8 +8,8 @@ CONFLICTS+= Mesa<3.2.1
.include "../../graphics/Mesa/Makefile.common"
-BUILDLINK_DEPENDS.MesaLib+= MesaLib>=${MESA_VERSION}
-BUILDLINK_DEPENDS.glu+= glu>=${MESA_VERSION}
+BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=${MESA_VERSION}
+BUILDLINK_API_DEPENDS.glu+= glu>=${MESA_VERSION}
INSTLIBS= ${WRKSRC}/src/glut/glx/libglut.la
diff --git a/graphics/glut/buildlink3.mk b/graphics/glut/buildlink3.mk
index 961cd7b8cfc..3a04c2601cf 100644
--- a/graphics/glut/buildlink3.mk
+++ b/graphics/glut/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/02/05 23:09:32 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/04/06 06:22:02 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GLUT_BUILDLINK3_MK:= ${GLUT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nglut}
BUILDLINK_PACKAGES+= glut
.if !empty(GLUT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.glut+= glut>=3.4.2
-BUILDLINK_RECOMMENDED.glut+= glut>=6.4.1nb1
+BUILDLINK_API_DEPENDS.glut+= glut>=3.4.2
+BUILDLINK_ABI_DEPENDS.glut+= glut>=6.4.1nb1
BUILDLINK_PKGSRCDIR.glut?= ../../graphics/glut
.endif # GLUT_BUILDLINK3_MK
diff --git a/graphics/gnome-icon-theme/Makefile b/graphics/gnome-icon-theme/Makefile
index fb2cbf5e16f..435c8b24a44 100644
--- a/graphics/gnome-icon-theme/Makefile
+++ b/graphics/gnome-icon-theme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2006/04/03 06:10:57 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2006/04/06 06:22:02 reed Exp $
#
DISTNAME= gnome-icon-theme-2.14.2
@@ -19,7 +19,7 @@ USE_PKGLOCALEDIR= yes
PKGCONFIG_OVERRIDE= gnome-icon-theme.pc.in
-BUILDLINK_DEPENDS.hicolor-icon-theme+= hicolor-icon-theme>=0.5
+BUILDLINK_API_DEPENDS.hicolor-icon-theme+= hicolor-icon-theme>=0.5
HICOLOR_ICON_THEME_DEPEND_ONLY= yes
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/graphics/gnome-icon-theme/buildlink3.mk b/graphics/gnome-icon-theme/buildlink3.mk
index 33a6fd1c0d3..70b8b2b4670 100644
--- a/graphics/gnome-icon-theme/buildlink3.mk
+++ b/graphics/gnome-icon-theme/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/03/30 21:45:33 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:22:02 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNOME_ICON_THEME_BUILDLINK3_MK:= ${GNOME_ICON_THEME_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-icon-theme}
BUILDLINK_PACKAGES+= gnome-icon-theme
.if !empty(GNOME_ICON_THEME_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-icon-theme+= gnome-icon-theme>=2.8.0
-BUILDLINK_RECOMMENDED.gnome-icon-theme?= gnome-icon-theme>=2.12.1nb2
+BUILDLINK_API_DEPENDS.gnome-icon-theme+= gnome-icon-theme>=2.8.0
+BUILDLINK_ABI_DEPENDS.gnome-icon-theme?= gnome-icon-theme>=2.12.1nb2
BUILDLINK_PKGSRCDIR.gnome-icon-theme?= ../../graphics/gnome-icon-theme
# intltool-{extract,merge,update} are Perl scripts included in the sources
diff --git a/graphics/graphviz/buildlink3.mk b/graphics/graphviz/buildlink3.mk
index ef3986c6cd3..6eee6793c25 100644
--- a/graphics/graphviz/buildlink3.mk
+++ b/graphics/graphviz/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:09:32 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:02 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GRAPHVIZ_BUILDLINK3_MK:= ${GRAPHVIZ_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngraphviz}
BUILDLINK_PACKAGES+= graphviz
.if !empty(GRAPHVIZ_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.graphviz+= graphviz>=1.12
-BUILDLINK_RECOMMENDED.graphviz+= graphviz>=2.6nb3
+BUILDLINK_API_DEPENDS.graphviz+= graphviz>=1.12
+BUILDLINK_ABI_DEPENDS.graphviz+= graphviz>=2.6nb3
BUILDLINK_PKGSRCDIR.graphviz?= ../../graphics/graphviz
.endif # GRAPHVIZ_BUILDLINK3_MK
diff --git a/graphics/gst-plugins0.8-opengl/Makefile b/graphics/gst-plugins0.8-opengl/Makefile
index 26dbea1b3a1..7a02538999f 100644
--- a/graphics/gst-plugins0.8-opengl/Makefile
+++ b/graphics/gst-plugins0.8-opengl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/03/21 06:00:46 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2006/04/06 06:22:02 reed Exp $
#
GST_PLUGINS0.8_NAME= opengl
@@ -7,7 +7,7 @@ GST_PLUGINS0.8_DIR= sys/glsink
.include "../../multimedia/gst-plugins0.8/Makefile.common"
PKGREVISION= 4
-BUILDLINK_DEPENDS.gst-plugins0.8+= gst-plugins0.8>=0.8.7nb1
+BUILDLINK_API_DEPENDS.gst-plugins0.8+= gst-plugins0.8>=0.8.7nb1
.include "../../graphics/MesaLib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gst-plugins0.8-png/Makefile b/graphics/gst-plugins0.8-png/Makefile
index 4dc58b1274c..1aa80e6664e 100644
--- a/graphics/gst-plugins0.8-png/Makefile
+++ b/graphics/gst-plugins0.8-png/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/03/21 06:00:46 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2006/04/06 06:22:03 reed Exp $
#
GST_PLUGINS0.8_NAME= png
@@ -8,7 +8,7 @@ GST_PLUGINS0.8_FLAG= pngenc
.include "../../multimedia/gst-plugins0.8/Makefile.common"
PKGREVISION= 4
-BUILDLINK_DEPENDS.png+= png>=1.2.5nb3 # requires libpng12.pc
+BUILDLINK_API_DEPENDS.png+= png>=1.2.5nb3 # requires libpng12.pc
.include "../../graphics/png/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile
index c1a5af70826..b245f3148d6 100644
--- a/graphics/gthumb/Makefile
+++ b/graphics/gthumb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/03/21 06:00:46 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2006/04/06 06:22:03 reed Exp $
DISTNAME= gthumb-2.6.9
PKGREVISION= 2
@@ -16,7 +16,7 @@ USE_LIBTOOL= yes
GNU_CONFIGURE= yes
GCONF2_SCHEMAS+= gthumb.schemas
-BUILDLINK_DEPENDS.libglade2+= libglade2>=2.4.0
+BUILDLINK_API_DEPENDS.libglade2+= libglade2>=2.4.0
.include "../../devel/GConf2/schemas.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/graphics/gtkglext/buildlink3.mk b/graphics/gtkglext/buildlink3.mk
index 5b460466c34..800a13cb4bb 100644
--- a/graphics/gtkglext/buildlink3.mk
+++ b/graphics/gtkglext/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/13 21:11:13 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:22:03 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GTKGLEXT_BUILDLINK3_MK:= ${GTKGLEXT_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtkglext}
BUILDLINK_PACKAGES+= gtkglext
.if !empty(GTKGLEXT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gtkglext+= gtkglext>=1.2.0
+BUILDLINK_API_DEPENDS.gtkglext+= gtkglext>=1.2.0
BUILDLINK_PKGSRCDIR.gtkglext?= ../../graphics/gtkglext
.endif # GTKGLEXT_BUILDLINK3_MK
diff --git a/graphics/hermes/buildlink3.mk b/graphics/hermes/buildlink3.mk
index e5a14e09c30..0a4f703a928 100644
--- a/graphics/hermes/buildlink3.mk
+++ b/graphics/hermes/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:09:33 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:03 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
HERMES_BUILDLINK3_MK:= ${HERMES_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NHermes}
BUILDLINK_PACKAGES+= Hermes
.if !empty(HERMES_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.Hermes+= Hermes>=1.3.2
-BUILDLINK_RECOMMENDED.Hermes+= Hermes>=1.3.3nb2
+BUILDLINK_API_DEPENDS.Hermes+= Hermes>=1.3.2
+BUILDLINK_ABI_DEPENDS.Hermes+= Hermes>=1.3.3nb2
BUILDLINK_PKGSRCDIR.Hermes?= ../../graphics/hermes
.endif # HERMES_BUILDLINK3_MK
diff --git a/graphics/hicolor-icon-theme/buildlink3.mk b/graphics/hicolor-icon-theme/buildlink3.mk
index 97bc5c5f19d..7f94be12ce2 100644
--- a/graphics/hicolor-icon-theme/buildlink3.mk
+++ b/graphics/hicolor-icon-theme/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/03/30 20:47:44 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:03 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
HICOLOR_ICON_THEME_BUILDLINK3_MK:= ${HICOLOR_ICON_THEME_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nhicolor-icon-theme}
BUILDLINK_PACKAGES+= hicolor-icon-theme
.if !empty(HICOLOR_ICON_THEME_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.hicolor-icon-theme+= hicolor-icon-theme>=0.4
-BUILDLINK_RECOMMENDED.hicolor-icon-theme+= hicolor-icon-theme>=0.5nb1
+BUILDLINK_API_DEPENDS.hicolor-icon-theme+= hicolor-icon-theme>=0.4
+BUILDLINK_ABI_DEPENDS.hicolor-icon-theme+= hicolor-icon-theme>=0.5nb1
BUILDLINK_PKGSRCDIR.hicolor-icon-theme?=../../graphics/hicolor-icon-theme
.include "../../mk/bsd.prefs.mk"
diff --git a/graphics/imlib/buildlink3.mk b/graphics/imlib/buildlink3.mk
index d61603861d8..ee615d3d936 100644
--- a/graphics/imlib/buildlink3.mk
+++ b/graphics/imlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:09:33 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:22:03 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
IMLIB_BUILDLINK3_MK:= ${IMLIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nimlib}
BUILDLINK_PACKAGES+= imlib
.if !empty(IMLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.imlib+= imlib>=1.9.14nb5
-BUILDLINK_RECOMMENDED.imlib+= imlib>=1.9.15nb3
+BUILDLINK_API_DEPENDS.imlib+= imlib>=1.9.14nb5
+BUILDLINK_ABI_DEPENDS.imlib+= imlib>=1.9.15nb3
BUILDLINK_PKGSRCDIR.imlib?= ../../graphics/imlib
.endif # IMLIB_BUILDLINK3_MK
diff --git a/graphics/imlib2/buildlink3.mk b/graphics/imlib2/buildlink3.mk
index aabbf4957a7..da12d117bc9 100644
--- a/graphics/imlib2/buildlink3.mk
+++ b/graphics/imlib2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/02/05 23:09:33 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/04/06 06:22:03 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
IMLIB2_BUILDLINK3_MK:= ${IMLIB2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nimlib2}
BUILDLINK_PACKAGES+= imlib2
.if !empty(IMLIB2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.imlib2+= imlib2>=1.1.0nb2
-BUILDLINK_RECOMMENDED.imlib2+= imlib2>=1.2.0nb4
+BUILDLINK_API_DEPENDS.imlib2+= imlib2>=1.1.0nb2
+BUILDLINK_ABI_DEPENDS.imlib2+= imlib2>=1.2.0nb4
BUILDLINK_PKGSRCDIR.imlib2?= ../../graphics/imlib2
.endif # IMLIB2_BUILDLINK3_MK
diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index 70f4d7a1654..90270c74b3f 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/03/06 18:50:21 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2006/04/06 06:22:03 reed Exp $
DISTNAME= inkscape-0.43
PKGREVISION= 4
@@ -23,7 +23,7 @@ USE_TOOLS+= gmake pkg-config
GNU_CONFIGURE= yes
BUILD_USES_MSGFMT= yes
-BUILDLINK_DEPENDS.boehm-gc+= boehm-gc>=6.4
+BUILDLINK_API_DEPENDS.boehm-gc+= boehm-gc>=6.4
.include "../../devel/boehm-gc/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
diff --git a/graphics/jasper/buildlink3.mk b/graphics/jasper/buildlink3.mk
index bf9eba82b31..6a5288409d6 100644
--- a/graphics/jasper/buildlink3.mk
+++ b/graphics/jasper/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:09:34 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:03 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
JASPER_BUILDLINK3_MK:= ${JASPER_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Njasper}
BUILDLINK_PACKAGES+= jasper
.if !empty(JASPER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.jasper+= jasper>=1.600.0
-BUILDLINK_RECOMMENDED.jasper+= jasper>=1.701.0nb2
+BUILDLINK_API_DEPENDS.jasper+= jasper>=1.600.0
+BUILDLINK_ABI_DEPENDS.jasper+= jasper>=1.701.0nb2
BUILDLINK_PKGSRCDIR.jasper?= ../../graphics/jasper
.endif # JASPER_BUILDLINK3_MK
diff --git a/graphics/jpeg/buildlink3.mk b/graphics/jpeg/buildlink3.mk
index b20cffbde60..e7275c2e534 100644
--- a/graphics/jpeg/buildlink3.mk
+++ b/graphics/jpeg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/10/03 00:14:54 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:03 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
JPEG_BUILDLINK3_MK:= ${JPEG_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Njpeg}
BUILDLINK_PACKAGES+= jpeg
.if !empty(JPEG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.jpeg+= jpeg>=6b
-BUILDLINK_RECOMMENDED.jpeg+= jpeg>=6bnb2
+BUILDLINK_API_DEPENDS.jpeg+= jpeg>=6b
+BUILDLINK_ABI_DEPENDS.jpeg+= jpeg>=6bnb2
BUILDLINK_PKGSRCDIR.jpeg?= ../../graphics/jpeg
.endif # JPEG_BUILDLINK3_MK
diff --git a/graphics/kbarcode/Makefile b/graphics/kbarcode/Makefile
index 4f40fe630c0..0d462b13cdd 100644
--- a/graphics/kbarcode/Makefile
+++ b/graphics/kbarcode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:29:49 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2006/04/06 06:22:03 reed Exp $
DISTNAME= kbarcode-1.8.1
PKGREVISION= 4
@@ -18,7 +18,7 @@ GNU_CONFIGURE= yes
DEPENDS+= barcode-[0-9]*:../../graphics/barcode
# Works only with KDE 3.3.x
-BUILDLINK_DEPENDS.kdelibs+= kdelibs>=3.3.0
+BUILDLINK_API_DEPENDS.kdelibs+= kdelibs>=3.3.0
.include "../../meta-pkgs/kde3/kde3.mk"
.include "../../x11/kdelibs3/buildlink3.mk"
diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile
index d56a545c344..f6b3fb5fb66 100644
--- a/graphics/kdegraphics3/Makefile
+++ b/graphics/kdegraphics3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2006/03/30 03:02:01 markd Exp $
+# $NetBSD: Makefile,v 1.64 2006/04/06 06:22:03 reed Exp $
DISTNAME= kdegraphics-${_KDE_VERSION}
CATEGORIES= graphics
@@ -9,7 +9,7 @@ COMMENT= Graphics programs for the KDE integrated X11 desktop
USE_DIRS+= xdg-1.1
USE_TOOLS+= gs:run pkg-config
-BUILDLINK_DEPENDS.lcms+= lcms>=1.12
+BUILDLINK_API_DEPENDS.lcms+= lcms>=1.12
REPLACE_PERL+= kghostview/update-to-xt-names.pl
diff --git a/graphics/kdegraphics3/buildlink3.mk b/graphics/kdegraphics3/buildlink3.mk
index 16862e632d0..c7838b509cd 100644
--- a/graphics/kdegraphics3/buildlink3.mk
+++ b/graphics/kdegraphics3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:09:34 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:22:03 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
KDEGRAPHICS_BUILDLINK3_MK:= ${KDEGRAPHICS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nkdegraphics}
BUILDLINK_PACKAGES+= kdegraphics
.if !empty(KDEGRAPHICS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.kdegraphics+= kdegraphics>=3.5.0nb2
-BUILDLINK_RECOMMENDED.kdegraphics?= kdegraphics>=3.5.1nb2
+BUILDLINK_API_DEPENDS.kdegraphics+= kdegraphics>=3.5.0nb2
+BUILDLINK_ABI_DEPENDS.kdegraphics?= kdegraphics>=3.5.1nb2
BUILDLINK_PKGSRCDIR.kdegraphics?= ../../graphics/kdegraphics3
.endif # KDEGRAPHICS_BUILDLINK3_MK
diff --git a/graphics/lcms/buildlink3.mk b/graphics/lcms/buildlink3.mk
index 9796c19a986..e6efb67caa3 100644
--- a/graphics/lcms/buildlink3.mk
+++ b/graphics/lcms/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/10/03 00:14:54 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:03 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LCMS_BUILDLINK3_MK:= ${LCMS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlcms}
BUILDLINK_PACKAGES+= lcms
.if !empty(LCMS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.lcms+= lcms>=1.06
-BUILDLINK_RECOMMENDED.lcms+= lcms>=1.12nb2
+BUILDLINK_API_DEPENDS.lcms+= lcms>=1.06
+BUILDLINK_ABI_DEPENDS.lcms+= lcms>=1.12nb2
BUILDLINK_PKGSRCDIR.lcms?= ../../graphics/lcms
BUILDLINK_TARGETS+= buildlink-include-lcms
diff --git a/graphics/lib3ds/buildlink3.mk b/graphics/lib3ds/buildlink3.mk
index 45ea3f90c0d..e922cbbc649 100644
--- a/graphics/lib3ds/buildlink3.mk
+++ b/graphics/lib3ds/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:09:34 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:03 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIB3DS_BUILDLINK3_MK:= ${LIB3DS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlib3ds}
BUILDLINK_PACKAGES+= lib3ds
.if !empty(LIB3DS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.lib3ds+= lib3ds>=1.2.0nb2
-BUILDLINK_RECOMMENDED.lib3ds?= lib3ds>=1.2.0nb4
+BUILDLINK_API_DEPENDS.lib3ds+= lib3ds>=1.2.0nb2
+BUILDLINK_ABI_DEPENDS.lib3ds?= lib3ds>=1.2.0nb4
BUILDLINK_PKGSRCDIR.lib3ds?= ../../graphics/lib3ds
.endif # LIB3DS_BUILDLINK3_MK
diff --git a/graphics/libart2/buildlink3.mk b/graphics/libart2/buildlink3.mk
index ee8a17b71ee..d3866d0e5c7 100644
--- a/graphics/libart2/buildlink3.mk
+++ b/graphics/libart2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:14:55 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:03 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBART2_BUILDLINK3_MK:= ${LIBART2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibart2}
BUILDLINK_PACKAGES+= libart2
.if !empty(LIBART2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libart2+= libart2>=2.3.10nb1
-BUILDLINK_RECOMMENDED.libart2+= libart2>=2.3.16nb1
+BUILDLINK_API_DEPENDS.libart2+= libart2>=2.3.10nb1
+BUILDLINK_ABI_DEPENDS.libart2+= libart2>=2.3.16nb1
BUILDLINK_PKGSRCDIR.libart2?= ../../graphics/libart2
.endif # LIBART2_BUILDLINK3_MK
diff --git a/graphics/libexif-gtk/buildlink3.mk b/graphics/libexif-gtk/buildlink3.mk
index 04bfc18beb7..b64df2951a4 100644
--- a/graphics/libexif-gtk/buildlink3.mk
+++ b/graphics/libexif-gtk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:09:34 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:03 reed Exp $
#
# This file was created automatically using createbuildlink-3.4.
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibexif-gtk}
BUILDLINK_PACKAGES+= libexif-gtk
.if !empty(LIBEXIF_GTK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libexif-gtk+= libexif-gtk>=0.3.3nb7
-BUILDLINK_RECOMMENDED.libexif-gtk+= libexif-gtk>=0.3.5nb3
+BUILDLINK_API_DEPENDS.libexif-gtk+= libexif-gtk>=0.3.3nb7
+BUILDLINK_ABI_DEPENDS.libexif-gtk+= libexif-gtk>=0.3.5nb3
BUILDLINK_PKGSRCDIR.libexif-gtk?= ../../graphics/libexif-gtk
.endif # LIBEXIF_GTK_BUILDLINK3_MK
diff --git a/graphics/libexif/buildlink3.mk b/graphics/libexif/buildlink3.mk
index 818da8a20c9..000178dee1a 100644
--- a/graphics/libexif/buildlink3.mk
+++ b/graphics/libexif/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/05 23:09:34 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:22:03 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBEXIF_BUILDLINK3_MK:= ${LIBEXIF_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibexif}
BUILDLINK_PACKAGES+= libexif
.if !empty(LIBEXIF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libexif+= libexif>=0.6.11
-BUILDLINK_RECOMMENDED.libexif+= libexif>=0.6.13nb1
+BUILDLINK_API_DEPENDS.libexif+= libexif>=0.6.11
+BUILDLINK_ABI_DEPENDS.libexif+= libexif>=0.6.13nb1
BUILDLINK_PKGSRCDIR.libexif?= ../../graphics/libexif
.endif # LIBEXIF_BUILDLINK3_MK
diff --git a/graphics/libgdgeda/buildlink3.mk b/graphics/libgdgeda/buildlink3.mk
index adb880fb6db..5625da53646 100644
--- a/graphics/libgdgeda/buildlink3.mk
+++ b/graphics/libgdgeda/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/10/03 00:14:55 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:04 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGDGEDA_BUILDLINK3_MK:= ${LIBGDGEDA_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgdgeda}
BUILDLINK_PACKAGES+= libgdgeda
.if !empty(LIBGDGEDA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgdgeda+= libgdgeda>=2.0.15
-BUILDLINK_RECOMMENDED.libgdgeda+= libgdgeda>=2.0.15nb2
+BUILDLINK_API_DEPENDS.libgdgeda+= libgdgeda>=2.0.15
+BUILDLINK_ABI_DEPENDS.libgdgeda+= libgdgeda>=2.0.15nb2
BUILDLINK_PKGSRCDIR.libgdgeda?= ../../graphics/libgdgeda
.endif # LIBGDGEDA_BUILDLINK3_MK
diff --git a/graphics/libgdiplus/Makefile b/graphics/libgdiplus/Makefile
index a20606bef27..d50d35ef26d 100644
--- a/graphics/libgdiplus/Makefile
+++ b/graphics/libgdiplus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/02/05 23:09:34 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2006/04/06 06:22:04 reed Exp $
#
DISTNAME= libgdiplus-1.1.11
@@ -17,9 +17,9 @@ PKGCONFIG_OVERRIDE+= libgdiplus.pc.in
PKGCONFIG_OVERRIDE+= cairo/cairo.pc.in
GNU_CONFIGURE= yes
-BUILDLINK_DEPENDS.freetype2+= freetype2>=2.1.5
-BUILDLINK_DEPENDS.Xft2+= Xft2>=2.1.2
-BUILDLINK_DEPENDS.Xrender+= Xrender>=0.8
+BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.1.5
+BUILDLINK_API_DEPENDS.Xft2+= Xft2>=2.1.2
+BUILDLINK_API_DEPENDS.Xrender+= Xrender>=0.8
BUILDLINK_TRANSFORM+= rm:-Werror
diff --git a/graphics/libgdiplus/buildlink3.mk b/graphics/libgdiplus/buildlink3.mk
index b81b8584f05..2935fb51155 100644
--- a/graphics/libgdiplus/buildlink3.mk
+++ b/graphics/libgdiplus/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2006/02/05 23:09:34 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2006/04/06 06:22:04 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGDIPLUS_BUILDLINK3_MK:= ${LIBGDIPLUS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgdiplus}
BUILDLINK_PACKAGES+= libgdiplus
.if !empty(LIBGDIPLUS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgdiplus+= libgdiplus>=1.1.11
-BUILDLINK_RECOMMENDED.libgdiplus?= libgdiplus>=1.1.11nb2
+BUILDLINK_API_DEPENDS.libgdiplus+= libgdiplus>=1.1.11
+BUILDLINK_ABI_DEPENDS.libgdiplus?= libgdiplus>=1.1.11nb2
BUILDLINK_PKGSRCDIR.libgdiplus?= ../../graphics/libgdiplus
.endif # LIBGDIPLUS_BUILDLINK3_MK
diff --git a/graphics/libggi/buildlink3.mk b/graphics/libggi/buildlink3.mk
index 59069d455c8..fb933660afa 100644
--- a/graphics/libggi/buildlink3.mk
+++ b/graphics/libggi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:09:34 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:04 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGGI_BUILDLINK3_MK:= ${LIBGGI_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibggi}
BUILDLINK_PACKAGES+= libggi
.if !empty(LIBGGI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libggi+= libggi>=2.1.0
-BUILDLINK_RECOMMENDED.libggi?= libggi>=2.1.1nb1
+BUILDLINK_API_DEPENDS.libggi+= libggi>=2.1.0
+BUILDLINK_ABI_DEPENDS.libggi?= libggi>=2.1.1nb1
BUILDLINK_PKGSRCDIR.libggi?= ../../graphics/libggi
.endif # LIBGGI_BUILDLINK3_MK
diff --git a/graphics/libggiwmh/buildlink3.mk b/graphics/libggiwmh/buildlink3.mk
index 2b3f6cafcca..bbea4ad9190 100644
--- a/graphics/libggiwmh/buildlink3.mk
+++ b/graphics/libggiwmh/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:09:34 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:04 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGGIWMH_BUILDLINK3_MK:= ${LIBGGIWMH_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibggiwmh}
BUILDLINK_PACKAGES+= libggiwmh
.if !empty(LIBGGIWMH_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libggiwmh+= libggiwmh>=0.2.0
-BUILDLINK_RECOMMENDED.libggiwmh?= libggiwmh>=0.2.1nb1
+BUILDLINK_API_DEPENDS.libggiwmh+= libggiwmh>=0.2.0
+BUILDLINK_ABI_DEPENDS.libggiwmh?= libggiwmh>=0.2.1nb1
BUILDLINK_PKGSRCDIR.libggiwmh?= ../../graphics/libggiwmh
.endif # LIBGGIWMH_BUILDLINK3_MK
diff --git a/graphics/libgii/buildlink3.mk b/graphics/libgii/buildlink3.mk
index d2bab552755..51789e0d99d 100644
--- a/graphics/libgii/buildlink3.mk
+++ b/graphics/libgii/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:09:35 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:04 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGII_BUILDLINK3_MK:= ${LIBGII_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgii}
BUILDLINK_PACKAGES+= libgii
.if !empty(LIBGII_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgii+= libgii>=0.9.0
-BUILDLINK_RECOMMENDED.libgii?= libgii>=0.9.1nb1
+BUILDLINK_API_DEPENDS.libgii+= libgii>=0.9.0
+BUILDLINK_ABI_DEPENDS.libgii?= libgii>=0.9.1nb1
BUILDLINK_PKGSRCDIR.libgii?= ../../graphics/libgii
.endif # LIBGII_BUILDLINK3_MK
diff --git a/graphics/libgnomecanvas/buildlink3.mk b/graphics/libgnomecanvas/buildlink3.mk
index cfb67bc9cf1..e2b9402b37b 100644
--- a/graphics/libgnomecanvas/buildlink3.mk
+++ b/graphics/libgnomecanvas/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:09:35 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:22:04 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGNOMECANVAS_BUILDLINK3_MK:= ${LIBGNOMECANVAS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgnomecanvas}
BUILDLINK_PACKAGES+= libgnomecanvas
.if !empty(LIBGNOMECANVAS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgnomecanvas+= libgnomecanvas>=2.8.0
-BUILDLINK_RECOMMENDED.libgnomecanvas+= libgnomecanvas>=2.12.0nb2
+BUILDLINK_API_DEPENDS.libgnomecanvas+= libgnomecanvas>=2.8.0
+BUILDLINK_ABI_DEPENDS.libgnomecanvas+= libgnomecanvas>=2.12.0nb2
BUILDLINK_PKGSRCDIR.libgnomecanvas?= ../../graphics/libgnomecanvas
.endif # LIBGNOMECANVAS_BUILDLINK3_MK
diff --git a/graphics/libgnomecanvasmm/buildlink3.mk b/graphics/libgnomecanvasmm/buildlink3.mk
index fafbf46f1d3..fb858f6e971 100644
--- a/graphics/libgnomecanvasmm/buildlink3.mk
+++ b/graphics/libgnomecanvasmm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:09:35 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:04 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGNOMECANVASMM_BUILDLINK3_MK:= ${LIBGNOMECANVASMM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgnomecanvasmm}
BUILDLINK_PACKAGES+= libgnomecanvasmm
.if !empty(LIBGNOMECANVASMM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgnomecanvasmm+= libgnomecanvasmm>=2.10.0
-BUILDLINK_RECOMMENDED.libgnomecanvasmm?= libgnomecanvasmm>=2.12.0nb2
+BUILDLINK_API_DEPENDS.libgnomecanvasmm+= libgnomecanvasmm>=2.10.0
+BUILDLINK_ABI_DEPENDS.libgnomecanvasmm?= libgnomecanvasmm>=2.12.0nb2
BUILDLINK_PKGSRCDIR.libgnomecanvasmm?= ../../graphics/libgnomecanvasmm
.endif # LIBGNOMECANVASMM_BUILDLINK3_MK
diff --git a/graphics/libkexif/buildlink3.mk b/graphics/libkexif/buildlink3.mk
index 73418f848f0..efadcd2a4ea 100644
--- a/graphics/libkexif/buildlink3.mk
+++ b/graphics/libkexif/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:09:35 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:04 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBKEXIF_BUILDLINK3_MK:= ${LIBKEXIF_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibkexif}
BUILDLINK_PACKAGES+= libkexif
.if !empty(LIBKEXIF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libkexif+= libkexif>=0.2.1
-BUILDLINK_RECOMMENDED.libkexif?= libkexif>=0.2.2nb2
+BUILDLINK_API_DEPENDS.libkexif+= libkexif>=0.2.1
+BUILDLINK_ABI_DEPENDS.libkexif?= libkexif>=0.2.2nb2
BUILDLINK_PKGSRCDIR.libkexif?= ../../graphics/libkexif
.endif # LIBKEXIF_BUILDLINK3_MK
diff --git a/graphics/libkipi/buildlink3.mk b/graphics/libkipi/buildlink3.mk
index 8af77ea864c..225335f0cae 100644
--- a/graphics/libkipi/buildlink3.mk
+++ b/graphics/libkipi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:09:35 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:04 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBKIPI_BUILDLINK3_MK:= ${LIBKIPI_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibkipi}
BUILDLINK_PACKAGES+= libkipi
.if !empty(LIBKIPI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libkipi+= libkipi>=0.1
-BUILDLINK_RECOMMENDED.libkipi?= libkipi>=0.1.2nb2
+BUILDLINK_API_DEPENDS.libkipi+= libkipi>=0.1
+BUILDLINK_ABI_DEPENDS.libkipi?= libkipi>=0.1.2nb2
BUILDLINK_PKGSRCDIR.libkipi?= ../../graphics/libkipi
. for dir in share/kde/apps/kipi/data share/kde/apps/kipi
diff --git a/graphics/libpixman/buildlink3.mk b/graphics/libpixman/buildlink3.mk
index 162cebf39a9..1026b9ae17a 100644
--- a/graphics/libpixman/buildlink3.mk
+++ b/graphics/libpixman/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2005/03/27 12:28:08 recht Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:04 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBPIXMAN_BUILDLINK3_MK:= ${LIBPIXMAN_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibpixman}
BUILDLINK_PACKAGES+= libpixman
.if !empty(LIBPIXMAN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libpixman+= libpixman>=0.1.4
+BUILDLINK_API_DEPENDS.libpixman+= libpixman>=0.1.4
BUILDLINK_PKGSRCDIR.libpixman?= ../../graphics/libpixman
.endif # LIBPIXMAN_BUILDLINK3_MK
diff --git a/graphics/librsvg/buildlink3.mk b/graphics/librsvg/buildlink3.mk
index 0041e994a6a..6a255cc2dc8 100644
--- a/graphics/librsvg/buildlink3.mk
+++ b/graphics/librsvg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:09:35 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:04 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBRSVG_BUILDLINK3_MK:= ${LIBRSVG_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibrsvg}
BUILDLINK_PACKAGES+= librsvg
.if !empty(LIBRSVG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.librsvg+= librsvg>=1.0.1nb5
-BUILDLINK_RECOMMENDED.librsvg+= librsvg>=1.0.3nb1
+BUILDLINK_API_DEPENDS.librsvg+= librsvg>=1.0.1nb5
+BUILDLINK_ABI_DEPENDS.librsvg+= librsvg>=1.0.3nb1
BUILDLINK_PKGSRCDIR.librsvg?= ../../graphics/librsvg
.endif # LIBRSVG_BUILDLINK3_MK
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index 6a2aae99598..5b34fbedebc 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2006/04/03 06:35:26 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2006/04/06 06:22:04 reed Exp $
#
DISTNAME= librsvg-2.14.3
@@ -32,7 +32,7 @@ GTK2_LOADERS= yes
.include "../../devel/libgsf/buildlink3.mk"
.include "../../print/libgnomeprintui/buildlink3.mk"
-BUILDLINK_DEPENDS.libcroco+= libcroco>=0.6.1
+BUILDLINK_API_DEPENDS.libcroco+= libcroco>=0.6.1
.include "../../textproc/libcroco/buildlink3.mk"
.include "../../x11/gtk2/modules.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/librsvg2/buildlink3.mk b/graphics/librsvg2/buildlink3.mk
index 1d4264237b1..477d3a1bd47 100644
--- a/graphics/librsvg2/buildlink3.mk
+++ b/graphics/librsvg2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/03/06 00:18:13 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2006/04/06 06:22:04 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBRSVG2_BUILDLINK3_MK:= ${LIBRSVG2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibrsvg2}
BUILDLINK_PACKAGES+= librsvg2
.if !empty(LIBRSVG2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.librsvg2+= librsvg2>=2.12.6nb1
-BUILDLINK_RECOMMENDED.librsvg2+= librsvg2>=2.14.1
+BUILDLINK_API_DEPENDS.librsvg2+= librsvg2>=2.12.6nb1
+BUILDLINK_ABI_DEPENDS.librsvg2+= librsvg2>=2.14.1
BUILDLINK_PKGSRCDIR.librsvg2?= ../../graphics/librsvg2
.endif # LIBRSVG2_BUILDLINK3_MK
diff --git a/graphics/libungif/buildlink3.mk b/graphics/libungif/buildlink3.mk
index b5ba6e5a84b..1f1ad609367 100644
--- a/graphics/libungif/buildlink3.mk
+++ b/graphics/libungif/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/10/03 00:14:55 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:04 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBUNGIF_BUILDLINK3_MK:= ${LIBUNGIF_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibungif}
BUILDLINK_PACKAGES+= libungif
.if !empty(LIBUNGIF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libungif+= libungif>=4.1.0
-BUILDLINK_RECOMMENDED.libungif+= libungif>=4.1.3nb1
+BUILDLINK_API_DEPENDS.libungif+= libungif>=4.1.0
+BUILDLINK_ABI_DEPENDS.libungif+= libungif>=4.1.3nb1
BUILDLINK_PKGSRCDIR.libungif?= ../../graphics/libungif
.endif # LIBUNGIF_BUILDLINK3_MK
diff --git a/graphics/libvideogfx/buildlink3.mk b/graphics/libvideogfx/buildlink3.mk
index c13c302216f..f1e20c8f554 100644
--- a/graphics/libvideogfx/buildlink3.mk
+++ b/graphics/libvideogfx/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:09:35 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:04 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBVIDEOGFX_BUILDLINK3_MK:= ${LIBVIDEOGFX_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibvideogfx}
BUILDLINK_PACKAGES+= libvideogfx
.if !empty(LIBVIDEOGFX_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libvideogfx+= libvideogfx>=1.0.3
-BUILDLINK_RECOMMENDED.libvideogfx+= libvideogfx>=1.0.3nb2
+BUILDLINK_API_DEPENDS.libvideogfx+= libvideogfx>=1.0.3
+BUILDLINK_ABI_DEPENDS.libvideogfx+= libvideogfx>=1.0.3nb2
BUILDLINK_PKGSRCDIR.libvideogfx?= ../../graphics/libvideogfx
.endif # LIBVIDEOGFX_BUILDLINK3_MK
diff --git a/graphics/libwmf/buildlink3.mk b/graphics/libwmf/buildlink3.mk
index ec768dbb067..844e90a79d7 100644
--- a/graphics/libwmf/buildlink3.mk
+++ b/graphics/libwmf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:09:35 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:22:04 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBWMF_BUILDLINK3_MK:= ${LIBWMF_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibwmf}
BUILDLINK_PACKAGES+= libwmf
.if !empty(LIBWMF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libwmf+= libwmf>=0.2.8nb2
-BUILDLINK_RECOMMENDED.libwmf+= libwmf>=0.2.8.4nb2
+BUILDLINK_API_DEPENDS.libwmf+= libwmf>=0.2.8nb2
+BUILDLINK_ABI_DEPENDS.libwmf+= libwmf>=0.2.8.4nb2
BUILDLINK_PKGSRCDIR.libwmf?= ../../graphics/libwmf
.endif # LIBWMF_BUILDLINK3_MK
diff --git a/graphics/mng/buildlink3.mk b/graphics/mng/buildlink3.mk
index 4ff15e2ef6f..c09e7442cff 100644
--- a/graphics/mng/buildlink3.mk
+++ b/graphics/mng/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:09:35 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:05 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
MNG_BUILDLINK3_MK:= ${MNG_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmng}
BUILDLINK_PACKAGES+= mng
.if !empty(MNG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.mng+= mng>=1.0.0
-BUILDLINK_RECOMMENDED.mng+= mng>=1.0.9nb1
+BUILDLINK_API_DEPENDS.mng+= mng>=1.0.0
+BUILDLINK_ABI_DEPENDS.mng+= mng>=1.0.9nb1
BUILDLINK_PKGSRCDIR.mng?= ../../graphics/mng
.endif # MNG_BUILDLINK3_MK
diff --git a/graphics/netpbm/buildlink3.mk b/graphics/netpbm/buildlink3.mk
index 13543d78a8f..aae224ce1fd 100644
--- a/graphics/netpbm/buildlink3.mk
+++ b/graphics/netpbm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:09:36 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:05 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
NETPBM_BUILDLINK3_MK:= ${NETPBM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nnetpbm}
BUILDLINK_PACKAGES+= netpbm
.if !empty(NETPBM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.netpbm+= netpbm>=10.11.6
-BUILDLINK_RECOMMENDED.netpbm+= netpbm>=10.31nb2
+BUILDLINK_API_DEPENDS.netpbm+= netpbm>=10.11.6
+BUILDLINK_ABI_DEPENDS.netpbm+= netpbm>=10.31nb2
BUILDLINK_PKGSRCDIR.netpbm?= ../../graphics/netpbm
.endif # NETPBM_BUILDLINK3_MK
diff --git a/graphics/openexr/buildlink3.mk b/graphics/openexr/buildlink3.mk
index 187c4a71aa8..2496ccf2e6e 100644
--- a/graphics/openexr/buildlink3.mk
+++ b/graphics/openexr/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:09:36 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:05 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OPENEXR_BUILDLINK3_MK:= ${OPENEXR_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nopenexr}
BUILDLINK_PACKAGES+= openexr
.if !empty(OPENEXR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.openexr+= openexr>=1.2.1
-BUILDLINK_RECOMMENDED.openexr?= openexr>=1.2.2nb1
+BUILDLINK_API_DEPENDS.openexr+= openexr>=1.2.1
+BUILDLINK_ABI_DEPENDS.openexr?= openexr>=1.2.2nb1
BUILDLINK_PKGSRCDIR.openexr?= ../../graphics/openexr
.endif # OPENEXR_BUILDLINK3_MK
diff --git a/graphics/optipng/Makefile b/graphics/optipng/Makefile
index bba933f46d6..1e9341640bf 100644
--- a/graphics/optipng/Makefile
+++ b/graphics/optipng/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/01/19 11:18:41 adam Exp $
+# $NetBSD: Makefile,v 1.6 2006/04/06 06:22:05 reed Exp $
DISTNAME= optipng-0.5
CATEGORIES= graphics
@@ -8,7 +8,7 @@ MAINTAINER= adam@NetBSD.org
HOMEPAGE= http://www.cs.toronto.edu/~cosmin/pngtech/optipng/
COMMENT= Advanced PNG Optimizer
-BUILDLINK_DEPENDS.zlib+= zlib>=1.2.2
+BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.2
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
diff --git a/graphics/p5-GD/Makefile b/graphics/p5-GD/Makefile
index a0517ac5919..22c7e7dde1c 100644
--- a/graphics/p5-GD/Makefile
+++ b/graphics/p5-GD/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2006/02/05 23:09:36 joerg Exp $
+# $NetBSD: Makefile,v 1.34 2006/04/06 06:22:05 reed Exp $
DISTNAME= GD-2.30
PKGNAME= p5-${DISTNAME}
@@ -13,7 +13,7 @@ COMMENT= Perl5 interface to gd graphics library
PKG_INSTALLATION_TYPES= overwrite pkgviews
-BUILDLINK_DEPENDS.gd+= gd>=2.0.28
+BUILDLINK_API_DEPENDS.gd+= gd>=2.0.28
PERL5_PACKLIST= auto/GD/.packlist
PERL5_OPTIONS+= threads
diff --git a/graphics/p5-Image-Imlib2/Makefile b/graphics/p5-Image-Imlib2/Makefile
index 017b18b3e4a..bc0eaa42f48 100644
--- a/graphics/p5-Image-Imlib2/Makefile
+++ b/graphics/p5-Image-Imlib2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/03/04 21:29:50 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2006/04/06 06:22:05 reed Exp $
#
DISTNAME= Image-Imlib2-1.04
@@ -13,7 +13,7 @@ HOMEPAGE= http://theory.uwinnipeg.ca/CPAN/data/Image-Imlib2/
COMMENT= Interface to the Imlib2 image library
# versions before that contained a broken imlib2-config
-BUILDLINK_DEPENDS.imlib2+= imlib2>=1.2.0nb2
+BUILDLINK_API_DEPENDS.imlib2+= imlib2>=1.2.0nb2
PERL5_MODULE_TYPE= Module::Build
diff --git a/graphics/p5-PerlMagick/Makefile b/graphics/p5-PerlMagick/Makefile
index ee4441fbcfa..b7bad0588ba 100644
--- a/graphics/p5-PerlMagick/Makefile
+++ b/graphics/p5-PerlMagick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2006/04/04 22:30:50 ghen Exp $
+# $NetBSD: Makefile,v 1.51 2006/04/06 06:22:05 reed Exp $
.include "../../graphics/ImageMagick/Makefile.common"
@@ -31,7 +31,7 @@ CONFIGURE_ARGS+= --with-perl=${PERL5:Q}
post-configure: perl5-configure
-BUILDLINK_DEPENDS.ImageMagick+= ImageMagick>=${DISTVERSION}
+BUILDLINK_API_DEPENDS.ImageMagick+= ImageMagick>=${DISTVERSION}
.include "../../graphics/ImageMagick/buildlink3.mk"
.include "../../mk/x11.buildlink3.mk"
.include "../../lang/perl5/module.mk"
diff --git a/graphics/plotutils-nox11/buildlink3.mk b/graphics/plotutils-nox11/buildlink3.mk
index 0ddd518e8ba..638ff5f40ba 100644
--- a/graphics/plotutils-nox11/buildlink3.mk
+++ b/graphics/plotutils-nox11/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/04/17 01:14:19 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:05 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PLOTUTILS_NOX11_BUILDLINK3_MK:= ${PLOTUTILS_NOX11_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nplotutils-nox11}
BUILDLINK_PACKAGES+= plotutils-nox11
.if !empty(PLOTUTILS_NOX11_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.plotutils-nox11+= plotutils-nox11>=2.4.1
+BUILDLINK_API_DEPENDS.plotutils-nox11+= plotutils-nox11>=2.4.1
BUILDLINK_PKGSRCDIR.plotutils-nox11?= ../../graphics/plotutils-nox11
.endif # PLOTUTILS_NOX11_BUILDLINK3_MK
diff --git a/graphics/plotutils/buildlink3.mk b/graphics/plotutils/buildlink3.mk
index 2835a1602e2..c751dc18c9b 100644
--- a/graphics/plotutils/buildlink3.mk
+++ b/graphics/plotutils/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:09:37 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:05 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PLOTUTILS_BUILDLINK3_MK:= ${PLOTUTILS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nplotutils}
BUILDLINK_PACKAGES+= plotutils
.if !empty(PLOTUTILS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.plotutils+= plotutils>=2.4.1nb2
-BUILDLINK_RECOMMENDED.plotutils+= plotutils>=2.4.1nb4
+BUILDLINK_API_DEPENDS.plotutils+= plotutils>=2.4.1nb2
+BUILDLINK_ABI_DEPENDS.plotutils+= plotutils>=2.4.1nb4
BUILDLINK_PKGSRCDIR.plotutils?= ../../graphics/plotutils
.endif # PLOTUTILS_BUILDLINK3_MK
diff --git a/graphics/png/buildlink3.mk b/graphics/png/buildlink3.mk
index ae9bf466763..79df10592d5 100644
--- a/graphics/png/buildlink3.mk
+++ b/graphics/png/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2004/10/03 00:14:57 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/04/06 06:22:05 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PNG_BUILDLINK3_MK:= ${PNG_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npng}
BUILDLINK_PACKAGES+= png
.if !empty(PNG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.png+= png>=1.2.4
-BUILDLINK_RECOMMENDED.png?= png>=1.2.6nb1
+BUILDLINK_API_DEPENDS.png+= png>=1.2.4
+BUILDLINK_ABI_DEPENDS.png?= png>=1.2.6nb1
BUILDLINK_PKGSRCDIR.png?= ../../graphics/png
.endif # PNG_BUILDLINK3_MK
diff --git a/graphics/povray/Makefile b/graphics/povray/Makefile
index dda392beec2..a1812b8c79f 100644
--- a/graphics/povray/Makefile
+++ b/graphics/povray/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2006/02/05 23:09:38 joerg Exp $
+# $NetBSD: Makefile,v 1.34 2006/04/06 06:22:05 reed Exp $
DISTNAME= povray-3.6.1
PKGREVISION= 3
@@ -13,7 +13,7 @@ COMMENT= Persistence of Vision Ray Tracer
LICENSE= povray-license
-BUILDLINK_DEPENDS.zlib+= zlib>=1.2.1
+BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.1
USE_LANGUAGES= c c++
GNU_CONFIGURE= yes
diff --git a/graphics/py-imaging/buildlink3.mk b/graphics/py-imaging/buildlink3.mk
index 6c59127415f..2d61dfc4723 100644
--- a/graphics/py-imaging/buildlink3.mk
+++ b/graphics/py-imaging/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:09:38 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:05 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_IMAGING_BUILDLINK3_MK:= ${PY_IMAGING_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npyimaging}
BUILDLINK_PACKAGES+= pyimaging
.if !empty(PY_IMAGING_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pyimaging+= ${PYPKGPREFIX}-imaging>=1.1.4
-BUILDLINK_RECOMMENDED.pyimaging?= ${PYPKGPREFIX}-imaging>=1.1.5nb1
+BUILDLINK_API_DEPENDS.pyimaging+= ${PYPKGPREFIX}-imaging>=1.1.4
+BUILDLINK_ABI_DEPENDS.pyimaging?= ${PYPKGPREFIX}-imaging>=1.1.5nb1
BUILDLINK_PKGSRCDIR.pyimaging?= ../../graphics/py-imaging
.endif # PY_IMAGING_BUILDLINK3_MK
diff --git a/graphics/py-imagingtk/Makefile b/graphics/py-imagingtk/Makefile
index b24d51f1280..37c495d08b3 100644
--- a/graphics/py-imagingtk/Makefile
+++ b/graphics/py-imagingtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/03/04 21:29:51 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2006/04/06 06:22:05 reed Exp $
#
DISTNAME= Imaging-1.1.5
@@ -13,7 +13,7 @@ COMMENT= Tk support for the Python Imaging Library (PIL)
DIST_SUBDIR= python
PYDISTUTILSPKG= yes
-BUILDLINK_DEPENDS.python20+= python20>=2.0.1nb4
+BUILDLINK_API_DEPENDS.python20+= python20>=2.0.1nb4
PY_PATCHPLIST= yes
PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX:Q}
diff --git a/graphics/ruby-imlib2/Makefile b/graphics/ruby-imlib2/Makefile
index e52c05cc45f..4765f60b881 100644
--- a/graphics/ruby-imlib2/Makefile
+++ b/graphics/ruby-imlib2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/02/05 23:09:39 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2006/04/06 06:22:05 reed Exp $
DISTNAME= imlib2-ruby-${VER}
PKGNAME= ${RUBY_PKGPREFIX}-imlib2-${VER}
@@ -20,7 +20,7 @@ USE_RUBY_EXTCONF= yes
INSTALL_TARGET= site-install
-BUILDLINK_DEPENDS.imlib2+= imlib2>=1.2.0nb2
+BUILDLINK_API_DEPENDS.imlib2+= imlib2>=1.2.0nb2
.include "../../graphics/imlib2/buildlink3.mk"
.include "../../lang/ruby/modules.mk"
diff --git a/graphics/sane-backends/buildlink3.mk b/graphics/sane-backends/buildlink3.mk
index c718e3bec78..e372deb77bc 100644
--- a/graphics/sane-backends/buildlink3.mk
+++ b/graphics/sane-backends/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:09:39 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:05 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SANE_BACKENDS_BUILDLINK3_MK:= ${SANE_BACKENDS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsane-backends}
BUILDLINK_PACKAGES+= sane-backends
.if !empty(SANE_BACKENDS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.sane-backends+= sane-backends>=1.0.3
-BUILDLINK_RECOMMENDED.sane-backends+= sane-backends>=1.0.17nb1
+BUILDLINK_API_DEPENDS.sane-backends+= sane-backends>=1.0.3
+BUILDLINK_ABI_DEPENDS.sane-backends+= sane-backends>=1.0.17nb1
BUILDLINK_PKGSRCDIR.sane-backends?= ../../graphics/sane-backends
.endif # SANE_BACKENDS_BUILDLINK3_MK
diff --git a/graphics/sane-frontends/Makefile b/graphics/sane-frontends/Makefile
index 846dfdae534..c644fd32872 100644
--- a/graphics/sane-frontends/Makefile
+++ b/graphics/sane-frontends/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/03/06 00:18:17 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2006/04/06 06:22:05 reed Exp $
.include "../../graphics/sane-backends/Makefile.common"
@@ -8,7 +8,7 @@ SANE_MICRO= 13
COMMENT= Frontends for access to scanners, digitals camera, frame grabbers etc
-BUILDLINK_DEPENDS.sane+= sane-backends>=${SANE_VERSION}
+BUILDLINK_API_DEPENDS.sane+= sane-backends>=${SANE_VERSION}
USE_X11BASE= YES
diff --git a/graphics/simage/buildlink3.mk b/graphics/simage/buildlink3.mk
index 5e06f799ae3..448a5037b90 100644
--- a/graphics/simage/buildlink3.mk
+++ b/graphics/simage/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:09:39 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:05 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SIMAGE_BUILDLINK3_MK:= ${SIMAGE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsimage}
BUILDLINK_PACKAGES+= simage
.if !empty(SIMAGE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.simage+= simage>=1.6.1
-BUILDLINK_RECOMMENDED.simage+= simage>=1.6.1nb2
+BUILDLINK_API_DEPENDS.simage+= simage>=1.6.1
+BUILDLINK_ABI_DEPENDS.simage+= simage>=1.6.1nb2
BUILDLINK_PKGSRCDIR.simage?= ../../graphics/simage
.endif # SIMAGE_BUILDLINK3_MK
diff --git a/graphics/tiff/buildlink3.mk b/graphics/tiff/buildlink3.mk
index fd3842fa64d..f511d4d8fc0 100644
--- a/graphics/tiff/buildlink3.mk
+++ b/graphics/tiff/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2005/05/12 12:53:21 salo Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/04/06 06:22:05 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
TIFF_BUILDLINK3_MK:= ${TIFF_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntiff}
BUILDLINK_PACKAGES+= tiff
.if !empty(TIFF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tiff+= tiff>=3.6.1
-BUILDLINK_RECOMMENDED.tiff+= tiff>=3.7.2nb1
+BUILDLINK_API_DEPENDS.tiff+= tiff>=3.6.1
+BUILDLINK_ABI_DEPENDS.tiff+= tiff>=3.7.2nb1
BUILDLINK_PKGSRCDIR.tiff?= ../../graphics/tiff
.endif # TIFF_BUILDLINK3_MK
diff --git a/graphics/tuxpaint/Makefile b/graphics/tuxpaint/Makefile
index cdb686abe01..99cdd3f1b46 100644
--- a/graphics/tuxpaint/Makefile
+++ b/graphics/tuxpaint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2006/03/07 18:56:46 minskim Exp $
+# $NetBSD: Makefile,v 1.39 2006/04/06 06:22:05 reed Exp $
#
DISTNAME= tuxpaint-0.9.14
@@ -15,9 +15,9 @@ USE_TOOLS+= gmake
USE_PKGLOCALEDIR= YES
MANCOMPRESSED= YES
-BUILDLINK_DEPENDS.SDL_mixer+= SDL_mixer>=1.2.6
-BUILDLINK_DEPENDS.SDL_ttf+= SDL_ttf>=2.0.7
-BUILDLINK_DEPENDS.SDL_image+= SDL_image>=1.2.4
+BUILDLINK_API_DEPENDS.SDL_mixer+= SDL_mixer>=1.2.6
+BUILDLINK_API_DEPENDS.SDL_ttf+= SDL_ttf>=2.0.7
+BUILDLINK_API_DEPENDS.SDL_image+= SDL_image>=1.2.4
CONFLICTS+= tuxpaint-stamps<2003.12.23
diff --git a/graphics/urt/buildlink3.mk b/graphics/urt/buildlink3.mk
index 7bcfdbf60f0..a6523162aa5 100644
--- a/graphics/urt/buildlink3.mk
+++ b/graphics/urt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:09:40 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:06 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
URT_BUILDLINK3_MK:= ${URT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nurt}
BUILDLINK_PACKAGES+= urt
.if !empty(URT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.urt+= urt>=3.1b1nb5
-BUILDLINK_RECOMMENDED.urt?= urt>=3.1b1nb6
+BUILDLINK_API_DEPENDS.urt+= urt>=3.1b1nb5
+BUILDLINK_ABI_DEPENDS.urt?= urt>=3.1b1nb6
BUILDLINK_PKGSRCDIR.urt?= ../../graphics/urt
.endif # URT_BUILDLINK3_MK
diff --git a/graphics/wxsvg/buildlink3.mk b/graphics/wxsvg/buildlink3.mk
index cc824494531..2e4b3545122 100644
--- a/graphics/wxsvg/buildlink3.mk
+++ b/graphics/wxsvg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:09:40 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:06 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
WXSVG_BUILDLINK3_MK:= ${WXSVG_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nwxsvg}
BUILDLINK_PACKAGES+= wxsvg
.if !empty(WXSVG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.wxsvg+= wxsvg>=1.0beta5
-BUILDLINK_RECOMMENDED.wxsvg?= wxsvg>=1.0beta5nb1
+BUILDLINK_API_DEPENDS.wxsvg+= wxsvg>=1.0beta5
+BUILDLINK_ABI_DEPENDS.wxsvg?= wxsvg>=1.0beta5nb1
BUILDLINK_PKGSRCDIR.wxsvg?= ../../graphics/wxsvg
.endif # WXSVG_BUILDLINK3_MK
diff --git a/graphics/xfce4-artwork/buildlink3.mk b/graphics/xfce4-artwork/buildlink3.mk
index 7bdcf595930..2fe29518382 100644
--- a/graphics/xfce4-artwork/buildlink3.mk
+++ b/graphics/xfce4-artwork/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/17 06:49:24 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:06 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_ARTWORK_BUILDLINK3_MK:= ${XFCE4_ARTWORK_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-artwork}
BUILDLINK_PACKAGES+= xfce4-artwork
.if !empty(XFCE4_ARTWORK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-artwork+= xfce4-artwork>=0.0.4nb5
-BUILDLINK_RECOMMENDED.xfce4-artwork?= xfce4-artwork>=0.0.4nb7
+BUILDLINK_API_DEPENDS.xfce4-artwork+= xfce4-artwork>=0.0.4nb5
+BUILDLINK_ABI_DEPENDS.xfce4-artwork?= xfce4-artwork>=0.0.4nb7
BUILDLINK_PKGSRCDIR.xfce4-artwork?= ../../graphics/xfce4-artwork
.endif # XFCE4_ARTWORK_BUILDLINK3_MK
diff --git a/graphics/xfce4-icon-theme/buildlink3.mk b/graphics/xfce4-icon-theme/buildlink3.mk
index 91fdd2d6fea..2fa9d4782a1 100644
--- a/graphics/xfce4-icon-theme/buildlink3.mk
+++ b/graphics/xfce4-icon-theme/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/17 06:49:24 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:06 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_ICON_THEME_BUILDLINK3_MK:= ${XFCE4_ICON_THEME_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-icon-theme}
BUILDLINK_PACKAGES+= xfce4-icon-theme
.if !empty(XFCE4_ICON_THEME_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-icon-theme+= xfce4-icon-theme>=4.2.3
-BUILDLINK_RECOMMENDED.xfce4-icon-theme?= xfce4-icon-theme>=4.2.3nb1
+BUILDLINK_API_DEPENDS.xfce4-icon-theme+= xfce4-icon-theme>=4.2.3
+BUILDLINK_ABI_DEPENDS.xfce4-icon-theme?= xfce4-icon-theme>=4.2.3nb1
BUILDLINK_PKGSRCDIR.xfce4-icon-theme?= ../../graphics/xfce4-icon-theme
.endif # XFCE4_ICON_THEME_BUILDLINK3_MK
diff --git a/graphics/xfce4-iconbox/buildlink3.mk b/graphics/xfce4-iconbox/buildlink3.mk
index a951c5de024..e4718d7f195 100644
--- a/graphics/xfce4-iconbox/buildlink3.mk
+++ b/graphics/xfce4-iconbox/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/02/17 06:49:24 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/04/06 06:22:06 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_ICONBOX_BUILDLINK3_MK:= ${XFCE4_ICONBOX_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-iconbox}
BUILDLINK_PACKAGES+= xfce4-iconbox
.if !empty(XFCE4_ICONBOX_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-iconbox+= xfce4-iconbox>=4.2.3
-BUILDLINK_RECOMMENDED.xfce4-iconbox?= xfce4-iconbox>=4.2.3nb2
+BUILDLINK_API_DEPENDS.xfce4-iconbox+= xfce4-iconbox>=4.2.3
+BUILDLINK_ABI_DEPENDS.xfce4-iconbox?= xfce4-iconbox>=4.2.3nb2
BUILDLINK_PKGSRCDIR.xfce4-iconbox?= ../../graphics/xfce4-iconbox
.endif # XFCE4_ICONBOX_BUILDLINK3_MK
diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile
index df57dcbdc5c..13822f3778f 100644
--- a/graphics/xfig/Makefile
+++ b/graphics/xfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2006/02/05 23:09:41 joerg Exp $
+# $NetBSD: Makefile,v 1.46 2006/04/06 06:22:06 reed Exp $
DISTNAME= xfig.3.2.5-alpha5.full
PKGNAME= xfig-3.2.5alpha5
@@ -13,7 +13,7 @@ COMMENT= CAD-like 2D drawing tool, good for colorful scale drawings & ISOs
DEPENDS+= transfig>=3.2.4:../../print/transfig
# if we're using Xaw3d, then we need 1.5E or newer since using that
# version means we need a patch, which is currently used unconditionally
-BUILDLINK_DEPENDS.Xaw3d+= Xaw3d>=1.5E
+BUILDLINK_API_DEPENDS.Xaw3d+= Xaw3d>=1.5E
WRKSRC= ${WRKDIR}/xfig.3.2.5-alpha5
USE_IMAKE= YES
diff --git a/graphics/xpm/buildlink3.mk b/graphics/xpm/buildlink3.mk
index fb8b5229229..048256c1903 100644
--- a/graphics/xpm/buildlink3.mk
+++ b/graphics/xpm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2006/02/05 23:09:41 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2006/04/06 06:22:06 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XPM_BUILDLINK3_MK:= ${XPM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxpm}
BUILDLINK_PACKAGES+= xpm
.if !empty(XPM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xpm+= xpm>=3.4k
-BUILDLINK_RECOMMENDED.xpm?= xpm>=3.4knb6
+BUILDLINK_API_DEPENDS.xpm+= xpm>=3.4k
+BUILDLINK_ABI_DEPENDS.xpm?= xpm>=3.4knb6
BUILDLINK_PKGSRCDIR.xpm?= ../../graphics/xpm
.endif # XPM_BUILDLINK3_MK
diff --git a/graphics/xpm/builtin.mk b/graphics/xpm/builtin.mk
index eceebda0e4d..286b0968344 100644
--- a/graphics/xpm/builtin.mk
+++ b/graphics/xpm/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.11 2006/03/30 18:06:18 jlam Exp $
+# $NetBSD: builtin.mk,v 1.12 2006/04/06 06:22:06 reed Exp $
BUILTIN_PKG:= xpm
@@ -63,7 +63,7 @@ USE_BUILTIN.xpm= ${IS_BUILTIN.xpm}
. if defined(BUILTIN_PKG.xpm) && \
!empty(IS_BUILTIN.xpm:M[yY][eE][sS])
USE_BUILTIN.xpm= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.xpm}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.xpm}
. if !empty(USE_BUILTIN.xpm:M[yY][eE][sS])
USE_BUILTIN.xpm!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.xpm:Q}; then \
diff --git a/ham/gnuradio-core/buildlink3.mk b/ham/gnuradio-core/buildlink3.mk
index a2ac0bce4ed..12ef8f59477 100644
--- a/ham/gnuradio-core/buildlink3.mk
+++ b/ham/gnuradio-core/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:09:41 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:06 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNURADIO_CORE_BUILDLINK3_MK:= ${GNURADIO_CORE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnuradio-core}
BUILDLINK_PACKAGES+= gnuradio-core
.if !empty(GNURADIO_CORE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnuradio-core+= gnuradio-core>=2.6
-BUILDLINK_RECOMMENDED.gnuradio-core?= gnuradio-core>=2.6nb3
+BUILDLINK_API_DEPENDS.gnuradio-core+= gnuradio-core>=2.6
+BUILDLINK_ABI_DEPENDS.gnuradio-core?= gnuradio-core>=2.6nb3
BUILDLINK_PKGSRCDIR.gnuradio-core?= ../../ham/gnuradio-core
.endif # GNURADIO_CORE_BUILDLINK3_MK
diff --git a/ham/gnuradio-wxgui/buildlink3.mk b/ham/gnuradio-wxgui/buildlink3.mk
index bdbb89fadca..2b18cdd04be 100644
--- a/ham/gnuradio-wxgui/buildlink3.mk
+++ b/ham/gnuradio-wxgui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:09:42 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:06 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNURADIO_WXGUI_BUILDLINK3_MK:= ${GNURADIO_WXGUI_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnuradio-wxgui}
BUILDLINK_PACKAGES+= gnuradio-wxgui
.if !empty(GNURADIO_WXGUI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnuradio-wxgui+= gnuradio-wxgui>=0.3
-BUILDLINK_RECOMMENDED.gnuradio-wxgui?= gnuradio-wxgui>=0.4nb2
+BUILDLINK_API_DEPENDS.gnuradio-wxgui+= gnuradio-wxgui>=0.3
+BUILDLINK_ABI_DEPENDS.gnuradio-wxgui?= gnuradio-wxgui>=0.4nb2
BUILDLINK_PKGSRCDIR.gnuradio-wxgui?= ../../ham/gnuradio-wxgui
.endif # GNURADIO_WXGUI_BUILDLINK3_MK
diff --git a/ham/hamlib/buildlink3.mk b/ham/hamlib/buildlink3.mk
index 8a8975a8deb..da064f1a354 100644
--- a/ham/hamlib/buildlink3.mk
+++ b/ham/hamlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/28 00:10:04 wulf Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:06 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
HAMLIB_BUILDLINK3_MK:= ${HAMLIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nhamlib}
BUILDLINK_PACKAGES+= hamlib
.if !empty(HAMLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.hamlib+= hamlib>=1.1.4
-BUILDLINK_RECOMMENDED.hamlib+= hamlib>=1.2.5
+BUILDLINK_API_DEPENDS.hamlib+= hamlib>=1.1.4
+BUILDLINK_ABI_DEPENDS.hamlib+= hamlib>=1.2.5
BUILDLINK_PKGSRCDIR.hamlib?= ../../ham/hamlib
.endif # HAMLIB_BUILDLINK3_MK
diff --git a/ham/usrp/buildlink3.mk b/ham/usrp/buildlink3.mk
index 7518f63665c..e2382fc600e 100644
--- a/ham/usrp/buildlink3.mk
+++ b/ham/usrp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:09:42 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:06 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
USRP_BUILDLINK3_MK:= ${USRP_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nusrp}
BUILDLINK_PACKAGES+= usrp
.if !empty(USRP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.usrp+= usrp>=0.9
-BUILDLINK_RECOMMENDED.usrp?= usrp>=0.9nb2
+BUILDLINK_API_DEPENDS.usrp+= usrp>=0.9
+BUILDLINK_ABI_DEPENDS.usrp?= usrp>=0.9nb2
BUILDLINK_PKGSRCDIR.usrp?= ../../ham/usrp
.endif # USRP_BUILDLINK3_MK
diff --git a/inputmethod/anthy/buildlink3.mk b/inputmethod/anthy/buildlink3.mk
index ba5eb43fc6a..7aac62016d5 100644
--- a/inputmethod/anthy/buildlink3.mk
+++ b/inputmethod/anthy/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:09:42 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:06 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ANTHY_BUILDLINK3_MK:= ${ANTHY_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nanthy}
BUILDLINK_PACKAGES+= anthy
.if !empty(ANTHY_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.anthy+= anthy>=6300
-BUILDLINK_RECOMMENDED.anthy?= anthy>=7100bnb1
+BUILDLINK_API_DEPENDS.anthy+= anthy>=6300
+BUILDLINK_ABI_DEPENDS.anthy?= anthy>=7100bnb1
BUILDLINK_PKGSRCDIR.anthy?= ../../inputmethod/anthy
.endif # ANTHY_BUILDLINK3_MK
diff --git a/inputmethod/canna-lib/buildlink3.mk b/inputmethod/canna-lib/buildlink3.mk
index d57e7f09932..259b6d23825 100644
--- a/inputmethod/canna-lib/buildlink3.mk
+++ b/inputmethod/canna-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 21:08:52 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:06 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
CANNA_LIB_BUILDLINK3_MK:= ${CANNA_LIB_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NCanna-lib}
BUILDLINK_PACKAGES+= Canna-lib
.if !empty(CANNA_LIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.Canna-lib+= Canna-lib>=3.6pl4
+BUILDLINK_API_DEPENDS.Canna-lib+= Canna-lib>=3.6pl4
BUILDLINK_PKGSRCDIR.Canna-lib?= ../../inputmethod/canna-lib
.endif # CANNA_LIB_BUILDLINK3_MK
diff --git a/inputmethod/ja-freewnn-lib/buildlink3.mk b/inputmethod/ja-freewnn-lib/buildlink3.mk
index a9ebfcfef99..260672f1fdc 100644
--- a/inputmethod/ja-freewnn-lib/buildlink3.mk
+++ b/inputmethod/ja-freewnn-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2005/05/05 19:37:22 kei Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:06 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
JA_FREEWNN_LIB_BUILDLINK3_MK:= ${JA_FREEWNN_LIB_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nja-FreeWnn-lib}
BUILDLINK_PACKAGES+= ja-FreeWnn-lib
.if !empty(JA_FREEWNN_LIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ja-FreeWnn-lib+= ja-FreeWnn-lib>=1.10nb3
+BUILDLINK_API_DEPENDS.ja-FreeWnn-lib+= ja-FreeWnn-lib>=1.10nb3
BUILDLINK_PKGSRCDIR.ja-FreeWnn-lib?= ../../inputmethod/ja-freewnn-lib
BUILDLINK_DEPMETHOD.ja-freewnn?= build
.endif # JA_FREEWNN_LIB_BUILDLINK3_MK
diff --git a/inputmethod/libchewing/buildlink3.mk b/inputmethod/libchewing/buildlink3.mk
index 44e19cb5ad8..361d94d5b43 100644
--- a/inputmethod/libchewing/buildlink3.mk
+++ b/inputmethod/libchewing/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/01/28 02:42:06 rxg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:06 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBCHEWING_BUILDLINK3_MK:= ${LIBCHEWING_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibchewing}
BUILDLINK_PACKAGES+= libchewing
.if !empty(LIBCHEWING_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libchewing+= libchewing>=0.2.7
-BUILDLINK_RECOMMENDED.libchewing+= libchewing>=0.2.7
+BUILDLINK_API_DEPENDS.libchewing+= libchewing>=0.2.7
+BUILDLINK_ABI_DEPENDS.libchewing+= libchewing>=0.2.7
BUILDLINK_PKGSRCDIR.libchewing?= ../../inputmethod/libchewing
.endif # LIBCHEWING_BUILDLINK3_MK
diff --git a/inputmethod/libtabe/buildlink3.mk b/inputmethod/libtabe/buildlink3.mk
index 89972401404..5b43b32fe1d 100644
--- a/inputmethod/libtabe/buildlink3.mk
+++ b/inputmethod/libtabe/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:09:43 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:07 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBTABE_BUILDLINK3_MK:= ${LIBTABE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibtabe}
BUILDLINK_PACKAGES+= libtabe
.if !empty(LIBTABE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libtabe+= libtabe>=0.2.5
-BUILDLINK_RECOMMENDED.libtabe+= libtabe>=0.2.5nb2
+BUILDLINK_API_DEPENDS.libtabe+= libtabe>=0.2.5
+BUILDLINK_ABI_DEPENDS.libtabe+= libtabe>=0.2.5nb2
BUILDLINK_PKGSRCDIR.libtabe?= ../../inputmethod/libtabe
.endif # LIBTABE_BUILDLINK3_MK
diff --git a/inputmethod/sj3-lib/buildlink3.mk b/inputmethod/sj3-lib/buildlink3.mk
index f3fe07f800a..6052e90eb1f 100644
--- a/inputmethod/sj3-lib/buildlink3.mk
+++ b/inputmethod/sj3-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/11/30 02:30:59 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:07 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SJ3_LIB_BUILDLINK3_MK:= ${SJ3_LIB_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsj3-lib}
BUILDLINK_PACKAGES+= sj3-lib
.if !empty(SJ3_LIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.sj3-lib+= sj3-lib>=2.0.1.20nb1
+BUILDLINK_API_DEPENDS.sj3-lib+= sj3-lib>=2.0.1.20nb1
BUILDLINK_PKGSRCDIR.sj3-lib?= ../../inputmethod/sj3-lib
.endif # SJ3_LIB_BUILDLINK3_MK
diff --git a/inputmethod/uim/buildlink3.mk b/inputmethod/uim/buildlink3.mk
index c5dda32b8b0..a8cbea0944a 100644
--- a/inputmethod/uim/buildlink3.mk
+++ b/inputmethod/uim/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:09:43 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:07 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
UIM_BUILDLINK3_MK:= ${UIM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nuim}
BUILDLINK_PACKAGES+= uim
.if !empty(UIM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.uim+= uim>=0.4.6
-BUILDLINK_RECOMMENDED.uim?= uim>=1.0.1nb2
+BUILDLINK_API_DEPENDS.uim+= uim>=0.4.6
+BUILDLINK_ABI_DEPENDS.uim?= uim>=1.0.1nb2
BUILDLINK_PKGSRCDIR.uim?= ../../inputmethod/uim
.endif # UIM_BUILDLINK3_MK
diff --git a/inputmethod/unicon-im/buildlink3.mk b/inputmethod/unicon-im/buildlink3.mk
index ea41997b470..7864d937257 100644
--- a/inputmethod/unicon-im/buildlink3.mk
+++ b/inputmethod/unicon-im/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:09:43 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:07 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
UNICON_IM_BUILDLINK3_MK:= ${UNICON_IM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nunicon-im}
BUILDLINK_PACKAGES+= unicon-im
.if !empty(UNICON_IM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.unicon-im+= unicon-im>=1.2nb2
-BUILDLINK_RECOMMENDED.unicon-im+= unicon-im>=1.2nb4
+BUILDLINK_API_DEPENDS.unicon-im+= unicon-im>=1.2nb2
+BUILDLINK_ABI_DEPENDS.unicon-im+= unicon-im>=1.2nb4
BUILDLINK_PKGSRCDIR.unicon-im?= ../../inputmethod/unicon-im
.endif # UNICON_IM_BUILDLINK3_MK
diff --git a/lang/Cg-compiler/buildlink3.mk b/lang/Cg-compiler/buildlink3.mk
index 52e2cc55db4..02d98a34218 100644
--- a/lang/Cg-compiler/buildlink3.mk
+++ b/lang/Cg-compiler/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:09:43 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:09 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
CG_COMPILER_BUILDLINK3_MK:= ${CG_COMPILER_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NCg-compiler}
BUILDLINK_PACKAGES+= Cg-compiler
.if !empty(CG_COMPILER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.Cg-compiler+= Cg-compiler>=1.2.1
-BUILDLINK_RECOMMENDED.Cg-compiler?= Cg-compiler>=1.3beta2nb1
+BUILDLINK_API_DEPENDS.Cg-compiler+= Cg-compiler>=1.2.1
+BUILDLINK_ABI_DEPENDS.Cg-compiler?= Cg-compiler>=1.3beta2nb1
BUILDLINK_PKGSRCDIR.Cg-compiler?= ../../lang/Cg-compiler
.endif # CG_COMPILER_BUILDLINK3_MK
diff --git a/lang/blackdown-jdk13/buildlink3.mk b/lang/blackdown-jdk13/buildlink3.mk
index ddbbe02064f..027afd86d4f 100644
--- a/lang/blackdown-jdk13/buildlink3.mk
+++ b/lang/blackdown-jdk13/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/07/02 12:51:57 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:09 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
BLACKDOWN_JDK13_BUILDLINK3_MK:= ${BLACKDOWN_JDK13_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= blackdown-jdk13
.if !empty(BLACKDOWN_JDK13_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.blackdown-jdk13+= blackdown-jdk13-[0-9]*
+BUILDLINK_API_DEPENDS.blackdown-jdk13+= blackdown-jdk13-[0-9]*
BUILDLINK_PKGSRCDIR.blackdown-jdk13?= ../../lang/blackdown-jdk13
BUILDLINK_DEPMETHOD.blackdown-jdk13?= build
diff --git a/lang/blackdown-jre13/buildlink3.mk b/lang/blackdown-jre13/buildlink3.mk
index c82dd6940cb..e58a2f49625 100644
--- a/lang/blackdown-jre13/buildlink3.mk
+++ b/lang/blackdown-jre13/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/05/05 18:12:11 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:09 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
BLACKDOWN_JRE13_BUILDLINK3_MK:= ${BLACKDOWN_JRE13_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= blackdown-jre13
.if !empty(BLACKDOWN_JRE13_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.blackdown-jre13+= blackdown-jre13-[0-9]*
+BUILDLINK_API_DEPENDS.blackdown-jre13+= blackdown-jre13-[0-9]*
BUILDLINK_PKGSRCDIR.blackdown-jre13?= ../../lang/blackdown-jre13
EVAL_PREFIX+= BUILDLINK_JAVA_PREFIX.blackdown-jre13=blackdown-jre13
BUILDLINK_JAVA_PREFIX.blackdown-jre13= \
diff --git a/lang/cdl3/buildlink3.mk b/lang/cdl3/buildlink3.mk
index 63845220449..53a0bc4791d 100644
--- a/lang/cdl3/buildlink3.mk
+++ b/lang/cdl3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:09:43 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:10 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
CDL3_BUILDLINK3_MK:= ${CDL3_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncdl3}
BUILDLINK_PACKAGES+= cdl3
.if !empty(CDL3_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.cdl3+= cdl3>=1.2.5
-BUILDLINK_RECOMMENDED.cdl3?= cdl3>=1.2.5nb1
+BUILDLINK_API_DEPENDS.cdl3+= cdl3>=1.2.5
+BUILDLINK_ABI_DEPENDS.cdl3?= cdl3>=1.2.5nb1
BUILDLINK_PKGSRCDIR.cdl3?= ../../lang/cdl3
.endif # CDL3_BUILDLINK3_MK
diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile
index 4953134d110..79af5378a5b 100644
--- a/lang/clisp/Makefile
+++ b/lang/clisp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2006/04/04 19:12:10 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2006/04/06 06:22:10 reed Exp $
DISTNAME= clisp-2.38
CATEGORIES= lang
@@ -54,7 +54,7 @@ pre-build:
.include "../../devel/libsigsegv/buildlink3.mk"
.include "../../devel/readline/buildlink3.mk"
.include "../../devel/pcre/buildlink3.mk"
-BUILDLINK_DEPENDS.zlib+= zlib>=1.2
+BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2
.include "../../devel/zlib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/coq/Makefile b/lang/coq/Makefile
index 82af9fef51f..89b17e780ab 100644
--- a/lang/coq/Makefile
+++ b/lang/coq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/02/05 23:09:44 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2006/04/06 06:22:10 reed Exp $
#
DISTNAME= coq-8.0pl3
@@ -17,7 +17,7 @@ CONFIGURE_ARGS+= -emacslib ${PREFIX}/share/emacs/site-lisp
CONFIGURE_ARGS+= -reals all
BUILD_TARGET= world
-BUILDLINK_DEPENDS.ocaml+= ocaml>=3.09
+BUILDLINK_API_DEPENDS.ocaml+= ocaml>=3.09
.include "../../mk/bsd.prefs.mk"
diff --git a/lang/elk/buildlink3.mk b/lang/elk/buildlink3.mk
index c8a525eba21..b4ac6b346b0 100644
--- a/lang/elk/buildlink3.mk
+++ b/lang/elk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2005/10/15 23:07:21 tonio Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:10 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ELK_BUILDLINK3_MK:= ${ELK_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nelk}
BUILDLINK_PACKAGES+= elk
.if !empty(ELK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.elk+= elk>=3.99.6
+BUILDLINK_API_DEPENDS.elk+= elk>=3.99.6
BUILDLINK_PKGSRCDIR.elk?= ../../lang/elk
.endif # ELK_BUILDLINK3_MK
diff --git a/lang/erlang/buildlink3.mk b/lang/erlang/buildlink3.mk
index 6c07d38f16f..ce6286796e3 100644
--- a/lang/erlang/buildlink3.mk
+++ b/lang/erlang/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:09:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:10 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ERLANG_BUILDLINK3_MK:= ${ERLANG_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nerlang}
BUILDLINK_PACKAGES+= erlang
.if !empty(ERLANG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.erlang+= erlang>=10.1
-BUILDLINK_RECOMMENDED.erlang?= erlang>=10.1.9nb1
+BUILDLINK_API_DEPENDS.erlang+= erlang>=10.1
+BUILDLINK_ABI_DEPENDS.erlang?= erlang>=10.1.9nb1
BUILDLINK_PKGSRCDIR.erlang?= ../../lang/erlang
.endif # ERLANG_BUILDLINK3_MK
diff --git a/lang/ezm3/buildlink3.mk b/lang/ezm3/buildlink3.mk
index cdb5069cc40..f84aa223afc 100644
--- a/lang/ezm3/buildlink3.mk
+++ b/lang/ezm3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:09:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:10 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
EZM3_BUILDLINK3_MK:= ${EZM3_BUILDLINK3_MK}+
@@ -11,9 +11,9 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nezm3}
BUILDLINK_PACKAGES+= ezm3
.if !empty(EZM3_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ezm3+= ezm3>=1.1nb1
+BUILDLINK_API_DEPENDS.ezm3+= ezm3>=1.1nb1
BUILDLINK_DEPMETHOD.ezm3?= build
-BUILDLINK_RECOMMENDED.ezm3?= ezm3>=1.2nb1
+BUILDLINK_ABI_DEPENDS.ezm3?= ezm3>=1.2nb1
BUILDLINK_PKGSRCDIR.ezm3?= ../../lang/ezm3
.endif # EZM3_BUILDLINK3_MK
diff --git a/lang/f2c/buildlink3.mk b/lang/f2c/buildlink3.mk
index ba5bc297250..156b3749a68 100644
--- a/lang/f2c/buildlink3.mk
+++ b/lang/f2c/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2005/12/05 20:50:25 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:10 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
F2C_BUILDLINK3_MK:= ${F2C_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nf2c}
BUILDLINK_PACKAGES+= f2c
.if !empty(F2C_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.f2c+= f2c>=20001205nb3
-BUILDLINK_RECOMMENDED.f2c+= f2c>=20001205nb8
+BUILDLINK_API_DEPENDS.f2c+= f2c>=20001205nb3
+BUILDLINK_ABI_DEPENDS.f2c+= f2c>=20001205nb8
BUILDLINK_PKGSRCDIR.f2c?= ../../lang/f2c
.endif # F2C_BUILDLINK3_MK
diff --git a/lang/gauche/buildlink3.mk b/lang/gauche/buildlink3.mk
index d4771529eee..914c5b85a0b 100644
--- a/lang/gauche/buildlink3.mk
+++ b/lang/gauche/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2005/12/09 15:38:54 uebayasi Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:11 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GAUCHE_BUILDLINK3_MK:= ${GAUCHE_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NGauche}
BUILDLINK_PACKAGES+= Gauche
.if !empty(GAUCHE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.Gauche+= Gauche>=0.8.1
+BUILDLINK_API_DEPENDS.Gauche+= Gauche>=0.8.1
BUILDLINK_PKGSRCDIR.Gauche?= ../../lang/gauche
.endif # GAUCHE_BUILDLINK3_MK
diff --git a/lang/gawk/Makefile b/lang/gawk/Makefile
index 4aab75d285b..8b71c3e2be0 100644
--- a/lang/gawk/Makefile
+++ b/lang/gawk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2006/03/30 03:44:43 jlam Exp $
+# $NetBSD: Makefile,v 1.35 2006/04/06 06:22:11 reed Exp $
#
DISTNAME= gawk-3.1.5
@@ -35,7 +35,7 @@ PKG_SUPPORTED_OPTIONS= portals
CONFIGURE_ARGS+= --enable-portals
.endif
-BUILDLINK_DEPENDS.gettext+= gettext-lib>=0.10.36
+BUILDLINK_API_DEPENDS.gettext+= gettext-lib>=0.10.36
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/gcc/buildlink3.mk b/lang/gcc/buildlink3.mk
index 546400f1a95..5a4a91af20e 100644
--- a/lang/gcc/buildlink3.mk
+++ b/lang/gcc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/05 23:09:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:22:11 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GCC_BUILDLINK3_MK:= ${GCC_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngcc}
BUILDLINK_PACKAGES+= gcc
.if !empty(GCC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gcc+= gcc>=${_GCC_REQD}
-BUILDLINK_RECOMMENDED.gcc?= gcc>=2.95.3nb7
+BUILDLINK_API_DEPENDS.gcc+= gcc>=${_GCC_REQD}
+BUILDLINK_ABI_DEPENDS.gcc?= gcc>=2.95.3nb7
BUILDLINK_PKGSRCDIR.gcc?= ../../lang/gcc
BUILDLINK_LIBDIRS.gcc?= \
${_GCC_PREFIX:S/^${BUILDLINK_PREFIX.gcc}\///}lib \
diff --git a/lang/gcc3-ada/buildlink3.mk b/lang/gcc3-ada/buildlink3.mk
index 6e886ee3c86..2a819cb336c 100644
--- a/lang/gcc3-ada/buildlink3.mk
+++ b/lang/gcc3-ada/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:09:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:11 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GCC3_ADA_BUILDLINK3_MK:= ${GCC3_ADA_BUILDLINK3_MK}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngcc3-ada}
BUILDLINK_PACKAGES+= gcc3-ada
.if !empty(GCC3_ADA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gcc3-ada+= gcc3-ada>=3.3.3
-BUILDLINK_RECOMMENDED.gcc3-ada?= gcc3-ada>=3.3.5nb1
+BUILDLINK_API_DEPENDS.gcc3-ada+= gcc3-ada>=3.3.3
+BUILDLINK_ABI_DEPENDS.gcc3-ada?= gcc3-ada>=3.3.5nb1
BUILDLINK_PKGSRCDIR.gcc3-ada?= ../../lang/gcc3-ada
BUILDLINK_ENV+= ADAC=${LOCALBASE}/gcc3/bin/gcc
_GCC_ARCHDIR!= ${DIRNAME} `${LOCALBASE}/gcc3/bin/gcc --print-libgcc-file-name`
diff --git a/lang/gcc3-c++/buildlink3.mk b/lang/gcc3-c++/buildlink3.mk
index 98adf205c93..27897e9944e 100644
--- a/lang/gcc3-c++/buildlink3.mk
+++ b/lang/gcc3-c++/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/02/05 23:09:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/04/06 06:22:11 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GCC3_CXX_BUILDLINK3_MK:= ${GCC3_CXX_BUILDLINK3_MK}+
@@ -18,8 +18,8 @@ BUILDLINK_PACKAGES+= gcc3-cxx
GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX}
. endif
. endif
-BUILDLINK_DEPENDS.gcc3-cxx+= gcc3${GCC3_PKGMODIF}-c++>=${_GCC_REQD}
-BUILDLINK_RECOMMENDED.gcc3-cxx?= gcc3-c++>=3.3.5nb1
+BUILDLINK_API_DEPENDS.gcc3-cxx+= gcc3${GCC3_PKGMODIF}-c++>=${_GCC_REQD}
+BUILDLINK_ABI_DEPENDS.gcc3-cxx?= gcc3-c++>=3.3.5nb1
BUILDLINK_PKGSRCDIR.gcc3-cxx?= ../../lang/gcc3-c++
BUILDLINK_LIBDIRS.gcc3-cxx?= \
lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-cxx}\///}
diff --git a/lang/gcc3-c/buildlink3.mk b/lang/gcc3-c/buildlink3.mk
index 95f7b362824..8f6fab23492 100644
--- a/lang/gcc3-c/buildlink3.mk
+++ b/lang/gcc3-c/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/02/05 23:09:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/04/06 06:22:11 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GCC3_C_BUILDLINK3_MK:= ${GCC3_C_BUILDLINK3_MK}+
@@ -22,8 +22,8 @@ BUILDLINK_PACKAGES+= gcc3-c
GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX}
. endif
. endif
-BUILDLINK_DEPENDS.gcc3-c+= gcc3${GCC3_PKGMODIF}-c>=${_GCC_REQD}
-BUILDLINK_RECOMMENDED.gcc3-c?= gcc3-c>=3.3.5nb1
+BUILDLINK_API_DEPENDS.gcc3-c+= gcc3${GCC3_PKGMODIF}-c>=${_GCC_REQD}
+BUILDLINK_ABI_DEPENDS.gcc3-c?= gcc3-c>=3.3.5nb1
BUILDLINK_PKGSRCDIR.gcc3-c?= ../../lang/gcc3-c
BUILDLINK_GCC3_LIBDIRS= lib
. if defined(GCC3_INSTALLTO_SUBPREFIX)
diff --git a/lang/gcc3-f77/buildlink3.mk b/lang/gcc3-f77/buildlink3.mk
index 2e7d4579073..3e3bc200a08 100644
--- a/lang/gcc3-f77/buildlink3.mk
+++ b/lang/gcc3-f77/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/02/05 23:09:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/04/06 06:22:11 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GCC3_F77_BUILDLINK3_MK:= ${GCC3_F77_BUILDLINK3_MK}+
@@ -18,8 +18,8 @@ BUILDLINK_PACKAGES+= gcc3-f77
GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX}
. endif
. endif
-BUILDLINK_DEPENDS.gcc3-f77+= gcc3${GCC3_PKGMODIF}-f77>=${_GCC_REQD}
-BUILDLINK_RECOMMENDED.gcc3-f77?= gcc3-f77>=3.3.5nb2
+BUILDLINK_API_DEPENDS.gcc3-f77+= gcc3${GCC3_PKGMODIF}-f77>=${_GCC_REQD}
+BUILDLINK_ABI_DEPENDS.gcc3-f77?= gcc3-f77>=3.3.5nb2
BUILDLINK_PKGSRCDIR.gcc3-f77?= ../../lang/gcc3-f77
BUILDLINK_LIBDIRS.gcc3-f77?= \
lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-f77}\///}
diff --git a/lang/gcc3-java/Makefile b/lang/gcc3-java/Makefile
index f32878979c3..0c34c28972a 100644
--- a/lang/gcc3-java/Makefile
+++ b/lang/gcc3-java/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.19 2006/02/05 23:09:45 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2006/04/06 06:22:11 reed Exp $
PKGNAME= gcc3${GCC3_PKGMODIF}-java-${GCC_VERSION}
PKGREVISION= 1
COMMENT= GNU Compiler Collection, v3 - Java compiler
-BUILDLINK_DEPENDS.gcc3cxx+= gcc3${GCC3_PKGMODIF}-c++-${GCC_VERSION}{,nb*}
+BUILDLINK_API_DEPENDS.gcc3cxx+= gcc3${GCC3_PKGMODIF}-c++-${GCC_VERSION}{,nb*}
BUILDLINK_DEPMETHOD.gcc3cxx+= full
INFO_FILES= gcj.info
diff --git a/lang/gcc3-java/buildlink3.mk b/lang/gcc3-java/buildlink3.mk
index bccc0ba309b..6f253bb4d09 100644
--- a/lang/gcc3-java/buildlink3.mk
+++ b/lang/gcc3-java/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/02/05 23:09:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/04/06 06:22:11 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GCC3_JAVA_BUILDLINK3_MK:= ${GCC3_JAVA_BUILDLINK3_MK}+
@@ -18,8 +18,8 @@ BUILDLINK_PACKAGES+= gcc3-java
GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX}
. endif
. endif
-BUILDLINK_DEPENDS.gcc3-java+= gcc3${GCC3_PKGMODIF}-java>=${_GCC_REQD}
-BUILDLINK_RECOMMENDED.gcc3-java?= gcc3-java>=3.3.5nb1
+BUILDLINK_API_DEPENDS.gcc3-java+= gcc3${GCC3_PKGMODIF}-java>=${_GCC_REQD}
+BUILDLINK_ABI_DEPENDS.gcc3-java?= gcc3-java>=3.3.5nb1
BUILDLINK_PKGSRCDIR.gcc3-java?= ../../lang/gcc3-java
BUILDLINK_LIBDIRS.gcc3-java?= \
lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-java}\///}
diff --git a/lang/gcc3-objc/buildlink3.mk b/lang/gcc3-objc/buildlink3.mk
index a9bfa237fd0..1abf123c3e0 100644
--- a/lang/gcc3-objc/buildlink3.mk
+++ b/lang/gcc3-objc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/02/05 23:09:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/04/06 06:22:11 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GCC3_OBJC_BUILDLINK3_MK:= ${GCC3_OBJC_BUILDLINK3_MK}+
@@ -18,8 +18,8 @@ BUILDLINK_PACKAGES+= gcc3-objc
GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX}
. endif
. endif
-BUILDLINK_DEPENDS.gcc3-objc+= gcc3${GCC3_PKGMODIF}-objc>=${_GCC_REQD}
-BUILDLINK_RECOMMENDED.gcc3-objc?= gcc3-objc>=3.3.5nb1
+BUILDLINK_API_DEPENDS.gcc3-objc+= gcc3${GCC3_PKGMODIF}-objc>=${_GCC_REQD}
+BUILDLINK_ABI_DEPENDS.gcc3-objc?= gcc3-objc>=3.3.5nb1
BUILDLINK_PKGSRCDIR.gcc3-objc?= ../../lang/gcc3-objc
BUILDLINK_LIBDIRS.gcc3-objc?= \
lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-objc}\///}
diff --git a/lang/gcc3/language.mk b/lang/gcc3/language.mk
index 896c1ab653a..201f5dfb8e6 100644
--- a/lang/gcc3/language.mk
+++ b/lang/gcc3/language.mk
@@ -1,6 +1,6 @@
-# $NetBSD: language.mk,v 1.4 2004/09/22 08:09:39 jlam Exp $
+# $NetBSD: language.mk,v 1.5 2006/04/06 06:22:11 reed Exp $
-BUILDLINK_DEPENDS.gcc3-c+= gcc3${GCC3_PKGMODIF}-c-${GCC_VERSION}{,nb*}
+BUILDLINK_API_DEPENDS.gcc3-c+= gcc3${GCC3_PKGMODIF}-c-${GCC_VERSION}{,nb*}
BUILDLINK_DEPMETHOD.gcc3-c+= full
.include "../../lang/gcc3/Makefile.common"
diff --git a/lang/gcc34-ada/buildlink3.mk b/lang/gcc34-ada/buildlink3.mk
index f21f7acbb45..44da5cde190 100644
--- a/lang/gcc34-ada/buildlink3.mk
+++ b/lang/gcc34-ada/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:09:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:11 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GCCADA_BUILDLINK3_MK:= ${GCCADA_BUILDLINK3_MK}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngcc34-ada}
BUILDLINK_PACKAGES+= gcc34-ada
.if !empty(GCCADA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gcc34-ada+= gcc34-ada>=3.4.1nb4
-BUILDLINK_RECOMMENDED.gcc34-ada?= gcc34-ada>=3.4.4nb1
+BUILDLINK_API_DEPENDS.gcc34-ada+= gcc34-ada>=3.4.1nb4
+BUILDLINK_ABI_DEPENDS.gcc34-ada?= gcc34-ada>=3.4.4nb1
BUILDLINK_PKGSRCDIR.gcc34-ada?= ../../lang/gcc34-ada
BUILDLINK_ENV+= ADAC=${BUILDLINK_PREFIX.gcc34-ada}/bin/gcc
. if exists(${BUILDLINK_PREFIX.gcc34-ada}/bin/gcc)
diff --git a/lang/gcc34/buildlink3.mk b/lang/gcc34/buildlink3.mk
index c833cf8d468..6cea81bdec7 100644
--- a/lang/gcc34/buildlink3.mk
+++ b/lang/gcc34/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/02/05 23:09:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/04/06 06:22:11 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GCC34_BUILDLINK3_MK:= ${GCC34_BUILDLINK3_MK}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngcc34}
BUILDLINK_PACKAGES+= gcc34
.if !empty(GCC34_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gcc34+= gcc34>=${_GCC_REQD}
-BUILDLINK_RECOMMENDED.gcc34?= gcc34>=3.4.5nb1
+BUILDLINK_API_DEPENDS.gcc34+= gcc34>=${_GCC_REQD}
+BUILDLINK_ABI_DEPENDS.gcc34?= gcc34>=3.4.5nb1
BUILDLINK_PKGSRCDIR.gcc34?= ../../lang/gcc34
. if exists(${BUILDLINK_PREFIX.gcc34}/bin/gcc)
_GNAT1!=${BUILDLINK_PREFIX.gcc34}/bin/gcc -print-prog-name=gnat1
diff --git a/lang/ghc/buildlink3.mk b/lang/ghc/buildlink3.mk
index d97a2abeca9..ae339f18ac9 100644
--- a/lang/ghc/buildlink3.mk
+++ b/lang/ghc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/03/22 15:12:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:11 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GHC_BUILDLINK3_MK:= ${GHC_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nghc}
BUILDLINK_PACKAGES+= ghc
.if !empty(GHC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ghc+= ghc>=6.2.1nb1
-BUILDLINK_RECOMMENDED.ghc?= ghc>=6.4.1nb1
+BUILDLINK_API_DEPENDS.ghc+= ghc>=6.2.1nb1
+BUILDLINK_ABI_DEPENDS.ghc?= ghc>=6.4.1nb1
BUILDLINK_PKGSRCDIR.ghc?= ../../lang/ghc
BUILDLINK_DEPMETHOD.ghc?= build
diff --git a/lang/guile/buildlink3.mk b/lang/guile/buildlink3.mk
index a6bde287b5d..7fa67842ed5 100644
--- a/lang/guile/buildlink3.mk
+++ b/lang/guile/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:09:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:12 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GUILE_BUILDLINK3_MK:= ${GUILE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nguile}
BUILDLINK_PACKAGES+= guile
.if !empty(GUILE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.guile+= guile>=1.6.3nb1
-BUILDLINK_RECOMMENDED.guile+= guile>=1.6.7nb3
+BUILDLINK_API_DEPENDS.guile+= guile>=1.6.3nb1
+BUILDLINK_ABI_DEPENDS.guile+= guile>=1.6.7nb3
BUILDLINK_PKGSRCDIR.guile?= ../../lang/guile
.endif # GUILE_BUILDLINK3_MK
diff --git a/lang/guile14/buildlink3.mk b/lang/guile14/buildlink3.mk
index f5cfaabacbe..652e29c71db 100644
--- a/lang/guile14/buildlink3.mk
+++ b/lang/guile14/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:09:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:12 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GUILE14_BUILDLINK3_MK:= ${GUILE14_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nguile14}
BUILDLINK_PACKAGES+= guile14
.if !empty(GUILE14_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.guile14+= guile14>=1.4.1nb4
-BUILDLINK_RECOMMENDED.guile14+= guile14>=1.4.1nb8
+BUILDLINK_API_DEPENDS.guile14+= guile14>=1.4.1nb4
+BUILDLINK_ABI_DEPENDS.guile14+= guile14>=1.4.1nb8
BUILDLINK_PKGSRCDIR.guile14?= ../../lang/guile14
BUILDLINK_PASSTHRU_DIRS= ${LOCALBASE}/guile/1.4
diff --git a/lang/jdk/buildlink3.mk b/lang/jdk/buildlink3.mk
index 6ead112d630..12b492641c5 100644
--- a/lang/jdk/buildlink3.mk
+++ b/lang/jdk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/07/02 12:51:57 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:12 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
JDK_BUILDLINK3_MK:= ${JDK_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Njdk}
BUILDLINK_PACKAGES+= jdk
.if !empty(JDK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.jdk+= jdk>=1.1.8
+BUILDLINK_API_DEPENDS.jdk+= jdk>=1.1.8
BUILDLINK_PKGSRCDIR.jdk?= ../../lang/jdk
BUILDLINK_JAVA_PREFIX.jdk= ${PREFIX}/java/jdk-1.1.8
diff --git a/lang/kaffe/buildlink3.mk b/lang/kaffe/buildlink3.mk
index 60783505152..794aa6f8658 100644
--- a/lang/kaffe/buildlink3.mk
+++ b/lang/kaffe/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/02/05 23:09:46 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/04/06 06:22:12 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
KAFFE_BUILDLINK3_MK:= ${KAFFE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nkaffe}
BUILDLINK_PACKAGES+= kaffe
.if !empty(KAFFE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.kaffe+= kaffe>=1.1.6
-BUILDLINK_RECOMMENDED.kaffe?= kaffe>=1.1.6nb2
+BUILDLINK_API_DEPENDS.kaffe+= kaffe>=1.1.6
+BUILDLINK_ABI_DEPENDS.kaffe?= kaffe>=1.1.6nb2
BUILDLINK_PKGSRCDIR.kaffe?= ../../lang/kaffe
BUILDLINK_JAVA_PREFIX.kaffe= ${PREFIX}/java/kaffe
.endif # KAFFE_BUILDLINK3_MK
diff --git a/lang/librep/buildlink3.mk b/lang/librep/buildlink3.mk
index e4457c0f0b8..0cb2067d1c8 100644
--- a/lang/librep/buildlink3.mk
+++ b/lang/librep/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:09:46 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:22:12 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBREP_BUILDLINK3_MK:= ${LIBREP_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibrep}
BUILDLINK_PACKAGES+= librep
.if !empty(LIBREP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.librep+= librep>=0.17
-BUILDLINK_RECOMMENDED.librep+= librep>=0.17nb2
+BUILDLINK_API_DEPENDS.librep+= librep>=0.17
+BUILDLINK_ABI_DEPENDS.librep+= librep>=0.17nb2
BUILDLINK_PKGSRCDIR.librep?= ../../lang/librep
MAKE_FLAGS+= rep_LIBTOOL=${LIBTOOL:Q}
.endif # LIBREP_BUILDLINK3_MK
diff --git a/lang/libtcl-nothread/buildlink3.mk b/lang/libtcl-nothread/buildlink3.mk
index 552083abe5d..12cb06249f8 100644
--- a/lang/libtcl-nothread/buildlink3.mk
+++ b/lang/libtcl-nothread/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:15:01 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:12 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
TCLNT_BUILDLINK3_MK:= ${TCLNT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntclnt}
BUILDLINK_PACKAGES+= tclnt
.if !empty(TCLNT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tclnt+= libtcl-nothread>=8.4.6
-BUILDLINK_RECOMMENDED.tclnt+= libtcl-nothread>=8.4.6nb1
+BUILDLINK_API_DEPENDS.tclnt+= libtcl-nothread>=8.4.6
+BUILDLINK_ABI_DEPENDS.tclnt+= libtcl-nothread>=8.4.6nb1
BUILDLINK_PKGSRCDIR.tclnt?= ../../lang/libtcl-nothread
BUILDLINK_FILES.tcl= bin/tclsh*
diff --git a/lang/lua/buildlink3.mk b/lang/lua/buildlink3.mk
index 62eba55f0d5..ad4a8d96f0f 100644
--- a/lang/lua/buildlink3.mk
+++ b/lang/lua/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2005/09/04 04:59:36 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:12 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LUA_BUILDLINK3_MK:= ${LUA_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlua}
BUILDLINK_PACKAGES+= lua
.if !empty(LUA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.lua+= lua>=5.0.2
-BUILDLINK_RECOMMENDED.lua+= lua>=5.0.2nb4
+BUILDLINK_API_DEPENDS.lua+= lua>=5.0.2
+BUILDLINK_ABI_DEPENDS.lua+= lua>=5.0.2nb4
BUILDLINK_PKGSRCDIR.lua?= ../../lang/lua
.endif # LUA_BUILDLINK3_MK
diff --git a/lang/lua4/buildlink3.mk b/lang/lua4/buildlink3.mk
index bc2030aee56..0e65cf0afd7 100644
--- a/lang/lua4/buildlink3.mk
+++ b/lang/lua4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/04/28 00:28:18 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:12 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LUA4_BUILDLINK3_MK:= ${LUA4_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlua4}
BUILDLINK_PACKAGES+= lua4
.if !empty(LUA4_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.lua4+= lua4>=4.0.1
+BUILDLINK_API_DEPENDS.lua4+= lua4>=4.0.1
BUILDLINK_PKGSRCDIR.lua4?= ../../lang/lua4
.endif # LUA4_BUILDLINK3_MK
diff --git a/lang/mono/buildlink3.mk b/lang/mono/buildlink3.mk
index b8739e1fdf6..80c80f62662 100644
--- a/lang/mono/buildlink3.mk
+++ b/lang/mono/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2006/02/05 23:09:46 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2006/04/06 06:22:12 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
MONO_BUILDLINK3_MK:= ${MONO_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmono}
BUILDLINK_PACKAGES+= mono
.if !empty(MONO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.mono+= mono>=1.1.12.1
-BUILDLINK_RECOMMENDED.mono?= mono>=1.1.12.1nb2
+BUILDLINK_API_DEPENDS.mono+= mono>=1.1.12.1
+BUILDLINK_ABI_DEPENDS.mono?= mono>=1.1.12.1nb2
BUILDLINK_PKGSRCDIR.mono?= ../../lang/mono
.endif # MONO_BUILDLINK3_MK
diff --git a/lang/ocaml/buildlink3.mk b/lang/ocaml/buildlink3.mk
index c626d553d42..bba1a9f8739 100644
--- a/lang/ocaml/buildlink3.mk
+++ b/lang/ocaml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/02/05 23:09:46 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2006/04/06 06:22:12 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OCAML_BUILDLINK3_MK:= ${OCAML_BUILDLINK3_MK}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES+= ocaml
BUILDLINK_DEPMETHOD.ocaml?= build
.if !empty(OCAML_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ocaml+= ocaml>=3.08.2
-BUILDLINK_RECOMMENDED.ocaml?= ocaml>=3.09.1nb2
+BUILDLINK_API_DEPENDS.ocaml+= ocaml>=3.08.2
+BUILDLINK_ABI_DEPENDS.ocaml?= ocaml>=3.09.1nb2
BUILDLINK_PKGSRCDIR.ocaml?= ../../lang/ocaml
. include "../../mk/bsd.prefs.mk"
diff --git a/lang/onyx/Makefile b/lang/onyx/Makefile
index 61d97cfe8ba..33bd18c95cb 100644
--- a/lang/onyx/Makefile
+++ b/lang/onyx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/03/04 21:29:55 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2006/04/06 06:22:12 reed Exp $
DISTNAME= onyx-${VERS}
PKGREVISION= 2
@@ -18,7 +18,7 @@ ONLY_FOR_PLATFORM= NetBSD-1.5[YZ]*-* NetBSD-1.6*-* NetBSD-1.7*-* NetBSD-[2-9]*-*
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-pcre-prefix=${BUILDLINK_PREFIX.pcre}
-BUILDLINK_DEPENDS.pcre?= pcre>=4.0
+BUILDLINK_API_DEPENDS.pcre?= pcre>=4.0
VERS= 5.1.1
PLIST_SUBST+= VERS=${VERS:Q}
diff --git a/lang/parrot/buildlink3.mk b/lang/parrot/buildlink3.mk
index 21ef0036545..190dd82fb60 100644
--- a/lang/parrot/buildlink3.mk
+++ b/lang/parrot/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:09:47 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:12 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PARROT_BUILDLINK3_MK:= ${PARROT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nparrot}
BUILDLINK_PACKAGES+= parrot
.if !empty(PARROT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.parrot+= parrot>=0.4.0
-BUILDLINK_RECOMMENDED.parrot?= parrot>=0.4.1nb1
+BUILDLINK_API_DEPENDS.parrot+= parrot>=0.4.0
+BUILDLINK_ABI_DEPENDS.parrot?= parrot>=0.4.1nb1
BUILDLINK_PKGSRCDIR.parrot?= ../../lang/parrot
.endif # PARROT_BUILDLINK3_MK
diff --git a/lang/perl5/buildlink3.mk b/lang/perl5/buildlink3.mk
index f6228f56598..3a2a245aaa8 100644
--- a/lang/perl5/buildlink3.mk
+++ b/lang/perl5/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.30 2006/03/14 01:14:29 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.31 2006/04/06 06:22:13 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PERL5_BUILDLINK3_MK:= ${PERL5_BUILDLINK3_MK}+
@@ -16,7 +16,7 @@ BUILDLINK_PACKAGES+= perl
USE_TOOLS+= perl
PERL5_REQD+= 5.8.7
TOOLS_DEPENDS.perl= # buildlink3 will handle the dependency
-BUILDLINK_DEPENDS.perl+= perl>=${PERL5_REQD}
+BUILDLINK_API_DEPENDS.perl+= perl>=${PERL5_REQD}
BUILDLINK_PKGSRCDIR.perl?= ../../lang/perl5
PERL5_OPTIONS?= # empty
diff --git a/lang/php5/buildlink3.mk b/lang/php5/buildlink3.mk
index acf967b2126..11e0c686177 100644
--- a/lang/php5/buildlink3.mk
+++ b/lang/php5/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/02/17 09:48:01 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/04/06 06:22:13 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PHP_BUILDLINK3_MK:= ${PHP_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nphp}
BUILDLINK_PACKAGES+= php
.if !empty(PHP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.php+= php>=5.1.2
-BUILDLINK_RECOMMENDED.php+= php>=5.1.2
+BUILDLINK_API_DEPENDS.php+= php>=5.1.2
+BUILDLINK_ABI_DEPENDS.php+= php>=5.1.2
BUILDLINK_PKGSRCDIR.php?= ../../lang/php5
.endif # PHP_BUILDLINK3_MK
diff --git a/lang/pnet/buildlink3.mk b/lang/pnet/buildlink3.mk
index ef59323e306..c255268f0bc 100644
--- a/lang/pnet/buildlink3.mk
+++ b/lang/pnet/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:09:47 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:13 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PNET_BUILDLINK3_MK:= ${PNET_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npnet}
BUILDLINK_PACKAGES+= pnet
.if !empty(PNET_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pnet+= pnet>=0.6.4
-BUILDLINK_RECOMMENDED.pnet+= pnet>=0.6.6nb2
+BUILDLINK_API_DEPENDS.pnet+= pnet>=0.6.4
+BUILDLINK_ABI_DEPENDS.pnet+= pnet>=0.6.6nb2
BUILDLINK_PKGSRCDIR.pnet?= ../../lang/pnet
.endif # PNET_BUILDLINK3_MK
diff --git a/lang/pnetC/buildlink3.mk b/lang/pnetC/buildlink3.mk
index 6d6f3658604..0ab8b697d7f 100644
--- a/lang/pnetC/buildlink3.mk
+++ b/lang/pnetC/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:09:47 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:13 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PNETC_BUILDLINK3_MK:= ${PNETC_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NpnetC}
BUILDLINK_PACKAGES+= pnetC
.if !empty(PNETC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pnetC+= pnetC>=0.6.4
-BUILDLINK_RECOMMENDED.pnetC?= pnetC>=0.6.6nb2
+BUILDLINK_API_DEPENDS.pnetC+= pnetC>=0.6.4
+BUILDLINK_ABI_DEPENDS.pnetC?= pnetC>=0.6.6nb2
BUILDLINK_PKGSRCDIR.pnetC?= ../../lang/pnetC
.endif # PNETC_BUILDLINK3_MK
diff --git a/lang/pnetlib/buildlink3.mk b/lang/pnetlib/buildlink3.mk
index dcf9ae27949..8f254677619 100644
--- a/lang/pnetlib/buildlink3.mk
+++ b/lang/pnetlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:09:47 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:13 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PNETLIB_BUILDLINK3_MK:= ${PNETLIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npnetlib}
BUILDLINK_PACKAGES+= pnetlib
.if !empty(PNETLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pnetlib+= pnetlib>=0.6.4
-BUILDLINK_RECOMMENDED.pnetlib+= pnetlib>=0.6.6nb2
+BUILDLINK_API_DEPENDS.pnetlib+= pnetlib>=0.6.4
+BUILDLINK_ABI_DEPENDS.pnetlib+= pnetlib>=0.6.6nb2
BUILDLINK_PKGSRCDIR.pnetlib?= ../../lang/pnetlib
.endif # PNETLIB_BUILDLINK3_MK
diff --git a/lang/py-extclass/buildlink3.mk b/lang/py-extclass/buildlink3.mk
index bbf58d5d92d..b6c64479356 100644
--- a/lang/py-extclass/buildlink3.mk
+++ b/lang/py-extclass/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2005/09/19 14:56:26 hira Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:13 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PYEXTCLASS_BUILDLINK3_MK:= ${PYEXTCLASS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npyextclass}
BUILDLINK_PACKAGES+= pyextclass
.if !empty(PYEXTCLASS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pyextclass+= py-extclass>=2.2.2nb1
-BUILDLINK_RECOMMENDED.pyextclass+= py-extclass>=2.2.2nb1
+BUILDLINK_API_DEPENDS.pyextclass+= py-extclass>=2.2.2nb1
+BUILDLINK_ABI_DEPENDS.pyextclass+= py-extclass>=2.2.2nb1
BUILDLINK_PKGSRCDIR.pyextclass?= ../../lang/py-extclass
.endif # PYEXTCLASS_BUILDLINK3_MK
diff --git a/lang/python/pyversion.mk b/lang/python/pyversion.mk
index a54453b8c4d..0d9cddedafb 100644
--- a/lang/python/pyversion.mk
+++ b/lang/python/pyversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: pyversion.mk,v 1.38 2005/11/04 18:24:37 rillig Exp $
+# $NetBSD: pyversion.mk,v 1.39 2006/04/06 06:22:13 reed Exp $
.if !defined(PYTHON_PYVERSION_MK)
PYTHON_PYVERSION_MK= defined
@@ -12,12 +12,12 @@ PYTHON_VERSIONS_INCOMPATIBLE+= 22 21 20 15
PYTHON_VERSIONS_ACCEPTED?= 24 23 22 21 20
PYTHON_VERSIONS_INCOMPATIBLE?= # empty by default
-BUILDLINK_DEPENDS.python15?= python15>=1.5
-BUILDLINK_DEPENDS.python20?= python20>=2.0
-BUILDLINK_DEPENDS.python21?= python21>=2.1
-BUILDLINK_DEPENDS.python22?= python22>=2.2
-BUILDLINK_DEPENDS.python23?= python23>=2.3
-BUILDLINK_DEPENDS.python24?= python24>=2.4
+BUILDLINK_API_DEPENDS.python15?= python15>=1.5
+BUILDLINK_API_DEPENDS.python20?= python20>=2.0
+BUILDLINK_API_DEPENDS.python21?= python21>=2.1
+BUILDLINK_API_DEPENDS.python22?= python22>=2.2
+BUILDLINK_API_DEPENDS.python23?= python23>=2.3
+BUILDLINK_API_DEPENDS.python24?= python24>=2.4
# transform the list into individual variables
.for pv in ${PYTHON_VERSIONS_ACCEPTED}
@@ -95,38 +95,38 @@ _PYTHON_VERSION= ${_PYTHON_VERSION_FIRSTACCEPTED}
#
.if ${_PYTHON_VERSION} == "24"
PYPKGSRCDIR= ../../lang/python24
-PYDEPENDENCY= ${BUILDLINK_DEPENDS.python24}:${PYPKGSRCDIR}
+PYDEPENDENCY= ${BUILDLINK_API_DEPENDS.python24}:${PYPKGSRCDIR}
PYPACKAGE= python24
PYVERSSUFFIX= 2.4
PYPKGPREFIX= py24
.elif ${_PYTHON_VERSION} == "23"
PYPKGSRCDIR= ../../lang/python23
-PYDEPENDENCY= ${BUILDLINK_DEPENDS.python23}:${PYPKGSRCDIR}
+PYDEPENDENCY= ${BUILDLINK_API_DEPENDS.python23}:${PYPKGSRCDIR}
PYPACKAGE= python23
PYVERSSUFFIX= 2.3
PYPKGPREFIX= py23
.elif ${_PYTHON_VERSION} == "22"
PYPKGSRCDIR= ../../lang/python22
-PYDEPENDENCY= ${BUILDLINK_DEPENDS.python22}:${PYPKGSRCDIR}
+PYDEPENDENCY= ${BUILDLINK_API_DEPENDS.python22}:${PYPKGSRCDIR}
PYPACKAGE= python22
PYVERSSUFFIX= 2.2
PYPKGPREFIX= py22
.elif ${_PYTHON_VERSION} == "21"
PYPKGSRCDIR= ../../lang/python21
PYPACKAGE= python21
-PYDEPENDENCY= ${BUILDLINK_DEPENDS.python21}:${PYPKGSRCDIR}
+PYDEPENDENCY= ${BUILDLINK_API_DEPENDS.python21}:${PYPKGSRCDIR}
PYVERSSUFFIX= 2.1
PYPKGPREFIX= py21
.elif ${_PYTHON_VERSION} == "20"
PYPKGSRCDIR= ../../lang/python20
PYPACKAGE= python20
-PYDEPENDENCY= ${BUILDLINK_DEPENDS.python20}:${PYPKGSRCDIR}
+PYDEPENDENCY= ${BUILDLINK_API_DEPENDS.python20}:${PYPKGSRCDIR}
PYVERSSUFFIX= 2.0
PYPKGPREFIX= py20
.elif ${_PYTHON_VERSION} == "15"
PYPKGSRCDIR= ../../lang/python15
PYPACKAGE= python15
-PYDEPENDENCY= ${BUILDLINK_DEPENDS.python15}:${PYPKGSRCDIR}
+PYDEPENDENCY= ${BUILDLINK_API_DEPENDS.python15}:${PYPKGSRCDIR}
PYVERSSUFFIX= 1.5
PYPKGPREFIX= py15
.if !defined(PYTHON_DISTUTILS_BOOTSTRAP)
diff --git a/lang/python15/buildlink3.mk b/lang/python15/buildlink3.mk
index c7b49fddf79..53dce08e7ed 100644
--- a/lang/python15/buildlink3.mk
+++ b/lang/python15/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:36 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:13 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PYTHON15_BUILDLINK3_MK:= ${PYTHON15_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npython15}
BUILDLINK_PACKAGES+= python15
.if !empty(PYTHON15_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.python15+= python15>=1.5
+BUILDLINK_API_DEPENDS.python15+= python15>=1.5
BUILDLINK_PKGSRCDIR.python15?= ../../lang/python15
.if defined(BUILDLINK_DEPMETHOD.python)
diff --git a/lang/python20/buildlink3.mk b/lang/python20/buildlink3.mk
index a75394c6d0b..0cc38ff1527 100644
--- a/lang/python20/buildlink3.mk
+++ b/lang/python20/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/03/26 02:27:42 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:13 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PYTHON20_BUILDLINK3_MK:= ${PYTHON20_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npython20}
BUILDLINK_PACKAGES+= python20
.if !empty(PYTHON20_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.python20+= python20>=2.0
-BUILDLINK_RECOMMENDED.python20?= python20>=2.0.1nb7
+BUILDLINK_API_DEPENDS.python20+= python20>=2.0
+BUILDLINK_ABI_DEPENDS.python20?= python20>=2.0.1nb7
BUILDLINK_PKGSRCDIR.python20?= ../../lang/python20
.if defined(BUILDLINK_DEPMETHOD.python)
diff --git a/lang/python21/buildlink3.mk b/lang/python21/buildlink3.mk
index f8b7e5b0fd9..f3719180f4c 100644
--- a/lang/python21/buildlink3.mk
+++ b/lang/python21/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2005/11/14 22:53:09 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:14 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PYTHON21_BUILDLINK3_MK:= ${PYTHON21_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npython21}
BUILDLINK_PACKAGES+= python21
.if !empty(PYTHON21_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.python21+= python21>=2.1
+BUILDLINK_API_DEPENDS.python21+= python21>=2.1
BUILDLINK_PKGSRCDIR.python21?= ../../lang/python21
.if defined(BUILDLINK_DEPMETHOD.python)
diff --git a/lang/python22/buildlink3.mk b/lang/python22/buildlink3.mk
index 6757fdf5bcb..81c383a0859 100644
--- a/lang/python22/buildlink3.mk
+++ b/lang/python22/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2005/11/14 22:53:09 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:14 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PYTHON22_BUILDLINK3_MK:= ${PYTHON22_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npython22}
BUILDLINK_PACKAGES+= python22
.if !empty(PYTHON22_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.python22+= python22>=2.2
+BUILDLINK_API_DEPENDS.python22+= python22>=2.2
BUILDLINK_PKGSRCDIR.python22?= ../../lang/python22
.if defined(BUILDLINK_DEPMETHOD.python)
diff --git a/lang/python23-nth/buildlink3.mk b/lang/python23-nth/buildlink3.mk
index 532a088e171..93008efef0b 100644
--- a/lang/python23-nth/buildlink3.mk
+++ b/lang/python23-nth/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:09:47 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:14 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PYTHON23_NTH_BUILDLINK3_MK:= ${PYTHON23_NTH_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npython23-nth}
BUILDLINK_PACKAGES+= python23-nth
.if !empty(PYTHON23_NTH_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.python23-nth+= python23-nth>=2.3.4
-BUILDLINK_RECOMMENDED.python23-nth?= python23-nth>=2.3.5nb4
+BUILDLINK_API_DEPENDS.python23-nth+= python23-nth>=2.3.4
+BUILDLINK_ABI_DEPENDS.python23-nth?= python23-nth>=2.3.5nb4
BUILDLINK_PKGSRCDIR.python23-nth?= ../../lang/python23-nth
.if defined(BUILDLINK_DEPMETHOD.python)
diff --git a/lang/python23/buildlink3.mk b/lang/python23/buildlink3.mk
index 6572e618b40..f29e916b50b 100644
--- a/lang/python23/buildlink3.mk
+++ b/lang/python23/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/05 23:09:47 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:22:14 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PYTHON23_BUILDLINK3_MK:= ${PYTHON23_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npython23}
BUILDLINK_PACKAGES+= python23
.if !empty(PYTHON23_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.python23+= python23>=2.3
-BUILDLINK_RECOMMENDED.python23?= python23>=2.3.5nb6
+BUILDLINK_API_DEPENDS.python23+= python23>=2.3
+BUILDLINK_ABI_DEPENDS.python23?= python23>=2.3.5nb6
BUILDLINK_PKGSRCDIR.python23?= ../../lang/python23
.if defined(BUILDLINK_DEPMETHOD.python)
diff --git a/lang/python24/buildlink3.mk b/lang/python24/buildlink3.mk
index 9b8ebf8d40c..74f2d86d934 100644
--- a/lang/python24/buildlink3.mk
+++ b/lang/python24/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:09:47 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:14 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PYTHON24_BUILDLINK3_MK:= ${PYTHON24_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npython24}
BUILDLINK_PACKAGES+= python24
.if !empty(PYTHON24_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.python24+= python24>=2.4
-BUILDLINK_RECOMMENDED.python24?= python24>=2.4.2nb4
+BUILDLINK_API_DEPENDS.python24+= python24>=2.4
+BUILDLINK_ABI_DEPENDS.python24?= python24>=2.4.2nb4
BUILDLINK_PKGSRCDIR.python24?= ../../lang/python24
.if defined(BUILDLINK_DEPMETHOD.python)
diff --git a/lang/ruby/buildlink3.mk b/lang/ruby/buildlink3.mk
index 00ad4911743..bcf595f33b3 100644
--- a/lang/ruby/buildlink3.mk
+++ b/lang/ruby/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2005/11/02 07:44:02 taca Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:14 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
RUBY_BUILDLINK3_MK:= ${RUBY_BUILDLINK3_MK}+
@@ -16,8 +16,8 @@ BUILDLINK_PACKAGES+= ${RUBY_BASE}
.if !empty(RUBY_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.${RUBY_BASE}?= ${RUBY_BASE}>=${RUBY_REQD}
-BUILDLINK_RECOMMENDED.${RUBY_BASE}?= ${RUBY_BASE}>=${RUBY_VERSION}
+BUILDLINK_API_DEPENDS.${RUBY_BASE}?= ${RUBY_BASE}>=${RUBY_REQD}
+BUILDLINK_ABI_DEPENDS.${RUBY_BASE}?= ${RUBY_BASE}>=${RUBY_VERSION}
BUILDLINK_PKGSRCDIR.${RUBY_BASE}?= ../../lang/${RUBY_BASE}
BUILDLINK_FILES.${RUBY_BASE}+= lib/libruby${RUBY_VER}.*
BUILDLINK_FILES.${RUBY_BASE}+= lib/ruby/${RUBY_VER_DIR}/${RUBY_ARCH}/*.h
diff --git a/lang/spidermonkey/buildlink3.mk b/lang/spidermonkey/buildlink3.mk
index 7c376d7d0d0..ffb6a60740f 100644
--- a/lang/spidermonkey/buildlink3.mk
+++ b/lang/spidermonkey/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:09:51 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:14 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SPIDERMONKEY_BUILDLINK3_MK:= ${SPIDERMONKEY_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nspidermonkey}
BUILDLINK_PACKAGES+= spidermonkey
.if !empty(SPIDERMONKEY_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.spidermonkey+= spidermonkey>=1.5
-BUILDLINK_RECOMMENDED.spidermonkey?= spidermonkey>=1.5nb1
+BUILDLINK_API_DEPENDS.spidermonkey+= spidermonkey>=1.5
+BUILDLINK_ABI_DEPENDS.spidermonkey?= spidermonkey>=1.5nb1
BUILDLINK_PKGSRCDIR.spidermonkey?= ../../lang/spidermonkey
.endif # SPIDERMONKEY_BUILDLINK3_MK
diff --git a/lang/sun-jdk13/buildlink3.mk b/lang/sun-jdk13/buildlink3.mk
index 56091032477..a560217be4f 100644
--- a/lang/sun-jdk13/buildlink3.mk
+++ b/lang/sun-jdk13/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:09:52 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:14 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SUN_JDK13_BUILDLINK3_MK:= ${SUN_JDK13_BUILDLINK3_MK}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES+= sun-jdk13
.if !empty(SUN_JDK13_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.sun-jdk13+= sun-jdk13-[0-9]*
-BUILDLINK_RECOMMENDED.sun-jdk13?= sun-jdk13>=1.0.17nb1
+BUILDLINK_API_DEPENDS.sun-jdk13+= sun-jdk13-[0-9]*
+BUILDLINK_ABI_DEPENDS.sun-jdk13?= sun-jdk13>=1.0.17nb1
BUILDLINK_PKGSRCDIR.sun-jdk13?= ../../lang/sun-jdk13
BUILDLINK_DEPMETHOD.sun-jdk13?= build
diff --git a/lang/sun-jdk14/buildlink3.mk b/lang/sun-jdk14/buildlink3.mk
index bf9c565ceb7..0ae29465686 100644
--- a/lang/sun-jdk14/buildlink3.mk
+++ b/lang/sun-jdk14/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/03/07 04:39:19 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:14 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SUN_JDK14_BUILDLINK3_MK:= ${SUN_JDK14_BUILDLINK3_MK}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES+= sun-jdk14
.if !empty(SUN_JDK14_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.sun-jdk14+= sun-jdk14-[0-9]*
-BUILDLINK_RECOMMENDED.sun-jdk14?= sun-jdk14>=2.11
+BUILDLINK_API_DEPENDS.sun-jdk14+= sun-jdk14-[0-9]*
+BUILDLINK_ABI_DEPENDS.sun-jdk14?= sun-jdk14>=2.11
BUILDLINK_PKGSRCDIR.sun-jdk14?= ../../lang/sun-jdk14
BUILDLINK_DEPMETHOD.sun-jdk14?= build
diff --git a/lang/sun-jdk15/buildlink3.mk b/lang/sun-jdk15/buildlink3.mk
index 01a3ec24678..894566401e1 100644
--- a/lang/sun-jdk15/buildlink3.mk
+++ b/lang/sun-jdk15/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:09:52 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:14 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SUN_JDK15_BUILDLINK3_MK:= ${SUN_JDK15_BUILDLINK3_MK}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES+= sun-jdk15
.if !empty(SUN_JDK15_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.sun-jdk15+= sun-jdk15-[0-9]*
-BUILDLINK_RECOMMENDED.sun-jdk15?= sun-jdk15>=5.0.6nb1
+BUILDLINK_API_DEPENDS.sun-jdk15+= sun-jdk15-[0-9]*
+BUILDLINK_ABI_DEPENDS.sun-jdk15?= sun-jdk15>=5.0.6nb1
BUILDLINK_PKGSRCDIR.sun-jdk15?= ../../lang/sun-jdk15
BUILDLINK_DEPMETHOD.sun-jdk15?= build
diff --git a/lang/sun-jre13/buildlink3.mk b/lang/sun-jre13/buildlink3.mk
index 558b3fc8ae0..5aef74cb7b4 100644
--- a/lang/sun-jre13/buildlink3.mk
+++ b/lang/sun-jre13/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:09:52 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:14 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SUN_JRE13_BUILDLINK3_MK:= ${SUN_JRE13_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsun-jre13}
BUILDLINK_PACKAGES+= sun-jre13
.if !empty(SUN_JRE13_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.sun-jre13+= sun-jre13-[0-9]*
-BUILDLINK_RECOMMENDED.sun-jre13?= sun-jre13>=1.0.17nb1
+BUILDLINK_API_DEPENDS.sun-jre13+= sun-jre13-[0-9]*
+BUILDLINK_ABI_DEPENDS.sun-jre13?= sun-jre13>=1.0.17nb1
BUILDLINK_PKGSRCDIR.sun-jre13?= ../../lang/sun-jre13
BUILDLINK_JAVA_PREFIX.sun-jre13= ${PREFIX}/java/sun-1.3
.endif # SUN_JRE13_BUILDLINK3_MK
diff --git a/lang/sun-jre14/buildlink3.mk b/lang/sun-jre14/buildlink3.mk
index 5990ff5c582..b89412bd8c7 100644
--- a/lang/sun-jre14/buildlink3.mk
+++ b/lang/sun-jre14/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/03/07 04:36:21 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:14 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SUN_JRE14_BUILDLINK3_MK:= ${SUN_JRE14_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsun-jre14}
BUILDLINK_PACKAGES+= sun-jre14
.if !empty(SUN_JRE14_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.sun-jre14+= sun-jre14-[0-9]*
-BUILDLINK_RECOMMENDED.sun-jre14?= sun-jre14>=2.11
+BUILDLINK_API_DEPENDS.sun-jre14+= sun-jre14-[0-9]*
+BUILDLINK_ABI_DEPENDS.sun-jre14?= sun-jre14>=2.11
BUILDLINK_PKGSRCDIR.sun-jre14?= ../../lang/sun-jre14
BUILDLINK_JAVA_PREFIX.sun-jre14= ${PREFIX}/java/sun-1.4
.endif # SUN_JRE14_BUILDLINK3_MK
diff --git a/lang/sun-jre15/buildlink3.mk b/lang/sun-jre15/buildlink3.mk
index 38e3c2085f3..985b0d2a799 100644
--- a/lang/sun-jre15/buildlink3.mk
+++ b/lang/sun-jre15/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:09:52 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:15 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SUN_JRE15_BUILDLINK3_MK:= ${SUN_JRE15_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsun-jre15}
BUILDLINK_PACKAGES+= sun-jre15
.if !empty(SUN_JRE15_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.sun-jre15+= sun-jre15-[0-9]*
-BUILDLINK_RECOMMENDED.sun-jre15?= sun-jre15>=5.0.6nb2
+BUILDLINK_API_DEPENDS.sun-jre15+= sun-jre15-[0-9]*
+BUILDLINK_ABI_DEPENDS.sun-jre15?= sun-jre15>=5.0.6nb2
BUILDLINK_PKGSRCDIR.sun-jre15?= ../../lang/sun-jre15
BUILDLINK_JAVA_PREFIX.sun-jre15= ${PREFIX}/java/sun-1.5
.endif # SUN_JRE15_BUILDLINK3_MK
diff --git a/lang/swi-prolog-lite/buildlink3.mk b/lang/swi-prolog-lite/buildlink3.mk
index 1f782aac9f4..eac715679ac 100644
--- a/lang/swi-prolog-lite/buildlink3.mk
+++ b/lang/swi-prolog-lite/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/05/20 11:09:17 hubertf Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:15 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SWI_PROLOG_LITE_BUILDLINK3_MK:= ${SWI_PROLOG_LITE_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nswi-prolog-lite}
BUILDLINK_PACKAGES+= swi-prolog-lite
.if !empty(SWI_PROLOG_LITE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.swi-prolog-lite+= swi-prolog-lite>=5.2.9
+BUILDLINK_API_DEPENDS.swi-prolog-lite+= swi-prolog-lite>=5.2.9
BUILDLINK_PKGSRCDIR.swi-prolog-lite?= ../../lang/swi-prolog-lite
.endif # SWI_PROLOG_LITE_BUILDLINK3_MK
diff --git a/lang/tcl-expect/buildlink3.mk b/lang/tcl-expect/buildlink3.mk
index b942e5c86f6..199efdf24c9 100644
--- a/lang/tcl-expect/buildlink3.mk
+++ b/lang/tcl-expect/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:15:03 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:15 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
TCL_EXPECT_BUILDLINK3_MK:= ${TCL_EXPECT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntcl-expect}
BUILDLINK_PACKAGES+= tcl-expect
.if !empty(TCL_EXPECT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tcl-expect+= tcl-expect>=5.38.0nb1
-BUILDLINK_RECOMMENDED.tcl-expect+= tcl-expect>=5.38.0nb2
+BUILDLINK_API_DEPENDS.tcl-expect+= tcl-expect>=5.38.0nb1
+BUILDLINK_ABI_DEPENDS.tcl-expect+= tcl-expect>=5.38.0nb2
BUILDLINK_PKGSRCDIR.tcl-expect?= ../../lang/tcl-expect
.endif # TCL_EXPECT_BUILDLINK3_MK
diff --git a/lang/tcl-itcl-current/buildlink3.mk b/lang/tcl-itcl-current/buildlink3.mk
index 2841ad8ed2c..63402029b87 100644
--- a/lang/tcl-itcl-current/buildlink3.mk
+++ b/lang/tcl-itcl-current/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/15 22:02:56 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:15 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
TCL_ITCL_CURRENT_BUILDLINK3_MK:= ${TCL_ITCL_CURRENT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntcl-itcl-current}
BUILDLINK_PACKAGES+= tcl-itcl-current
.if !empty(TCL_ITCL_CURRENT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tcl-itcl-current+= tcl-itcl-current>=20040920
-BUILDLINK_RECOMMENDED.tcl-itcl-current?= tcl-itcl-current>=20040920nb4
+BUILDLINK_API_DEPENDS.tcl-itcl-current+= tcl-itcl-current>=20040920
+BUILDLINK_ABI_DEPENDS.tcl-itcl-current?= tcl-itcl-current>=20040920nb4
BUILDLINK_PKGSRCDIR.tcl-itcl-current?= ../../lang/tcl-itcl-current
BUILDLINK_TRANSFORM+= l:itcl:itcl33
diff --git a/lang/tcl-itcl/buildlink3.mk b/lang/tcl-itcl/buildlink3.mk
index 6d84b18d1d1..1404b0064cf 100644
--- a/lang/tcl-itcl/buildlink3.mk
+++ b/lang/tcl-itcl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:09:52 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:15 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
TCL_ITCL_BUILDLINK3_MK:= ${TCL_ITCL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntcl-itcl}
BUILDLINK_PACKAGES+= tcl-itcl
.if !empty(TCL_ITCL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tcl-itcl+= tcl-itcl>=3.2.1
-BUILDLINK_RECOMMENDED.tcl-itcl?= tcl-itcl>=3.2.1nb1
+BUILDLINK_API_DEPENDS.tcl-itcl+= tcl-itcl>=3.2.1
+BUILDLINK_ABI_DEPENDS.tcl-itcl?= tcl-itcl>=3.2.1nb1
BUILDLINK_PKGSRCDIR.tcl-itcl?= ../../lang/tcl-itcl
.endif # TCL_ITCL_BUILDLINK3_MK
diff --git a/lang/tcl-otcl/buildlink3.mk b/lang/tcl-otcl/buildlink3.mk
index 153a3da8e5b..1a868102ba0 100644
--- a/lang/tcl-otcl/buildlink3.mk
+++ b/lang/tcl-otcl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:09:52 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:15 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
TCL_OTCL_BUILDLINK3_MK:= ${TCL_OTCL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntcl-otcl}
BUILDLINK_PACKAGES+= tcl-otcl
.if !empty(TCL_OTCL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tcl-otcl+= tcl-otcl>=1.8
-BUILDLINK_RECOMMENDED.tcl-otcl?= tcl-otcl>=1.11nb1
+BUILDLINK_API_DEPENDS.tcl-otcl+= tcl-otcl>=1.8
+BUILDLINK_ABI_DEPENDS.tcl-otcl?= tcl-otcl>=1.11nb1
BUILDLINK_PKGSRCDIR.tcl-otcl?= ../../lang/tcl-otcl
.endif # TCL_OTCL_BUILDLINK3_MK
diff --git a/lang/tcl-tclX/Makefile b/lang/tcl-tclX/Makefile
index 5ffbadc6289..768ce487189 100644
--- a/lang/tcl-tclX/Makefile
+++ b/lang/tcl-tclX/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2006/02/26 21:11:28 joerg Exp $
+# $NetBSD: Makefile,v 1.34 2006/04/06 06:22:15 reed Exp $
#
DISTNAME= tclx8.3.5-src
@@ -14,7 +14,7 @@ COMMENT= Extended Tcl (TclX), a set of Tcl extensions for system programming
.include "../../lang/tcl/Makefile.version"
CONFLICTS+= tclX-[0-9]*
-BUILDLINK_DEPENDS.tcl+= tcl>=8.4.7
+BUILDLINK_API_DEPENDS.tcl+= tcl>=8.4.7
PKG_INSTALLATION_TYPES= overwrite pkgviews
diff --git a/lang/tcl-tclX/buildlink3.mk b/lang/tcl-tclX/buildlink3.mk
index f7399f6ae65..e7afc0e6828 100644
--- a/lang/tcl-tclX/buildlink3.mk
+++ b/lang/tcl-tclX/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:09:53 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:15 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
TCL_TCLX_BUILDLINK3_MK:= ${TCL_TCLX_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntcl-tclX}
BUILDLINK_PACKAGES+= tcl-tclX
.if !empty(TCL_TCLX_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tcl-tclX+= tcl-tclX>=8.3.5
-BUILDLINK_RECOMMENDED.tcl-tclX?= tcl-tclX>=8.3.5nb3
+BUILDLINK_API_DEPENDS.tcl-tclX+= tcl-tclX>=8.3.5
+BUILDLINK_ABI_DEPENDS.tcl-tclX?= tcl-tclX>=8.3.5nb3
BUILDLINK_PKGSRCDIR.tcl-tclX?= ../../lang/tcl-tclX
.endif # TCL_TCLX_BUILDLINK3_MK
diff --git a/lang/tcl/buildlink3.mk b/lang/tcl/buildlink3.mk
index 6c61de71a41..cfaae78da85 100644
--- a/lang/tcl/buildlink3.mk
+++ b/lang/tcl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2004/11/25 22:55:54 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2006/04/06 06:22:15 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
TCL_BUILDLINK3_MK:= ${TCL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntcl}
BUILDLINK_PACKAGES+= tcl
.if !empty(TCL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tcl+= tcl>=8.4.6nb1
-BUILDLINK_RECOMMENDED.tcl+= tcl>=8.4.7nb1
+BUILDLINK_API_DEPENDS.tcl+= tcl>=8.4.6nb1
+BUILDLINK_ABI_DEPENDS.tcl+= tcl>=8.4.7nb1
BUILDLINK_PKGSRCDIR.tcl?= ../../lang/tcl
BUILDLINK_FILES.tcl= bin/tclsh*
diff --git a/lang/tcl83/buildlink3.mk b/lang/tcl83/buildlink3.mk
index fe4f710d613..c8a2ec55c03 100644
--- a/lang/tcl83/buildlink3.mk
+++ b/lang/tcl83/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/04/24 22:41:20 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:15 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
TCL_BUILDLINK3_MK:= ${TCL_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntcl}
BUILDLINK_PACKAGES+= tcl
.if !empty(TCL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tcl+= tcl-8.3.4*
+BUILDLINK_API_DEPENDS.tcl+= tcl-8.3.4*
BUILDLINK_PKGSRCDIR.tcl?= ../../lang/tcl83
BUILDLINK_FILES.tcl= bin/tclsh*
diff --git a/lang/win32-jdk/buildlink3.mk b/lang/win32-jdk/buildlink3.mk
index ade59e1ffde..b1cbba9907d 100644
--- a/lang/win32-jdk/buildlink3.mk
+++ b/lang/win32-jdk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/10/11 13:37:10 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:15 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
WIN32_JDK_BUILDLINK3_MK:= ${WIN32_JRE_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nwin32-jdk}
BUILDLINK_PACKAGES+= win32-jdk
.if !empty(WIN32_JDK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.win32-jdk+= win32-jre>=0.1
+BUILDLINK_API_DEPENDS.win32-jdk+= win32-jre>=0.1
BUILDLINK_PKGSRCDIR.win32-jdk?= ../../lang/win32-jre
.endif # WIN32_JDK_BUILDLINK3_MK
diff --git a/mail/Pantomime/buildlink3.mk b/mail/Pantomime/buildlink3.mk
index a322722cc00..d0728a19265 100644
--- a/mail/Pantomime/buildlink3.mk
+++ b/mail/Pantomime/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/03/12 14:38:25 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:15 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PANTOMIME_BUILDLINK3_MK:= ${PANTOMIME_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NPantomime}
BUILDLINK_PACKAGES+= Pantomime
.if !empty(PANTOMIME_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.Pantomime+= Pantomime>=1.1.2
-BUILDLINK_RECOMMENDED.Pantomime+= Pantomime>=1.1.2nb3
+BUILDLINK_API_DEPENDS.Pantomime+= Pantomime>=1.1.2
+BUILDLINK_ABI_DEPENDS.Pantomime+= Pantomime>=1.1.2nb3
BUILDLINK_PKGSRCDIR.Pantomime?= ../../mail/Pantomime
.include "../../devel/gnustep-make/gnustep.mk"
diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile
index 665fab8109d..71313e6190c 100644
--- a/mail/balsa2/Makefile
+++ b/mail/balsa2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2006/04/02 09:49:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.54 2006/04/06 06:22:15 reed Exp $
DISTNAME= balsa-2.3.10
PKGREVISION= 3
@@ -38,7 +38,7 @@ BUILDLINK_TRANSFORM+= rm:-DGNOME_DISABLE_DEPRECATED
BUILDLINK_TRANSFORM+= rm:-DGNOME_VFS_DISABLE_DEPRECATED
BUILDLINK_TRANSFORM+= rm:-DGTK_DISABLE_DEPRECATED
-BUILDLINK_DEPENDS.gmime+= gmime>=2.1.9
+BUILDLINK_API_DEPENDS.gmime+= gmime>=2.1.9
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile
index becb3a6ec11..124fafed091 100644
--- a/mail/clamav/Makefile
+++ b/mail/clamav/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2006/03/14 01:14:29 jlam Exp $
+# $NetBSD: Makefile,v 1.55 2006/04/06 06:22:16 reed Exp $
DISTNAME= clamav-${CLAMAV_VERSION}
PKGNAME= clamav-${CLAMAV_VERSION:S/-/./}
@@ -76,7 +76,7 @@ PLIST_SUBST+= MILTER="@comment "
.if !empty(PKG_OPTIONS:Mcurl)
. include "../../www/curl/buildlink3.mk"
CONFIGURE_ARGS+= --with-libcurl
-BUILDLINK_DEPENDS.curl+=curl>=7.10.0
+BUILDLINK_API_DEPENDS.curl+=curl>=7.10.0
.else
CONFIGURE_ARGS+= --without-libcurl
.endif
diff --git a/mail/clamav/buildlink3.mk b/mail/clamav/buildlink3.mk
index 5f6a54036b6..c2fd29a412b 100644
--- a/mail/clamav/buildlink3.mk
+++ b/mail/clamav/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:09:53 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:22:16 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
CLAMAV_BUILDLINK3_MK:= ${CLAMAV_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nclamav}
BUILDLINK_PACKAGES+= clamav
.if !empty(CLAMAV_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.clamav+= clamav>=0.60nb1
-BUILDLINK_RECOMMENDED.clamav+= clamav>=0.88nb1
+BUILDLINK_API_DEPENDS.clamav+= clamav>=0.60nb1
+BUILDLINK_ABI_DEPENDS.clamav+= clamav>=0.88nb1
BUILDLINK_PKGSRCDIR.clamav?= ../../mail/clamav
.endif # CLAMAV_BUILDLINK3_MK
diff --git a/mail/dk-milter/Makefile b/mail/dk-milter/Makefile
index 32511525fd1..ac7ff2e99b4 100644
--- a/mail/dk-milter/Makefile
+++ b/mail/dk-milter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/03/22 22:50:32 tv Exp $
+# $NetBSD: Makefile,v 1.7 2006/04/06 06:22:16 reed Exp $
DISTNAME= dk-milter-0.3.0
PKGREVISION= 1
@@ -9,7 +9,7 @@ MAINTAINER= tv@NetBSD.org
HOMEPAGE= http://sendmail.net/dk-milter/
COMMENT= Open source implementation of DomainKeys for sendmail
-BUILDLINK_DEPENDS.libmilter+= libmilter>=8.13.0
+BUILDLINK_API_DEPENDS.libmilter+= libmilter>=8.13.0
LICENSE= no-profit
MAKE_ENV+= M4=${M4:Q}
diff --git a/mail/dkim-milter/Makefile b/mail/dkim-milter/Makefile
index 232dbc9851b..3f6c4dfa327 100644
--- a/mail/dkim-milter/Makefile
+++ b/mail/dkim-milter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/01/08 18:20:30 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2006/04/06 06:22:16 reed Exp $
DISTNAME= dkim-milter-0.1.1
CATEGORIES= mail
@@ -8,7 +8,7 @@ MAINTAINER= imil@gcu.info
HOMEPAGE= http://sourceforge.net/projects/dkim-milter/
COMMENT= Open source DKIM filter software from Sendmail, Inc
-BUILDLINK_DEPENDS.libmilter+= libmilter>=8.13.0
+BUILDLINK_API_DEPENDS.libmilter+= libmilter>=8.13.0
LICENSE= no-profit
MAKE_ENV+= M4=${M4:Q}
diff --git a/mail/drac/buildlink3.mk b/mail/drac/buildlink3.mk
index f90f96c5b7f..51db9e7a8d6 100644
--- a/mail/drac/buildlink3.mk
+++ b/mail/drac/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/04/25 01:06:29 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:16 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
DRAC_BUILDLINK3_MK:= ${DRAC_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndrac}
BUILDLINK_PACKAGES+= drac
.if !empty(DRAC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.drac+= drac>=1.10
+BUILDLINK_API_DEPENDS.drac+= drac>=1.10
BUILDLINK_PKGSRCDIR.drac?= ../../mail/drac
BUILDLINK_DEPMETHOD.drac?= build
.endif # DRAC_BUILDLINK3_MK
diff --git a/mail/evolution-data-server/Makefile b/mail/evolution-data-server/Makefile
index 2863336679c..9033491227b 100644
--- a/mail/evolution-data-server/Makefile
+++ b/mail/evolution-data-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2006/03/30 21:15:27 jmmv Exp $
+# $NetBSD: Makefile,v 1.36 2006/04/06 06:22:17 reed Exp $
#
DISTNAME= evolution-data-server-1.6.0
@@ -13,7 +13,7 @@ COMMENT= Evolution data server
BUILD_USES_MSGFMT= yes
USE_MSGFMT_PLURALS= yes
-BUILDLINK_DEPENDS.libsoup-devel+= libsoup-devel>=2.2.3
+BUILDLINK_API_DEPENDS.libsoup-devel+= libsoup-devel>=2.2.3
GNU_CONFIGURE= YES
USE_DIRS+= xdg-1.1
diff --git a/mail/evolution-data-server/buildlink3.mk b/mail/evolution-data-server/buildlink3.mk
index 26b148bb72d..f802b31c1ce 100644
--- a/mail/evolution-data-server/buildlink3.mk
+++ b/mail/evolution-data-server/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/02/05 23:09:54 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2006/04/06 06:22:18 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
EVOLUTION_DATA_SERVER_BUILDLINK3_MK:= ${EVOLUTION_DATA_SERVER_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nevolution-data-server}
BUILDLINK_PACKAGES+= evolution-data-server
.if !empty(EVOLUTION_DATA_SERVER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.evolution-data-server+= evolution-data-server>=1.4.2.1nb1
-BUILDLINK_RECOMMENDED.evolution-data-server?= evolution-data-server>=1.4.2.1nb3
+BUILDLINK_API_DEPENDS.evolution-data-server+= evolution-data-server>=1.4.2.1nb1
+BUILDLINK_ABI_DEPENDS.evolution-data-server?= evolution-data-server>=1.4.2.1nb3
BUILDLINK_PKGSRCDIR.evolution-data-server?= ../../mail/evolution-data-server
.endif # EVOLUTION_DATA_SERVER_BUILDLINK3_MK
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 12105387d59..35a861b52ea 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.105 2006/04/01 16:13:56 jmmv Exp $
+# $NetBSD: Makefile,v 1.106 2006/04/06 06:22:16 reed Exp $
DISTNAME= evolution-2.6.0
PKGREVISION= 2
@@ -82,7 +82,7 @@ PRINT_PLIST_AWK+= /smime/ { print "$${HAVE_SMIME}" $$0; next; }
# add rpath flags to the dependency_libs, but there is an strange comment
# in the wrapper saying that it shouldn't.
LDFLAGS+= ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.nss}/lib/nss
-BUILDLINK_DEPENDS.nss+= nss>=3.9.2nb3
+BUILDLINK_API_DEPENDS.nss+= nss>=3.9.2nb3
. include "../../devel/nspr/buildlink3.mk"
. include "../../devel/nss/buildlink3.mk"
@@ -108,9 +108,9 @@ GCONF2_SCHEMAS+= evolution-mail-2.6.schemas
BUILDLINK_TRANSFORM+= rm:-DG_DISABLE_DEPRECATED
BUILDLINK_TRANSFORM+= rm:-DGTK_DISABLE_DEPRECATED
-BUILDLINK_DEPENDS.evolution-data-server+= evolution-data-server>=1.4.1
-BUILDLINK_DEPENDS.glib2+= glib2>=2.4.0nb2
-BUILDLINK_DEPENDS.libsoup-devel+= libsoup-devel>=2.2.3
+BUILDLINK_API_DEPENDS.evolution-data-server+= evolution-data-server>=1.4.1
+BUILDLINK_API_DEPENDS.glib2+= glib2>=2.4.0nb2
+BUILDLINK_API_DEPENDS.libsoup-devel+= libsoup-devel>=2.2.3
.if !exists(/usr/include/semaphore.h)
LDFLAGS+= -lsemaphore
diff --git a/mail/evolution/buildlink3.mk b/mail/evolution/buildlink3.mk
index 53a05c53c66..fea01c48bf9 100644
--- a/mail/evolution/buildlink3.mk
+++ b/mail/evolution/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/03/30 21:37:01 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:22:17 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
EVOLUTION_BUILDLINK3_MK:= ${EVOLUTION_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nevolution}
BUILDLINK_PACKAGES+= evolution
.if !empty(EVOLUTION_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.evolution+= evolution>=2.6.0
+BUILDLINK_API_DEPENDS.evolution+= evolution>=2.6.0
BUILDLINK_PKGSRCDIR.evolution?= ../../mail/evolution
.endif # EVOLUTION_BUILDLINK3_MK
diff --git a/mail/faces/buildlink3.mk b/mail/faces/buildlink3.mk
index 3854751db34..deb9c245616 100644
--- a/mail/faces/buildlink3.mk
+++ b/mail/faces/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:09:54 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:18 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
FACES_BUILDLINK3_MK:= ${FACES_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfaces}
BUILDLINK_PACKAGES+= faces
.if !empty(FACES_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.faces+= faces>=1.6.1nb1
-BUILDLINK_RECOMMENDED.faces+= faces>=1.6.1nb4
+BUILDLINK_API_DEPENDS.faces+= faces>=1.6.1nb1
+BUILDLINK_ABI_DEPENDS.faces+= faces>=1.6.1nb4
BUILDLINK_PKGSRCDIR.faces?= ../../mail/faces
.endif # FACES_BUILDLINK3_MK
diff --git a/mail/gmime/buildlink3.mk b/mail/gmime/buildlink3.mk
index 8ed2d5dacca..1696880468e 100644
--- a/mail/gmime/buildlink3.mk
+++ b/mail/gmime/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:09:55 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:18 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GMIME_BUILDLINK3_MK:= ${GMIME_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngmime}
BUILDLINK_PACKAGES+= gmime
.if !empty(GMIME_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gmime+= gmime>=2.1.7
-BUILDLINK_RECOMMENDED.gmime+= gmime>=2.1.9nb1
+BUILDLINK_API_DEPENDS.gmime+= gmime>=2.1.7
+BUILDLINK_ABI_DEPENDS.gmime+= gmime>=2.1.9nb1
BUILDLINK_PKGSRCDIR.gmime?= ../../mail/gmime
.endif # GMIME_BUILDLINK3_MK
diff --git a/mail/imap-uw-utils/Makefile b/mail/imap-uw-utils/Makefile
index 1a635c4c40a..b11802891bd 100644
--- a/mail/imap-uw-utils/Makefile
+++ b/mail/imap-uw-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/03/04 21:30:00 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2006/04/06 06:22:18 reed Exp $
DISTNAME= imap-utils
PKGNAME= imap-uw-utils-20050108
@@ -12,7 +12,7 @@ COMMENT= UW IMAP mailbox utilities
DIST_SUBDIR= ${PKGNAME_NOREV}
-BUILDLINK_DEPENDS.imap-uw+= imap-uw>=2004c1nb1
+BUILDLINK_API_DEPENDS.imap-uw+= imap-uw>=2004c1nb1
SRCDIRS= icat ifrom
diff --git a/mail/imap-uw/buildlink3.mk b/mail/imap-uw/buildlink3.mk
index 0b7e6e4ffa2..fbbcfd0c433 100644
--- a/mail/imap-uw/buildlink3.mk
+++ b/mail/imap-uw/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2005/10/05 15:49:44 salo Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:18 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
IMAP_UW_BUILDLINK3_MK:= ${IMAP_UW_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nimap-uw}
BUILDLINK_PACKAGES+= imap-uw
.if !empty(IMAP_UW_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.imap-uw+= imap-uw>=2004
-BUILDLINK_RECOMMENDED.imap-uw+= imap-uw>=2004enb1
+BUILDLINK_API_DEPENDS.imap-uw+= imap-uw>=2004
+BUILDLINK_ABI_DEPENDS.imap-uw+= imap-uw>=2004enb1
BUILDLINK_PKGSRCDIR.imap-uw?= ../../mail/imap-uw
#
# Make "-limapuw" resolve into "-lc-client".
diff --git a/mail/libesmtp/buildlink3.mk b/mail/libesmtp/buildlink3.mk
index 45a8bc1b3cb..5ef14ccaec9 100644
--- a/mail/libesmtp/buildlink3.mk
+++ b/mail/libesmtp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:09:55 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:18 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBESMTP_BUILDLINK3_MK:= ${LIBESMTP_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibesmtp}
BUILDLINK_PACKAGES+= libesmtp
.if !empty(LIBESMTP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libesmtp+= libesmtp>=1.0rc1nb1
-BUILDLINK_RECOMMENDED.libesmtp?= libesmtp>=1.0.3nb2
+BUILDLINK_API_DEPENDS.libesmtp+= libesmtp>=1.0rc1nb1
+BUILDLINK_ABI_DEPENDS.libesmtp?= libesmtp>=1.0.3nb2
BUILDLINK_PKGSRCDIR.libesmtp?= ../../mail/libesmtp
LIBESMTP= -lesmtp
diff --git a/mail/libetpan/buildlink3.mk b/mail/libetpan/buildlink3.mk
index 9a16e45ebe3..1ab3904b768 100644
--- a/mail/libetpan/buildlink3.mk
+++ b/mail/libetpan/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/03/08 06:33:31 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:18 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBETPAN_BUILDLINK3_MK:= ${LIBETPAN_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibetpan}
BUILDLINK_PACKAGES+= libetpan
.if !empty(LIBETPAN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libetpan+= libetpan>=0.38nb1
-BUILDLINK_RECOMMENDED.libetpan?= libetpan>=0.43
+BUILDLINK_API_DEPENDS.libetpan+= libetpan>=0.38nb1
+BUILDLINK_ABI_DEPENDS.libetpan?= libetpan>=0.43
BUILDLINK_PKGSRCDIR.libetpan?= ../../mail/libetpan
.endif # LIBETPAN_BUILDLINK3_MK
diff --git a/mail/libmilter/buildlink3.mk b/mail/libmilter/buildlink3.mk
index a0edff9607e..a28cf38f9bb 100644
--- a/mail/libmilter/buildlink3.mk
+++ b/mail/libmilter/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/08/30 20:26:18 adrianp Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:18 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBMILTER_BUILDLINK3_MK:= ${LIBMILTER_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmilter}
BUILDLINK_PACKAGES+= libmilter
.if !empty(LIBMILTER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmilter+= libmilter>=8.13.1
+BUILDLINK_API_DEPENDS.libmilter+= libmilter>=8.13.1
BUILDLINK_PKGSRCDIR.libmilter?= ../../mail/libmilter
BUILDLINK_DEPMETHOD.libmilter?= build
diff --git a/mail/libmilter/builtin.mk b/mail/libmilter/builtin.mk
index c88d7f68818..a7553209741 100644
--- a/mail/libmilter/builtin.mk
+++ b/mail/libmilter/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.4 2006/03/30 18:06:18 jlam Exp $
+# $NetBSD: builtin.mk,v 1.5 2006/04/06 06:22:18 reed Exp $
BUILTIN_PKG:= libmilter
@@ -34,7 +34,7 @@ USE_BUILTIN.libmilter= ${IS_BUILTIN.libmilter}
. if defined(BUILTIN_PKG.libmilter) && \
!empty(IS_BUILTIN.libmilter:M[yY][eE][sS])
USE_BUILTIN.libmilter= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.libmilter}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.libmilter}
. if !empty(USE_BUILTIN.libmilter:M[yY][eE][sS])
USE_BUILTIN.libmilter!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.libmilter:Q}; then \
diff --git a/mail/libmilter812/buildlink3.mk b/mail/libmilter812/buildlink3.mk
index 133d3e3f3f1..6d55fddde59 100644
--- a/mail/libmilter812/buildlink3.mk
+++ b/mail/libmilter812/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/08/30 20:53:20 adrianp Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:18 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBMILTER_BUILDLINK3_MK:= ${LIBMILTER_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmilter}
BUILDLINK_PACKAGES+= libmilter
.if !empty(LIBMILTER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmilter+= libmilter>=8.12.9nb1
+BUILDLINK_API_DEPENDS.libmilter+= libmilter>=8.12.9nb1
BUILDLINK_PKGSRCDIR.libmilter?= ../../mail/libmilter812
BUILDLINK_DEPMETHOD.libmilter?= build
diff --git a/mail/libmilter812/builtin.mk b/mail/libmilter812/builtin.mk
index a15ac0e408e..2a3d6e239eb 100644
--- a/mail/libmilter812/builtin.mk
+++ b/mail/libmilter812/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.3 2006/03/30 18:06:18 jlam Exp $
+# $NetBSD: builtin.mk,v 1.4 2006/04/06 06:22:18 reed Exp $
BUILTIN_PKG:= libmilter
@@ -34,7 +34,7 @@ USE_BUILTIN.libmilter= ${IS_BUILTIN.libmilter}
. if defined(BUILTIN_PKG.libmilter) && \
!empty(IS_BUILTIN.libmilter:M[yY][eE][sS])
USE_BUILTIN.libmilter= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.libmilter}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.libmilter}
. if !empty(USE_BUILTIN.libmilter:M[yY][eE][sS])
USE_BUILTIN.libmilter!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.libmilter:Q}; then \
diff --git a/mail/libspf-alt/Makefile b/mail/libspf-alt/Makefile
index e8fa66b89bb..bb745b5a084 100644
--- a/mail/libspf-alt/Makefile
+++ b/mail/libspf-alt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/02/05 23:09:55 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2006/04/06 06:22:18 reed Exp $
DISTNAME= libspf_alt-0.4.0
PKGREVISION= 3
@@ -9,7 +9,7 @@ MAINTAINER= manu@NetBSD.org
HOMEPAGE= http://www.midwestcs.com/spf/libspf-alt/
COMMENT= Sender Permitted Framework (SPF) library
-BUILDLINK_DEPENDS.bind+= bind>=9.2.3nb3
+BUILDLINK_API_DEPENDS.bind+= bind>=9.2.3nb3
GNU_CONFIGURE= YES
CONFIGURE_ARGS+=--with-bind=${BUILDLINK_PREFIX.bind}
diff --git a/mail/libspf-alt/buildlink3.mk b/mail/libspf-alt/buildlink3.mk
index 07bcd12fc1a..fdb7b63f076 100644
--- a/mail/libspf-alt/buildlink3.mk
+++ b/mail/libspf-alt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:09:55 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:18 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBSPF_ALT_BUILDLINK3_MK:= ${LIBSPF_ALT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibspf_alt}
BUILDLINK_PACKAGES+= libspf_alt
.if !empty(LIBSPF_ALT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libspf_alt+= libspf_alt>=0.4.0nb1
-BUILDLINK_RECOMMENDED.libspf_alt+= libspf_alt>=0.4.0nb3
+BUILDLINK_API_DEPENDS.libspf_alt+= libspf_alt>=0.4.0nb1
+BUILDLINK_ABI_DEPENDS.libspf_alt+= libspf_alt>=0.4.0nb3
BUILDLINK_PKGSRCDIR.libspf_alt?= ../../mail/libspf-alt
.endif # LIBSPF_ALT_BUILDLINK3_MK
diff --git a/mail/p5-Mail-ClamAV/Makefile b/mail/p5-Mail-ClamAV/Makefile
index 8d6f2459217..3e73c2036fa 100644
--- a/mail/p5-Mail-ClamAV/Makefile
+++ b/mail/p5-Mail-ClamAV/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/03/04 21:30:01 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2006/04/06 06:22:19 reed Exp $
DISTNAME= Mail-ClamAV-0.17
PKGNAME= p5-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT= Perl5 module for mail/clamav virus scanner
DEPENDS+= p5-Inline>=0.40:../../devel/p5-Inline
# this version needs clamav>=0.80
-BUILDLINK_DEPENDS.clamav+= clamav>=0.80
+BUILDLINK_API_DEPENDS.clamav+= clamav>=0.80
PERL5_PACKLIST= auto/Mail/ClamAV/.packlist
PTHREAD_OPTS+= require
diff --git a/mail/perdition/buildlink3.mk b/mail/perdition/buildlink3.mk
index 1743730b770..01273a4b832 100644
--- a/mail/perdition/buildlink3.mk
+++ b/mail/perdition/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:09:57 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:19 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PERDITION_BUILDLINK3_MK:= ${PERDITION_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nperdition}
BUILDLINK_PACKAGES+= perdition
.if !empty(PERDITION_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.perdition+= perdition>=1.17
-BUILDLINK_RECOMMENDED.perdition?= perdition>=1.17nb1
+BUILDLINK_API_DEPENDS.perdition+= perdition>=1.17
+BUILDLINK_ABI_DEPENDS.perdition?= perdition>=1.17nb1
BUILDLINK_PKGSRCDIR.perdition?= ../../mail/perdition
.endif # PERDITION_BUILDLINK3_MK
diff --git a/mail/pine/Makefile b/mail/pine/Makefile
index ff2300028ae..68ffac5633e 100644
--- a/mail/pine/Makefile
+++ b/mail/pine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.109 2006/03/04 21:30:01 jlam Exp $
+# $NetBSD: Makefile,v 1.110 2006/04/06 06:22:19 reed Exp $
DISTNAME= pine4.64
PKGNAME= pine-4.64
@@ -104,7 +104,7 @@ do-install:
${CHMOD} +x ${PREFIX}/share/pine/contrib/utils/*.sh
# 2004e contains extensions needed by Pine 4.63
-BUILDLINK_DEPENDS.imap-uw+= imap-uw>=2004e
+BUILDLINK_API_DEPENDS.imap-uw+= imap-uw>=2004e
.include "../../mail/imap-uw/buildlink3.mk"
.include "../../devel/ncurses/buildlink3.mk"
diff --git a/mail/squirrelmail/buildlink3.mk b/mail/squirrelmail/buildlink3.mk
index 156d5f8a9f8..ff32e511a71 100644
--- a/mail/squirrelmail/buildlink3.mk
+++ b/mail/squirrelmail/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/27 07:12:13 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:19 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SQUIRRELMAIL_BUILDLINK3_MK:= ${SQUIRRELMAIL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsquirrelmail}
BUILDLINK_PACKAGES+= squirrelmail
.if !empty(SQUIRRELMAIL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.squirrelmail+= {ja-,}squirrelmail>=1.4.6
-BUILDLINK_RECOMMENDED.squirrelmail?= squirrelmail>=1.4.6
+BUILDLINK_API_DEPENDS.squirrelmail+= {ja-,}squirrelmail>=1.4.6
+BUILDLINK_ABI_DEPENDS.squirrelmail?= squirrelmail>=1.4.6
BUILDLINK_PKGSRCDIR.squirrelmail?= ../../mail/squirrelmail
.endif # SQUIRRELMAIL_BUILDLINK3_MK
diff --git a/mail/sylpheed-claws/buildlink3.mk b/mail/sylpheed-claws/buildlink3.mk
index 278ed41bfa9..9dcaff955f1 100644
--- a/mail/sylpheed-claws/buildlink3.mk
+++ b/mail/sylpheed-claws/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:09:58 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:19 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SYLPHEED_CLAWS_BUILDLINK3_MK:= ${SYLPHEED_CLAWS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsylpheed-claws}
BUILDLINK_PACKAGES+= sylpheed-claws
.if !empty(SYLPHEED_CLAWS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.sylpheed-claws+= sylpheed-claws>=0.9.7nb1
-BUILDLINK_RECOMMENDED.sylpheed-claws?= sylpheed-claws>=1.0.4nb1
+BUILDLINK_API_DEPENDS.sylpheed-claws+= sylpheed-claws>=0.9.7nb1
+BUILDLINK_ABI_DEPENDS.sylpheed-claws?= sylpheed-claws>=1.0.4nb1
BUILDLINK_PKGSRCDIR.sylpheed-claws?= ../../mail/sylpheed-claws
.endif # SYLPHEED_CLAWS_BUILDLINK3_MK
diff --git a/math/R/Makefile b/math/R/Makefile
index 2d04fd55d99..ed1c811b363 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2006/03/05 16:27:27 jlam Exp $
+# $NetBSD: Makefile,v 1.82 2006/04/06 06:22:19 reed Exp $
DISTNAME= R-2.2.1
PKGREVISION= 2
@@ -78,7 +78,7 @@ PLIST_SRC= ${WRKDIR}/.PLIST_SRC
R_LIBDIR= ${PREFIX}/lib/R
R_INSTALL_DIRS= ${R_LIBDIR}
-BUILDLINK_DEPENDS.zlib+= zlib>=1.2.1
+BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.1
.if ${OPSYS} == "NetBSD" && !empty(OS_VERSION:M1.[0-6]*)
CONFIGURE_ARGS+= --enable-mbcs=no
diff --git a/math/R/buildlink3.mk b/math/R/buildlink3.mk
index cbea7d9b627..f0de34c5fc5 100644
--- a/math/R/buildlink3.mk
+++ b/math/R/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:09:59 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:19 reed Exp $
# XXX BUILDLINK_DEPMETHOD.R?= build
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NR}
BUILDLINK_PACKAGES+= R
.if !empty(R_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.R+= R>=1.7.0
-BUILDLINK_RECOMMENDED.R?= R>=2.2.1nb2
+BUILDLINK_API_DEPENDS.R+= R>=1.7.0
+BUILDLINK_ABI_DEPENDS.R?= R>=2.2.1nb2
BUILDLINK_PKGSRCDIR.R?= ../../math/R
.endif # R_BUILDLINK3_MK
diff --git a/math/blas/buildlink3.mk b/math/blas/buildlink3.mk
index 7431b3dc893..60393f5a54b 100644
--- a/math/blas/buildlink3.mk
+++ b/math/blas/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:12:55 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:19 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
BLAS_BUILDLINK3_MK:= ${BLAS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nblas}
BUILDLINK_PACKAGES+= blas
.if !empty(BLAS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.blas+= blas>=1.0nb2
-BUILDLINK_RECOMMENDED.blas+= blas>=1.0nb3
+BUILDLINK_API_DEPENDS.blas+= blas>=1.0nb2
+BUILDLINK_ABI_DEPENDS.blas+= blas>=1.0nb3
BUILDLINK_PKGSRCDIR.blas?= ../../math/blas
.endif # BLAS_BUILDLINK3_MK
diff --git a/math/cln/buildlink3.mk b/math/cln/buildlink3.mk
index 8f965f42f9a..6de742bc988 100644
--- a/math/cln/buildlink3.mk
+++ b/math/cln/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/03/12 16:33:32 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:19 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
CLN_BUILDLINK3_MK:= ${CLN_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncln}
BUILDLINK_PACKAGES+= cln
.if !empty(CLN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.cln+= cln>=1.1.6
-BUILDLINK_RECOMMENDED.cln+= cln>=1.1.9nb1
+BUILDLINK_API_DEPENDS.cln+= cln>=1.1.6
+BUILDLINK_ABI_DEPENDS.cln+= cln>=1.1.9nb1
BUILDLINK_PKGSRCDIR.cln?= ../../math/cln
.endif # CLN_BUILDLINK3_MK
diff --git a/math/djbfft/buildlink3.mk b/math/djbfft/buildlink3.mk
index 012b340c234..9929f57a9d4 100644
--- a/math/djbfft/buildlink3.mk
+++ b/math/djbfft/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/04/18 17:51:41 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:20 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
DJBFFT_BUILDLINK3_MK:= ${DJBFFT_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndjbfft}
BUILDLINK_PACKAGES+= djbfft
.if !empty(DJBFFT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.djbfft+= djbfft>=0.76
+BUILDLINK_API_DEPENDS.djbfft+= djbfft>=0.76
BUILDLINK_PKGSRCDIR.djbfft?= ../../math/djbfft
BUILDLINK_DEPMETHOD.djbfft?= build
.endif # DJBFFT_BUILDLINK3_MK
diff --git a/math/fftw/buildlink3.mk b/math/fftw/buildlink3.mk
index c3dddaf04f8..cdac914f88f 100644
--- a/math/fftw/buildlink3.mk
+++ b/math/fftw/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:10:01 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:20 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
FFTW_BUILDLINK3_MK:= ${FFTW_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfftw}
BUILDLINK_PACKAGES+= fftw
.if !empty(FFTW_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.fftw+= fftw>=3.0
-BUILDLINK_RECOMMENDED.fftw+= fftw>=3.1nb1
+BUILDLINK_API_DEPENDS.fftw+= fftw>=3.0
+BUILDLINK_ABI_DEPENDS.fftw+= fftw>=3.1nb1
BUILDLINK_PKGSRCDIR.fftw?= ../../math/fftw
.endif # FFTW_BUILDLINK3_MK
diff --git a/math/fftw2/buildlink3.mk b/math/fftw2/buildlink3.mk
index 88a43929fb1..d2a9628bfa3 100644
--- a/math/fftw2/buildlink3.mk
+++ b/math/fftw2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:01 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:20 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
FFTW2_BUILDLINK3_MK:= ${FFTW2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfftw2}
BUILDLINK_PACKAGES+= fftw2
.if !empty(FFTW2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.fftw2+= fftw2>=2.1.3
-BUILDLINK_RECOMMENDED.fftw2?= fftw2>=2.1.5nb2
+BUILDLINK_API_DEPENDS.fftw2+= fftw2>=2.1.3
+BUILDLINK_ABI_DEPENDS.fftw2?= fftw2>=2.1.5nb2
BUILDLINK_PKGSRCDIR.fftw2?= ../../math/fftw2
.endif # FFTW2_BUILDLINK3_MK
diff --git a/math/fftwf/buildlink3.mk b/math/fftwf/buildlink3.mk
index fb4253a2a74..4a06c57e282 100644
--- a/math/fftwf/buildlink3.mk
+++ b/math/fftwf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:10:01 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:20 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
FFTWF_BUILDLINK3_MK:= ${FFTWF_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfftwf}
BUILDLINK_PACKAGES+= fftwf
.if !empty(FFTWF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.fftwf+= fftwf>=3.0
-BUILDLINK_RECOMMENDED.fftwf+= fftwf>=3.0.1nb1
+BUILDLINK_API_DEPENDS.fftwf+= fftwf>=3.0
+BUILDLINK_ABI_DEPENDS.fftwf+= fftwf>=3.0.1nb1
BUILDLINK_PKGSRCDIR.fftwf?= ../../math/fftwf
.endif # FFTWF_BUILDLINK3_MK
diff --git a/math/glpk/buildlink3.mk b/math/glpk/buildlink3.mk
index 34988dc3b6f..fc2a395d849 100644
--- a/math/glpk/buildlink3.mk
+++ b/math/glpk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:10:02 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:20 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GLPK_BUILDLINK3_MK:= ${GLPK_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nglpk}
BUILDLINK_PACKAGES+= glpk
.if !empty(GLPK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.glpk+= glpk>=4.8nb1
-BUILDLINK_RECOMMENDED.glpk?= glpk>=4.9nb1
+BUILDLINK_API_DEPENDS.glpk+= glpk>=4.8nb1
+BUILDLINK_ABI_DEPENDS.glpk?= glpk>=4.9nb1
BUILDLINK_PKGSRCDIR.glpk?= ../../math/glpk
.endif # GLPK_BUILDLINK3_MK
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 49e992f23a1..21445da7832 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.109 2006/04/02 22:49:10 wiz Exp $
+# $NetBSD: Makefile,v 1.110 2006/04/06 06:22:20 reed Exp $
#
DISTNAME= gnumeric-1.6.3
@@ -48,9 +48,9 @@ PLIST_SUBST+= PERL="@comment "
BUILDLINK_DEPENDS.goffice+= goffice>=0.2.1
.include "../../misc/goffice/buildlink3.mk"
.include "../../net/ORBit2/buildlink3.mk"
-BUILDLINK_DEPENDS.libgnomeprint+= libgnomeprint>=2.8.2
+BUILDLINK_API_DEPENDS.libgnomeprint+= libgnomeprint>=2.8.2
.include "../../print/libgnomeprint/buildlink3.mk"
-BUILDLINK_DEPENDS.libgnomeprintui+= libgnomeprintui>=2.8.2
+BUILDLINK_API_DEPENDS.libgnomeprintui+= libgnomeprintui>=2.8.2
.include "../../print/libgnomeprintui/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
diff --git a/math/gsl/buildlink3.mk b/math/gsl/buildlink3.mk
index 67a96119df4..668b11f86e7 100644
--- a/math/gsl/buildlink3.mk
+++ b/math/gsl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:12:56 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:20 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GSL_BUILDLINK3_MK:= ${GSL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngsl}
BUILDLINK_PACKAGES+= gsl
.if !empty(GSL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gsl+= gsl>=1.4
-BUILDLINK_RECOMMENDED.gsl+= gsl>=1.5nb1
+BUILDLINK_API_DEPENDS.gsl+= gsl>=1.4
+BUILDLINK_ABI_DEPENDS.gsl+= gsl>=1.5nb1
BUILDLINK_PKGSRCDIR.gsl?= ../../math/gsl
.endif # GSL_BUILDLINK3_MK
diff --git a/math/guppi/buildlink3.mk b/math/guppi/buildlink3.mk
index f7d6f848928..fba50e1af48 100644
--- a/math/guppi/buildlink3.mk
+++ b/math/guppi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:10:02 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:20 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GUPPI_BUILDLINK3_MK:= ${GUPPI_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nguppi}
BUILDLINK_PACKAGES+= guppi
.if !empty(GUPPI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.guppi+= guppi>=0.40.3nb13
-BUILDLINK_RECOMMENDED.guppi?= guppi>=0.40.3nb15
+BUILDLINK_API_DEPENDS.guppi+= guppi>=0.40.3nb13
+BUILDLINK_ABI_DEPENDS.guppi?= guppi>=0.40.3nb15
BUILDLINK_PKGSRCDIR.guppi?= ../../math/guppi
.endif # GUPPI_BUILDLINK3_MK
diff --git a/math/lapack/buildlink3.mk b/math/lapack/buildlink3.mk
index 7974d4815b7..abd50dd17c6 100644
--- a/math/lapack/buildlink3.mk
+++ b/math/lapack/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:12:56 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:20 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LAPACK_BUILDLINK3_MK:= ${LAPACK_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlapack}
BUILDLINK_PACKAGES+= lapack
.if !empty(LAPACK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.lapack+= lapack>=20010201nb1
-BUILDLINK_RECOMMENDED.lapack+= lapack>=20010201nb2
+BUILDLINK_API_DEPENDS.lapack+= lapack>=20010201nb1
+BUILDLINK_ABI_DEPENDS.lapack+= lapack>=20010201nb2
BUILDLINK_PKGSRCDIR.lapack?= ../../math/lapack
.endif # LAPACK_BUILDLINK3_MK
diff --git a/math/libffm/buildlink3.mk b/math/libffm/buildlink3.mk
index 6ce5ccfbac5..6d3e8a356bd 100644
--- a/math/libffm/buildlink3.mk
+++ b/math/libffm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:02 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:20 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBFFM_BUILDLINK3_MK:= ${LIBFFM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibffm}
BUILDLINK_PACKAGES+= libffm
.if !empty(LIBFFM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libffm+= libffm>=0.28
-BUILDLINK_RECOMMENDED.libffm?= libffm>=0.28nb1
+BUILDLINK_API_DEPENDS.libffm+= libffm>=0.28
+BUILDLINK_ABI_DEPENDS.libffm?= libffm>=0.28nb1
BUILDLINK_PKGSRCDIR.libffm?= ../../math/libffm
.endif # LIBFFM_BUILDLINK3_MK
diff --git a/math/libmatheval/buildlink3.mk b/math/libmatheval/buildlink3.mk
index 3fea36eb2c5..23d2fd66e9c 100644
--- a/math/libmatheval/buildlink3.mk
+++ b/math/libmatheval/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:10:02 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:20 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBMATHEVAL_BUILDLINK3_MK:= ${LIBMATHEVAL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmatheval}
BUILDLINK_PACKAGES+= libmatheval
.if !empty(LIBMATHEVAL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmatheval+= libmatheval>=1.1.0
-BUILDLINK_RECOMMENDED.libmatheval+= libmatheval>=1.1.1nb3
+BUILDLINK_API_DEPENDS.libmatheval+= libmatheval>=1.1.0
+BUILDLINK_ABI_DEPENDS.libmatheval+= libmatheval>=1.1.1nb3
BUILDLINK_PKGSRCDIR.libmatheval?= ../../math/libmatheval
.endif # LIBMATHEVAL_BUILDLINK3_MK
diff --git a/math/ltm/buildlink3.mk b/math/ltm/buildlink3.mk
index 5cb2fc7505c..25fa897c23c 100644
--- a/math/ltm/buildlink3.mk
+++ b/math/ltm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:10:03 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:20 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LTM_BUILDLINK3_MK:= ${LTM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nltm}
BUILDLINK_PACKAGES+= ltm
.if !empty(LTM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ltm+= ltm>=0.30
-BUILDLINK_RECOMMENDED.ltm?= ltm>=0.30nb1
+BUILDLINK_API_DEPENDS.ltm+= ltm>=0.30
+BUILDLINK_ABI_DEPENDS.ltm?= ltm>=0.30nb1
BUILDLINK_PKGSRCDIR.ltm?= ../../math/ltm
BUILDLINK_DEPMETHOD.ltm?= build
.endif # LTM_BUILDLINK3_MK
diff --git a/math/mathomatic/Makefile b/math/mathomatic/Makefile
index f2d35c01ce1..a13088ebde3 100644
--- a/math/mathomatic/Makefile
+++ b/math/mathomatic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2006/03/26 18:45:07 minskim Exp $
+# $NetBSD: Makefile,v 1.64 2006/04/06 06:22:21 reed Exp $
#
DISTNAME= mathomatic-12.5.12
@@ -19,7 +19,7 @@ CFLAGS.SunOS+= -DSOLARIS
INSTALLATION_DIRS= bin man/man1
-BUILDLINK_DEPENDS.readline+= readline>=5.1pl1nb1
+BUILDLINK_API_DEPENDS.readline+= readline>=5.1pl1nb1
.include "../../devel/readline/buildlink3.mk"
do-install:
diff --git a/math/mpfr/buildlink3.mk b/math/mpfr/buildlink3.mk
index 11d3280d086..9ca78df53a2 100644
--- a/math/mpfr/buildlink3.mk
+++ b/math/mpfr/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/06/05 22:19:53 rh Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:21 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
MPFR_BUILDLINK3_MK:= ${MPFR_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmpfr}
BUILDLINK_PACKAGES+= mpfr
.if !empty(MPFR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.mpfr+= mpfr>=2.0.3
+BUILDLINK_API_DEPENDS.mpfr+= mpfr>=2.0.3
BUILDLINK_DEPMETHOD.mpfr?= build
BUILDLINK_PKGSRCDIR.mpfr?= ../../math/mpfr
.endif # MPFR_BUILDLINK3_MK
diff --git a/math/ntl/buildlink3.mk b/math/ntl/buildlink3.mk
index 48ac8cb72ec..04bf5900e97 100644
--- a/math/ntl/buildlink3.mk
+++ b/math/ntl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:12:57 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:21 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
NTL_BUILDLINK3_MK:= ${NTL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nntl}
BUILDLINK_PACKAGES+= ntl
.if !empty(NTL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ntl+= ntl>=5.3.1
-BUILDLINK_RECOMMENDED.ntl+= ntl>=5.3.1nb1
+BUILDLINK_API_DEPENDS.ntl+= ntl>=5.3.1
+BUILDLINK_ABI_DEPENDS.ntl+= ntl>=5.3.1nb1
BUILDLINK_PKGSRCDIR.ntl?= ../../math/ntl
.endif # NTL_BUILDLINK3_MK
diff --git a/math/octave-current/buildlink3.mk b/math/octave-current/buildlink3.mk
index 9937edf9877..b5e0e9dead2 100644
--- a/math/octave-current/buildlink3.mk
+++ b/math/octave-current/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:10:03 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:21 reed Exp $
#
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Noctave-current}
BUILDLINK_PACKAGES+= octave-current
.if !empty(OCTAVE_CURRENT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.octave-current+= octave-current>=2.1.57
-BUILDLINK_RECOMMENDED.octave-current+= octave-current>=2.9.4nb1
+BUILDLINK_API_DEPENDS.octave-current+= octave-current>=2.1.57
+BUILDLINK_ABI_DEPENDS.octave-current+= octave-current>=2.9.4nb1
BUILDLINK_PKGSRCDIR.octave-current?= ../../math/octave-current
.endif # OCTAVE_CURRENT_BUILDLINK3_MK
diff --git a/math/octave-forge/buildlink3.mk b/math/octave-forge/buildlink3.mk
index 4f8c91cee2b..49a62e842f3 100644
--- a/math/octave-forge/buildlink3.mk
+++ b/math/octave-forge/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:03 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:21 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OCTAVE_FORGE_BUILDLINK3_MK:= ${OCTAVE_FORGE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Noctave-forge}
BUILDLINK_PACKAGES+= octave-forge
.if !empty(OCTAVE_FORGE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.octave-forge+= octave-forge>=2005.06.13
-BUILDLINK_RECOMMENDED.octave-forge?= octave-forge>=2005.06.13nb1
+BUILDLINK_API_DEPENDS.octave-forge+= octave-forge>=2005.06.13
+BUILDLINK_ABI_DEPENDS.octave-forge?= octave-forge>=2005.06.13nb1
BUILDLINK_PKGSRCDIR.octave-forge?= ../../math/octave-forge
.endif # OCTAVE_FORGE_BUILDLINK3_MK
diff --git a/math/octave/buildlink3.mk b/math/octave/buildlink3.mk
index 7981f30926e..835b3363186 100644
--- a/math/octave/buildlink3.mk
+++ b/math/octave/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:10:03 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:21 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OCTAVE_BUILDLINK3_MK:= ${OCTAVE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Noctave}
BUILDLINK_PACKAGES+= octave
.if !empty(OCTAVE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.octave+= octave>=2.1.69
-BUILDLINK_RECOMMENDED.octave?= octave>=2.1.72nb1
+BUILDLINK_API_DEPENDS.octave+= octave>=2.1.69
+BUILDLINK_ABI_DEPENDS.octave?= octave>=2.1.72nb1
BUILDLINK_PKGSRCDIR.octave?= ../../math/octave
.endif # OCTAVE_BUILDLINK3_MK
diff --git a/math/pari/buildlink3.mk b/math/pari/buildlink3.mk
index 921a8af44f3..33a1d3d93a4 100644
--- a/math/pari/buildlink3.mk
+++ b/math/pari/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:03 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:21 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PARI_BUILDLINK3_MK:= ${PARI_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npari}
BUILDLINK_PACKAGES+= pari
.if !empty(PARI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pari+= pari>=2.1.5nb1
-BUILDLINK_RECOMMENDED.pari+= pari>=2.1.6nb1
+BUILDLINK_API_DEPENDS.pari+= pari>=2.1.5nb1
+BUILDLINK_ABI_DEPENDS.pari+= pari>=2.1.6nb1
BUILDLINK_PKGSRCDIR.pari?= ../../math/pari
.endif # PARI_BUILDLINK3_MK
diff --git a/math/py-Numeric/buildlink3.mk b/math/py-Numeric/buildlink3.mk
index a82e895deed..cc3533799bc 100644
--- a/math/py-Numeric/buildlink3.mk
+++ b/math/py-Numeric/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:10:03 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:22:21 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_NUMERIC_BUILDLINK3_MK:= ${PY_NUMERIC_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npynumeric}
BUILDLINK_PACKAGES+= pynumeric
.if !empty(PY_NUMERIC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pynumeric+= ${PYPKGPREFIX}-Numeric-[0-9]*
-BUILDLINK_RECOMMENDED.pynumeric?= ${PYPKGPREFIX}-Numeric>=23.7nb1
+BUILDLINK_API_DEPENDS.pynumeric+= ${PYPKGPREFIX}-Numeric-[0-9]*
+BUILDLINK_ABI_DEPENDS.pynumeric?= ${PYPKGPREFIX}-Numeric>=23.7nb1
BUILDLINK_PKGSRCDIR.pynumeric?= ../../math/py-Numeric
.endif # PY_NUMERIC_BUILDLINK3_MK
diff --git a/math/py-Scientific/Makefile b/math/py-Scientific/Makefile
index 297447e09cd..a2323c0873e 100644
--- a/math/py-Scientific/Makefile
+++ b/math/py-Scientific/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2006/03/24 10:59:19 joerg Exp $
+# $NetBSD: Makefile,v 1.27 2006/04/06 06:22:21 reed Exp $
DISTNAME= ScientificPython-2.4.5
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/Python//}
@@ -13,8 +13,8 @@ COMMENT= Python modules for scientific computing
CONFLICTS+= py-Scientific-*
-BUILDLINK_DEPENDS.python20+= python20>=2.0.1nb1
-BUILDLINK_DEPENDS.python21+= python21>=2.1.1nb1
+BUILDLINK_API_DEPENDS.python20+= python20>=2.0.1nb1
+BUILDLINK_API_DEPENDS.python21+= python21>=2.1.1nb1
PYDISTUTILSPKG= yes
PYBINMODULE= yes
diff --git a/math/py-fpconst/buildlink3.mk b/math/py-fpconst/buildlink3.mk
index 499ffdf5694..00b8d7e399f 100644
--- a/math/py-fpconst/buildlink3.mk
+++ b/math/py-fpconst/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:10:03 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:21 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_FPCONST_BUILDLINK3_MK:= ${PY_FPCONST_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npy-fpconst}
BUILDLINK_PACKAGES+= py-fpconst
.if !empty(PY_FPCONST_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.py-fpconst+= ${PYPKGPREFIX}-fpconst>=0.7.0
-BUILDLINK_RECOMMENDED.py-fpconst?= ${PYPKGPREFIX}-fpconst>=0.7.0nb1
+BUILDLINK_API_DEPENDS.py-fpconst+= ${PYPKGPREFIX}-fpconst>=0.7.0
+BUILDLINK_ABI_DEPENDS.py-fpconst?= ${PYPKGPREFIX}-fpconst>=0.7.0nb1
BUILDLINK_PKGSRCDIR.py-fpconst?= ../../math/py-fpconst
.endif # PY_FPCONST_BUILDLINK3_MK
diff --git a/math/py-numarray/buildlink3.mk b/math/py-numarray/buildlink3.mk
index aa430b09019..395563cb68c 100644
--- a/math/py-numarray/buildlink3.mk
+++ b/math/py-numarray/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:03 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:22 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_NUMARRAY_BUILDLINK3_MK:= ${PY_NUMARRAY_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npynumarray}
BUILDLINK_PACKAGES+= pynumarray
.if !empty(PY_NUMARRAY_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pynumarray+= ${PYPKGPREFIX}-numarray>=1.1.1
-BUILDLINK_RECOMMENDED.pynumarray?= ${PYPKGPREFIX}-numarray>=1.3.3nb1
+BUILDLINK_API_DEPENDS.pynumarray+= ${PYPKGPREFIX}-numarray>=1.1.1
+BUILDLINK_ABI_DEPENDS.pynumarray?= ${PYPKGPREFIX}-numarray>=1.3.3nb1
BUILDLINK_PKGSRCDIR.pynumarray?= ../../math/py-numarray
.endif # PY_NUMARRAY_BUILDLINK3_MK
diff --git a/math/py-rpy/Makefile b/math/py-rpy/Makefile
index 0acbb9d35f5..01a5691860b 100644
--- a/math/py-rpy/Makefile
+++ b/math/py-rpy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/03/04 21:30:08 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2006/04/06 06:22:22 reed Exp $
#
DISTNAME= rpy-0.4.6
@@ -13,7 +13,7 @@ COMMENT= R interface for Python
PYDISTUTILSPKG= YES
-BUILDLINK_DEPENDS.R+= R>=2.2.1
+BUILDLINK_API_DEPENDS.R+= R>=2.2.1
.include "../../lang/python/extension.mk"
.include "../../math/py-Numeric/buildlink3.mk"
diff --git a/math/qalculate/buildlink3.mk b/math/qalculate/buildlink3.mk
index e13dea8bd9d..a193a0eb9a9 100644
--- a/math/qalculate/buildlink3.mk
+++ b/math/qalculate/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:10:04 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:22 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
QALCULATE_BUILDLINK3_MK:= ${QALCULATE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nqalculate}
BUILDLINK_PACKAGES+= qalculate
.if !empty(QALCULATE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.qalculate+= qalculate>=0.8.2
-BUILDLINK_RECOMMENDED.qalculate?= qalculate>=0.8.2nb2
+BUILDLINK_API_DEPENDS.qalculate+= qalculate>=0.8.2
+BUILDLINK_ABI_DEPENDS.qalculate?= qalculate>=0.8.2nb2
BUILDLINK_PKGSRCDIR.qalculate?= ../../math/qalculate
.endif # QALCULATE_BUILDLINK3_MK
diff --git a/math/scilab/buildlink3.mk b/math/scilab/buildlink3.mk
index b8d2505bf33..360dfdc8a40 100644
--- a/math/scilab/buildlink3.mk
+++ b/math/scilab/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:10:04 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:22 reed Exp $
#
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nscilab}
BUILDLINK_PACKAGES+= scilab
.if !empty(SCILAB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.scilab+= scilab>=3.0
-BUILDLINK_RECOMMENDED.scilab?= scilab>=3.1.1nb2
+BUILDLINK_API_DEPENDS.scilab+= scilab>=3.0
+BUILDLINK_ABI_DEPENDS.scilab?= scilab>=3.1.1nb2
BUILDLINK_PKGSRCDIR.scilab?= ../../math/scilab
BUILDLINK_FILES.scilab+= lib/scilab-${SCIVERSION}/Version.incl
diff --git a/math/slatec/buildlink3.mk b/math/slatec/buildlink3.mk
index 11e3797b5bb..d8c543e4f91 100644
--- a/math/slatec/buildlink3.mk
+++ b/math/slatec/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:12:57 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:22 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SLATEC_BUILDLINK3_MK:= ${SLATEC_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nslatec}
BUILDLINK_PACKAGES+= slatec
.if !empty(SLATEC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.slatec+= slatec>=4.1nb1
-BUILDLINK_RECOMMENDED.slatec+= slatec>=4.1nb2
+BUILDLINK_API_DEPENDS.slatec+= slatec>=4.1nb1
+BUILDLINK_ABI_DEPENDS.slatec+= slatec>=4.1nb2
BUILDLINK_PKGSRCDIR.slatec?= ../../math/slatec
.endif # SLATEC_BUILDLINK3_MK
diff --git a/math/superlu/buildlink3.mk b/math/superlu/buildlink3.mk
index 0f2e771cd87..ceb87ad766d 100644
--- a/math/superlu/buildlink3.mk
+++ b/math/superlu/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/04/25 21:38:03 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:22 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SUPERLU_BUILDLINK3_MK:= ${SUPERLU_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsuperlu}
BUILDLINK_PACKAGES+= superlu
.if !empty(SUPERLU_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.superlu+= superlu>=2.0nb2
+BUILDLINK_API_DEPENDS.superlu+= superlu>=2.0nb2
BUILDLINK_PKGSRCDIR.superlu?= ../../math/superlu
BUILDLINK_DEPMETHOD.superlu?= build
.endif # SUPERLU_BUILDLINK3_MK
diff --git a/math/tasp-vsipl/buildlink3.mk b/math/tasp-vsipl/buildlink3.mk
index bfc5b25a9ea..cd8dcae1b34 100644
--- a/math/tasp-vsipl/buildlink3.mk
+++ b/math/tasp-vsipl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:10:04 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:22 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
TASP_VSIPL_BUILDLINK3_MK:= ${TASP_VSIPL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntasp-vsipl}
BUILDLINK_PACKAGES+= tasp-vsipl
.if !empty(TASP_VSIPL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tasp-vsipl+= tasp-vsipl>=20030710
-BUILDLINK_RECOMMENDED.tasp-vsipl?= tasp-vsipl>=20030710nb1
+BUILDLINK_API_DEPENDS.tasp-vsipl+= tasp-vsipl>=20030710
+BUILDLINK_ABI_DEPENDS.tasp-vsipl?= tasp-vsipl>=20030710nb1
BUILDLINK_PKGSRCDIR.tasp-vsipl?= ../../math/tasp-vsipl
.endif # TASP_VSIPL_BUILDLINK3_MK
diff --git a/math/udunits/buildlink3.mk b/math/udunits/buildlink3.mk
index f4b4c5cea9c..5cab6b5b203 100644
--- a/math/udunits/buildlink3.mk
+++ b/math/udunits/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/22 17:29:02 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:22 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
UDUNITS_BUILDLINK3_MK:= ${UDUNITS_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nudunits}
BUILDLINK_PACKAGES+= udunits
.if !empty(UDUNITS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.udunits+= udunits>=1.11.7
+BUILDLINK_API_DEPENDS.udunits+= udunits>=1.11.7
BUILDLINK_PKGSRCDIR.udunits?= ../../math/udunits
BUILDLINK_DEPMETHOD.udunits?= build
BUILDLINK_FILES.udunits= include/udunits.inc
diff --git a/math/yorick/buildlink3.mk b/math/yorick/buildlink3.mk
index 063a5faa282..e1281f0d022 100644
--- a/math/yorick/buildlink3.mk
+++ b/math/yorick/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:10:04 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:22 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
YORICK_BUILDLINK3_MK:= ${YORICK_BUILDLINK3_MK}+
@@ -11,9 +11,9 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nyorick}
BUILDLINK_PACKAGES+= yorick
.if !empty(YORICK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.yorick+= yorick>=1.5.12
+BUILDLINK_API_DEPENDS.yorick+= yorick>=1.5.12
BUILDLINK_DEPMETHOD.yorick?= build
-BUILDLINK_RECOMMENDED.yorick?= yorick>=1.6.02nb1
+BUILDLINK_ABI_DEPENDS.yorick?= yorick>=1.6.02nb1
BUILDLINK_PKGSRCDIR.yorick?= ../../math/yorick
.endif # YORICK_BUILDLINK3_MK
diff --git a/mbone/common-mml/buildlink3.mk b/mbone/common-mml/buildlink3.mk
index 8895deb04f5..c9b5aa202e1 100644
--- a/mbone/common-mml/buildlink3.mk
+++ b/mbone/common-mml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2005/04/05 10:34:00 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:22 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
COMMON_MML_BUILDLINK3_MK:= ${COMMON_MML_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncommon-mml}
BUILDLINK_PACKAGES+= common-mml
.if !empty(COMMON_MML_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.common-mml+= common-mml>=1.2.0nb1
+BUILDLINK_API_DEPENDS.common-mml+= common-mml>=1.2.0nb1
BUILDLINK_PKGSRCDIR.common-mml?= ../../mbone/common-mml
.endif # COMMON_MML_BUILDLINK3_MK
diff --git a/meta-pkgs/kde3/kde3.mk b/meta-pkgs/kde3/kde3.mk
index fb1c8ccada0..8079f16b77f 100644
--- a/meta-pkgs/kde3/kde3.mk
+++ b/meta-pkgs/kde3/kde3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: kde3.mk,v 1.12 2006/01/05 10:08:59 ghen Exp $
+# $NetBSD: kde3.mk,v 1.13 2006/04/06 06:22:23 reed Exp $
#
# This Makefile fragment is included by packages that use the KDE3
# configure-and-build process.
@@ -92,7 +92,7 @@ CONFIGURE_ENV+= xdg_directorydir="${KDEDIR}/share/desktop-directories"
_IN_ARTS_BUILD?= no
.if !empty(_IN_ARTS_BUILD:M[nN][oO])
-BUILDLINK_DEPENDS.qt3-libs+= qt3-libs>=3.3.3nb1
+BUILDLINK_API_DEPENDS.qt3-libs+= qt3-libs>=3.3.3nb1
.include "../../x11/qt3-libs/buildlink3.mk"
.endif
diff --git a/meta-pkgs/xfce4/buildlink3.mk b/meta-pkgs/xfce4/buildlink3.mk
index 04466701771..a9e01efb769 100644
--- a/meta-pkgs/xfce4/buildlink3.mk
+++ b/meta-pkgs/xfce4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/02/17 06:49:24 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/04/06 06:22:23 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_BUILDLINK3_MK:= ${XFCE4_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4}
BUILDLINK_PACKAGES+= xfce4
.if !empty(XFCE4_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4+= xfce4>=4.2.3.1
-BUILDLINK_RECOMMENDED.xfce4?= xfce4>=4.2.3.2nb2
+BUILDLINK_API_DEPENDS.xfce4+= xfce4>=4.2.3.1
+BUILDLINK_ABI_DEPENDS.xfce4?= xfce4>=4.2.3.2nb2
BUILDLINK_PKGSRCDIR.xfce4?= ../../meta-pkgs/xfce4
.endif # XFCE4_BUILDLINK3_MK
diff --git a/misc/Addresses/buildlink3.mk b/misc/Addresses/buildlink3.mk
index 92e9d476bc0..8fa3f7ac627 100644
--- a/misc/Addresses/buildlink3.mk
+++ b/misc/Addresses/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:10:06 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:23 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ADDRESSES_BUILDLINK3_MK:= ${ADDRESSES_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NAddresses}
BUILDLINK_PACKAGES+= Addresses
.if !empty(ADDRESSES_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.Addresses+= Addresses>=0.4.5
-BUILDLINK_RECOMMENDED.Addresses+= Addresses>=0.4.6nb3
+BUILDLINK_API_DEPENDS.Addresses+= Addresses>=0.4.5
+BUILDLINK_ABI_DEPENDS.Addresses+= Addresses>=0.4.6nb3
BUILDLINK_PKGSRCDIR.Addresses?= ../../misc/Addresses
.include "../../devel/gnustep-make/gnustep.mk"
diff --git a/misc/gnome2-utils/Makefile b/misc/gnome2-utils/Makefile
index 68565ed505e..86d9fb9fcf2 100644
--- a/misc/gnome2-utils/Makefile
+++ b/misc/gnome2-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2006/03/30 21:33:32 jmmv Exp $
+# $NetBSD: Makefile,v 1.54 2006/04/06 06:22:23 reed Exp $
#
DISTNAME= gnome-utils-2.14.0
@@ -29,10 +29,10 @@ GCONF2_SCHEMAS+= gnome-screenshot.schemas
GCONF2_SCHEMAS+= gnome-search-tool.schemas
GCONF2_SCHEMAS+= logview.schemas
-BUILDLINK_DEPENDS.glib2+= glib2>=2.9.1
-BUILDLINK_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.8.4
-BUILDLINK_DEPENDS.libgnome+= libgnome>=2.13.7
-BUILDLINK_DEPENDS.libgnomeui+= libgnomeui>=2.13.2
+BUILDLINK_API_DEPENDS.glib2+= glib2>=2.9.1
+BUILDLINK_API_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.8.4
+BUILDLINK_API_DEPENDS.libgnome+= libgnome>=2.13.7
+BUILDLINK_API_DEPENDS.libgnomeui+= libgnomeui>=2.13.2
.include "../../devel/GConf2/schemas.mk"
.include "../../devel/GConf2-ui/buildlink3.mk"
diff --git a/misc/goffice/Makefile b/misc/goffice/Makefile
index 3329516c6f3..475ed8fe517 100644
--- a/misc/goffice/Makefile
+++ b/misc/goffice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/03/31 14:54:22 drochner Exp $
+# $NetBSD: Makefile,v 1.8 2006/04/06 06:22:23 reed Exp $
#
DISTNAME= goffice-0.2.1
@@ -18,7 +18,7 @@ USE_TOOLS+= gmake pkg-config
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/GConf2/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
-BUILDLINK_DEPENDS.glib2+= glib2>=2.6.3
+BUILDLINK_API_DEPENDS.glib2+= glib2>=2.6.3
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
@@ -26,7 +26,7 @@ BUILDLINK_DEPENDS.glib2+= glib2>=2.6.3
.include "../../devel/pango/buildlink3.mk"
.include "../../graphics/cairo/buildlink3.mk"
.include "../../graphics/libart2/buildlink3.mk"
-BUILDLINK_DEPENDS.libgnomeprint+= libgnomeprint>=2.8.2
+BUILDLINK_API_DEPENDS.libgnomeprint+= libgnomeprint>=2.8.2
.include "../../print/libgnomeprint/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
diff --git a/misc/goffice/buildlink3.mk b/misc/goffice/buildlink3.mk
index cd47f645da2..87e1cfd5bec 100644
--- a/misc/goffice/buildlink3.mk
+++ b/misc/goffice/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:09 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:23 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GOFFICE_BUILDLINK3_MK:= ${GOFFICE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngoffice}
BUILDLINK_PACKAGES+= goffice
.if !empty(GOFFICE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.goffice+= goffice>=0.1.2
-BUILDLINK_RECOMMENDED.goffice?= goffice>=0.2.0nb1
+BUILDLINK_API_DEPENDS.goffice+= goffice>=0.1.2
+BUILDLINK_ABI_DEPENDS.goffice?= goffice>=0.2.0nb1
BUILDLINK_PKGSRCDIR.goffice?= ../../misc/goffice
.endif # GOFFICE_BUILDLINK3_MK
diff --git a/misc/kdepim3/Makefile b/misc/kdepim3/Makefile
index 440c10a295f..a1149b509ab 100644
--- a/misc/kdepim3/Makefile
+++ b/misc/kdepim3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2006/03/30 02:52:17 markd Exp $
+# $NetBSD: Makefile,v 1.59 2006/04/06 06:22:23 reed Exp $
DISTNAME= kdepim-${_KDE_VERSION}
CATEGORIES= misc
@@ -15,7 +15,7 @@ PKG_SUGGESTED_OPTIONS= sasl
.include "../../mk/bsd.options.mk"
-BUILDLINK_DEPENDS.gpgme+= gpgme>=0.4.5
+BUILDLINK_API_DEPENDS.gpgme+= gpgme>=0.4.5
REPLACE_PERL+= kmail/kmail-3.1-update-new-mail-notification-settings.pl \
kmail/kmail-3.1-use-UOID-for-identities.pl \
diff --git a/misc/kdepim3/buildlink3.mk b/misc/kdepim3/buildlink3.mk
index 80936e9e3e8..d5b5c1ed670 100644
--- a/misc/kdepim3/buildlink3.mk
+++ b/misc/kdepim3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/02/05 23:10:10 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2006/04/06 06:22:23 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
KDEPIM_BUILDLINK3_MK:= ${KDEPIM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nkdepim}
BUILDLINK_PACKAGES+= kdepim
.if !empty(KDEPIM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.kdepim+= kdepim>=3.5.0nb1
-BUILDLINK_RECOMMENDED.kdepim?= kdepim>=3.5.1nb1
+BUILDLINK_API_DEPENDS.kdepim+= kdepim>=3.5.0nb1
+BUILDLINK_ABI_DEPENDS.kdepim?= kdepim>=3.5.1nb1
BUILDLINK_PKGSRCDIR.kdepim?= ../../misc/kdepim3
.endif # KDEPIM_BUILDLINK3_MK
diff --git a/misc/koffice/buildlink3.mk b/misc/koffice/buildlink3.mk
index c3ad5d975d5..73cbb37d82c 100644
--- a/misc/koffice/buildlink3.mk
+++ b/misc/koffice/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:10:10 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:22:23 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
KOFFICE_BUILDLINK3_MK:= ${KOFFICE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nkoffice}
BUILDLINK_PACKAGES+= koffice
.if !empty(KOFFICE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.koffice?= koffice>=1.4.2nb5
-BUILDLINK_RECOMMENDED.koffice?= koffice>=1.4.2nb8
+BUILDLINK_API_DEPENDS.koffice?= koffice>=1.4.2nb5
+BUILDLINK_ABI_DEPENDS.koffice?= koffice>=1.4.2nb8
BUILDLINK_PKGSRCDIR.koffice?= ../../misc/koffice
.endif # KOFFICE_BUILDLINK3_MK
diff --git a/misc/libcdio/buildlink3.mk b/misc/libcdio/buildlink3.mk
index 917319cc01d..778926d5f85 100644
--- a/misc/libcdio/buildlink3.mk
+++ b/misc/libcdio/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:10:12 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:23 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBCDIO_BUILDLINK3_MK:= ${LIBCDIO_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibcdio}
BUILDLINK_PACKAGES+= libcdio
.if !empty(LIBCDIO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libcdio+= libcdio>=0.65
-BUILDLINK_RECOMMENDED.libcdio+= libcdio>=0.76nb1
+BUILDLINK_API_DEPENDS.libcdio+= libcdio>=0.65
+BUILDLINK_ABI_DEPENDS.libcdio+= libcdio>=0.76nb1
BUILDLINK_PKGSRCDIR.libcdio?= ../../misc/libcdio
.endif # LIBCDIO_BUILDLINK3_MK
diff --git a/misc/libutf/buildlink3.mk b/misc/libutf/buildlink3.mk
index 221bb05a51b..60b81a70ef9 100644
--- a/misc/libutf/buildlink3.mk
+++ b/misc/libutf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:00 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:24 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBUTF_BUILDLINK3_MK:= ${LIBUTF_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibutf}
BUILDLINK_PACKAGES+= libutf
.if !empty(LIBUTF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libutf+= libutf>=2.10nb1
-BUILDLINK_RECOMMENDED.libutf+= libutf>=2.10nb2
+BUILDLINK_API_DEPENDS.libutf+= libutf>=2.10nb1
+BUILDLINK_ABI_DEPENDS.libutf+= libutf>=2.10nb2
BUILDLINK_PKGSRCDIR.libutf?= ../../misc/libutf
.endif # LIBUTF_BUILDLINK3_MK
diff --git a/misc/proj/buildlink3.mk b/misc/proj/buildlink3.mk
index f4d65eca6ca..cad861a629f 100644
--- a/misc/proj/buildlink3.mk
+++ b/misc/proj/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:13 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:24 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PROJ_BUILDLINK3_MK:= ${PROJ_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nproj}
BUILDLINK_PACKAGES+= proj
.if !empty(PROJ_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.proj+= proj>=4.4.7nb1
-BUILDLINK_RECOMMENDED.proj?= proj>=4.4.7nb2
+BUILDLINK_API_DEPENDS.proj+= proj>=4.4.7nb1
+BUILDLINK_ABI_DEPENDS.proj?= proj>=4.4.7nb2
BUILDLINK_PKGSRCDIR.proj?= ../../misc/proj
.endif # PROJ_BUILDLINK3_MK
diff --git a/misc/rpm/buildlink3.mk b/misc/rpm/buildlink3.mk
index 169e1d33567..b3a89f53a62 100644
--- a/misc/rpm/buildlink3.mk
+++ b/misc/rpm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:10:14 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:24 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
RPM_BUILDLINK3_MK:= ${RPM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nrpm}
BUILDLINK_PACKAGES+= rpm
.if !empty(RPM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.rpm+= rpm>=2.5.4nb4
-BUILDLINK_RECOMMENDED.rpm?= rpm>=2.5.4nb5
+BUILDLINK_API_DEPENDS.rpm+= rpm>=2.5.4nb4
+BUILDLINK_ABI_DEPENDS.rpm?= rpm>=2.5.4nb5
BUILDLINK_PKGSRCDIR.rpm?= ../../misc/rpm
BUILDLINK_DEPMETHOD.rpm?= build
diff --git a/misc/xfce4-weather-plugin/buildlink3.mk b/misc/xfce4-weather-plugin/buildlink3.mk
index b6b529c7934..8fdf35d95a1 100644
--- a/misc/xfce4-weather-plugin/buildlink3.mk
+++ b/misc/xfce4-weather-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/17 06:49:24 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:24 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_WEATHER_PLUGIN_BUILDLINK3_MK:= ${XFCE4_WEATHER_PLUGIN_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-weather-plugin}
BUILDLINK_PACKAGES+= xfce4-weather-plugin
.if !empty(XFCE4_WEATHER_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-weather-plugin+= xfce4-weather-plugin>=0.4.9
-BUILDLINK_RECOMMENDED.xfce4-weather-plugin?= xfce4-weather-plugin>=0.4.9nb2
+BUILDLINK_API_DEPENDS.xfce4-weather-plugin+= xfce4-weather-plugin>=0.4.9
+BUILDLINK_ABI_DEPENDS.xfce4-weather-plugin?= xfce4-weather-plugin>=0.4.9nb2
BUILDLINK_PKGSRCDIR.xfce4-weather-plugin?= ../../misc/xfce4-weather-plugin
.endif # XFCE4_WEATHER_PLUGIN_BUILDLINK3_MK
diff --git a/misc/yelp/Makefile b/misc/yelp/Makefile
index 4c20b866c86..d1312b424ae 100644
--- a/misc/yelp/Makefile
+++ b/misc/yelp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2006/03/30 21:26:24 jmmv Exp $
+# $NetBSD: Makefile,v 1.47 2006/04/06 06:22:24 reed Exp $
#
DISTNAME= yelp-2.14.0
@@ -13,7 +13,7 @@ COMMENT= Help browser for GNOME 2 desktop
DEPENDS+= docbook>=4.2:../../textproc/docbook
BUILD_USES_MSGFMT= yes
-BUILDLINK_DEPENDS.libxslt+= libxslt>=1.1.4
+BUILDLINK_API_DEPENDS.libxslt+= libxslt>=1.1.4
USE_DIRS+= gnome2-1.5
USE_TOOLS+= gmake pkg-config
@@ -31,7 +31,7 @@ PKG_OPTIONS_VAR= PKG_OPTIONS.yelp
.if !empty(PKG_OPTIONS:Mfirefox)
# Require a version that has the .pc files in it.
-BUILDLINK_DEPENDS.firefox+= firefox>=1.5nb2
+BUILDLINK_API_DEPENDS.firefox+= firefox>=1.5nb2
.endif
.include "../../archivers/bzip2/buildlink3.mk"
diff --git a/mk/apache.mk b/mk/apache.mk
index 821788503c3..d15f9dc8713 100644
--- a/mk/apache.mk
+++ b/mk/apache.mk
@@ -1,4 +1,4 @@
-# $NetBSD: apache.mk,v 1.9 2005/04/21 23:05:41 sketch Exp $
+# $NetBSD: apache.mk,v 1.10 2006/04/06 06:23:05 reed Exp $
#
# This Makefile fragment handles Apache dependencies and make variables,
# and is meant to be included by packages that require Apache either at
@@ -108,8 +108,8 @@ PKG_FAIL_REASON= "no acceptable apache found"
_PKG_APACHE= "none"
.endif
-BUILDLINK_DEPENDS.apache13?= apache-1.3*
-BUILDLINK_DEPENDS.apache2?= apache-2*
+BUILDLINK_API_DEPENDS.apache13?= apache-1.3*
+BUILDLINK_API_DEPENDS.apache2?= apache-2*
.if ${_PKG_APACHE} == "apache13"
_APACHE_PKGSRCDIR= ../../www/apache
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index cb55acb3dcd..fe29c0e7b9d 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1812 2006/03/20 01:48:57 jlam Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1813 2006/04/06 06:23:05 reed Exp $
#
# This file is in the public domain.
#
@@ -760,11 +760,11 @@ USE_LANGUAGES?= # empty
.include "../../mk/wrapper/bsd.wrapper.mk"
-.if defined(RECOMMENDED)
-. if !empty(IGNORE_RECOMMENDED:M[nN][oO])
-DEPENDS+= ${RECOMMENDED}
+.if defined(ABI_DEPENDS)
+. if !empty(USE_ABI_DEPENDS:M[yY][eE][sS])
+DEPENDS+= ${ABI_DEPENDS}
. else
-BUILD_DEFS+= IGNORE_RECOMMENDED
+BUILD_DEFS+= USE_ABI_DEPENDS
. endif
.endif
@@ -1806,8 +1806,8 @@ real-su-package: ${PLIST} ${DESCR}
@${ECHO_MSG} "${_PKGSRC_IN}> Warning: ${PKGNAME} may not be made available through FTP:"
@${ECHO_MSG} "${_PKGSRC_IN}> " ${NO_BIN_ON_FTP:Q}
. endif
-. if defined(RECOMMENDED) && !empty(IGNORE_RECOMMENDED:M[yY][eE][sS])
- @${ECHO_MSG} "${_PKGSRC_IN}> Warning: dependency recommendations are being ignored!"
+. if defined(ABI_DEPENDS) && !empty(USE_ABI_DEPENDS:M[Nn][Oo])
+ @${ECHO_MSG} "${_PKGSRC_IN}> Warning: ABI dependency recommendations are being ignored!"
@${ECHO_MSG} "${_PKGSRC_IN}> ${PKGNAME} should not be uploaded nor"
@${ECHO_MSG} "${_PKGSRC_IN}> otherwise be used as a binary package!"
. endif
diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk
index d7f07449d35..e75d5d4ef96 100644
--- a/mk/buildlink3/bsd.buildlink3.mk
+++ b/mk/buildlink3/bsd.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.172 2005/12/09 16:16:41 hira Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.173 2006/04/06 06:23:06 reed Exp $
#
# Copyright (c) 2004 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -48,8 +48,8 @@
# BUILDLINK_PACKAGES+= foo
#
# .if !empty(FOO_BUILDLINK3_MK:M+)
-# BUILDLINK_DEPENDS.foo+= foo-lib>=1.0
-# BUILDLINK_RECOMMENDED.foo?= foo-lib>=1.0nb1
+# BUILDLINK_API_DEPENDS.foo+= foo-lib>=1.0
+# BUILDLINK_ABI_DEPENDS.foo?= foo-lib>=1.0nb1
# BUILDLINK_PKGSRCDIR.foo?= ../../category/foo-lib
#
# # We want "-lbar" to eventually resolve to "-lfoo".
@@ -184,33 +184,33 @@ _BLNK_DEPENDS_LIST= ${_BLNK_DEPENDS}
#
_BLNK_ADD_TO.DEPENDS= # empty
_BLNK_ADD_TO.BUILD_DEPENDS= # empty
-_BLNK_ADD_TO.RECOMMENDED= # empty
+_BLNK_ADD_TO.ABI_DEPENDS= # empty
.for _pkg_ in ${_BLNK_DEPENDS_LIST}
. if !empty(BUILDLINK_DEPMETHOD.${_pkg_}:Mfull)
_BLNK_DEPMETHOD.${_pkg_}= _BLNK_ADD_TO.DEPENDS
-_BLNK_RECMETHOD.${_pkg_}= _BLNK_ADD_TO.RECOMMENDED
+_BLNK_ABIMETHOD.${_pkg_}= _BLNK_ADD_TO.ABI_DEPENDS
. elif !empty(BUILDLINK_DEPMETHOD.${_pkg_}:Mbuild)
_BLNK_DEPMETHOD.${_pkg_}= _BLNK_ADD_TO.BUILD_DEPENDS
-_BLNK_RECMETHOD.${_pkg_}= _BLNK_ADD_TO.BUILD_DEPENDS
+_BLNK_ABIMETHOD.${_pkg_}= _BLNK_ADD_TO.BUILD_DEPENDS
. endif
-. if defined(BUILDLINK_DEPENDS.${_pkg_}) && \
+. if defined(BUILDLINK_API_DEPENDS.${_pkg_}) && \
defined(BUILDLINK_PKGSRCDIR.${_pkg_})
-. for _depend_ in ${BUILDLINK_DEPENDS.${_pkg_}}
+. for _depend_ in ${BUILDLINK_API_DEPENDS.${_pkg_}}
. if empty(${_BLNK_DEPMETHOD.${_pkg_}}:M${_depend_}\:*)
${_BLNK_DEPMETHOD.${_pkg_}}+= ${_depend_}:${BUILDLINK_PKGSRCDIR.${_pkg_}}
. endif
. endfor
. endif
-. if defined(BUILDLINK_RECOMMENDED.${_pkg_}) && \
+. if defined(BUILDLINK_ABI_DEPENDS.${_pkg_}) && \
defined(BUILDLINK_PKGSRCDIR.${_pkg_})
-. for _rec_ in ${BUILDLINK_RECOMMENDED.${_pkg_}}
-. if empty(${_BLNK_RECMETHOD.${_pkg_}}:M${_rec_}\:*)
-${_BLNK_RECMETHOD.${_pkg_}}+= ${_rec_}:${BUILDLINK_PKGSRCDIR.${_pkg_}}
+. for _abi_ in ${BUILDLINK_ABI_DEPENDS.${_pkg_}}
+. if empty(${_BLNK_ABIMETHOD.${_pkg_}}:M${_abi_}\:*)
+${_BLNK_ABIMETHOD.${_pkg_}}+= ${_abi_}:${BUILDLINK_PKGSRCDIR.${_pkg_}}
. endif
. endfor
. endif
.endfor
-.for _depmethod_ in DEPENDS BUILD_DEPENDS RECOMMENDED
+.for _depmethod_ in DEPENDS BUILD_DEPENDS ABI_DEPENDS
. if !empty(_BLNK_ADD_TO.${_depmethod_})
${_depmethod_}+= ${_BLNK_ADD_TO.${_depmethod_}}
. endif
@@ -280,7 +280,7 @@ BUILDLINK_PREFIX.${_pkg_}?= /usr
#
. if !defined(_BLNK_PKG_DBDIR.${_pkg_})
_BLNK_PKG_DBDIR.${_pkg_}?= # empty
-. for _depend_ in ${BUILDLINK_DEPENDS.${_pkg_}}
+. for _depend_ in ${BUILDLINK_API_DEPENDS.${_pkg_}}
. if empty(_BLNK_PKG_DBDIR.${_pkg_}:M*not_found)
_BLNK_PKG_DBDIR.${_pkg_}!= \
dir=""; \
diff --git a/mk/buildlink3/bsd.builtin.mk b/mk/buildlink3/bsd.builtin.mk
index e3eea895d45..ec5cba53da2 100644
--- a/mk/buildlink3/bsd.builtin.mk
+++ b/mk/buildlink3/bsd.builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.builtin.mk,v 1.6 2005/06/20 05:44:17 jlam Exp $
+# $NetBSD: bsd.builtin.mk,v 1.7 2006/04/06 06:23:06 reed Exp $
#
# Copyright (c) 2004-2005 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -85,7 +85,7 @@
# . if defined(BUILTIN_PKG.wibble) && \
# !empty(IS_BUILTIN.wibble:M[yY][eE][sS])
# USE_BUILTIN.wibble= yes
-# . for _dep_ in ${BUILDLINK_DEPENDS.wibble}
+# . for _dep_ in ${BUILDLINK_API_DEPENDS.wibble}
# . if !empty(USE_BUILTIN.wibble:M[yY][eE][sS])
# USE_BUILTIN.wibble!= \
# if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.wibble:Q}; then \
diff --git a/mk/db1.builtin.mk b/mk/db1.builtin.mk
index f695258038c..0a9cdc8470e 100644
--- a/mk/db1.builtin.mk
+++ b/mk/db1.builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: db1.builtin.mk,v 1.14 2005/08/11 20:25:20 cube Exp $
+# $NetBSD: db1.builtin.mk,v 1.15 2006/04/06 06:23:06 reed Exp $
BUILTIN_PKG:= db1
@@ -41,7 +41,7 @@ USE_BUILTIN.db1= no
USE_BUILTIN.db1= ${IS_BUILTIN.db1}
. if defined(BUILTIN_PKG.db1) && !empty(IS_BUILTIN.db1:M[yY][eE][sS])
USE_BUILTIN.db1= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.db1}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.db1}
. if !empty(USE_BUILTIN.db1:M[yY][eE][sS])
USE_BUILTIN.db1!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.db1:Q}; then \
diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf
index 0db2f643ad5..48574e38002 100644
--- a/mk/defaults/mk.conf
+++ b/mk/defaults/mk.conf
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.114 2006/03/30 04:57:45 jlam Exp $
+# $NetBSD: mk.conf,v 1.115 2006/04/06 06:23:06 reed Exp $
#
# This file provides default values for variables that may be overridden
@@ -100,17 +100,17 @@ PKGSRC_SLEEPSECS?= 5
# Possible: defined, not defined
# Default: not defined
-IGNORE_RECOMMENDED?= no
-# Ignore package prerequisite recommendations. If this is set to
-# "no", all entries in RECOMMENDED will be added to DEPENDS.
-# If set to "yes", a warning will be printed if recommendations
+USE_ABI_DEPENDS?= yes
+# Honor package prerequisite ABI recommendations. If this is set
+# to "yes", all entries in ABI_DEPENDS will be added to DEPENDS.
+# If set to "no", a warning will be printed if recommendations
# are possibly ignored.
#
# WARNING: This should only be set if you know what you're doing.
# Please read pkgsrc/doc/pkgsrc.txt for details.
#
# Possible: yes, no
-# Default: no
+# Default: yes
#PKG_REGISTER_SHELLS= YES
# Automatically register shells in /etc/shells
diff --git a/mk/java-vm.mk b/mk/java-vm.mk
index d61d9a274cc..a27190a987f 100644
--- a/mk/java-vm.mk
+++ b/mk/java-vm.mk
@@ -1,4 +1,4 @@
-# $NetBSD: java-vm.mk,v 1.44 2005/12/12 14:43:26 joerg Exp $
+# $NetBSD: java-vm.mk,v 1.45 2006/04/06 06:23:06 reed Exp $
#
# This Makefile fragment handles Java dependencies and make variables,
# and is meant to be included by packages that require Java either at
@@ -199,18 +199,18 @@ PKG_SKIP_REASON= "no acceptable JVM found"
_PKG_JVM= "none"
.endif
-BUILDLINK_DEPENDS.blackdown-jdk13?= blackdown-jdk13-[0-9]*
-BUILDLINK_DEPENDS.blackdown-jre13?= blackdown-jre13-[0-9]*
-BUILDLINK_DEPENDS.jdk?= jdk-[0-9]*
-BUILDLINK_DEPENDS.jdk14?= jdk14-[0-9]*
-BUILDLINK_DEPENDS.kaffe?= kaffe>=1.1.4
-BUILDLINK_DEPENDS.sun-jdk13?= sun-jdk13-[0-9]*
-BUILDLINK_DEPENDS.sun-jre13?= sun-jre13-[0-9]*
-BUILDLINK_DEPENDS.sun-jdk14?= sun-jdk14-[0-9]*
-BUILDLINK_DEPENDS.sun-jre14?= sun-jre14-[0-9]*
-BUILDLINK_DEPENDS.sun-jdk15?= sun-jdk15-[0-9]*
-BUILDLINK_DEPENDS.sun-jre15?= sun-jre15-[0-9]*
-#BUILDLINK_DEPENDS.win32-jdk?= win32-jdk>=0.1
+BUILDLINK_API_DEPENDS.blackdown-jdk13?= blackdown-jdk13-[0-9]*
+BUILDLINK_API_DEPENDS.blackdown-jre13?= blackdown-jre13-[0-9]*
+BUILDLINK_API_DEPENDS.jdk?= jdk-[0-9]*
+BUILDLINK_API_DEPENDS.jdk14?= jdk14-[0-9]*
+BUILDLINK_API_DEPENDS.kaffe?= kaffe>=1.1.4
+BUILDLINK_API_DEPENDS.sun-jdk13?= sun-jdk13-[0-9]*
+BUILDLINK_API_DEPENDS.sun-jre13?= sun-jre13-[0-9]*
+BUILDLINK_API_DEPENDS.sun-jdk14?= sun-jdk14-[0-9]*
+BUILDLINK_API_DEPENDS.sun-jre14?= sun-jre14-[0-9]*
+BUILDLINK_API_DEPENDS.sun-jdk15?= sun-jdk15-[0-9]*
+BUILDLINK_API_DEPENDS.sun-jre15?= sun-jre15-[0-9]*
+#BUILDLINK_API_DEPENDS.win32-jdk?= win32-jdk>=0.1
_JRE.blackdown-jdk13= blackdown-jre13
_JRE.jdk= jdk
diff --git a/mk/oss.builtin.mk b/mk/oss.builtin.mk
index b658542fb36..0bb5d4d6e7b 100644
--- a/mk/oss.builtin.mk
+++ b/mk/oss.builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: oss.builtin.mk,v 1.1 2006/03/09 20:23:13 jlam Exp $
+# $NetBSD: oss.builtin.mk,v 1.2 2006/04/06 06:23:06 reed Exp $
BUILTIN_PKG:= oss
@@ -37,7 +37,7 @@ USE_BUILTIN.oss= ${IS_BUILTIN.oss}
. if defined(BUILTIN_PKG.oss) && \
!empty(IS_BUILTIN.oss:M[yY][eE][sS])
USE_BUILTIN.oss= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.oss}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.oss}
. if !empty(USE_BUILTIN.oss:M[yY][eE][sS])
USE_BUILTIN.oss!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.oss:Q}; then \
diff --git a/mk/pthread.buildlink3.mk b/mk/pthread.buildlink3.mk
index 1eccb987cd9..657dab28d4f 100644
--- a/mk/pthread.buildlink3.mk
+++ b/mk/pthread.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: pthread.buildlink3.mk,v 1.21 2005/11/04 14:36:23 rillig Exp $
+# $NetBSD: pthread.buildlink3.mk,v 1.22 2006/04/06 06:23:06 reed Exp $
#
# The pthreads strategy for pkgsrc is to "bless" a particular pthread
# package as the Official Pthread Replacement (OPR). The following
@@ -116,7 +116,7 @@ BUILDLINK_AUTO_VARS.pthread?= ${PTHREAD_AUTO_VARS}
.elif ${PTHREAD_TYPE} == "${_PKG_PTHREAD}"
. if exists(${_PKG_PTHREAD_BUILDLINK3_MK})
. if !empty(_PKG_PTHREAD_DEPENDS)
-BUILDLINK_DEPENDS.${_PKG_PTHREAD}+= ${_PKG_PTHREAD_DEPENDS}
+BUILDLINK_API_DEPENDS.${_PKG_PTHREAD}+= ${_PKG_PTHREAD_DEPENDS}
. endif
. include "${_PKG_PTHREAD_BUILDLINK3_MK}"
BUILDLINK_PREFIX.pthread= ${BUILDLINK_PREFIX.${_PKG_PTHREAD}}
diff --git a/mk/solaris-pam.builtin.mk b/mk/solaris-pam.builtin.mk
index 277e9243eaa..025a4da5d97 100644
--- a/mk/solaris-pam.builtin.mk
+++ b/mk/solaris-pam.builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: solaris-pam.builtin.mk,v 1.3 2005/06/01 18:03:06 jlam Exp $
+# $NetBSD: solaris-pam.builtin.mk,v 1.4 2006/04/06 06:23:06 reed Exp $
BUILTIN_PKG:= solaris-pam
@@ -32,7 +32,7 @@ USE_BUILTIN.solaris-pam= ${IS_BUILTIN.solaris-pam}
. if defined(BUILTIN_PKG.solaris-pam) && \
!empty(IS_BUILTIN.solaris-pam:M[yY][eE][sS])
USE_BUILTIN.solaris-pam= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.solaris-pam}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.solaris-pam}
. if !empty(USE_BUILTIN.solaris-pam:M[yY][eE][sS])
USE_BUILTIN.solaris-pam!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.solaris-pam:Q}; then \
diff --git a/mk/tex.buildlink3.mk b/mk/tex.buildlink3.mk
index d098d09b655..212f9366992 100644
--- a/mk/tex.buildlink3.mk
+++ b/mk/tex.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tex.buildlink3.mk,v 1.12 2006/02/27 12:14:50 rxg Exp $
+# $NetBSD: tex.buildlink3.mk,v 1.13 2006/04/06 06:23:06 reed Exp $
#
# A Makefile fragment for TeX and LaTeX packages
#
@@ -88,11 +88,11 @@ TEX_ACCEPTED?= teTeX2 teTeX3
# set up variables for buildlink or depends
#
-BUILDLINK_DEPENDS.teTeX1= teTeX-bin-1.[0-9]*
+BUILDLINK_API_DEPENDS.teTeX1= teTeX-bin-1.[0-9]*
BUILDLINK_PKGSRCDIR.teTeX1= ../../print/teTeX1-bin
-BUILDLINK_DEPENDS.teTeX2= teTeX-bin-2.[0-9]*
+BUILDLINK_API_DEPENDS.teTeX2= teTeX-bin-2.[0-9]*
BUILDLINK_PKGSRCDIR.teTeX2= ../../print/teTeX-bin
-BUILDLINK_DEPENDS.teTeX3= teTeX-bin-3.[0-9]*
+BUILDLINK_API_DEPENDS.teTeX3= teTeX-bin-3.[0-9]*
BUILDLINK_PKGSRCDIR.teTeX3= ../../print/teTeX3-bin
# Determine the TeX version to be used.
@@ -110,13 +110,13 @@ TEX_TYPE= none
# Set version specifics.
#
.if ${TEX_TYPE} == "teTeX3"
-_TEX_DEPENDENCY= ${BUILDLINK_DEPENDS.teTeX3}
+_TEX_DEPENDENCY= ${BUILDLINK_API_DEPENDS.teTeX3}
_TEX_PKGSRCDIR= ${BUILDLINK_PKGSRCDIR.teTeX3}
.elif ${TEX_TYPE} == "teTeX2"
-_TEX_DEPENDENCY= ${BUILDLINK_DEPENDS.teTeX2}
+_TEX_DEPENDENCY= ${BUILDLINK_API_DEPENDS.teTeX2}
_TEX_PKGSRCDIR= ${BUILDLINK_PKGSRCDIR.teTeX2}
.elif ${TEX_TYPE} == "teTeX1"
-_TEX_DEPENDENCY= ${BUILDLINK_DEPENDS.teTeX1}
+_TEX_DEPENDENCY= ${BUILDLINK_API_DEPENDS.teTeX1}
_TEX_PKGSRCDIR= ${BUILDLINK_PKGSRCDIR.teTeX1}
.endif
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk
index e1b59ab1da7..5a8d897923a 100644
--- a/mk/tools/replace.mk
+++ b/mk/tools/replace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.163 2006/03/19 23:40:07 jlam Exp $
+# $NetBSD: replace.mk,v 1.164 2006/04/06 06:23:06 reed Exp $
#
# Copyright (c) 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -322,7 +322,7 @@ MAKEFLAGS+= TOOLS_IGNORE.flex=
. elif !empty(_TOOLS_USE_PKGSRC.flex:M[yY][eE][sS])
. include "../../devel/flex/buildlink3.mk"
_TOOLS_DEPENDS.flex= # empty
-. for _dep_ in ${BUILDLINK_DEPENDS.flex}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.flex}
_TOOLS_DEPENDS.flex+= ${_dep_}:${BUILDLINK_PKGSRCDIR.flex}
. endfor
TOOLS_DEPENDS.flex?= ${_TOOLS_DEPENDS.flex}
@@ -459,7 +459,7 @@ MAKEFLAGS+= TOOLS_IGNORE.lex=
. elif !empty(_TOOLS_USE_PKGSRC.lex:M[yY][eE][sS])
. include "../../devel/flex/buildlink3.mk"
_TOOLS_DEPENDS.lex= # empty
-. for _dep_ in ${BUILDLINK_DEPENDS.flex}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.flex}
_TOOLS_DEPENDS.lex+= ${_dep_}:${BUILDLINK_PKGSRCDIR.flex}
. endfor
TOOLS_DEPENDS.lex?= ${_TOOLS_DEPENDS.lex}
diff --git a/multimedia/dirac/buildlink3.mk b/multimedia/dirac/buildlink3.mk
index 5fc589842c7..b135243744f 100644
--- a/multimedia/dirac/buildlink3.mk
+++ b/multimedia/dirac/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/05/16 02:07:44 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:24 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
DIRAC_BUILDLINK3_MK:= ${DIRAC_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndirac}
BUILDLINK_PACKAGES+= dirac
.if !empty(DIRAC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.dirac+= dirac>=0.2.0
+BUILDLINK_API_DEPENDS.dirac+= dirac>=0.2.0
BUILDLINK_PKGSRCDIR.dirac?= ../../multimedia/dirac
BUILDLINK_DEPMETHOD.dirac?= build
.endif # DIRAC_BUILDLINK3_MK
diff --git a/multimedia/dvdrip/Makefile b/multimedia/dvdrip/Makefile
index 1f4c8ad94c8..0a33cdef76d 100644
--- a/multimedia/dvdrip/Makefile
+++ b/multimedia/dvdrip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/03/04 21:30:14 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2006/04/06 06:22:24 reed Exp $
#
DISTNAME= Video-DVDRip-0.50.18
@@ -24,7 +24,7 @@ DEPENDS+= vcdimager>=0.7.12:../../sysutils/vcdimager-devel
#DEPENDS+= rar>=2.02:../../archivers/rar
.endif
-BUILDLINK_DEPENDS.perl+= perl>=5.6.0
+BUILDLINK_API_DEPENDS.perl+= perl>=5.6.0
USE_PKGLOCALEDIR= YES
diff --git a/multimedia/ffmpeg/buildlink3.mk b/multimedia/ffmpeg/buildlink3.mk
index ac7e444c2fc..7f49e91df8a 100644
--- a/multimedia/ffmpeg/buildlink3.mk
+++ b/multimedia/ffmpeg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/22 10:30:18 abs Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:24 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
FFMPEG_BUILDLINK3_MK:= ${FFMPEG_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nffmpeg}
BUILDLINK_PACKAGES+= ffmpeg
.if !empty(FFMPEG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ffmpeg+= ffmpeg>=0.4.9pre1
-BUILDLINK_RECOMMENDED.ffmpeg?= ffmpeg>=0.4.9pre1
+BUILDLINK_API_DEPENDS.ffmpeg+= ffmpeg>=0.4.9pre1
+BUILDLINK_ABI_DEPENDS.ffmpeg?= ffmpeg>=0.4.9pre1
BUILDLINK_PKGSRCDIR.ffmpeg?= ../../multimedia/ffmpeg
.endif # FFMPEG_BUILDLINK3_MK
diff --git a/multimedia/gnome2-media/buildlink3.mk b/multimedia/gnome2-media/buildlink3.mk
index 1d4e5886c84..b8e7be1b726 100644
--- a/multimedia/gnome2-media/buildlink3.mk
+++ b/multimedia/gnome2-media/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:10:15 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:24 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNOME_MEDIA_BUILDLINK3_MK:= ${GNOME_MEDIA_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-media}
BUILDLINK_PACKAGES+= gnome-media
.if !empty(GNOME_MEDIA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-media+= gnome-media>=2.12.0nb1
-BUILDLINK_RECOMMENDED.gnome-media?= gnome-media>=2.12.0nb5
+BUILDLINK_API_DEPENDS.gnome-media+= gnome-media>=2.12.0nb1
+BUILDLINK_ABI_DEPENDS.gnome-media?= gnome-media>=2.12.0nb5
BUILDLINK_PKGSRCDIR.gnome-media?= ../../multimedia/gnome2-media
.endif # GNOME_MEDIA_BUILDLINK3_MK
diff --git a/multimedia/gst-plugins0.10-base/buildlink3.mk b/multimedia/gst-plugins0.10-base/buildlink3.mk
index a41616c218d..b53b481b908 100644
--- a/multimedia/gst-plugins0.10-base/buildlink3.mk
+++ b/multimedia/gst-plugins0.10-base/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:10:15 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:25 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GST_PLUGINS0.10_BASE_BUILDLINK3_MK:= ${GST_PLUGINS0.10_BASE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngst-plugins0.10-base}
BUILDLINK_PACKAGES+= gst-plugins0.10-base
.if !empty(GST_PLUGINS0.10_BASE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gst-plugins0.10-base+= gst-plugins0.10-base>=0.10.1
-BUILDLINK_RECOMMENDED.gst-plugins0.10-base?= gst-plugins0.10-base>=0.10.2nb1
+BUILDLINK_API_DEPENDS.gst-plugins0.10-base+= gst-plugins0.10-base>=0.10.1
+BUILDLINK_ABI_DEPENDS.gst-plugins0.10-base?= gst-plugins0.10-base>=0.10.2nb1
BUILDLINK_PKGSRCDIR.gst-plugins0.10-base?= ../../multimedia/gst-plugins0.10-base
.endif # GST_PLUGINS0.10_BASE_BUILDLINK3_MK
diff --git a/multimedia/gst-plugins0.10-good/buildlink3.mk b/multimedia/gst-plugins0.10-good/buildlink3.mk
index 7539ca0a639..09c1c40efdf 100644
--- a/multimedia/gst-plugins0.10-good/buildlink3.mk
+++ b/multimedia/gst-plugins0.10-good/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:10:15 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:25 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GST_PLUGINS0.10_GOOD_BUILDLINK3_MK:= ${GST_PLUGINS0.10_GOOD_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngst-plugins0.10-good}
BUILDLINK_PACKAGES+= gst-plugins0.10-good
.if !empty(GST_PLUGINS0.10_GOOD_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gst-plugins0.10-good+= gst-plugins0.10-good>=0.10.1
-BUILDLINK_RECOMMENDED.gst-plugins0.10-good?= gst-plugins0.10-good>=0.10.1nb1
+BUILDLINK_API_DEPENDS.gst-plugins0.10-good+= gst-plugins0.10-good>=0.10.1
+BUILDLINK_ABI_DEPENDS.gst-plugins0.10-good?= gst-plugins0.10-good>=0.10.1nb1
BUILDLINK_PKGSRCDIR.gst-plugins0.10-good?= ../../multimedia/gst-plugins0.10-good
.endif # GST_PLUGINS0.10_GOOD_BUILDLINK3_MK
diff --git a/multimedia/gst-plugins0.8-xvid/Makefile b/multimedia/gst-plugins0.8-xvid/Makefile
index 707d099b270..8101cd00487 100644
--- a/multimedia/gst-plugins0.8-xvid/Makefile
+++ b/multimedia/gst-plugins0.8-xvid/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2006/03/21 06:00:47 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2006/04/06 06:22:25 reed Exp $
#
GST_PLUGINS0.8_NAME= xvid
GST_PLUGINS0.8_DIR= ext/xvid
-BUILDLINK_DEPENDS.xvidcore+= xvidcore>=1.0.3nb1
+BUILDLINK_API_DEPENDS.xvidcore+= xvidcore>=1.0.3nb1
.include "../../multimedia/gst-plugins0.8/Makefile.common"
PKGREVISION= 4
diff --git a/multimedia/gst-plugins0.8/Makefile.common b/multimedia/gst-plugins0.8/Makefile.common
index 5ce3a309afc..e81229ad30c 100644
--- a/multimedia/gst-plugins0.8/Makefile.common
+++ b/multimedia/gst-plugins0.8/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2006/01/18 12:44:03 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.2 2006/04/06 06:22:25 reed Exp $
#
DISTNAME= gst-plugins-0.8.11
@@ -163,7 +163,7 @@ SUBST_SED.libs= -e 's|$$(top_builddir)/gst-libs/gst/libgst|${BUILDLINK_PREFIX.g
.include "../../multimedia/gst-plugins0.8/buildlink3.mk"
.endif
-BUILDLINK_DEPENDS.gstreamer0.8+= gstreamer0.8>=0.8.11
+BUILDLINK_API_DEPENDS.gstreamer0.8+= gstreamer0.8>=0.8.11
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/multimedia/gst-plugins0.8/buildlink3.mk b/multimedia/gst-plugins0.8/buildlink3.mk
index 0efed7fa42a..bd6f5125157 100644
--- a/multimedia/gst-plugins0.8/buildlink3.mk
+++ b/multimedia/gst-plugins0.8/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:15 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:25 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GST_PLUGINS0.8_BUILDLINK3_MK:= ${GST_PLUGINS0.8_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngst-plugins0.8}
BUILDLINK_PACKAGES+= gst-plugins0.8
.if !empty(GST_PLUGINS0.8_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gst-plugins0.8+= gst-plugins0.8>=0.8.11
-BUILDLINK_RECOMMENDED.gst-plugins0.8?= gst-plugins0.8>=0.8.11nb2
+BUILDLINK_API_DEPENDS.gst-plugins0.8+= gst-plugins0.8>=0.8.11
+BUILDLINK_ABI_DEPENDS.gst-plugins0.8?= gst-plugins0.8>=0.8.11nb2
BUILDLINK_PKGSRCDIR.gst-plugins0.8?= ../../multimedia/gst-plugins0.8
.endif # GST_PLUGINS0.8_BUILDLINK3_MK
diff --git a/multimedia/gstreamer0.10/Makefile b/multimedia/gstreamer0.10/Makefile
index 99a82e93cd1..4fcd6dfadf7 100644
--- a/multimedia/gstreamer0.10/Makefile
+++ b/multimedia/gstreamer0.10/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/03/12 12:41:09 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2006/04/06 06:22:25 reed Exp $
#
DISTNAME= gstreamer-0.10.4
@@ -41,7 +41,7 @@ PKGCONFIG_OVERRIDE+= pkgconfig/gstreamer.pc.in
.if ${OPSYS} == "NetBSD"
# We must have a glib2 compiled with the RTLD_GLOBAL fix; if not, plugins
# won't work at all.
-BUILDLINK_DEPENDS.glib2+= glib2>=2.4.0nb1
+BUILDLINK_API_DEPENDS.glib2+= glib2>=2.4.0nb1
.endif
.undef f
diff --git a/multimedia/gstreamer0.10/buildlink3.mk b/multimedia/gstreamer0.10/buildlink3.mk
index 2fb3d41a9ef..3b6aac82957 100644
--- a/multimedia/gstreamer0.10/buildlink3.mk
+++ b/multimedia/gstreamer0.10/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:10:16 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:25 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GSTREAMER0.10_BUILDLINK3_MK:= ${GSTREAMER0.10_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngstreamer0.10}
BUILDLINK_PACKAGES+= gstreamer0.10
.if !empty(GSTREAMER0.10_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gstreamer0.10+= gstreamer0.10>=0.10.1
-BUILDLINK_RECOMMENDED.gstreamer0.10?= gstreamer0.10>=0.10.2nb1
+BUILDLINK_API_DEPENDS.gstreamer0.10+= gstreamer0.10>=0.10.1
+BUILDLINK_ABI_DEPENDS.gstreamer0.10?= gstreamer0.10>=0.10.2nb1
BUILDLINK_PKGSRCDIR.gstreamer0.10?= ../../multimedia/gstreamer0.10
PRINT_PLIST_AWK+= /^@dirrm (include|lib)\/gstreamer-0.10(\/gst)?$$/ \
diff --git a/multimedia/gstreamer0.8/Makefile b/multimedia/gstreamer0.8/Makefile
index 7bbd6d011cb..e926cc5a86e 100644
--- a/multimedia/gstreamer0.8/Makefile
+++ b/multimedia/gstreamer0.8/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/03/21 06:00:47 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2006/04/06 06:22:25 reed Exp $
#
DISTNAME= gstreamer-0.8.11
@@ -39,7 +39,7 @@ PYTHON_VERSIONS_ACCEPTED= 24 23 22
.if ${OPSYS} == "NetBSD"
# We must have a glib2 compiled with the RTLD_GLOBAL fix; if not, plugins
# won't work at all.
-BUILDLINK_DEPENDS.glib2+= glib2>=2.4.0nb1
+BUILDLINK_API_DEPENDS.glib2+= glib2>=2.4.0nb1
.endif
.undef f
diff --git a/multimedia/gstreamer0.8/buildlink3.mk b/multimedia/gstreamer0.8/buildlink3.mk
index f2bb182b328..dfb0d376471 100644
--- a/multimedia/gstreamer0.8/buildlink3.mk
+++ b/multimedia/gstreamer0.8/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:16 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:25 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GSTREAMER0.8_BUILDLINK3_MK:= ${GSTREAMER0.8_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngstreamer0.8}
BUILDLINK_PACKAGES+= gstreamer0.8
.if !empty(GSTREAMER0.8_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gstreamer0.8+= gstreamer0.8>=0.8.11
-BUILDLINK_RECOMMENDED.gstreamer0.8?= gstreamer0.8>=0.8.11nb2
+BUILDLINK_API_DEPENDS.gstreamer0.8+= gstreamer0.8>=0.8.11
+BUILDLINK_ABI_DEPENDS.gstreamer0.8?= gstreamer0.8>=0.8.11nb2
BUILDLINK_PKGSRCDIR.gstreamer0.8?= ../../multimedia/gstreamer0.8
PRINT_PLIST_AWK+= /^@dirrm (include|lib)\/gstreamer-0.8(\/gst)?$$/ \
diff --git a/multimedia/gstreamer0.8/plugins.mk b/multimedia/gstreamer0.8/plugins.mk
index 16f7600afab..8add471426d 100644
--- a/multimedia/gstreamer0.8/plugins.mk
+++ b/multimedia/gstreamer0.8/plugins.mk
@@ -1,4 +1,4 @@
-# $NetBSD: plugins.mk,v 1.2 2006/03/14 01:14:31 jlam Exp $
+# $NetBSD: plugins.mk,v 1.3 2006/04/06 06:22:25 reed Exp $
#
# This Makefile fragment is intended to be included by packages that install
# GStreamer modules. It takes care of rebuilding the corresponding databases
@@ -24,7 +24,7 @@ PRINT_PLIST_AWK+= /^@dirrm libdata\/gstreamer-0.8/ { next; }
.if defined(_GSTREAMER0.8_NO_DEPEND)
BUILDLINK_PREFIX.gstreamer0.8= ${LOCALBASE}
.else
-BUILDLINK_DEPENDS.gstreamer0.8+= gstreamer0.8>=0.8.1
+BUILDLINK_API_DEPENDS.gstreamer0.8+= gstreamer0.8>=0.8.1
. include "../../multimedia/gstreamer0.8/buildlink3.mk"
.endif
diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index b08a5d919be..aed3fad7e67 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2006/03/30 02:48:36 markd Exp $
+# $NetBSD: Makefile,v 1.45 2006/04/06 06:22:25 reed Exp $
DISTNAME= kdemultimedia-${_KDE_VERSION}
CATEGORIES= multimedia
@@ -18,7 +18,7 @@ CONF_FILES+= ${PREFIX}/share/examples/kdemultimedia3/applications-merged/kde-mu
.include "../../mk/compiler.mk"
.if !empty(CC_VERSION:Mgcc-3.*)
-BUILDLINK_DEPENDS.xine-lib+= xine-lib>=1rc0anb1
+BUILDLINK_API_DEPENDS.xine-lib+= xine-lib>=1rc0anb1
.endif
CONFIGURE_ARGS+= --enable-cdparanoia
diff --git a/multimedia/kdemultimedia3/buildlink3.mk b/multimedia/kdemultimedia3/buildlink3.mk
index fbd0a5a2954..f3778dffe90 100644
--- a/multimedia/kdemultimedia3/buildlink3.mk
+++ b/multimedia/kdemultimedia3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/02/05 23:10:16 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/04/06 06:22:25 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
KDEMULTIMEDIA_BUILDLINK3_MK:= ${KDEMULTIMEDIA_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nkdemultimedia}
BUILDLINK_PACKAGES+= kdemultimedia
.if !empty(KDEMULTIMEDIA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.kdemultimedia+= kdemultimedia>=3.5.0nb2
-BUILDLINK_RECOMMENDED.kdemultimedia?= kdemultimedia>=3.5.1nb1
+BUILDLINK_API_DEPENDS.kdemultimedia+= kdemultimedia>=3.5.0nb2
+BUILDLINK_ABI_DEPENDS.kdemultimedia?= kdemultimedia>=3.5.1nb1
BUILDLINK_PKGSRCDIR.kdemultimedia?= ../../multimedia/kdemultimedia3
.endif # KDEMULTIMEDIA_BUILDLINK3_MK
diff --git a/multimedia/libassetml/buildlink3.mk b/multimedia/libassetml/buildlink3.mk
index 30a47b31391..3e43e550052 100644
--- a/multimedia/libassetml/buildlink3.mk
+++ b/multimedia/libassetml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:10:16 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:25 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBASSETML_BUILDLINK3_MK:= ${LIBASSETML_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibassetml}
BUILDLINK_PACKAGES+= libassetml
.if !empty(LIBASSETML_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libassetml+= libassetml>=1.2.1
-BUILDLINK_RECOMMENDED.libassetml?= libassetml>=1.2.1nb1
+BUILDLINK_API_DEPENDS.libassetml+= libassetml>=1.2.1
+BUILDLINK_ABI_DEPENDS.libassetml?= libassetml>=1.2.1nb1
BUILDLINK_PKGSRCDIR.libassetml?= ../../multimedia/libassetml
.endif # LIBASSETML_BUILDLINK3_MK
diff --git a/multimedia/libdv-tools/Makefile b/multimedia/libdv-tools/Makefile
index 8013ca1c504..dbc1e4652bd 100644
--- a/multimedia/libdv-tools/Makefile
+++ b/multimedia/libdv-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/02/05 23:10:16 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2006/04/06 06:22:25 reed Exp $
.include "../../multimedia/libdv/Makefile.common"
@@ -12,7 +12,7 @@ CONFIGURE_ARGS:= ${CONFIGURE_ARGS:S/--disable-gtk/--enable-gtk/g}
BUILD_DIRS= ${WRKSRC}/encodedv ${WRKSRC}/playdv
INSTALL_DIRS= ${WRKSRC}/encodedv ${WRKSRC}/playdv
-BUILDLINK_DEPENDS.libdv+= libdv>=0.104nb1
+BUILDLINK_API_DEPENDS.libdv+= libdv>=0.104nb1
.include "../../devel/glib/buildlink3.mk"
.include "../../multimedia/libdv/buildlink3.mk"
diff --git a/multimedia/libdv/buildlink3.mk b/multimedia/libdv/buildlink3.mk
index b1d9052b8d2..dcddfe0349a 100644
--- a/multimedia/libdv/buildlink3.mk
+++ b/multimedia/libdv/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:10:16 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:25 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBDV_BUILDLINK3_MK:= ${LIBDV_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibdv}
BUILDLINK_PACKAGES+= libdv
.if !empty(LIBDV_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libdv+= libdv>=0.102
-BUILDLINK_RECOMMENDED.libdv+= libdv>=0.104nb2
+BUILDLINK_API_DEPENDS.libdv+= libdv>=0.102
+BUILDLINK_ABI_DEPENDS.libdv+= libdv>=0.104nb2
BUILDLINK_PKGSRCDIR.libdv?= ../../multimedia/libdv
.endif # LIBDV_BUILDLINK3_MK
diff --git a/multimedia/libdvbpsi/buildlink3.mk b/multimedia/libdvbpsi/buildlink3.mk
index e3ebffe48cc..3ba1cd3df74 100644
--- a/multimedia/libdvbpsi/buildlink3.mk
+++ b/multimedia/libdvbpsi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:16 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:26 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBDVBPSI_BUILDLINK3_MK:= ${LIBDVBPSI_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibdvbpsi}
BUILDLINK_PACKAGES+= libdvbpsi
.if !empty(LIBDVBPSI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libdvbpsi+= libdvbpsi>=0.1.3
-BUILDLINK_RECOMMENDED.libdvbpsi+= libdvbpsi>=0.1.3nb2
+BUILDLINK_API_DEPENDS.libdvbpsi+= libdvbpsi>=0.1.3
+BUILDLINK_ABI_DEPENDS.libdvbpsi+= libdvbpsi>=0.1.3nb2
BUILDLINK_PKGSRCDIR.libdvbpsi?= ../../multimedia/libdvbpsi
.endif # LIBDVBPSI_BUILDLINK3_MK
diff --git a/multimedia/libdvdcss/buildlink3.mk b/multimedia/libdvdcss/buildlink3.mk
index 8bda56fca5b..a74062a2d2f 100644
--- a/multimedia/libdvdcss/buildlink3.mk
+++ b/multimedia/libdvdcss/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:02 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:26 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBDVDCSS_BUILDLINK3_MK:= ${LIBDVDCSS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibdvdcss}
BUILDLINK_PACKAGES+= libdvdcss
.if !empty(LIBDVDCSS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libdvdcss+= libdvdcss>=1.2.4
-BUILDLINK_RECOMMENDED.libdvdcss+= libdvdcss>=1.2.8nb1
+BUILDLINK_API_DEPENDS.libdvdcss+= libdvdcss>=1.2.4
+BUILDLINK_ABI_DEPENDS.libdvdcss+= libdvdcss>=1.2.8nb1
BUILDLINK_PKGSRCDIR.libdvdcss?= ../../multimedia/libdvdcss
.endif # LIBDVDCSS_BUILDLINK3_MK
diff --git a/multimedia/libdvdnav/buildlink3.mk b/multimedia/libdvdnav/buildlink3.mk
index 988663fca3b..8c83398bb75 100644
--- a/multimedia/libdvdnav/buildlink3.mk
+++ b/multimedia/libdvdnav/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:02 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:26 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBDVDNAV_BUILDLINK3_MK:= ${LIBDVDNAV_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibdvdnav}
BUILDLINK_PACKAGES+= libdvdnav
.if !empty(LIBDVDNAV_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libdvdnav+= libdvdnav>=0.1.9
-BUILDLINK_RECOMMENDED.libdvdnav+= libdvdnav>=0.1.9nb1
+BUILDLINK_API_DEPENDS.libdvdnav+= libdvdnav>=0.1.9
+BUILDLINK_ABI_DEPENDS.libdvdnav+= libdvdnav>=0.1.9nb1
BUILDLINK_PKGSRCDIR.libdvdnav?= ../../multimedia/libdvdnav
.endif # LIBDVDNAV_BUILDLINK3_MK
diff --git a/multimedia/libdvdplay/buildlink3.mk b/multimedia/libdvdplay/buildlink3.mk
index 655ddb2fb85..c32b2410fb9 100644
--- a/multimedia/libdvdplay/buildlink3.mk
+++ b/multimedia/libdvdplay/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:16 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:26 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBDVDPLAY_BUILDLINK3_MK:= ${LIBDVDPLAY_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibdvdplay}
BUILDLINK_PACKAGES+= libdvdplay
.if !empty(LIBDVDPLAY_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libdvdplay+= libdvdplay>=1.0.1
-BUILDLINK_RECOMMENDED.libdvdplay+= libdvdplay>=1.0.1nb3
+BUILDLINK_API_DEPENDS.libdvdplay+= libdvdplay>=1.0.1
+BUILDLINK_ABI_DEPENDS.libdvdplay+= libdvdplay>=1.0.1nb3
BUILDLINK_PKGSRCDIR.libdvdplay?= ../../multimedia/libdvdplay
.endif # LIBDVDPLAY_BUILDLINK3_MK
diff --git a/multimedia/libdvdread/buildlink3.mk b/multimedia/libdvdread/buildlink3.mk
index 1307e31405b..33b6ffe1488 100644
--- a/multimedia/libdvdread/buildlink3.mk
+++ b/multimedia/libdvdread/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:10:16 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:26 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBDVDREAD_BUILDLINK3_MK:= ${LIBDVDREAD_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibdvdread}
BUILDLINK_PACKAGES+= libdvdread
.if !empty(LIBDVDREAD_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libdvdread+= libdvdread>=0.9.4
-BUILDLINK_RECOMMENDED.libdvdread+= libdvdread>=0.9.5nb2
+BUILDLINK_API_DEPENDS.libdvdread+= libdvdread>=0.9.4
+BUILDLINK_ABI_DEPENDS.libdvdread+= libdvdread>=0.9.5nb2
BUILDLINK_PKGSRCDIR.libdvdread?= ../../multimedia/libdvdread
.endif # LIBDVDREAD_BUILDLINK3_MK
diff --git a/multimedia/libflash/buildlink3.mk b/multimedia/libflash/buildlink3.mk
index 492edf133f3..90677b7abb6 100644
--- a/multimedia/libflash/buildlink3.mk
+++ b/multimedia/libflash/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:16 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:26 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBFLASH_BUILDLINK3_MK:= ${LIBFLASH_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibflash}
BUILDLINK_PACKAGES+= libflash
.if !empty(LIBFLASH_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libflash+= libflash>=0.4.10nb4
-BUILDLINK_RECOMMENDED.libflash+= libflash>=0.4.10nb6
+BUILDLINK_API_DEPENDS.libflash+= libflash>=0.4.10nb4
+BUILDLINK_ABI_DEPENDS.libflash+= libflash>=0.4.10nb6
BUILDLINK_PKGSRCDIR.libflash?= ../../multimedia/libflash
.endif # LIBFLASH_BUILDLINK3_MK
diff --git a/multimedia/libmatroska/buildlink3.mk b/multimedia/libmatroska/buildlink3.mk
index 7d066710682..6f1ff90b363 100644
--- a/multimedia/libmatroska/buildlink3.mk
+++ b/multimedia/libmatroska/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/02/05 23:10:16 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/04/06 06:22:26 reed Exp $
#
# This Makefile fragment is included by packages that use libmatroska.
#
@@ -16,8 +16,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmatroska}
BUILDLINK_PACKAGES+= libmatroska
.if !empty(LIBMATROSKA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmatroska+= libmatroska>=0.8.0
-BUILDLINK_RECOMMENDED.libmatroska?= libmatroska>=0.8.0nb1
+BUILDLINK_API_DEPENDS.libmatroska+= libmatroska>=0.8.0
+BUILDLINK_ABI_DEPENDS.libmatroska?= libmatroska>=0.8.0nb1
BUILDLINK_PKGSRCDIR.libmatroska?= ../../multimedia/libmatroska
.endif # LIBMATROSKA_BUILDLINK3_MK
diff --git a/multimedia/libmpeg2/buildlink3.mk b/multimedia/libmpeg2/buildlink3.mk
index 0a5fbdd5051..0c51f2e7aa3 100644
--- a/multimedia/libmpeg2/buildlink3.mk
+++ b/multimedia/libmpeg2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:10:16 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:26 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBMPEG2_BUILDLINK3_MK:= ${LIBMPEG2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmpeg2}
BUILDLINK_PACKAGES+= libmpeg2
.if !empty(LIBMPEG2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmpeg2+= libmpeg2>=0.4.0
-BUILDLINK_RECOMMENDED.libmpeg2+= libmpeg2>=0.4.0bnb3
+BUILDLINK_API_DEPENDS.libmpeg2+= libmpeg2>=0.4.0
+BUILDLINK_ABI_DEPENDS.libmpeg2+= libmpeg2>=0.4.0bnb3
BUILDLINK_PKGSRCDIR.libmpeg2?= ../../multimedia/libmpeg2
.endif # LIBMPEG2_BUILDLINK3_MK
diff --git a/multimedia/libmpeg3/buildlink3.mk b/multimedia/libmpeg3/buildlink3.mk
index 059635b62e6..69756e6938f 100644
--- a/multimedia/libmpeg3/buildlink3.mk
+++ b/multimedia/libmpeg3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:10:17 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:26 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBMPEG3_BUILDLINK3_MK:= ${LIBMPEG3_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmpeg3}
BUILDLINK_PACKAGES+= libmpeg3
.if !empty(LIBMPEG3_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmpeg3+= libmpeg3>=1.3nb4
-BUILDLINK_RECOMMENDED.libmpeg3?= libmpeg3>=1.3nb6
+BUILDLINK_API_DEPENDS.libmpeg3+= libmpeg3>=1.3nb4
+BUILDLINK_ABI_DEPENDS.libmpeg3?= libmpeg3>=1.3nb6
BUILDLINK_PKGSRCDIR.libmpeg3?= ../../multimedia/libmpeg3
.endif # LIBMPEG3_BUILDLINK3_MK
diff --git a/multimedia/libogg/buildlink3.mk b/multimedia/libogg/buildlink3.mk
index 2bd05df2637..bc2e8549cf7 100644
--- a/multimedia/libogg/buildlink3.mk
+++ b/multimedia/libogg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:03 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:26 reed Exp $
#
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibogg}
BUILDLINK_PACKAGES+= libogg
.if !empty(LIBOGG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libogg+= libogg>=1.1
-BUILDLINK_RECOMMENDED.libogg+= libogg>=1.1.2nb1
+BUILDLINK_API_DEPENDS.libogg+= libogg>=1.1
+BUILDLINK_ABI_DEPENDS.libogg+= libogg>=1.1.2nb1
BUILDLINK_PKGSRCDIR.libogg?= ../../multimedia/libogg
.endif # LIBOGG_BUILDLINK3_MK
diff --git a/multimedia/libtheora/buildlink3.mk b/multimedia/libtheora/buildlink3.mk
index 7462ae368b5..84a32d6dc7b 100644
--- a/multimedia/libtheora/buildlink3.mk
+++ b/multimedia/libtheora/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:13:03 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:26 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBTHEORA_BUILDLINK3_MK:= ${LIBTHEORA_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibtheora}
BUILDLINK_PACKAGES+= libtheora
.if !empty(LIBTHEORA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libtheora+= libtheora>=1.0alpha3
-BUILDLINK_RECOMMENDED.libtheora+= libtheora>=1.0alpha3nb1
+BUILDLINK_API_DEPENDS.libtheora+= libtheora>=1.0alpha3
+BUILDLINK_ABI_DEPENDS.libtheora+= libtheora>=1.0alpha3nb1
BUILDLINK_PKGSRCDIR.libtheora?= ../../multimedia/libtheora
.endif # LIBTHEORA_BUILDLINK3_MK
diff --git a/multimedia/lsdvd/Makefile b/multimedia/lsdvd/Makefile
index 71fe6c2b82e..9a22ed14167 100644
--- a/multimedia/lsdvd/Makefile
+++ b/multimedia/lsdvd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/02/26 05:03:21 snj Exp $
+# $NetBSD: Makefile,v 1.8 2006/04/06 06:22:26 reed Exp $
DISTNAME= lsdvd-0.10
PKGREVISION= 3
@@ -14,7 +14,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= YES
USE_TOOLS+= autoconf213
-BUILDLINK_DEPENDS.libdvdread+= libdvdread>=0.9.5nb1
+BUILDLINK_API_DEPENDS.libdvdread+= libdvdread>=0.9.5nb1
pre-configure:
cd ${WRKSRC}; autoconf
diff --git a/multimedia/ming/buildlink3.mk b/multimedia/ming/buildlink3.mk
index 7e92ab657bf..18ba9e31032 100644
--- a/multimedia/ming/buildlink3.mk
+++ b/multimedia/ming/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/11/04 02:59:54 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:26 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
MING_BUILDLINK3_MK:= ${MING_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nming}
BUILDLINK_PACKAGES+= ming
.if !empty(MING_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ming+= ming>=0.2
+BUILDLINK_API_DEPENDS.ming+= ming>=0.2
BUILDLINK_PKGSRCDIR.ming?= ../../multimedia/ming
.endif # MING_BUILDLINK3_MK
diff --git a/multimedia/mjpegtools/buildlink3.mk b/multimedia/mjpegtools/buildlink3.mk
index fdbb0ecf1e5..f51a0f487fd 100644
--- a/multimedia/mjpegtools/buildlink3.mk
+++ b/multimedia/mjpegtools/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/02/05 23:10:17 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/04/06 06:22:26 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
MJPEGTOOLS_BUILDLINK3_MK:= ${MJPEGTOOLS_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmjpegtools}
BUILDLINK_PACKAGES+= mjpegtools
.if !empty(MJPEGTOOLS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.mjpegtools+= mjpegtools>=1.8.0
-BUILDLINK_RECOMMENDED.mjpegtools?= mjpegtools>=1.8.0nb3
+BUILDLINK_API_DEPENDS.mjpegtools+= mjpegtools>=1.8.0
+BUILDLINK_ABI_DEPENDS.mjpegtools?= mjpegtools>=1.8.0nb3
BUILDLINK_PKGSRCDIR.mjpegtools?= ../../multimedia/mjpegtools
.endif # MJPEGTOOLS_BUILDLINK3_MK
diff --git a/multimedia/mpeg-lib/buildlink3.mk b/multimedia/mpeg-lib/buildlink3.mk
index a1ae987dc4e..f0f530833a4 100644
--- a/multimedia/mpeg-lib/buildlink3.mk
+++ b/multimedia/mpeg-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:03 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:27 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
MPEG_BUILDLINK3_MK:= ${MPEG_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmpeg}
BUILDLINK_PACKAGES+= mpeg
.if !empty(MPEG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.mpeg+= mpeg>=1.3.1
-BUILDLINK_RECOMMENDED.mpeg+= mpeg>=1.3.1nb1
+BUILDLINK_API_DEPENDS.mpeg+= mpeg>=1.3.1
+BUILDLINK_ABI_DEPENDS.mpeg+= mpeg>=1.3.1nb1
BUILDLINK_PKGSRCDIR.mpeg?= ../../multimedia/mpeg-lib
.endif # MPEG_BUILDLINK3_MK
diff --git a/multimedia/ogle/buildlink3.mk b/multimedia/ogle/buildlink3.mk
index 7eaaf0ebb86..43dfc75b19f 100644
--- a/multimedia/ogle/buildlink3.mk
+++ b/multimedia/ogle/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:17 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:27 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OGLE_BUILDLINK3_MK:= ${OGLE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nogle}
BUILDLINK_PACKAGES+= ogle
.if !empty(OGLE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ogle+= ogle>=0.9.2
-BUILDLINK_RECOMMENDED.ogle+= ogle>=0.9.2nb3
+BUILDLINK_API_DEPENDS.ogle+= ogle>=0.9.2
+BUILDLINK_ABI_DEPENDS.ogle+= ogle>=0.9.2nb3
BUILDLINK_PKGSRCDIR.ogle?= ../../multimedia/ogle
.endif # OGLE_BUILDLINK3_MK
diff --git a/multimedia/openquicktime/buildlink3.mk b/multimedia/openquicktime/buildlink3.mk
index fa4f1c8a8c1..b9ba103e552 100644
--- a/multimedia/openquicktime/buildlink3.mk
+++ b/multimedia/openquicktime/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:18 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:27 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OPENQUICKTIME_BUILDLINK3_MK:= ${OPENQUICKTIME_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nopenquicktime}
BUILDLINK_PACKAGES+= openquicktime
.if !empty(OPENQUICKTIME_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.openquicktime+= openquicktime>=1.0nb2
-BUILDLINK_RECOMMENDED.openquicktime?= openquicktime>=1.0nb4
+BUILDLINK_API_DEPENDS.openquicktime+= openquicktime>=1.0nb2
+BUILDLINK_ABI_DEPENDS.openquicktime?= openquicktime>=1.0nb4
BUILDLINK_PKGSRCDIR.openquicktime?= ../../multimedia/openquicktime
.endif # OPENQUICKTIME_BUILDLINK3_MK
diff --git a/multimedia/smpeg/buildlink3.mk b/multimedia/smpeg/buildlink3.mk
index 6a4491d18fa..97f7d838668 100644
--- a/multimedia/smpeg/buildlink3.mk
+++ b/multimedia/smpeg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:10:18 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:27 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SPMEG_BUILDLINK3_MK:= ${SPMEG_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsmpeg}
BUILDLINK_PACKAGES+= smpeg
.if !empty(SPMEG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.smpeg+= smpeg>=0.4.4nb3
-BUILDLINK_RECOMMENDED.smpeg+= smpeg>=0.4.4nb12
+BUILDLINK_API_DEPENDS.smpeg+= smpeg>=0.4.4nb3
+BUILDLINK_ABI_DEPENDS.smpeg+= smpeg>=0.4.4nb12
BUILDLINK_PKGSRCDIR.smpeg?= ../../multimedia/smpeg
.endif # SMPEG_BUILDLINK3_MK
diff --git a/multimedia/swfdec/buildlink3.mk b/multimedia/swfdec/buildlink3.mk
index 08daa6690b1..e51de71ee66 100644
--- a/multimedia/swfdec/buildlink3.mk
+++ b/multimedia/swfdec/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:10:18 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:27 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SWFDEC_BUILDLINK3_MK:= ${SWFDEC_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nswfdec}
BUILDLINK_PACKAGES+= swfdec
.if !empty(SWFDEC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.swfdec+= swfdec>=0.2.2
-BUILDLINK_RECOMMENDED.swfdec+= swfdec>=0.2.2nb5
+BUILDLINK_API_DEPENDS.swfdec+= swfdec>=0.2.2
+BUILDLINK_ABI_DEPENDS.swfdec+= swfdec>=0.2.2nb5
BUILDLINK_PKGSRCDIR.swfdec?= ../../multimedia/swfdec
.endif # SWFDEC_BUILDLINK3_MK
diff --git a/multimedia/totem/Makefile.common b/multimedia/totem/Makefile.common
index d03a25e47e1..014b265e65c 100644
--- a/multimedia/totem/Makefile.common
+++ b/multimedia/totem/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.14 2006/03/30 21:36:13 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.15 2006/04/06 06:22:27 reed Exp $
#
DISTNAME= totem-1.4.0
@@ -26,8 +26,8 @@ GCONF2_SCHEMAS= totem.schemas
GCONF2_SCHEMAS+= totem-handlers.schemas
GCONF2_SCHEMAS+= totem-video-thumbnail.schemas
-BUILDLINK_DEPENDS.glib2+= glib2>=2.6.3
-BUILDLINK_DEPENDS.gnome-icon-theme+= gnome-icon-theme>=2.10.0
+BUILDLINK_API_DEPENDS.glib2+= glib2>=2.6.3
+BUILDLINK_API_DEPENDS.gnome-icon-theme+= gnome-icon-theme>=2.10.0
.include "../../devel/GConf2/schemas.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 0a5cc74dd35..e60041b2253 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2006/03/09 21:04:45 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2006/04/06 06:22:28 reed Exp $
#
DISTNAME= vlc-${VLC_VER}
@@ -23,8 +23,8 @@ VLC_VER= 0.7.2
.if ${OPSYS} == "NetBSD"
CONFIGURE_ARGS+= --disable-vcd
.endif
-BUILDLINK_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1
-BUILDLINK_DEPENDS.ffmpeg+= ffmpeg>=0.4.8nb1 # Postprocess fix
+BUILDLINK_API_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1
+BUILDLINK_API_DEPENDS.ffmpeg+= ffmpeg>=0.4.8nb1 # Postprocess fix
CONFIGURE_ARGS+= --disable-skins2
CONFIGURE_ARGS+= --disable-speex # needs unstable 1.1.x branch
diff --git a/multimedia/vlc/buildlink3.mk b/multimedia/vlc/buildlink3.mk
index b2336ee8138..fd91b5dada6 100644
--- a/multimedia/vlc/buildlink3.mk
+++ b/multimedia/vlc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:10:18 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:22:29 reed Exp $
#
# This Makefile fragment is included by packages that use vlc.
#
@@ -14,8 +14,8 @@ BUILDLINK_DEPENDS+= vlc
.if !empty(VLC_BUILDLINK3_MK:M+)
BUILDLINK_PACKAGES+= vlc
-BUILDLINK_DEPENDS.vlc?= vlc>=0.7.1
-BUILDLINK_RECOMMENDED.vlc?= vlc>=0.7.2nb9
+BUILDLINK_API_DEPENDS.vlc?= vlc>=0.7.1
+BUILDLINK_ABI_DEPENDS.vlc?= vlc>=0.7.2nb9
BUILDLINK_PKGSRCDIR.vlc?= ../../multimedia/vlc
.endif # VLC_BUILDLINK3_MK
diff --git a/multimedia/x264-devel/buildlink3.mk b/multimedia/x264-devel/buildlink3.mk
index 90b02a93138..55558721ce7 100644
--- a/multimedia/x264-devel/buildlink3.mk
+++ b/multimedia/x264-devel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/02/12 14:11:22 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:29 reed Exp $
BUILDLINK_DEPMETHOD.x264-devel?= build
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nx264-devel}
BUILDLINK_PACKAGES+= x264-devel
.if !empty(X264_DEVEL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.x264-devel+= x264-devel>=20060127
+BUILDLINK_API_DEPENDS.x264-devel+= x264-devel>=20060127
BUILDLINK_PKGSRCDIR.x264-devel?= ../../multimedia/x264-devel
.endif # X264_DEVEL_BUILDLINK3_MK
diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile
index 9a01afc6888..45dc5435919 100644
--- a/multimedia/xine-lib/Makefile
+++ b/multimedia/xine-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2006/02/05 23:10:18 joerg Exp $
+# $NetBSD: Makefile,v 1.32 2006/04/06 06:22:29 reed Exp $
.include "Makefile.common"
@@ -6,7 +6,7 @@ PKGREVISION= 5
COMMENT= Multimedia player library
-BUILDLINK_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1
+BUILDLINK_API_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1
SUBST_CLASSES+= oss w32path
@@ -24,7 +24,7 @@ SUBST_SED.w32path= -e "s,@W32PATH@,${PREFIX}/lib/win32,"
SUBST_MESSAGE.w32path= "Fixing win32 dll path."
# Needed to fix build problems under, at least, NetBSD/amd64.
-BUILDLINK_DEPENDS.libcdio+= libcdio>=0.75
+BUILDLINK_API_DEPENDS.libcdio+= libcdio>=0.75
.include "../../audio/flac/buildlink3.mk"
.include "../../audio/libvorbis/buildlink3.mk"
diff --git a/multimedia/xine-lib/buildlink3.mk b/multimedia/xine-lib/buildlink3.mk
index 2b459ae0625..d45f0f4bd46 100644
--- a/multimedia/xine-lib/buildlink3.mk
+++ b/multimedia/xine-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/02/05 23:10:19 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2006/04/06 06:22:30 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XINE_LIB_BUILDLINK3_MK:= ${XINE_LIB_BUILDLINK3_MK}+
@@ -11,9 +11,9 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxine-lib}
BUILDLINK_PACKAGES+= xine-lib
.if !empty(XINE_LIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xine-lib+= xine-lib>=1rc3c
-BUILDLINK_RECOMMENDED.xine-lib+=xine-lib>=1.0.3a
-BUILDLINK_RECOMMENDED.xine-lib?= xine-lib>=1.0.3anb5
+BUILDLINK_API_DEPENDS.xine-lib+= xine-lib>=1rc3c
+BUILDLINK_ABI_DEPENDS.xine-lib+=xine-lib>=1.0.3a
+BUILDLINK_ABI_DEPENDS.xine-lib?= xine-lib>=1.0.3anb5
BUILDLINK_PKGSRCDIR.xine-lib?= ../../multimedia/xine-lib
.endif # XINE_LIB_BUILDLINK3_MK
diff --git a/multimedia/xine-ui/Makefile b/multimedia/xine-ui/Makefile
index 14ce0fc2401..3ddf149191a 100644
--- a/multimedia/xine-ui/Makefile
+++ b/multimedia/xine-ui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/03/04 21:30:16 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2006/04/06 06:22:30 reed Exp $
#
DISTNAME= xine-ui-0.99.2
@@ -12,7 +12,7 @@ COMMENT= Skinned xlib-based xine GUI
BUILD_USES_MSGFMT= YES
-BUILDLINK_DEPENDS.curl+= curl>7.10.2
+BUILDLINK_API_DEPENDS.curl+= curl>7.10.2
USE_PKGLOCALEDIR= YES
USE_DIRS+= xdg-1.1
diff --git a/multimedia/xvidcore/buildlink3.mk b/multimedia/xvidcore/buildlink3.mk
index 90701b518aa..5561d76d063 100644
--- a/multimedia/xvidcore/buildlink3.mk
+++ b/multimedia/xvidcore/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/03/13 18:24:45 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:30 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XVIDCORE_BUILDLINK3_MK:= ${XVIDCORE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxvidcore}
BUILDLINK_PACKAGES+= xvidcore
.if !empty(XVIDCORE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xvidcore+= xvidcore>=1.0.0
-BUILDLINK_RECOMMENDED.xvidcore?= xvidcore>=1.1.0nb1
+BUILDLINK_API_DEPENDS.xvidcore+= xvidcore>=1.0.0
+BUILDLINK_ABI_DEPENDS.xvidcore?= xvidcore>=1.1.0nb1
BUILDLINK_PKGSRCDIR.xvidcore?= ../../multimedia/xvidcore
.endif # XVIDCORE_BUILDLINK3_MK
diff --git a/net/GeoIP/buildlink3.mk b/net/GeoIP/buildlink3.mk
index 6a31a40128a..186773322ce 100644
--- a/net/GeoIP/buildlink3.mk
+++ b/net/GeoIP/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:17:48 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:30 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GEOIP_BUILDLINK3_MK:= ${GEOIP_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NGeoIP}
BUILDLINK_PACKAGES+= GeoIP
.if !empty(GEOIP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.GeoIP+= GeoIP>=1.3.1
-BUILDLINK_RECOMMENDED.GeoIP+= GeoIP>=1.3.4nb1
+BUILDLINK_API_DEPENDS.GeoIP+= GeoIP>=1.3.1
+BUILDLINK_ABI_DEPENDS.GeoIP+= GeoIP>=1.3.4nb1
BUILDLINK_PKGSRCDIR.GeoIP?= ../../net/GeoIP
.endif # GEOIP_BUILDLINK3_MK
diff --git a/net/ORBit/buildlink3.mk b/net/ORBit/buildlink3.mk
index 6f9675fa1a7..5b808199c71 100644
--- a/net/ORBit/buildlink3.mk
+++ b/net/ORBit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:10:22 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:30 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ORBIT_BUILDLINK3_MK:= ${ORBIT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NORBit}
BUILDLINK_PACKAGES+= ORBit
.if !empty(ORBIT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ORBit+= ORBit>=0.5.15nb5
-BUILDLINK_RECOMMENDED.ORBit+= ORBit>=0.5.17nb1
+BUILDLINK_API_DEPENDS.ORBit+= ORBit>=0.5.15nb5
+BUILDLINK_ABI_DEPENDS.ORBit+= ORBit>=0.5.17nb1
BUILDLINK_PKGSRCDIR.ORBit?= ../../net/ORBit
.endif # ORBIT_BUILDLINK3_MK
diff --git a/net/ORBit2/buildlink3.mk b/net/ORBit2/buildlink3.mk
index 1031fd65a25..036968caeeb 100644
--- a/net/ORBit2/buildlink3.mk
+++ b/net/ORBit2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/05 23:10:22 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:22:30 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ORBIT2_BUILDLINK3_MK:= ${ORBIT2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NORBit2}
BUILDLINK_PACKAGES+= ORBit2
.if !empty(ORBIT2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ORBit2+= ORBit2>=2.12.0
-BUILDLINK_RECOMMENDED.ORBit2?= ORBit2>=2.12.4nb1
+BUILDLINK_API_DEPENDS.ORBit2+= ORBit2>=2.12.0
+BUILDLINK_ABI_DEPENDS.ORBit2?= ORBit2>=2.12.4nb1
BUILDLINK_PKGSRCDIR.ORBit2?= ../../net/ORBit2
PRINT_PLIST_AWK+= /^@dirrm lib\/orbit-2.0$$/ \
diff --git a/net/SDL_net/buildlink3.mk b/net/SDL_net/buildlink3.mk
index e3405818b01..d2d6b52a750 100644
--- a/net/SDL_net/buildlink3.mk
+++ b/net/SDL_net/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:10:22 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:30 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SDL_NET_BUILDLINK3_MK:= ${SDL_NET_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NSDL_net}
BUILDLINK_PACKAGES+= SDL_net
.if !empty(SDL_NET_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.SDL_net+= SDL_net>=1.2.5nb1
-BUILDLINK_RECOMMENDED.SDL_net+= SDL_net>=1.2.5nb5
+BUILDLINK_API_DEPENDS.SDL_net+= SDL_net>=1.2.5nb1
+BUILDLINK_ABI_DEPENDS.SDL_net+= SDL_net>=1.2.5nb5
BUILDLINK_PKGSRCDIR.SDL_net?= ../../net/SDL_net
.endif # SDL_NET_BUILDLINK3_MK
diff --git a/net/adns/buildlink3.mk b/net/adns/buildlink3.mk
index ba4602bc493..a2e0f932c6c 100644
--- a/net/adns/buildlink3.mk
+++ b/net/adns/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:22 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:30 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ADNS_BUILDLINK3_MK:= ${ADNS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nadns}
BUILDLINK_PACKAGES+= adns
.if !empty(ADNS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.adns+= adns>=1.0
-BUILDLINK_RECOMMENDED.adns+= adns>=1.1nb2
+BUILDLINK_API_DEPENDS.adns+= adns>=1.0
+BUILDLINK_ABI_DEPENDS.adns+= adns>=1.1nb2
BUILDLINK_PKGSRCDIR.adns?= ../../net/adns
.endif # ADNS_BUILDLINK3_MK
diff --git a/net/bind9/buildlink3.mk b/net/bind9/buildlink3.mk
index ff47e288e6f..c84b614dad1 100644
--- a/net/bind9/buildlink3.mk
+++ b/net/bind9/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2004/10/03 00:17:49 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:30 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
BIND_BUILDLINK3_MK:= ${BIND_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nbind}
BUILDLINK_PACKAGES+= bind
.if !empty(BIND_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.bind+= bind>=9.2.2
-BUILDLINK_RECOMMENDED.bind+= bind>=9.2.3nb5
+BUILDLINK_API_DEPENDS.bind+= bind>=9.2.2
+BUILDLINK_ABI_DEPENDS.bind+= bind>=9.2.3nb5
BUILDLINK_PKGSRCDIR.bind?= ../../net/bind9
BUILDLINK_INCDIRS.bind?= include/bind
diff --git a/net/bind9/builtin.mk b/net/bind9/builtin.mk
index a7597d7bb72..08a1d3240b0 100644
--- a/net/bind9/builtin.mk
+++ b/net/bind9/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.10 2006/03/30 18:06:18 jlam Exp $
+# $NetBSD: builtin.mk,v 1.11 2006/04/06 06:22:30 reed Exp $
BUILTIN_PKG:= bind
@@ -59,7 +59,7 @@ USE_BUILTIN.bind= ${IS_BUILTIN.bind}
. if defined(BUILTIN_PKG.bind) && \
!empty(IS_BUILTIN.bind:M[yY][eE][sS])
USE_BUILTIN.bind= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.bind}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.bind}
. if !empty(USE_BUILTIN.bind:M[yY][eE][sS])
USE_BUILTIN.bind!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.bind:Q}; then \
diff --git a/net/boinc3-libs/buildlink3.mk b/net/boinc3-libs/buildlink3.mk
index 02f35531136..79ef31f9e88 100644
--- a/net/boinc3-libs/buildlink3.mk
+++ b/net/boinc3-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/07/19 20:11:04 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:30 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
BOINC_LIBS_BUILDLINK3_MK:= ${BOINC_LIBS_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nboinclibs}
BUILDLINK_PACKAGES+= boinclibs
.if !empty(BOINC_LIBS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.boinclibs+= boinc3-libs>=3.19.20040714
+BUILDLINK_API_DEPENDS.boinclibs+= boinc3-libs>=3.19.20040714
BUILDLINK_PKGSRCDIR.boinclibs?= ../../net/boinc3-libs
# installs static libraries only
diff --git a/net/btpd/Makefile b/net/btpd/Makefile
index e0386b66eb6..7bb92527b9d 100644
--- a/net/btpd/Makefile
+++ b/net/btpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/02/22 22:09:44 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2006/04/06 06:22:30 reed Exp $
DISTNAME= btpd-0.8
CATEGORIES= net
@@ -9,7 +9,7 @@ MAINTAINER= rnyberg@murmeldjur.se
HOMEPAGE= http://www.murmeldjur.se/btpd/
COMMENT= Daemon for file sharing over bittorrent
-BUILDLINK_DEPENDS.libevent+= libevent>=0.9
+BUILDLINK_API_DEPENDS.libevent+= libevent>=0.9
GNU_CONFIGURE= YES
diff --git a/net/cdpd/Makefile b/net/cdpd/Makefile
index aa03ca41d42..b09284f1a1a 100644
--- a/net/cdpd/Makefile
+++ b/net/cdpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/06/17 03:50:24 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2006/04/06 06:22:31 reed Exp $
#
DISTNAME= cdpd-1.0.2
@@ -11,7 +11,7 @@ COMMENT= Simple daemon to send Cisco Discovery Protocol packets
GNU_CONFIGURE= YES
-BUILDLINK_DEPENDS.libnet+= libnet-1.0.*
+BUILDLINK_API_DEPENDS.libnet+= libnet-1.0.*
INSTALLATION_DIRS= man/man8 sbin
diff --git a/net/dante/buildlink3.mk b/net/dante/buildlink3.mk
index c59fcc4e039..0b9e314cd56 100644
--- a/net/dante/buildlink3.mk
+++ b/net/dante/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:17:49 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:31 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
DANTE_BUILDLINK3_MK:= ${DANTE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndante}
BUILDLINK_PACKAGES+= dante
.if !empty(DANTE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.dante+= dante>=1.1.13
-BUILDLINK_RECOMMENDED.dante+= dante>=1.1.14nb1
+BUILDLINK_API_DEPENDS.dante+= dante>=1.1.13
+BUILDLINK_ABI_DEPENDS.dante+= dante>=1.1.14nb1
BUILDLINK_PKGSRCDIR.dante?= ../../net/dante
.endif # DANTE_BUILDLINK3_MK
diff --git a/net/ettercap-NG/Makefile b/net/ettercap-NG/Makefile
index 97ec97ada6c..696a24a7da7 100644
--- a/net/ettercap-NG/Makefile
+++ b/net/ettercap-NG/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/12/29 06:21:58 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2006/04/06 06:22:32 reed Exp $
DISTNAME= ettercap-NG-0.7.3
CATEGORIES= net
@@ -10,7 +10,7 @@ COMMENT= Multipurpose sniffer/interceptor/logger for switched LAN
CONFLICTS= ettercap-[0-9]*
-BUILDLINK_DEPENDS.libpcap+= libpcap>=0.8.1
+BUILDLINK_API_DEPENDS.libpcap+= libpcap>=0.8.1
GNU_CONFIGURE= YES
PTHREAD_OPTS+= require
diff --git a/net/firewalk/Makefile b/net/firewalk/Makefile
index 95a5a93b94a..a373a024d18 100644
--- a/net/firewalk/Makefile
+++ b/net/firewalk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/03/04 21:30:18 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2006/04/06 06:22:32 reed Exp $
DISTNAME= firewalk-5.0
PKGREVISION= 1
@@ -14,7 +14,7 @@ WRKSRC= ${WRKDIR}/Firewalk
GNU_CONFIGURE= yes
CONFIGURE_ENV+= CFLAGS=-I${LOCALBASE}/include
-BUILDLINK_DEPENDS.libnet+= libnet-1.1.*
+BUILDLINK_API_DEPENDS.libnet+= libnet-1.1.*
MAKE_ENV+= FIREWALK_LOC=${PREFIX:Q}
diff --git a/net/flodo/Makefile b/net/flodo/Makefile
index f5518e0461a..73cbc11e136 100644
--- a/net/flodo/Makefile
+++ b/net/flodo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/03/04 21:30:18 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2006/04/06 06:22:32 reed Exp $
#
DISTNAME= flodo-v4
@@ -11,7 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://arctic.org/~dean/flodo/
COMMENT= Simple network flow sampling tool
-BUILDLINK_DEPENDS.libpcap+= libpcap>=0.8
+BUILDLINK_API_DEPENDS.libpcap+= libpcap>=0.8
CPPFLAGS+= -I${BUILDLINK_PREFIX.libpcap}/include
LDFLAGS+= -L${BUILDLINK_PREFIX.libpcap}/lib
diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index a5a9c955f91..8398a47bfc9 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2006/03/22 20:53:41 joerg Exp $
+# $NetBSD: Makefile,v 1.47 2006/04/06 06:22:32 reed Exp $
DISTNAME= freeradius-1.1.1
PKGREVISION= 2
@@ -20,7 +20,7 @@ FILES_SUBST+= ROOT_USER=${ROOT_USER:Q}
FILES_SUBST+= ROOT_GROUP=${ROOT_GROUP:Q}
USE_OLD_DES_API= YES
-BUILDLINK_DEPENDS.openssl+= openssl>=0.9.7
+BUILDLINK_API_DEPENDS.openssl+= openssl>=0.9.7
USE_LIBTOOL= YES
LIBTOOL_OVERRIDE+= libtool
diff --git a/net/freewais-sf/buildlink3.mk b/net/freewais-sf/buildlink3.mk
index 2c82336cb2d..c47c73d9314 100644
--- a/net/freewais-sf/buildlink3.mk
+++ b/net/freewais-sf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:17:51 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:32 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
FREEWAIS_SF_BUILDLINK3_MK:= ${FREEWAIS_SF_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfreewais-sf}
BUILDLINK_PACKAGES+= freewais-sf
.if !empty(FREEWAIS_SF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.freewais-sf+= freewais-sf>=2.2.12
-BUILDLINK_RECOMMENDED.freewais-sf+= freewais-sf>=2.2.12nb2
+BUILDLINK_API_DEPENDS.freewais-sf+= freewais-sf>=2.2.12
+BUILDLINK_ABI_DEPENDS.freewais-sf+= freewais-sf>=2.2.12nb2
BUILDLINK_PKGSRCDIR.freewais-sf?= ../../net/freewais-sf
.endif # FREEWAIS_SF_BUILDLINK3_MK
diff --git a/net/gift/buildlink3.mk b/net/gift/buildlink3.mk
index edc566aa49f..771dfa213b0 100644
--- a/net/gift/buildlink3.mk
+++ b/net/gift/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/15 12:14:07 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:32 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GIFT_BUILDLINK3_MK:= ${GIFT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngift}
BUILDLINK_PACKAGES+= gift
.if !empty(GIFT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gift+= gift>=0.11.6
-BUILDLINK_RECOMMENDED.gift+= gift>=0.11.6nb2
+BUILDLINK_API_DEPENDS.gift+= gift>=0.11.6
+BUILDLINK_ABI_DEPENDS.gift+= gift>=0.11.6nb2
BUILDLINK_PKGSRCDIR.gift?= ../../net/gift
.endif # GIFT_BUILDLINK3_MK
diff --git a/net/gnet/buildlink3.mk b/net/gnet/buildlink3.mk
index 1eb5dc00cdf..21cde30b296 100644
--- a/net/gnet/buildlink3.mk
+++ b/net/gnet/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:10:24 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:32 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNET_BUILDLINK3_MK:= ${GNET_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnet}
BUILDLINK_PACKAGES+= gnet
.if !empty(GNET_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnet+= gnet>=2.0.3nb1
-BUILDLINK_RECOMMENDED.gnet+= gnet>=2.0.7nb2
+BUILDLINK_API_DEPENDS.gnet+= gnet>=2.0.3nb1
+BUILDLINK_ABI_DEPENDS.gnet+= gnet>=2.0.7nb2
BUILDLINK_PKGSRCDIR.gnet?= ../../net/gnet
.endif # GNET_BUILDLINK3_MK
diff --git a/net/gnet1/buildlink3.mk b/net/gnet1/buildlink3.mk
index c39a3afe927..8d1532d95c5 100644
--- a/net/gnet1/buildlink3.mk
+++ b/net/gnet1/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:10:25 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:32 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNET1_BUILDLINK3_MK:= ${GNET1_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnet1}
BUILDLINK_PACKAGES+= gnet1
.if !empty(GNET1_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnet1+= gnet1>=1.1.8nb2
-BUILDLINK_RECOMMENDED.gnet1+= gnet1>=1.1.8nb4
+BUILDLINK_API_DEPENDS.gnet1+= gnet1>=1.1.8nb2
+BUILDLINK_ABI_DEPENDS.gnet1+= gnet1>=1.1.8nb4
BUILDLINK_PKGSRCDIR.gnet1?= ../../net/gnet1
.endif # GNET1_BUILDLINK3_MK
diff --git a/net/hesiod/buildlink3.mk b/net/hesiod/buildlink3.mk
index 48ec16b3d9d..e7c2b67ad66 100644
--- a/net/hesiod/buildlink3.mk
+++ b/net/hesiod/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/04/25 00:34:21 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:32 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
HESIOD_BUILDLINK3_MK:= ${HESIOD_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nhesiod}
BUILDLINK_PACKAGES+= hesiod
.if !empty(HESIOD_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.hesiod+= hesiod>=3.0.2
+BUILDLINK_API_DEPENDS.hesiod+= hesiod>=3.0.2
BUILDLINK_PKGSRCDIR.hesiod?= ../../net/hesiod
BUILDLINK_DEPMETHOD.hesiod?= build
.endif # HESIOD_BUILDLINK3_MK
diff --git a/net/howl/buildlink3.mk b/net/howl/buildlink3.mk
index 2eff3ae6d09..3b75af6cae2 100644
--- a/net/howl/buildlink3.mk
+++ b/net/howl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/12 05:26:39 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:32 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
HOWL_BUILDLINK3_MK:= ${HOWL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nhowl}
BUILDLINK_PACKAGES+= howl
.if !empty(HOWL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.howl+= howl>=0.9.5
-BUILDLINK_RECOMMENDED.howl+= howl>=0.9.5nb1
+BUILDLINK_API_DEPENDS.howl+= howl>=0.9.5
+BUILDLINK_ABI_DEPENDS.howl+= howl>=0.9.5nb1
BUILDLINK_PKGSRCDIR.howl?= ../../net/howl
.endif # HOWL_BUILDLINK3_MK
diff --git a/net/kdenetwork3/buildlink3.mk b/net/kdenetwork3/buildlink3.mk
index 4dc56717ef5..eb936ae8f6a 100644
--- a/net/kdenetwork3/buildlink3.mk
+++ b/net/kdenetwork3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:10:26 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:32 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
KDENETWORK_BUILDLINK3_MK:= ${KDENETWORK_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nkdenetwork}
BUILDLINK_PACKAGES+= kdenetwork
.if !empty(KDENETWORK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.kdenetwork+= kdenetwork>=3.5.0nb1
-BUILDLINK_RECOMMENDED.kdenetwork?= kdenetwork>=3.5.1nb1
+BUILDLINK_API_DEPENDS.kdenetwork+= kdenetwork>=3.5.0nb1
+BUILDLINK_ABI_DEPENDS.kdenetwork?= kdenetwork>=3.5.1nb1
BUILDLINK_PKGSRCDIR.kdenetwork?= ../../net/kdenetwork3
.endif # KDENETWORK_BUILDLINK3_MK
diff --git a/net/libIDL/buildlink3.mk b/net/libIDL/buildlink3.mk
index e5aff59f629..5700a6bd942 100644
--- a/net/libIDL/buildlink3.mk
+++ b/net/libIDL/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:10:26 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:22:32 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBIDL_BUILDLINK3_MK:= ${LIBIDL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NlibIDL}
BUILDLINK_PACKAGES+= libIDL
.if !empty(LIBIDL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libIDL+= libIDL>=0.8.3nb1
-BUILDLINK_RECOMMENDED.libIDL+= libIDL>=0.8.6nb1
+BUILDLINK_API_DEPENDS.libIDL+= libIDL>=0.8.3nb1
+BUILDLINK_ABI_DEPENDS.libIDL+= libIDL>=0.8.6nb1
BUILDLINK_PKGSRCDIR.libIDL?= ../../net/libIDL
.endif # LIBIDL_BUILDLINK3_MK
diff --git a/net/libares/buildlink3.mk b/net/libares/buildlink3.mk
index f052b339ea4..e1224908189 100644
--- a/net/libares/buildlink3.mk
+++ b/net/libares/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2005/03/12 05:42:48 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:32 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBARES_BUILDLINK3_MK:= ${LIBARES_BUILDLINK3_MK}+
@@ -13,7 +13,7 @@ BUILDLINK_PACKAGES+= libares
.include "../../mk/bsd.prefs.mk"
.if !empty(LIBARES_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libares+= libares>=1.1.1
+BUILDLINK_API_DEPENDS.libares+= libares>=1.1.1
BUILDLINK_PKGSRCDIR.libares?= ../../net/libares
BUILDLINK_DEPMETHOD.libares?= build
.endif # LIBARES_BUILDLINK3_MK
diff --git a/net/libcares/buildlink3.mk b/net/libcares/buildlink3.mk
index 691eaf19d67..0072505729c 100644
--- a/net/libcares/buildlink3.mk
+++ b/net/libcares/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/12/01 17:27:10 adrianp Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:33 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBCARES_BUILDLINK3_MK:= ${LIBCARES_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibcares}
BUILDLINK_PACKAGES+= libcares
.if !empty(LIBCARES_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libcares+= libcares>=1.3.0
+BUILDLINK_API_DEPENDS.libcares+= libcares>=1.3.0
BUILDLINK_PKGSRCDIR.libcares?= ../../net/libcares
.endif # LIBCARES_BUILDLINK3_MK
diff --git a/net/libdnet/buildlink3.mk b/net/libdnet/buildlink3.mk
index 083c042e475..a36cfac687c 100644
--- a/net/libdnet/buildlink3.mk
+++ b/net/libdnet/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:10:26 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:33 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBDNET_BUILDLINK3_MK:= ${LIBDNET_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibdnet}
BUILDLINK_PACKAGES+= libdnet
.if !empty(LIBDNET_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libdnet+= libdnet>=1.7
-BUILDLINK_RECOMMENDED.libdnet?= libdnet>=1.10nb1
+BUILDLINK_API_DEPENDS.libdnet+= libdnet>=1.7
+BUILDLINK_ABI_DEPENDS.libdnet?= libdnet>=1.10nb1
BUILDLINK_PKGSRCDIR.libdnet?= ../../net/libdnet
.endif # LIBDNET_BUILDLINK3_MK
diff --git a/net/liblive/buildlink3.mk b/net/liblive/buildlink3.mk
index 34131f6ab62..d8b75ca4950 100644
--- a/net/liblive/buildlink3.mk
+++ b/net/liblive/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:17:54 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:33 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBLIVE_BUILDLINK3_MK:= ${LIBLIVE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nliblive}
BUILDLINK_PACKAGES+= liblive
.if !empty(LIBLIVE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.liblive+= liblive>=2003.04.04
-BUILDLINK_RECOMMENDED.liblive+= liblive>=2003.04.04nb1
+BUILDLINK_API_DEPENDS.liblive+= liblive>=2003.04.04
+BUILDLINK_ABI_DEPENDS.liblive+= liblive>=2003.04.04nb1
BUILDLINK_PKGSRCDIR.liblive?= ../../net/liblive
.endif # LIBLIVE_BUILDLINK3_MK
diff --git a/net/libnids/buildlink3.mk b/net/libnids/buildlink3.mk
index e5c3183fca4..afcba515e30 100644
--- a/net/libnids/buildlink3.mk
+++ b/net/libnids/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/04/25 04:25:11 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:33 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBNIDS_BUILDLINK3_MK:= ${LIBNIDS_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibnids}
BUILDLINK_PACKAGES+= libnids
.if !empty(LIBNIDS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libnids+= libnids>=1.18
+BUILDLINK_API_DEPENDS.libnids+= libnids>=1.18
BUILDLINK_PKGSRCDIR.libnids?= ../../net/libnids
BUILDLINK_DEPMETHOD.libnids?= build
.endif # LIBNIDS_BUILDLINK3_MK
diff --git a/net/libpcap/buildlink3.mk b/net/libpcap/buildlink3.mk
index 6e5664da549..7045eecfea6 100644
--- a/net/libpcap/buildlink3.mk
+++ b/net/libpcap/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2005/01/12 15:44:12 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2006/04/06 06:22:33 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBPCAP_BUILDLINK3_MK:= ${LIBPCAP_BUILDLINK3_MK}+
@@ -14,7 +14,7 @@ BUILDLINK_PACKAGES+= libpcap
.if !empty(LIBPCAP_BUILDLINK3_MK:M+)
# XXX?
-BUILDLINK_DEPENDS.libpcap+= libpcap>=0.5.0
+BUILDLINK_API_DEPENDS.libpcap+= libpcap>=0.5.0
BUILDLINK_PKGSRCDIR.libpcap?= ../../net/libpcap
# on Solaris, we always need libnsl and libsocket because libpcap.a
diff --git a/net/libpcap/builtin.mk b/net/libpcap/builtin.mk
index cc808181ce0..5eb94001dab 100644
--- a/net/libpcap/builtin.mk
+++ b/net/libpcap/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.13 2006/03/30 18:06:18 jlam Exp $
+# $NetBSD: builtin.mk,v 1.14 2006/04/06 06:22:33 reed Exp $
BUILTIN_PKG:= libpcap
@@ -82,7 +82,7 @@ USE_BUILTIN.libpcap= ${IS_BUILTIN.libpcap}
. if defined(BUILTIN_PKG.libpcap) && \
!empty(IS_BUILTIN.libpcap:M[yY][eE][sS])
USE_BUILTIN.libpcap= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.libpcap}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.libpcap}
. if !empty(USE_BUILTIN.libpcap:M[yY][eE][sS])
USE_BUILTIN.libpcap!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.libpcap:Q}; then \
diff --git a/net/libradius/buildlink3.mk b/net/libradius/buildlink3.mk
index cf11fce7f03..98df5446f61 100644
--- a/net/libradius/buildlink3.mk
+++ b/net/libradius/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/11/11 11:57:47 grant Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:33 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBRADIUS_LINUX_BUILDLINK3_MK:= ${LIBRADIUS_LINUX_BUILDLINK3_MK}+
@@ -13,7 +13,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibradius}
BUILDLINK_PACKAGES+= libradius
.if !empty(LIBRADIUS_LINUX_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libradius+= libradius>=20040827
+BUILDLINK_API_DEPENDS.libradius+= libradius>=20040827
BUILDLINK_PKGSRCDIR.libradius?= ../../net/libradius
BUILDLINK_DEPMETHOD.libradius?= build
diff --git a/net/libsoup-devel/buildlink3.mk b/net/libsoup-devel/buildlink3.mk
index ee9db711cb5..0979426df11 100644
--- a/net/libsoup-devel/buildlink3.mk
+++ b/net/libsoup-devel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:10:26 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:33 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBSOUP_DEVEL_BUILDLINK3_MK:= ${LIBSOUP_DEVEL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibsoup-devel}
BUILDLINK_PACKAGES+= libsoup-devel
.if !empty(LIBSOUP_DEVEL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libsoup-devel+= libsoup-devel>=2.2.0
-BUILDLINK_RECOMMENDED.libsoup-devel?= libsoup-devel>=2.2.7nb1
+BUILDLINK_API_DEPENDS.libsoup-devel+= libsoup-devel>=2.2.0
+BUILDLINK_ABI_DEPENDS.libsoup-devel?= libsoup-devel>=2.2.7nb1
BUILDLINK_PKGSRCDIR.libsoup-devel?= ../../net/libsoup-devel
.endif # LIBSOUP_DEVEL_BUILDLINK3_MK
diff --git a/net/libsoup/buildlink3.mk b/net/libsoup/buildlink3.mk
index a889ee489c3..541919d306a 100644
--- a/net/libsoup/buildlink3.mk
+++ b/net/libsoup/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/05 23:10:26 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:22:33 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBSOUP_BUILDLINK3_MK:= ${LIBSOUP_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibsoup}
BUILDLINK_PACKAGES+= libsoup
.if !empty(LIBSOUP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libsoup+= libsoup>=1.99.28nb3
-BUILDLINK_RECOMMENDED.libsoup?= libsoup>=1.99.28nb4
+BUILDLINK_API_DEPENDS.libsoup+= libsoup>=1.99.28nb3
+BUILDLINK_ABI_DEPENDS.libsoup?= libsoup>=1.99.28nb4
BUILDLINK_PKGSRCDIR.libsoup?= ../../net/libsoup
.endif # LIBSOUP_BUILDLINK3_MK
diff --git a/net/libtorrent/buildlink3.mk b/net/libtorrent/buildlink3.mk
index 36e7b3fb9ed..69a89aa14d4 100644
--- a/net/libtorrent/buildlink3.mk
+++ b/net/libtorrent/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/03/03 15:30:53 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:33 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBTORRENT_BUILDLINK3_MK:= ${LIBTORRENT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibtorrent}
BUILDLINK_PACKAGES+= libtorrent
.if !empty(LIBTORRENT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libtorrent+= libtorrent>=0.8.0
-BUILDLINK_RECOMMENDED.libtorrent+= libtorrent>=0.8.5nb1
+BUILDLINK_API_DEPENDS.libtorrent+= libtorrent>=0.8.0
+BUILDLINK_ABI_DEPENDS.libtorrent+= libtorrent>=0.8.5nb1
BUILDLINK_PKGSRCDIR.libtorrent?= ../../net/libtorrent
.endif # LIBTORRENT_BUILDLINK3_MK
diff --git a/net/linc/buildlink3.mk b/net/linc/buildlink3.mk
index ca2fd306a4f..e7f121420e2 100644
--- a/net/linc/buildlink3.mk
+++ b/net/linc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:26 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:33 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LINC_BUILDLINK3_MK:= ${LINC_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlinc}
BUILDLINK_PACKAGES+= linc
.if !empty(LINC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.linc+= linc>=1.1.1
-BUILDLINK_RECOMMENDED.linc+= linc>=1.1.1nb3
+BUILDLINK_API_DEPENDS.linc+= linc>=1.1.1
+BUILDLINK_ABI_DEPENDS.linc+= linc>=1.1.1nb3
BUILDLINK_PKGSRCDIR.linc?= ../../net/linc
.endif # LINC_BUILDLINK3_MK
diff --git a/net/mDNSResponder/buildlink3.mk b/net/mDNSResponder/buildlink3.mk
index 879c6a7ae3d..013c879f140 100644
--- a/net/mDNSResponder/buildlink3.mk
+++ b/net/mDNSResponder/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:10:26 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:33 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
MDNSRESPONDER_BUILDLINK3_MK:= ${MDNSRESPONDER_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NmDNSResponder}
BUILDLINK_PACKAGES+= mDNSResponder
.if !empty(MDNSRESPONDER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.mDNSResponder+= mDNSResponder>=98
-BUILDLINK_RECOMMENDED.mDNSResponder?= mDNSResponder>=107.5nb1
+BUILDLINK_API_DEPENDS.mDNSResponder+= mDNSResponder>=98
+BUILDLINK_ABI_DEPENDS.mDNSResponder?= mDNSResponder>=107.5nb1
BUILDLINK_PKGSRCDIR.mDNSResponder?= ../../net/mDNSResponder
.endif # MDNSRESPONDER_BUILDLINK3_MK
diff --git a/net/mldonkey-gui/options.mk b/net/mldonkey-gui/options.mk
index 610dcb01d48..0d3b7901189 100644
--- a/net/mldonkey-gui/options.mk
+++ b/net/mldonkey-gui/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2005/11/01 21:48:22 wiz Exp $
+# $NetBSD: options.mk,v 1.5 2006/04/06 06:22:33 reed Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.mldonkey-gui
PKG_OPTIONS_REQUIRED_GROUPS+= toolkit
@@ -17,6 +17,6 @@ CONFIGURE_ARGS+= --enable-gui=newgui2
.include "../../graphics/librsvg2/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
# 2.6.0 is the first ~stable version (for mldonkey)
-BUILDLINK_DEPENDS.lablgtk2+= lablgtk2>=2.6.0
+BUILDLINK_API_DEPENDS.lablgtk2+= lablgtk2>=2.6.0
.include "../../x11/lablgtk2/buildlink3.mk"
.endif
diff --git a/net/nemesis/Makefile b/net/nemesis/Makefile
index 3c555d7b614..6d7f56618e9 100644
--- a/net/nemesis/Makefile
+++ b/net/nemesis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/03/04 21:30:21 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2006/04/06 06:22:33 reed Exp $
DISTNAME= nemesis-1.4
CATEGORIES= net
@@ -10,7 +10,7 @@ COMMENT= Nemesis is a command-line UNIX network packet injection suite
GNU_CONFIGURE= yes
-BUILDLINK_DEPENDS.libnet+= libnet-1.0.2a
+BUILDLINK_API_DEPENDS.libnet+= libnet-1.0.2a
.include "../../net/libpcap/buildlink3.mk"
.include "../../devel/libnet/buildlink3.mk"
diff --git a/net/net-snmp/buildlink3.mk b/net/net-snmp/buildlink3.mk
index 9eee157b06b..f1b74d812cd 100644
--- a/net/net-snmp/buildlink3.mk
+++ b/net/net-snmp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/01/24 22:16:55 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:33 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
NET_SNMP_BUILDLINK3_MK:= ${NET_SNMP_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nnet-snmp}
BUILDLINK_PACKAGES+= net-snmp
.if !empty(NET_SNMP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.net-snmp+= net-snmp>=5.0.9nb3
-BUILDLINK_RECOMMENDED.net-snmp+= net-snmp>=5.2.1.2
+BUILDLINK_API_DEPENDS.net-snmp+= net-snmp>=5.0.9nb3
+BUILDLINK_ABI_DEPENDS.net-snmp+= net-snmp>=5.2.1.2
BUILDLINK_PKGSRCDIR.net-snmp?= ../../net/net-snmp
.endif # NET_SNMP_BUILDLINK3_MK
diff --git a/net/netatalk/buildlink3.mk b/net/netatalk/buildlink3.mk
index fcd645bf0f4..fb653cb6179 100644
--- a/net/netatalk/buildlink3.mk
+++ b/net/netatalk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:10:27 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:22:33 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
NETATALK_BUILDLINK3_MK:= ${NETATALK_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nnetatalk}
BUILDLINK_PACKAGES+= netatalk
.if !empty(NETATALK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.netatalk+= netatalk>=2.0.3nb2
-BUILDLINK_RECOMMENDED.netatalk?= netatalk>=2.0.3nb3
+BUILDLINK_API_DEPENDS.netatalk+= netatalk>=2.0.3nb2
+BUILDLINK_ABI_DEPENDS.netatalk?= netatalk>=2.0.3nb3
BUILDLINK_PKGSRCDIR.netatalk?= ../../net/netatalk
BUILDLINK_DEPMETHOD.netatalk?= build
.endif # NETATALK_BUILDLINK3_MK
diff --git a/net/netatalk1/buildlink3.mk b/net/netatalk1/buildlink3.mk
index 254d6b1beee..c41452d750c 100644
--- a/net/netatalk1/buildlink3.mk
+++ b/net/netatalk1/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:10:27 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:33 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
NETATALK_BUILDLINK3_MK:= ${NETATALK_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGESNnetatalk}
BUILDLINK_PACKAGES+= netatalk
.if !empty(NETATALK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.netatalk+= netatalk>=1.6.2
-BUILDLINK_RECOMMENDED.netatalk+= netatalk>=1.6.4anb1
+BUILDLINK_API_DEPENDS.netatalk+= netatalk>=1.6.2
+BUILDLINK_ABI_DEPENDS.netatalk+= netatalk>=1.6.4anb1
BUILDLINK_PKGSRCDIR.netatalk?= ../../net/netatalk1
.endif # NETATALK_BUILDLINK3_MK
diff --git a/net/netbsd-tap/buildlink3.mk b/net/netbsd-tap/buildlink3.mk
index d74e7661daf..c69b5ecef9f 100644
--- a/net/netbsd-tap/buildlink3.mk
+++ b/net/netbsd-tap/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2005/02/20 21:50:57 cube Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:34 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
NETBSD_TAP_BUILDLINK3_MK:= ${NETBSD_TAP_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nnetbsd-tap}
BUILDLINK_PACKAGES+= netbsd-tap
.if !empty(NETBSD_TAP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.netbsd-tap+= netbsd-tap>=20050120
+BUILDLINK_API_DEPENDS.netbsd-tap+= netbsd-tap>=20050120
BUILDLINK_PKGSRCDIR.netbsd-tap?= ../../net/netbsd-tap
.endif # NETBSD_TAP_BUILDLINK3_MK
diff --git a/net/netbsd-tap/builtin.mk b/net/netbsd-tap/builtin.mk
index ff2670ea28f..f3d7c6f3f5b 100644
--- a/net/netbsd-tap/builtin.mk
+++ b/net/netbsd-tap/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.3 2006/03/30 18:06:18 jlam Exp $
+# $NetBSD: builtin.mk,v 1.4 2006/04/06 06:22:34 reed Exp $
BUILTIN_PKG:= netbsd-tap
@@ -32,7 +32,7 @@ USE_BUILTIN.netbsd-tap= ${IS_BUILTIN.netbsd-tap}
. if defined(BUILTIN_PKG.netbsd-tap) && \
!empty(IS_BUILTIN.netbsd-tap:M[yY][eE][sS])
USE_BUILTIN.netbsd-tap= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.netbsd-tap}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.netbsd-tap}
. if !empty(USE_BUILTIN.netbsd-tap:M[yY][eE][sS])
USE_BUILTIN.netbsd-tap!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.netbsd-tap:Q}; then \
diff --git a/net/ns/Makefile b/net/ns/Makefile
index f89a71b2bff..8797b648a05 100644
--- a/net/ns/Makefile
+++ b/net/ns/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/02/23 23:37:47 minskim Exp $
+# $NetBSD: Makefile,v 1.25 2006/04/06 06:22:34 reed Exp $
DISTNAME= ns-src-2.29
PKGNAME= ${DISTNAME:S/-src//}
@@ -12,8 +12,8 @@ COMMENT= The UCB/LBNL Network Simulator Version 2
PKG_INSTALLATION_TYPES= overwrite pkgviews
-BUILDLINK_DEPENDS.tcl+= tcl>=8.4.12nb1
-BUILDLINK_DEPENDS.tk+= tk>=8.4.12nb2
+BUILDLINK_API_DEPENDS.tcl+= tcl>=8.4.12nb1
+BUILDLINK_API_DEPENDS.tk+= tk>=8.4.12nb2
WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//}
USE_LANGUAGES= c c++
diff --git a/net/nsd/Makefile b/net/nsd/Makefile
index bf2be539a9e..aa1b4e7c22f 100644
--- a/net/nsd/Makefile
+++ b/net/nsd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/12/29 06:22:00 jlam Exp $
+# $NetBSD: Makefile,v 1.35 2006/04/06 06:22:34 reed Exp $
DISTNAME= nsd-2.3.3
CATEGORIES= net
@@ -9,7 +9,7 @@ HOMEPAGE= http://www.nlnetlabs.nl/nsd/index.html
COMMENT= Authoritative-only DNS server
BUILD_DEFS+= USE_INET6
-BUILDLINK_DEPENDS.openssl+= openssl>=0.9.7
+BUILDLINK_API_DEPENDS.openssl+= openssl>=0.9.7
.include "../../mk/bsd.prefs.mk"
diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index 3d00d9c31fe..311b4da76af 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2006/02/05 23:10:28 joerg Exp $
+# $NetBSD: Makefile,v 1.44 2006/04/06 06:22:34 reed Exp $
DISTNAME= ntop-3.2
PKGREVISION= 1
@@ -29,7 +29,7 @@ CONFIGURE_ARGS+= --with-zlib-root=${BUILDLINK_PREFIX.zlib}
# ntop-3.x crashes with IPv6
CONFIGURE_ARGS+= --disable-ipv6
-BUILDLINK_DEPENDS.libpcap+= libpcap>=0.8.3
+BUILDLINK_API_DEPENDS.libpcap+= libpcap>=0.8.3
.include "../../mk/pthread.buildlink3.mk"
.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "none"
diff --git a/net/openh323/buildlink3.mk b/net/openh323/buildlink3.mk
index eb6666c039f..68493125c4b 100644
--- a/net/openh323/buildlink3.mk
+++ b/net/openh323/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:28 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:34 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OPENH323_BUILDLINK3_MK:= ${OPENH323_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nopenh323}
BUILDLINK_PACKAGES+= openh323
.if !empty(OPENH323_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.openh323+= openh323>=1.15.1
-BUILDLINK_RECOMMENDED.openh323+= openh323>=1.15.2nb1
+BUILDLINK_API_DEPENDS.openh323+= openh323>=1.15.1
+BUILDLINK_ABI_DEPENDS.openh323+= openh323>=1.15.2nb1
BUILDLINK_PKGSRCDIR.openh323?= ../../net/openh323
.endif # OPENH323_BUILDLINK3_MK
diff --git a/net/openslp/buildlink3.mk b/net/openslp/buildlink3.mk
index c00c64589ae..bc8c6a314f0 100644
--- a/net/openslp/buildlink3.mk
+++ b/net/openslp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2005/05/26 20:14:21 adrianp Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:22:34 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OPENSLP_BUILDLINK3_MK:= ${OPENSLP_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nopenslp}
BUILDLINK_PACKAGES+= openslp
.if !empty(OPENSLP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.openslp+= openslp>=1.0.1
-BUILDLINK_RECOMMENDED.openslp+= openslp>=1.2.1
+BUILDLINK_API_DEPENDS.openslp+= openslp>=1.0.1
+BUILDLINK_ABI_DEPENDS.openslp+= openslp>=1.2.1
BUILDLINK_PKGSRCDIR.openslp?= ../../net/openslp
.endif # OPENSLP_BUILDLINK3_MK
diff --git a/net/p5-Net-Packet/Makefile b/net/p5-Net-Packet/Makefile
index ed1d91986f0..8c35972ccad 100644
--- a/net/p5-Net-Packet/Makefile
+++ b/net/p5-Net-Packet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/11/05 19:37:54 kristerw Exp $
+# $NetBSD: Makefile,v 1.3 2006/04/06 06:22:34 reed Exp $
DISTNAME= Net-Packet-2.04
PKGNAME= p5-${DISTNAME}
@@ -16,7 +16,7 @@ DEPENDS+= p5-Net-IPv6Addr-[0-9]*:../../net/p5-Net-IPv6Addr
DEPENDS+= p5-Class-Gomor-Hash-[0-9]*:../../devel/p5-Class-Gomor-Hash
PKG_INSTALLATION_TYPES= overwrite pkgviews
-BUILDLINK_DEPENDS.libpcap+= libpcap>=0.9.3nb2
+BUILDLINK_API_DEPENDS.libpcap+= libpcap>=0.9.3nb2
PERL5_PACKLIST= auto/Net/Packet/.packlist
diff --git a/net/p5-Net-Pcap/Makefile b/net/p5-Net-Pcap/Makefile
index bd40a58b935..18b1910f933 100644
--- a/net/p5-Net-Pcap/Makefile
+++ b/net/p5-Net-Pcap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/01/26 02:00:16 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.10 2006/04/06 06:22:34 reed Exp $
#
DISTNAME= Net-Pcap-0.11
@@ -10,7 +10,7 @@ MAINTAINER= adrianp@NetBSD.org
HOMEPAGE= http://search.cpan.org/dist/Net-Pcap/
COMMENT= Perl interface to pcap(3) LBL packet capture library
-BUILDLINK_DEPENDS.libpcap+= libpcap>=0.8.1
+BUILDLINK_API_DEPENDS.libpcap+= libpcap>=0.8.1
PERL5_PACKLIST= auto/Net/Pcap/.packlist
diff --git a/net/py-ORBit/Makefile b/net/py-ORBit/Makefile
index effa4f0c255..50198d5f891 100644
--- a/net/py-ORBit/Makefile
+++ b/net/py-ORBit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/02/05 23:10:30 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2006/04/06 06:22:34 reed Exp $
#
DISTNAME= pyorbit-2.0.1
@@ -20,7 +20,7 @@ GNU_CONFIGURE= YES
CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
PYTHON_VERSIONS_ACCEPTED= 24 23 22
-BUILDLINK_DEPENDS.python22+= python22>=2.2.2nb2
+BUILDLINK_API_DEPENDS.python22+= python22>=2.2.2nb2
.include "../../net/ORBit2/buildlink3.mk"
.include "../../lang/python/extension.mk"
diff --git a/net/py-ORBit/buildlink3.mk b/net/py-ORBit/buildlink3.mk
index 56fe3578c46..92aeb5cfa07 100644
--- a/net/py-ORBit/buildlink3.mk
+++ b/net/py-ORBit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/05 23:10:30 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:22:34 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_ORBIT_BUILDLINK3_MK:= ${PY_ORBIT_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npyorbit}
BUILDLINK_PACKAGES+= pyorbit
.if !empty(PY_ORBIT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pyorbit+= ${PYPKGPREFIX}-ORBit>=2.0.0nb1
-BUILDLINK_RECOMMENDED.pyorbit+= ${PYPKGPREFIX}-ORBit>=2.0.1nb1
+BUILDLINK_API_DEPENDS.pyorbit+= ${PYPKGPREFIX}-ORBit>=2.0.0nb1
+BUILDLINK_ABI_DEPENDS.pyorbit+= ${PYPKGPREFIX}-ORBit>=2.0.1nb1
BUILDLINK_PKGSRCDIR.pyorbit?= ../../net/py-ORBit
.endif # PY_ORBIT_BUILDLINK3_MK
diff --git a/net/py-libdnet/buildlink3.mk b/net/py-libdnet/buildlink3.mk
index 43031fbc7df..163ad3036dc 100644
--- a/net/py-libdnet/buildlink3.mk
+++ b/net/py-libdnet/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:10:30 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:34 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PYLIBDNET_BUILDLINK3_MK:= ${PYLIBDNET_BUILDLINK3_MK}+
@@ -14,8 +14,8 @@ BUILDLINK_PACKAGES+= pylibdnet
.include "../../lang/python/pyversion.mk"
-BUILDLINK_DEPENDS.pylibdnet+= ${PYPKGPREFIX}-libdnet>=1.7
-BUILDLINK_RECOMMENDED.pylibdnet?= ${PYPKGPREFIX}-libdnet>=1.10nb1
+BUILDLINK_API_DEPENDS.pylibdnet+= ${PYPKGPREFIX}-libdnet>=1.7
+BUILDLINK_ABI_DEPENDS.pylibdnet?= ${PYPKGPREFIX}-libdnet>=1.10nb1
BUILDLINK_PKGSRCDIR.pylibdnet?= ../../net/py-libdnet
.endif # PYLIBDNET_BUILDLINK3_MK
diff --git a/net/py-libpcap/Makefile b/net/py-libpcap/Makefile
index 8a7889733c6..7921c9dd63b 100644
--- a/net/py-libpcap/Makefile
+++ b/net/py-libpcap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/03/04 21:30:23 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2006/04/06 06:22:34 reed Exp $
#
DISTNAME= pylibpcap-0.5.1
@@ -11,7 +11,7 @@ HOMEPAGE= http://pylibpcap.sourceforge.net/
COMMENT= Python wrapper for libpcap
PYDISTUTILSPKG= yes
-BUILDLINK_DEPENDS.libpcap+= libpcap>=0.9.3nb1
+BUILDLINK_API_DEPENDS.libpcap+= libpcap>=0.9.3nb1
pre-build:
(cd ${WRKSRC} && ${PYTHONBIN} mk-constants.py)
diff --git a/net/py-libpcap/buildlink3.mk b/net/py-libpcap/buildlink3.mk
index 25d7893915e..4a9b9eccbd5 100644
--- a/net/py-libpcap/buildlink3.mk
+++ b/net/py-libpcap/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:10:30 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:34 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PYLIBPCAP_BUILDLINK3_MK:= ${PYLIBPCAP_BUILDLINK3_MK}+
@@ -14,8 +14,8 @@ BUILDLINK_PACKAGES+= pylibpcap
.include "../../lang/python/pyversion.mk"
-BUILDLINK_DEPENDS.pylibpcap+= ${PYPKGPREFIX}-libpcap>=0.5.0
-BUILDLINK_RECOMMENDED.pylibpcap?= ${PYPKGPREFIX}-libpcap>=0.5nb1
+BUILDLINK_API_DEPENDS.pylibpcap+= ${PYPKGPREFIX}-libpcap>=0.5.0
+BUILDLINK_ABI_DEPENDS.pylibpcap?= ${PYPKGPREFIX}-libpcap>=0.5nb1
BUILDLINK_PKGSRCDIR.pylibpcap?= ../../net/py-libpcap
.endif # PYLIBPCAP_BUILDLINK3_MK
diff --git a/net/py-soappy/buildlink3.mk b/net/py-soappy/buildlink3.mk
index 9e819b72cee..31c43e4bca2 100644
--- a/net/py-soappy/buildlink3.mk
+++ b/net/py-soappy/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:30 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:34 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_SOAPPY_BUILDLINK3_MK:= ${PY_SOAPPY_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npy-SOAPpy}
BUILDLINK_PACKAGES+= py-SOAPpy
.if !empty(PY_SOAPPY_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.py-SOAPpy+= ${PYPKGPREFIX}-SOAPpy>=0.11.4
-BUILDLINK_RECOMMENDED.py-SOAPpy?= ${PYPKGPREFIX}-SOAPpy>=0.11.4nb4
+BUILDLINK_API_DEPENDS.py-SOAPpy+= ${PYPKGPREFIX}-SOAPpy>=0.11.4
+BUILDLINK_ABI_DEPENDS.py-SOAPpy?= ${PYPKGPREFIX}-SOAPpy>=0.11.4nb4
BUILDLINK_PKGSRCDIR.py-SOAPpy?= ../../net/py-soappy
.endif # PY_SOAPPY_BUILDLINK3_MK
diff --git a/net/samba/buildlink3.mk b/net/samba/buildlink3.mk
index 00378e73e1c..616e01df85c 100644
--- a/net/samba/buildlink3.mk
+++ b/net/samba/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/09/14 17:18:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:34 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SAMBA_BUILDLINK3_MK:= ${SAMBA_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsamba}
BUILDLINK_PACKAGES+= samba
.if !empty(SAMBA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.samba+= samba>=3.0.7
+BUILDLINK_API_DEPENDS.samba+= samba>=3.0.7
BUILDLINK_PKGSRCDIR.samba?= ../../net/samba
.endif # SAMBA_BUILDLINK3_MK
diff --git a/net/scdp/Makefile b/net/scdp/Makefile
index 111fa430a55..c8a02ca5404 100644
--- a/net/scdp/Makefile
+++ b/net/scdp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:46:59 tv Exp $
+# $NetBSD: Makefile,v 1.6 2006/04/06 06:22:34 reed Exp $
#
DISTNAME= scdp-1.0b
@@ -13,7 +13,7 @@ COMMENT= Program to send Cisco Discovery Protocol packets
GNU_CONFIGURE= yes
-BUILDLINK_DEPENDS.libnet+= libnet-1.0.*
+BUILDLINK_API_DEPENDS.libnet+= libnet-1.0.*
.include "../../devel/libnet/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/scli/Makefile b/net/scli/Makefile
index f4a8e16ba76..ef74ce99bf3 100644
--- a/net/scli/Makefile
+++ b/net/scli/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/04/06 03:20:54 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2006/04/06 06:22:34 reed Exp $
#
DISTNAME= scli-0.2.12
@@ -13,7 +13,7 @@ COMMENT= SNMP command line interface
GNU_CONFIGURE= yes
USE_GNU_READLINE= # history_list
-BUILDLINK_DEPENDS.readline+= readline>=4.0
+BUILDLINK_API_DEPENDS.readline+= readline>=4.0
INFO_FILES= # PLIST
diff --git a/net/socks4/buildlink3.mk b/net/socks4/buildlink3.mk
index e83b6e5c4d9..231617d50b4 100644
--- a/net/socks4/buildlink3.mk
+++ b/net/socks4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:38 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:34 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SOCKS4_BUILDLINK3_MK:= ${SOCKS4_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsocks4}
BUILDLINK_PACKAGES+= socks4
.if !empty(SOCKS4_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.socks4+= socks4>=2.2
+BUILDLINK_API_DEPENDS.socks4+= socks4>=2.2
BUILDLINK_PKGSRCDIR.socks4?= ../../net/socks4
BUILDLINK_TRANSFORM+= l:socks:socks4
diff --git a/net/socks5/buildlink3.mk b/net/socks5/buildlink3.mk
index 8a9980928c1..15f29662c4d 100644
--- a/net/socks5/buildlink3.mk
+++ b/net/socks5/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:39 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:34 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SOCKS5_BUILDLINK3_MK:= ${SOCKS5_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsocks5}
BUILDLINK_PACKAGES+= socks5
.if !empty(SOCKS5_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.socks5+= socks5>=1.0.2
+BUILDLINK_API_DEPENDS.socks5+= socks5>=1.0.2
BUILDLINK_PKGSRCDIR.socks5?= ../../net/socks5
.endif # SOCKS5_BUILDLINK3_MK
diff --git a/net/soup/buildlink3.mk b/net/soup/buildlink3.mk
index 7eaef201fa4..3fbaf6c4cbb 100644
--- a/net/soup/buildlink3.mk
+++ b/net/soup/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:10:31 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:34 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SOUP_BUILDLINK3_MK:= ${SOUP_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsoup}
BUILDLINK_PACKAGES+= soup
.if !empty(SOUP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.soup?= soup>=0.7.11nb3
-BUILDLINK_RECOMMENDED.soup?= soup>=0.7.11nb5
+BUILDLINK_API_DEPENDS.soup?= soup>=0.7.11nb3
+BUILDLINK_ABI_DEPENDS.soup?= soup>=0.7.11nb5
BUILDLINK_PKGSRCDIR.soup?= ../../net/soup
.endif # SOUP_BUILDLINK3_MK
diff --git a/net/spread/buildlink3.mk b/net/spread/buildlink3.mk
index 135749cf18b..88b5adef683 100644
--- a/net/spread/buildlink3.mk
+++ b/net/spread/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:39 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:35 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SPREAD_BUILDLINK3_MK:= ${SPREAD_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nspread}
BUILDLINK_PACKAGES+= spread
.if !empty(SPREAD_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.spread+= spread>=3.17.1
+BUILDLINK_API_DEPENDS.spread+= spread>=3.17.1
BUILDLINK_PKGSRCDIR.spread?= ../../net/spread
.endif # SPREAD_BUILDLINK3_MK
diff --git a/net/tcl-scotty/Makefile b/net/tcl-scotty/Makefile
index 7f2334389e9..97102e2c975 100644
--- a/net/tcl-scotty/Makefile
+++ b/net/tcl-scotty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/04/11 21:47:00 tv Exp $
+# $NetBSD: Makefile,v 1.19 2006/04/06 06:22:35 reed Exp $
#
DISTNAME= scotty-${DIST_VERS}
@@ -11,7 +11,7 @@ MAINTAINER= jwise@NetBSD.org
HOMEPAGE= http://wwwhome.cs.utwente.nl/~schoenw/scotty/
COMMENT= Network management extensions to TCL
-BUILDLINK_DEPENDS.tcl+= tcl>=8.4.6nb4
+BUILDLINK_API_DEPENDS.tcl+= tcl>=8.4.6nb4
PKG_INSTALLATION_TYPES= overwrite pkgviews
diff --git a/net/tcl-scotty/buildlink3.mk b/net/tcl-scotty/buildlink3.mk
index ba37195232c..94e77847404 100644
--- a/net/tcl-scotty/buildlink3.mk
+++ b/net/tcl-scotty/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:18:00 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:35 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
TCL_SCOTTY_BUILDLINK3_MK:= ${TCL_SCOTTY_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntcl-scotty}
BUILDLINK_PACKAGES+= tcl-scotty
.if !empty(TCL_SCOTTY_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tcl-scotty+= tcl-scotty>=2.1.11
-BUILDLINK_RECOMMENDED.tcl-scotty+= tcl-scotty>=2.1.11nb4
+BUILDLINK_API_DEPENDS.tcl-scotty+= tcl-scotty>=2.1.11
+BUILDLINK_ABI_DEPENDS.tcl-scotty+= tcl-scotty>=2.1.11nb4
BUILDLINK_PKGSRCDIR.tcl-scotty?= ../../net/tcl-scotty
.endif # TCL_SCOTTY_BUILDLINK3_MK
diff --git a/net/tcpdump/Makefile b/net/tcpdump/Makefile
index 5f43675732e..b389b4f3f6a 100644
--- a/net/tcpdump/Makefile
+++ b/net/tcpdump/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/03/04 21:30:24 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2006/04/06 06:22:35 reed Exp $
DISTNAME= tcpdump-3.9.4
CATEGORIES= net
@@ -13,7 +13,7 @@ GNU_CONFIGURE= YES
.include "options.mk"
# not strictly needed
-BUILDLINK_DEPENDS.libpcap+= libpcap>=0.9.3
+BUILDLINK_API_DEPENDS.libpcap+= libpcap>=0.9.3
.include "../../net/libpcap/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
diff --git a/net/tcpreplay/Makefile b/net/tcpreplay/Makefile
index 0ba4bc946b1..7431165d85c 100644
--- a/net/tcpreplay/Makefile
+++ b/net/tcpreplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/03/04 21:30:25 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2006/04/06 06:22:35 reed Exp $
DISTNAME= tcpreplay-2.3.5
CATEGORIES= net
@@ -8,7 +8,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://tcpreplay.sourceforge.net/
COMMENT= Replay saved tcpdump or snoop files
-BUILDLINK_DEPENDS.libpcap+= libpcap>=0.6
+BUILDLINK_API_DEPENDS.libpcap+= libpcap>=0.6
GNU_CONFIGURE= yes
diff --git a/net/tcptraceroute/Makefile b/net/tcptraceroute/Makefile
index 6b59ec7fcb5..1edfec9ad97 100644
--- a/net/tcptraceroute/Makefile
+++ b/net/tcptraceroute/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/06/17 03:50:28 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2006/04/06 06:22:35 reed Exp $
#
DISTNAME= tcptraceroute-1.4
@@ -11,7 +11,7 @@ HOMEPAGE= http://michael.toren.net/code/tcptraceroute/
COMMENT= Traceroute implementation using TCP packets
-BUILDLINK_DEPENDS.libnet+= libnet-1.0.*
+BUILDLINK_API_DEPENDS.libnet+= libnet-1.0.*
BUILD_TARGET= tcptraceroute
diff --git a/net/tor/Makefile b/net/tor/Makefile
index 2357decf8f8..6e9aaa686b3 100644
--- a/net/tor/Makefile
+++ b/net/tor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2006/03/14 01:14:31 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2006/04/06 06:22:35 reed Exp $
#
DISTNAME= tor-0.1.0.17
@@ -60,7 +60,7 @@ post-install:
${INSTALL_DATA_DIR} ${PREFIX}/${RCD_SCRIPTS_EXAMPLEDIR}
${INSTALL_SCRIPT} ${WRKSRC}/tor.pkgsrc.rc ${PREFIX}/${RCD_SCRIPTS_EXAMPLEDIR}/tor
-BUILDLINK_DEPENDS.libevent+= libevent>=1.1a
+BUILDLINK_API_DEPENDS.libevent+= libevent>=1.1a
# XXX the pkgsrc libevent builtin.mk does not detect the version of a builtin
# libevent, so we need to force use of the pkgsrc one
USE_BUILTIN.libevent= no
diff --git a/net/trafshow/Makefile b/net/trafshow/Makefile
index 183aadb9344..2097c875f9b 100644
--- a/net/trafshow/Makefile
+++ b/net/trafshow/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/03/04 21:30:25 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2006/04/06 06:22:35 reed Exp $
DISTNAME= trafshow-5.2.1
PKGREVISION= 1
@@ -29,7 +29,7 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/.trafshow \
${PREFIX}/share/examples/trafshow/trafshow
-BUILDLINK_DEPENDS.libpcap+= libpcap>=0.7
+BUILDLINK_API_DEPENDS.libpcap+= libpcap>=0.7
.include "../../net/libpcap/buildlink3.mk"
.include "../../mk/curses.buildlink3.mk"
diff --git a/net/ucarp/Makefile b/net/ucarp/Makefile
index 08707bc4896..64c46654109 100644
--- a/net/ucarp/Makefile
+++ b/net/ucarp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/02/05 23:10:32 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2006/04/06 06:22:35 reed Exp $
#
DISTNAME= ucarp-1.1
@@ -15,7 +15,7 @@ USE_PKGLOCALEDIR= YES
GNU_CONFIGURE= YES
# pcap_freecode with one argument only
-BUILDLINK_DEPENDS.libpcap+= libpcap>=0.6.0
+BUILDLINK_API_DEPENDS.libpcap+= libpcap>=0.6.0
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ucarp
diff --git a/net/unison-devel/Makefile b/net/unison-devel/Makefile
index 95b9afd609d..6a8052e4f52 100644
--- a/net/unison-devel/Makefile
+++ b/net/unison-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/02/05 23:10:32 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2006/04/06 06:22:35 reed Exp $
DISTNAME= unison-2.17.1
PKGREVISION= 2
@@ -12,7 +12,7 @@ COMMENT= File-synchronization tool
PKG_INSTALLATION_TYPES= overwrite pkgviews
DIST_SUBDIR= ${PKGNAME_NOREV}
-BUILDLINK_DEPENDS.ocaml+= ocaml>=3.08.2
+BUILDLINK_API_DEPENDS.ocaml+= ocaml>=3.08.2
# docs: unison-manual.pdf/html/ps/dvi
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
diff --git a/net/unison/Makefile b/net/unison/Makefile
index 50ca3b27933..f5e3ac42c68 100644
--- a/net/unison/Makefile
+++ b/net/unison/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2006/02/05 23:10:32 joerg Exp $
+# $NetBSD: Makefile,v 1.32 2006/04/06 06:22:35 reed Exp $
DISTNAME= unison-2.13.16
PKGREVISION= 2
@@ -12,7 +12,7 @@ COMMENT= File-synchronization tool
PKG_INSTALLATION_TYPES= overwrite pkgviews
DIST_SUBDIR= ${PKGNAME_NOREV}
-BUILDLINK_DEPENDS.ocaml+= ocaml>=3.08.2
+BUILDLINK_API_DEPENDS.ocaml+= ocaml>=3.08.2
# docs: unison-manual.pdf/html/ps/dvi
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
diff --git a/net/whoson/buildlink3.mk b/net/whoson/buildlink3.mk
index 9b2a9a7a1b1..b49ce9e0aca 100644
--- a/net/whoson/buildlink3.mk
+++ b/net/whoson/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/10/11 16:51:54 abs Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:35 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
WHOSON_BUILDLINK3_MK:= ${WHOSON_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nwhoson}
BUILDLINK_PACKAGES+= whoson
.if !empty(WHOSON_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.whoson+= whoson>=2.03
+BUILDLINK_API_DEPENDS.whoson+= whoson>=2.03
BUILDLINK_PKGSRCDIR.whoson?= ../../net/whoson
.endif # WHOSON_BUILDLINK3_MK
diff --git a/net/xfce4-wavelan-plugin/buildlink3.mk b/net/xfce4-wavelan-plugin/buildlink3.mk
index 2af9a96a09c..f7090c46009 100644
--- a/net/xfce4-wavelan-plugin/buildlink3.mk
+++ b/net/xfce4-wavelan-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/17 06:49:24 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:35 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_WAVELAN_PLUGIN_BUILDLINK3_MK:= ${XFCE4_WAVELAN_PLUGIN_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-wavelan-plugin}
BUILDLINK_PACKAGES+= xfce4-wavelan-plugin
.if !empty(XFCE4_WAVELAN_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-wavelan-plugin+= xfce4-wavelan-plugin>=0.4.1nb1
-BUILDLINK_RECOMMENDED.xfce4-wavelan-plugin?= xfce4-wavelan-plugin>=0.4.1nb3
+BUILDLINK_API_DEPENDS.xfce4-wavelan-plugin+= xfce4-wavelan-plugin>=0.4.1nb1
+BUILDLINK_ABI_DEPENDS.xfce4-wavelan-plugin?= xfce4-wavelan-plugin>=0.4.1nb3
BUILDLINK_PKGSRCDIR.xfce4-wavelan-plugin?= ../../net/xfce4-wavelan-plugin
.endif # XFCE4_WAVELAN_PLUGIN_BUILDLINK3_MK
diff --git a/net/xipdump/Makefile b/net/xipdump/Makefile
index d2bf56221ff..6db13c70ea4 100644
--- a/net/xipdump/Makefile
+++ b/net/xipdump/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/02/05 23:10:33 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2006/04/06 06:22:35 reed Exp $
#
DISTNAME= xipdump-1.5.4
@@ -11,7 +11,7 @@ MAINTAINER= sakamoto@NetBSD.org
HOMEPAGE= http://www.lse.epita.fr/twiki/bin/view/Projects/XipDump
COMMENT= Displays IP packets using X Window System
-BUILDLINK_DEPENDS.libnet+= libnet-1.0.*
+BUILDLINK_API_DEPENDS.libnet+= libnet-1.0.*
PLIST_SRC= ${WRKDIR}/PLIST
diff --git a/net/yaz/buildlink3.mk b/net/yaz/buildlink3.mk
index f312a262c8e..b6d276503de 100644
--- a/net/yaz/buildlink3.mk
+++ b/net/yaz/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:10:33 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:35 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
YAZ_BUILDLINK3_MK:= ${YAZ_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nyaz}
BUILDLINK_PACKAGES+= yaz
.if !empty(YAZ_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.yaz+= yaz>=2.0
-BUILDLINK_RECOMMENDED.yaz+= yaz>=2.1.6nb1
+BUILDLINK_API_DEPENDS.yaz+= yaz>=2.0
+BUILDLINK_ABI_DEPENDS.yaz+= yaz>=2.1.6nb1
BUILDLINK_PKGSRCDIR.yaz?= ../../net/yaz
.endif # YAZ_BUILDLINK3_MK
diff --git a/news/inn/buildlink3.mk b/news/inn/buildlink3.mk
index 522e008c1a1..cc332a01a81 100644
--- a/news/inn/buildlink3.mk
+++ b/news/inn/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/16 09:48:37 cube Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:35 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
INN_BUILDLINK3_MK:= ${INN_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ninn}
BUILDLINK_PACKAGES+= inn
.if !empty(INN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.inn+= inn>=2.3.4
+BUILDLINK_API_DEPENDS.inn+= inn>=2.3.4
BUILDLINK_PKGSRCDIR.inn?= ../../news/inn
.endif # INN_BUILDLINK3_MK
diff --git a/parallel/mpi-ch/buildlink3.mk b/parallel/mpi-ch/buildlink3.mk
index 5bcfa92b615..91c702633f8 100644
--- a/parallel/mpi-ch/buildlink3.mk
+++ b/parallel/mpi-ch/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:10:34 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:36 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
MPICH_BUILDLINK3_MK:= ${MPICH_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmpich}
BUILDLINK_PACKAGES+= mpich
.if !empty(MPICH_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.mpich+= mpich>=1.2.6
-BUILDLINK_RECOMMENDED.mpich?= mpich>=1.2.6nb3
+BUILDLINK_API_DEPENDS.mpich+= mpich>=1.2.6
+BUILDLINK_ABI_DEPENDS.mpich?= mpich>=1.2.6nb3
BUILDLINK_PKGSRCDIR.mpich?= ../../parallel/mpi-ch
BUILDLINK_DEPMETHOD.mpich?= build
.endif # MPICH_BUILDLINK3_MK
diff --git a/parallel/pvm3/buildlink3.mk b/parallel/pvm3/buildlink3.mk
index 2ff2a987b6c..96096e768df 100644
--- a/parallel/pvm3/buildlink3.mk
+++ b/parallel/pvm3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:10:34 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:36 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PVM_BUILDLINK3_MK:= ${PVM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npvm}
BUILDLINK_PACKAGES+= pvm
.if !empty(PVM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pvm+= pvm>=3.4.3
-BUILDLINK_RECOMMENDED.pvm+= pvm>=3.4.5nb1
+BUILDLINK_API_DEPENDS.pvm+= pvm>=3.4.3
+BUILDLINK_ABI_DEPENDS.pvm+= pvm>=3.4.5nb1
BUILDLINK_PKGSRCDIR.pvm?= ../../parallel/pvm3
. include "${BUILDLINK_PKGSRCDIR.pvm}/arch.mk"
diff --git a/pkgtools/libnbcompat/buildlink3.mk b/pkgtools/libnbcompat/buildlink3.mk
index 2719881684c..b1ccad215b8 100644
--- a/pkgtools/libnbcompat/buildlink3.mk
+++ b/pkgtools/libnbcompat/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2004/09/11 19:05:16 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/04/06 06:22:36 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBNBCOMPAT_BUILDLINK3_MK:= ${LIBNBCOMPAT_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibnbcompat}
BUILDLINK_PACKAGES+= libnbcompat
.if !empty(LIBNBCOMPAT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libnbcompat+= libnbcompat>=20040911
+BUILDLINK_API_DEPENDS.libnbcompat+= libnbcompat>=20040911
BUILDLINK_PKGSRCDIR.libnbcompat?= ../../pkgtools/libnbcompat
BUILDLINK_DEPMETHOD.libnbcompat?= build
BUILDLINK_LDADD.libnbcompat= -lnbcompat
diff --git a/pkgtools/x11-links/buildlink3.mk b/pkgtools/x11-links/buildlink3.mk
index b05ea4e710c..0455e0e1405 100644
--- a/pkgtools/x11-links/buildlink3.mk
+++ b/pkgtools/x11-links/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2005/06/10 03:44:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:36 reed Exp $
#
# Don't include this file manually! It will be included as necessary
# by bsd.buildlink3.mk.
@@ -17,7 +17,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nx11-links}
BUILDLINK_PACKAGES:= x11-links ${BUILDLINK_PACKAGES}
.if !empty(X11_LINKS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.x11-links+= x11-links>=0.25
+BUILDLINK_API_DEPENDS.x11-links+= x11-links>=0.25
BUILDLINK_PKGSRCDIR.x11-links?= ../../pkgtools/x11-links
BUILDLINK_DEPMETHOD.x11-links?= build
diff --git a/print/a2ps/buildlink3.mk b/print/a2ps/buildlink3.mk
index 7eb9d99d0e9..2afb2b7f023 100644
--- a/print/a2ps/buildlink3.mk
+++ b/print/a2ps/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:10:35 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:36 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
A2PS_BUILDLINK3_MK:= ${A2PS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Na2ps}
BUILDLINK_PACKAGES+= a2ps
.if !empty(A2PS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.a2ps+= a2ps>=4.13.0.2nb4
-BUILDLINK_RECOMMENDED.a2ps?= a2ps>=4.13.0.2nb10
+BUILDLINK_API_DEPENDS.a2ps+= a2ps>=4.13.0.2nb4
+BUILDLINK_ABI_DEPENDS.a2ps?= a2ps>=4.13.0.2nb10
BUILDLINK_PKGSRCDIR.a2ps?= ../../print/a2ps
.endif # A2PS_BUILDLINK3_MK
diff --git a/print/cups/buildlink3.mk b/print/cups/buildlink3.mk
index db8a4265467..d4681e41ff7 100644
--- a/print/cups/buildlink3.mk
+++ b/print/cups/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/02/05 23:10:35 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2006/04/06 06:22:36 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
CUPS_BUILDLINK3_MK:= ${CUPS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncups}
BUILDLINK_PACKAGES+= cups
.if !empty(CUPS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.cups+= cups>=1.1.19nb3
-BUILDLINK_RECOMMENDED.cups+= cups>=1.1.23nb6
+BUILDLINK_API_DEPENDS.cups+= cups>=1.1.19nb3
+BUILDLINK_ABI_DEPENDS.cups+= cups>=1.1.23nb6
BUILDLINK_PKGSRCDIR.cups?= ../../print/cups
.endif # CUPS_BUILDLINK3_MK
diff --git a/print/dvipng/Makefile b/print/dvipng/Makefile
index 618c1de7d00..7a82b444801 100644
--- a/print/dvipng/Makefile
+++ b/print/dvipng/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/04/06 03:33:28 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2006/04/06 06:22:36 reed Exp $
DISTNAME= dvipng-1.7
CATEGORIES= textproc converters
@@ -14,7 +14,7 @@ GNU_CONFIGURE= yes
INFO_FILES= dvipng.info
-BUILDLINK_DEPENDS.freetype2+= freetype2>=2.1.3
+BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.1.3
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/gd/buildlink3.mk"
diff --git a/print/gimp-print-lib/buildlink3.mk b/print/gimp-print-lib/buildlink3.mk
index b7d450e5d1f..155c70b0b30 100644
--- a/print/gimp-print-lib/buildlink3.mk
+++ b/print/gimp-print-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:10:37 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:36 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GIMP_PRINT_LIB_BUILDLINK3_MK:= ${GIMP_PRINT_LIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngimp-print-lib}
BUILDLINK_PACKAGES+= gimp-print-lib
.if !empty(GIMP_PRINT_LIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gimp-print-lib+= gimp-print-lib>=4.2.5nb1
-BUILDLINK_RECOMMENDED.gimp-print-lib+= gimp-print-lib>=4.2.7nb2
+BUILDLINK_API_DEPENDS.gimp-print-lib+= gimp-print-lib>=4.2.5nb1
+BUILDLINK_ABI_DEPENDS.gimp-print-lib+= gimp-print-lib>=4.2.7nb2
BUILDLINK_PKGSRCDIR.gimp-print-lib?= ../../print/gimp-print-lib
.endif # GIMP_PRINT_LIB_BUILDLINK3_MK
diff --git a/print/gnome-print/buildlink3.mk b/print/gnome-print/buildlink3.mk
index 7f8fdbdd6b0..9101b0fe646 100644
--- a/print/gnome-print/buildlink3.mk
+++ b/print/gnome-print/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:37 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:36 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNOME_PRINT_BUILDLINK3_MK:= ${GNOME_PRINT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-print}
BUILDLINK_PACKAGES+= gnome-print
.if !empty(GNOME_PRINT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-print+= gnome-print>=0.36nb4
-BUILDLINK_RECOMMENDED.gnome-print+= gnome-print>=0.37nb1
+BUILDLINK_API_DEPENDS.gnome-print+= gnome-print>=0.36nb4
+BUILDLINK_ABI_DEPENDS.gnome-print+= gnome-print>=0.37nb1
BUILDLINK_PKGSRCDIR.gnome-print?= ../../print/gnome-print
.endif # GNOME_PRINT_BUILDLINK3_MK
diff --git a/print/ijs/buildlink3.mk b/print/ijs/buildlink3.mk
index f591a6d9adc..88eb24a1585 100644
--- a/print/ijs/buildlink3.mk
+++ b/print/ijs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:37 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:36 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
IJS_BUILDLINK3_MK:= ${IJS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nijs}
BUILDLINK_PACKAGES+= ijs
.if !empty(IJS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ijs+= ijs>=0.34
-BUILDLINK_RECOMMENDED.ijs+= ijs>=0.34nb2
+BUILDLINK_API_DEPENDS.ijs+= ijs>=0.34
+BUILDLINK_ABI_DEPENDS.ijs+= ijs>=0.34nb2
BUILDLINK_PKGSRCDIR.ijs?= ../../print/ijs
.endif # IJS_BUILDLINK3_MK
diff --git a/print/ja-vflib-lib/buildlink3.mk b/print/ja-vflib-lib/buildlink3.mk
index 90aadd6fed8..2a846a9333a 100644
--- a/print/ja-vflib-lib/buildlink3.mk
+++ b/print/ja-vflib-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:37 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:36 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
JA_VFLIB_LIB_BUILDLINK3_MK:= ${JA_VFLIB_LIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nja-vflib-lib}
BUILDLINK_PACKAGES+= ja-vflib-lib
.if !empty(JA_VFLIB_LIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ja-vflib-lib+= ja-vflib-lib>=2.24.2
-BUILDLINK_RECOMMENDED.ja-vflib-lib+= ja-vflib-lib>=2.24.2nb2
+BUILDLINK_API_DEPENDS.ja-vflib-lib+= ja-vflib-lib>=2.24.2
+BUILDLINK_ABI_DEPENDS.ja-vflib-lib+= ja-vflib-lib>=2.24.2nb2
BUILDLINK_PKGSRCDIR.ja-vflib-lib?= ../../print/ja-vflib-lib
.endif # JA_VFLIB_LIB_BUILDLINK3_MK
diff --git a/print/ja-vflib-utils/Makefile b/print/ja-vflib-utils/Makefile
index 7ebd7dea2c1..06fb8cb3103 100644
--- a/print/ja-vflib-utils/Makefile
+++ b/print/ja-vflib-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/02/05 23:10:37 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2006/04/06 06:22:36 reed Exp $
.include "../../print/ja-vflib-lib/Makefile.common"
@@ -6,7 +6,7 @@ PKGNAME= ja-vflib-utils-${VFLIB_VERSION}
PKGREVISION= 2
COMMENT= Utilities for manipulating VFlib vector font files
-BUILDLINK_DEPENDS.vflib+= ja-vflib-lib>=${VFLIB_VERSION}
+BUILDLINK_API_DEPENDS.vflib+= ja-vflib-lib>=${VFLIB_VERSION}
CONFIGURE_ARGS+= --enable-tools --with-x
diff --git a/print/libgnomecups/buildlink3.mk b/print/libgnomecups/buildlink3.mk
index 54974e9a11f..d581676d18b 100644
--- a/print/libgnomecups/buildlink3.mk
+++ b/print/libgnomecups/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:10:38 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:36 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGNOMECUPS_BUILDLINK3_MK:= ${LIBGNOMECUPS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgnomecups}
BUILDLINK_PACKAGES+= libgnomecups
.if !empty(LIBGNOMECUPS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgnomecups+= libgnomecups>=0.2.0
-BUILDLINK_RECOMMENDED.libgnomecups?= libgnomecups>=0.2.2nb2
+BUILDLINK_API_DEPENDS.libgnomecups+= libgnomecups>=0.2.0
+BUILDLINK_ABI_DEPENDS.libgnomecups?= libgnomecups>=0.2.2nb2
BUILDLINK_PKGSRCDIR.libgnomecups?= ../../print/libgnomecups
.endif # LIBGNOMECUPS_BUILDLINK3_MK
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index 76b1d9a5be6..ae3bc07a4cb 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2006/02/05 23:10:38 joerg Exp $
+# $NetBSD: Makefile,v 1.48 2006/04/06 06:22:36 reed Exp $
#
DISTNAME= libgnomeprint-2.12.1
@@ -18,7 +18,7 @@ USE_PKGLOCALEDIR= YES
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
-BUILDLINK_DEPENDS.freetype2+= freetype2>=2.1.4
+BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.1.4
PKGCONFIG_OVERRIDE= libgnomeprint/libgnomeprint-2.2.pc.in
diff --git a/print/libgnomeprint/buildlink3.mk b/print/libgnomeprint/buildlink3.mk
index 5d1a350dca1..daf8521c960 100644
--- a/print/libgnomeprint/buildlink3.mk
+++ b/print/libgnomeprint/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/05 23:10:38 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:22:36 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGNOMEPRINT_BUILDLINK3_MK:= ${LIBGNOMEPRINT_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgnomeprint}
BUILDLINK_PACKAGES+= libgnomeprint
.if !empty(LIBGNOMEPRINT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgnomeprint+= libgnomeprint>=2.8.0
-BUILDLINK_RECOMMENDED.libgnomeprint+= libgnomeprint>=2.12.1nb2
+BUILDLINK_API_DEPENDS.libgnomeprint+= libgnomeprint>=2.8.0
+BUILDLINK_ABI_DEPENDS.libgnomeprint+= libgnomeprint>=2.12.1nb2
BUILDLINK_PKGSRCDIR.libgnomeprint?= ../../print/libgnomeprint
.endif # LIBGNOMEPRINT_BUILDLINK3_MK
diff --git a/print/libgnomeprintui/Makefile b/print/libgnomeprintui/Makefile
index a503f706ba0..14e512f2e6b 100644
--- a/print/libgnomeprintui/Makefile
+++ b/print/libgnomeprintui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2006/02/05 23:10:38 joerg Exp $
+# $NetBSD: Makefile,v 1.43 2006/04/06 06:22:36 reed Exp $
#
DISTNAME= libgnomeprintui-2.12.1
@@ -23,7 +23,7 @@ PKGCONFIG_OVERRIDE= libgnomeprintui/libgnomeprintui-2.2.pc.in
CONFIGURE_ARGS+= --enable-gtk-doc=no
CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc
-BUILDLINK_DEPENDS.libgnomeprint+= libgnomeprint>=2.12.1
+BUILDLINK_API_DEPENDS.libgnomeprint+= libgnomeprint>=2.12.1
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/GConf2/buildlink3.mk"
diff --git a/print/libgnomeprintui/buildlink3.mk b/print/libgnomeprintui/buildlink3.mk
index a4a755eb36e..25541d92942 100644
--- a/print/libgnomeprintui/buildlink3.mk
+++ b/print/libgnomeprintui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:10:38 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:22:36 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGNOMEPRINTUI_BUILDLINK3_MK:= ${LIBGNOMEPRINTUI_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgnomeprintui}
BUILDLINK_PACKAGES+= libgnomeprintui
.if !empty(LIBGNOMEPRINTUI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgnomeprintui+= libgnomeprintui>=2.8.0
-BUILDLINK_RECOMMENDED.libgnomeprintui+= libgnomeprintui>=2.12.1nb2
+BUILDLINK_API_DEPENDS.libgnomeprintui+= libgnomeprintui>=2.8.0
+BUILDLINK_ABI_DEPENDS.libgnomeprintui+= libgnomeprintui>=2.12.1nb2
BUILDLINK_PKGSRCDIR.libgnomeprintui?= ../../print/libgnomeprintui
.endif # LIBGNOMEPRINTUI_BUILDLINK3_MK
diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile
index 1aabba3a319..ff6cc902fe0 100644
--- a/print/lilypond/Makefile
+++ b/print/lilypond/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2006/03/21 06:00:48 jlam Exp $
+# $NetBSD: Makefile,v 1.43 2006/04/06 06:22:36 reed Exp $
#
DISTNAME= lilypond-2.4.3
@@ -13,7 +13,7 @@ COMMENT= GNU Music Typesetter
DEPENDS+= ec-fonts-mftraced-[0-9]*:../../fonts/ec-fonts-mftraced
BUILD_DEPENDS+= bison>=1.875nb1:../../devel/bison
-BUILDLINK_DEPENDS.mftrace+= mftrace>=1.1.0
+BUILDLINK_API_DEPENDS.mftrace+= mftrace>=1.1.0
GNU_CONFIGURE= YES
USE_PKGLOCALEDIR= YES
diff --git a/print/pdflib/buildlink3.mk b/print/pdflib/buildlink3.mk
index 940c7347316..5eecff49d99 100644
--- a/print/pdflib/buildlink3.mk
+++ b/print/pdflib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:10:38 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:36 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PDFLIB_BUILDLINK3_MK:= ${PDFLIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npdflib}
BUILDLINK_PACKAGES+= pdflib
.if !empty(PDFLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pdflib+= pdflib>=4.0.3nb2
-BUILDLINK_RECOMMENDED.pdflib+= pdflib>=4.0.3nb6
+BUILDLINK_API_DEPENDS.pdflib+= pdflib>=4.0.3nb2
+BUILDLINK_ABI_DEPENDS.pdflib+= pdflib>=4.0.3nb6
BUILDLINK_PKGSRCDIR.pdflib?= ../../print/pdflib
.endif # PDFLIB_BUILDLINK3_MK
diff --git a/print/poppler-glib/Makefile b/print/poppler-glib/Makefile
index e052d16cd13..c103bf8b393 100644
--- a/print/poppler-glib/Makefile
+++ b/print/poppler-glib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/04/01 17:23:14 reed Exp $
+# $NetBSD: Makefile,v 1.6 2006/04/06 06:22:36 reed Exp $
#
.include "../../print/poppler/Makefile.common"
@@ -36,7 +36,7 @@ post-install:
.include "../../devel/glib2/buildlink3.mk"
.include "../../graphics/cairo/buildlink3.mk"
-BUILDLINK_DEPENDS.poppler+= poppler>=${POPPLER_VERS}nb1
+BUILDLINK_API_DEPENDS.poppler+= poppler>=${POPPLER_VERS}nb1
.include "../../print/poppler/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
diff --git a/print/poppler-glib/buildlink3.mk b/print/poppler-glib/buildlink3.mk
index 8dc3b845196..b8cbca4a2b2 100644
--- a/print/poppler-glib/buildlink3.mk
+++ b/print/poppler-glib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/03/30 21:30:25 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:37 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
POPPLER_GLIB_BUILDLINK3_MK:= ${POPPLER_GLIB_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npoppler-glib}
BUILDLINK_PACKAGES+= poppler-glib
.if !empty(POPPLER_GLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.poppler-glib+= poppler-glib>=0.5.1
+BUILDLINK_API_DEPENDS.poppler-glib+= poppler-glib>=0.5.1
BUILDLINK_PKGSRCDIR.poppler-glib?= ../../print/poppler-glib
.endif # POPPLER_GLIB_BUILDLINK3_MK
diff --git a/print/poppler-qt/Makefile b/print/poppler-qt/Makefile
index bb2e9200c9f..68eeaa176a8 100644
--- a/print/poppler-qt/Makefile
+++ b/print/poppler-qt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/04/01 13:59:55 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2006/04/06 06:22:37 reed Exp $
#
.include "../../print/poppler/Makefile.common"
@@ -31,7 +31,7 @@ do-install:
${PREFIX}/include/poppler
${INSTALL_DATA} ${WRKSRC}/poppler-qt.pc ${PREFIX}/lib/pkgconfig
-BUILDLINK_DEPENDS.poppler+= poppler>=${POPPLER_VERS}nb1
+BUILDLINK_API_DEPENDS.poppler+= poppler>=${POPPLER_VERS}nb1
.include "../../print/poppler/buildlink3.mk"
.include "../../x11/qt3-libs/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
diff --git a/print/poppler-qt/buildlink3.mk b/print/poppler-qt/buildlink3.mk
index ec4d2bccfda..d21c90673b5 100644
--- a/print/poppler-qt/buildlink3.mk
+++ b/print/poppler-qt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/03/09 01:29:46 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:37 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
POPPLER_QT_BUILDLINK3_MK:= ${POPPLER_QT_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npoppler-qt}
BUILDLINK_PACKAGES+= poppler-qt
.if !empty(POPPLER_QT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.poppler-qt+= poppler-qt>=0.4.5nb1
+BUILDLINK_API_DEPENDS.poppler-qt+= poppler-qt>=0.4.5nb1
BUILDLINK_PKGSRCDIR.poppler-qt?= ../../print/poppler-qt
.endif # POPPLER_QT_BUILDLINK3_MK
diff --git a/print/poppler/buildlink3.mk b/print/poppler/buildlink3.mk
index 361201cb714..19a88b27b75 100644
--- a/print/poppler/buildlink3.mk
+++ b/print/poppler/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/03/30 21:30:25 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:36 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
POPPLER_BUILDLINK3_MK:= ${POPPLER_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npoppler}
BUILDLINK_PACKAGES+= poppler
.if !empty(POPPLER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.poppler+= poppler>=0.5.1
+BUILDLINK_API_DEPENDS.poppler+= poppler>=0.5.1
BUILDLINK_PKGSRCDIR.poppler?= ../../print/poppler
.endif # POPPLER_BUILDLINK3_MK
diff --git a/print/pslib/buildlink3.mk b/print/pslib/buildlink3.mk
index 11621778010..f7a2efeddfa 100644
--- a/print/pslib/buildlink3.mk
+++ b/print/pslib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:38 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:37 reed Exp $
# XXX
# XXX This file was created automatically using createbuildlink-3.9.
# XXX After this file has been verified as correct, the comment lines
@@ -21,8 +21,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npslib}
BUILDLINK_PACKAGES+= pslib
.if !empty(PSLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pslib+= pslib>=0.2.6
-BUILDLINK_RECOMMENDED.pslib?= pslib>=0.2.6nb3
+BUILDLINK_API_DEPENDS.pslib+= pslib>=0.2.6
+BUILDLINK_ABI_DEPENDS.pslib?= pslib>=0.2.6nb3
BUILDLINK_PKGSRCDIR.pslib?= ../../print/pslib
.endif # PSLIB_BUILDLINK3_MK
diff --git a/print/py-reportlab-renderPM/buildlink3.mk b/print/py-reportlab-renderPM/buildlink3.mk
index eb75a01daa2..051facf492b 100644
--- a/print/py-reportlab-renderPM/buildlink3.mk
+++ b/print/py-reportlab-renderPM/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:10:39 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:37 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PYRLRENDERPM_BUILDLINK3_MK:= ${PYRLRENDERPM_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npyrlrenderpm}
BUILDLINK_PACKAGES+= pyrlrenderpm
.if !empty(PYRLRENDERPM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pyrlrenderpm+= ${PYPKGPREFIX}-reportlab-renderPM-[0-9]*
-BUILDLINK_RECOMMENDED.pyrlrenderpm?= ${PYPKGPREFIX}-reportlab-renderPM>=0.9nb2
+BUILDLINK_API_DEPENDS.pyrlrenderpm+= ${PYPKGPREFIX}-reportlab-renderPM-[0-9]*
+BUILDLINK_ABI_DEPENDS.pyrlrenderpm?= ${PYPKGPREFIX}-reportlab-renderPM>=0.9nb2
BUILDLINK_PKGSRCDIR.pyrlrenderpm?= ../../print/py-reportlab-renderPM
.endif # PYRLRENDERPM_BUILDLINK3_MK
diff --git a/print/py-reportlab/buildlink3.mk b/print/py-reportlab/buildlink3.mk
index a4bbb3bb3b9..880b22551c9 100644
--- a/print/py-reportlab/buildlink3.mk
+++ b/print/py-reportlab/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:39 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:37 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PYREPORTLAB_BUILDLINK3_MK:= ${PYREPORTLAB_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npyreportlab}
BUILDLINK_PACKAGES+= pyreportlab
.if !empty(PYREPORTLAB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pyreportlab+= ${PYPKGPREFIX}-reportlab-[0-9]*
-BUILDLINK_RECOMMENDED.pyreportlab?= ${PYPKGPREFIX}-reportlab>=1.20nb2
+BUILDLINK_API_DEPENDS.pyreportlab+= ${PYPKGPREFIX}-reportlab-[0-9]*
+BUILDLINK_ABI_DEPENDS.pyreportlab?= ${PYPKGPREFIX}-reportlab>=1.20nb2
BUILDLINK_PKGSRCDIR.pyreportlab?= ../../print/py-reportlab
.endif # PYREPORTLAB_BUILDLINK3_MK
diff --git a/print/tcl-pdflib/Makefile b/print/tcl-pdflib/Makefile
index c8bdc95492d..0c88be4bd47 100644
--- a/print/tcl-pdflib/Makefile
+++ b/print/tcl-pdflib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/02/05 23:10:39 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2006/04/06 06:22:37 reed Exp $
.include "../../print/pdflib/Makefile.common"
@@ -6,7 +6,7 @@ PKGNAME= tcl-pdflib-${PDFLIB_BASE_VERS}
PKGREVISION= 4
COMMENT= Tcl interface to PDFlib for generating PDF files
-BUILDLINK_DEPENDS.pdflib+= pdflib>=${PDFLIB_BASE_VERS}
+BUILDLINK_API_DEPENDS.pdflib+= pdflib>=${PDFLIB_BASE_VERS}
CONFIGURE_ARGS+= --with-tcl=${TCLSH:Q}
CONFIGURE_ARGS+= --with-tclincl="${BUILDLINK_PREFIX.tcl}/include"
diff --git a/print/teTeX-bin/buildlink3.mk b/print/teTeX-bin/buildlink3.mk
index 1b7da0911b3..b1f1871a3ae 100644
--- a/print/teTeX-bin/buildlink3.mk
+++ b/print/teTeX-bin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:10:39 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:37 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
TETEX_BIN_BUILDLINK3_MK:= ${TETEX_BIN_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NteTeX-bin}
BUILDLINK_PACKAGES+= teTeX-bin
.if !empty(TETEX_BIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.teTeX-bin+= teTeX-bin-2.[0-9]*
-BUILDLINK_RECOMMENDED.teTeX-bin?= teTeX-bin>=2.0.2nb6
+BUILDLINK_API_DEPENDS.teTeX-bin+= teTeX-bin-2.[0-9]*
+BUILDLINK_ABI_DEPENDS.teTeX-bin?= teTeX-bin>=2.0.2nb6
BUILDLINK_PKGSRCDIR.teTeX-bin?= ../../print/teTeX-bin
.endif # TETEX_BIN_BUILDLINK3_MK
diff --git a/print/teTeX/module.mk b/print/teTeX/module.mk
index 2aaf3b48c5e..9d0710ed087 100644
--- a/print/teTeX/module.mk
+++ b/print/teTeX/module.mk
@@ -1,4 +1,4 @@
-# $NetBSD: module.mk,v 1.12 2006/03/14 01:14:32 jlam Exp $
+# $NetBSD: module.mk,v 1.13 2006/04/06 06:22:37 reed Exp $
#
# This Makefile fragment is intended to be included by packages that
# install TeX packages. It takes care of rebuilding the ls-R database
@@ -19,7 +19,7 @@ TEXMFDIRS?= ${PKG_LOCALTEXMFPREFIX}
TEX_FONTMAPS?= # empty
.if !empty(TEX_FONTMAPS)
-BUILDLINK_DEPENDS.teTeX-bin+= teTeX-bin>=3.0nb4
+BUILDLINK_API_DEPENDS.teTeX-bin+= teTeX-bin>=3.0nb4
.endif
FILES_SUBST+= MKTEXLSR="${LOCALBASE}/bin/mktexlsr"
diff --git a/print/teTeX1-bin/buildlink3.mk b/print/teTeX1-bin/buildlink3.mk
index 2ea19d95187..e59075a7ef1 100644
--- a/print/teTeX1-bin/buildlink3.mk
+++ b/print/teTeX1-bin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:10:39 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:37 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
TETEX_BIN_BUILDLINK3_MK:= ${TETEX_BIN_BUILDLINK3_MK}+
@@ -11,9 +11,9 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NteTeX-bin}
BUILDLINK_PACKAGES+= teTeX-bin
.if !empty(TETEX_BIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.teTeX-bin+= teTeX-bin-1.[0-9]*
+BUILDLINK_API_DEPENDS.teTeX-bin+= teTeX-bin-1.[0-9]*
BUILDLINK_DEPMETHOD.teTeX-bin?= build
-BUILDLINK_RECOMMENDED.teTeX-bin?= teTeX-bin>=1.0.7nb6
+BUILDLINK_ABI_DEPENDS.teTeX-bin?= teTeX-bin>=1.0.7nb6
BUILDLINK_PKGSRCDIR.teTeX-bin?= ../../print/teTeX1-bin
.endif # TETEX_BIN_BUILDLINK3_MK
diff --git a/print/teTeX3-bin/buildlink3.mk b/print/teTeX3-bin/buildlink3.mk
index ccbdb86b943..02e6313c1b8 100644
--- a/print/teTeX3-bin/buildlink3.mk
+++ b/print/teTeX3-bin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:10:39 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:37 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
TETEX_BIN_BUILDLINK3_MK:= ${TETEX_BIN_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NteTeX-bin}
BUILDLINK_PACKAGES+= teTeX-bin
.if !empty(TETEX_BIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.teTeX-bin+= teTeX-bin>=3.0nb2
-BUILDLINK_RECOMMENDED.teTeX-bin?= teTeX-bin>=3.0nb7
+BUILDLINK_API_DEPENDS.teTeX-bin+= teTeX-bin>=3.0nb2
+BUILDLINK_ABI_DEPENDS.teTeX-bin?= teTeX-bin>=3.0nb7
BUILDLINK_PKGSRCDIR.teTeX-bin?= ../../print/teTeX3-bin
.endif # TETEX_BIN_BUILDLINK3_MK
diff --git a/print/transfig/buildlink3.mk b/print/transfig/buildlink3.mk
index 8aa19fac529..18b00291c6e 100644
--- a/print/transfig/buildlink3.mk
+++ b/print/transfig/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:10:41 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:37 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
TRANSFIG_BUILDLINK3_MK:= ${TRANSFIG_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntransfig}
BUILDLINK_PACKAGES+= transfig
.if !empty(TRANSFIG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.transfig+= transfig>=3.2.4
-BUILDLINK_RECOMMENDED.transfig?= transfig>=3.2.5alpha7nb1
+BUILDLINK_API_DEPENDS.transfig+= transfig>=3.2.4
+BUILDLINK_ABI_DEPENDS.transfig?= transfig>=3.2.5alpha7nb1
BUILDLINK_PKGSRCDIR.transfig?= ../../print/transfig
.endif # TRANSFIG_BUILDLINK3_MK
diff --git a/print/xfce4-print/buildlink3.mk b/print/xfce4-print/buildlink3.mk
index 8bf249022ae..de1bad7716c 100644
--- a/print/xfce4-print/buildlink3.mk
+++ b/print/xfce4-print/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/02/17 06:49:24 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/04/06 06:22:37 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_PRINT_BUILDLINK3_MK:= ${XFCE4_PRINT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-print}
BUILDLINK_PACKAGES+= xfce4-print
.if !empty(XFCE4_PRINT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-print+= xfce4-print>=4.2.3
-BUILDLINK_RECOMMENDED.xfce4-print?= xfce4-print>=4.2.3nb2
+BUILDLINK_API_DEPENDS.xfce4-print+= xfce4-print>=4.2.3
+BUILDLINK_ABI_DEPENDS.xfce4-print?= xfce4-print>=4.2.3nb2
BUILDLINK_PKGSRCDIR.xfce4-print?= ../../print/xfce4-print
.endif # XFCE4_PRINT_BUILDLINK3_MK
diff --git a/security/PAM/buildlink3.mk b/security/PAM/buildlink3.mk
index fccf143f8fe..c36ef8c7f77 100644
--- a/security/PAM/buildlink3.mk
+++ b/security/PAM/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2006/02/05 23:10:42 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2006/04/06 06:22:37 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LINUX_PAM_BUILDLINK3_MK:= ${LINUX_PAM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlinux-pam}
BUILDLINK_PACKAGES+= linux-pam
.if !empty(LINUX_PAM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.linux-pam+= PAM>=0.75
-BUILDLINK_RECOMMENDED.linux-pam+= PAM>=0.77nb5
+BUILDLINK_API_DEPENDS.linux-pam+= PAM>=0.75
+BUILDLINK_ABI_DEPENDS.linux-pam+= PAM>=0.77nb5
BUILDLINK_PKGSRCDIR.linux-pam?= ../../security/PAM
.endif # LINUX_PAM_BUILDLINK3_MK
diff --git a/security/PAM/builtin.mk b/security/PAM/builtin.mk
index 47c69c8a802..3250e05c4ef 100644
--- a/security/PAM/builtin.mk
+++ b/security/PAM/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.13 2006/03/30 18:06:18 jlam Exp $
+# $NetBSD: builtin.mk,v 1.14 2006/04/06 06:22:37 reed Exp $
BUILTIN_PKG:= linux-pam
@@ -33,7 +33,7 @@ USE_BUILTIN.linux-pam= ${IS_BUILTIN.linux-pam}
. if defined(BUILTIN_PKG.linux-pam) && \
!empty(IS_BUILTIN.linux-pam:M[yY][eE][sS])
USE_BUILTIN.linux-pam= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.linux-pam}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.linux-pam}
. if !empty(USE_BUILTIN.linux-pam:M[yY][eE][sS])
USE_BUILTIN.linux-pam!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.linux-pam:Q}; then \
diff --git a/security/aide/Makefile b/security/aide/Makefile
index 15ff5bce332..4cb8ae16c26 100644
--- a/security/aide/Makefile
+++ b/security/aide/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/03/04 21:30:33 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2006/04/06 06:22:37 reed Exp $
#
DISTNAME= aide-0.10
@@ -10,7 +10,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.cs.tut.fi/~rammer/aide.html
COMMENT= Free intrusion detection system for checking file integrity
-BUILDLINK_DEPENDS.mhash?= mhash>=0.8.17
+BUILDLINK_API_DEPENDS.mhash?= mhash>=0.8.17
GNU_CONFIGURE= yes
diff --git a/security/beecrypt/buildlink3.mk b/security/beecrypt/buildlink3.mk
index 140bcd35d3f..97ae0e7c0fc 100644
--- a/security/beecrypt/buildlink3.mk
+++ b/security/beecrypt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:18:07 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:37 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
BEECRYPT_BUILDLINK3_MK:= ${BEECRYPT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nbeecrypt}
BUILDLINK_PACKAGES+= beecrypt
.if !empty(BEECRYPT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.beecrypt+= beecrypt>=3.0.0
-BUILDLINK_RECOMMENDED.beecrypt+= beecrypt>=3.0.0nb1
+BUILDLINK_API_DEPENDS.beecrypt+= beecrypt>=3.0.0
+BUILDLINK_ABI_DEPENDS.beecrypt+= beecrypt>=3.0.0nb1
BUILDLINK_PKGSRCDIR.beecrypt?= ../../security/beecrypt
.endif # BEECRYPT_BUILDLINK3_MK
diff --git a/security/botan/buildlink3.mk b/security/botan/buildlink3.mk
index edf9869d9f0..be68bf4ec9f 100644
--- a/security/botan/buildlink3.mk
+++ b/security/botan/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2006/02/13 17:19:42 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:37 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
BOTAN_BUILDLINK3_MK:= ${BOTAN_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nbotan}
BUILDLINK_PACKAGES+= botan
.if !empty(BOTAN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.botan+= botan>=1.4.11
+BUILDLINK_API_DEPENDS.botan+= botan>=1.4.11
BUILDLINK_PKGSRCDIR.botan?= ../../security/botan
.endif # BOTAN_BUILDLINK3_MK
diff --git a/security/courier-authlib/buildlink3.mk b/security/courier-authlib/buildlink3.mk
index ba1ed43a209..4a3928f4fdc 100644
--- a/security/courier-authlib/buildlink3.mk
+++ b/security/courier-authlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:10:42 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:37 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
COURIER_AUTHLIB_BUILDLINK3_MK:= ${COURIER_AUTHLIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncourier-authlib}
BUILDLINK_PACKAGES+= courier-authlib
.if !empty(COURIER_AUTHLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.courier-authlib+= courier-authlib>=0.53
-BUILDLINK_RECOMMENDED.courier-authlib?= courier-authlib>=0.58nb2
+BUILDLINK_API_DEPENDS.courier-authlib+= courier-authlib>=0.53
+BUILDLINK_ABI_DEPENDS.courier-authlib?= courier-authlib>=0.58nb2
BUILDLINK_PKGSRCDIR.courier-authlib?= ../../security/courier-authlib
.endif # COURIER_AUTHLIB_BUILDLINK3_MK
diff --git a/security/crypto++/buildlink3.mk b/security/crypto++/buildlink3.mk
index f136fd6cf28..21462c2caf6 100644
--- a/security/crypto++/buildlink3.mk
+++ b/security/crypto++/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:42 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:37 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
CRYPTOPP_BUILDLINK3_MK:= ${CRYPTOPP_BUILDLINK3_MK}+
@@ -11,9 +11,9 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncryptopp}
BUILDLINK_PACKAGES+= cryptopp
.if !empty(CRYPTOPP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.cryptopp+= cryptopp>=5.1
+BUILDLINK_API_DEPENDS.cryptopp+= cryptopp>=5.1
BUILDLINK_DEPMETHOD.cryptopp?= build
-BUILDLINK_RECOMMENDED.cryptopp?= cryptopp>=5.2.1nb1
+BUILDLINK_ABI_DEPENDS.cryptopp?= cryptopp>=5.2.1nb1
BUILDLINK_PKGSRCDIR.cryptopp?= ../../security/cryptopp
.endif # CRYPTOPP_BUILDLINK3_MK
diff --git a/security/cvm/buildlink3.mk b/security/cvm/buildlink3.mk
index d7564824c77..0fdbc9ba41b 100644
--- a/security/cvm/buildlink3.mk
+++ b/security/cvm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2005/08/24 04:49:31 schmonz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:37 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
CVM_BUILDLINK3_MK:= ${CVM_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncvm}
BUILDLINK_PACKAGES+= cvm
.if !empty(CVM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.cvm+= cvm>=0.75
+BUILDLINK_API_DEPENDS.cvm+= cvm>=0.75
BUILDLINK_PKGSRCDIR.cvm?= ../../security/cvm
BUILDLINK_DEPMETHOD.cvm?= build
.endif # CVM_BUILDLINK3_MK
diff --git a/security/cyrus-sasl2/buildlink3.mk b/security/cyrus-sasl2/buildlink3.mk
index 792e0a53039..6f29f2e4a4a 100644
--- a/security/cyrus-sasl2/buildlink3.mk
+++ b/security/cyrus-sasl2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/05 23:10:43 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:22:37 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
CYRUS_SASL_BUILDLINK3_MK:= ${CYRUS_SASL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncyrus-sasl}
BUILDLINK_PACKAGES+= cyrus-sasl
.if !empty(CYRUS_SASL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.cyrus-sasl+= cyrus-sasl>=2.1.12
-BUILDLINK_RECOMMENDED.cyrus-sasl?= cyrus-sasl>=2.1.20nb3
+BUILDLINK_API_DEPENDS.cyrus-sasl+= cyrus-sasl>=2.1.12
+BUILDLINK_ABI_DEPENDS.cyrus-sasl?= cyrus-sasl>=2.1.20nb3
BUILDLINK_PKGSRCDIR.cyrus-sasl?= ../../security/cyrus-sasl2
.endif # CYRUS_SASL_BUILDLINK3_MK
diff --git a/security/dirb/Makefile b/security/dirb/Makefile
index ea9b6f31b7b..c6c0449539c 100644
--- a/security/dirb/Makefile
+++ b/security/dirb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/02/05 23:10:43 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2006/04/06 06:22:38 reed Exp $
#
PKGNAME= dirb-1.9
@@ -16,7 +16,7 @@ WRKSRC=${WRKDIR}/dirb
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
-BUILDLINK_DEPENDS.curl+= curl>=7.15.0nb1
+BUILDLINK_API_DEPENDS.curl+= curl>=7.15.0nb1
.include "../../www/curl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/security/dirmngr/buildlink3.mk b/security/dirmngr/buildlink3.mk
index af3439296e6..83eda256dde 100644
--- a/security/dirmngr/buildlink3.mk
+++ b/security/dirmngr/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:10:43 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:38 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
DIRMNGR_BUILDLINK3_MK:= ${DIRMNGR_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndirmngr}
BUILDLINK_PACKAGES+= dirmngr
.if !empty(DIRMNGR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.dirmngr+= dirmngr>=0.9.3nb1
-BUILDLINK_RECOMMENDED.dirmngr?= dirmngr>=0.9.3nb2
+BUILDLINK_API_DEPENDS.dirmngr+= dirmngr>=0.9.3nb1
+BUILDLINK_ABI_DEPENDS.dirmngr?= dirmngr>=0.9.3nb2
BUILDLINK_PKGSRCDIR.dirmngr?= ../../security/dirmngr
.endif # DIRMNGR_BUILDLINK3_MK
diff --git a/security/dsniff/Makefile.common b/security/dsniff/Makefile.common
index bab00c8c797..dac3397c1b1 100644
--- a/security/dsniff/Makefile.common
+++ b/security/dsniff/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2006/03/04 21:30:33 jlam Exp $
+# $NetBSD: Makefile.common,v 1.4 2006/04/06 06:22:38 reed Exp $
DISTNAME= dsniff-${VERS}
VERS= 2.3
@@ -10,7 +10,7 @@ HOMEPAGE= http://monkey.org/~dugsong/dsniff/
GNU_CONFIGURE= yes
-BUILDLINK_DEPENDS.libnet+= libnet-1.0.*
+BUILDLINK_API_DEPENDS.libnet+= libnet-1.0.*
PATCHDIR= ${.CURDIR}/../dsniff/patches
DISTINFO_FILE= ${.CURDIR}/../dsniff/distinfo
diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index d70ef5ec141..d80abaf2dc5 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/03/13 18:27:46 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2006/04/06 06:22:38 reed Exp $
#
DISTNAME= gnome-keyring-0.4.9
@@ -19,8 +19,8 @@ USE_PKGLOCALEDIR= YES
PKGCONFIG_OVERRIDE= ${WRKSRC}/gnome-keyring-1.pc.in
-BUILDLINK_DEPENDS.glib2+= glib2>=2.6.0
-BUILDLINK_DEPENDS.gtk2+= gtk2+>=2.6.0
+BUILDLINK_API_DEPENDS.glib2+= glib2>=2.6.0
+BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.6.0
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
diff --git a/security/gnome-keyring/buildlink3.mk b/security/gnome-keyring/buildlink3.mk
index a05768d8281..d252e369e08 100644
--- a/security/gnome-keyring/buildlink3.mk
+++ b/security/gnome-keyring/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:10:43 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:38 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNOME_KEYRING_BUILDLINK3_MK:= ${GNOME_KEYRING_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-keyring}
BUILDLINK_PACKAGES+= gnome-keyring
.if !empty(GNOME_KEYRING_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-keyring+= gnome-keyring>=0.4.0
-BUILDLINK_RECOMMENDED.gnome-keyring+= gnome-keyring>=0.4.6nb2
+BUILDLINK_API_DEPENDS.gnome-keyring+= gnome-keyring>=0.4.0
+BUILDLINK_ABI_DEPENDS.gnome-keyring+= gnome-keyring>=0.4.6nb2
BUILDLINK_PKGSRCDIR.gnome-keyring?= ../../security/gnome-keyring
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/security/gnupg-devel/Makefile b/security/gnupg-devel/Makefile
index cc023f367fb..add8c84b36a 100644
--- a/security/gnupg-devel/Makefile
+++ b/security/gnupg-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/02/05 23:10:43 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2006/04/06 06:22:38 reed Exp $
#
DISTNAME= gnupg-1.9.20
@@ -54,7 +54,7 @@ PLIST_SRC+= ${.CURDIR}/PLIST.gpgsm
pre-configure:
cd ${WRKDIR}/pth-2.0.4 && ./configure --prefix=${WRKDIR}/pth --enable-pthread --enable-static --disable-shared && ${MAKE} install
-BUILDLINK_DEPENDS.libgpg-error+= libgpg-error>=1.0.0
+BUILDLINK_API_DEPENDS.libgpg-error+= libgpg-error>=1.0.0
.include "../../databases/openldap/buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
diff --git a/security/gnupg-devel/buildlink3.mk b/security/gnupg-devel/buildlink3.mk
index 5ef7b041458..acf66e332be 100644
--- a/security/gnupg-devel/buildlink3.mk
+++ b/security/gnupg-devel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:43 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:38 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNUPG_DEVEL_BUILDLINK3_MK:= ${GNUPG_DEVEL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnupg-devel}
BUILDLINK_PACKAGES+= gnupg-devel
.if !empty(GNUPG_DEVEL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnupg-devel+= gnupg-devel>=1.9.11
-BUILDLINK_RECOMMENDED.gnupg-devel+= gnupg-devel>=1.9.20nb1
+BUILDLINK_API_DEPENDS.gnupg-devel+= gnupg-devel>=1.9.11
+BUILDLINK_ABI_DEPENDS.gnupg-devel+= gnupg-devel>=1.9.20nb1
BUILDLINK_PKGSRCDIR.gnupg-devel?= ../../security/gnupg-devel
.endif # GNUPG_DEVEL_BUILDLINK3_MK
BUILDLINK_PREFIX.gnupg-devel?= ${LOCALBASE}
diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index 1472c0ad774..94c97b08775 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2006/03/31 23:56:29 jlam Exp $
+# $NetBSD: Makefile,v 1.48 2006/04/06 06:22:38 reed Exp $
DISTNAME= gnutls-1.3.5
CATEGORIES= security devel
@@ -24,9 +24,9 @@ INFO_FILES= # PLIST
PKGCONFIG_OVERRIDE= lib/gnutls.pc.in
PKGCONFIG_OVERRIDE+= libextra/gnutls-extra.pc.in
-BUILDLINK_DEPENDS.opencdk+= opencdk>=0.5.5
-BUILDLINK_DEPENDS.libtasn1+= libtasn1>=0.3.1
-BUILDLINK_DEPENDS.libgcrypt+= libgcrypt>=1.2.2
+BUILDLINK_API_DEPENDS.opencdk+= opencdk>=0.5.5
+BUILDLINK_API_DEPENDS.libtasn1+= libtasn1>=0.3.1
+BUILDLINK_API_DEPENDS.libgcrypt+= libgcrypt>=1.2.2
MAKE_ENV+= RM=${RM:Q}
MAKE_ENV+= TZ=UTC
diff --git a/security/gnutls/buildlink3.mk b/security/gnutls/buildlink3.mk
index a29317e55bd..cceb504bbd5 100644
--- a/security/gnutls/buildlink3.mk
+++ b/security/gnutls/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/03/06 00:18:10 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2006/04/06 06:22:38 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNUTLS_BUILDLINK3_MK:= ${GNUTLS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnutls}
BUILDLINK_PACKAGES+= gnutls
.if !empty(GNUTLS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnutls+= gnutls>=1.0.13
-BUILDLINK_RECOMMENDED.gnutls+= gnutls>=1.3.4nb1
+BUILDLINK_API_DEPENDS.gnutls+= gnutls>=1.0.13
+BUILDLINK_ABI_DEPENDS.gnutls+= gnutls>=1.3.4nb1
BUILDLINK_PKGSRCDIR.gnutls?= ../../security/gnutls
.endif # GNUTLS_BUILDLINK3_MK
diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index 026d40b2f0a..4359139cf31 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2006/03/31 23:56:29 jlam Exp $
+# $NetBSD: Makefile,v 1.42 2006/04/06 06:22:38 reed Exp $
#
DISTNAME= gpgme-1.0.3
@@ -48,7 +48,7 @@ CONFIGURE_ARGS+= --without-pth --without-pth-test
.include "../../security/libgpg-error/buildlink3.mk"
# we want the getenv_r() semantics of NetBSD-current
-BUILDLINK_DEPENDS.librfuncs+= librfuncs>=1.0.7nb1
+BUILDLINK_API_DEPENDS.librfuncs+= librfuncs>=1.0.7nb1
.include "../../devel/librfuncs/buildlink3.mk"
##
diff --git a/security/gpgme/buildlink3.mk b/security/gpgme/buildlink3.mk
index 4246f621aa7..ea82d167667 100644
--- a/security/gpgme/buildlink3.mk
+++ b/security/gpgme/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/02/05 23:10:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/04/06 06:22:38 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GPGME_BUILDLINK3_MK:= ${GPGME_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngpgme}
BUILDLINK_PACKAGES+= gpgme
.if !empty(GPGME_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gpgme+= gpgme>=0.9.0
-BUILDLINK_RECOMMENDED.gpgme+= gpgme>=1.0.3nb1
+BUILDLINK_API_DEPENDS.gpgme+= gpgme>=0.9.0
+BUILDLINK_ABI_DEPENDS.gpgme+= gpgme>=1.0.3nb1
BUILDLINK_PKGSRCDIR.gpgme?= ../../security/gpgme
.endif # GPGME_BUILDLINK3_MK
diff --git a/security/gpgme03/buildlink3.mk b/security/gpgme03/buildlink3.mk
index 9fd437d49b4..df5f0eb6ee2 100644
--- a/security/gpgme03/buildlink3.mk
+++ b/security/gpgme03/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:10:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:39 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GPGME03_BUILDLINK3_MK:= ${GPGME03_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngpgme03}
BUILDLINK_PACKAGES+= gpgme03
.if !empty(GPGME03_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gpgme03+= gpgme03>=0.3.16
-BUILDLINK_RECOMMENDED.gpgme03+= gpgme03>=0.3.16nb2
+BUILDLINK_API_DEPENDS.gpgme03+= gpgme03>=0.3.16
+BUILDLINK_ABI_DEPENDS.gpgme03+= gpgme03>=0.3.16nb2
BUILDLINK_PKGSRCDIR.gpgme03?= ../../security/gpgme03
BUILDLINK_FILES.gpgme03+= bin/gpgme03-config
diff --git a/security/gsasl/buildlink3.mk b/security/gsasl/buildlink3.mk
index 855bcd9bd2a..213d7241843 100644
--- a/security/gsasl/buildlink3.mk
+++ b/security/gsasl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:10:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:39 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GSASL_BUILDLINK3_MK:= ${GSASL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngsasl}
BUILDLINK_PACKAGES+= gsasl
.if !empty(GSASL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gsasl+= gsasl>=0.2.3
-BUILDLINK_RECOMMENDED.gsasl?= gsasl>=0.2.5nb1
+BUILDLINK_API_DEPENDS.gsasl+= gsasl>=0.2.3
+BUILDLINK_ABI_DEPENDS.gsasl?= gsasl>=0.2.5nb1
BUILDLINK_PKGSRCDIR.gsasl?= ../../security/gsasl
.endif # GSASL_BUILDLINK3_MK
diff --git a/security/gss/buildlink3.mk b/security/gss/buildlink3.mk
index 28c3a6d40bf..c3e3cbc8aa5 100644
--- a/security/gss/buildlink3.mk
+++ b/security/gss/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/10/03 00:18:09 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:40 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GSS_BUILDLINK3_MK:= ${GSS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngss}
BUILDLINK_PACKAGES+= gss
.if !empty(GSS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gss+= gss>=0.0.6nb1
-BUILDLINK_RECOMMENDED.gss+= gss>=0.0.13nb1
+BUILDLINK_API_DEPENDS.gss+= gss>=0.0.6nb1
+BUILDLINK_ABI_DEPENDS.gss+= gss>=0.0.13nb1
BUILDLINK_PKGSRCDIR.gss?= ../../security/gss
.endif # GSS_BUILDLINK3_MK
diff --git a/security/heimdal/buildlink3.mk b/security/heimdal/buildlink3.mk
index 05445f58a99..8b0b01bbb8e 100644
--- a/security/heimdal/buildlink3.mk
+++ b/security/heimdal/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.26 2005/10/26 15:12:45 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.27 2006/04/06 06:22:40 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
HEIMDAL_BUILDLINK3_MK:= ${HEIMDAL_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nheimdal}
BUILDLINK_PACKAGES+= heimdal
.if !empty(HEIMDAL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.heimdal+= heimdal>=0.4e
-BUILDLINK_RECOMMENDED.heimdal+= heimdal>=0.6.3nb2
+BUILDLINK_API_DEPENDS.heimdal+= heimdal>=0.4e
+BUILDLINK_ABI_DEPENDS.heimdal+= heimdal>=0.6.3nb2
BUILDLINK_PKGSRCDIR.heimdal?= ../../security/heimdal
BUILDLINK_INCDIRS.heimdal?= include/krb5
.endif # HEIMDAL_BUILDLINK3_MK
diff --git a/security/heimdal/builtin.mk b/security/heimdal/builtin.mk
index e212ea11135..d5e3a871db1 100644
--- a/security/heimdal/builtin.mk
+++ b/security/heimdal/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.8 2006/03/30 18:06:18 jlam Exp $
+# $NetBSD: builtin.mk,v 1.9 2006/04/06 06:22:41 reed Exp $
BUILTIN_PKG:= heimdal
@@ -74,7 +74,7 @@ USE_BUILTIN.heimdal= ${IS_BUILTIN.heimdal}
. if defined(BUILTIN_PKG.heimdal) && \
!empty(IS_BUILTIN.heimdal:M[yY][eE][sS])
USE_BUILTIN.heimdal= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.heimdal}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.heimdal}
. if !empty(USE_BUILTIN.heimdal:M[yY][eE][sS])
USE_BUILTIN.heimdal!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.heimdal:Q}; then \
@@ -97,7 +97,7 @@ CHECK_BUILTIN.heimdal?= no
.if !empty(CHECK_BUILTIN.heimdal:M[nN][oO])
. if !empty(USE_BUILTIN.heimdal:M[nN][oO])
-BUILDLINK_DEPENDS.heimdal+= heimdal>=0.6
+BUILDLINK_API_DEPENDS.heimdal+= heimdal>=0.6
KRB5_CONFIG?= ${BUILDLINK_PREFIX.heimdal}/bin/krb5-config
CONFIGURE_ENV+= KRB5_CONFIG=${KRB5_CONFIG:Q}
diff --git a/security/hydra/Makefile b/security/hydra/Makefile
index b03e046049d..bfba72f460a 100644
--- a/security/hydra/Makefile
+++ b/security/hydra/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/02/05 00:18:29 adrianp Exp $
+# $NetBSD: Makefile,v 1.8 2006/04/06 06:22:42 reed Exp $
#
DISTNAME= ${PKGNAME}-src
@@ -32,7 +32,7 @@ SUBST_MESSAGE.build= Patching build files.
USE_OLD_DES_API= YES
PLIST_SRC= ${WRKDIR}/.PLIST_SRC
CONFIGURE_ARGS+= --prefix=${PREFIX:Q}
-BUILDLINK_DEPENDS.libssh+= libssh-0.11
+BUILDLINK_API_DEPENDS.libssh+= libssh-0.11
INSTALLATION_DIRS= bin
diff --git a/security/kth-krb4/buildlink3.mk b/security/kth-krb4/buildlink3.mk
index 1afa6b01ce1..636c7733d5d 100644
--- a/security/kth-krb4/buildlink3.mk
+++ b/security/kth-krb4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:42 reed Exp $
# XXX BUILDLINK_DEPMETHOD.kth-krb4?= build
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
@@ -12,9 +12,9 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nkth-krb4}
BUILDLINK_PACKAGES+= kth-krb4
.if !empty(KTH_KRB4_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.kth-krb4+= kth-krb4>=1.1.1
-BUILDLINK_RECOMMENDED.kth-krb4+=kth-krb4>=1.2.1nb5
-BUILDLINK_RECOMMENDED.kth-krb4?= kth-krb4>=1.2.1nb6
+BUILDLINK_API_DEPENDS.kth-krb4+= kth-krb4>=1.1.1
+BUILDLINK_ABI_DEPENDS.kth-krb4+=kth-krb4>=1.2.1nb5
+BUILDLINK_ABI_DEPENDS.kth-krb4?= kth-krb4>=1.2.1nb6
BUILDLINK_PKGSRCDIR.kth-krb4?= ../../security/kth-krb4
.endif # KTH_KRB4_BUILDLINK3_MK
diff --git a/security/libassuan/Makefile b/security/libassuan/Makefile
index a427b364bc9..492e89435c7 100644
--- a/security/libassuan/Makefile
+++ b/security/libassuan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/03/31 23:56:29 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2006/04/06 06:22:42 reed Exp $
#
DISTNAME= libassuan-0.6.10
@@ -15,7 +15,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= yes
INFO_FILES= # PLIST
-BUILDLINK_DEPENDS.libgpg-error+= libgpg-error>=1.0.0
+BUILDLINK_API_DEPENDS.libgpg-error+= libgpg-error>=1.0.0
.include "../../security/libgpg-error/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/security/libassuan/buildlink3.mk b/security/libassuan/buildlink3.mk
index 351e4b6f2ee..8a22788afae 100644
--- a/security/libassuan/buildlink3.mk
+++ b/security/libassuan/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:10:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:42 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBASSUAN_BUILDLINK3_MK:= ${LIBASSUAN_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibassuan}
BUILDLINK_PACKAGES+= libassuan
.if !empty(LIBASSUAN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libassuan+= libassuan>=0.6.7
-BUILDLINK_RECOMMENDED.libassuan?= libassuan>=0.6.10nb2
+BUILDLINK_API_DEPENDS.libassuan+= libassuan>=0.6.7
+BUILDLINK_ABI_DEPENDS.libassuan?= libassuan>=0.6.10nb2
BUILDLINK_PKGSRCDIR.libassuan?= ../../security/libassuan
.endif # LIBASSUAN_BUILDLINK3_MK
diff --git a/security/libcrack/buildlink3.mk b/security/libcrack/buildlink3.mk
index 3169e073e17..49a56ff0889 100644
--- a/security/libcrack/buildlink3.mk
+++ b/security/libcrack/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/10/03 00:18:09 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:42 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBCRACK_BUILDLINK3_MK:= ${LIBCRACK_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibcrack}
BUILDLINK_PACKAGES+= libcrack
.if !empty(LIBCRACK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libcrack+= libcrack>=2.7
-BUILDLINK_RECOMMENDED.libcrack+= libcrack>=2.7nb1
+BUILDLINK_API_DEPENDS.libcrack+= libcrack>=2.7
+BUILDLINK_ABI_DEPENDS.libcrack+= libcrack>=2.7nb1
BUILDLINK_PKGSRCDIR.libcrack?= ../../security/libcrack
.endif # LIBCRACK_BUILDLINK3_MK
diff --git a/security/libdes/buildlink3.mk b/security/libdes/buildlink3.mk
index c826a5aa5db..3362b944c57 100644
--- a/security/libdes/buildlink3.mk
+++ b/security/libdes/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/04/12 20:46:28 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:42 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBDES_BUILDLINK3_MK:= ${LIBDES_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibdes}
BUILDLINK_PACKAGES+= libdes
.if !empty(LIBDES_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libdes+= libdes>=4.04b
+BUILDLINK_API_DEPENDS.libdes+= libdes>=4.04b
BUILDLINK_PKGSRCDIR.libdes?= ../../security/libdes
BUILDLINK_DEPMETHOD.libdes?= build
.endif # LIBDES_BUILDLINK3_MK
diff --git a/security/libdes/builtin.mk b/security/libdes/builtin.mk
index 0e383ed6c6c..0d20f7a6aa0 100644
--- a/security/libdes/builtin.mk
+++ b/security/libdes/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.5 2006/03/30 18:06:18 jlam Exp $
+# $NetBSD: builtin.mk,v 1.6 2006/04/06 06:22:42 reed Exp $
BUILTIN_PKG:= libdes
@@ -31,7 +31,7 @@ USE_BUILTIN.libdes= ${IS_BUILTIN.libdes}
. if defined(BUILTIN_PKG.libdes) && \
!empty(IS_BUILTIN.libdes:M[yY][eE][sS])
USE_BUILTIN.libdes= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.libdes}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.libdes}
. if !empty(USE_BUILTIN.libdes:M[yY][eE][sS])
USE_BUILTIN.libdes!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.libdes:Q}; then \
diff --git a/security/libfwbuilder/Makefile b/security/libfwbuilder/Makefile
index ac5be18e074..8fc0e314abf 100644
--- a/security/libfwbuilder/Makefile
+++ b/security/libfwbuilder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/03/12 06:56:30 minskim Exp $
+# $NetBSD: Makefile,v 1.20 2006/04/06 06:22:42 reed Exp $
DISTNAME= libfwbuilder-2.0.10
PKGREVISION= 5
@@ -19,7 +19,7 @@ USE_LANGUAGES= c++
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../textproc/libxslt/buildlink3.mk"
.include "../../x11/qt3-libs/buildlink3.mk"
-BUILDLINK_DEPENDS.qt3-tools+= qt3-tools>=3.3.5nb5
+BUILDLINK_API_DEPENDS.qt3-tools+= qt3-tools>=3.3.5nb5
.include "../../x11/qt3-tools/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/security/libfwbuilder/buildlink3.mk b/security/libfwbuilder/buildlink3.mk
index 511b79e585f..9a35117acc5 100644
--- a/security/libfwbuilder/buildlink3.mk
+++ b/security/libfwbuilder/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/03/03 01:29:40 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/04/06 06:22:42 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBFWBUILDER_BUILDLINK3_MK:= ${LIBFWBUILDER_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibfwbuilder}
BUILDLINK_PACKAGES+= libfwbuilder
.if !empty(LIBFWBUILDER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libfwbuilder+= libfwbuilder>=2.0.10
-BUILDLINK_RECOMMENDED.libfwbuilder?= libfwbuilder>=2.0.10nb2
+BUILDLINK_API_DEPENDS.libfwbuilder+= libfwbuilder>=2.0.10
+BUILDLINK_ABI_DEPENDS.libfwbuilder?= libfwbuilder>=2.0.10nb2
BUILDLINK_PKGSRCDIR.libfwbuilder?= ../../security/libfwbuilder
.endif # LIBFWBUILDER_BUILDLINK3_MK
diff --git a/security/libgcrypt/buildlink3.mk b/security/libgcrypt/buildlink3.mk
index 532f2666c16..84807ef856d 100644
--- a/security/libgcrypt/buildlink3.mk
+++ b/security/libgcrypt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/05 23:10:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:22:42 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGCRYPT_BUILDLINK3_MK:= ${LIBGCRYPT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgcrypt}
BUILDLINK_PACKAGES+= libgcrypt
.if !empty(LIBGCRYPT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgcrypt+= libgcrypt>=1.2.0
-BUILDLINK_RECOMMENDED.libgcrypt+= libgcrypt>=1.2.2nb1
+BUILDLINK_API_DEPENDS.libgcrypt+= libgcrypt>=1.2.0
+BUILDLINK_ABI_DEPENDS.libgcrypt+= libgcrypt>=1.2.2nb1
BUILDLINK_PKGSRCDIR.libgcrypt?= ../../security/libgcrypt
.endif # LIBGCRYPT_BUILDLINK3_MK
diff --git a/security/libgpg-error/buildlink3.mk b/security/libgpg-error/buildlink3.mk
index e43236f2817..adae61d7027 100644
--- a/security/libgpg-error/buildlink3.mk
+++ b/security/libgpg-error/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:10:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:22:42 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGPG_ERROR_BUILDLINK3_MK:= ${LIBGPG_ERROR_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgpg-error}
BUILDLINK_PACKAGES+= libgpg-error
.if !empty(LIBGPG_ERROR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgpg-error+= libgpg-error>=0.6
-BUILDLINK_RECOMMENDED.libgpg-error+= libgpg-error>=1.0nb1
+BUILDLINK_API_DEPENDS.libgpg-error+= libgpg-error>=0.6
+BUILDLINK_ABI_DEPENDS.libgpg-error+= libgpg-error>=1.0nb1
BUILDLINK_PKGSRCDIR.libgpg-error?= ../../security/libgpg-error
.endif # LIBGPG_ERROR_BUILDLINK3_MK
diff --git a/security/libidea/buildlink3.mk b/security/libidea/buildlink3.mk
index c360757bf2e..5b08b5a7db2 100644
--- a/security/libidea/buildlink3.mk
+++ b/security/libidea/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/04/18 18:48:41 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:42 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBIDEA_BUILDLINK3_MK:= ${LIBIDEA_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibidea}
BUILDLINK_PACKAGES+= libidea
.if !empty(LIBIDEA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libidea+= libidea>=0.8.2
+BUILDLINK_API_DEPENDS.libidea+= libidea>=0.8.2
BUILDLINK_PKGSRCDIR.libidea?= ../../security/libidea
BUILDLINK_DEPMETHOD.libidea?= build
.endif # LIBIDEA_BUILDLINK3_MK
diff --git a/security/libident/buildlink3.mk b/security/libident/buildlink3.mk
index 5b64b5e143e..8cd8b69eb92 100644
--- a/security/libident/buildlink3.mk
+++ b/security/libident/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:18:09 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:42 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBIDENT_BUILDLINK3_MK:= ${LIBIDENT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibident}
BUILDLINK_PACKAGES+= libident
.if !empty(LIBIDENT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libident+= libident>=0.22
-BUILDLINK_RECOMMENDED.libident+= libident>=0.22nb1
+BUILDLINK_API_DEPENDS.libident+= libident>=0.22
+BUILDLINK_ABI_DEPENDS.libident+= libident>=0.22nb1
BUILDLINK_PKGSRCDIR.libident?= ../../security/libident
.endif # LIBIDENT_BUILDLINK3_MK
diff --git a/security/libksba/buildlink3.mk b/security/libksba/buildlink3.mk
index a0d40df53c8..e9cc5aa9413 100644
--- a/security/libksba/buildlink3.mk
+++ b/security/libksba/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:10:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:22:42 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBKSBA_BUILDLINK3_MK:= ${LIBKSBA_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibksba}
BUILDLINK_PACKAGES+= libksba
.if !empty(LIBKSBA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libksba+= libksba>=0.9.7
-BUILDLINK_RECOMMENDED.libksba+= libksba>=0.9.13nb1
+BUILDLINK_API_DEPENDS.libksba+= libksba>=0.9.7
+BUILDLINK_ABI_DEPENDS.libksba+= libksba>=0.9.13nb1
BUILDLINK_PKGSRCDIR.libksba?= ../../security/libksba
.endif # LIBKSBA_BUILDLINK3_MK
diff --git a/security/libksba04/buildlink3.mk b/security/libksba04/buildlink3.mk
index d60e35cc131..0a1a2b382d4 100644
--- a/security/libksba04/buildlink3.mk
+++ b/security/libksba04/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:18:10 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:42 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBKSBA_BUILDLINK3_MK:= ${LIBKSBA_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibksba}
BUILDLINK_PACKAGES+= libksba
.if !empty(LIBKSBA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libksba+= libksba>=0.4.7nb1
-BUILDLINK_RECOMMENDED.libksba+= libksba>=0.4.7nb2
+BUILDLINK_API_DEPENDS.libksba+= libksba>=0.4.7nb1
+BUILDLINK_ABI_DEPENDS.libksba+= libksba>=0.4.7nb2
BUILDLINK_PKGSRCDIR.libksba?= ../../security/libksba04
.endif # LIBKSBA_BUILDLINK3_MK
diff --git a/security/libmcrypt/buildlink3.mk b/security/libmcrypt/buildlink3.mk
index 4ec6c3b4183..5b36b925705 100644
--- a/security/libmcrypt/buildlink3.mk
+++ b/security/libmcrypt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:18:10 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:42 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBMCRYPT_BUILDLINK3_MK:= ${LIBMCRYPT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmcrypt}
BUILDLINK_PACKAGES+= libmcrypt
.if !empty(LIBMCRYPT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmcrypt+= libmcrypt>=2.5.6
-BUILDLINK_RECOMMENDED.libmcrypt+= libmcrypt>=2.5.7nb1
+BUILDLINK_API_DEPENDS.libmcrypt+= libmcrypt>=2.5.6
+BUILDLINK_ABI_DEPENDS.libmcrypt+= libmcrypt>=2.5.7nb1
BUILDLINK_PKGSRCDIR.libmcrypt?= ../../security/libmcrypt
.endif # LIBMCRYPT_BUILDLINK3_MK
diff --git a/security/libnasl/buildlink3.mk b/security/libnasl/buildlink3.mk
index fdee6b0fe4c..1fc245b228f 100644
--- a/security/libnasl/buildlink3.mk
+++ b/security/libnasl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2005/02/21 10:08:43 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:42 reed Exp $
# XXX BUILDLINK_DEPMETHOD.libnasl?= build
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibnasl}
BUILDLINK_PACKAGES+= libnasl
.if !empty(LIBNASL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libnasl+= libnasl>=2.2.3
-BUILDLINK_RECOMMENDED.libnasl?= libnasl>=2.2.3
+BUILDLINK_API_DEPENDS.libnasl+= libnasl>=2.2.3
+BUILDLINK_ABI_DEPENDS.libnasl?= libnasl>=2.2.3
BUILDLINK_PKGSRCDIR.libnasl?= ../../security/libnasl
.endif # LIBNASL_BUILDLINK3_MK
diff --git a/security/libprelude/buildlink3.mk b/security/libprelude/buildlink3.mk
index 7586e93baa9..62ff9e5233f 100644
--- a/security/libprelude/buildlink3.mk
+++ b/security/libprelude/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/03/10 22:19:29 shannonjr Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:42 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBPRELUDE_BUILDLINK3_MK:= ${LIBPRELUDE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibprelude}
BUILDLINK_PACKAGES+= libprelude
.if !empty(LIBPRELUDE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libprelude+= libprelude>=0.9.0
-BUILDLINK_RECOMMENDED.libprelude?= libprelude>=0.9.7
+BUILDLINK_API_DEPENDS.libprelude+= libprelude>=0.9.0
+BUILDLINK_ABI_DEPENDS.libprelude?= libprelude>=0.9.7
BUILDLINK_PKGSRCDIR.libprelude?= ../../security/libprelude
.endif # LIBPRELUDE_BUILDLINK3_MK
diff --git a/security/libpreludedb/buildlink3.mk b/security/libpreludedb/buildlink3.mk
index 4b50ec3b2ee..d80b6254ad8 100644
--- a/security/libpreludedb/buildlink3.mk
+++ b/security/libpreludedb/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/03/10 22:44:50 shannonjr Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:43 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBPRELUDEDB_BUILDLINK3_MK:= ${LIBPRELUDEDB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibpreludedb}
BUILDLINK_PACKAGES+= libpreludedb
.if !empty(LIBPRELUDEDB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libpreludedb+= libpreludedb>=0.9.3
-BUILDLINK_RECOMMENDED.libpreludedb?= libpreludedb>=0.9.6
+BUILDLINK_API_DEPENDS.libpreludedb+= libpreludedb>=0.9.3
+BUILDLINK_ABI_DEPENDS.libpreludedb?= libpreludedb>=0.9.6
BUILDLINK_PKGSRCDIR.libpreludedb?= ../../security/libpreludedb
.endif # LIBPRELUDEDB_BUILDLINK3_MK
diff --git a/security/libssh/buildlink3.mk b/security/libssh/buildlink3.mk
index 648f030b957..489a604f066 100644
--- a/security/libssh/buildlink3.mk
+++ b/security/libssh/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 00:20:17 adrianp Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:43 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBSSH_BUILDLINK3_MK:= ${NETWIB_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibssh}
BUILDLINK_PACKAGES+= libssh
.if !empty(LIBSSH_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libssh+= libssh>=0.11
+BUILDLINK_API_DEPENDS.libssh+= libssh>=0.11
BUILDLINK_PKGSRCDIR.libssh?= ../../security/libssh
.endif # LIBSSH_BUILDLINK3_MK
diff --git a/security/libtasn1/buildlink3.mk b/security/libtasn1/buildlink3.mk
index 8fef1298346..5c91269a031 100644
--- a/security/libtasn1/buildlink3.mk
+++ b/security/libtasn1/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/03/06 00:18:10 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:43 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBTASN1_BUILDLINK3_MK:= ${LIBTASN1_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibtasn1}
BUILDLINK_PACKAGES+= libtasn1
.if !empty(LIBTASN1_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libtasn1+= libtasn1>=0.2.7
-BUILDLINK_RECOMMENDED.libtasn1+= libtasn1>=0.3.0
+BUILDLINK_API_DEPENDS.libtasn1+= libtasn1>=0.2.7
+BUILDLINK_ABI_DEPENDS.libtasn1+= libtasn1>=0.3.0
BUILDLINK_PKGSRCDIR.libtasn1?= ../../security/libtasn1
.endif # LIBTASN1_BUILDLINK3_MK
diff --git a/security/libtcpa/buildlink3.mk b/security/libtcpa/buildlink3.mk
index 6b051d69e30..d1d2a0e1dfe 100644
--- a/security/libtcpa/buildlink3.mk
+++ b/security/libtcpa/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/03/26 02:27:52 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:43 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBTCPA_BUILDLINK3_MK:= ${LIBTCPA_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibtcpa}
BUILDLINK_PACKAGES+= libtcpa
.if !empty(LIBTCPA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libtcpa+= libtcpa>=1.1b
-BUILDLINK_RECOMMENDED.libtcpa?= libtcpa>=1.1bnb1
+BUILDLINK_API_DEPENDS.libtcpa+= libtcpa>=1.1b
+BUILDLINK_ABI_DEPENDS.libtcpa?= libtcpa>=1.1bnb1
BUILDLINK_PKGSRCDIR.libtcpa?= ../../security/libtcpa
BUILDLINK_DEPMETHOD.libtcpa?= build
.endif # LIBTCPA_BUILDLINK3_MK
diff --git a/security/mhash/buildlink3.mk b/security/mhash/buildlink3.mk
index 885bab4eb67..ad13b49a818 100644
--- a/security/mhash/buildlink3.mk
+++ b/security/mhash/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:43 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
MHASH_BUILDLINK3_MK:= ${MHASH_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmhash}
BUILDLINK_PACKAGES+= mhash
.if !empty(MHASH_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.mhash+= mhash>=0.8.3
-BUILDLINK_RECOMMENDED.mhash+= mhash>=0.9.2nb1
+BUILDLINK_API_DEPENDS.mhash+= mhash>=0.8.3
+BUILDLINK_ABI_DEPENDS.mhash+= mhash>=0.9.2nb1
BUILDLINK_PKGSRCDIR.mhash?= ../../security/mhash
.endif # MHASH_BUILDLINK3_MK
diff --git a/security/mit-krb5/buildlink3.mk b/security/mit-krb5/buildlink3.mk
index 04441a84b9b..5f1cf216b26 100644
--- a/security/mit-krb5/buildlink3.mk
+++ b/security/mit-krb5/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2005/04/16 14:32:53 salo Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:43 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
MIT_KRB5_BUILDLINK3_MK:= ${MIT_KRB5_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmit-krb5}
BUILDLINK_PACKAGES+= mit-krb5
.if !empty(MIT_KRB5_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.mit-krb5+= mit-krb5>=1.3.1
-BUILDLINK_RECOMMENDED.mit-krb5+= mit-krb5>=1.4nb1
+BUILDLINK_API_DEPENDS.mit-krb5+= mit-krb5>=1.3.1
+BUILDLINK_ABI_DEPENDS.mit-krb5+= mit-krb5>=1.4nb1
BUILDLINK_PKGSRCDIR.mit-krb5?= ../../security/mit-krb5
.endif # MIT_KRB5_BUILDLINK3_MK
diff --git a/security/mixminion/Makefile b/security/mixminion/Makefile
index d81f5c51ac1..1b8d618a512 100644
--- a/security/mixminion/Makefile
+++ b/security/mixminion/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/02/05 23:10:45 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2006/04/06 06:22:43 reed Exp $
#
DISTNAME= Mixminion-0.0.7.1
@@ -11,7 +11,7 @@ MAINTAINER= pdh@wiredyne.com
HOMEPAGE= http://mixminion.net/
COMMENT= Mixminion impedes message traffic analysis
-BUILDLINK_DEPENDS.openssl+= openssl>=0.9.7d
+BUILDLINK_API_DEPENDS.openssl+= openssl>=0.9.7d
CRYPTO= YES
PYTHON_VERSIONS_ACCEPTED= 23 22 21
diff --git a/security/nessus-core/buildlink3.mk b/security/nessus-core/buildlink3.mk
index d9b3e97b9e7..3f1ae5102a6 100644
--- a/security/nessus-core/buildlink3.mk
+++ b/security/nessus-core/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:10:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:43 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
NESSUS_CORE_BUILDLINK3_MK:= ${NESSUS_CORE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nnessus-core}
BUILDLINK_PACKAGES+= nessus-core
.if !empty(NESSUS_CORE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.nessus-core+= nessus-core>=2.2.3
-BUILDLINK_RECOMMENDED.nessus-core?= nessus-core>=2.2.6
+BUILDLINK_API_DEPENDS.nessus-core+= nessus-core>=2.2.3
+BUILDLINK_ABI_DEPENDS.nessus-core?= nessus-core>=2.2.6
BUILDLINK_PKGSRCDIR.nessus-core?= ../../security/nessus-core
.endif # NESSUS_CORE_BUILDLINK3_MK
diff --git a/security/nessus-libraries/buildlink3.mk b/security/nessus-libraries/buildlink3.mk
index f816757635a..0ec943291ab 100644
--- a/security/nessus-libraries/buildlink3.mk
+++ b/security/nessus-libraries/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/01/29 17:05:54 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:22:43 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
NESSUS_LIBRARIES_BUILDLINK3_MK:= ${NESSUS_LIBRARIES_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nnessus-libraries}
BUILDLINK_PACKAGES+= nessus-libraries
.if !empty(NESSUS_LIBRARIES_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.nessus-libraries+= nessus-libraries>=2.2.3
+BUILDLINK_API_DEPENDS.nessus-libraries+= nessus-libraries>=2.2.3
BUILDLINK_PKGSRCDIR.nessus-libraries?= ../../security/nessus-libraries
.endif # NESSUS_LIBRARIES_BUILDLINK3_MK
diff --git a/security/opencdk/buildlink3.mk b/security/opencdk/buildlink3.mk
index ce79b74fbf1..dab23c600c7 100644
--- a/security/opencdk/buildlink3.mk
+++ b/security/opencdk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:10:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:43 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OPENCDK_BUILDLINK3_MK:= ${OPENCDK_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nopencdk}
BUILDLINK_PACKAGES+= opencdk
.if !empty(OPENCDK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.opencdk+= opencdk>=0.5.4nb1
-BUILDLINK_RECOMMENDED.opencdk+= opencdk>=0.5.8nb1
+BUILDLINK_API_DEPENDS.opencdk+= opencdk>=0.5.4nb1
+BUILDLINK_ABI_DEPENDS.opencdk+= opencdk>=0.5.8nb1
BUILDLINK_PKGSRCDIR.opencdk?= ../../security/opencdk
.endif # OPENCDK_BUILDLINK3_MK
diff --git a/security/openpam/buildlink3.mk b/security/openpam/buildlink3.mk
index e2c14dad32d..80f1bcdacb0 100644
--- a/security/openpam/buildlink3.mk
+++ b/security/openpam/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2005/01/13 21:59:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:43 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OPENPAM_BUILDLINK3_MK:= ${OPENPAM_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nopenpam}
BUILDLINK_PACKAGES+= openpam
.if !empty(OPENPAM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.openpam+= openpam>=20040210
+BUILDLINK_API_DEPENDS.openpam+= openpam>=20040210
BUILDLINK_PKGSRCDIR.openpam?= ../../security/openpam
.endif # OPENPAM_BUILDLINK3_MK
diff --git a/security/openpam/builtin.mk b/security/openpam/builtin.mk
index d014f858f03..212bf8c0b2c 100644
--- a/security/openpam/builtin.mk
+++ b/security/openpam/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.5 2006/03/30 18:06:18 jlam Exp $
+# $NetBSD: builtin.mk,v 1.6 2006/04/06 06:22:43 reed Exp $
BUILTIN_PKG:= openpam
@@ -45,7 +45,7 @@ USE_BUILTIN.openpam= ${IS_BUILTIN.openpam}
. if defined(BUILTIN_PKG.openpam) && \
!empty(IS_BUILTIN.openpam:M[yY][eE][sS])
USE_BUILTIN.openpam= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.openpam}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.openpam}
. if !empty(USE_BUILTIN.openpam:M[yY][eE][sS])
USE_BUILTIN.openpam!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.openpam:Q}; then \
diff --git a/security/openssl/buildlink3.mk b/security/openssl/buildlink3.mk
index 82a846a07e2..b3945811336 100644
--- a/security/openssl/buildlink3.mk
+++ b/security/openssl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.29 2006/02/05 23:10:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.30 2006/04/06 06:22:43 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OPENSSL_BUILDLINK3_MK:= ${OPENSSL_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nopenssl}
BUILDLINK_PACKAGES+= openssl
.if !empty(OPENSSL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.openssl+= openssl>=0.9.6m
-BUILDLINK_RECOMMENDED.openssl+= openssl>=0.9.7inb1
+BUILDLINK_API_DEPENDS.openssl+= openssl>=0.9.6m
+BUILDLINK_ABI_DEPENDS.openssl+= openssl>=0.9.7inb1
BUILDLINK_PKGSRCDIR.openssl?= ../../security/openssl
# Ensure that -lcrypt comes before -lcrypto when linking so that the
diff --git a/security/openssl/builtin.mk b/security/openssl/builtin.mk
index 07c7dcd6dd9..d371540fa9f 100644
--- a/security/openssl/builtin.mk
+++ b/security/openssl/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.18 2006/03/30 18:06:18 jlam Exp $
+# $NetBSD: builtin.mk,v 1.19 2006/04/06 06:22:43 reed Exp $
BUILTIN_PKG:= openssl
@@ -112,7 +112,7 @@ USE_BUILTIN.openssl= ${IS_BUILTIN.openssl}
. if defined(BUILTIN_PKG.openssl) && \
!empty(IS_BUILTIN.openssl:M[yY][eE][sS])
USE_BUILTIN.openssl= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.openssl}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.openssl}
. if !empty(USE_BUILTIN.openssl:M[yY][eE][sS])
USE_BUILTIN.openssl!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.openssl:Q}; then \
diff --git a/security/p5-Net-DNS-SEC/Makefile b/security/p5-Net-DNS-SEC/Makefile
index 5f9ec9caac8..043876bb9b1 100644
--- a/security/p5-Net-DNS-SEC/Makefile
+++ b/security/p5-Net-DNS-SEC/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/12/29 06:22:11 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2006/04/06 06:22:43 reed Exp $
#
DISTNAME= Net-DNS-SEC-0.12
@@ -20,7 +20,7 @@ DEPENDS+= p5-Digest-SHA1>=2.04:../../security/p5-Digest-SHA1
DEPENDS+= p5-MIME-Base64-[0-9]*:../../converters/p5-MIME-Base64
DEPENDS+= p5-Digest-BubbleBabble>=0.01:../../security/p5-Digest-BubbleBabble
-BUILDLINK_DEPENDS.perl+= perl>=5.6.1
+BUILDLINK_API_DEPENDS.perl+= perl>=5.6.1
PERL5_PACKLIST= auto/Net/DNS/SEC/.packlist
diff --git a/security/pakemon/Makefile b/security/pakemon/Makefile
index 98b330de2e8..311f843216f 100644
--- a/security/pakemon/Makefile
+++ b/security/pakemon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/03/04 21:30:37 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2006/04/06 06:22:44 reed Exp $
DISTNAME= pakemon-0.3.1
PKGREVISION= 3
@@ -13,7 +13,7 @@ COMMENT= Packet monster, an Open Source Intrusion Detection System
GNU_CONFIGURE= yes
-BUILDLINK_DEPENDS.libnet+= libnet-1.0.*
+BUILDLINK_API_DEPENDS.libnet+= libnet-1.0.*
post-extract:
${CP} ${WRKSRC}/pakemon.h ${WRKSRC}/pakemon.h.in
diff --git a/security/pflkm/buildlink3.mk b/security/pflkm/buildlink3.mk
index b3abe5b5036..3667ff67cc5 100644
--- a/security/pflkm/buildlink3.mk
+++ b/security/pflkm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/03/07 19:11:54 peter Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:44 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PFLKM_BUILDLINK3_MK:= ${PFLKM_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npflkm}
BUILDLINK_PACKAGES+= pflkm
.if !empty(PFLKM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pflkm+= pflkm>=20040501
+BUILDLINK_API_DEPENDS.pflkm+= pflkm>=20040501
BUILDLINK_PKGSRCDIR.pflkm?= ../../security/pflkm
.endif # PFLKM_BUILDLINK3_MK
diff --git a/security/pflkm/builtin.mk b/security/pflkm/builtin.mk
index a9695aeab83..3c65b587d2a 100644
--- a/security/pflkm/builtin.mk
+++ b/security/pflkm/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.9 2006/03/30 18:06:18 jlam Exp $
+# $NetBSD: builtin.mk,v 1.10 2006/04/06 06:22:44 reed Exp $
BUILTIN_PKG:= pflkm
@@ -79,7 +79,7 @@ USE_BUILTIN.pflkm= ${IS_BUILTIN.pflkm}
. if defined(BUILTIN_PKG.pflkm) && \
!empty(IS_BUILTIN.pflkm:M[yY][eE][sS])
USE_BUILTIN.pflkm= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.pflkm}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.pflkm}
. if !empty(USE_BUILTIN.pflkm:M[yY][eE][sS])
USE_BUILTIN.pflkm!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.pflkm:Q}; then \
diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile
index c401ffe1b6a..de4da4c6261 100644
--- a/security/pinentry/Makefile
+++ b/security/pinentry/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/03/31 23:56:29 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2006/04/06 06:22:44 reed Exp $
#
DISTNAME= pinentry-0.7.1
@@ -38,7 +38,7 @@ PLIST_SUBST+= USE_QT=
PLIST_SUBST+= USE_QT='@comment '
.endif
-BUILDLINK_DEPENDS.libgpg-error+= libgpg-error>=1.0.0
+BUILDLINK_API_DEPENDS.libgpg-error+= libgpg-error>=1.0.0
.include "../../security/libgpg-error/buildlink3.mk"
.include "../../security/libksba/buildlink3.mk"
diff --git a/security/pinentry/buildlink3.mk b/security/pinentry/buildlink3.mk
index 0d04238a849..9387d34abed 100644
--- a/security/pinentry/buildlink3.mk
+++ b/security/pinentry/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:10:46 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:44 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PINENTRY_BUILDLINK3_MK:= ${PINENTRY_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npinentry}
BUILDLINK_PACKAGES+= pinentry
.if !empty(PINENTRY_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pinentry+= pinentry>=0.7.1
-BUILDLINK_RECOMMENDED.pinentry?= pinentry>=0.7.1nb3
+BUILDLINK_API_DEPENDS.pinentry+= pinentry>=0.7.1
+BUILDLINK_ABI_DEPENDS.pinentry?= pinentry>=0.7.1nb3
BUILDLINK_PKGSRCDIR.pinentry?= ../../security/pinentry
.endif # PINENTRY_BUILDLINK3_MK
diff --git a/security/py-m2crypto/Makefile b/security/py-m2crypto/Makefile
index afba76f4079..39ed7dfc633 100644
--- a/security/py-m2crypto/Makefile
+++ b/security/py-m2crypto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/03/04 21:30:38 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2006/04/06 06:22:44 reed Exp $
#
DISTNAME= m2crypto-0.13
@@ -22,7 +22,7 @@ PYTHON_VERSIONS_ACCEPTED= 24 23 22 21
# it seems, and 0.9.7i is the version which currently is
# in pkgsrc and against which I fixed m2crypto to compile.
# -- wiz 20060115
-BUILDLINK_DEPENDS.openssl+= openssl-0.9.7i{,nb*}
+BUILDLINK_API_DEPENDS.openssl+= openssl-0.9.7i{,nb*}
.include "../../lang/python/extension.mk"
.include "../../devel/swig/buildlink3.mk"
diff --git a/security/qca-tls/Makefile b/security/qca-tls/Makefile
index 27a4b6204db..f6fd697caf4 100644
--- a/security/qca-tls/Makefile
+++ b/security/qca-tls/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/03/13 21:56:22 minskim Exp $
+# $NetBSD: Makefile,v 1.16 2006/04/06 06:22:44 reed Exp $
DISTNAME= qca-tls-1.0
PKGREVISION= 2
@@ -19,6 +19,6 @@ CONFIGURE_ARGS+= --with-openssl-lib=${SSLBASE}/lib
.include "../../security/openssl/buildlink3.mk"
.include "../../x11/qt3-libs/buildlink3.mk"
-BUILDLINK_DEPENDS.qt3-tools+= qt3-tools>=3.3.5nb6
+BUILDLINK_API_DEPENDS.qt3-tools+= qt3-tools>=3.3.5nb6
.include "../../x11/qt3-tools/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/security/qca/Makefile b/security/qca/Makefile
index 904e9dd6f1b..4f1de37d699 100644
--- a/security/qca/Makefile
+++ b/security/qca/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/03/13 21:56:22 minskim Exp $
+# $NetBSD: Makefile,v 1.11 2006/04/06 06:22:44 reed Exp $
DISTNAME= qca-1.0
PKGREVISION= 2
@@ -17,6 +17,6 @@ HAS_CONFIGURE= yes
INSTALLATION_DIRS= include lib
.include "../../x11/qt3-libs/buildlink3.mk"
-BUILDLINK_DEPENDS.qt3-tools+= qt3-tools>=3.3.5nb6
+BUILDLINK_API_DEPENDS.qt3-tools+= qt3-tools>=3.3.5nb6
.include "../../x11/qt3-tools/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/security/qca/buildlink3.mk b/security/qca/buildlink3.mk
index 86f04a70910..5fd78fbd997 100644
--- a/security/qca/buildlink3.mk
+++ b/security/qca/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:47 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:44 reed Exp $
#
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
QCA_BUILDLINK3_MK:= ${QCA_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nqca}
BUILDLINK_PACKAGES+= qca
.if !empty(QCA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.qca+= qca>=1.0
-BUILDLINK_RECOMMENDED.qca?= qca>=1.0nb2
+BUILDLINK_API_DEPENDS.qca+= qca>=1.0
+BUILDLINK_ABI_DEPENDS.qca?= qca>=1.0nb2
BUILDLINK_PKGSRCDIR.qca?= ../../security/qca
.endif # QCA_BUILDLINK3_MK
diff --git a/security/rsaref/buildlink3.mk b/security/rsaref/buildlink3.mk
index e6ea16ae532..52030bd18d6 100644
--- a/security/rsaref/buildlink3.mk
+++ b/security/rsaref/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2004/10/03 19:59:38 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:44 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
RSAREF_BUILDLINK3_MK:= ${RSAREF_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nrsaref}
BUILDLINK_PACKAGES+= rsaref
.if !empty(RSAREF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.rsaref+= rsaref>=2.0p3
-BUILDLINK_RECOMMENDED.rsaref+= rsaref>=2.0p3nb1
+BUILDLINK_API_DEPENDS.rsaref+= rsaref>=2.0p3
+BUILDLINK_ABI_DEPENDS.rsaref+= rsaref>=2.0p3nb1
BUILDLINK_PKGSRCDIR.rsaref?= ../../security/rsaref
.endif # RSAREF_BUILDLINK3_MK
diff --git a/security/seahorse-gedit/Makefile b/security/seahorse-gedit/Makefile
index c42ec7e7de6..934b466e601 100644
--- a/security/seahorse-gedit/Makefile
+++ b/security/seahorse-gedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/03/21 06:00:48 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2006/04/06 06:22:44 reed Exp $
DISTNAME= seahorse-0.8.1
PKGNAME= seahorse-gedit-0.8.1
@@ -26,7 +26,7 @@ CONFIGURE_ARGS+= --disable-nautilus
GCONF2_SCHEMAS= seahorse-gedit.schemas
-BUILDLINK_DEPENDS.gpgme+= gpgme>=1.0.1nb2
+BUILDLINK_API_DEPENDS.gpgme+= gpgme>=1.0.1nb2
BUILD_DIRS= plugins/gedit
INSTALL_DIRS= plugins/gedit
diff --git a/security/seahorse-nautilus/Makefile b/security/seahorse-nautilus/Makefile
index be28eaddc1f..bd0657939f9 100644
--- a/security/seahorse-nautilus/Makefile
+++ b/security/seahorse-nautilus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/03/21 06:00:49 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2006/04/06 06:22:44 reed Exp $
DISTNAME= seahorse-0.8.1
PKGNAME= seahorse-nautilus-0.8.1
@@ -24,7 +24,7 @@ USE_PKGLOCALEDIR= yes
CONFIGURE_ARGS+= --disable-gedit
-BUILDLINK_DEPENDS.gpgme+= gpgme>=1.0.1nb2
+BUILDLINK_API_DEPENDS.gpgme+= gpgme>=1.0.1nb2
BUILD_DIRS= plugins/nautilus-ext
INSTALL_DIRS= plugins/nautilus-ext
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 576119b7d6d..861489a5ec2 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2006/03/21 06:00:48 jlam Exp $
+# $NetBSD: Makefile,v 1.53 2006/04/06 06:22:44 reed Exp $
DISTNAME= seahorse-0.8.1
PKGREVISION= 1
@@ -25,7 +25,7 @@ CONFIGURE_ARGS+= --disable-nautilus
GCONF2_SCHEMAS= seahorse.schemas
-BUILDLINK_DEPENDS.gpgme+= gpgme>=1.0.1nb2
+BUILDLINK_API_DEPENDS.gpgme+= gpgme>=1.0.1nb2
.include "../../databases/gnome-mime-data/buildlink3.mk"
.include "../../databases/shared-mime-info/mimedb.mk"
diff --git a/security/seahorse/buildlink3.mk b/security/seahorse/buildlink3.mk
index 463085b061a..7a1766bed8b 100644
--- a/security/seahorse/buildlink3.mk
+++ b/security/seahorse/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2006/03/14 15:00:57 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:44 reed Exp $
# XXX
# XXX This file was created automatically using createbuildlink-3.10.
# XXX After this file has been verified as correct, the comment lines
@@ -21,7 +21,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nseahorse}
BUILDLINK_PACKAGES+= seahorse
.if !empty(SEAHORSE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.seahorse+= seahorse>=0.8.1
+BUILDLINK_API_DEPENDS.seahorse+= seahorse>=0.8.1
BUILDLINK_PKGSRCDIR.seahorse?= ../../security/seahorse
.endif # SEAHORSE_BUILDLINK3_MK
diff --git a/security/skey/buildlink3.mk b/security/skey/buildlink3.mk
index 66a403b5540..c7f1ca57834 100644
--- a/security/skey/buildlink3.mk
+++ b/security/skey/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:47 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:44 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SKEY_BUILDLINK3_MK:= ${SKEY_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nskey}
BUILDLINK_PACKAGES+= skey
.if !empty(SKEY_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.skey+= skey>=1.1.5
-BUILDLINK_RECOMMENDED.skey?= skey>=1.1.5nb2
+BUILDLINK_API_DEPENDS.skey+= skey>=1.1.5
+BUILDLINK_ABI_DEPENDS.skey?= skey>=1.1.5nb2
BUILDLINK_PKGSRCDIR.skey?= ../../security/skey
BUILDLINK_DEPMETHOD.skey?= build
.endif # SKEY_BUILDLINK3_MK
diff --git a/security/skey/builtin.mk b/security/skey/builtin.mk
index 6f79b3f79d4..9c6a0c09455 100644
--- a/security/skey/builtin.mk
+++ b/security/skey/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.3 2006/03/30 18:06:18 jlam Exp $
+# $NetBSD: builtin.mk,v 1.4 2006/04/06 06:22:44 reed Exp $
BUILTIN_PKG:= skey
@@ -45,7 +45,7 @@ USE_BUILTIN.skey= ${IS_BUILTIN.skey}
. if defined(BUILTIN_PKG.skey) && \
!empty(IS_BUILTIN.skey:M[yY][eE][sS])
USE_BUILTIN.skey= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.skey}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.skey}
. if !empty(USE_BUILTIN.skey:M[yY][eE][sS])
USE_BUILTIN.skey!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.skey:Q}; then \
diff --git a/security/tcl-tls/buildlink3.mk b/security/tcl-tls/buildlink3.mk
index db79717630c..c4f30e9b95e 100644
--- a/security/tcl-tls/buildlink3.mk
+++ b/security/tcl-tls/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/01/22 19:45:23 peter Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:44 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
TCL_TLS_BUILDLINK3_MK:= ${TCL_TLS_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntcl-tls}
BUILDLINK_PACKAGES+= tcl-tls
.if !empty(TCL_TLS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tcl-tls+= tcl-tls>=1.5.0
+BUILDLINK_API_DEPENDS.tcl-tls+= tcl-tls>=1.5.0
BUILDLINK_PKGSRCDIR.tcl-tls?= ../../security/tcl-tls
.endif # TCL_TLS_BUILDLINK3_MK
diff --git a/security/tcp_wrappers/buildlink3.mk b/security/tcp_wrappers/buildlink3.mk
index d948416e373..e1cb7e765dc 100644
--- a/security/tcp_wrappers/buildlink3.mk
+++ b/security/tcp_wrappers/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2005/10/18 04:32:01 grant Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:22:44 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
TCP_WRAPPERS_BUILDLINK3_MK:= ${TCP_WRAPPERS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntcp_wrappers}
BUILDLINK_PACKAGES+= tcp_wrappers
.if !empty(TCP_WRAPPERS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tcp_wrappers+= tcp_wrappers>=7.6.1nb1
-BUILDLINK_RECOMMENDED.tcp_wrappers+= tcp_wrappers>=7.6.1nb3
+BUILDLINK_API_DEPENDS.tcp_wrappers+= tcp_wrappers>=7.6.1nb1
+BUILDLINK_ABI_DEPENDS.tcp_wrappers+= tcp_wrappers>=7.6.1nb3
BUILDLINK_PKGSRCDIR.tcp_wrappers?= ../../security/tcp_wrappers
.endif # TCP_WRAPPERS_BUILDLINK3_MK
diff --git a/security/tcp_wrappers/builtin.mk b/security/tcp_wrappers/builtin.mk
index 8537f44cf01..840f8eab14b 100644
--- a/security/tcp_wrappers/builtin.mk
+++ b/security/tcp_wrappers/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.7 2006/03/30 18:06:18 jlam Exp $
+# $NetBSD: builtin.mk,v 1.8 2006/04/06 06:22:44 reed Exp $
BUILTIN_PKG:= tcp_wrappers
@@ -34,7 +34,7 @@ USE_BUILTIN.tcp_wrappers= ${IS_BUILTIN.tcp_wrappers}
. if defined(BUILTIN_PKG.tcp_wrappers) && \
!empty(IS_BUILTIN.tcp_wrappers:M[yY][eE][sS])
USE_BUILTIN.tcp_wrappers= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.tcp_wrappers}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.tcp_wrappers}
. if !empty(USE_BUILTIN.tcp_wrappers:M[yY][eE][sS])
USE_BUILTIN.tcp_wrappers!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.tcp_wrappers:Q}; then \
diff --git a/security/tinyca/Makefile b/security/tinyca/Makefile
index 423620009dc..aa5577e8cf0 100644
--- a/security/tinyca/Makefile
+++ b/security/tinyca/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/02/05 23:10:47 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2006/04/06 06:22:44 reed Exp $
DISTNAME= tinyca-0.6.8
PKGREVISION= 2
@@ -21,7 +21,7 @@ CADIR= ${PREFIX}/share/tinyca
USE_TOOLS+= perl:run
REPLACE_PERL= tinyca
-BUILDLINK_DEPENDS.openssl+= openssl>=0.9.7d
+BUILDLINK_API_DEPENDS.openssl+= openssl>=0.9.7d
SUBST_CLASSES+= script
SUBST_STAGE.script= post-patch
diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index bcd7f6169b3..bedc23b9aab 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/03/30 03:44:44 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2006/04/06 06:22:44 reed Exp $
DISTNAME= bash-3.1
PKGNAME= bash-3.1pl1
@@ -73,7 +73,7 @@ CONFIGURE_ENV+= ac_cv_type_wctype_t=no
CONFIGURE_ARGS+= --with-installed-readline
USE_GNU_READLINE= yes
-BUILDLINK_DEPENDS.readline+= readline>=4.3
+BUILDLINK_API_DEPENDS.readline+= readline>=4.3
.include "../../devel/readline/buildlink3.mk"
.endif
diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile
index 831edfb6f8e..d2eb150b954 100644
--- a/shells/bash2/Makefile
+++ b/shells/bash2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2006/02/05 23:10:47 joerg Exp $
+# $NetBSD: Makefile,v 1.72 2006/04/06 06:22:44 reed Exp $
#
DISTNAME= bash-2.05b
@@ -55,7 +55,7 @@ BUILDLINK_DEPMETHOD.readline= build
CONFIGURE_ENV+= ac_cv_type_wctype_t=no
.endif
-BUILDLINK_DEPENDS.readline+= readline>=4.3
+BUILDLINK_API_DEPENDS.readline+= readline>=4.3
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/readline/buildlink3.mk"
diff --git a/sysutils/amanda-common/buildlink3.mk b/sysutils/amanda-common/buildlink3.mk
index 1da2cf5d6f0..159dfe95072 100644
--- a/sysutils/amanda-common/buildlink3.mk
+++ b/sysutils/amanda-common/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:10:48 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:44 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
AMANDA_COMMON_BUILDLINK3_MK:= ${AMANDA_COMMON_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Namanda-common}
BUILDLINK_PACKAGES+= amanda-common
.if !empty(AMANDA_COMMON_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.amanda-common+= amanda-common>=2.4.4p4nb2
-BUILDLINK_RECOMMENDED.amanda-common+= amanda-common>=2.4.4p4nb3
+BUILDLINK_API_DEPENDS.amanda-common+= amanda-common>=2.4.4p4nb2
+BUILDLINK_ABI_DEPENDS.amanda-common+= amanda-common>=2.4.4p4nb3
BUILDLINK_PKGSRCDIR.amanda-common?= ../../sysutils/amanda-common
.endif # AMANDA_COMMON_BUILDLINK3_MK
diff --git a/sysutils/dbus-glib/buildlink3.mk b/sysutils/dbus-glib/buildlink3.mk
index 0578cc53bb9..1744ec5ac90 100644
--- a/sysutils/dbus-glib/buildlink3.mk
+++ b/sysutils/dbus-glib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/03/30 20:57:08 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:45 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
DBUS_GLIB_BUILDLINK3_MK:= ${DBUS_GLIB_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndbus-glib}
BUILDLINK_PACKAGES+= dbus-glib
.if !empty(DBUS_GLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.dbus-glib+= dbus-glib>=0.61
+BUILDLINK_API_DEPENDS.dbus-glib+= dbus-glib>=0.61
BUILDLINK_PKGSRCDIR.dbus-glib?= ../../sysutils/dbus-glib
.endif # DBUS_GLIB_BUILDLINK3_MK
diff --git a/sysutils/dbus/Makefile.common b/sysutils/dbus/Makefile.common
index 3ac7a09c2a7..a7ebfb44e4c 100644
--- a/sysutils/dbus/Makefile.common
+++ b/sysutils/dbus/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2006/03/30 20:57:08 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.14 2006/04/06 06:22:45 reed Exp $
#
DBUS_VERSION= 0.61
@@ -75,7 +75,7 @@ INSTALL_DIRS+= ${WRKSRC}/${f}
SUBST_FILES.paths+= ${f}/Makefile.in
. endfor
-BUILDLINK_DEPENDS.dbus+= dbus>=${DBUS_VERSION}
+BUILDLINK_API_DEPENDS.dbus+= dbus>=${DBUS_VERSION}
. include "../../sysutils/dbus/buildlink3.mk"
.endif
diff --git a/sysutils/dbus/buildlink3.mk b/sysutils/dbus/buildlink3.mk
index 1e46e7546e9..314c185c17f 100644
--- a/sysutils/dbus/buildlink3.mk
+++ b/sysutils/dbus/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/03/30 20:57:08 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:45 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
DBUS_BUILDLINK3_MK:= ${DBUS_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndbus}
BUILDLINK_PACKAGES+= dbus
.if !empty(DBUS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.dbus+= dbus>=0.61
+BUILDLINK_API_DEPENDS.dbus+= dbus>=0.61
BUILDLINK_PKGSRCDIR.dbus?= ../../sysutils/dbus
PRINT_PLIST_AWK+= /^@dirrm share\/dbus-1\/services/ \
diff --git a/sysutils/desktop-file-utils/buildlink3.mk b/sysutils/desktop-file-utils/buildlink3.mk
index 3184deb620f..ffa490cec1a 100644
--- a/sysutils/desktop-file-utils/buildlink3.mk
+++ b/sysutils/desktop-file-utils/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:10:49 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:45 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
DESKTOP_FILE_UTILS_BUILDLINK3_MK:= ${DESKTOP_FILE_UTILS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndesktop-file-utils}
BUILDLINK_PACKAGES+= desktop-file-utils
.if !empty(DESKTOP_FILE_UTILS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.desktop-file-utils+= desktop-file-utils>=0.8
-BUILDLINK_RECOMMENDED.desktop-file-utils+= desktop-file-utils>=0.10nb1
+BUILDLINK_API_DEPENDS.desktop-file-utils+= desktop-file-utils>=0.8
+BUILDLINK_ABI_DEPENDS.desktop-file-utils+= desktop-file-utils>=0.10nb1
BUILDLINK_PKGSRCDIR.desktop-file-utils?=../../sysutils/desktop-file-utils
.endif # DESKTOP_FILE_UTILS_BUILDLINK3_MK
diff --git a/sysutils/duplicity/Makefile b/sysutils/duplicity/Makefile
index 65c17943d91..73e4b6ad01f 100644
--- a/sysutils/duplicity/Makefile
+++ b/sysutils/duplicity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/03/04 21:30:40 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2006/04/06 06:22:45 reed Exp $
#
DISTNAME= duplicity-0.4.1
@@ -12,7 +12,7 @@ COMMENT= Remote encrypting incremental backup utility
DEPENDS+= gnupg>=1.2.3:../../security/gnupg
-BUILDLINK_DEPENDS.librsync+= librsync>=0.9.6
+BUILDLINK_API_DEPENDS.librsync+= librsync>=0.9.6
PYDISTUTILSPKG= yes
PYTHON_VERSIONS_ACCEPTED= 22 23
diff --git a/sysutils/fam/buildlink3.mk b/sysutils/fam/buildlink3.mk
index aa8d6588ca6..e1ddb68134b 100644
--- a/sysutils/fam/buildlink3.mk
+++ b/sysutils/fam/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:10:49 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:45 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
FAM_BUILDLINK3_MK:= ${FAM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfam}
BUILDLINK_PACKAGES+= fam
.if !empty(FAM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.fam+= fam>=2.6.10
-BUILDLINK_RECOMMENDED.fam+= fam>=2.7.0nb7
+BUILDLINK_API_DEPENDS.fam+= fam>=2.6.10
+BUILDLINK_ABI_DEPENDS.fam+= fam>=2.7.0nb7
BUILDLINK_PKGSRCDIR.fam?= ../../sysutils/fam
.endif # FAM_BUILDLINK3_MK
diff --git a/sysutils/fam/builtin.mk b/sysutils/fam/builtin.mk
index 9585aed69f6..74e166ca43a 100644
--- a/sysutils/fam/builtin.mk
+++ b/sysutils/fam/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.3 2006/03/30 18:06:18 jlam Exp $
+# $NetBSD: builtin.mk,v 1.4 2006/04/06 06:22:45 reed Exp $
BUILTIN_PKG:= fam
@@ -31,7 +31,7 @@ USE_BUILTIN.fam= ${IS_BUILTIN.fam}
. if defined(BUILTIN_PKG.fam) && \
!empty(IS_BUILTIN.fam:M[yY][eE][sS])
USE_BUILTIN.fam= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.fam}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.fam}
. if !empty(USE_BUILTIN.fam:M[yY][eE][sS])
USE_BUILTIN.fam!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.fam:Q}; then \
diff --git a/sysutils/file/buildlink3.mk b/sysutils/file/buildlink3.mk
index 24125f28322..99d6a1e37d7 100644
--- a/sysutils/file/buildlink3.mk
+++ b/sysutils/file/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:18:14 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:45 reed Exp $
#
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfile}
BUILDLINK_PACKAGES+= file
.if !empty(FILE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.file+= file>=4.09
-BUILDLINK_RECOMMENDED.file+= file>=4.09nb1
+BUILDLINK_API_DEPENDS.file+= file>=4.09
+BUILDLINK_ABI_DEPENDS.file+= file>=4.09nb1
BUILDLINK_PKGSRCDIR.file?= ../../sysutils/file
.endif # FILE_BUILDLINK3_MK
diff --git a/sysutils/file/builtin.mk b/sysutils/file/builtin.mk
index bcf7e0ce9c5..05376c51790 100644
--- a/sysutils/file/builtin.mk
+++ b/sysutils/file/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.3 2006/03/30 18:06:18 jlam Exp $
+# $NetBSD: builtin.mk,v 1.4 2006/04/06 06:22:45 reed Exp $
BUILTIN_PKG:= file
@@ -32,7 +32,7 @@ USE_BUILTIN.file= ${IS_BUILTIN.file}
. if defined(BUILTIN_PKG.file) && \
!empty(IS_BUILTIN.file:M[yY][eE][sS])
USE_BUILTIN.file= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.file}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.file}
. if !empty(USE_BUILTIN.file:M[yY][eE][sS])
USE_BUILTIN.file!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.file:Q}; then \
diff --git a/sysutils/gamin/buildlink3.mk b/sysutils/gamin/buildlink3.mk
index 13bfe92bd98..b95e73b6f0d 100644
--- a/sysutils/gamin/buildlink3.mk
+++ b/sysutils/gamin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:10:50 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:45 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GAMIN_BUILDLINK3_MK:= ${GAMIN_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngamin}
BUILDLINK_PACKAGES+= gamin
.if !empty(GAMIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gamin+= gamin>=0.1.5
-BUILDLINK_RECOMMENDED.gamin?= gamin>=0.1.5nb2
+BUILDLINK_API_DEPENDS.gamin+= gamin>=0.1.5
+BUILDLINK_ABI_DEPENDS.gamin?= gamin>=0.1.5nb2
BUILDLINK_PKGSRCDIR.gamin?= ../../sysutils/gamin
.endif # GAMIN_BUILDLINK3_MK
diff --git a/sysutils/gkrellm/buildlink3.mk b/sysutils/gkrellm/buildlink3.mk
index 4ede36fcee6..1e880753c63 100644
--- a/sysutils/gkrellm/buildlink3.mk
+++ b/sysutils/gkrellm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:10:50 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:22:45 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GKRELLM_BUILDLINK3_MK:= ${GKRELLM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngkrellm}
BUILDLINK_PACKAGES+= gkrellm
.if !empty(GKRELLM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gkrellm+= gkrellm>=2.1.22
-BUILDLINK_RECOMMENDED.gkrellm?= gkrellm>=2.2.7nb2
+BUILDLINK_API_DEPENDS.gkrellm+= gkrellm>=2.1.22
+BUILDLINK_ABI_DEPENDS.gkrellm?= gkrellm>=2.2.7nb2
BUILDLINK_PKGSRCDIR.gkrellm?= ../../sysutils/gkrellm
.endif # GKRELLM_BUILDLINK3_MK
diff --git a/sysutils/gkrellm1/buildlink3.mk b/sysutils/gkrellm1/buildlink3.mk
index 0bac9d9a83a..af94411f0fc 100644
--- a/sysutils/gkrellm1/buildlink3.mk
+++ b/sysutils/gkrellm1/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:10:50 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:45 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GKRELLM_BUILDLINK3_MK:= ${GKRELLM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngkrellm}
BUILDLINK_PACKAGES+= gkrellm
.if !empty(GKRELLM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gkrellm+= gkrellm<2.0
-BUILDLINK_RECOMMENDED.gkrellm?= gkrellm>=1.2.13nb5
+BUILDLINK_API_DEPENDS.gkrellm+= gkrellm<2.0
+BUILDLINK_ABI_DEPENDS.gkrellm?= gkrellm>=1.2.13nb5
BUILDLINK_PKGSRCDIR.gkrellm?= ../../sysutils/gkrellm1
.endif # GKRELLM_BUILDLINK3_MK
diff --git a/sysutils/gnome-menus/Makefile b/sysutils/gnome-menus/Makefile
index 36ebdbcbedf..eb2a730799f 100644
--- a/sysutils/gnome-menus/Makefile
+++ b/sysutils/gnome-menus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/04/04 18:07:16 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2006/04/06 06:22:45 reed Exp $
#
DISTNAME= gnome-menus-2.13.5
@@ -38,8 +38,8 @@ SUBST_FILES.paths= layout/*.menu
SUBST_SED.paths= -e 's|/usr/|${PREFIX}/|g'
SUBST_SED.paths+= -e 's|/etc/X11/applnk|${PREFIX}/share/kde/applnk/|g'
-BUILDLINK_DEPENDS.glib2+= glib2>=2.6.0
-BUILDLINK_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.10.0
+BUILDLINK_API_DEPENDS.glib2+= glib2>=2.6.0
+BUILDLINK_API_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.10.0
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
diff --git a/sysutils/gnome-menus/buildlink3.mk b/sysutils/gnome-menus/buildlink3.mk
index 7e7b89380a5..af806e0239e 100644
--- a/sysutils/gnome-menus/buildlink3.mk
+++ b/sysutils/gnome-menus/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/03/30 21:11:51 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:45 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNOME_MENUS_BUILDLINK3_MK:= ${GNOME_MENUS_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-menus}
BUILDLINK_PACKAGES+= gnome-menus
.if !empty(GNOME_MENUS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-menus+= gnome-menus>=2.13.5
+BUILDLINK_API_DEPENDS.gnome-menus+= gnome-menus>=2.13.5
BUILDLINK_PKGSRCDIR.gnome-menus?= ../../sysutils/gnome-menus
.endif # GNOME_MENUS_BUILDLINK3_MK
diff --git a/sysutils/gnome-vfs/Makefile b/sysutils/gnome-vfs/Makefile
index 070c0d6cbe4..c3d7ac3a2c3 100644
--- a/sysutils/gnome-vfs/Makefile
+++ b/sysutils/gnome-vfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2006/02/05 23:10:51 joerg Exp $
+# $NetBSD: Makefile,v 1.56 2006/04/06 06:22:45 reed Exp $
DISTNAME= gnome-vfs-1.0.5
PKGREVISION= 10
@@ -11,7 +11,7 @@ COMMENT= GNOME Virtual File System
BROKEN_GETTEXT_DETECTION= yes
BUILD_USES_MSGFMT= YES
-BUILDLINK_DEPENDS.gnome-mime-data+= gnome-mime-data>=2.0.1
+BUILDLINK_API_DEPENDS.gnome-mime-data+= gnome-mime-data>=2.0.1
USE_PKGLOCALEDIR= YES
USE_X11BASE= YES
diff --git a/sysutils/gnome-vfs/buildlink3.mk b/sysutils/gnome-vfs/buildlink3.mk
index ca2633590c2..d21cf08f2a2 100644
--- a/sysutils/gnome-vfs/buildlink3.mk
+++ b/sysutils/gnome-vfs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/02/05 23:10:53 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/04/06 06:22:45 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNOME_VFS_BUILDLINK3_MK:= ${GNOME_VFS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-vfs}
BUILDLINK_PACKAGES+= gnome-vfs
.if !empty(GNOME_VFS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-vfs+= gnome-vfs>=1.0.5nb7
-BUILDLINK_RECOMMENDED.gnome-vfs+= gnome-vfs>=1.0.5nb10
+BUILDLINK_API_DEPENDS.gnome-vfs+= gnome-vfs>=1.0.5nb7
+BUILDLINK_ABI_DEPENDS.gnome-vfs+= gnome-vfs>=1.0.5nb10
BUILDLINK_PKGSRCDIR.gnome-vfs?= ../../sysutils/gnome-vfs
.endif # GNOME_VFS_BUILDLINK3_MK
diff --git a/sysutils/gnome-vfs2/Makefile b/sysutils/gnome-vfs2/Makefile
index e425086a597..8a8e47f1767 100644
--- a/sysutils/gnome-vfs2/Makefile
+++ b/sysutils/gnome-vfs2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2006/04/02 18:58:19 jmmv Exp $
+# $NetBSD: Makefile,v 1.62 2006/04/06 06:22:45 reed Exp $
PKGREVISION= 1
@@ -18,7 +18,7 @@ GCONF2_SCHEMAS+= system_smb.schemas
LDFLAGS.Darwin+= -lresolv
-BUILDLINK_DEPENDS.glib2+= glib2>=2.9.3
+BUILDLINK_API_DEPENDS.glib2+= glib2>=2.9.3
.include "Makefile.common"
diff --git a/sysutils/gnome-vfs2/Makefile.common b/sysutils/gnome-vfs2/Makefile.common
index 7c43f808ead..48277016b62 100644
--- a/sysutils/gnome-vfs2/Makefile.common
+++ b/sysutils/gnome-vfs2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.31 2006/04/04 18:07:16 jlam Exp $
+# $NetBSD: Makefile.common,v 1.32 2006/04/06 06:22:45 reed Exp $
#
GNOME_VFS2_VERSION= 2.14.0
@@ -87,7 +87,7 @@ SUBST_STAGE.libs= pre-configure
SUBST_FILES.libs= modules/Makefile.in
SUBST_SED.libs= -e 's|../libgnomevfs/libgnomevfs-2.la|${BUILDLINK_PREFIX.gnome-vfs2}/lib/libgnomevfs-2.la|g'
-BUILDLINK_DEPENDS.gnome-vfs2+= gnome-vfs2>=${GNOME_VFS2_VERSION}
+BUILDLINK_API_DEPENDS.gnome-vfs2+= gnome-vfs2>=${GNOME_VFS2_VERSION}
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
PRINT_PLIST_AWK+= /^@dirrm lib\/gnome-vfs-2.0\/modules$$/ \
diff --git a/sysutils/gnome-vfs2/buildlink3.mk b/sysutils/gnome-vfs2/buildlink3.mk
index 043b2b3226d..4d269f8e8f1 100644
--- a/sysutils/gnome-vfs2/buildlink3.mk
+++ b/sysutils/gnome-vfs2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2006/04/02 18:58:20 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2006/04/06 06:22:45 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNOME_VFS2_BUILDLINK3_MK:= ${GNOME_VFS2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-vfs2}
BUILDLINK_PACKAGES+= gnome-vfs2
.if !empty(GNOME_VFS2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.8.0
-BUILDLINK_RECOMMENDED.gnome-vfs2+= gnome-vfs2>=2.12.2nb2
+BUILDLINK_API_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.8.0
+BUILDLINK_ABI_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.12.2nb2
BUILDLINK_PKGSRCDIR.gnome-vfs2?= ../../sysutils/gnome-vfs2
PRINT_PLIST_AWK+= /^@dirrm lib\/gnome-vfs-2.0\/modules/ \
diff --git a/sysutils/gnome-vfsmm/buildlink3.mk b/sysutils/gnome-vfsmm/buildlink3.mk
index 7f51df3e385..b03ff673968 100644
--- a/sysutils/gnome-vfsmm/buildlink3.mk
+++ b/sysutils/gnome-vfsmm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:10:54 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:45 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNOME_VFSMM_BUILDLINK3_MK:= ${GNOME_VFSMM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-vfsmm}
BUILDLINK_PACKAGES+= gnome-vfsmm
.if !empty(GNOME_VFSMM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-vfsmm+= gnome-vfsmm>=2.10.0
-BUILDLINK_RECOMMENDED.gnome-vfsmm?= gnome-vfsmm>=2.12.0nb3
+BUILDLINK_API_DEPENDS.gnome-vfsmm+= gnome-vfsmm>=2.10.0
+BUILDLINK_ABI_DEPENDS.gnome-vfsmm?= gnome-vfsmm>=2.12.0nb3
BUILDLINK_PKGSRCDIR.gnome-vfsmm?= ../../sysutils/gnome-vfsmm
.endif # GNOME_VFSMM_BUILDLINK3_MK
diff --git a/sysutils/gst-plugins0.8-gnomevfs/buildlink3.mk b/sysutils/gst-plugins0.8-gnomevfs/buildlink3.mk
index 8308291e113..aa0f308560c 100644
--- a/sysutils/gst-plugins0.8-gnomevfs/buildlink3.mk
+++ b/sysutils/gst-plugins0.8-gnomevfs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:54 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:45 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GST_PLUGINS0.8_GNOMEVFS_BUILDLINK3_MK:= ${GST_PLUGINS0.8_GNOMEVFS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngst-plugins0.8-gnomevfs}
BUILDLINK_PACKAGES+= gst-plugins0.8-gnomevfs
.if !empty(GST_PLUGINS0.8_GNOMEVFS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gst-plugins0.8-gnomevfs+= gst-plugins0.8-gnomevfs>=0.8.11
-BUILDLINK_RECOMMENDED.gst-plugins0.8-gnomevfs?= gst-plugins0.8-gnomevfs>=0.8.11nb2
+BUILDLINK_API_DEPENDS.gst-plugins0.8-gnomevfs+= gst-plugins0.8-gnomevfs>=0.8.11
+BUILDLINK_ABI_DEPENDS.gst-plugins0.8-gnomevfs?= gst-plugins0.8-gnomevfs>=0.8.11nb2
BUILDLINK_PKGSRCDIR.gst-plugins0.8-gnomevfs?= ../../sysutils/gst-plugins0.8-gnomevfs
.endif # GST_PLUGINS0.8_GNOMEVFS_BUILDLINK3_MK
diff --git a/sysutils/libgtop2/Makefile b/sysutils/libgtop2/Makefile
index a2451389fdf..9447ce611bb 100644
--- a/sysutils/libgtop2/Makefile
+++ b/sysutils/libgtop2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2006/03/30 21:09:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.35 2006/04/06 06:22:45 reed Exp $
DISTNAME= libgtop-2.14.0
PKGNAME= ${DISTNAME:S/-/2-/}
@@ -92,7 +92,7 @@ CPPFLAGS+= -DHAVE_STATVFS_WRITES_COUNT
.endif
.undef statvfs_h
-BUILDLINK_DEPENDS.glib2+= glib2>=2.6.0
+BUILDLINK_API_DEPENDS.glib2+= glib2>=2.6.0
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
diff --git a/sysutils/libgtop2/buildlink3.mk b/sysutils/libgtop2/buildlink3.mk
index 2cf5943e760..a06732544f2 100644
--- a/sysutils/libgtop2/buildlink3.mk
+++ b/sysutils/libgtop2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/03/30 21:09:48 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:22:45 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGTOP2_BUILDLINK3_MK:= ${LIBGTOP2_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgtop2}
BUILDLINK_PACKAGES+= libgtop2
.if !empty(LIBGTOP2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgtop2+= libgtop2>=2.14.0
+BUILDLINK_API_DEPENDS.libgtop2+= libgtop2>=2.14.0
BUILDLINK_PKGSRCDIR.libgtop2?= ../../sysutils/libgtop2
.endif # LIBGTOP2_BUILDLINK3_MK
diff --git a/sysutils/libol/buildlink3.mk b/sysutils/libol/buildlink3.mk
index 935396986fb..6fcf0b33568 100644
--- a/sysutils/libol/buildlink3.mk
+++ b/sysutils/libol/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/06 18:31:23 adrianp Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:45 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBOL_BUILDLINK3_MK:= ${LIBOL_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibol}
BUILDLINK_PACKAGES+= libol
.if !empty(LIBOL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libol+= libol>=0.3.17
+BUILDLINK_API_DEPENDS.libol+= libol>=0.3.17
BUILDLINK_PKGSRCDIR.libol?= ../../sysutils/libol
.endif # LIBOL_BUILDLINK3_MK
diff --git a/sysutils/medusa/buildlink3.mk b/sysutils/medusa/buildlink3.mk
index 7fe02d2c25e..06aa2f7c853 100644
--- a/sysutils/medusa/buildlink3.mk
+++ b/sysutils/medusa/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:10:55 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:45 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
MEDUSA_BUILDLINK3_MK:= ${MEDUSA_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmedusa}
BUILDLINK_PACKAGES+= medusa
.if !empty(MEDUSA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.medusa+= medusa>=0.5.1nb7
-BUILDLINK_RECOMMENDED.medusa?= medusa>=0.5.1nb9
+BUILDLINK_API_DEPENDS.medusa+= medusa>=0.5.1nb7
+BUILDLINK_ABI_DEPENDS.medusa?= medusa>=0.5.1nb9
BUILDLINK_PKGSRCDIR.medusa?= ../../sysutils/medusa
.endif # MEDUSA_BUILDLINK3_MK
diff --git a/sysutils/nautilus-cd-burner/buildlink3.mk b/sysutils/nautilus-cd-burner/buildlink3.mk
index aefcd71a6d1..b5a13b71b4e 100644
--- a/sysutils/nautilus-cd-burner/buildlink3.mk
+++ b/sysutils/nautilus-cd-burner/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/03/06 00:18:14 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:46 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
NAUTILUS_CD_BURNER_BUILDLINK3_MK:= ${NAUTILUS_CD_BURNER_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nnautilus-cd-burner}
BUILDLINK_PACKAGES+= nautilus-cd-burner
.if !empty(NAUTILUS_CD_BURNER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.nautilus-cd-burner+= nautilus-cd-burner>=2.12.1nb1
-BUILDLINK_RECOMMENDED.nautilus-cd-burner?= nautilus-cd-burner>=2.12.3
+BUILDLINK_API_DEPENDS.nautilus-cd-burner+= nautilus-cd-burner>=2.12.1nb1
+BUILDLINK_ABI_DEPENDS.nautilus-cd-burner?= nautilus-cd-burner>=2.12.3
BUILDLINK_PKGSRCDIR.nautilus-cd-burner?= ../../sysutils/nautilus-cd-burner
.endif # NAUTILUS_CD_BURNER_BUILDLINK3_MK
diff --git a/sysutils/nautilus/Makefile b/sysutils/nautilus/Makefile
index 4d4d0b9be62..76a5b58f758 100644
--- a/sysutils/nautilus/Makefile
+++ b/sysutils/nautilus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2006/03/30 21:12:43 jmmv Exp $
+# $NetBSD: Makefile,v 1.65 2006/04/06 06:22:46 reed Exp $
#
DISTNAME= nautilus-2.14.0
@@ -24,10 +24,10 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
GCONF2_SCHEMAS= apps_nautilus_preferences.schemas
-BUILDLINK_DEPENDS.eel2+= eel2>=2.13.91
-BUILDLINK_DEPENDS.glib2+= glib2>=2.6.0
-BUILDLINK_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.13.92
-BUILDLINK_DEPENDS.startup-notification+= startup-notification>=0.8
+BUILDLINK_API_DEPENDS.eel2+= eel2>=2.13.91
+BUILDLINK_API_DEPENDS.glib2+= glib2>=2.6.0
+BUILDLINK_API_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.13.92
+BUILDLINK_API_DEPENDS.startup-notification+= startup-notification>=0.8
.include "../../audio/esound/buildlink3.mk"
.include "../../databases/shared-mime-info/mimedb.mk"
diff --git a/sysutils/nautilus/buildlink3.mk b/sysutils/nautilus/buildlink3.mk
index 235e0a130f8..3a52c43c250 100644
--- a/sysutils/nautilus/buildlink3.mk
+++ b/sysutils/nautilus/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/02/05 23:10:56 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2006/04/06 06:22:46 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
NAUTILUS_BUILDLINK3_MK:= ${NAUTILUS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nnautilus}
BUILDLINK_PACKAGES+= nautilus
.if !empty(NAUTILUS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.nautilus+= nautilus>=2.12.1nb1
-BUILDLINK_RECOMMENDED.nautilus?= nautilus>=2.12.2nb2
+BUILDLINK_API_DEPENDS.nautilus+= nautilus>=2.12.1nb1
+BUILDLINK_ABI_DEPENDS.nautilus?= nautilus>=2.12.2nb2
BUILDLINK_PKGSRCDIR.nautilus?= ../../sysutils/nautilus
PRINT_PLIST_AWK+= /^@dirrm lib\/nautilus$$/ \
diff --git a/sysutils/pciutils/buildlink3.mk b/sysutils/pciutils/buildlink3.mk
index 7380ea95b85..56de1e17680 100644
--- a/sysutils/pciutils/buildlink3.mk
+++ b/sysutils/pciutils/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:10:56 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:46 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PCIUTILS_BUILDLINK3_MK:= ${PCIUTILS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npciutils}
BUILDLINK_PACKAGES+= pciutils
.if !empty(PCIUTILS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pciutils+= pciutils>=2.1.11
-BUILDLINK_RECOMMENDED.pciutils?= pciutils>=2.1.11nb1
+BUILDLINK_API_DEPENDS.pciutils+= pciutils>=2.1.11
+BUILDLINK_ABI_DEPENDS.pciutils?= pciutils>=2.1.11nb1
BUILDLINK_PKGSRCDIR.pciutils?= ../../sysutils/pciutils
BUILDLINK_DEPMETHOD.pciutils?= build
.endif # PCIUTILS_BUILDLINK3_MK
diff --git a/sysutils/py-dbus/buildlink3.mk b/sysutils/py-dbus/buildlink3.mk
index 9106ac740ec..855877512e7 100644
--- a/sysutils/py-dbus/buildlink3.mk
+++ b/sysutils/py-dbus/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/04/02 15:04:20 rxg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:46 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_DBUS_BUILDLINK3_MK:= ${PY_DBUS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npy-dbus}
BUILDLINK_PACKAGES+= py-dbus
.if !empty(PY_DBUS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.py-dbus+= ${PYPKGPREFIX}-dbus>=0.23.4
-BUILDLINK_RECOMMENDED.py-dbus?= ${PYPKGPREFIX}-dbus>=0.23.4nb2
+BUILDLINK_API_DEPENDS.py-dbus+= ${PYPKGPREFIX}-dbus>=0.23.4
+BUILDLINK_ABI_DEPENDS.py-dbus?= ${PYPKGPREFIX}-dbus>=0.23.4nb2
BUILDLINK_PKGSRCDIR.py-dbus?= ../../sysutils/py-dbus
.endif # PY_DBUS_BUILDLINK3_MK
diff --git a/sysutils/rdiff-backup/Makefile b/sysutils/rdiff-backup/Makefile
index cd397ad5d27..779de7db085 100644
--- a/sysutils/rdiff-backup/Makefile
+++ b/sysutils/rdiff-backup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/03/04 21:30:42 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2006/04/06 06:22:46 reed Exp $
#
DISTNAME= rdiff-backup-1.0.1
@@ -19,7 +19,7 @@ SUBST_FILES.path= setup.py
SUBST_SED.path= -e "s|%%LOCALBASE%%|${LOCALBASE}|g"
SUBST_MESSAGE.path= "Fixing paths."
-BUILDLINK_DEPENDS.librsync+= librsync>=0.9.6
+BUILDLINK_API_DEPENDS.librsync+= librsync>=0.9.6
.include "../../devel/librsync/buildlink3.mk"
.include "../../lang/python/application.mk"
diff --git a/sysutils/vcdimager-devel/Makefile b/sysutils/vcdimager-devel/Makefile
index eb014b44952..9d44dabf153 100644
--- a/sysutils/vcdimager-devel/Makefile
+++ b/sysutils/vcdimager-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2006/03/31 23:56:30 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2006/04/06 06:22:46 reed Exp $
#
DISTNAME= vcdimager-0.7.23
@@ -22,7 +22,7 @@ PKGCONFIG_OVERRIDE+= libvcdinfo.pc.in
BUILDLINK_TRANSFORM+= rm:-Wl,--version-script=libvcdinfo.la.ver
.endif
-BUILDLINK_DEPENDS.libcdio+= libcdio>=0.72
+BUILDLINK_API_DEPENDS.libcdio+= libcdio>=0.72
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
diff --git a/sysutils/vcdimager-devel/buildlink3.mk b/sysutils/vcdimager-devel/buildlink3.mk
index 1d8a08750a6..59e5f30548d 100644
--- a/sysutils/vcdimager-devel/buildlink3.mk
+++ b/sysutils/vcdimager-devel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:57 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:46 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
VCDIMAGER_BUILDLINK3_MK:= ${VCDIMAGER_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nvcdimager}
BUILDLINK_PACKAGES+= vcdimager
.if !empty(VCDIMAGER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.vcdimager+= vcdimager>=0.7.20
-BUILDLINK_RECOMMENDED.vcdimager+= vcdimager>=0.7.23nb1
+BUILDLINK_API_DEPENDS.vcdimager+= vcdimager>=0.7.20
+BUILDLINK_ABI_DEPENDS.vcdimager+= vcdimager>=0.7.23nb1
BUILDLINK_PKGSRCDIR.vcdimager?= ../../sysutils/vcdimager-devel
.endif # VCDIMAGER_BUILDLINK3_MK
diff --git a/sysutils/xfce4-appfinder/buildlink3.mk b/sysutils/xfce4-appfinder/buildlink3.mk
index 4e6a56df34e..f44619dd7e5 100644
--- a/sysutils/xfce4-appfinder/buildlink3.mk
+++ b/sysutils/xfce4-appfinder/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/17 06:49:24 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:46 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_APPFINDER_BUILDLINK3_MK:= ${XFCE4_APPFINDER_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-appfinder}
BUILDLINK_PACKAGES+= xfce4-appfinder
.if !empty(XFCE4_APPFINDER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-appfinder+= xfce4-appfinder>=4.2.3
-BUILDLINK_RECOMMENDED.xfce4-appfinder?= xfce4-appfinder>=4.2.3nb2
+BUILDLINK_API_DEPENDS.xfce4-appfinder+= xfce4-appfinder>=4.2.3
+BUILDLINK_ABI_DEPENDS.xfce4-appfinder?= xfce4-appfinder>=4.2.3nb2
BUILDLINK_PKGSRCDIR.xfce4-appfinder?= ../../sysutils/xfce4-appfinder
.endif # XFCE4_APPFINDER_BUILDLINK3_MK
diff --git a/sysutils/xfce4-cpugraph-plugin/buildlink3.mk b/sysutils/xfce4-cpugraph-plugin/buildlink3.mk
index f7e90696459..e56c8a026ec 100644
--- a/sysutils/xfce4-cpugraph-plugin/buildlink3.mk
+++ b/sysutils/xfce4-cpugraph-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/17 06:49:24 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:46 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_CPUGRAPH_PLUGIN_BUILDLINK3_MK:= ${XFCE4_CPUGRAPH_PLUGIN_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-cpugraph-plugin}
BUILDLINK_PACKAGES+= xfce4-cpugraph-plugin
.if !empty(XFCE4_CPUGRAPH_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-cpugraph-plugin+= xfce4-cpugraph-plugin>=0.2.2nb1
-BUILDLINK_RECOMMENDED.xfce4-cpugraph-plugin?= xfce4-cpugraph-plugin>=0.2.2nb3
+BUILDLINK_API_DEPENDS.xfce4-cpugraph-plugin+= xfce4-cpugraph-plugin>=0.2.2nb1
+BUILDLINK_ABI_DEPENDS.xfce4-cpugraph-plugin?= xfce4-cpugraph-plugin>=0.2.2nb3
BUILDLINK_PKGSRCDIR.xfce4-cpugraph-plugin?= ../../sysutils/xfce4-cpugraph-plugin
.endif # XFCE4_CPUGRAPH_PLUGIN_BUILDLINK3_MK
diff --git a/sysutils/xfce4-diskperf-plugin/buildlink3.mk b/sysutils/xfce4-diskperf-plugin/buildlink3.mk
index 832083938f2..b1694b9e8e6 100644
--- a/sysutils/xfce4-diskperf-plugin/buildlink3.mk
+++ b/sysutils/xfce4-diskperf-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/17 06:49:24 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:46 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK:= ${XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-diskperf-plugin}
BUILDLINK_PACKAGES+= xfce4-diskperf-plugin
.if !empty(XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-diskperf-plugin+= xfce4-diskperf-plugin>=1.5
-BUILDLINK_RECOMMENDED.xfce4-diskperf-plugin?= xfce4-diskperf-plugin>=1.5nb2
+BUILDLINK_API_DEPENDS.xfce4-diskperf-plugin+= xfce4-diskperf-plugin>=1.5
+BUILDLINK_ABI_DEPENDS.xfce4-diskperf-plugin?= xfce4-diskperf-plugin>=1.5nb2
BUILDLINK_PKGSRCDIR.xfce4-diskperf-plugin?= ../../sysutils/xfce4-diskperf-plugin
.endif # XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK
diff --git a/sysutils/xfce4-fm/buildlink3.mk b/sysutils/xfce4-fm/buildlink3.mk
index b6d08b5cc97..2938e279cc0 100644
--- a/sysutils/xfce4-fm/buildlink3.mk
+++ b/sysutils/xfce4-fm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/02/17 06:49:24 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/04/06 06:22:46 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_FM_BUILDLINK3_MK:= ${XFCE4_FM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-fm}
BUILDLINK_PACKAGES+= xfce4-fm
.if !empty(XFCE4_FM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-fm+= xfce4-fm>=4.2.3
-BUILDLINK_RECOMMENDED.xfce4-fm?= xfce4-fm>=4.2.3nb2
+BUILDLINK_API_DEPENDS.xfce4-fm+= xfce4-fm>=4.2.3
+BUILDLINK_ABI_DEPENDS.xfce4-fm?= xfce4-fm>=4.2.3nb2
BUILDLINK_PKGSRCDIR.xfce4-fm?= ../../sysutils/xfce4-fm
.endif # XFCE4_FM_BUILDLINK3_MK
diff --git a/sysutils/xfce4-fsguard-plugin/buildlink3.mk b/sysutils/xfce4-fsguard-plugin/buildlink3.mk
index 5438fa8436a..2df9cdb1053 100644
--- a/sysutils/xfce4-fsguard-plugin/buildlink3.mk
+++ b/sysutils/xfce4-fsguard-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/17 06:49:25 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:46 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_FSGUARD_PLUGIN_BUILDLINK3_MK:= ${XFCE4_FSGUARD_PLUGIN_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-fsguard-plugin}
BUILDLINK_PACKAGES+= xfce4-fsguard-plugin
.if !empty(XFCE4_FSGUARD_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-fsguard-plugin+= xfce4-fsguard-plugin>=0.2.1
-BUILDLINK_RECOMMENDED.xfce4-fsguard-plugin?= xfce4-fsguard-plugin>=0.2.1nb2
+BUILDLINK_API_DEPENDS.xfce4-fsguard-plugin+= xfce4-fsguard-plugin>=0.2.1
+BUILDLINK_ABI_DEPENDS.xfce4-fsguard-plugin?= xfce4-fsguard-plugin>=0.2.1nb2
BUILDLINK_PKGSRCDIR.xfce4-fsguard-plugin?= ../../sysutils/xfce4-fsguard-plugin
.endif # XFCE4_FSGUARD_PLUGIN_BUILDLINK3_MK
diff --git a/sysutils/xfce4-minicmd-plugin/buildlink3.mk b/sysutils/xfce4-minicmd-plugin/buildlink3.mk
index fb70a973dd4..f29a37a00b5 100644
--- a/sysutils/xfce4-minicmd-plugin/buildlink3.mk
+++ b/sysutils/xfce4-minicmd-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/17 06:49:25 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:22:46 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_MINICMD_PLUGIN_BUILDLINK3_MK:= ${XFCE4_MINICMD_PLUGIN_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-minicmd-plugin}
BUILDLINK_PACKAGES+= xfce4-minicmd-plugin
.if !empty(XFCE4_MINICMD_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-minicmd-plugin+= xfce4-minicmd-plugin>=0.3.0
-BUILDLINK_RECOMMENDED.xfce4-minicmd-plugin?= xfce4-minicmd-plugin>=0.3.0nb2
+BUILDLINK_API_DEPENDS.xfce4-minicmd-plugin+= xfce4-minicmd-plugin>=0.3.0
+BUILDLINK_ABI_DEPENDS.xfce4-minicmd-plugin?= xfce4-minicmd-plugin>=0.3.0nb2
BUILDLINK_PKGSRCDIR.xfce4-minicmd-plugin?= ../../sysutils/xfce4-minicmd-plugin
.endif # XFCE4_MINICMD_PLUGIN_BUILDLINK3_MK
diff --git a/sysutils/xfce4-netload-plugin/buildlink3.mk b/sysutils/xfce4-netload-plugin/buildlink3.mk
index d6716390259..9339d063640 100644
--- a/sysutils/xfce4-netload-plugin/buildlink3.mk
+++ b/sysutils/xfce4-netload-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/02/17 06:49:25 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/04/06 06:22:46 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK:= ${XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-netload-plugin}
BUILDLINK_PACKAGES+= xfce4-netload-plugin
.if !empty(XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-netload-plugin+= xfce4-netload-plugin>=0.3.3
-BUILDLINK_RECOMMENDED.xfce4-netload-plugin?= xfce4-netload-plugin>=0.3.3nb3
+BUILDLINK_API_DEPENDS.xfce4-netload-plugin+= xfce4-netload-plugin>=0.3.3
+BUILDLINK_ABI_DEPENDS.xfce4-netload-plugin?= xfce4-netload-plugin>=0.3.3nb3
BUILDLINK_PKGSRCDIR.xfce4-netload-plugin?= ../../sysutils/xfce4-netload-plugin
.endif # XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK
diff --git a/sysutils/xfce4-quicklauncher-plugin/buildlink3.mk b/sysutils/xfce4-quicklauncher-plugin/buildlink3.mk
index df7ace8874b..ab8c568b2b1 100644
--- a/sysutils/xfce4-quicklauncher-plugin/buildlink3.mk
+++ b/sysutils/xfce4-quicklauncher-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/17 06:49:25 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:46 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_QUICKLAUNCHER_PLUGIN_BUILDLINK3_MK:= ${XFCE4_QUICKLAUNCHER_PLUGIN_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-quicklauncher-plugin}
BUILDLINK_PACKAGES+= xfce4-quicklauncher-plugin
.if !empty(XFCE4_QUICKLAUNCHER_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-quicklauncher-plugin+= xfce4-quicklauncher-plugin>=0.81
-BUILDLINK_RECOMMENDED.xfce4-quicklauncher-plugin?= xfce4-quicklauncher-plugin>=0.81nb3
+BUILDLINK_API_DEPENDS.xfce4-quicklauncher-plugin+= xfce4-quicklauncher-plugin>=0.81
+BUILDLINK_ABI_DEPENDS.xfce4-quicklauncher-plugin?= xfce4-quicklauncher-plugin>=0.81nb3
BUILDLINK_PKGSRCDIR.xfce4-quicklauncher-plugin?= ../../sysutils/xfce4-quicklauncher-plugin
.endif # XFCE4_QUICKLAUNCHER_PLUGIN_BUILDLINK3_MK
diff --git a/sysutils/xfce4-showdesktop-plugin/buildlink3.mk b/sysutils/xfce4-showdesktop-plugin/buildlink3.mk
index 6250cc586f9..225203e19fb 100644
--- a/sysutils/xfce4-showdesktop-plugin/buildlink3.mk
+++ b/sysutils/xfce4-showdesktop-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/17 06:49:25 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:22:46 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_SHOWDESKTOP_PLUGIN_BUILDLINK3_MK:= ${XFCE4_SHOWDESKTOP_PLUGIN_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-showdesktop-plugin}
BUILDLINK_PACKAGES+= xfce4-showdesktop-plugin
.if !empty(XFCE4_SHOWDESKTOP_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-showdesktop-plugin+= xfce4-showdesktop-plugin>=0.4.0
-BUILDLINK_RECOMMENDED.xfce4-showdesktop-plugin?= xfce4-showdesktop-plugin>=0.4.0nb2
+BUILDLINK_API_DEPENDS.xfce4-showdesktop-plugin+= xfce4-showdesktop-plugin>=0.4.0
+BUILDLINK_ABI_DEPENDS.xfce4-showdesktop-plugin?= xfce4-showdesktop-plugin>=0.4.0nb2
BUILDLINK_PKGSRCDIR.xfce4-showdesktop-plugin?= ../../sysutils/xfce4-showdesktop-plugin
.endif # XFCE4_SHOWDESKTOP_PLUGIN_BUILDLINK3_MK
diff --git a/sysutils/xfce4-systemload-plugin/buildlink3.mk b/sysutils/xfce4-systemload-plugin/buildlink3.mk
index f47e85690bc..1f620ce4e9c 100644
--- a/sysutils/xfce4-systemload-plugin/buildlink3.mk
+++ b/sysutils/xfce4-systemload-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/17 06:49:25 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:22:46 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK:= ${XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-systemload-plugin}
BUILDLINK_PACKAGES+= xfce4-systemload-plugin
.if !empty(XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-systemload-plugin+= xfce4-systemload-plugin>=0.3.6
-BUILDLINK_RECOMMENDED.xfce4-systemload-plugin?= xfce4-systemload-plugin>=0.3.6nb3
+BUILDLINK_API_DEPENDS.xfce4-systemload-plugin+= xfce4-systemload-plugin>=0.3.6
+BUILDLINK_ABI_DEPENDS.xfce4-systemload-plugin?= xfce4-systemload-plugin>=0.3.6nb3
BUILDLINK_PKGSRCDIR.xfce4-systemload-plugin?= ../../sysutils/xfce4-systemload-plugin
.endif # XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK
diff --git a/sysutils/xfce4-systray/buildlink3.mk b/sysutils/xfce4-systray/buildlink3.mk
index ca7bf17a590..c03888dc954 100644
--- a/sysutils/xfce4-systray/buildlink3.mk
+++ b/sysutils/xfce4-systray/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/02/17 06:49:25 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/04/06 06:22:46 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_SYSTRAY_BUILDLINK3_MK:= ${XFCE4_SYSTRAY_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-systray}
BUILDLINK_PACKAGES+= xfce4-systray
.if !empty(XFCE4_SYSTRAY_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-systray+= xfce4-systray>=4.2.3
-BUILDLINK_RECOMMENDED.xfce4-systray?= xfce4-systray>=4.2.3nb2
+BUILDLINK_API_DEPENDS.xfce4-systray+= xfce4-systray>=4.2.3
+BUILDLINK_ABI_DEPENDS.xfce4-systray?= xfce4-systray>=4.2.3nb2
BUILDLINK_PKGSRCDIR.xfce4-systray?= ../../sysutils/xfce4-systray
.endif # XFCE4_SYSTRAY_BUILDLINK3_MK
diff --git a/sysutils/xfce4-xkb-plugin/buildlink3.mk b/sysutils/xfce4-xkb-plugin/buildlink3.mk
index 860d6dc53af..fab275f6de2 100644
--- a/sysutils/xfce4-xkb-plugin/buildlink3.mk
+++ b/sysutils/xfce4-xkb-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/03/10 08:25:05 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:46 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_XKB_PLUGIN_BUILDLINK3_MK:= ${XFCE4_XKB_PLUGIN_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-xkb-plugin}
BUILDLINK_PACKAGES+= xfce4-xkb-plugin
.if !empty(XFCE4_XKB_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-xkb-plugin+= xfce4-xkb-plugin>=0.3.3
-BUILDLINK_RECOMMENDED.xfce4-xkb-plugin?= xfce4-xkb-plugin>=0.3.3
+BUILDLINK_API_DEPENDS.xfce4-xkb-plugin+= xfce4-xkb-plugin>=0.3.3
+BUILDLINK_ABI_DEPENDS.xfce4-xkb-plugin?= xfce4-xkb-plugin>=0.3.3
BUILDLINK_PKGSRCDIR.xfce4-xkb-plugin?= ../../sysutils/xfce4-xkb-plugin
.endif # XFCE4_XKB_PLUGIN_BUILDLINK3_MK
diff --git a/textproc/aiksaurus/buildlink3.mk b/textproc/aiksaurus/buildlink3.mk
index e67e99f4f22..5435ceef769 100644
--- a/textproc/aiksaurus/buildlink3.mk
+++ b/textproc/aiksaurus/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/12/29 09:18:20 recht Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:47 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
AIKSAURUS_BUILDLINK3_MK:= ${AIKSAURUS_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Naiksaurus}
BUILDLINK_PACKAGES+= aiksaurus
.if !empty(AIKSAURUS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.aiksaurus+= aiksaurus>=1.2.1
+BUILDLINK_API_DEPENDS.aiksaurus+= aiksaurus>=1.2.1
BUILDLINK_PKGSRCDIR.aiksaurus?= ../../textproc/aiksaurus
.endif # AIKSAURUS_BUILDLINK3_MK
diff --git a/textproc/aspell-czech/Makefile b/textproc/aspell-czech/Makefile
index ea8f1e7c69a..27e395bd182 100644
--- a/textproc/aspell-czech/Makefile
+++ b/textproc/aspell-czech/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/03/04 21:30:44 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2006/04/06 06:22:48 reed Exp $
#
DISTNAME= aspell6-cs-20040614-1
@@ -13,7 +13,7 @@ HOMEPAGE= http://aspell.net/
COMMENT= Czech language support for aspell
# earlier versions core-dumped on the input
-BUILDLINK_DEPENDS.aspell+= aspell>=0.60.2nb1
+BUILDLINK_API_DEPENDS.aspell+= aspell>=0.60.2nb1
HAS_CONFIGURE= YES
diff --git a/textproc/aspell/buildlink3.mk b/textproc/aspell/buildlink3.mk
index 0c8913a192b..1e4f9ea73f6 100644
--- a/textproc/aspell/buildlink3.mk
+++ b/textproc/aspell/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/05 23:10:59 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:22:47 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ASPELL_BUILDLINK3_MK:= ${ASPELL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Naspell}
BUILDLINK_PACKAGES+= aspell
.if !empty(ASPELL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.aspell+= aspell>=0.50.3
-BUILDLINK_RECOMMENDED.aspell+= aspell>=0.60.4nb1
+BUILDLINK_API_DEPENDS.aspell+= aspell>=0.50.3
+BUILDLINK_ABI_DEPENDS.aspell+= aspell>=0.60.4nb1
BUILDLINK_PKGSRCDIR.aspell?= ../../textproc/aspell
.endif # ASPELL_BUILDLINK3_MK
diff --git a/textproc/btparse/buildlink3.mk b/textproc/btparse/buildlink3.mk
index d8e6acf5aa9..1aa7acfb6e0 100644
--- a/textproc/btparse/buildlink3.mk
+++ b/textproc/btparse/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2005/09/27 12:24:06 tonio Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:49 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
BTPARSE_BUILDLINK3_MK:= ${BTPARSE_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nbtparse}
BUILDLINK_PACKAGES+= btparse
.if !empty(BTPARSE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.btparse+= btparse>=0.34
+BUILDLINK_API_DEPENDS.btparse+= btparse>=0.34
BUILDLINK_PKGSRCDIR.btparse?= ../../textproc/btparse
.endif # BTPARSE_BUILDLINK3_MK
diff --git a/textproc/chasen-base/buildlink3.mk b/textproc/chasen-base/buildlink3.mk
index c46923f5713..7f45beced12 100644
--- a/textproc/chasen-base/buildlink3.mk
+++ b/textproc/chasen-base/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:18:19 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:49 reed Exp $
#
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nchasen-base}
BUILDLINK_PACKAGES+= chasen-base
.if !empty(CHASEN_BASE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.chasen-base+= chasen-base>=2.3.3
-BUILDLINK_RECOMMENDED.chasen-base+= chasen-base>=2.3.3nb1
+BUILDLINK_API_DEPENDS.chasen-base+= chasen-base>=2.3.3
+BUILDLINK_ABI_DEPENDS.chasen-base+= chasen-base>=2.3.3nb1
BUILDLINK_PKGSRCDIR.chasen-base?= ../../textproc/chasen-base
.endif # CHASEN_BASE_BUILDLINK3_MK
diff --git a/textproc/chasen/buildlink3.mk b/textproc/chasen/buildlink3.mk
index 4dd29740836..4dfa6b5e8da 100644
--- a/textproc/chasen/buildlink3.mk
+++ b/textproc/chasen/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/05/05 00:28:50 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:49 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
CHASEN_BUILDLINK3_MK:= ${CHASEN_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nchasen}
BUILDLINK_PACKAGES+= chasen
.if !empty(CHASEN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.chasen+= chasen>=2.0
+BUILDLINK_API_DEPENDS.chasen+= chasen>=2.0
BUILDLINK_PKGSRCDIR.chasen?= ../../textproc/chasen
BUILDLINK_FILES.chasen= include/chasen.h
BUILDLINK_FILES.chasen+= lib/libchasen.*
diff --git a/textproc/eb/buildlink3.mk b/textproc/eb/buildlink3.mk
index 9d6a142207f..9bc576d92da 100644
--- a/textproc/eb/buildlink3.mk
+++ b/textproc/eb/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:11:01 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:50 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
EB_BUILDLINK3_MK:= ${EB_BUILDLINK3_MK}+
@@ -26,8 +26,8 @@ PKG_SYSCONFDIR.eb=$$( \
else ${ECHO}; fi )
.if !empty(EB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.eb+= eb>=${_EB_REQD}
-BUILDLINK_RECOMMENDED.eb+= eb>=4.1.3nb1
+BUILDLINK_API_DEPENDS.eb+= eb>=${_EB_REQD}
+BUILDLINK_ABI_DEPENDS.eb+= eb>=4.1.3nb1
BUILDLINK_PKGSRCDIR.eb?= ../../textproc/eb
.endif # EB_BUILDLINK3_MK
diff --git a/textproc/enchant/buildlink3.mk b/textproc/enchant/buildlink3.mk
index e7e66d6366f..9d71225bed0 100644
--- a/textproc/enchant/buildlink3.mk
+++ b/textproc/enchant/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:11:01 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:50 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ENCHANT_BUILDLINK3_MK:= ${ENCHANT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nenchant}
BUILDLINK_PACKAGES+= enchant
.if !empty(ENCHANT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.enchant+= enchant>=1.1.3
-BUILDLINK_RECOMMENDED.enchant+= enchant>=1.1.6nb1
+BUILDLINK_API_DEPENDS.enchant+= enchant>=1.1.3
+BUILDLINK_ABI_DEPENDS.enchant+= enchant>=1.1.6nb1
BUILDLINK_PKGSRCDIR.enchant?= ../../textproc/enchant
.endif # ENCHANT_BUILDLINK3_MK
diff --git a/textproc/expat/buildlink3.mk b/textproc/expat/buildlink3.mk
index a5e623da333..0388cd0f382 100644
--- a/textproc/expat/buildlink3.mk
+++ b/textproc/expat/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/02/05 23:11:01 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2006/04/06 06:22:50 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
EXPAT_BUILDLINK3_MK:= ${EXPAT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nexpat}
BUILDLINK_PACKAGES+= expat
.if !empty(EXPAT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.expat+= expat>=1.95.7
-BUILDLINK_RECOMMENDED.expat+= expat>=2.0.0nb1
+BUILDLINK_API_DEPENDS.expat+= expat>=1.95.7
+BUILDLINK_ABI_DEPENDS.expat+= expat>=2.0.0nb1
BUILDLINK_PKGSRCDIR.expat?= ../../textproc/expat
.endif # EXPAT_BUILDLINK3_MK
diff --git a/textproc/expat/builtin.mk b/textproc/expat/builtin.mk
index 7c8e5f99a45..0007004d6e3 100644
--- a/textproc/expat/builtin.mk
+++ b/textproc/expat/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.10 2006/03/30 18:06:18 jlam Exp $
+# $NetBSD: builtin.mk,v 1.11 2006/04/06 06:22:50 reed Exp $
BUILTIN_PKG:= expat
@@ -54,7 +54,7 @@ USE_BUILTIN.expat= ${IS_BUILTIN.expat}
. if defined(BUILTIN_PKG.expat) && \
!empty(IS_BUILTIN.expat:M[yY][eE][sS])
USE_BUILTIN.expat= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.expat}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.expat}
. if !empty(USE_BUILTIN.expat:M[yY][eE][sS])
USE_BUILTIN.expat!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.expat:Q}; then \
@@ -77,7 +77,7 @@ CHECK_BUILTIN.expat?= no
.if !empty(CHECK_BUILTIN.expat:M[nN][oO])
. if !empty(USE_BUILTIN.expat:M[nN][oO])
-BUILDLINK_DEPENDS.expat+= expat>=1.95.4
+BUILDLINK_API_DEPENDS.expat+= expat>=1.95.4
. endif
. if !empty(USE_BUILTIN.expat:M[yY][eE][sS])
diff --git a/textproc/gdome2/buildlink3.mk b/textproc/gdome2/buildlink3.mk
index 0f7f34146fd..d598ed646cc 100644
--- a/textproc/gdome2/buildlink3.mk
+++ b/textproc/gdome2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/10 12:09:24 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:50 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GDOME2_BUILDLINK3_MK:= ${GDOME2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngdome2}
BUILDLINK_PACKAGES+= gdome2
.if !empty(GDOME2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gdome2+= gdome2>=0.8.1nb1
-BUILDLINK_RECOMMENDED.gdome2?= gdome2>=0.8.1nb2
+BUILDLINK_API_DEPENDS.gdome2+= gdome2>=0.8.1nb1
+BUILDLINK_ABI_DEPENDS.gdome2?= gdome2>=0.8.1nb2
BUILDLINK_PKGSRCDIR.gdome2?= ../../textproc/gdome2
.endif # GDOME2_BUILDLINK3_MK
diff --git a/textproc/gnome-doc-utils/Makefile b/textproc/gnome-doc-utils/Makefile
index d0e30606fd0..82c27b231fa 100644
--- a/textproc/gnome-doc-utils/Makefile
+++ b/textproc/gnome-doc-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/03/21 06:00:50 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2006/04/06 06:22:50 reed Exp $
#
DISTNAME= gnome-doc-utils-0.6.0
@@ -30,7 +30,7 @@ PYTHON_PATCH_SCRIPTS+= xml2po/modes/empty.py
PYTHON_PATCH_SCRIPTS+= xml2po/modes/gs.py
PYTHON_PATCH_SCRIPTS+= xml2po/xml2po.py
-BUILDLINK_DEPENDS.libxml2+= libxml2>=2.6.12
+BUILDLINK_API_DEPENDS.libxml2+= libxml2>=2.6.12
BUILDLINK_DEPMETHOD.libxslt?= build
BUILDLINK_DEPMETHOD.libxml2?= build
diff --git a/textproc/gnome-doc-utils/buildlink3.mk b/textproc/gnome-doc-utils/buildlink3.mk
index a71e2167a50..bb062bb78a8 100644
--- a/textproc/gnome-doc-utils/buildlink3.mk
+++ b/textproc/gnome-doc-utils/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/03/12 22:14:09 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:50 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNOME_DOC_UTILS_BUILDLINK3_MK:= ${GNOME_DOC_UTILS_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= gnome-doc-utils
.if !empty(GNOME_DOC_UTILS_BUILDLINK3_MK:M+)
BUILDLINK_DEPMETHOD.gnome-doc-utils+= build
-BUILDLINK_DEPENDS.gnome-doc-utils+= gnome-doc-utils>=0.6.0
+BUILDLINK_API_DEPENDS.gnome-doc-utils+= gnome-doc-utils>=0.6.0
BUILDLINK_PKGSRCDIR.gnome-doc-utils?= ../../textproc/gnome-doc-utils
.endif # GNOME_DOC_UTILS_BUILDLINK3_MK
diff --git a/textproc/gnome-spell/Makefile b/textproc/gnome-spell/Makefile
index 8fc7700c3e9..e71070bf903 100644
--- a/textproc/gnome-spell/Makefile
+++ b/textproc/gnome-spell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/03/06 00:18:12 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2006/04/06 06:22:50 reed Exp $
DISTNAME= gnome-spell-1.0.6
PKGREVISION= 4
@@ -16,7 +16,7 @@ USE_PKGLOCALEDIR= YES
USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= YES
-BUILDLINK_DEPENDS.libgnomeui+= libgnomeui>=2.8.0nb3
+BUILDLINK_API_DEPENDS.libgnomeui+= libgnomeui>=2.8.0nb3
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
diff --git a/textproc/gnome-spell/buildlink3.mk b/textproc/gnome-spell/buildlink3.mk
index 56a40aa19b2..8be2e084ea3 100644
--- a/textproc/gnome-spell/buildlink3.mk
+++ b/textproc/gnome-spell/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/05 23:11:02 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:22:50 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNOME_SPELL_BUILDLINK3_MK:= ${GNOME_SPELL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-spell}
BUILDLINK_PACKAGES+= gnome-spell
.if !empty(GNOME_SPELL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-spell+= gnome-spell>=1.0.5
-BUILDLINK_RECOMMENDED.gnome-spell+= gnome-spell>=1.0.6nb3
+BUILDLINK_API_DEPENDS.gnome-spell+= gnome-spell>=1.0.5
+BUILDLINK_ABI_DEPENDS.gnome-spell+= gnome-spell>=1.0.6nb3
BUILDLINK_PKGSRCDIR.gnome-spell?= ../../textproc/gnome-spell
.endif # GNOME_SPELL_BUILDLINK3_MK
diff --git a/textproc/gtk-doc/buildlink3.mk b/textproc/gtk-doc/buildlink3.mk
index 9f9982b6d2f..9ee06eda285 100644
--- a/textproc/gtk-doc/buildlink3.mk
+++ b/textproc/gtk-doc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2006/02/26 10:24:35 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:50 reed Exp $
# provided mostly for pkg-config
@@ -13,7 +13,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtk-doc}
BUILDLINK_PACKAGES+= gtk-doc
.if !empty(GTK_DOC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gtk-doc+= gtk-doc>=1.4nb1
+BUILDLINK_API_DEPENDS.gtk-doc+= gtk-doc>=1.4nb1
BUILDLINK_PKGSRCDIR.gtk-doc?= ../../textproc/gtk-doc
.endif # GTK_DOC_BUILDLINK3_MK
diff --git a/textproc/gtkspell/buildlink3.mk b/textproc/gtkspell/buildlink3.mk
index 5efca7088c5..45b581c493d 100644
--- a/textproc/gtkspell/buildlink3.mk
+++ b/textproc/gtkspell/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:11:02 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:50 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GTKSPELL_BUILDLINK3_MK:= ${GTKSPELL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtkspell}
BUILDLINK_PACKAGES+= gtkspell
.if !empty(GTKSPELL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gtkspell+= gtkspell>=2.0.2nb6
-BUILDLINK_RECOMMENDED.gtkspell+= gtkspell>=2.0.11nb2
+BUILDLINK_API_DEPENDS.gtkspell+= gtkspell>=2.0.2nb6
+BUILDLINK_ABI_DEPENDS.gtkspell+= gtkspell>=2.0.11nb2
BUILDLINK_PKGSRCDIR.gtkspell?= ../../textproc/gtkspell
.endif # GTKSPELL_BUILDLINK3_MK
diff --git a/textproc/hre/buildlink3.mk b/textproc/hre/buildlink3.mk
index cf0ea3cad60..613e0504929 100644
--- a/textproc/hre/buildlink3.mk
+++ b/textproc/hre/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:18:19 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:50 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
HRE_BUILDLINK3_MK:= ${HRE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nhre}
BUILDLINK_PACKAGES+= hre
.if !empty(HRE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.hre+= hre>=0.9.7
-BUILDLINK_RECOMMENDED.hre+= hre>=0.9.8anb1
+BUILDLINK_API_DEPENDS.hre+= hre>=0.9.7
+BUILDLINK_ABI_DEPENDS.hre+= hre>=0.9.8anb1
BUILDLINK_PKGSRCDIR.hre?= ../../textproc/hre
.endif # HRE_BUILDLINK3_MK
diff --git a/textproc/icu/buildlink3.mk b/textproc/icu/buildlink3.mk
index 014f95232c7..96bb88b2d32 100644
--- a/textproc/icu/buildlink3.mk
+++ b/textproc/icu/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/05 23:11:02 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:22:51 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ICU_BUILDLINK3_MK:= ${ICU_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nicu}
BUILDLINK_PACKAGES+= icu
.if !empty(ICU_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.icu+= icu>=3.4
-BUILDLINK_RECOMMENDED.icu?= icu>=3.4nb1
+BUILDLINK_API_DEPENDS.icu+= icu>=3.4
+BUILDLINK_ABI_DEPENDS.icu?= icu>=3.4nb1
BUILDLINK_PKGSRCDIR.icu?= ../../textproc/icu
.endif # ICU_BUILDLINK3_MK
diff --git a/textproc/intltool/buildlink3.mk b/textproc/intltool/buildlink3.mk
index c065bcf6df2..8afb5b2b6d2 100644
--- a/textproc/intltool/buildlink3.mk
+++ b/textproc/intltool/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/02/05 23:11:02 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/04/06 06:22:51 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
INTLTOOL_BUILDLINK3_MK:= ${INTLTOOL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nintltool}
BUILDLINK_PACKAGES+= intltool
.if !empty(INTLTOOL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.intltool+= intltool>=0.34.1
-BUILDLINK_RECOMMENDED.intltool?= intltool>=0.34.1nb2
+BUILDLINK_API_DEPENDS.intltool+= intltool>=0.34.1
+BUILDLINK_ABI_DEPENDS.intltool?= intltool>=0.34.1nb2
BUILDLINK_PKGSRCDIR.intltool?= ../../textproc/intltool
BUILDLINK_DEPMETHOD.intltool?= build
.endif # INTLTOOL_BUILDLINK3_MK
diff --git a/textproc/iso-codes/buildlink3.mk b/textproc/iso-codes/buildlink3.mk
index faecd8666cc..bf4852fe590 100644
--- a/textproc/iso-codes/buildlink3.mk
+++ b/textproc/iso-codes/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/03/30 21:01:43 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:51 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ISO_CODES_BUILDLINK3_MK:= ${ISO_CODES_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Niso-codes}
BUILDLINK_PACKAGES+= iso-codes
.if !empty(ISO_CODES_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.iso-codes+= iso-codes>=0.50
+BUILDLINK_API_DEPENDS.iso-codes+= iso-codes>=0.50
BUILDLINK_PKGSRCDIR.iso-codes?= ../../textproc/iso-codes
.endif # ISO_CODES_BUILDLINK3_MK
diff --git a/textproc/jade/buildlink3.mk b/textproc/jade/buildlink3.mk
index 866033b887d..8e42671bf52 100644
--- a/textproc/jade/buildlink3.mk
+++ b/textproc/jade/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:11:03 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:51 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
JADE_BUILDLINK3_MK:= ${JADE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Njade}
BUILDLINK_PACKAGES+= jade
.if !empty(JADE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.jade+= jade>=1.2.1nb7
-BUILDLINK_RECOMMENDED.jade+= jade>=1.2.1nb10
+BUILDLINK_API_DEPENDS.jade+= jade>=1.2.1nb7
+BUILDLINK_ABI_DEPENDS.jade+= jade>=1.2.1nb10
BUILDLINK_PKGSRCDIR.jade?= ../../textproc/jade
.endif # JADE_BUILDLINK3_MK
diff --git a/textproc/kakasi/buildlink3.mk b/textproc/kakasi/buildlink3.mk
index 92820b5e111..f367828d5f0 100644
--- a/textproc/kakasi/buildlink3.mk
+++ b/textproc/kakasi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/03/13 09:17:51 taca Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:51 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
KAKASI_BUILDLINK3_MK:= ${KAKASI_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nkakasi}
BUILDLINK_PACKAGES+= kakasi
.if !empty(KAKASI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.kakasi+= kakasi>=2.3.0
-BUILDLINK_RECOMMENDED.kakasi+= kakasi>=2.3.4nb4
+BUILDLINK_API_DEPENDS.kakasi+= kakasi>=2.3.0
+BUILDLINK_ABI_DEPENDS.kakasi+= kakasi>=2.3.4nb4
BUILDLINK_PKGSRCDIR.kakasi?= ../../textproc/kakasi
.endif # KAKASI_BUILDLINK3_MK
diff --git a/textproc/libcroco/buildlink3.mk b/textproc/libcroco/buildlink3.mk
index 99b912e042c..a07b29c8c84 100644
--- a/textproc/libcroco/buildlink3.mk
+++ b/textproc/libcroco/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/02/05 23:11:03 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/04/06 06:22:51 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBCROCO_BUILDLINK3_MK:= ${LIBCROCO_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibcroco}
BUILDLINK_PACKAGES+= libcroco
.if !empty(LIBCROCO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libcroco+= libcroco>=0.6.0
-BUILDLINK_RECOMMENDED.libcroco+= libcroco>=0.6.0nb4
+BUILDLINK_API_DEPENDS.libcroco+= libcroco>=0.6.0
+BUILDLINK_ABI_DEPENDS.libcroco+= libcroco>=0.6.0nb4
BUILDLINK_PKGSRCDIR.libcroco?= ../../textproc/libcroco
.endif # LIBCROCO_BUILDLINK3_MK
diff --git a/textproc/libpathan/buildlink3.mk b/textproc/libpathan/buildlink3.mk
index b8480de8f44..da1c639cbaf 100644
--- a/textproc/libpathan/buildlink3.mk
+++ b/textproc/libpathan/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:11:03 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:51 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBPATHAN_BUILDLINK3_MK:= ${LIBPATHAN_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibpathan}
BUILDLINK_PACKAGES+= libpathan
.if !empty(LIBPATHAN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libpathan+= libpathan>=1.2.2
-BUILDLINK_RECOMMENDED.libpathan+= libpathan>=1.2.2nb2
+BUILDLINK_API_DEPENDS.libpathan+= libpathan>=1.2.2
+BUILDLINK_ABI_DEPENDS.libpathan+= libpathan>=1.2.2nb2
BUILDLINK_PKGSRCDIR.libpathan?= ../../textproc/libpathan
.endif # LIBPATHAN_BUILDLINK3_MK
diff --git a/textproc/libunicode/buildlink3.mk b/textproc/libunicode/buildlink3.mk
index 9989d9f15d3..27fa2b01fd5 100644
--- a/textproc/libunicode/buildlink3.mk
+++ b/textproc/libunicode/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:18:20 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:51 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBUNICODE_BUILDLINK3_MK:= ${LIBUNICODE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibunicode}
BUILDLINK_PACKAGES+= libunicode
.if !empty(LIBUNICODE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libunicode+= libunicode>=0.4
-BUILDLINK_RECOMMENDED.libunicode+= libunicode>=0.4nb1
+BUILDLINK_API_DEPENDS.libunicode+= libunicode>=0.4
+BUILDLINK_ABI_DEPENDS.libunicode+= libunicode>=0.4nb1
BUILDLINK_PKGSRCDIR.libunicode?= ../../textproc/libunicode
.endif # LIBUNICODE_BUILDLINK3_MK
diff --git a/textproc/libxml++2/buildlink3.mk b/textproc/libxml++2/buildlink3.mk
index efad31e15cb..bc503a8e6d1 100644
--- a/textproc/libxml++2/buildlink3.mk
+++ b/textproc/libxml++2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:11:03 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:51 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBXML++2_BUILDLINK3_MK:= ${LIBXML++2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibxml++2}
BUILDLINK_PACKAGES+= libxml++2
.if !empty(LIBXML++2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libxml++2+= libxml++2>=2.10.0
-BUILDLINK_RECOMMENDED.libxml++2?= libxml++2>=2.10.0nb1
+BUILDLINK_API_DEPENDS.libxml++2+= libxml++2>=2.10.0
+BUILDLINK_ABI_DEPENDS.libxml++2?= libxml++2>=2.10.0nb1
BUILDLINK_PKGSRCDIR.libxml++2?= ../../textproc/libxml++2
.endif # LIBXML++2_BUILDLINK3_MK
diff --git a/textproc/libxml/buildlink3.mk b/textproc/libxml/buildlink3.mk
index a1e3ef505a8..4c5261ef781 100644
--- a/textproc/libxml/buildlink3.mk
+++ b/textproc/libxml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/11/20 22:07:49 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:51 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBXML_BUILDLINK3_MK:= ${LIBXML_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibxml}
BUILDLINK_PACKAGES+= libxml
.if !empty(LIBXML_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libxml+= libxml>=1.8.11
-BUILDLINK_RECOMMENDED.libxml+= libxml>=1.8.17nb3
+BUILDLINK_API_DEPENDS.libxml+= libxml>=1.8.11
+BUILDLINK_ABI_DEPENDS.libxml+= libxml>=1.8.17nb3
BUILDLINK_FILES.libxml+= include/gnome-xml/libxml/*.h
BUILDLINK_PKGSRCDIR.libxml?= ../../textproc/libxml
.endif # LIBXML_BUILDLINK3_MK
diff --git a/textproc/libxml2/buildlink3.mk b/textproc/libxml2/buildlink3.mk
index eefd2c4b751..8d30749e481 100644
--- a/textproc/libxml2/buildlink3.mk
+++ b/textproc/libxml2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:11:03 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:51 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBXML2_BUILDLINK3_MK:= ${LIBXML2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibxml2}
BUILDLINK_PACKAGES+= libxml2
.if !empty(LIBXML2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libxml2+= libxml2>=2.6.2
-BUILDLINK_RECOMMENDED.libxml2+= libxml2>=2.6.23nb1
+BUILDLINK_API_DEPENDS.libxml2+= libxml2>=2.6.2
+BUILDLINK_ABI_DEPENDS.libxml2+= libxml2>=2.6.23nb1
BUILDLINK_PKGSRCDIR.libxml2?= ../../textproc/libxml2
BUILDLINK_FILES.libxml2+= bin/xml2-config
diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile
index aa3e4541593..b3800b366c4 100644
--- a/textproc/libxslt/Makefile
+++ b/textproc/libxslt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2006/02/05 23:11:03 joerg Exp $
+# $NetBSD: Makefile,v 1.63 2006/04/06 06:22:51 reed Exp $
DISTNAME= libxslt-1.1.15
PKGREVISION= 1
@@ -24,7 +24,7 @@ CONFIGURE_ARGS+= --without-python
TEST_TARGET= check
-BUILDLINK_DEPENDS.libxml2+= libxml2>=2.6.17
+BUILDLINK_API_DEPENDS.libxml2+= libxml2>=2.6.17
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../security/libgcrypt/buildlink3.mk"
diff --git a/textproc/libxslt/buildlink3.mk b/textproc/libxslt/buildlink3.mk
index bac3aa55fc1..6a2b320a728 100644
--- a/textproc/libxslt/buildlink3.mk
+++ b/textproc/libxslt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/02/05 23:11:03 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/04/06 06:22:51 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBXSLT_BUILDLINK3_MK:= ${LIBXSLT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibxslt}
BUILDLINK_PACKAGES+= libxslt
.if !empty(LIBXSLT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libxslt+= libxslt>=1.1.8
-BUILDLINK_RECOMMENDED.libxslt+= libxslt>=1.1.15nb1
+BUILDLINK_API_DEPENDS.libxslt+= libxslt>=1.1.8
+BUILDLINK_ABI_DEPENDS.libxslt+= libxslt>=1.1.15nb1
BUILDLINK_PKGSRCDIR.libxslt?= ../../textproc/libxslt
.endif # LIBXSLT_BUILDLINK3_MK
diff --git a/textproc/opensp/buildlink3.mk b/textproc/opensp/buildlink3.mk
index 969e4c1a733..88540468f58 100644
--- a/textproc/opensp/buildlink3.mk
+++ b/textproc/opensp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:11:04 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:51 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OPENSP_BUILDLINK3_MK:= ${OPENSP_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nopensp}
BUILDLINK_PACKAGES+= opensp
.if !empty(OPENSP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.opensp+= opensp>=1.5.1
-BUILDLINK_RECOMMENDED.opensp+= opensp>=1.5.1nb3
+BUILDLINK_API_DEPENDS.opensp+= opensp>=1.5.1
+BUILDLINK_ABI_DEPENDS.opensp+= opensp>=1.5.1nb3
BUILDLINK_PKGSRCDIR.opensp?= ../../textproc/opensp
.endif # OPENSP_BUILDLINK3_MK
diff --git a/textproc/p5-XML-Xerces/Makefile b/textproc/p5-XML-Xerces/Makefile
index c4e3d04a6e8..7075fabf438 100644
--- a/textproc/p5-XML-Xerces/Makefile
+++ b/textproc/p5-XML-Xerces/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/02/05 23:11:05 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2006/04/06 06:22:51 reed Exp $
#
DISTNAME= XML-Xerces-2.3.0-4
@@ -23,7 +23,7 @@ MAKE_ENV+= XERCESCROOT="${BUILDLINK_PREFIX.xerces-c}" LANG=""
# Xerces-C is built unthreaded in pkgsrc (for now).
BUILDLINK_TRANSFORM+= rm:-lpthread
-BUILDLINK_DEPENDS.xerces-c+= xerces-c>=2.3.0
+BUILDLINK_API_DEPENDS.xerces-c+= xerces-c>=2.3.0
.include "../../textproc/xerces-c/buildlink3.mk"
.include "../../lang/perl5/module.mk"
diff --git a/textproc/py-libxml2/Makefile b/textproc/py-libxml2/Makefile
index 695e55d2cd8..64eca297633 100644
--- a/textproc/py-libxml2/Makefile
+++ b/textproc/py-libxml2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/02/07 20:58:07 drochner Exp $
+# $NetBSD: Makefile,v 1.20 2006/04/06 06:22:51 reed Exp $
DISTNAME= libxml2-2.6.23
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -22,7 +22,7 @@ SUBST_FILES.setup= setup.py
SUBST_SED.setup= -e "/ROOT/s,'/usr','${BUILDLINK_PREFIX.libxml2}',g" \
-e "/^\"/s,/usr/include,${BUILDLINK_PREFIX.iconv}/include,g"
-BUILDLINK_DEPENDS.libxml2+= libxml2>=${PKGVERSION}
+BUILDLINK_API_DEPENDS.libxml2+= libxml2>=${PKGVERSION}
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../lang/python/extension.mk"
diff --git a/textproc/py-libxslt/Makefile b/textproc/py-libxslt/Makefile
index 50fb97bfa9c..1b7d68190b3 100644
--- a/textproc/py-libxslt/Makefile
+++ b/textproc/py-libxslt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/02/05 23:11:07 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2006/04/06 06:22:51 reed Exp $
DISTNAME= libxslt-1.1.15
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -28,7 +28,7 @@ SUBST_SED.setup= -e "s,@LIBICONVDIR@,${BUILDLINK_PREFIX.iconv},g" \
-e "s,@LIBXML2DIR@,${BUILDLINK_PREFIX.libxml2},g" \
-e "s,@LIBXSLTDIR@,${BUILDLINK_PREFIX.libxslt},g"
-BUILDLINK_DEPENDS.libxslt+= libxslt>=${PKGVERSION}
+BUILDLINK_API_DEPENDS.libxslt+= libxslt>=${PKGVERSION}
.include "../../textproc/libxslt/buildlink3.mk"
.include "../../lang/python/extension.mk"
diff --git a/textproc/py-xml/Makefile b/textproc/py-xml/Makefile
index 4a602bf3b9d..2c796e004bb 100644
--- a/textproc/py-xml/Makefile
+++ b/textproc/py-xml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/02/05 23:11:07 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2006/04/06 06:22:52 reed Exp $
#
DISTNAME= PyXML-0.8.4
@@ -15,7 +15,7 @@ CONFLICTS+= PyXML-[0-9]*
PYDISTUTILSPKG= yes
PYBINMODULE= yes
-BUILDLINK_DEPENDS.expat+= expat>=1.95.6
+BUILDLINK_API_DEPENDS.expat+= expat>=1.95.6
PYSETUPBUILDARGS+= --with-libexpat=${BUILDLINK_DIR}
PYSETUPBUILDARGS+= --ldflags="${EXPAT_LDFLAGS}"
EXPAT_LDFLAGS= ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.expat}/lib
diff --git a/textproc/py-xml/buildlink3.mk b/textproc/py-xml/buildlink3.mk
index 6ad667edfc5..8182a5c2409 100644
--- a/textproc/py-xml/buildlink3.mk
+++ b/textproc/py-xml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:11:07 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:52 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PYXML_BUILDLINK3_MK:= ${PYXML_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npyxml}
BUILDLINK_PACKAGES+= pyxml
.if !empty(PYXML_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pyxml+= ${PYPKGPREFIX}-xml>=0.8.3nb1
-BUILDLINK_RECOMMENDED.pyxml?= ${PYPKGPREFIX}-xml>=0.8.4nb2
+BUILDLINK_API_DEPENDS.pyxml+= ${PYPKGPREFIX}-xml>=0.8.3nb1
+BUILDLINK_ABI_DEPENDS.pyxml?= ${PYPKGPREFIX}-xml>=0.8.4nb2
BUILDLINK_PKGSRCDIR.pyxml?= ../../textproc/py-xml
.endif # PYXML_BUILDLINK3_MK
diff --git a/textproc/raptor/buildlink3.mk b/textproc/raptor/buildlink3.mk
index 832d731d25a..4f2597d3538 100644
--- a/textproc/raptor/buildlink3.mk
+++ b/textproc/raptor/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:11:07 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:52 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
RAPTOR_BUILDLINK3_MK:= ${RAPTOR_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nraptor}
BUILDLINK_PACKAGES+= raptor
.if !empty(RAPTOR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.raptor?= raptor>=1.0.0
-BUILDLINK_RECOMMENDED.raptor+= raptor>=1.0.0nb6
+BUILDLINK_API_DEPENDS.raptor?= raptor>=1.0.0
+BUILDLINK_ABI_DEPENDS.raptor+= raptor>=1.0.0nb6
.endif # RAPTOR_BUILDLINK3_MK
.include "../../textproc/libxml2/buildlink3.mk"
diff --git a/textproc/ruby-eruby/buildlink3.mk b/textproc/ruby-eruby/buildlink3.mk
index 09f8ff6e8e9..a5cf6841992 100644
--- a/textproc/ruby-eruby/buildlink3.mk
+++ b/textproc/ruby-eruby/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2005/12/11 13:33:26 taca Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:52 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
RUBY_ERUBY_BUILDLINK3_MK:= ${RUBY_ERUBY_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:N${RUBY_PKGPREFIX}-eruby}
BUILDLINK_PACKAGES+= ${RUBY_PKGPREFIX}-eruby
.if !empty(RUBY_ERUBY_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ruby18-eruby+= ${RUBY_PKGPREFIX}-eruby>=0.9.7
+BUILDLINK_API_DEPENDS.ruby18-eruby+= ${RUBY_PKGPREFIX}-eruby>=0.9.7
BUILDLINK_PKGSRCDIR.ruby18-eruby?= ../../textproc/ruby-eruby
.endif # RUBY_ERUBY_BUILDLINK3_MK
diff --git a/textproc/ruby-rdtool/buildlink3.mk b/textproc/ruby-rdtool/buildlink3.mk
index ed914c7b625..230033d17c1 100644
--- a/textproc/ruby-rdtool/buildlink3.mk
+++ b/textproc/ruby-rdtool/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/13 15:23:28 taca Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:52 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
@@ -22,7 +22,7 @@ RUBY_RD_LIST= ${RUBY_VERSION_LIST:C/([1-9][0-9]*)/ruby&-rdtool/g}
BUILDLINK_FILES.ruby18-rdtool+= bin/rd2
BUILDLINK_DEPMETHOD.ruby18-rdtool?= build
-BUILDLINK_DEPENDS.ruby18-rdtool+= {${RUBY_RD_LIST}}>=0.6.14
+BUILDLINK_API_DEPENDS.ruby18-rdtool+= {${RUBY_RD_LIST}}>=0.6.14
BUILDLINK_PKGSRCDIR.ruby18-rdtool?= ../../textproc/ruby-rdtool
.endif
diff --git a/textproc/sablotron/buildlink3.mk b/textproc/sablotron/buildlink3.mk
index 82c6aa4cdfe..9081f3319c1 100644
--- a/textproc/sablotron/buildlink3.mk
+++ b/textproc/sablotron/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:11:07 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:52 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SABLOTRON_BUILDLINK3_MK:= ${SABLOTRON_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsablotron}
BUILDLINK_PACKAGES+= sablotron
.if !empty(SABLOTRON_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.sablotron+= sablotron>=1.0
-BUILDLINK_RECOMMENDED.sablotron+= sablotron>=1.0.2nb2
+BUILDLINK_API_DEPENDS.sablotron+= sablotron>=1.0
+BUILDLINK_ABI_DEPENDS.sablotron+= sablotron>=1.0.2nb2
BUILDLINK_PKGSRCDIR.sablotron?= ../../textproc/sablotron
.endif # SABLOTRON_BUILDLINK3_MK
diff --git a/textproc/scrollkeeper/buildlink3.mk b/textproc/scrollkeeper/buildlink3.mk
index b63a57aa54b..3c6a02b449e 100644
--- a/textproc/scrollkeeper/buildlink3.mk
+++ b/textproc/scrollkeeper/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:11:07 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:52 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SCROLLKEEPER_BUILDLINK3_MK:= ${SCROLLKEEPER_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nscrollkeeper}
BUILDLINK_PACKAGES+= scrollkeeper
.if !empty(SCROLLKEEPER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.scrollkeeper+= scrollkeeper>=0.3.12nb2
-BUILDLINK_RECOMMENDED.scrollkeeper+= scrollkeeper>=0.3.14nb8
+BUILDLINK_API_DEPENDS.scrollkeeper+= scrollkeeper>=0.3.12nb2
+BUILDLINK_ABI_DEPENDS.scrollkeeper+= scrollkeeper>=0.3.14nb8
BUILDLINK_PKGSRCDIR.scrollkeeper?= ../../textproc/scrollkeeper
.endif # SCROLLKEEPER_BUILDLINK3_MK
diff --git a/textproc/xalan-c/buildlink3.mk b/textproc/xalan-c/buildlink3.mk
index 7ffceb2d30e..521f2be6b47 100644
--- a/textproc/xalan-c/buildlink3.mk
+++ b/textproc/xalan-c/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:11:08 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:52 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XALAN_C_BUILDLINK3_MK:= ${XALAN_C_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxalan-c}
BUILDLINK_PACKAGES+= xalan-c
.if !empty(XALAN_C_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xalan-c+= xalan-c>=1.6nb3
-BUILDLINK_RECOMMENDED.xalan-c?= xalan-c>=1.6nb4
+BUILDLINK_API_DEPENDS.xalan-c+= xalan-c>=1.6nb3
+BUILDLINK_ABI_DEPENDS.xalan-c?= xalan-c>=1.6nb4
BUILDLINK_PKGSRCDIR.xalan-c?= ../../textproc/xalan-c
.endif # XALAN_C_BUILDLINK3_MK
diff --git a/textproc/xerces-c/buildlink3.mk b/textproc/xerces-c/buildlink3.mk
index 716dc7a2e44..30a57be8490 100644
--- a/textproc/xerces-c/buildlink3.mk
+++ b/textproc/xerces-c/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:11:08 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:52 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XERCES_C_BUILDLINK3_MK:= ${XERCES_C_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxerces-c}
BUILDLINK_PACKAGES+= xerces-c
.if !empty(XERCES_C_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xerces-c+= xerces-c>=2.3.0
-BUILDLINK_RECOMMENDED.xerces-c?= xerces-c>=2.3.0nb3
+BUILDLINK_API_DEPENDS.xerces-c+= xerces-c>=2.3.0
+BUILDLINK_ABI_DEPENDS.xerces-c?= xerces-c>=2.3.0nb3
BUILDLINK_PKGSRCDIR.xerces-c?= ../../textproc/xerces-c
.endif # XERCES_C_BUILDLINK3_MK
diff --git a/textproc/xmlcatmgr/buildlink3.mk b/textproc/xmlcatmgr/buildlink3.mk
index 468f5f3b5d5..5e27ab8b3ac 100644
--- a/textproc/xmlcatmgr/buildlink3.mk
+++ b/textproc/xmlcatmgr/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2005/03/26 16:54:51 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:52 reed Exp $
#
# This Makefile fragment is included by packages that use xmlcatmgr.
#
@@ -23,7 +23,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxmlcatmgr}
BUILDLINK_PACKAGES+= xmlcatmgr
.if !empty(XMLCATMGR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xmlcatmgr+= xmlcatmgr>=2.0beta1
+BUILDLINK_API_DEPENDS.xmlcatmgr+= xmlcatmgr>=2.0beta1
BUILDLINK_PKGSRCDIR.xmlcatmgr?= ../../textproc/xmlcatmgr
# Location of the xmlcatmgr binary program.
diff --git a/textproc/xmlstarlet/Makefile b/textproc/xmlstarlet/Makefile
index df4b5c3863c..58d7a6b84f4 100644
--- a/textproc/xmlstarlet/Makefile
+++ b/textproc/xmlstarlet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/03/04 21:30:52 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2006/04/06 06:22:52 reed Exp $
#
DISTNAME= xmlstarlet-1.0.1
@@ -16,8 +16,8 @@ CONFIGURE_ARGS+= --with-libxml-prefix=${BUILDLINK_PREFIX.libxml2}
CONFIGURE_ARGS+= --with-libxslt-prefix=${BUILDLINK_PREFIX.libxslt}
PTHREAD_OPTS+= require
-BUILDLINK_DEPENDS.libxml2+= libxml2>=2.6.12
-BUILDLINK_DEPENDS.libxslt+= libxslt>=1.1.9
+BUILDLINK_API_DEPENDS.libxml2+= libxml2>=2.6.12
+BUILDLINK_API_DEPENDS.libxslt+= libxslt>=1.1.9
TEST_TARGET= check
diff --git a/time/py-mxDateTime/buildlink3.mk b/time/py-mxDateTime/buildlink3.mk
index 26119a33662..96f34380038 100644
--- a/time/py-mxDateTime/buildlink3.mk
+++ b/time/py-mxDateTime/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:11:10 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:22:52 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_MXDATETIME_BUILDLINK3_MK:= ${PY_MXDATETIME_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npy-mxDateTime}
BUILDLINK_PACKAGES+= py-mxDateTime
.if !empty(PY_MXDATETIME_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.py-mxDateTime+= ${PYPKGPREFIX}-mxDateTime>=2.0.5
-BUILDLINK_RECOMMENDED.py-mxDateTime?= ${PYPKGPREFIX}-mxDateTime>=2.0.6nb1
+BUILDLINK_API_DEPENDS.py-mxDateTime+= ${PYPKGPREFIX}-mxDateTime>=2.0.5
+BUILDLINK_ABI_DEPENDS.py-mxDateTime?= ${PYPKGPREFIX}-mxDateTime>=2.0.6nb1
BUILDLINK_PKGSRCDIR.py-mxDateTime?= ../../time/py-mxDateTime
BUILDLINK_INCDIRS.py-mxDateTime+= ${PYSITELIB}/mx/DateTime/mxDateTime
.endif # PY_MXDATETIME_BUILDLINK3_MK
diff --git a/time/xfce4-calendar/buildlink3.mk b/time/xfce4-calendar/buildlink3.mk
index 69513899b09..a5d6016fa85 100644
--- a/time/xfce4-calendar/buildlink3.mk
+++ b/time/xfce4-calendar/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/17 06:49:25 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:52 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_CALENDAR_BUILDLINK3_MK:= ${XFCE4_CALENDAR_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-calendar}
BUILDLINK_PACKAGES+= xfce4-calendar
.if !empty(XFCE4_CALENDAR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-calendar+= xfce4-calendar>=4.2.3
-BUILDLINK_RECOMMENDED.xfce4-calendar?= xfce4-calendar>=4.2.3nb2
+BUILDLINK_API_DEPENDS.xfce4-calendar+= xfce4-calendar>=4.2.3
+BUILDLINK_ABI_DEPENDS.xfce4-calendar?= xfce4-calendar>=4.2.3nb2
BUILDLINK_PKGSRCDIR.xfce4-calendar?= ../../time/xfce4-calendar
.endif # XFCE4_CALENDAR_BUILDLINK3_MK
diff --git a/time/xfce4-datetime-plugin/buildlink3.mk b/time/xfce4-datetime-plugin/buildlink3.mk
index e4f63ee1a77..77fe720a6c1 100644
--- a/time/xfce4-datetime-plugin/buildlink3.mk
+++ b/time/xfce4-datetime-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/17 06:49:25 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:52 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_DATETIME_PLUGIN_BUILDLINK3_MK:= ${XFCE4_DATETIME_PLUGIN_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-datetime-plugin}
BUILDLINK_PACKAGES+= xfce4-datetime-plugin
.if !empty(XFCE4_DATETIME_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-datetime-plugin+= xfce4-datetime-plugin>=0.3.1
-BUILDLINK_RECOMMENDED.xfce4-datetime-plugin?= xfce4-datetime-plugin>=0.3.1nb2
+BUILDLINK_API_DEPENDS.xfce4-datetime-plugin+= xfce4-datetime-plugin>=0.3.1
+BUILDLINK_ABI_DEPENDS.xfce4-datetime-plugin?= xfce4-datetime-plugin>=0.3.1nb2
BUILDLINK_PKGSRCDIR.xfce4-datetime-plugin?= ../../time/xfce4-datetime-plugin
.endif # XFCE4_DATETIME_PLUGIN_BUILDLINK3_MK
diff --git a/wm/metacity/buildlink3.mk b/wm/metacity/buildlink3.mk
index cf69f411bfc..1253ecabd5b 100644
--- a/wm/metacity/buildlink3.mk
+++ b/wm/metacity/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/02/05 23:11:14 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/04/06 06:22:52 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
METACITY_BUILDLINK3_MK:= ${METACITY_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmetacity}
BUILDLINK_PACKAGES+= metacity
.if !empty(METACITY_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.metacity+= metacity>=2.8.5
-BUILDLINK_RECOMMENDED.metacity+= metacity>=2.12.2nb2
+BUILDLINK_API_DEPENDS.metacity+= metacity>=2.8.5
+BUILDLINK_ABI_DEPENDS.metacity+= metacity>=2.12.2nb2
BUILDLINK_PKGSRCDIR.metacity?= ../../wm/metacity
.endif # METACITY_BUILDLINK3_MK
diff --git a/wm/openbox/buildlink3.mk b/wm/openbox/buildlink3.mk
index e110e423233..a0fcd4e15e7 100644
--- a/wm/openbox/buildlink3.mk
+++ b/wm/openbox/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:11:14 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:52 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OPENBOX_BUILDLINK3_MK:= ${OPENBOX_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nopenbox}
BUILDLINK_PACKAGES+= openbox
.if !empty(OPENBOX_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.openbox+= openbox>=3.1
-BUILDLINK_RECOMMENDED.openbox+= openbox>=3.2nb3
+BUILDLINK_API_DEPENDS.openbox+= openbox>=3.1
+BUILDLINK_ABI_DEPENDS.openbox+= openbox>=3.2nb3
BUILDLINK_PKGSRCDIR.openbox?= ../../wm/openbox
.endif # OPENBOX_BUILDLINK3_MK
diff --git a/wm/windowmaker/buildlink3.mk b/wm/windowmaker/buildlink3.mk
index dd36104e6ab..2e10b872011 100644
--- a/wm/windowmaker/buildlink3.mk
+++ b/wm/windowmaker/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/03/10 23:04:46 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/04/06 06:22:52 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
WINDOWMAKER_BUILDLINK3_MK:= ${WINDOWMAKER_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nwindowmaker}
BUILDLINK_PACKAGES+= windowmaker
.if !empty(WINDOWMAKER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.windowmaker+= windowmaker>=0.80.2nb3
-BUILDLINK_RECOMMENDED.windowmaker+= windowmaker>=0.92.0nb5
+BUILDLINK_API_DEPENDS.windowmaker+= windowmaker>=0.80.2nb3
+BUILDLINK_ABI_DEPENDS.windowmaker+= windowmaker>=0.92.0nb5
BUILDLINK_PKGSRCDIR.windowmaker?= ../../wm/windowmaker
.endif # WINDOWMAKER_BUILDLINK3_MK
diff --git a/wm/xfce4-wm-themes/buildlink3.mk b/wm/xfce4-wm-themes/buildlink3.mk
index 0643afb0abe..799cf3f9de7 100644
--- a/wm/xfce4-wm-themes/buildlink3.mk
+++ b/wm/xfce4-wm-themes/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/02/17 06:49:25 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/04/06 06:22:52 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_WM_THEMES_BUILDLINK3_MK:= ${XFCE4_WM_THEMES_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-wm-themes}
BUILDLINK_PACKAGES+= xfce4-wm-themes
.if !empty(XFCE4_WM_THEMES_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-wm-themes+= xfce4-wm-themes>=4.2.3
-BUILDLINK_RECOMMENDED.xfce4-wm-themes?= xfce4-wm-themes>=4.2.3nb2
+BUILDLINK_API_DEPENDS.xfce4-wm-themes+= xfce4-wm-themes>=4.2.3
+BUILDLINK_ABI_DEPENDS.xfce4-wm-themes?= xfce4-wm-themes>=4.2.3nb2
BUILDLINK_PKGSRCDIR.xfce4-wm-themes?= ../../wm/xfce4-wm-themes
.endif # XFCE4_WM_THEMES_BUILDLINK3_MK
diff --git a/wm/xfce4-wm/buildlink3.mk b/wm/xfce4-wm/buildlink3.mk
index da0445e71d8..47f8872ba94 100644
--- a/wm/xfce4-wm/buildlink3.mk
+++ b/wm/xfce4-wm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/02/17 06:49:25 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/04/06 06:22:52 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_WM_BUILDLINK3_MK:= ${XFCE4_WM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-wm}
BUILDLINK_PACKAGES+= xfce4-wm
.if !empty(XFCE4_WM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-wm+= xfce4-wm>=4.2.3.2
-BUILDLINK_RECOMMENDED.xfce4-wm?= xfce4-wm>=4.2.3.2nb2
+BUILDLINK_API_DEPENDS.xfce4-wm+= xfce4-wm>=4.2.3.2
+BUILDLINK_ABI_DEPENDS.xfce4-wm?= xfce4-wm>=4.2.3.2nb2
BUILDLINK_PKGSRCDIR.xfce4-wm?= ../../wm/xfce4-wm
.endif # XFCE4_WM_BUILDLINK3_MK
diff --git a/www/ap-dav/Makefile b/www/ap-dav/Makefile
index 21238fd2ee6..38d48377ea2 100644
--- a/www/ap-dav/Makefile
+++ b/www/ap-dav/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/03/04 21:30:56 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2006/04/06 06:22:52 reed Exp $
DISTNAME= mod_dav-1.0.3-1.3.6
PKGNAME= ap-dav-1.0.3
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.webdav.org/mod_dav/
COMMENT= Apache WebDAV module
# Ugly mess that says apache>=1.3.9 and apache<2.0.
-BUILDLINK_DEPENDS.apache+= {apache-1.3.9*,apache-1.3.[1-9][0-9]*,apache6-1.3.9*,apache6-1.3.[1-9][0-9]*}
+BUILDLINK_API_DEPENDS.apache+= {apache-1.3.9*,apache-1.3.[1-9][0-9]*,apache6-1.3.9*,apache6-1.3.[1-9][0-9]*}
APACHE_MODULE= YES
GNU_CONFIGURE= YES
diff --git a/www/ap-perl/Makefile b/www/ap-perl/Makefile
index 3e4db0832c1..1171d677728 100644
--- a/www/ap-perl/Makefile
+++ b/www/ap-perl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2006/03/04 21:30:56 jlam Exp $
+# $NetBSD: Makefile,v 1.42 2006/04/06 06:22:53 reed Exp $
#
DISTNAME= mod_perl-1.29
@@ -14,7 +14,7 @@ COMMENT= Module that embeds a Perl interpreter into Apache
CONFLICTS= ap2-perl-[0-9]*
-DEPENDS+= ${BUILDLINK_DEPENDS.apache}:../../www/apache
+DEPENDS+= ${BUILDLINK_API_DEPENDS.apache}:../../www/apache
DEPENDS+= p5-BSD-Resource>=1.10:../../devel/p5-BSD-Resource
APACHE_MODULE= YES
diff --git a/www/ap-perl/buildlink3.mk b/www/ap-perl/buildlink3.mk
index 40952c2e5da..34f534bee02 100644
--- a/www/ap-perl/buildlink3.mk
+++ b/www/ap-perl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:11:17 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:53 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
AP_PERL_BUILDLINK3_MK:= ${AP_PERL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nap-perl}
BUILDLINK_PACKAGES+= ap-perl
.if !empty(AP_PERL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ap-perl+= ap-perl>=1.29nb3
-BUILDLINK_RECOMMENDED.ap-perl?= ap-perl>=1.29nb5
+BUILDLINK_API_DEPENDS.ap-perl+= ap-perl>=1.29nb3
+BUILDLINK_ABI_DEPENDS.ap-perl?= ap-perl>=1.29nb5
BUILDLINK_PKGSRCDIR.ap-perl?= ../../www/ap-perl
BUILDLINK_FILES.ap-perl+= lib/httpd/mod_perl.*
diff --git a/www/ap-ssl/Makefile b/www/ap-ssl/Makefile
index 87528ab20a1..fe5d27c7939 100644
--- a/www/ap-ssl/Makefile
+++ b/www/ap-ssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.99 2006/03/04 21:30:56 jlam Exp $
+# $NetBSD: Makefile,v 1.100 2006/04/06 06:22:53 reed Exp $
DISTNAME= mod_ssl-2.8.25-1.3.34
PKGNAME= ap-ssl-2.8.25
@@ -14,7 +14,7 @@ COMMENT= SSL/TLS protocols module for Apache
CONFLICTS= apache-1.3.[0-9] apache-*modssl-[0-9]* apache6-[0-9]*
-BUILDLINK_DEPENDS.apache+= apache>=1.3.33
+BUILDLINK_API_DEPENDS.apache+= apache>=1.3.33
APACHE_MODULE= yes
diff --git a/www/ap2-auth-ldap/Makefile b/www/ap2-auth-ldap/Makefile
index 753674cb7c9..b6c6cd1e6cb 100644
--- a/www/ap2-auth-ldap/Makefile
+++ b/www/ap2-auth-ldap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/02/05 23:11:18 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2006/04/06 06:22:53 reed Exp $
DISTNAME= mod_auth_ldap3.05
PKGNAME= ap2-auth-ldap-3.05
@@ -16,7 +16,7 @@ APACHE_MODULE_NAME= mm_auth_ldap_module
USE_LIBTOOL= YES
CPPFLAGS+= -L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib -lldap -llber
-BUILDLINK_DEPENDS.apache+= apache>=2.0.47
+BUILDLINK_API_DEPENDS.apache+= apache>=2.0.47
CONFIGURE_ARGS+= --with-apxs=${APXS:Q}
CONFIGURE_ARGS+= --with-ldap-dir=${BUILDLINK_PREFIX.openldap}
diff --git a/www/ap2-perl/buildlink3.mk b/www/ap2-perl/buildlink3.mk
index 6b45146768f..2e4a48921ba 100644
--- a/www/ap2-perl/buildlink3.mk
+++ b/www/ap2-perl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:11:18 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:53 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
AP2_PERL_BUILDLINK3_MK:= ${AP2_PERL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nap2-perl}
BUILDLINK_PACKAGES+= ap2-perl
.if !empty(AP2_PERL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ap2-perl+= ap2-perl>=2.0.1
-BUILDLINK_RECOMMENDED.ap2-perl?= ap2-perl>=2.0.1nb2
+BUILDLINK_API_DEPENDS.ap2-perl+= ap2-perl>=2.0.1
+BUILDLINK_ABI_DEPENDS.ap2-perl?= ap2-perl>=2.0.1nb2
BUILDLINK_PKGSRCDIR.ap2-perl?= ../../www/ap2-perl
.endif # AP2_PERL_BUILDLINK3_MK
diff --git a/www/ap2-subversion/Makefile b/www/ap2-subversion/Makefile
index 9a8b90139d9..23c171e8a09 100644
--- a/www/ap2-subversion/Makefile
+++ b/www/ap2-subversion/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/04/05 01:42:00 epg Exp $
+# $NetBSD: Makefile,v 1.24 2006/04/06 06:22:53 reed Exp $
PKGNAME= ap2-subversion-${SVNVER}
COMMENT= WebDAV server (Apache module) for Subversion
@@ -13,7 +13,7 @@ APACHE_MODULE= YES
BUILD_TARGET= apache-mod
INSTALL_TARGET= install-mods-shared
-BUILDLINK_DEPENDS.apache?= apache>=2.0.48
+BUILDLINK_API_DEPENDS.apache?= apache>=2.0.48
post-patch:
${RM} ${WRKSRC}/build-outputs.mk
diff --git a/www/apache/buildlink3.mk b/www/apache/buildlink3.mk
index 1b4fa466fbe..3f9c940b67a 100644
--- a/www/apache/buildlink3.mk
+++ b/www/apache/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/02/05 23:11:18 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2006/04/06 06:22:53 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
APACHE_BUILDLINK3_MK:= ${APACHE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Napache}
BUILDLINK_PACKAGES+= apache
.if !empty(APACHE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.apache+= apache{,6}-1.3.*
-BUILDLINK_RECOMMENDED.apache?= apache>=1.3.34nb5
+BUILDLINK_API_DEPENDS.apache+= apache{,6}-1.3.*
+BUILDLINK_ABI_DEPENDS.apache?= apache>=1.3.34nb5
BUILDLINK_PKGSRCDIR.apache?= ../../www/apache
.if defined(APACHE_MODULE)
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 68f24c07b79..731c27ececd 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.95 2006/02/05 23:11:18 joerg Exp $
+# $NetBSD: Makefile,v 1.96 2006/04/06 06:22:53 reed Exp $
.include "Makefile.common"
@@ -27,7 +27,7 @@ CONFIGURE_ENV+= perlbin=${PERL5:Q}
CONFIGURE_ARGS+= --with-apr=${BUILDLINK_PREFIX.apr}
CONFIGURE_ARGS+= --with-apr-util=${BUILDLINK_PREFIX.apr}
-BUILDLINK_DEPENDS.apr+= apr>=0.9.7.2.0.55
+BUILDLINK_API_DEPENDS.apr+= apr>=0.9.7.2.0.55
.include "../../mk/bsd.prefs.mk"
.include "../../devel/apr/buildlink3.mk"
diff --git a/www/apache2/buildlink3.mk b/www/apache2/buildlink3.mk
index be51e0b9c92..8e14ef1a39e 100644
--- a/www/apache2/buildlink3.mk
+++ b/www/apache2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2006/02/05 23:11:19 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2006/04/06 06:22:53 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
APACHE_BUILDLINK3_MK:= ${APACHE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Napache}
BUILDLINK_PACKAGES+= apache
.if !empty(APACHE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.apache+= apache>=2.0.51
-BUILDLINK_RECOMMENDED.apache+= apache>=2.0.55nb7
+BUILDLINK_API_DEPENDS.apache+= apache>=2.0.51
+BUILDLINK_ABI_DEPENDS.apache+= apache>=2.0.55nb7
BUILDLINK_PKGSRCDIR.apache?= ../../www/apache2
BUILDLINK_DEPMETHOD.apache?= build
. if defined(APACHE_MODULE)
diff --git a/www/cgic/buildlink3.mk b/www/cgic/buildlink3.mk
index 61f8ff6336c..057134c05f1 100644
--- a/www/cgic/buildlink3.mk
+++ b/www/cgic/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2005/12/08 16:09:05 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:53 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
CGIC_BUILDLINK3_MK:= ${CGIC_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncgic}
BUILDLINK_PACKAGES+= cgic
.if !empty(CGIC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.cgic+= cgic>=2.02nb1
+BUILDLINK_API_DEPENDS.cgic+= cgic>=2.02nb1
BUILDLINK_PKGSRCDIR.cgic?= ../../www/cgic
.endif # CGIC_BUILDLINK3_MK
diff --git a/www/cgilib/buildlink3.mk b/www/cgilib/buildlink3.mk
index c53dd712f54..a4e369eee28 100644
--- a/www/cgilib/buildlink3.mk
+++ b/www/cgilib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/10/03 00:18:25 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:53 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
CGILIB_BUILDLINK3_MK:= ${CGILIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncgilib}
BUILDLINK_PACKAGES+= cgilib
.if !empty(CGILIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.cgilib+= cgilib>=0.5nb1
-BUILDLINK_RECOMMENDED.cgilib+= cgilib>=0.5nb2
+BUILDLINK_API_DEPENDS.cgilib+= cgilib>=0.5nb1
+BUILDLINK_ABI_DEPENDS.cgilib+= cgilib>=0.5nb2
BUILDLINK_PKGSRCDIR.cgilib?= ../../www/cgilib
.endif # CGILIB_BUILDLINK3_MK
diff --git a/www/clearsilver/buildlink3.mk b/www/clearsilver/buildlink3.mk
index 04cae626b5b..a4b6542b2ad 100644
--- a/www/clearsilver/buildlink3.mk
+++ b/www/clearsilver/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:11:20 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:53 reed Exp $
BUILDLINK_DEPMETHOD.clearsilver?= build
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nclearsilver-base}
BUILDLINK_PACKAGES+= clearsilver-base
.if !empty(CLEARSILVER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.clearsilver+= clearsilver-base>=0.9.0
-BUILDLINK_RECOMMENDED.clearsilver+= clearsilver>=0.10.1
+BUILDLINK_API_DEPENDS.clearsilver+= clearsilver-base>=0.9.0
+BUILDLINK_ABI_DEPENDS.clearsilver+= clearsilver>=0.10.1
BUILDLINK_PKGSRCDIR.clearsilver?= ../../www/clearsilver-base
.endif
diff --git a/www/curl/buildlink3.mk b/www/curl/buildlink3.mk
index 6acddebe08b..7cd22f7d37a 100644
--- a/www/curl/buildlink3.mk
+++ b/www/curl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/03/21 21:49:47 recht Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/04/06 06:22:53 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
CURL_BUILDLINK3_MK:= ${CURL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncurl}
BUILDLINK_PACKAGES+= curl
.if !empty(CURL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.curl+= curl>=7.12.3
-BUILDLINK_RECOMMENDED.curl+= curl>=7.15.3
+BUILDLINK_API_DEPENDS.curl+= curl>=7.12.3
+BUILDLINK_ABI_DEPENDS.curl+= curl>=7.15.3
BUILDLINK_PKGSRCDIR.curl?= ../../www/curl
.endif # CURL_BUILDLINK3_MK
diff --git a/www/drivel/Makefile b/www/drivel/Makefile
index ceb04871c7b..1ea5a3d240f 100644
--- a/www/drivel/Makefile
+++ b/www/drivel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2006/03/21 06:00:51 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2006/04/06 06:22:53 reed Exp $
#
DISTNAME= drivel-2.0.2
@@ -18,7 +18,7 @@ USE_PKGLOCALEDIR= YES
GCONF2_SCHEMAS= drivel.schemas
-BUILDLINK_DEPENDS.curl+= curl>=7.14.0nb1
+BUILDLINK_API_DEPENDS.curl+= curl>=7.14.0nb1
.include "../../databases/shared-mime-info/mimedb.mk"
.include "../../devel/GConf2/schemas.mk"
diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index 53bc0f1c968..dff1fe34c4a 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/03/06 00:18:26 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2006/04/06 06:22:54 reed Exp $
#
DISTNAME= epiphany-extensions-1.8.1
@@ -36,7 +36,7 @@ CPPFLAGS+= -I${BUILDLINK_PREFIX.mozilla-gtk2}/include/mozilla-gtk2/pref
CPPFLAGS+= -I${BUILDLINK_PREFIX.mozilla-gtk2}/include/mozilla-gtk2/webbrwsr
.endif
-BUILDLINK_DEPENDS.glib2+= glib2>=2.8.0
+BUILDLINK_API_DEPENDS.glib2+= glib2>=2.8.0
.include "../../devel/GConf2/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 0707338b0f4..8d9865c6f1b 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2006/03/30 21:26:06 jmmv Exp $
+# $NetBSD: Makefile,v 1.52 2006/04/06 06:22:53 reed Exp $
#
DISTNAME= epiphany-2.14.0
@@ -29,7 +29,7 @@ PKG_OPTIONS_VAR= PKG_OPTIONS.epiphany
.if !empty(PKG_OPTIONS:Mfirefox)
# Require a version that has the .pc files in it.
-BUILDLINK_DEPENDS.firefox+= firefox>=1.5nb2
+BUILDLINK_API_DEPENDS.firefox+= firefox>=1.5nb2
CPPFLAGS+= -I${BUILDLINK_PREFIX.firefox}/include/firefox/find
CFLAGS+= -I${BUILDLINK_PREFIX.firefox}/include/firefox/find
@@ -49,9 +49,9 @@ CFLAGS+= -I${BUILDLINK_PREFIX.mozilla-gtk2}/include/mozilla-gtk2/pref
GCONF2_SCHEMAS= epiphany.schemas
GCONF2_SCHEMAS+= epiphany-lockdown.schemas
-BUILDLINK_DEPENDS.glib2+= glib2>=2.8.0
-BUILDLINK_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.10.0
-BUILDLINK_DEPENDS.gtk2+= gtk2+>=2.8.3
+BUILDLINK_API_DEPENDS.glib2+= glib2>=2.8.0
+BUILDLINK_API_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.10.0
+BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.8.3
.include "../../devel/GConf2/schemas.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/www/epiphany/buildlink3.mk b/www/epiphany/buildlink3.mk
index a3fbdeebea8..a4cde0d786d 100644
--- a/www/epiphany/buildlink3.mk
+++ b/www/epiphany/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/02/05 23:11:20 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2006/04/06 06:22:53 reed Exp $
#
# This Makefile fragment is included by packages that use epiphany.
#
@@ -14,8 +14,8 @@ BUILDLINK_DEPENDS+= epiphany
.if !empty(EPIPHANY_BUILDLINK3_MK:M+)
BUILDLINK_PACKAGES+= epiphany
-BUILDLINK_DEPENDS.epiphany+= epiphany>=1.8.2
-BUILDLINK_RECOMMENDED.epiphany?= epiphany>=1.8.3nb2
+BUILDLINK_API_DEPENDS.epiphany+= epiphany>=1.8.2
+BUILDLINK_ABI_DEPENDS.epiphany?= epiphany>=1.8.3nb2
BUILDLINK_PKGSRCDIR.epiphany?= ../../www/epiphany
.include "../../mk/bsd.prefs.mk"
diff --git a/www/fcgi/buildlink3.mk b/www/fcgi/buildlink3.mk
index 8e6d0ae869f..9772d028a7a 100644
--- a/www/fcgi/buildlink3.mk
+++ b/www/fcgi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:18:25 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:54 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
FCGI_BUILDLINK3_MK:= ${FCGI_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfcgi}
BUILDLINK_PACKAGES+= fcgi
.if !empty(FCGI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.fcgi+= fcgi>=2.2.2nb1
-BUILDLINK_RECOMMENDED.fcgi+= fcgi>=2.4.0nb1
+BUILDLINK_API_DEPENDS.fcgi+= fcgi>=2.2.2nb1
+BUILDLINK_ABI_DEPENDS.fcgi+= fcgi>=2.4.0nb1
BUILDLINK_PKGSRCDIR.fcgi?= ../../www/fcgi
.endif # FCGI_BUILDLINK3_MK
diff --git a/www/firefox-gtk1/buildlink3.mk b/www/firefox-gtk1/buildlink3.mk
index 2b11c5ceda7..437035ad460 100644
--- a/www/firefox-gtk1/buildlink3.mk
+++ b/www/firefox-gtk1/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/05 23:11:21 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:22:54 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
FIREFOX_GTK2_BUILDLINK3_MK:= ${FIREFOX_GTK2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfirefox-gtk1}
BUILDLINK_PACKAGES+= firefox-gtk1
.if !empty(FIREFOX_GTK2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.firefox-gtk1+= firefox-gtk1>=1.5
-BUILDLINK_RECOMMENDED.firefox-gtk1+= firefox-gtk1>=1.5.0.1nb1
+BUILDLINK_API_DEPENDS.firefox-gtk1+= firefox-gtk1>=1.5
+BUILDLINK_ABI_DEPENDS.firefox-gtk1+= firefox-gtk1>=1.5.0.1nb1
BUILDLINK_PKGSRCDIR.firefox-gtk1?= ../../www/firefox-gtk1
.endif # FIREFOX_GTK2_BUILDLINK3_MK
diff --git a/www/firefox/buildlink3.mk b/www/firefox/buildlink3.mk
index 933ed7ee0d1..626fabcadcd 100644
--- a/www/firefox/buildlink3.mk
+++ b/www/firefox/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/02/06 00:37:54 ghen Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/04/06 06:22:54 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
FIREFOX_BUILDLINK3_MK:= ${FIREFOX_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfirefox}
BUILDLINK_PACKAGES+= firefox
.if !empty(FIREFOX_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.firefox+= firefox>=1.5
-BUILDLINK_RECOMMENDED.firefox+= firefox>=1.5.0.1nb1
+BUILDLINK_API_DEPENDS.firefox+= firefox>=1.5
+BUILDLINK_ABI_DEPENDS.firefox+= firefox>=1.5.0.1nb1
BUILDLINK_PKGSRCDIR.firefox?= ../../www/firefox
.endif # FIREFOX_BUILDLINK3_MK
diff --git a/www/glibwww/buildlink3.mk b/www/glibwww/buildlink3.mk
index 89d77495d5a..332c24cd6ce 100644
--- a/www/glibwww/buildlink3.mk
+++ b/www/glibwww/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:11:24 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:54 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GLIBWWW_BUILDLINK3_MK:= ${GLIBWWW_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nglibwww}
BUILDLINK_PACKAGES+= glibwww
.if !empty(GLIBWWW_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.glibwww?= glibwww>=0.2nb5
-BUILDLINK_RECOMMENDED.glibwww+= glibwww>=0.2nb8
+BUILDLINK_API_DEPENDS.glibwww?= glibwww>=0.2nb5
+BUILDLINK_ABI_DEPENDS.glibwww+= glibwww>=0.2nb8
BUILDLINK_PKGSRCDIR.glibwww?= ../../www/glibwww
.endif # GLIBWWW_BUILDLINK3_MK
diff --git a/www/gtkhtml/buildlink3.mk b/www/gtkhtml/buildlink3.mk
index f9fd43236b7..a0aab53fc67 100644
--- a/www/gtkhtml/buildlink3.mk
+++ b/www/gtkhtml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:11:24 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:55 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GTKHTML_BUILDLINK3_MK:= ${GTKHTML_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtkhtml}
BUILDLINK_PACKAGES+= gtkhtml
.if !empty(GTKHTML_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gtkhtml?= gtkhtml>=1.1.10nb5
-BUILDLINK_RECOMMENDED.gtkhtml?= gtkhtml>=1.1.10nb7
+BUILDLINK_API_DEPENDS.gtkhtml?= gtkhtml>=1.1.10nb5
+BUILDLINK_ABI_DEPENDS.gtkhtml?= gtkhtml>=1.1.10nb7
BUILDLINK_PKGSRCDIR.gtkhtml?= ../../www/gtkhtml
.endif # GTKHTML_BUILDLINK3_MK
diff --git a/www/gtkhtml38/buildlink3.mk b/www/gtkhtml38/buildlink3.mk
index 768cf677642..983bb52dbee 100644
--- a/www/gtkhtml38/buildlink3.mk
+++ b/www/gtkhtml38/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/03/06 00:18:12 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:55 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GTKHTML38_BUILDLINK3_MK:= ${GTKHTML38_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtkhtml38}
BUILDLINK_PACKAGES+= gtkhtml38
.if !empty(GTKHTML38_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gtkhtml38+= gtkhtml38>=3.8.0
-BUILDLINK_RECOMMENDED.gtkhtml38?= gtkhtml38>=3.8.2
+BUILDLINK_API_DEPENDS.gtkhtml38+= gtkhtml38>=3.8.0
+BUILDLINK_ABI_DEPENDS.gtkhtml38?= gtkhtml38>=3.8.2
BUILDLINK_PKGSRCDIR.gtkhtml38?= ../../www/gtkhtml38
.endif # GTKHTML38_BUILDLINK3_MK
diff --git a/www/libghttp/buildlink3.mk b/www/libghttp/buildlink3.mk
index 8adb8caeda9..a24614dab3d 100644
--- a/www/libghttp/buildlink3.mk
+++ b/www/libghttp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:18:26 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:55 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGHTTP_BUILDLINK3_MK:= ${LIBGHTTP_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibghttp}
BUILDLINK_PACKAGES+= libghttp
.if !empty(LIBGHTTP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libghttp+= libghttp>=1.0.9
-BUILDLINK_RECOMMENDED.libghttp+= libghttp>=1.0.9nb1
+BUILDLINK_API_DEPENDS.libghttp+= libghttp>=1.0.9
+BUILDLINK_ABI_DEPENDS.libghttp+= libghttp>=1.0.9nb1
BUILDLINK_PKGSRCDIR.libghttp?= ../../www/libghttp
.endif # LIBGHTTP_BUILDLINK3_MK
diff --git a/www/libgtkhtml/buildlink3.mk b/www/libgtkhtml/buildlink3.mk
index 6b85f077c22..74bcbbc2af4 100644
--- a/www/libgtkhtml/buildlink3.mk
+++ b/www/libgtkhtml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/02/05 23:11:25 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/04/06 06:22:55 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGTKHTML_BUILDLINK3_MK:= ${LIBGTKHTML_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgtkhtml}
BUILDLINK_PACKAGES+= libgtkhtml
.if !empty(LIBGTKHTML_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgtkhtml+= libgtkhtml>=2.6.0
-BUILDLINK_RECOMMENDED.libgtkhtml+= libgtkhtml>=2.6.3nb3
+BUILDLINK_API_DEPENDS.libgtkhtml+= libgtkhtml>=2.6.0
+BUILDLINK_ABI_DEPENDS.libgtkhtml+= libgtkhtml>=2.6.3nb3
BUILDLINK_PKGSRCDIR.libgtkhtml?= ../../www/libgtkhtml
.endif # LIBGTKHTML_BUILDLINK3_MK
diff --git a/www/libwww/buildlink3.mk b/www/libwww/buildlink3.mk
index c4d8eb800e9..fd28f97861c 100644
--- a/www/libwww/buildlink3.mk
+++ b/www/libwww/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:11:25 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:55 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBWWW_BUILDLINK3_MK:= ${LIBWWW_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibwww}
BUILDLINK_PACKAGES+= libwww
.if !empty(LIBWWW_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libwww+= libwww>=5.3.2nb2
-BUILDLINK_RECOMMENDED.libwww+= libwww>=5.4.0nb5
+BUILDLINK_API_DEPENDS.libwww+= libwww>=5.3.2nb2
+BUILDLINK_ABI_DEPENDS.libwww+= libwww>=5.4.0nb5
BUILDLINK_PKGSRCDIR.libwww?= ../../www/libwww
.endif # LIBWWW_BUILDLINK3_MK
diff --git a/www/mozilla-gtk2/buildlink3.mk b/www/mozilla-gtk2/buildlink3.mk
index 67caea8800e..a608996a5dd 100644
--- a/www/mozilla-gtk2/buildlink3.mk
+++ b/www/mozilla-gtk2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/02/06 00:25:06 ghen Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2006/04/06 06:22:55 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
MOZILLA_GTK2_BUILDLINK3_MK:= ${MOZILLA_GTK2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmozilla-gtk2}
BUILDLINK_PACKAGES+= mozilla-gtk2
.if !empty(MOZILLA_GTK2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.mozilla-gtk2+= mozilla-gtk2>=1.7.5
-BUILDLINK_RECOMMENDED.mozilla-gtk2+= mozilla-gtk2>=1.7.12nb3
+BUILDLINK_API_DEPENDS.mozilla-gtk2+= mozilla-gtk2>=1.7.5
+BUILDLINK_ABI_DEPENDS.mozilla-gtk2+= mozilla-gtk2>=1.7.12nb3
BUILDLINK_PKGSRCDIR.mozilla-gtk2?= ../../www/mozilla-gtk2
.endif # MOZILLA_GTK2_BUILDLINK3_MK
diff --git a/www/mozilla/buildlink3.mk b/www/mozilla/buildlink3.mk
index cdeb556d700..fe691acd49b 100644
--- a/www/mozilla/buildlink3.mk
+++ b/www/mozilla/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2006/02/06 00:25:06 ghen Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2006/04/06 06:22:55 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
MOZILLA_BUILDLINK3_MK:= ${MOZILLA_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmozilla}
BUILDLINK_PACKAGES+= mozilla
.if !empty(MOZILLA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.mozilla+= mozilla>=1.7.5
-BUILDLINK_RECOMMENDED.mozilla+= mozilla>=1.7.12nb3
+BUILDLINK_API_DEPENDS.mozilla+= mozilla>=1.7.5
+BUILDLINK_ABI_DEPENDS.mozilla+= mozilla>=1.7.12nb3
BUILDLINK_PKGSRCDIR.mozilla?= ../../www/mozilla
.endif # MOZILLA_BUILDLINK3_MK
diff --git a/www/mozilla/gecko-depends.mk b/www/mozilla/gecko-depends.mk
index cc2ac9b4a0f..42b451814df 100644
--- a/www/mozilla/gecko-depends.mk
+++ b/www/mozilla/gecko-depends.mk
@@ -1,8 +1,8 @@
-# $NetBSD: gecko-depends.mk,v 1.2 2005/09/28 12:04:29 rillig Exp $
+# $NetBSD: gecko-depends.mk,v 1.3 2006/04/06 06:22:55 reed Exp $
.if !empty(PKG_OPTIONS:Mfirefox)
# firefox didn't have a pkgconfig file before 1.0.4
-BUILDLINK_DEPENDS.firefox+= firefox>=1.0.4
+BUILDLINK_API_DEPENDS.firefox+= firefox>=1.0.4
.include "../../www/firefox/buildlink3.mk"
.else
.include "../../www/mozilla-gtk2/buildlink3.mk"
diff --git a/www/neon/buildlink3.mk b/www/neon/buildlink3.mk
index 8d095f6417b..7b0bfbd6c26 100644
--- a/www/neon/buildlink3.mk
+++ b/www/neon/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:11:26 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:55 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
NEON_BUILDLINK3_MK:= ${NEON_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nneon}
BUILDLINK_PACKAGES+= neon
.if !empty(NEON_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.neon+= neon>=0.24.4
-BUILDLINK_RECOMMENDED.neon+= neon>=0.25.5nb2
+BUILDLINK_API_DEPENDS.neon+= neon>=0.24.4
+BUILDLINK_ABI_DEPENDS.neon+= neon>=0.25.5nb2
BUILDLINK_PKGSRCDIR.neon?= ../../www/neon
.endif # NEON_BUILDLINK3_MK
diff --git a/www/p5-libapreq2/Makefile b/www/p5-libapreq2/Makefile
index 924e8d15764..550e19a4784 100644
--- a/www/p5-libapreq2/Makefile
+++ b/www/p5-libapreq2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/03/04 21:31:03 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2006/04/06 06:22:55 reed Exp $
DISTNAME= libapreq2-2.07
PKGNAME= p5-libapreq2-2.07
@@ -12,8 +12,8 @@ COMMENT= Lots of Apache specific httpd handling modules
DEPENDS+= p5-ExtUtils-XSBuilder>=0.23:../../devel/p5-ExtUtils-XSBuilder
-BUILDLINK_DEPENDS.apache+= apache>=2.0.48
-BUILDLINK_DEPENDS.ap2-perl+= ap2-perl>=2.0.1
+BUILDLINK_API_DEPENDS.apache+= apache>=2.0.48
+BUILDLINK_API_DEPENDS.ap2-perl+= ap2-perl>=2.0.1
USE_TOOLS+= gmake
USE_LIBTOOL= YES
diff --git a/www/php4/buildlink3.mk b/www/php4/buildlink3.mk
index ac364f2025b..47d3f0f0b9e 100644
--- a/www/php4/buildlink3.mk
+++ b/www/php4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:11:28 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:22:55 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PHP_BUILDLINK3_MK:= ${PHP_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nphp}
BUILDLINK_PACKAGES+= php
.if !empty(PHP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.php+= php-4.4.*
-BUILDLINK_RECOMMENDED.php+= php>=4.4.1nb3
+BUILDLINK_API_DEPENDS.php+= php-4.4.*
+BUILDLINK_ABI_DEPENDS.php+= php>=4.4.1nb3
BUILDLINK_PKGSRCDIR.php?= ../../www/php4
.endif # PHP_BUILDLINK3_MK
diff --git a/www/py-curl/Makefile b/www/py-curl/Makefile
index 654cfaaedf4..4eabb3d0581 100644
--- a/www/py-curl/Makefile
+++ b/www/py-curl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2006/02/05 23:11:28 joerg Exp $
+# $NetBSD: Makefile,v 1.27 2006/04/06 06:22:55 reed Exp $
DISTNAME= pycurl-7.13.2
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -15,7 +15,7 @@ PYBINMODULE= # defined
PYTHON_VERSIONS_ACCEPTED= 23 22
PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
-BUILDLINK_DEPENDS.curl+= curl>=7.12.1
+BUILDLINK_API_DEPENDS.curl+= curl>=7.12.1
.include "../../www/curl/buildlink3.mk"
.include "../../lang/python/extension.mk"
diff --git a/www/sope/buildlink3.mk b/www/sope/buildlink3.mk
index 23b7699f9c7..ea188a62178 100644
--- a/www/sope/buildlink3.mk
+++ b/www/sope/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:11:28 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:56 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SOPE_BUILDLINK3_MK:= ${SOPE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsope}
BUILDLINK_PACKAGES+= sope
.if !empty(SOPE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.sope+= sope>=4.5.4nb2
-BUILDLINK_RECOMMENDED.sope?= sope>=4.5.4nb3
+BUILDLINK_API_DEPENDS.sope+= sope>=4.5.4nb2
+BUILDLINK_ABI_DEPENDS.sope?= sope>=4.5.4nb3
BUILDLINK_PKGSRCDIR.sope?= ../../www/sope
.endif # SOPE_BUILDLINK3_MK
diff --git a/www/tidy/buildlink3.mk b/www/tidy/buildlink3.mk
index e7d62dea8c4..eaed912005e 100644
--- a/www/tidy/buildlink3.mk
+++ b/www/tidy/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:11:29 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:56 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
TIDY_BUILDLINK3_MK:= ${TIDY_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntidy}
BUILDLINK_PACKAGES+= tidy
.if !empty(TIDY_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tidy+= tidy>=20031002
-BUILDLINK_RECOMMENDED.tidy?= tidy>=20050921nb1
+BUILDLINK_API_DEPENDS.tidy+= tidy>=20031002
+BUILDLINK_ABI_DEPENDS.tidy?= tidy>=20050921nb1
BUILDLINK_PKGSRCDIR.tidy?= ../../www/tidy
.endif # TIDY_BUILDLINK3_MK
diff --git a/www/zope25-CMFPlone/Makefile b/www/zope25-CMFPlone/Makefile
index 1aaea8cbc3f..dd5d5a0915c 100644
--- a/www/zope25-CMFPlone/Makefile
+++ b/www/zope25-CMFPlone/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/03/04 21:31:04 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2006/04/06 06:22:56 reed Exp $
DISTNAME= CMFPlone1.0.3
PKGNAME= zope25-CMFPlone-1.0.3
@@ -9,7 +9,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.plone.org/
COMMENT= Content Management System
-BUILDLINK_DEPENDS.zope+= zope-2.6.*
+BUILDLINK_API_DEPENDS.zope+= zope-2.6.*
DEPENDS+= zope25-CMF-[0-9]*:../../www/zope25-CMF
DEPENDS+= zope25-Formulator-[0-9]*:../../www/zope25-Formulator
diff --git a/www/zope25-EasyImage/Makefile b/www/zope25-EasyImage/Makefile
index 71b6aba64de..25eab372a55 100644
--- a/www/zope25-EasyImage/Makefile
+++ b/www/zope25-EasyImage/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:31:05 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2006/04/06 06:22:56 reed Exp $
DISTNAME= EasyImage15
PKGREVISION= 3
@@ -7,7 +7,7 @@ CATEGORIES= www
MASTER_SITES= http://www.zope.org/Members/regebro/easyimage/
EXTRACT_SUFX= .zip
-BUILDLINK_DEPENDS.pyimaging+= ${PYPKGPREFIX}-imaging>=1.1.3
+BUILDLINK_API_DEPENDS.pyimaging+= ${PYPKGPREFIX}-imaging>=1.1.3
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.zope.org/Members/regebro/easyimage
diff --git a/www/zope25-JPicture/Makefile b/www/zope25-JPicture/Makefile
index a75dd3ad31d..bcd15998c45 100644
--- a/www/zope25-JPicture/Makefile
+++ b/www/zope25-JPicture/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:31:05 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2006/04/06 06:22:56 reed Exp $
DISTNAME= JPicture-2_0
PKGREVISION= 3
@@ -7,7 +7,7 @@ CATEGORIES= www
MASTER_SITES= http://www.dataflake.org/software/jpicture/
EXTRACT_SUFX= .tgz
-BUILDLINK_DEPENDS.pyimaging+= ${PYPKGPREFIX}-imaging>=1.1.3
+BUILDLINK_API_DEPENDS.pyimaging+= ${PYPKGPREFIX}-imaging>=1.1.3
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.dataflake.org/software/jpicture/
diff --git a/www/zope25-PropertyFolder/Makefile b/www/zope25-PropertyFolder/Makefile
index 73c644aa9dc..424d514dce0 100644
--- a/www/zope25-PropertyFolder/Makefile
+++ b/www/zope25-PropertyFolder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/03/04 21:31:05 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2006/04/06 06:22:56 reed Exp $
DISTNAME= PropertyFolder-1.3.3
PKGNAME= zope25-PropertyFolder-1.3.3
@@ -9,7 +9,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.zope.org/Members/mjablonski/PropertyFolder
COMMENT= The folderish friend of the PropertyObject
-BUILDLINK_DEPENDS.zope+= zope>=2.6.1
+BUILDLINK_API_DEPENDS.zope+= zope>=2.6.1
.include "../../www/zope25/product.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/zope25-ZPhotoSlides/Makefile b/www/zope25-ZPhotoSlides/Makefile
index 30fdc144623..21532c7de2e 100644
--- a/www/zope25-ZPhotoSlides/Makefile
+++ b/www/zope25-ZPhotoSlides/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/03/04 21:31:06 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2006/04/06 06:22:56 reed Exp $
DISTNAME= ZPhotoSlides-1.1b
PKGNAME= zope25-ZPhotoSlides-1.1b
@@ -7,7 +7,7 @@ CATEGORIES= www
MASTER_SITES= http://www.zope.org/Members/p3b/ZPhotoSlides/
DEPENDS+= zope25-LocalFS-[0-9]*:../../www/zope25-LocalFS
-BUILDLINK_DEPENDS.pyimaging+= ${PYPKGPREFIX}-imaging>=1.1.3
+BUILDLINK_API_DEPENDS.pyimaging+= ${PYPKGPREFIX}-imaging>=1.1.3
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.zope.org/Members/p3b/ZPhotoSlides
diff --git a/www/zope25/product.mk b/www/zope25/product.mk
index a0784c20b6f..788c38b0509 100644
--- a/www/zope25/product.mk
+++ b/www/zope25/product.mk
@@ -1,8 +1,8 @@
-# $NetBSD: product.mk,v 1.9 2006/03/12 17:35:05 rillig Exp $
+# $NetBSD: product.mk,v 1.10 2006/04/06 06:22:56 reed Exp $
DIST_SUBDIR= zope
-BUILDLINK_DEPENDS.zope?= zope-2.*
-DEPENDS+= ${BUILDLINK_DEPENDS.zope}:../../www/zope25
+BUILDLINK_API_DEPENDS.zope?= zope-2.*
+DEPENDS+= ${BUILDLINK_API_DEPENDS.zope}:../../www/zope25
EVAL_PREFIX+= BUILDLINK_PREFIX.zope=zope25
BUILDLINK_PREFIX.zope_DEFAULT= ${LOCALBASE}
WRKSRC?= ${WRKDIR}
diff --git a/x11/XFree86-libs/buildlink3.mk b/x11/XFree86-libs/buildlink3.mk
index 53fcde033f6..cbda07d5303 100644
--- a/x11/XFree86-libs/buildlink3.mk
+++ b/x11/XFree86-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/23 23:17:30 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:22:56 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFREE86_LIBS_BUILDLINK3_MK:= ${XFREE86_LIBS_BUILDLINK3_MK}+
@@ -18,8 +18,8 @@ BUILDLINK_PACKAGES:= XFree86-libs ${BUILDLINK_PACKAGES}
.if !empty(XFREE86_LIBS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.XFree86-libs+= XFree86-libs>=4.4.0
-BUILDLINK_RECOMMENDED.XFree86-libs+= XFree86-libs>=4.4.0nb7
+BUILDLINK_API_DEPENDS.XFree86-libs+= XFree86-libs>=4.4.0
+BUILDLINK_ABI_DEPENDS.XFree86-libs+= XFree86-libs>=4.4.0nb7
BUILDLINK_PKGSRCDIR.XFree86-libs?= ../../x11/XFree86-libs
BUILDLINK_LIBDIRS.XFree86-libs?= ${X11ROOT_PREFIX}/lib
BUILDLINK_TRANSFORM.XFree86-libs+= -e "s|/${X11ROOT_PREFIX}/|/|"
diff --git a/x11/XFree86-libs/builtin.mk b/x11/XFree86-libs/builtin.mk
index 5e0007c2f4e..ab078e059b3 100644
--- a/x11/XFree86-libs/builtin.mk
+++ b/x11/XFree86-libs/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.3 2006/03/30 18:06:18 jlam Exp $
+# $NetBSD: builtin.mk,v 1.4 2006/04/06 06:22:56 reed Exp $
BUILTIN_PKG:= XFree86-libs
@@ -43,7 +43,7 @@ USE_BUILTIN.XFree86-libs= ${IS_BUILTIN.XFree86-libs}
. if defined(BUILTIN_PKG.XFree86-libs) && \
!empty(IS_BUILTIN.XFree86-libs:M[yY][eE][sS])
USE_BUILTIN.XFree86-libs= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.XFree86-libs}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.XFree86-libs}
. if !empty(USE_BUILTIN.XFree86-libs:M[yY][eE][sS])
USE_BUILTIN.XFree86-libs!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.XFree86-libs:Q}; then \
diff --git a/x11/Xaw-Xpm/buildlink3.mk b/x11/Xaw-Xpm/buildlink3.mk
index caa6ec2cd65..4c0db3d55ea 100644
--- a/x11/Xaw-Xpm/buildlink3.mk
+++ b/x11/Xaw-Xpm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:11:31 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:56 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XAW_XPM_BUILDLINK3_MK:= ${XAW_XPM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NXaw-Xpm}
BUILDLINK_PACKAGES+= Xaw-Xpm
.if !empty(XAW_XPM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.Xaw-Xpm+= Xaw-Xpm>=1.1
-BUILDLINK_RECOMMENDED.Xaw-Xpm?= Xaw-Xpm>=1.1nb2
+BUILDLINK_API_DEPENDS.Xaw-Xpm+= Xaw-Xpm>=1.1
+BUILDLINK_ABI_DEPENDS.Xaw-Xpm?= Xaw-Xpm>=1.1nb2
BUILDLINK_PKGSRCDIR.Xaw-Xpm?= ../../x11/Xaw-Xpm
.endif # XAW_XPM_BUILDLINK3_MK
diff --git a/x11/Xaw3d/buildlink3.mk b/x11/Xaw3d/buildlink3.mk
index 721eb18d1f9..f82a0b27afa 100644
--- a/x11/Xaw3d/buildlink3.mk
+++ b/x11/Xaw3d/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:11:31 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:56 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XAW3D_BUILDLINK3_MK:= ${XAW3D_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NXaw3d}
BUILDLINK_PACKAGES+= Xaw3d
.if !empty(XAW3D_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.Xaw3d+= Xaw3d>=1.5
-BUILDLINK_RECOMMENDED.Xaw3d?= Xaw3d>=1.5Enb1
+BUILDLINK_API_DEPENDS.Xaw3d+= Xaw3d>=1.5
+BUILDLINK_ABI_DEPENDS.Xaw3d?= Xaw3d>=1.5Enb1
BUILDLINK_PKGSRCDIR.Xaw3d?= ../../x11/Xaw3d
.endif # XAW3D_BUILDLINK3_MK
diff --git a/x11/Xbae/buildlink3.mk b/x11/Xbae/buildlink3.mk
index 9e3c564d690..8763e24c35a 100644
--- a/x11/Xbae/buildlink3.mk
+++ b/x11/Xbae/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:11:31 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:56 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XBAE_BUILDLINK3_MK:= ${XBAE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NXbae}
BUILDLINK_PACKAGES+= Xbae
.if !empty(XBAE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.Xbae+= Xbae>=4.8.4
-BUILDLINK_RECOMMENDED.Xbae+= Xbae>=4.51.01nb2
+BUILDLINK_API_DEPENDS.Xbae+= Xbae>=4.8.4
+BUILDLINK_ABI_DEPENDS.Xbae+= Xbae>=4.51.01nb2
BUILDLINK_PKGSRCDIR.Xbae?= ../../x11/Xbae
.endif # XBAE_BUILDLINK3_MK
diff --git a/x11/Xcomposite/buildlink3.mk b/x11/Xcomposite/buildlink3.mk
index c7423a5371f..a82889bb677 100644
--- a/x11/Xcomposite/buildlink3.mk
+++ b/x11/Xcomposite/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:11:31 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:56 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XCOMPOSITE_BUILDLINK3_MK:= ${XCOMPOSITE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NXcomposite}
BUILDLINK_PACKAGES+= Xcomposite
.if !empty(XCOMPOSITE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.Xcomposite+= Xcomposite>=1.0.1
-BUILDLINK_RECOMMENDED.Xcomposite?= Xcomposite>=1.0.1nb2
+BUILDLINK_API_DEPENDS.Xcomposite+= Xcomposite>=1.0.1
+BUILDLINK_ABI_DEPENDS.Xcomposite?= Xcomposite>=1.0.1nb2
BUILDLINK_PKGSRCDIR.Xcomposite?= ../../x11/Xcomposite
.endif # XCOMPOSITE_BUILDLINK3_MK
diff --git a/x11/Xcomposite/builtin.mk b/x11/Xcomposite/builtin.mk
index 52d643625b3..8a35aac5247 100644
--- a/x11/Xcomposite/builtin.mk
+++ b/x11/Xcomposite/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.10 2006/03/30 18:06:19 jlam Exp $
+# $NetBSD: builtin.mk,v 1.11 2006/04/06 06:22:56 reed Exp $
BUILTIN_PKG:= Xcomposite
@@ -34,7 +34,7 @@ USE_BUILTIN.Xcomposite= ${IS_BUILTIN.Xcomposite}
. if defined(BUILTIN_PKG.Xcomposite) && \
!empty(IS_BUILTIN.Xcomposite:M[yY][eE][sS])
USE_BUILTIN.Xcomposite= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.Xcomposite}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.Xcomposite}
. if !empty(USE_BUILTIN.Xcomposite:M[yY][eE][sS])
USE_BUILTIN.Xcomposite!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.Xcomposite:Q}; then \
diff --git a/x11/Xfixes/buildlink3.mk b/x11/Xfixes/buildlink3.mk
index 55e56327c63..e3b8789c7b3 100644
--- a/x11/Xfixes/buildlink3.mk
+++ b/x11/Xfixes/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:11:31 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:56 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFIXES_BUILDLINK3_MK:= ${XFIXES_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NXfixes}
BUILDLINK_PACKAGES+= Xfixes
.if !empty(XFIXES_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.Xfixes+= Xfixes>=2.0.0
-BUILDLINK_RECOMMENDED.Xfixes+= Xfixes>=2.0.1nb2
+BUILDLINK_API_DEPENDS.Xfixes+= Xfixes>=2.0.0
+BUILDLINK_ABI_DEPENDS.Xfixes+= Xfixes>=2.0.1nb2
BUILDLINK_PKGSRCDIR.Xfixes?= ../../x11/Xfixes
.endif # XFIXES_BUILDLINK3_MK
diff --git a/x11/Xfixes/builtin.mk b/x11/Xfixes/builtin.mk
index f5696f18a59..506d4a6b937 100644
--- a/x11/Xfixes/builtin.mk
+++ b/x11/Xfixes/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.9 2006/03/30 18:06:19 jlam Exp $
+# $NetBSD: builtin.mk,v 1.10 2006/04/06 06:22:56 reed Exp $
BUILTIN_PKG:= Xfixes
@@ -33,7 +33,7 @@ USE_BUILTIN.Xfixes= ${IS_BUILTIN.Xfixes}
. if defined(BUILTIN_PKG.Xfixes) && \
!empty(IS_BUILTIN.Xfixes:M[yY][eE][sS])
USE_BUILTIN.Xfixes= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.Xfixes}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.Xfixes}
. if !empty(USE_BUILTIN.Xfixes:M[yY][eE][sS])
USE_BUILTIN.Xfixes!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.Xfixes:Q}; then \
diff --git a/x11/XmHTML/buildlink3.mk b/x11/XmHTML/buildlink3.mk
index f8e7bc66577..5ea19b87097 100644
--- a/x11/XmHTML/buildlink3.mk
+++ b/x11/XmHTML/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:11:31 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:56 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XMHTML_BUILDLINK3_MK:= ${XMHTML_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NXmHTML}
BUILDLINK_PACKAGES+= XmHTML
.if !empty(XMHTML_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.XmHTML+= XmHTML>=1.1.7nb2
-BUILDLINK_RECOMMENDED.XmHTML+= XmHTML>=1.1.7nb5
+BUILDLINK_API_DEPENDS.XmHTML+= XmHTML>=1.1.7nb2
+BUILDLINK_ABI_DEPENDS.XmHTML+= XmHTML>=1.1.7nb5
BUILDLINK_PKGSRCDIR.XmHTML?= ../../x11/XmHTML
.endif # XMHTML_BUILDLINK3_MK
diff --git a/x11/Xrandr-mixedcase/Makefile b/x11/Xrandr-mixedcase/Makefile
index 630d2b354b7..85dc627405a 100644
--- a/x11/Xrandr-mixedcase/Makefile
+++ b/x11/Xrandr-mixedcase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/03/04 21:31:07 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2006/04/06 06:22:56 reed Exp $
#
DISTNAME= libXrandr-1.0.2
@@ -20,8 +20,8 @@ GNU_CONFIGURE= yes
PKGCONFIG_OVERRIDE+= xrandr.pc.in
-BUILDLINK_DEPENDS.Xrender+= Xrender>=0.8
-BUILDLINK_DEPENDS.randrext+= randrext>=1.0
+BUILDLINK_API_DEPENDS.Xrender+= Xrender>=0.8
+BUILDLINK_API_DEPENDS.randrext+= randrext>=1.0
.include "../../x11/Xrender/buildlink3.mk"
.include "../../x11/randrext/buildlink3.mk"
diff --git a/x11/Xrandr-mixedcase/buildlink3.mk b/x11/Xrandr-mixedcase/buildlink3.mk
index 84161b91edb..3f674cf1b16 100644
--- a/x11/Xrandr-mixedcase/buildlink3.mk
+++ b/x11/Xrandr-mixedcase/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2006/02/05 23:11:31 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2006/04/06 06:22:56 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XRANDR_BUILDLINK3_MK:= ${XRANDR_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NXrandr}
BUILDLINK_PACKAGES+= Xrandr
.if !empty(XRANDR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.Xrandr+= Xrandr>=0.99
-BUILDLINK_RECOMMENDED.Xrandr+= Xrandr>=1.0.2nb3
+BUILDLINK_API_DEPENDS.Xrandr+= Xrandr>=0.99
+BUILDLINK_ABI_DEPENDS.Xrandr+= Xrandr>=1.0.2nb3
BUILDLINK_PKGSRCDIR.Xrandr?= ../../x11/Xrandr
.endif # XRANDR_BUILDLINK3_MK
diff --git a/x11/Xrandr-mixedcase/builtin.mk b/x11/Xrandr-mixedcase/builtin.mk
index c62345d1bc2..ddb1082587d 100644
--- a/x11/Xrandr-mixedcase/builtin.mk
+++ b/x11/Xrandr-mixedcase/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.14 2006/03/30 18:06:19 jlam Exp $
+# $NetBSD: builtin.mk,v 1.15 2006/04/06 06:22:56 reed Exp $
BUILTIN_PKG:= Xrandr
@@ -77,7 +77,7 @@ USE_BUILTIN.Xrandr= ${IS_BUILTIN.Xrandr}
. if defined(BUILTIN_PKG.Xrandr) && \
!empty(IS_BUILTIN.Xrandr:M[yY][eE][sS])
USE_BUILTIN.Xrandr= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.Xrandr}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.Xrandr}
. if !empty(USE_BUILTIN.Xrandr:M[yY][eE][sS])
USE_BUILTIN.Xrandr!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.Xrandr:Q}; then \
@@ -100,8 +100,8 @@ CHECK_BUILTIN.Xrandr?= no
.if !empty(CHECK_BUILTIN.Xrandr:M[nN][oO])
. if !empty(USE_BUILTIN.Xrandr:M[nN][oO])
-BUILDLINK_DEPENDS.Xrandr+= Xrandr>=1.0.1
-BUILDLINK_DEPENDS.Xrender+= Xrender>=0.8
+BUILDLINK_API_DEPENDS.Xrandr+= Xrandr>=1.0.1
+BUILDLINK_API_DEPENDS.Xrender+= Xrender>=0.8
. endif
. if !empty(USE_BUILTIN.Xrandr:M[yY][eE][sS])
diff --git a/x11/Xrender/buildlink3.mk b/x11/Xrender/buildlink3.mk
index affc1678e9d..eb6c66a5c64 100644
--- a/x11/Xrender/buildlink3.mk
+++ b/x11/Xrender/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.36 2006/02/05 23:11:31 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.37 2006/04/06 06:22:57 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XRENDER_BUILDLINK3_MK:= ${XRENDER_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NXrender}
BUILDLINK_PACKAGES+= Xrender
.if !empty(XRENDER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.Xrender+= Xrender>=0.2
-BUILDLINK_RECOMMENDED.Xrender+= Xrender>=0.9.0nb1
+BUILDLINK_API_DEPENDS.Xrender+= Xrender>=0.2
+BUILDLINK_ABI_DEPENDS.Xrender+= Xrender>=0.9.0nb1
BUILDLINK_PKGSRCDIR.Xrender?= ../../x11/Xrender
.endif # XRENDER_BUILDLINK3_MK
diff --git a/x11/Xrender/builtin.mk b/x11/Xrender/builtin.mk
index cccc7ec9213..b596f5eb625 100644
--- a/x11/Xrender/builtin.mk
+++ b/x11/Xrender/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.16 2006/03/30 18:06:19 jlam Exp $
+# $NetBSD: builtin.mk,v 1.17 2006/04/06 06:22:57 reed Exp $
BUILTIN_PKG:= Xrender
@@ -77,7 +77,7 @@ USE_BUILTIN.Xrender= ${IS_BUILTIN.Xrender}
. if defined(BUILTIN_PKG.Xrender) && \
!empty(IS_BUILTIN.Xrender:M[yY][eE][sS])
USE_BUILTIN.Xrender= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.Xrender}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.Xrender}
. if !empty(USE_BUILTIN.Xrender:M[yY][eE][sS])
USE_BUILTIN.Xrender!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.Xrender:Q}; then \
@@ -100,8 +100,8 @@ CHECK_BUILTIN.Xrender?= no
.if !empty(CHECK_BUILTIN.Xrender:M[nN][oO])
. if !empty(USE_BUILTIN.Xrender:M[nN][oO])
-BUILDLINK_DEPENDS.Xrender+= Xrender>=0.8.2
-BUILDLINK_DEPENDS.render+= Xrender>=0.8
+BUILDLINK_API_DEPENDS.Xrender+= Xrender>=0.8.2
+BUILDLINK_API_DEPENDS.render+= Xrender>=0.8
. endif
. if !empty(USE_BUILTIN.Xrender:M[yY][eE][sS])
diff --git a/x11/blt/buildlink3.mk b/x11/blt/buildlink3.mk
index 886f7f25e1c..6a4018a508d 100644
--- a/x11/blt/buildlink3.mk
+++ b/x11/blt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:11:31 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:57 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
BLT_BUILDLINK3_MK:= ${BLT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nblt}
BUILDLINK_PACKAGES+= blt
.if !empty(BLT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.blt+= blt>=2.4z
-BUILDLINK_RECOMMENDED.blt?= blt>=2.4znb2
+BUILDLINK_API_DEPENDS.blt+= blt>=2.4z
+BUILDLINK_ABI_DEPENDS.blt?= blt>=2.4znb2
BUILDLINK_PKGSRCDIR.blt?= ../../x11/blt
.endif # BLT_BUILDLINK3_MK
diff --git a/x11/compositeext/buildlink3.mk b/x11/compositeext/buildlink3.mk
index 531e6a352e4..e31d93c16f7 100644
--- a/x11/compositeext/buildlink3.mk
+++ b/x11/compositeext/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:11:31 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:57 reed Exp $
#
# This Makefile fragment is included by packages that use compositeext.
#
@@ -12,8 +12,8 @@ BUILDLINK_DEPENDS+= compositeext
.if !empty(COMPOSITEEXT_BUILDLINK3_MK:M+)
BUILDLINK_PACKAGES+= compositeext
-BUILDLINK_DEPENDS.compositeext?= compositeext>=2.0
-BUILDLINK_RECOMMENDED.compositeext?= compositeext>=2.0nb1
+BUILDLINK_API_DEPENDS.compositeext?= compositeext>=2.0
+BUILDLINK_ABI_DEPENDS.compositeext?= compositeext>=2.0nb1
BUILDLINK_PKGSRCDIR.compositeext?= ../../x11/compositeext
.include "../../x11/fixesext/buildlink3.mk"
diff --git a/x11/compositeext/builtin.mk b/x11/compositeext/builtin.mk
index 2d536a2d9ce..9433d3f9198 100644
--- a/x11/compositeext/builtin.mk
+++ b/x11/compositeext/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.6 2006/03/30 18:06:19 jlam Exp $
+# $NetBSD: builtin.mk,v 1.7 2006/04/06 06:22:57 reed Exp $
BUILTIN_PKG:= compositeext
@@ -40,7 +40,7 @@ USE_BUILTIN.compositeext= ${IS_BUILTIN.compositeext}
. if defined(BUILTIN_PKG.compositeext) && \
!empty(IS_BUILTIN.compositeext:M[yY][eE][sS])
USE_BUILTIN.compositeext= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.compositeext}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.compositeext}
. if !empty(USE_BUILTIN.compositeext:M[yY][eE][sS])
USE_BUILTIN.compositeext!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.compositeext:Q}; then \
diff --git a/x11/control-center/buildlink3.mk b/x11/control-center/buildlink3.mk
index 33208581e8e..502070f6f48 100644
--- a/x11/control-center/buildlink3.mk
+++ b/x11/control-center/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:11:32 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:57 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
CONTROL_CENTER_BUILDLINK3_MK:= ${CONTROL_CENTER_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncontrol-center}
BUILDLINK_PACKAGES+= control-center
.if !empty(CONTROL_CENTER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.control-center+= control-center>=1.4.0.4nb9
-BUILDLINK_RECOMMENDED.control-center+= control-center>=1.4.0.5nb2
+BUILDLINK_API_DEPENDS.control-center+= control-center>=1.4.0.4nb9
+BUILDLINK_ABI_DEPENDS.control-center+= control-center>=1.4.0.5nb2
BUILDLINK_PKGSRCDIR.control-center?= ../../x11/control-center
.endif # CONTROL_CENTER_BUILDLINK3_MK
diff --git a/x11/devilspie/Makefile b/x11/devilspie/Makefile
index b9560a6288b..4e4ecf62cda 100644
--- a/x11/devilspie/Makefile
+++ b/x11/devilspie/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/03/12 18:23:09 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2006/04/06 06:22:57 reed Exp $
DISTNAME= devilspie-0.17.1
CATEGORIES= x11
@@ -19,7 +19,7 @@ post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/devilspie
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/devilspie/
-BUILDLINK_DEPENDS.glib2+= glib2>=2.9.1
+BUILDLINK_API_DEPENDS.glib2+= glib2>=2.9.1
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
diff --git a/x11/efltk/buildlink3.mk b/x11/efltk/buildlink3.mk
index 6e48d91a2eb..0fc8c982d0b 100644
--- a/x11/efltk/buildlink3.mk
+++ b/x11/efltk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:11:32 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:57 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
EFLTK_BUILDLINK3_MK:= ${EFLTK_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nefltk}
BUILDLINK_PACKAGES+= efltk
.if !empty(EFLTK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.efltk+= efltk>=2.0.5nb1
-BUILDLINK_RECOMMENDED.efltk?= efltk>=2.0.5nb4
+BUILDLINK_API_DEPENDS.efltk+= efltk>=2.0.5nb1
+BUILDLINK_ABI_DEPENDS.efltk?= efltk>=2.0.5nb4
BUILDLINK_PKGSRCDIR.efltk?= ../../x11/efltk
.endif # EFLTK_BUILDLINK3_MK
diff --git a/x11/fixesext/buildlink3.mk b/x11/fixesext/buildlink3.mk
index 83237742727..9939f2010e1 100644
--- a/x11/fixesext/buildlink3.mk
+++ b/x11/fixesext/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:11:32 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:57 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
FIXESEXT_BUILDLINK3_MK:= ${FIXESEXT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfixesext}
BUILDLINK_PACKAGES+= fixesext
.if !empty(FIXESEXT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.fixesext+= fixesext>=2.0
-BUILDLINK_RECOMMENDED.fixesext?= fixesext>=2.0.1nb1
+BUILDLINK_API_DEPENDS.fixesext+= fixesext>=2.0
+BUILDLINK_ABI_DEPENDS.fixesext?= fixesext>=2.0.1nb1
BUILDLINK_PKGSRCDIR.fixesext?= ../../x11/fixesext
.endif # FIXESEXT_BUILDLINK3_MK
diff --git a/x11/fixesext/builtin.mk b/x11/fixesext/builtin.mk
index 56586af3ee9..2b38671405d 100644
--- a/x11/fixesext/builtin.mk
+++ b/x11/fixesext/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.5 2006/03/30 18:06:19 jlam Exp $
+# $NetBSD: builtin.mk,v 1.6 2006/04/06 06:22:57 reed Exp $
BUILTIN_PKG:= fixesext
@@ -40,7 +40,7 @@ USE_BUILTIN.fixesext= ${IS_BUILTIN.fixesext}
. if defined(BUILTIN_PKG.fixesext) && \
!empty(IS_BUILTIN.fixesext:M[yY][eE][sS])
USE_BUILTIN.fixesext= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.fixesext}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.fixesext}
. if !empty(USE_BUILTIN.fixesext:M[yY][eE][sS])
USE_BUILTIN.fixesext!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.fixesext:Q}; then \
diff --git a/x11/fltk/buildlink3.mk b/x11/fltk/buildlink3.mk
index a94cea57090..572959f493d 100644
--- a/x11/fltk/buildlink3.mk
+++ b/x11/fltk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/02/05 23:11:32 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/04/06 06:22:57 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
FLTK_BUILDLINK3_MK:= ${FLTK_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfltk}
BUILDLINK_PACKAGES+= fltk
.if !empty(FLTK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.fltk+= fltk>=1.1.5rc1
-BUILDLINK_RECOMMENDED.fltk+= fltk>=1.1.7nb1
+BUILDLINK_API_DEPENDS.fltk+= fltk>=1.1.5rc1
+BUILDLINK_ABI_DEPENDS.fltk+= fltk>=1.1.7nb1
BUILDLINK_PKGSRCDIR.fltk?= ../../x11/fltk
BUILDLINK_FILES.fltk+= include/Fl/*
.endif # FLTK_BUILDLINK3_MK
diff --git a/x11/fox/buildlink3.mk b/x11/fox/buildlink3.mk
index 677fd9af47f..aa67dd4d3df 100644
--- a/x11/fox/buildlink3.mk
+++ b/x11/fox/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/05 23:11:32 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:22:58 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
FOX_BUILDLINK3_MK:= ${FOX_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfox}
BUILDLINK_PACKAGES+= fox
.if !empty(FOX_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.fox+= fox>=1.4.16
-BUILDLINK_RECOMMENDED.fox?= fox>=1.4.17nb1
+BUILDLINK_API_DEPENDS.fox+= fox>=1.4.16
+BUILDLINK_ABI_DEPENDS.fox?= fox>=1.4.17nb1
BUILDLINK_PKGSRCDIR.fox?= ../../x11/fox
BUILDLINK_INCDIRS.fox?= include/fox-1.4
.endif # FOX_BUILDLINK3_MK
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index d971381f7d4..e315939b3de 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.105 2006/04/04 18:07:16 jlam Exp $
+# $NetBSD: Makefile,v 1.106 2006/04/06 06:22:58 reed Exp $
#
DISTNAME= gdm-2.14.0
@@ -15,7 +15,7 @@ BUILD_USES_MSGFMT= YES
DEPENDS+= zenity>=2.14.0:../../x11/zenity
-BUILDLINK_DEPENDS.libart2+= libart2>=2.3.11
+BUILDLINK_API_DEPENDS.libart2+= libart2>=2.3.11
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= YES
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index c9f5ec82741..9eb78378be5 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2006/03/30 21:47:15 jmmv Exp $
+# $NetBSD: Makefile,v 1.52 2006/04/06 06:22:58 reed Exp $
#
DISTNAME= gnome-desktop-2.14.0
@@ -20,7 +20,7 @@ USE_LIBTOOL= yes
CONFIGURE_ARGS+= --with-gnome-distributor="The NetBSD Foundation"
-BUILDLINK_DEPENDS.glib2+= glib2>=2.8.0
+BUILDLINK_API_DEPENDS.glib2+= glib2>=2.8.0
post-install:
.for f in netbsd-logo-icon.png netbsd-logo-icon-transparent.png
diff --git a/x11/gnome-desktop/buildlink3.mk b/x11/gnome-desktop/buildlink3.mk
index 4fbbc734b63..3e221834a53 100644
--- a/x11/gnome-desktop/buildlink3.mk
+++ b/x11/gnome-desktop/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2006/03/30 21:47:15 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2006/04/06 06:22:58 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNOME_DESKTOP_BUILDLINK3_MK:= ${GNOME_DESKTOP_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-desktop}
BUILDLINK_PACKAGES+= gnome-desktop
.if !empty(GNOME_DESKTOP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-desktop+= gnome-desktop>=2.14.0
+BUILDLINK_API_DEPENDS.gnome-desktop+= gnome-desktop>=2.14.0
BUILDLINK_PKGSRCDIR.gnome-desktop?= ../../x11/gnome-desktop
.endif # GNOME_DESKTOP_BUILDLINK3_MK
diff --git a/x11/gnome-libs/buildlink3.mk b/x11/gnome-libs/buildlink3.mk
index 5d73c878650..a115a25c157 100644
--- a/x11/gnome-libs/buildlink3.mk
+++ b/x11/gnome-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:11:33 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:22:58 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNOME_LIBS_BUILDLINK3_MK:= ${GNOME_LIBS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-libs}
BUILDLINK_PACKAGES+= gnome-libs
.if !empty(GNOME_LIBS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-libs+= gnome-libs>=1.4.2nb1
-BUILDLINK_RECOMMENDED.gnome-libs+= gnome-libs>=1.4.2nb5
+BUILDLINK_API_DEPENDS.gnome-libs+= gnome-libs>=1.4.2nb1
+BUILDLINK_ABI_DEPENDS.gnome-libs+= gnome-libs>=1.4.2nb5
BUILDLINK_PKGSRCDIR.gnome-libs?= ../../x11/gnome-libs
.endif # GNOME_LIBS_BUILDLINK3_MK
diff --git a/x11/gnome-mag/buildlink3.mk b/x11/gnome-mag/buildlink3.mk
index 325ee82d388..7177e00e59a 100644
--- a/x11/gnome-mag/buildlink3.mk
+++ b/x11/gnome-mag/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/02/05 23:11:33 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/04/06 06:22:58 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNOME_MAG_BUILDLINK3_MK:= ${GNOME_MAG_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-mag}
BUILDLINK_PACKAGES+= gnome-mag
.if !empty(GNOME_MAG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-mag+= gnome-mag>=0.12.0
-BUILDLINK_RECOMMENDED.gnome-mag?= gnome-mag>=0.12.2nb2
+BUILDLINK_API_DEPENDS.gnome-mag+= gnome-mag>=0.12.0
+BUILDLINK_ABI_DEPENDS.gnome-mag?= gnome-mag>=0.12.2nb2
BUILDLINK_PKGSRCDIR.gnome-mag?= ../../x11/gnome-mag
.endif # GNOME_MAG_BUILDLINK3_MK
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 52486406c86..b22b3c536ea 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2006/03/30 21:15:59 jmmv Exp $
+# $NetBSD: Makefile,v 1.68 2006/04/06 06:22:58 reed Exp $
#
DISTNAME= gnome-panel-2.14.0
@@ -33,10 +33,10 @@ GCONF2_SCHEMAS+= workspace-switcher.schemas
GCONF2_SCHEMAS+= window-list.schemas
GCONF2_ENTRIES= panel-default-setup.entries
-BUILDLINK_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.10.0
-BUILDLINK_DEPENDS.libglade2+= libglade2>=2.5.0
-BUILDLINK_DEPENDS.libgnome+= libgnome>=2.13.0
-BUILDLINK_DEPENDS.libwnck+= libwnck>=2.13.5
+BUILDLINK_API_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.10.0
+BUILDLINK_API_DEPENDS.libglade2+= libglade2>=2.5.0
+BUILDLINK_API_DEPENDS.libgnome+= libgnome>=2.13.0
+BUILDLINK_API_DEPENDS.libwnck+= libwnck>=2.13.5
.include "../../devel/GConf2/schemas.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/x11/gnome-panel/buildlink3.mk b/x11/gnome-panel/buildlink3.mk
index 23c23099ed4..2d03ac06bc7 100644
--- a/x11/gnome-panel/buildlink3.mk
+++ b/x11/gnome-panel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/03/06 00:18:11 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2006/04/06 06:22:58 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNOME_PANEL_BUILDLINK3_MK:= ${GNOME_PANEL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-panel}
BUILDLINK_PACKAGES+= gnome-panel
.if !empty(GNOME_PANEL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-panel+= gnome-panel>=2.12.1nb3
-BUILDLINK_RECOMMENDED.gnome-panel?= gnome-panel>=2.12.3
+BUILDLINK_API_DEPENDS.gnome-panel+= gnome-panel>=2.12.1nb3
+BUILDLINK_ABI_DEPENDS.gnome-panel?= gnome-panel>=2.12.3
BUILDLINK_PKGSRCDIR.gnome-panel?= ../../x11/gnome-panel
.endif # GNOME_PANEL_BUILDLINK3_MK
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 609a110734c..9f2412ba6b6 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2006/04/02 11:07:28 jmmv Exp $
+# $NetBSD: Makefile,v 1.66 2006/04/06 06:22:58 reed Exp $
#
DISTNAME= gnome-session-2.14.0
@@ -31,8 +31,8 @@ GCONF2_SCHEMAS= gnome-session.schemas
# Make sure we do not use old packages that rely on XDG_{CONFIG,DATA}_DIRS
# in the environment being set.
-BUILDLINK_DEPENDS.glib2+= glib2>=2.6.1
-BUILDLINK_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.8.3nb1
+BUILDLINK_API_DEPENDS.glib2+= glib2>=2.6.1
+BUILDLINK_API_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.8.3nb1
.include "../../audio/esound/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/x11/gnome-themes-extras/Makefile b/x11/gnome-themes-extras/Makefile
index a91c5a71fa7..84a625feecf 100644
--- a/x11/gnome-themes-extras/Makefile
+++ b/x11/gnome-themes-extras/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/03/06 00:18:26 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2006/04/06 06:22:59 reed Exp $
#
DISTNAME= gnome-themes-extras-0.8.1
@@ -30,7 +30,7 @@ USE_TOOLS+= gmake pkg-config
BUILDLINK_TRANSFORM+= rm:-DG_DISABLE_DEPRECATED
BUILDLINK_TRANSFORM+= rm:-DGTK_DISABLE_DEPRECATED
-BUILDLINK_DEPENDS.librsvg2+= librsvg2>=2.12.6
+BUILDLINK_API_DEPENDS.librsvg2+= librsvg2>=2.12.6
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
diff --git a/x11/gnome2-applets/Makefile b/x11/gnome2-applets/Makefile
index 969060af983..4bec8c4a2f0 100644
--- a/x11/gnome2-applets/Makefile
+++ b/x11/gnome2-applets/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2006/04/01 17:50:18 jmmv Exp $
+# $NetBSD: Makefile,v 1.63 2006/04/06 06:22:59 reed Exp $
#
DISTNAME= gnome-applets-2.14.0
@@ -69,9 +69,9 @@ PRINT_PLIST_AWK+= /examples/ { print "$${BATTSTAT}"$$0; next; }
.include "../../devel/GConf2/schemas.mk"
-BUILDLINK_DEPENDS.glib2+= glib2>=2.6.0
-BUILDLINK_DEPENDS.libglade2+= libglade2>=2.4.0
-BUILDLINK_DEPENDS.gnome-panel+= gnome-panel>=2.13.4
+BUILDLINK_API_DEPENDS.glib2+= glib2>=2.6.0
+BUILDLINK_API_DEPENDS.libglade2+= libglade2>=2.4.0
+BUILDLINK_API_DEPENDS.gnome-panel+= gnome-panel>=2.13.4
.include "../../devel/gail/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/x11/gnome2-control-center/Makefile b/x11/gnome2-control-center/Makefile
index 2f56f909e05..d563e867437 100644
--- a/x11/gnome2-control-center/Makefile
+++ b/x11/gnome2-control-center/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2006/04/04 18:07:16 jlam Exp $
+# $NetBSD: Makefile,v 1.63 2006/04/06 06:23:00 reed Exp $
#
DISTNAME= control-center-2.14.0
@@ -43,8 +43,8 @@ CONF_FILES= ${EGDIR}/theme-method.conf \
CONF_FILES+= ${EGDIR}/font-method.conf \
${PKG_SYSCONFDIR}/font-method.conf
-BUILDLINK_DEPENDS.glib2= glib2>=2.6.0
-BUILDLINK_DEPENDS.gtk2+= gtk2+>=2.8.12
+BUILDLINK_API_DEPENDS.glib2= glib2>=2.6.0
+BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.8.12
.include "../../audio/esound/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/x11/gnome2-control-center/buildlink3.mk b/x11/gnome2-control-center/buildlink3.mk
index 6b87fd1880d..bfe75a01500 100644
--- a/x11/gnome2-control-center/buildlink3.mk
+++ b/x11/gnome2-control-center/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/02/05 23:11:33 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/04/06 06:23:00 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNOME2_CONTROL_CENTER_BUILDLINK3_MK:= ${GNOME2_CONTROL_CENTER_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome2-control-center}
BUILDLINK_PACKAGES+= gnome2-control-center
.if !empty(GNOME2_CONTROL_CENTER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome2-control-center+= gnome2-control-center>=2.12.1nb1
-BUILDLINK_RECOMMENDED.gnome2-control-center?= gnome2-control-center>=2.12.1nb5
+BUILDLINK_API_DEPENDS.gnome2-control-center+= gnome2-control-center>=2.12.1nb1
+BUILDLINK_ABI_DEPENDS.gnome2-control-center?= gnome2-control-center>=2.12.1nb5
BUILDLINK_PKGSRCDIR.gnome2-control-center?= ../../x11/gnome2-control-center
.endif # GNOME2_CONTROL_CENTER_BUILDLINK3_MK
diff --git a/x11/gnome2-terminal/Makefile b/x11/gnome2-terminal/Makefile
index 5b1e2a7d558..b62938ed007 100644
--- a/x11/gnome2-terminal/Makefile
+++ b/x11/gnome2-terminal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2006/03/30 21:18:25 jmmv Exp $
+# $NetBSD: Makefile,v 1.51 2006/04/06 06:23:00 reed Exp $
#
DISTNAME= gnome-terminal-2.14.0
@@ -24,7 +24,7 @@ USE_LIBTOOL= YES
GCONF2_SCHEMAS= gnome-terminal.schemas
-BUILDLINK_DEPENDS.startup-notification+= startup-notification>=0.8
+BUILDLINK_API_DEPENDS.startup-notification+= startup-notification>=0.8
.include "../../devel/GConf2/schemas.mk"
.include "../../devel/libglade2/buildlink3.mk"
diff --git a/x11/gnopernicus/Makefile b/x11/gnopernicus/Makefile
index 7b395f7a2f2..212d35148b9 100644
--- a/x11/gnopernicus/Makefile
+++ b/x11/gnopernicus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2006/04/04 18:07:16 jlam Exp $
+# $NetBSD: Makefile,v 1.43 2006/04/06 06:23:00 reed Exp $
#
DISTNAME= gnopernicus-1.0.3
@@ -52,7 +52,7 @@ GCONF2_SCHEMAS+= brlmonitor.schemas
GCONF2_SCHEMAS+= gnopernicus.schemas
GCONF2_SCHEMAS+= remote.schemas
-BUILDLINK_DEPENDS.glib2+= glib2>=2.4.1
+BUILDLINK_API_DEPENDS.glib2+= glib2>=2.4.1
.include "../../audio/gnome-speech/buildlink3.mk"
.include "../../devel/at-spi/buildlink3.mk"
diff --git a/x11/gnustep-back/buildlink3.mk b/x11/gnustep-back/buildlink3.mk
index eb716f50f7d..81221e7a155 100644
--- a/x11/gnustep-back/buildlink3.mk
+++ b/x11/gnustep-back/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:11:33 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:23:00 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNUSTEP_BACK_BUILDLINK3_MK:= ${GNUSTEP_BACK_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnustep-back}
BUILDLINK_PACKAGES+= gnustep-back
.if !empty(GNUSTEP_BACK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnustep-back+= gnustep-back>=0.9.2
-BUILDLINK_RECOMMENDED.gnustep-back+= gnustep-back>=0.10.2nb2
+BUILDLINK_API_DEPENDS.gnustep-back+= gnustep-back>=0.9.2
+BUILDLINK_ABI_DEPENDS.gnustep-back+= gnustep-back>=0.10.2nb2
BUILDLINK_PKGSRCDIR.gnustep-back?= ../../x11/gnustep-back
.endif # GNUSTEP_BACK_BUILDLINK3_MK
diff --git a/x11/gnustep-gui/buildlink3.mk b/x11/gnustep-gui/buildlink3.mk
index 767ad598b78..9c1e30ab8d8 100644
--- a/x11/gnustep-gui/buildlink3.mk
+++ b/x11/gnustep-gui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:11:34 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:23:00 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNUSTEP_GUI_BUILDLINK3_MK:= ${GNUSTEP_GUI_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnustep-gui}
BUILDLINK_PACKAGES+= gnustep-gui
.if !empty(GNUSTEP_GUI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnustep-gui+= gnustep-gui>=0.9.2
-BUILDLINK_RECOMMENDED.gnustep-gui+= gnustep-gui>=0.10.2nb1
+BUILDLINK_API_DEPENDS.gnustep-gui+= gnustep-gui>=0.9.2
+BUILDLINK_ABI_DEPENDS.gnustep-gui+= gnustep-gui>=0.10.2nb1
BUILDLINK_PKGSRCDIR.gnustep-gui?= ../../x11/gnustep-gui
PRINT_PLIST_AWK+= /^@dirrm share\/GNUstep\/System\/Library\/Bundles\/GSPrinting$$/ { print "@comment in x11/gnustep-gui: " $$0; next; }
diff --git a/x11/gnustep-preferences/buildlink3.mk b/x11/gnustep-preferences/buildlink3.mk
index e2e621632b9..65ff4e1b37a 100644
--- a/x11/gnustep-preferences/buildlink3.mk
+++ b/x11/gnustep-preferences/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:11:34 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:23:00 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNUSTEP_PREFERENCES_BUILDLINK3_MK:= ${GNUSTEP_PREFERENCES_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnustep-preferences}
BUILDLINK_PACKAGES+= gnustep-preferences
.if !empty(GNUSTEP_PREFERENCES_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnustep-preferences+= gnustep-preferences>=1.2.0
-BUILDLINK_RECOMMENDED.gnustep-preferences?= gnustep-preferences>=1.2.0nb13
+BUILDLINK_API_DEPENDS.gnustep-preferences+= gnustep-preferences>=1.2.0
+BUILDLINK_ABI_DEPENDS.gnustep-preferences?= gnustep-preferences>=1.2.0nb13
BUILDLINK_PKGSRCDIR.gnustep-preferences?= ../../x11/gnustep-preferences
.endif # GNUSTEP_PREFERENCES_BUILDLINK3_MK
diff --git a/x11/gtk+extra/buildlink3.mk b/x11/gtk+extra/buildlink3.mk
index dcff7a91b59..41c922ab971 100644
--- a/x11/gtk+extra/buildlink3.mk
+++ b/x11/gtk+extra/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:11:34 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:23:01 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GTK+EXTRA_BUILDLINK3_MK:= ${GTK+EXTRA_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtk+extra}
BUILDLINK_PACKAGES+= gtk+extra
.if !empty(GTK+EXTRA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gtk+extra+= gtk+extra>=0.99.17nb2
-BUILDLINK_RECOMMENDED.gtk+extra?= gtk+extra>=0.99.17nb5
+BUILDLINK_API_DEPENDS.gtk+extra+= gtk+extra>=0.99.17nb2
+BUILDLINK_ABI_DEPENDS.gtk+extra?= gtk+extra>=0.99.17nb5
BUILDLINK_PKGSRCDIR.gtk+extra?= ../../x11/gtk+extra
.endif # GTK+EXTRA_BUILDLINK3_MK
diff --git a/x11/gtk/buildlink3.mk b/x11/gtk/buildlink3.mk
index 949da969122..65b9900edae 100644
--- a/x11/gtk/buildlink3.mk
+++ b/x11/gtk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/02/05 23:11:34 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2006/04/06 06:23:00 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GTK_BUILDLINK3_MK:= ${GTK_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtk}
BUILDLINK_PACKAGES+= gtk
.if !empty(GTK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gtk+= gtk+>=1.2.10
-BUILDLINK_RECOMMENDED.gtk+= gtk+>=1.2.10nb9
+BUILDLINK_API_DEPENDS.gtk+= gtk+>=1.2.10
+BUILDLINK_ABI_DEPENDS.gtk+= gtk+>=1.2.10nb9
BUILDLINK_PKGSRCDIR.gtk?= ../../x11/gtk
.endif # GTK_BUILDLINK3_MK
diff --git a/x11/gtk2+extra/buildlink3.mk b/x11/gtk2+extra/buildlink3.mk
index c3f5fd286c9..bf902f1e96c 100644
--- a/x11/gtk2+extra/buildlink3.mk
+++ b/x11/gtk2+extra/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:11:34 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:23:01 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GTK2+EXTRA_BUILDLINK3_MK:= ${GTK2+EXTRA_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtk2+extra}
BUILDLINK_PACKAGES+= gtk2+extra
.if !empty(GTK2+EXTRA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gtk2+extra+= gtk2+extra>=2.1.1
-BUILDLINK_RECOMMENDED.gtk2+extra?= gtk2+extra>=2.1.1nb2
+BUILDLINK_API_DEPENDS.gtk2+extra+= gtk2+extra>=2.1.1
+BUILDLINK_ABI_DEPENDS.gtk2+extra?= gtk2+extra>=2.1.1nb2
BUILDLINK_PKGSRCDIR.gtk2+extra?= ../../x11/gtk2+extra
.endif # GTK2+EXTRA_BUILDLINK3_MK
diff --git a/x11/gtk2-engines/Makefile b/x11/gtk2-engines/Makefile
index 30536e87b62..14e8a5f7a97 100644
--- a/x11/gtk2-engines/Makefile
+++ b/x11/gtk2-engines/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2006/03/30 21:11:32 jmmv Exp $
+# $NetBSD: Makefile,v 1.40 2006/04/06 06:23:01 reed Exp $
DISTNAME= gtk-engines-2.6.8
PKGNAME= ${DISTNAME:S/gtk/gtk2/}
@@ -15,7 +15,7 @@ CONFLICTS+= gtk2-engines-clearlooks-[0-9]*
CONFLICTS+= gtk2-engines-industrial-[0-9]*
CONFLICTS+= gnome-themes-extras<0.8
-BUILDLINK_DEPENDS.gtk2+= gtk2+>=2.6.4
+BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.6.4
USE_TOOLS+= pkg-config
GNU_CONFIGURE= yes
diff --git a/x11/gtk2-engines/buildlink3.mk b/x11/gtk2-engines/buildlink3.mk
index 872914a1514..2be006a779b 100644
--- a/x11/gtk2-engines/buildlink3.mk
+++ b/x11/gtk2-engines/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:11:34 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:23:01 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GTK2_ENGINES_BUILDLINK3_MK:= ${GTK2_ENGINES_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtk2-engines}
BUILDLINK_PACKAGES+= gtk2-engines
.if !empty(GTK2_ENGINES_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gtk2-engines+= gtk2-engines>=2.6.0
-BUILDLINK_RECOMMENDED.gtk2-engines?= gtk2-engines>=2.6.6nb2
+BUILDLINK_API_DEPENDS.gtk2-engines+= gtk2-engines>=2.6.0
+BUILDLINK_ABI_DEPENDS.gtk2-engines?= gtk2-engines>=2.6.6nb2
BUILDLINK_PKGSRCDIR.gtk2-engines?= ../../x11/gtk2-engines
.endif # GTK2_ENGINES_BUILDLINK3_MK
diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index 9293d4cd1dc..6fe494afa1b 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.116 2006/03/30 20:48:30 jmmv Exp $
+# $NetBSD: Makefile,v 1.117 2006/04/06 06:23:01 reed Exp $
DISTNAME= gtk+-2.8.16
PKGNAME= ${DISTNAME:S/gtk/gtk2/}
@@ -17,9 +17,9 @@ CONFLICTS= gtk2-engines<2.6.0
BUILD_USES_MSGFMT= yes
-BUILDLINK_DEPENDS.glib2+= glib2>=2.10.1
-BUILDLINK_DEPENDS.pango+= pango>=1.10.0
-BUILDLINK_DEPENDS.Xft2+= Xft2>=2.1.2nb2
+BUILDLINK_API_DEPENDS.glib2+= glib2>=2.10.1
+BUILDLINK_API_DEPENDS.pango+= pango>=1.10.0
+BUILDLINK_API_DEPENDS.Xft2+= Xft2>=2.1.2nb2
USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= yes
diff --git a/x11/gtk2/buildlink3.mk b/x11/gtk2/buildlink3.mk
index 8320667d4d8..4b21d2308e4 100644
--- a/x11/gtk2/buildlink3.mk
+++ b/x11/gtk2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.22 2006/02/05 23:11:34 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2006/04/06 06:23:01 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GTK2_BUILDLINK3_MK:= ${GTK2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtk2}
BUILDLINK_PACKAGES+= gtk2
.if !empty(GTK2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gtk2+= gtk2+>=2.4.0
-BUILDLINK_RECOMMENDED.gtk2+= gtk2+>=2.8.11nb1
+BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.4.0
+BUILDLINK_ABI_DEPENDS.gtk2+= gtk2+>=2.8.11nb1
BUILDLINK_PKGSRCDIR.gtk2?= ../../x11/gtk2
PRINT_PLIST_AWK+= /^@dirrm lib\/gtk-2.0$$/ { next; }
diff --git a/x11/gtkglarea/buildlink3.mk b/x11/gtkglarea/buildlink3.mk
index ded86725c30..7866a607166 100644
--- a/x11/gtkglarea/buildlink3.mk
+++ b/x11/gtkglarea/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:11:34 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:23:01 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GTKGLAREA_BUILDLINK3_MK:= ${GTKGLAREA_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtkglarea}
BUILDLINK_PACKAGES+= gtkglarea
.if !empty(GTKGLAREA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gtkglarea+= gtkglarea>=1.2.2nb3
-BUILDLINK_RECOMMENDED.gtkglarea?= gtkglarea>=1.2.3nb2
+BUILDLINK_API_DEPENDS.gtkglarea+= gtkglarea>=1.2.2nb3
+BUILDLINK_ABI_DEPENDS.gtkglarea?= gtkglarea>=1.2.3nb2
BUILDLINK_PKGSRCDIR.gtkglarea?= ../../x11/gtkglarea
.endif # GTKGLAREA_BUILDLINK3_MK
diff --git a/x11/gtkglarea2/buildlink3.mk b/x11/gtkglarea2/buildlink3.mk
index 415f58da3e5..58fe2b80902 100644
--- a/x11/gtkglarea2/buildlink3.mk
+++ b/x11/gtkglarea2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:11:34 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:23:01 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GTKGLAREA2_BUILDLINK3_MK:= ${GTKGLAREA2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtkglarea2}
BUILDLINK_PACKAGES+= gtkglarea2
.if !empty(GTKGLAREA2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gtkglarea2+= gtkglarea2>=1.99.0nb3
-BUILDLINK_RECOMMENDED.gtkglarea2?= gtkglarea2>=1.99.0nb6
+BUILDLINK_API_DEPENDS.gtkglarea2+= gtkglarea2>=1.99.0nb3
+BUILDLINK_ABI_DEPENDS.gtkglarea2?= gtkglarea2>=1.99.0nb6
BUILDLINK_PKGSRCDIR.gtkglarea2?= ../../x11/gtkglarea2
.endif # GTKGLAREA2_BUILDLINK3_MK
diff --git a/x11/gtkmm/Makefile b/x11/gtkmm/Makefile
index 94eb958021d..a0056482062 100644
--- a/x11/gtkmm/Makefile
+++ b/x11/gtkmm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2006/02/14 22:05:44 adam Exp $
+# $NetBSD: Makefile,v 1.36 2006/04/06 06:23:01 reed Exp $
DISTNAME= gtkmm-2.8.3
CATEGORIES= x11
@@ -19,7 +19,7 @@ PKGCONFIG_OVERRIDE+= gdk/gdkmm-2.4.pc.in
PKGCONFIG_OVERRIDE+= gtk/gtkmm-2.4.pc.in
PKGCONFIG_OVERRIDE+= pango/pangomm-1.4.pc.in
-BUILDLINK_DEPENDS.glibmm+= glibmm>=2.8.0
+BUILDLINK_API_DEPENDS.glibmm+= glibmm>=2.8.0
.include "../../devel/glibmm/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/x11/gtkmm/buildlink3.mk b/x11/gtkmm/buildlink3.mk
index d7a56f801f7..87f7587432d 100644
--- a/x11/gtkmm/buildlink3.mk
+++ b/x11/gtkmm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:11:35 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:23:01 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GTKMM_BUILDLINK3_MK:= ${GTKMM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtkmm}
BUILDLINK_PACKAGES+= gtkmm
.if !empty(GTKMM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gtkmm+= gtkmm>=2.6.3
-BUILDLINK_RECOMMENDED.gtkmm?= gtkmm>=2.8.2nb2
+BUILDLINK_API_DEPENDS.gtkmm+= gtkmm>=2.6.3
+BUILDLINK_ABI_DEPENDS.gtkmm?= gtkmm>=2.8.2nb2
BUILDLINK_PKGSRCDIR.gtkmm?= ../../x11/gtkmm
.endif # GTKMM_BUILDLINK3_MK
diff --git a/x11/gtksourceview/buildlink3.mk b/x11/gtksourceview/buildlink3.mk
index 8d06e365dc1..c6f6be1e3e4 100644
--- a/x11/gtksourceview/buildlink3.mk
+++ b/x11/gtksourceview/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:11:35 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:23:01 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GTKSOURCEVIEW_BUILDLINK3_MK:= ${GTKSOURCEVIEW_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtksourceview}
BUILDLINK_PACKAGES+= gtksourceview
.if !empty(GTKSOURCEVIEW_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gtksourceview+= gtksourceview>=1.2.0
-BUILDLINK_RECOMMENDED.gtksourceview?= gtksourceview>=1.4.2nb2
+BUILDLINK_API_DEPENDS.gtksourceview+= gtksourceview>=1.2.0
+BUILDLINK_ABI_DEPENDS.gtksourceview?= gtksourceview>=1.4.2nb2
BUILDLINK_PKGSRCDIR.gtksourceview?= ../../x11/gtksourceview
.endif # GTKSOURCEVIEW_BUILDLINK3_MK
diff --git a/x11/gtoolkit/buildlink3.mk b/x11/gtoolkit/buildlink3.mk
index 96fd32939da..6bde62d597d 100644
--- a/x11/gtoolkit/buildlink3.mk
+++ b/x11/gtoolkit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:11:35 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:23:01 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GTOOLKIT_BUILDLINK3_MK:= ${GTOOLKIT_BUILDLINK3_MK}+
@@ -11,9 +11,9 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtoolkit}
BUILDLINK_PACKAGES+= gtoolkit
.if !empty(GTOOLKIT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gtoolkit+= gtoolkit>=0.9.5nb5
-BUILDLINK_RECOMMENDED.gtoolkit+=gtoolkit>=0.9.5nb7
-BUILDLINK_RECOMMENDED.gtoolkit?= gtoolkit>=0.9.5nb9
+BUILDLINK_API_DEPENDS.gtoolkit+= gtoolkit>=0.9.5nb5
+BUILDLINK_ABI_DEPENDS.gtoolkit+=gtoolkit>=0.9.5nb7
+BUILDLINK_ABI_DEPENDS.gtoolkit?= gtoolkit>=0.9.5nb9
BUILDLINK_PKGSRCDIR.gtoolkit?= ../../x11/gtoolkit
.endif # GTOOLKIT_BUILDLINK3_MK
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 4386060a604..468aee05f43 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.109 2006/04/02 02:01:58 markd Exp $
+# $NetBSD: Makefile,v 1.110 2006/04/06 06:23:01 reed Exp $
DISTNAME= kdebase-${_KDE_VERSION}
PKGREVISION= 1
@@ -90,8 +90,8 @@ PKG_SUGGESTED_OPTIONS= sasl
.include "../../mk/bsd.options.mk"
-BUILDLINK_DEPENDS.Xrandr+= Xrandr>=1.0
-BUILDLINK_DEPENDS.kdelibs+= kdelibs>=${_KDE_VERSION}
+BUILDLINK_API_DEPENDS.Xrandr+= Xrandr>=1.0
+BUILDLINK_API_DEPENDS.kdelibs+= kdelibs>=${_KDE_VERSION}
DEPENDS+= htdig>=3.2.0:../../www/htdig-devel
diff --git a/x11/kdebase3/buildlink3.mk b/x11/kdebase3/buildlink3.mk
index ba003b56de9..2a53414741f 100644
--- a/x11/kdebase3/buildlink3.mk
+++ b/x11/kdebase3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/02/05 23:11:38 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2006/04/06 06:23:01 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
KDEBASE_BUILDLINK3_MK:= ${KDEBASE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nkdebase}
BUILDLINK_PACKAGES+= kdebase
.if !empty(KDEBASE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.kdebase+= kdebase>=3.5.0nb2
-BUILDLINK_RECOMMENDED.kdebase?= kdebase>=3.5.1nb2
+BUILDLINK_API_DEPENDS.kdebase+= kdebase>=3.5.0nb2
+BUILDLINK_ABI_DEPENDS.kdebase?= kdebase>=3.5.1nb2
BUILDLINK_PKGSRCDIR.kdebase?= ../../x11/kdebase3
.endif # KDEBASE_BUILDLINK3_MK
@@ -24,7 +24,7 @@ MAKEFLAGS+= PKG_BUILD_OPTIONS.kdebase=${PKG_BUILD_OPTIONS.kdebase:Q}
.endif
MAKEVARS+= PKG_BUILD_OPTIONS.kdebase
-BUILDLINK_DEPENDS.Xrandr+= Xrandr>=1.0
+BUILDLINK_API_DEPENDS.Xrandr+= Xrandr>=1.0
.include "../../databases/openldap/buildlink3.mk"
.include "../../fonts/fontconfig/buildlink3.mk"
diff --git a/x11/kdelibs3/buildlink3.mk b/x11/kdelibs3/buildlink3.mk
index 0da7c23b63b..4c539435ea2 100644
--- a/x11/kdelibs3/buildlink3.mk
+++ b/x11/kdelibs3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2006/03/09 21:04:45 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2006/04/06 06:23:01 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
KDELIBS_BUILDLINK3_MK:= ${KDELIBS_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nkdelibs}
BUILDLINK_PACKAGES+= kdelibs
.if !empty(KDELIBS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.kdelibs+= kdelibs>=3.2.0
-BUILDLINK_RECOMMENDED.kdelibs?= kdelibs>=3.5.1nb1
+BUILDLINK_API_DEPENDS.kdelibs+= kdelibs>=3.2.0
+BUILDLINK_ABI_DEPENDS.kdelibs?= kdelibs>=3.5.1nb1
BUILDLINK_PKGSRCDIR.kdelibs?= ../../x11/kdelibs3
.include "../../x11/kdelibs3/dirs.mk"
diff --git a/x11/lablgtk/Makefile b/x11/lablgtk/Makefile
index 95e9b6c3f13..344648ca437 100644
--- a/x11/lablgtk/Makefile
+++ b/x11/lablgtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/03/04 21:31:09 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2006/04/06 06:23:01 reed Exp $
DISTNAME= lablgtk-1.2.7
PKGREVISION= 3
@@ -12,7 +12,7 @@ COMMENT= GTK+ bindings for ocaml
USE_TOOLS+= gmake
BUILDLINK_DEPMETHOD.ocaml= full
-BUILDLINK_DEPENDS.ocaml+= ocaml>=3.0.5
+BUILDLINK_API_DEPENDS.ocaml+= ocaml>=3.0.5
.include "../../mk/bsd.prefs.mk"
diff --git a/x11/lablgtk/buildlink3.mk b/x11/lablgtk/buildlink3.mk
index e7617855c4f..6fa1f70d2f9 100644
--- a/x11/lablgtk/buildlink3.mk
+++ b/x11/lablgtk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:11:39 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:23:01 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LABLGTK_BUILDLINK3_MK:= ${LABLGTK_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlablgtk}
BUILDLINK_PACKAGES+= lablgtk
.if !empty(LABLGTK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.lablgtk+= lablgtk>=1.2.5nb3
-BUILDLINK_RECOMMENDED.lablgtk?= lablgtk>=1.2.7nb2
+BUILDLINK_API_DEPENDS.lablgtk+= lablgtk>=1.2.5nb3
+BUILDLINK_ABI_DEPENDS.lablgtk?= lablgtk>=1.2.7nb2
BUILDLINK_PKGSRCDIR.lablgtk?= ../../x11/lablgtk
.endif # LABLGTK_BUILDLINK3_MK
diff --git a/x11/lablgtk2/buildlink3.mk b/x11/lablgtk2/buildlink3.mk
index cb23b9b3914..a80633b020e 100644
--- a/x11/lablgtk2/buildlink3.mk
+++ b/x11/lablgtk2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:11:39 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:23:01 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LABLGTK2_BUILDLINK3_MK:= ${LABLGTK2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlablgtk2}
BUILDLINK_PACKAGES+= lablgtk2
.if !empty(LABLGTK2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.lablgtk2+= lablgtk2>=2.6.0nb3
-BUILDLINK_RECOMMENDED.lablgtk2?= lablgtk2>=2.6.0nb5
+BUILDLINK_API_DEPENDS.lablgtk2+= lablgtk2>=2.6.0nb3
+BUILDLINK_ABI_DEPENDS.lablgtk2?= lablgtk2>=2.6.0nb5
BUILDLINK_PKGSRCDIR.lablgtk2?= ../../x11/lablgtk2
.endif # LABLGTK2_BUILDLINK3_MK
diff --git a/x11/lesstif/buildlink3.mk b/x11/lesstif/buildlink3.mk
index 46851cf4020..5102bf6c923 100644
--- a/x11/lesstif/buildlink3.mk
+++ b/x11/lesstif/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:11:39 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:23:01 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LESSTIF_BUILDLINK3_MK:= ${LESSTIF_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlesstif}
BUILDLINK_PACKAGES+= lesstif
.if !empty(LESSTIF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.lesstif+= lesstif>=0.91.4
-BUILDLINK_RECOMMENDED.lesstif+= lesstif>=0.94.4nb2
+BUILDLINK_API_DEPENDS.lesstif+= lesstif>=0.91.4
+BUILDLINK_ABI_DEPENDS.lesstif+= lesstif>=0.94.4nb2
BUILDLINK_PKGSRCDIR.lesstif?= ../../x11/lesstif
.endif # LESSTIF_BUILDLINK3_MK
diff --git a/x11/libexo/buildlink3.mk b/x11/libexo/buildlink3.mk
index 3d202f26445..34d30350f76 100644
--- a/x11/libexo/buildlink3.mk
+++ b/x11/libexo/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:11:39 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:23:02 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
EXO_BUILDLINK3_MK:= ${EXO_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nexo}
BUILDLINK_PACKAGES+= exo
.if !empty(EXO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.exo+= exo>=0.3.0
-BUILDLINK_RECOMMENDED.exo?= exo>=0.3.0nb2
+BUILDLINK_API_DEPENDS.exo+= exo>=0.3.0
+BUILDLINK_ABI_DEPENDS.exo?= exo>=0.3.0nb2
BUILDLINK_PKGSRCDIR.exo?= ../../x11/libexo
.endif # EXO_BUILDLINK3_MK
diff --git a/x11/libxfce4gui/buildlink3.mk b/x11/libxfce4gui/buildlink3.mk
index 60f8c75330f..4cfc3fdcb8e 100644
--- a/x11/libxfce4gui/buildlink3.mk
+++ b/x11/libxfce4gui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/02/17 06:49:25 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2006/04/06 06:23:02 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBXFCE4GUI_BUILDLINK3_MK:= ${LIBXFCE4GUI_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibxfce4gui}
BUILDLINK_PACKAGES+= libxfce4gui
.if !empty(LIBXFCE4GUI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libxfce4gui+= libxfce4gui>=4.2.3
-BUILDLINK_RECOMMENDED.libxfce4gui?= libxfce4gui>=4.2.3nb2
+BUILDLINK_API_DEPENDS.libxfce4gui+= libxfce4gui>=4.2.3
+BUILDLINK_ABI_DEPENDS.libxfce4gui?= libxfce4gui>=4.2.3nb2
BUILDLINK_PKGSRCDIR.libxfce4gui?= ../../x11/libxfce4gui
.endif # LIBXFCE4GUI_BUILDLINK3_MK
diff --git a/x11/libxfce4mcs/buildlink3.mk b/x11/libxfce4mcs/buildlink3.mk
index 4021fe57427..b60dd3f2664 100644
--- a/x11/libxfce4mcs/buildlink3.mk
+++ b/x11/libxfce4mcs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/02/17 06:49:25 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/04/06 06:23:02 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBXFCE4MCS_BUILDLINK3_MK:= ${LIBXFCE4MCS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibxfce4mcs}
BUILDLINK_PACKAGES+= libxfce4mcs
.if !empty(LIBXFCE4MCS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libxfce4mcs+= libxfce4mcs>=4.2.3
-BUILDLINK_RECOMMENDED.libxfce4mcs?= libxfce4mcs>=4.2.3nb1
+BUILDLINK_API_DEPENDS.libxfce4mcs+= libxfce4mcs>=4.2.3
+BUILDLINK_ABI_DEPENDS.libxfce4mcs?= libxfce4mcs>=4.2.3nb1
BUILDLINK_PKGSRCDIR.libxfce4mcs?= ../../x11/libxfce4mcs
.endif # LIBXFCE4MCS_BUILDLINK3_MK
diff --git a/x11/libxfce4util/buildlink3.mk b/x11/libxfce4util/buildlink3.mk
index f656d883a61..ffa4f989449 100644
--- a/x11/libxfce4util/buildlink3.mk
+++ b/x11/libxfce4util/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/02/17 06:49:25 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/04/06 06:23:02 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBXFCE4UTIL_BUILDLINK3_MK:= ${LIBXFCE4UTIL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibxfce4util}
BUILDLINK_PACKAGES+= libxfce4util
.if !empty(LIBXFCE4UTIL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libxfce4util+= libxfce4util>=4.2.3.2
-BUILDLINK_RECOMMENDED.libxfce4util?= libxfce4util>=4.2.3.2nb1
+BUILDLINK_API_DEPENDS.libxfce4util+= libxfce4util>=4.2.3.2
+BUILDLINK_ABI_DEPENDS.libxfce4util?= libxfce4util>=4.2.3.2nb1
BUILDLINK_PKGSRCDIR.libxfce4util?= ../../x11/libxfce4util
.endif # LIBXFCE4UTIL_BUILDLINK3_MK
diff --git a/x11/libxklavier/buildlink3.mk b/x11/libxklavier/buildlink3.mk
index 1b291e329d1..fe84d9c890a 100644
--- a/x11/libxklavier/buildlink3.mk
+++ b/x11/libxklavier/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:11:39 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:23:02 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBXKLAVIER_BUILDLINK3_MK:= ${LIBXKLAVIER_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibxklavier}
BUILDLINK_PACKAGES+= libxklavier
.if !empty(LIBXKLAVIER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libxklavier+= libxklavier>=2.0
-BUILDLINK_RECOMMENDED.libxklavier?= libxklavier>=2.0nb1
+BUILDLINK_API_DEPENDS.libxklavier+= libxklavier>=2.0
+BUILDLINK_ABI_DEPENDS.libxklavier?= libxklavier>=2.0nb1
BUILDLINK_PKGSRCDIR.libxklavier?= ../../x11/libxklavier
.endif # LIBXKLAVIER_BUILDLINK3_MK
diff --git a/x11/libzvt/buildlink3.mk b/x11/libzvt/buildlink3.mk
index 7abc96fdb3b..28b39548637 100644
--- a/x11/libzvt/buildlink3.mk
+++ b/x11/libzvt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:11:39 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:23:02 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBZVT_BUILDLINK3_MK:= ${LIBZVT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibzvt}
BUILDLINK_PACKAGES+= libzvt
.if !empty(LIBZVT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libzvt+= libzvt>=2.0.1nb5
-BUILDLINK_RECOMMENDED.libzvt+= libzvt>=2.0.1nb8
+BUILDLINK_API_DEPENDS.libzvt+= libzvt>=2.0.1nb5
+BUILDLINK_ABI_DEPENDS.libzvt+= libzvt>=2.0.1nb8
BUILDLINK_PKGSRCDIR.libzvt?= ../../x11/libzvt
.endif # LIBZVT_BUILDLINK3_MK
diff --git a/x11/mowitz/buildlink3.mk b/x11/mowitz/buildlink3.mk
index 8b8ae309984..416b291ee25 100644
--- a/x11/mowitz/buildlink3.mk
+++ b/x11/mowitz/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:11:40 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:23:02 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
MOWITZ_BUILDLINK3_MK:= ${MOWITZ_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NMowitz}
BUILDLINK_PACKAGES+= Mowitz
.if !empty(MOWITZ_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.Mowitz+= Mowitz>=0.2.1
-BUILDLINK_RECOMMENDED.Mowitz+= Mowitz>=0.2.2nb2
+BUILDLINK_API_DEPENDS.Mowitz+= Mowitz>=0.2.1
+BUILDLINK_ABI_DEPENDS.Mowitz+= Mowitz>=0.2.2nb2
BUILDLINK_PKGSRCDIR.Mowitz?= ../../x11/mowitz
.endif # MOWITZ_BUILDLINK3_MK
diff --git a/x11/neXtaw/buildlink3.mk b/x11/neXtaw/buildlink3.mk
index 5e6e37bc716..621b6d3e980 100644
--- a/x11/neXtaw/buildlink3.mk
+++ b/x11/neXtaw/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:11:40 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:23:02 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
NEXTAW_BUILDLINK3_MK:= ${NEXTAW_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NneXtaw}
BUILDLINK_PACKAGES+= neXtaw
.if !empty(NEXTAW_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.neXtaw+= neXtaw>=0.15.1
-BUILDLINK_RECOMMENDED.neXtaw+= neXtaw>=0.15.1nb2
+BUILDLINK_API_DEPENDS.neXtaw+= neXtaw>=0.15.1
+BUILDLINK_ABI_DEPENDS.neXtaw+= neXtaw>=0.15.1nb2
BUILDLINK_PKGSRCDIR.neXtaw?= ../../x11/neXtaw
.endif # NEXTAW_BUILDLINK3_MK
diff --git a/x11/ocaml-graphics/buildlink3.mk b/x11/ocaml-graphics/buildlink3.mk
index cb9a0f95912..f09e168a643 100644
--- a/x11/ocaml-graphics/buildlink3.mk
+++ b/x11/ocaml-graphics/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:11:40 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:23:02 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OCAML_GRAPHICS_BUILDLINK3_MK:= ${OCAML_GRAPHICS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nocaml-graphics}
BUILDLINK_PACKAGES+= ocaml-graphics
.if !empty(OCAML_GRAPHICS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ocaml-graphics+= ocaml-graphics>=3.08.2
-BUILDLINK_RECOMMENDED.ocaml-graphics?= ocaml-graphics>=3.09.1
+BUILDLINK_API_DEPENDS.ocaml-graphics+= ocaml-graphics>=3.08.2
+BUILDLINK_ABI_DEPENDS.ocaml-graphics?= ocaml-graphics>=3.09.1
BUILDLINK_PKGSRCDIR.ocaml-graphics?= ../../x11/ocaml-graphics
.endif # OCAML_GRAPHICS_BUILDLINK3_MK
diff --git a/x11/openmotif/buildlink3.mk b/x11/openmotif/buildlink3.mk
index 9ba526c7406..62757f0516f 100644
--- a/x11/openmotif/buildlink3.mk
+++ b/x11/openmotif/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:11:40 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:23:02 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OPENMOTIF_BUILDLINK3_MK:= ${OPENMOTIF_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nopenmotif}
BUILDLINK_PACKAGES+= openmotif
.if !empty(OPENMOTIF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.openmotif+= openmotif>=2.2.3
-BUILDLINK_RECOMMENDED.openmotif?= openmotif>=2.2.3nb2
+BUILDLINK_API_DEPENDS.openmotif+= openmotif>=2.2.3
+BUILDLINK_ABI_DEPENDS.openmotif?= openmotif>=2.2.3nb2
BUILDLINK_PKGSRCDIR.openmotif?= ../../x11/openmotif
.endif # OPENMOTIF_BUILDLINK3_MK
diff --git a/x11/paragui/buildlink3.mk b/x11/paragui/buildlink3.mk
index 948dedb8ad2..48cd8ed70ed 100644
--- a/x11/paragui/buildlink3.mk
+++ b/x11/paragui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/02/05 23:11:40 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/04/06 06:23:02 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PARAGUI_BUILDLINK3_MK:= ${PARAGUI_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nparagui}
BUILDLINK_PACKAGES+= paragui
.if !empty(PARAGUI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.paragui+= paragui>=1.0.4nb3
-BUILDLINK_RECOMMENDED.paragui+= paragui>=1.0.4nb10
+BUILDLINK_API_DEPENDS.paragui+= paragui>=1.0.4nb3
+BUILDLINK_ABI_DEPENDS.paragui+= paragui>=1.0.4nb10
BUILDLINK_PKGSRCDIR.paragui?= ../../x11/paragui
.endif # PARAGUI_BUILDLINK3_MK
diff --git a/x11/py-Pmw/buildlink3.mk b/x11/py-Pmw/buildlink3.mk
index 39a0c8c1209..07de4a7b10c 100644
--- a/x11/py-Pmw/buildlink3.mk
+++ b/x11/py-Pmw/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:11:40 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:23:02 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_PMW_BUILDLINK3_MK:= ${PY_PMW_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npypmw}
BUILDLINK_PACKAGES+= pypmw
.if !empty(PY_PMW_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pypmw+= ${PYPKGPREFIX}-Pmw-[0-9]*
-BUILDLINK_RECOMMENDED.pypmw?= ${PYPKGPREFIX}-Pmw>=1.2nb1
+BUILDLINK_API_DEPENDS.pypmw+= ${PYPKGPREFIX}-Pmw-[0-9]*
+BUILDLINK_ABI_DEPENDS.pypmw?= ${PYPKGPREFIX}-Pmw>=1.2nb1
BUILDLINK_PKGSRCDIR.pypmw?= ../../x11/py-Pmw
.endif # PY_PMW_BUILDLINK3_MK
diff --git a/x11/py-Tk/buildlink3.mk b/x11/py-Tk/buildlink3.mk
index a079b2d48d5..5287bacf38e 100644
--- a/x11/py-Tk/buildlink3.mk
+++ b/x11/py-Tk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:11:41 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:23:02 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PYTK_BUILDLINK3_MK:= ${PYTK_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npytk}
BUILDLINK_PACKAGES+= pytk
.if !empty(PYTK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pytk+= ${PYPKGPREFIX}-Tk-[0-9]*
-BUILDLINK_RECOMMENDED.pytk?= ${PYPKGPREFIX}-Tk>=0nb4
+BUILDLINK_API_DEPENDS.pytk+= ${PYPKGPREFIX}-Tk-[0-9]*
+BUILDLINK_ABI_DEPENDS.pytk?= ${PYPKGPREFIX}-Tk>=0nb4
BUILDLINK_PKGSRCDIR.pytk?= ../../x11/py-Tk
.endif # PYTK_BUILDLINK3_MK
diff --git a/x11/py-Xlib/buildlink3.mk b/x11/py-Xlib/buildlink3.mk
index dc4d274b09a..d11fccde65d 100644
--- a/x11/py-Xlib/buildlink3.mk
+++ b/x11/py-Xlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:11:41 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:23:02 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_XLIB_BUILDLINK3_MK:= ${PY_XLIB_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npy-Xlib}
BUILDLINK_PACKAGES+= py-Xlib
.if !empty(PY_XLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.py-Xlib+= ${PYPKGPREFIX}-Xlib>=0.12
-BUILDLINK_RECOMMENDED.py-Xlib?= ${PYPKGPREFIX}-Xlib>=0.12nb1
+BUILDLINK_API_DEPENDS.py-Xlib+= ${PYPKGPREFIX}-Xlib>=0.12
+BUILDLINK_ABI_DEPENDS.py-Xlib?= ${PYPKGPREFIX}-Xlib>=0.12nb1
BUILDLINK_PKGSRCDIR.py-Xlib?= ../../x11/py-Xlib
.endif # PY_XLIB_BUILDLINK3_MK
diff --git a/x11/py-gnome2-extras/Makefile b/x11/py-gnome2-extras/Makefile
index f149169dac2..490d4698a48 100644
--- a/x11/py-gnome2-extras/Makefile
+++ b/x11/py-gnome2-extras/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/06 00:18:27 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2006/04/06 06:23:02 reed Exp $
#
DISTNAME= gnome-python-extras-2.12.0
@@ -21,7 +21,7 @@ USE_TOOLS+= pkg-config
PYTHON_VERSIONS_ACCEPTED= 24 23
-BUILDLINK_DEPENDS.nautilus-cd-burner+= nautilus-cd-burner>=2.11.1
+BUILDLINK_API_DEPENDS.nautilus-cd-burner+= nautilus-cd-burner>=2.11.1
.include "../../lang/python/extension.mk"
.include "../../lang/python/application.mk"
diff --git a/x11/py-gnome2-extras/buildlink3.mk b/x11/py-gnome2-extras/buildlink3.mk
index 401e13e6397..6e7889e1097 100644
--- a/x11/py-gnome2-extras/buildlink3.mk
+++ b/x11/py-gnome2-extras/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:11:41 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:23:02 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_GNOME2EX_BUILDLINK3_MK:= ${PY_GNOME2EX_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npygnome2ex}
BUILDLINK_PACKAGES+= pygnome2ex
.if !empty(PY_GNOME2EX_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pygnome2ex+= ${PYPKGPREFIX}-gnome2-extras>=2.12.0nb3
-BUILDLINK_RECOMMENDED.pygnome2ex?= ${PYPKGPREFIX}-gnome2-extras>=2.12.0nb5
+BUILDLINK_API_DEPENDS.pygnome2ex+= ${PYPKGPREFIX}-gnome2-extras>=2.12.0nb3
+BUILDLINK_ABI_DEPENDS.pygnome2ex?= ${PYPKGPREFIX}-gnome2-extras>=2.12.0nb5
BUILDLINK_PKGSRCDIR.pygnome2ex?= ../../x11/py-gnome2-extras
.endif # PY_GNOME2EX_BUILDLINK3_MK
diff --git a/x11/py-gnome2/Makefile b/x11/py-gnome2/Makefile
index 559b2929a29..0691f97e5ce 100644
--- a/x11/py-gnome2/Makefile
+++ b/x11/py-gnome2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2006/03/06 00:18:27 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2006/04/06 06:23:02 reed Exp $
#
DISTNAME= gnome-python-2.12.3
@@ -24,18 +24,18 @@ PYTHON_VERSIONS_ACCEPTED= 24 23
.include "../../lang/python/extension.mk"
.include "../../lang/python/application.mk"
-BUILDLINK_DEPENDS.GConf2+= GConf2>=2.11.1
+BUILDLINK_API_DEPENDS.GConf2+= GConf2>=2.11.1
.include "../../devel/GConf2/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
.include "../../devel/libbonoboui/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../graphics/libgnomecanvas/buildlink3.mk"
-BUILDLINK_DEPENDS.pyorbit+= ${PYPKGPREFIX}-ORBit>=2.0.1
+BUILDLINK_API_DEPENDS.pyorbit+= ${PYPKGPREFIX}-ORBit>=2.0.1
.include "../../net/py-ORBit/buildlink3.mk"
-BUILDLINK_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.9.0
+BUILDLINK_API_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.9.0
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
-BUILDLINK_DEPENDS.pygtk2+= ${PYPKGPREFIX}-gtk2>=2.6.2
+BUILDLINK_API_DEPENDS.pygtk2+= ${PYPKGPREFIX}-gtk2>=2.6.2
.include "../../x11/py-gtk2/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
diff --git a/x11/py-gnome2/buildlink3.mk b/x11/py-gnome2/buildlink3.mk
index bd140fe0cf9..e2ed8487056 100644
--- a/x11/py-gnome2/buildlink3.mk
+++ b/x11/py-gnome2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/02/05 23:11:41 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2006/04/06 06:23:02 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_GNOME2_BUILDLINK3_MK:= ${PY_GNOME2_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npygnome2}
BUILDLINK_PACKAGES+= pygnome2
.if !empty(PY_GNOME2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pygnome2+= ${PYPKGPREFIX}-gnome2>=2.10.0
-BUILDLINK_RECOMMENDED.pygnome2?= ${PYPKGPREFIX}-gnome2>=2.12.1nb3
+BUILDLINK_API_DEPENDS.pygnome2+= ${PYPKGPREFIX}-gnome2>=2.10.0
+BUILDLINK_ABI_DEPENDS.pygnome2?= ${PYPKGPREFIX}-gnome2>=2.12.1nb3
BUILDLINK_PKGSRCDIR.pygnome2?= ../../x11/py-gnome2
.endif # PY_GNOME2_BUILDLINK3_MK
diff --git a/x11/py-gtk2/buildlink3.mk b/x11/py-gtk2/buildlink3.mk
index 665e5df149e..a89ded80b61 100644
--- a/x11/py-gtk2/buildlink3.mk
+++ b/x11/py-gtk2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/02/07 21:27:28 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2006/04/06 06:23:02 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_GTK2_BUILDLINK3_MK:= ${PY_GTK2_BUILDLINK3_MK}+
@@ -13,7 +13,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npygtk2}
BUILDLINK_PACKAGES+= pygtk2
.if !empty(PY_GTK2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pygtk2+= ${PYPKGPREFIX}-gtk2>=2.8.4
+BUILDLINK_API_DEPENDS.pygtk2+= ${PYPKGPREFIX}-gtk2>=2.8.4
BUILDLINK_PKGSRCDIR.pygtk2?= ../../x11/py-gtk2
.endif # PY_GTK2_BUILDLINK3_MK
diff --git a/x11/py-qt2-sip/buildlink3.mk b/x11/py-qt2-sip/buildlink3.mk
index 44efe086b93..924dbc746a5 100644
--- a/x11/py-qt2-sip/buildlink3.mk
+++ b/x11/py-qt2-sip/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:11:41 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:23:02 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_QT2_SIP_BUILDLINK3_MK:= ${PY_QT2_SIP_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npyqt2sip}
BUILDLINK_PACKAGES+= pyqt2sip
.if !empty(PY_QT2_SIP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pyqt2sip+= ${PYPKGPREFIX}-qt2-sip-[0-9]*
-BUILDLINK_RECOMMENDED.pyqt2sip+= ${PYPKGPREFIX}-qt2-sip>=3.1nb3
+BUILDLINK_API_DEPENDS.pyqt2sip+= ${PYPKGPREFIX}-qt2-sip-[0-9]*
+BUILDLINK_ABI_DEPENDS.pyqt2sip+= ${PYPKGPREFIX}-qt2-sip>=3.1nb3
BUILDLINK_PKGSRCDIR.pyqt2sip?= ../../x11/py-qt2-sip
.endif # PY_QT2_SIP_BUILDLINK3_MK
diff --git a/x11/py-qt2/Makefile b/x11/py-qt2/Makefile
index 1867d5eccce..853a998fe69 100644
--- a/x11/py-qt2/Makefile
+++ b/x11/py-qt2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/03/02 21:53:52 drochner Exp $
+# $NetBSD: Makefile,v 1.20 2006/04/06 06:23:02 reed Exp $
#
DISTNAME= PyQt-3.1-Qt-2.3.1
@@ -24,7 +24,7 @@ MAKE_ENV+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
# MesaLib is pulled in through qt2-libs; we need a version
# which doesn't (needlessly) link to libpthread
-BUILDLINK_DEPENDS.MesaLib+= MesaLib>=6.4.2nb1
+BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=6.4.2nb1
.include "../../lang/python/extension.mk"
diff --git a/x11/py-qt3-base/Makefile b/x11/py-qt3-base/Makefile
index ce776f8341e..01669076ef5 100644
--- a/x11/py-qt3-base/Makefile
+++ b/x11/py-qt3-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/02/10 10:45:02 drochner Exp $
+# $NetBSD: Makefile,v 1.23 2006/04/06 06:23:03 reed Exp $
#
.include "../../x11/py-qt3-base/Makefile.common"
@@ -8,7 +8,7 @@ PKGREVISION= 2
COMMENT= Python binding for Qt3
-BUILDLINK_DEPENDS.qt3-tools+= qt3-tools>=3.1.2nb2
+BUILDLINK_API_DEPENDS.qt3-tools+= qt3-tools>=3.1.2nb2
PLIST_SRC= ${PKGDIR}/PLIST.common
.if ${OPSYS} == "Darwin"
diff --git a/x11/py-qt3-base/buildlink3.mk b/x11/py-qt3-base/buildlink3.mk
index 4fbb91cfa5a..df09a202bcb 100644
--- a/x11/py-qt3-base/buildlink3.mk
+++ b/x11/py-qt3-base/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:11:41 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:23:03 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PYQT3_BASE_BUILDLINK3_MK:= ${PYQT3_BASE_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npyqt3-base}
BUILDLINK_PACKAGES+= pyqt3-base
.if !empty(PYQT3_BASE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pyqt3-base+= ${PYPKGPREFIX}-qt3-base>=3.11
-BUILDLINK_RECOMMENDED.pyqt3-base?= ${PYPKGPREFIX}-qt3-base>=3.15.1nb2
+BUILDLINK_API_DEPENDS.pyqt3-base+= ${PYPKGPREFIX}-qt3-base>=3.11
+BUILDLINK_ABI_DEPENDS.pyqt3-base?= ${PYPKGPREFIX}-qt3-base>=3.15.1nb2
BUILDLINK_PKGSRCDIR.pyqt3-base?= ../../x11/py-qt3-base
BUILDLINK_LIBDIRS.pyqt3-base+= ${PYSITELIB}
diff --git a/x11/py-qt3-modules/buildlink3.mk b/x11/py-qt3-modules/buildlink3.mk
index 09f5ec3f4ee..03357aa6af5 100644
--- a/x11/py-qt3-modules/buildlink3.mk
+++ b/x11/py-qt3-modules/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:11:41 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:23:03 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PYQT3_MOD_BUILDLINK3_MK:= ${PYQT3_MOD_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npyqt3-mod}
BUILDLINK_PACKAGES+= pyqt3-mod
.if !empty(PYQT3_MOD_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pyqt3-mod+= ${PYPKGPREFIX}-qt3-modules>=3.11
-BUILDLINK_RECOMMENDED.pyqt3-mod?= ${PYPKGPREFIX}-qt3-modules>=3.15.1nb2
+BUILDLINK_API_DEPENDS.pyqt3-mod+= ${PYPKGPREFIX}-qt3-modules>=3.11
+BUILDLINK_ABI_DEPENDS.pyqt3-mod?= ${PYPKGPREFIX}-qt3-modules>=3.15.1nb2
BUILDLINK_PKGSRCDIR.pyqt3-mod?= ../../x11/py-qt3-modules
BUILDLINK_LIBDIRS.pyqt3-mod+= ${PYSITELIB}
diff --git a/x11/py-qt3-sip/buildlink3.mk b/x11/py-qt3-sip/buildlink3.mk
index 62a29fc34e6..d6d4fd5111a 100644
--- a/x11/py-qt3-sip/buildlink3.mk
+++ b/x11/py-qt3-sip/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:11:41 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:23:03 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PYQT3_SIP_BUILDLINK3_MK:= ${PYQT3_SIP_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npyqt3-sip}
BUILDLINK_PACKAGES+= pyqt3-sip
.if !empty(PYQT3_SIP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pyqt3-sip+= ${PYPKGPREFIX}-qt3-sip>=4.0rc3
-BUILDLINK_RECOMMENDED.pyqt3-sip?= ${PYPKGPREFIX}-qt3-sip>=4.3.2nb2
+BUILDLINK_API_DEPENDS.pyqt3-sip+= ${PYPKGPREFIX}-qt3-sip>=4.0rc3
+BUILDLINK_ABI_DEPENDS.pyqt3-sip?= ${PYPKGPREFIX}-qt3-sip>=4.3.2nb2
BUILDLINK_PKGSRCDIR.pyqt3-sip?= ../../x11/py-qt3-sip
BUILDLINK_LIBDIRS.pyqt3-sip+= ${PYSITELIB}
diff --git a/x11/py-wxWidgets/buildlink3.mk b/x11/py-wxWidgets/buildlink3.mk
index f4efe7bf2eb..fa9664e489b 100644
--- a/x11/py-wxWidgets/buildlink3.mk
+++ b/x11/py-wxWidgets/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:11:41 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:23:03 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_WXWIDGETS_BUILDLINK3_MK:= ${PY_WXWIDGETS_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:N${PYPKGPREFIX}-wxWidgets}
BUILDLINK_PACKAGES+= ${PYPKGPREFIX}-wxWidgets
.if !empty(PY_WXWIDGETS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.${PYPKGPREFIX}-wxWidgets+= ${PYPKGPREFIX}-wxWidgets>=2.6.1.0
-BUILDLINK_RECOMMENDED.${PYPKGPREFIX}-wxWidgets?= ${PYPKGPREFIX}-wxWidgets>=2.6.1.0nb3
+BUILDLINK_API_DEPENDS.${PYPKGPREFIX}-wxWidgets+= ${PYPKGPREFIX}-wxWidgets>=2.6.1.0
+BUILDLINK_ABI_DEPENDS.${PYPKGPREFIX}-wxWidgets?= ${PYPKGPREFIX}-wxWidgets>=2.6.1.0nb3
BUILDLINK_PKGSRCDIR.${PYPKGPREFIX}-wxWidgets?= ../../x11/py-wxWidgets
.include "../../x11/wxGTK/buildlink3.mk"
diff --git a/x11/pygtk/buildlink3.mk b/x11/pygtk/buildlink3.mk
index 5528cb99aee..64183d6d70a 100644
--- a/x11/pygtk/buildlink3.mk
+++ b/x11/pygtk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:11:41 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:23:03 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_GTK_BUILDLINK3_MK:= ${PY_GTK_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npygtk}
BUILDLINK_PACKAGES+= pygtk
.if !empty(PY_GTK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pygtk+= ${PYPKGPREFIX}-gtk>=0.6.9nb4
-BUILDLINK_RECOMMENDED.pygtk+= ${PYPKGPREFIX}-gtk>=0.6.11nb2
+BUILDLINK_API_DEPENDS.pygtk+= ${PYPKGPREFIX}-gtk>=0.6.9nb4
+BUILDLINK_ABI_DEPENDS.pygtk+= ${PYPKGPREFIX}-gtk>=0.6.11nb2
BUILDLINK_PKGSRCDIR.pygtk?= ../../x11/pygtk
.endif # PY_GTK_BUILDLINK3_MK
diff --git a/x11/qt1/buildlink3.mk b/x11/qt1/buildlink3.mk
index a795f2a696e..0a46e3a891c 100644
--- a/x11/qt1/buildlink3.mk
+++ b/x11/qt1/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:11:41 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:23:03 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
QT1_BUILDLINK3_MK:= ${QT1_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nqt1}
BUILDLINK_PACKAGES+= qt1
.if !empty(QT1_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.qt1+= qt1>=1.44
-BUILDLINK_RECOMMENDED.qt1+= qt1>=1.44nb3
+BUILDLINK_API_DEPENDS.qt1+= qt1>=1.44
+BUILDLINK_ABI_DEPENDS.qt1+= qt1>=1.44nb3
BUILDLINK_PKGSRCDIR.qt1?= ../../x11/qt1
BUILDLINK_PASSTHRU_DIRS= ${LOCALBASE}/qt1
diff --git a/x11/qt2-designer/buildlink3.mk b/x11/qt2-designer/buildlink3.mk
index 9c6d68b401b..4a1219fa291 100644
--- a/x11/qt2-designer/buildlink3.mk
+++ b/x11/qt2-designer/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:11:42 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:23:03 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
QT2_DESIGNER_BUILDLINK3_MK:= ${QT2_DESIGNER_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nqt2-designer}
BUILDLINK_PACKAGES+= qt2-designer
.if !empty(QT2_DESIGNER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.qt2-designer+= qt2-designer>=2.3.1nb2
-BUILDLINK_RECOMMENDED.qt2-designer+= qt2-designer>=2.3.1nb5
+BUILDLINK_API_DEPENDS.qt2-designer+= qt2-designer>=2.3.1nb2
+BUILDLINK_ABI_DEPENDS.qt2-designer+= qt2-designer>=2.3.1nb5
BUILDLINK_PKGSRCDIR.qt2-designer?= ../../x11/qt2-designer
.endif # QT2_DESIGNER_BUILDLINK3_MK
diff --git a/x11/qt2-libs/buildlink3.mk b/x11/qt2-libs/buildlink3.mk
index 0936881ddd7..8c19310a671 100644
--- a/x11/qt2-libs/buildlink3.mk
+++ b/x11/qt2-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:11:42 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:23:03 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
QT2_LIBS_BUILDLINK3_MK:= ${QT2_LIBS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nqt2-libs}
BUILDLINK_PACKAGES+= qt2-libs
.if !empty(QT2_LIBS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.qt2-libs+= qt2-libs>=2.3.1nb2
-BUILDLINK_RECOMMENDED.qt2-libs+= qt2-libs>=2.3.1nb8
+BUILDLINK_API_DEPENDS.qt2-libs+= qt2-libs>=2.3.1nb2
+BUILDLINK_ABI_DEPENDS.qt2-libs+= qt2-libs>=2.3.1nb8
BUILDLINK_PKGSRCDIR.qt2-libs?= ../../x11/qt2-libs
BUILDLINK_INCDIRS.qt2-libs= qt2/include
BUILDLINK_LIBDIRS.qt2-libs= qt2/lib
diff --git a/x11/qt3-libs/buildlink3.mk b/x11/qt3-libs/buildlink3.mk
index 55ec275e4a1..bb578572b11 100644
--- a/x11/qt3-libs/buildlink3.mk
+++ b/x11/qt3-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/02/17 23:24:17 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/04/06 06:23:03 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
QT3_LIBS_BUILDLINK3_MK:= ${QT3_LIBS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nqt3-libs}
BUILDLINK_PACKAGES+= qt3-libs
.if !empty(QT3_LIBS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.qt3-libs+= qt3-libs>=3.2.3
-BUILDLINK_RECOMMENDED.qt3-libs?= qt3-libs>=3.3.5nb4
+BUILDLINK_API_DEPENDS.qt3-libs+= qt3-libs>=3.2.3
+BUILDLINK_ABI_DEPENDS.qt3-libs?= qt3-libs>=3.3.5nb4
BUILDLINK_PKGSRCDIR.qt3-libs?= ../../x11/qt3-libs
BUILDLINK_INCDIRS.qt3-libs+= qt3/include
diff --git a/x11/qt3-qscintilla/buildlink3.mk b/x11/qt3-qscintilla/buildlink3.mk
index ea34cdbdde2..7c5112e0d34 100644
--- a/x11/qt3-qscintilla/buildlink3.mk
+++ b/x11/qt3-qscintilla/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:11:42 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:23:03 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
QT3_QSCINTILLA_BUILDLINK3_MK:= ${QT3_QSCINTILLA_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nqt3-qscintilla}
BUILDLINK_PACKAGES+= qt3-qscintilla
.if !empty(QT3_QSCINTILLA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.qt3-qscintilla+= qt3-qscintilla>=1.2
-BUILDLINK_RECOMMENDED.qt3-qscintilla+= qt3-qscintilla>=1.6nb2
+BUILDLINK_API_DEPENDS.qt3-qscintilla+= qt3-qscintilla>=1.2
+BUILDLINK_ABI_DEPENDS.qt3-qscintilla+= qt3-qscintilla>=1.6nb2
BUILDLINK_PKGSRCDIR.qt3-qscintilla?= ../../x11/qt3-qscintilla
.endif # QT3_QSCINTILLA_BUILDLINK3_MK
diff --git a/x11/qt3-tools/buildlink3.mk b/x11/qt3-tools/buildlink3.mk
index ca8ea484f1f..3ce7929074f 100644
--- a/x11/qt3-tools/buildlink3.mk
+++ b/x11/qt3-tools/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/17 23:26:26 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:23:03 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
QT3_TOOLS_BUILDLINK3_MK:= ${QT3_TOOLS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nqt3-tools}
BUILDLINK_PACKAGES+= qt3-tools
.if !empty(QT3_TOOLS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.qt3-tools+= qt3-tools>=3.1.2nb3
-BUILDLINK_RECOMMENDED.qt3-tools+= qt3-tools>=3.3.5nb3
+BUILDLINK_API_DEPENDS.qt3-tools+= qt3-tools>=3.1.2nb3
+BUILDLINK_ABI_DEPENDS.qt3-tools+= qt3-tools>=3.3.5nb3
BUILDLINK_PKGSRCDIR.qt3-tools?= ../../x11/qt3-tools
BUILDLINK_DEPMETHOD.qt3-tools?= build
.endif # QT3_TOOLS_BUILDLINK3_MK
diff --git a/x11/qt4-libs/buildlink3.mk b/x11/qt4-libs/buildlink3.mk
index 463d9a30937..3b6d8de7736 100644
--- a/x11/qt4-libs/buildlink3.mk
+++ b/x11/qt4-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/25 09:25:00 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:23:03 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
QT4_LIBS_BUILDLINK3_MK:= ${QT4_LIBS_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nqt4-libs}
BUILDLINK_PACKAGES+= qt4-libs
.if !empty(QT4_LIBS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.qt4-libs+= qt4-libs>=4.1.0
+BUILDLINK_API_DEPENDS.qt4-libs+= qt4-libs>=4.1.0
BUILDLINK_PKGSRCDIR.qt4-libs?= ../../x11/qt4-libs
BUILDLINK_INCDIRS.qt4-libs+= qt4/include
diff --git a/x11/qt4-tools/buildlink3.mk b/x11/qt4-tools/buildlink3.mk
index 6d3fb4d663e..6914451eb06 100644
--- a/x11/qt4-tools/buildlink3.mk
+++ b/x11/qt4-tools/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/02/20 12:09:01 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:23:03 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
QT4_TOOLS_BUILDLINK3_MK:= ${QT4_TOOLS_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nqt4-tools}
BUILDLINK_PACKAGES+= qt4-tools
.if !empty(QT4_TOOLS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.qt4-tools+= qt4-tools>=4.1.0
+BUILDLINK_API_DEPENDS.qt4-tools+= qt4-tools>=4.1.0
BUILDLINK_PKGSRCDIR.qt4-tools?= ../../x11/qt4-tools
BUILDLINK_DEPMETHOD.qt4-tools?= build
.endif # QT4_TOOLS_BUILDLINK3_MK
diff --git a/x11/randrext/buildlink3.mk b/x11/randrext/buildlink3.mk
index d23b4e0dc3b..af6b58b15cf 100644
--- a/x11/randrext/buildlink3.mk
+++ b/x11/randrext/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:11:42 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:23:03 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
RANDREXT_BUILDLINK3_MK:= ${RANDREXT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nrandrext}
BUILDLINK_PACKAGES+= randrext
.if !empty(RANDREXT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.randrext+= randrext>=1.0
-BUILDLINK_RECOMMENDED.randrext?= randrext>=1.0nb2
+BUILDLINK_API_DEPENDS.randrext+= randrext>=1.0
+BUILDLINK_ABI_DEPENDS.randrext?= randrext>=1.0nb2
BUILDLINK_PKGSRCDIR.randrext?= ../../x11/randrext
BUILDLINK_DEPMETHOD.randrext?= build
.endif # RANDREXT_BUILDLINK3_MK
diff --git a/x11/randrext/builtin.mk b/x11/randrext/builtin.mk
index c5a26239366..a387fd53497 100644
--- a/x11/randrext/builtin.mk
+++ b/x11/randrext/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.4 2006/03/30 18:06:19 jlam Exp $
+# $NetBSD: builtin.mk,v 1.5 2006/04/06 06:23:03 reed Exp $
BUILTIN_PKG:= randrext
@@ -52,7 +52,7 @@ USE_BUILTIN.randrext= ${IS_BUILTIN.randrext}
. if defined(BUILTIN_PKG.randrext) && \
!empty(IS_BUILTIN.randrext:M[yY][eE][sS])
USE_BUILTIN.randrext= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.randrext}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.randrext}
. if !empty(USE_BUILTIN.randrext:M[yY][eE][sS])
USE_BUILTIN.randrext!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.randrext:Q}; then \
@@ -75,7 +75,7 @@ CHECK_BUILTIN.randrext?= no
.if !empty(CHECK_BUILTIN.randrext:M[nN][oO])
. if !empty(USE_BUILTIN.randrext:M[nN][oO])
-BUILDLINK_DEPENDS.randrext+= randrext>=1.0
+BUILDLINK_API_DEPENDS.randrext+= randrext>=1.0
. endif
. if !empty(USE_BUILTIN.randrext:M[yY][eE][sS])
diff --git a/x11/renderext/buildlink3.mk b/x11/renderext/buildlink3.mk
index c795e24292d..6d236293f37 100644
--- a/x11/renderext/buildlink3.mk
+++ b/x11/renderext/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/10/15 16:36:57 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:23:03 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
RENDEREXT_BUILDLINK3_MK:= ${RENDEREXT_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nrenderext}
BUILDLINK_PACKAGES+= renderext
.if !empty(RENDEREXT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.renderext+= renderext>=0.9
+BUILDLINK_API_DEPENDS.renderext+= renderext>=0.9
BUILDLINK_PKGSRCDIR.renderext?= ../../x11/renderext
BUILDLINK_DEPMETHOD.renderext?= build
.endif # RENDEREXT_BUILDLINK3_MK
diff --git a/x11/renderext/builtin.mk b/x11/renderext/builtin.mk
index f85455cf1fb..ba8570aaba5 100644
--- a/x11/renderext/builtin.mk
+++ b/x11/renderext/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.2 2006/03/30 18:06:19 jlam Exp $
+# $NetBSD: builtin.mk,v 1.3 2006/04/06 06:23:03 reed Exp $
BUILTIN_PKG:= renderext
@@ -52,7 +52,7 @@ USE_BUILTIN.renderext= ${IS_BUILTIN.renderext}
. if defined(BUILTIN_PKG.renderext) && \
!empty(IS_BUILTIN.renderext:M[yY][eE][sS])
USE_BUILTIN.renderext= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.renderext}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.renderext}
. if !empty(USE_BUILTIN.renderext:M[yY][eE][sS])
USE_BUILTIN.renderext!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.renderext:Q}; then \
@@ -75,7 +75,7 @@ CHECK_BUILTIN.renderext?= no
.if !empty(CHECK_BUILTIN.renderext:M[nN][oO])
. if !empty(USE_BUILTIN.renderext:M[nN][oO])
-BUILDLINK_DEPENDS.renderext+= renderext>=0.9
+BUILDLINK_API_DEPENDS.renderext+= renderext>=0.9
. endif
. if !empty(USE_BUILTIN.renderext:M[yY][eE][sS])
diff --git a/x11/startup-notification/buildlink3.mk b/x11/startup-notification/buildlink3.mk
index 2576888574e..b9a9c200a9b 100644
--- a/x11/startup-notification/buildlink3.mk
+++ b/x11/startup-notification/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:11:43 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:23:03 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
STARTUP_NOTIFICATION_BUILDLINK3_MK:= ${STARTUP_NOTIFICATION_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nstartup-notification}
BUILDLINK_PACKAGES+= startup-notification
.if !empty(STARTUP_NOTIFICATION_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.startup-notification+= startup-notification>=0.5
-BUILDLINK_RECOMMENDED.startup-notification+= startup-notification>=0.8nb1
+BUILDLINK_API_DEPENDS.startup-notification+= startup-notification>=0.5
+BUILDLINK_ABI_DEPENDS.startup-notification+= startup-notification>=0.8nb1
BUILDLINK_PKGSRCDIR.startup-notification?= ../../x11/startup-notification
.endif # STARTUP_NOTIFICATION_BUILDLINK3_MK
diff --git a/x11/tk-BWidget/buildlink3.mk b/x11/tk-BWidget/buildlink3.mk
index a8ac90579df..e61bb36fedb 100644
--- a/x11/tk-BWidget/buildlink3.mk
+++ b/x11/tk-BWidget/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:11:43 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:23:04 reed Exp $
#
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntk-BWidget}
BUILDLINK_PACKAGES+= tk-BWidget
.if !empty(TK_BWIDGET_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tk-BWidget+= tk-BWidget>=1.7.0
-BUILDLINK_RECOMMENDED.tk-BWidget?= tk-BWidget>=1.7.0nb1
+BUILDLINK_API_DEPENDS.tk-BWidget+= tk-BWidget>=1.7.0
+BUILDLINK_ABI_DEPENDS.tk-BWidget?= tk-BWidget>=1.7.0nb1
BUILDLINK_PKGSRCDIR.tk-BWidget?= ../../x11/tk-BWidget
.endif # TK_BWIDGET_BUILDLINK3_MK
diff --git a/x11/tk/buildlink3.mk b/x11/tk/buildlink3.mk
index ffe5414d890..adbc3c6d40e 100644
--- a/x11/tk/buildlink3.mk
+++ b/x11/tk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2006/02/05 23:11:43 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2006/04/06 06:23:03 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
TK_BUILDLINK3_MK:= ${TK_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntk}
BUILDLINK_PACKAGES+= tk
.if !empty(TK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tk+= tk>=8.4.6nb1
-BUILDLINK_RECOMMENDED.tk+= tk>=8.4.12nb1
+BUILDLINK_API_DEPENDS.tk+= tk>=8.4.6nb1
+BUILDLINK_ABI_DEPENDS.tk+= tk>=8.4.12nb1
BUILDLINK_PKGSRCDIR.tk?= ../../x11/tk
BUILDLINK_FILES.tk= bin/wish*
diff --git a/x11/tk83/buildlink3.mk b/x11/tk83/buildlink3.mk
index 460f6b664cc..6f695e6f879 100644
--- a/x11/tk83/buildlink3.mk
+++ b/x11/tk83/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:11:43 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:23:04 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
TK_BUILDLINK3_MK:= ${TK_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntk}
BUILDLINK_PACKAGES+= tk
.if !empty(TK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tk+= tk-8.3.4*
-BUILDLINK_RECOMMENDED.tk?= tk>=8.3.4nb2
+BUILDLINK_API_DEPENDS.tk+= tk-8.3.4*
+BUILDLINK_ABI_DEPENDS.tk?= tk>=8.3.4nb2
BUILDLINK_PKGSRCDIR.tk?= ../../x11/tk83
BUILDLINK_FILES.tk= bin/wish*
diff --git a/x11/vte/Makefile b/x11/vte/Makefile
index b3f308385f9..bf4012a2364 100644
--- a/x11/vte/Makefile
+++ b/x11/vte/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2006/03/30 21:18:06 jmmv Exp $
+# $NetBSD: Makefile,v 1.31 2006/04/06 06:23:04 reed Exp $
#
DISTNAME= vte-0.12.0
@@ -26,7 +26,7 @@ CONFIGURE_ARGS+= --with-ft-exec-prefix=${BUILDLINK_PREFIX.freetype2}
PKGCONFIG_OVERRIDE+= vte.pc.in
# for FC_WIDTH
-BUILDLINK_DEPENDS.fontconfig+= fontconfig>=2.1.93
+BUILDLINK_API_DEPENDS.fontconfig+= fontconfig>=2.1.93
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
diff --git a/x11/vte/buildlink3.mk b/x11/vte/buildlink3.mk
index 55730644226..538c5657774 100644
--- a/x11/vte/buildlink3.mk
+++ b/x11/vte/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/05 23:11:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:23:04 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
VTE_BUILDLINK3_MK:= ${VTE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nvte}
BUILDLINK_PACKAGES+= vte
.if !empty(VTE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.vte+= vte>=0.11.11
-BUILDLINK_RECOMMENDED.vte+= vte>=0.11.15nb2
+BUILDLINK_API_DEPENDS.vte+= vte>=0.11.11
+BUILDLINK_ABI_DEPENDS.vte+= vte>=0.11.15nb2
BUILDLINK_PKGSRCDIR.vte?= ../../x11/vte
.endif # VTE_BUILDLINK3_MK
diff --git a/x11/wxGTK-contrib/buildlink3.mk b/x11/wxGTK-contrib/buildlink3.mk
index 93d9fccb91b..730733a6f51 100644
--- a/x11/wxGTK-contrib/buildlink3.mk
+++ b/x11/wxGTK-contrib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:11:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:23:04 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
WXGTK_CONTRIB_BUILDLINK3_MK:= ${WXGTK_CONTRIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NwxGTK-contrib}
BUILDLINK_PACKAGES+= wxGTK-contrib
.if !empty(WXGTK_CONTRIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.wxGTK-contrib+= wxGTK-contrib>=2.6.0
-BUILDLINK_RECOMMENDED.wxGTK-contrib?= wxGTK-contrib>=2.6.2nb2
+BUILDLINK_API_DEPENDS.wxGTK-contrib+= wxGTK-contrib>=2.6.0
+BUILDLINK_ABI_DEPENDS.wxGTK-contrib?= wxGTK-contrib>=2.6.2nb2
BUILDLINK_PKGSRCDIR.wxGTK-contrib?= ../../x11/wxGTK-contrib
.include "../../devel/zlib/buildlink3.mk"
diff --git a/x11/wxGTK/buildlink3.mk b/x11/wxGTK/buildlink3.mk
index 8d4c4b43595..1e5fa415b96 100644
--- a/x11/wxGTK/buildlink3.mk
+++ b/x11/wxGTK/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/02/05 23:11:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/04/06 06:23:04 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
WXGTK_BUILDLINK3_MK:= ${WXGTK_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NwxGTK}
BUILDLINK_PACKAGES+= wxGTK
.if !empty(WXGTK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.wxGTK+= wxGTK>=2.6.0
-BUILDLINK_RECOMMENDED.wxGTK?= wxGTK>=2.6.2nb2
+BUILDLINK_API_DEPENDS.wxGTK+= wxGTK>=2.6.0
+BUILDLINK_ABI_DEPENDS.wxGTK?= wxGTK>=2.6.2nb2
BUILDLINK_PKGSRCDIR.wxGTK?= ../../x11/wxGTK
.endif # WXGTK_BUILDLINK3_MK
diff --git a/x11/wxGTK24/buildlink3.mk b/x11/wxGTK24/buildlink3.mk
index 81b545e8a7a..22e367b10ca 100644
--- a/x11/wxGTK24/buildlink3.mk
+++ b/x11/wxGTK24/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:11:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:23:04 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
WXGTK24_BUILDLINK3_MK:= ${WXGTK24_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NwxGTK24}
BUILDLINK_PACKAGES+= wxGTK24
.if !empty(WXGTK24_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.wxGTK24+= wxGTK24>=2.4.2
-BUILDLINK_RECOMMENDED.wxGTK24?= wxGTK24>=2.4.2nb9
+BUILDLINK_API_DEPENDS.wxGTK24+= wxGTK24>=2.4.2
+BUILDLINK_ABI_DEPENDS.wxGTK24?= wxGTK24>=2.4.2nb9
BUILDLINK_PKGSRCDIR.wxGTK24?= ../../x11/wxGTK24
.endif # WXGTK24_BUILDLINK3_MK
diff --git a/x11/xcursor/Makefile b/x11/xcursor/Makefile
index a50437582fb..50217c9cd24 100644
--- a/x11/xcursor/Makefile
+++ b/x11/xcursor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/03/31 23:24:50 reed Exp $
+# $NetBSD: Makefile,v 1.20 2006/04/06 06:23:04 reed Exp $
#
DISTNAME= libXcursor-1.1.2
@@ -23,7 +23,7 @@ GNU_CONFIGURE= yes
PKGCONFIG_OVERRIDE+= xcursor.pc.in
-BUILDLINK_DEPENDS.Xrender+= Xrender>=0.8
+BUILDLINK_API_DEPENDS.Xrender+= Xrender>=0.8
.include "../../x11/Xfixes/buildlink3.mk"
.include "../../x11/Xrender/buildlink3.mk"
diff --git a/x11/xcursor/buildlink3.mk b/x11/xcursor/buildlink3.mk
index 9996b3c0d87..1a25939ea71 100644
--- a/x11/xcursor/buildlink3.mk
+++ b/x11/xcursor/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2006/02/05 23:11:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2006/04/06 06:23:04 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XCURSOR_BUILDLINK3_MK:= ${XCURSOR_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxcursor}
BUILDLINK_PACKAGES+= xcursor
.if !empty(XCURSOR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xcursor+= xcursor>=1.0
-BUILDLINK_RECOMMENDED.xcursor+= xcursor>=1.1.2nb1
+BUILDLINK_API_DEPENDS.xcursor+= xcursor>=1.0
+BUILDLINK_ABI_DEPENDS.xcursor+= xcursor>=1.1.2nb1
BUILDLINK_PKGSRCDIR.xcursor?= ../../x11/xcursor
.endif # XCURSOR_BUILDLINK3_MK
diff --git a/x11/xcursor/builtin.mk b/x11/xcursor/builtin.mk
index d29ac9b8630..df3f01f6947 100644
--- a/x11/xcursor/builtin.mk
+++ b/x11/xcursor/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.11 2006/03/30 18:06:19 jlam Exp $
+# $NetBSD: builtin.mk,v 1.12 2006/04/06 06:23:04 reed Exp $
BUILTIN_PKG:= xcursor
@@ -57,7 +57,7 @@ USE_BUILTIN.xcursor= ${IS_BUILTIN.xcursor}
. if defined(BUILTIN_PKG.xcursor) && \
!empty(IS_BUILTIN.xcursor:M[yY][eE][sS])
USE_BUILTIN.xcursor= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.xcursor}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.xcursor}
. if !empty(USE_BUILTIN.xcursor:M[yY][eE][sS])
USE_BUILTIN.xcursor!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.xcursor:Q}; then \
@@ -80,8 +80,8 @@ CHECK_BUILTIN.xcursor?= no
.if !empty(CHECK_BUILTIN.xcursor:M[nN][oO])
. if !empty(USE_BUILTIN.xcursor:M[nN][oO])
-BUILDLINK_DEPENDS.xcursor+= xcursor>=1.1.1
-BUILDLINK_DEPENDS.Xrender+= Xrender>=0.8
+BUILDLINK_API_DEPENDS.xcursor+= xcursor>=1.1.1
+BUILDLINK_API_DEPENDS.Xrender+= Xrender>=0.8
. for _mkfile_ in buildlink3.mk builtin.mk
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
. sinclude "../../x11/Xfixes/${_mkfile_}"
diff --git a/x11/xextensions/buildlink3.mk b/x11/xextensions/buildlink3.mk
index b1e4fd4e6e1..979fee245e9 100644
--- a/x11/xextensions/buildlink3.mk
+++ b/x11/xextensions/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/05/08 21:57:04 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:23:04 reed Exp $
#
# This Makefile fragment is included by packages that use xextensions.
#
@@ -14,7 +14,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxextensions}
BUILDLINK_PACKAGES+= xextensions
.if !empty(XEXTENSIONS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xextensions?= xextensions>=1.0
+BUILDLINK_API_DEPENDS.xextensions?= xextensions>=1.0
BUILDLINK_PKGSRCDIR.xextensions?= ../../x11/xextensions
BUILDLINK_DEPMETHOD.xextensions?= build
.endif # XEXTENSIONS_BUILDLINK3_MK
diff --git a/x11/xextensions/builtin.mk b/x11/xextensions/builtin.mk
index 7e207fca3b1..87ee025f402 100644
--- a/x11/xextensions/builtin.mk
+++ b/x11/xextensions/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.9 2006/03/30 18:06:19 jlam Exp $
+# $NetBSD: builtin.mk,v 1.10 2006/04/06 06:23:04 reed Exp $
BUILTIN_PKG:= xextensions
@@ -37,7 +37,7 @@ USE_BUILTIN.xextensions= ${IS_BUILTIN.xextensions}
. if defined(BUILTIN_PKG.xextensions) && \
!empty(IS_BUILTIN.xextensions:M[yY][eE][sS])
USE_BUILTIN.xextensions= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.xextensions}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.xextensions}
. if !empty(USE_BUILTIN.xextensions:M[yY][eE][sS])
USE_BUILTIN.xextensions!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.xextensions:Q}; then \
diff --git a/x11/xfce4-clipman-plugin/buildlink3.mk b/x11/xfce4-clipman-plugin/buildlink3.mk
index d521d1f5350..174f5833740 100644
--- a/x11/xfce4-clipman-plugin/buildlink3.mk
+++ b/x11/xfce4-clipman-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/17 06:49:26 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:23:04 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK:= ${XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-clipman-plugin}
BUILDLINK_PACKAGES+= xfce4-clipman-plugin
.if !empty(XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-clipman-plugin+= xfce4-clipman-plugin>=0.4.1
-BUILDLINK_RECOMMENDED.xfce4-clipman-plugin?= xfce4-clipman-plugin>=0.4.1nb2
+BUILDLINK_API_DEPENDS.xfce4-clipman-plugin+= xfce4-clipman-plugin>=0.4.1
+BUILDLINK_ABI_DEPENDS.xfce4-clipman-plugin?= xfce4-clipman-plugin>=0.4.1nb2
BUILDLINK_PKGSRCDIR.xfce4-clipman-plugin?= ../../x11/xfce4-clipman-plugin
.endif # XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK
diff --git a/x11/xfce4-desktop/buildlink3.mk b/x11/xfce4-desktop/buildlink3.mk
index e566192f9e6..229f1010740 100644
--- a/x11/xfce4-desktop/buildlink3.mk
+++ b/x11/xfce4-desktop/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/02/17 06:49:26 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/04/06 06:23:04 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_DESKTOP_BUILDLINK3_MK:= ${XFCE4_DESKTOP_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-desktop}
BUILDLINK_PACKAGES+= xfce4-desktop
.if !empty(XFCE4_DESKTOP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-desktop+= xfce4-desktop>=4.2.3
-BUILDLINK_RECOMMENDED.xfce4-desktop?= xfce4-desktop>=4.2.3nb2
+BUILDLINK_API_DEPENDS.xfce4-desktop+= xfce4-desktop>=4.2.3
+BUILDLINK_ABI_DEPENDS.xfce4-desktop?= xfce4-desktop>=4.2.3nb2
BUILDLINK_PKGSRCDIR.xfce4-desktop?= ../../x11/xfce4-desktop
.endif # XFCE4_DESKTOP_BUILDLINK3_MK
diff --git a/x11/xfce4-gtk2-engine/buildlink3.mk b/x11/xfce4-gtk2-engine/buildlink3.mk
index c2cd49e591f..471314a1ad5 100644
--- a/x11/xfce4-gtk2-engine/buildlink3.mk
+++ b/x11/xfce4-gtk2-engine/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/17 06:49:26 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:23:04 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_GTK2_ENGINE_BUILDLINK3_MK:= ${XFCE4_GTK2_ENGINE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-gtk2-engine}
BUILDLINK_PACKAGES+= xfce4-gtk2-engine
.if !empty(XFCE4_GTK2_ENGINE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-gtk2-engine+= xfce4-gtk2-engine>=2.2.8
-BUILDLINK_RECOMMENDED.xfce4-gtk2-engine?= xfce4-gtk2-engine>=2.2.8nb2
+BUILDLINK_API_DEPENDS.xfce4-gtk2-engine+= xfce4-gtk2-engine>=2.2.8
+BUILDLINK_ABI_DEPENDS.xfce4-gtk2-engine?= xfce4-gtk2-engine>=2.2.8nb2
BUILDLINK_PKGSRCDIR.xfce4-gtk2-engine?= ../../x11/xfce4-gtk2-engine
.endif # XFCE4_GTK2_ENGINE_BUILDLINK3_MK
diff --git a/x11/xfce4-mcs-manager/buildlink3.mk b/x11/xfce4-mcs-manager/buildlink3.mk
index edd7dadb505..70c09a2124b 100644
--- a/x11/xfce4-mcs-manager/buildlink3.mk
+++ b/x11/xfce4-mcs-manager/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/02/17 06:49:26 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/04/06 06:23:04 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_MCS_MANAGER_BUILDLINK3_MK:= ${XFCE4_MCS_MANAGER_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-mcs-manager}
BUILDLINK_PACKAGES+= xfce4-mcs-manager
.if !empty(XFCE4_MCS_MANAGER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-mcs-manager+= xfce4-mcs-manager>=4.2.3
-BUILDLINK_RECOMMENDED.xfce4-mcs-manager?= xfce4-mcs-manager>=4.2.3nb2
+BUILDLINK_API_DEPENDS.xfce4-mcs-manager+= xfce4-mcs-manager>=4.2.3
+BUILDLINK_ABI_DEPENDS.xfce4-mcs-manager?= xfce4-mcs-manager>=4.2.3nb2
BUILDLINK_PKGSRCDIR.xfce4-mcs-manager?= ../../x11/xfce4-mcs-manager
.endif # XFCE4_MCS_MANAGER_BUILDLINK3_MK
diff --git a/x11/xfce4-mcs-plugins/buildlink3.mk b/x11/xfce4-mcs-plugins/buildlink3.mk
index ee56d319c5a..03661222c4f 100644
--- a/x11/xfce4-mcs-plugins/buildlink3.mk
+++ b/x11/xfce4-mcs-plugins/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/02/17 06:49:26 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/04/06 06:23:04 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_MCS_PLUGINS_BUILDLINK3_MK:= ${XFCE4_MCS_PLUGINS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-mcs-plugins}
BUILDLINK_PACKAGES+= xfce4-mcs-plugins
.if !empty(XFCE4_MCS_PLUGINS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-mcs-plugins+= xfce4-mcs-plugins>=4.2.3
-BUILDLINK_RECOMMENDED.xfce4-mcs-plugins?= xfce4-mcs-plugins>=4.2.3nb2
+BUILDLINK_API_DEPENDS.xfce4-mcs-plugins+= xfce4-mcs-plugins>=4.2.3
+BUILDLINK_ABI_DEPENDS.xfce4-mcs-plugins?= xfce4-mcs-plugins>=4.2.3nb2
BUILDLINK_PKGSRCDIR.xfce4-mcs-plugins?= ../../x11/xfce4-mcs-plugins
.endif # XFCE4_MCS_PLUGINS_BUILDLINK3_MK
diff --git a/x11/xfce4-notes-plugin/buildlink3.mk b/x11/xfce4-notes-plugin/buildlink3.mk
index 100f40172ba..9a9922743ad 100644
--- a/x11/xfce4-notes-plugin/buildlink3.mk
+++ b/x11/xfce4-notes-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/17 06:49:26 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:23:04 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_NOTES_PLUGIN_BUILDLINK3_MK:= ${XFCE4_NOTES_PLUGIN_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-notes-plugin}
BUILDLINK_PACKAGES+= xfce4-notes-plugin
.if !empty(XFCE4_NOTES_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-notes-plugin+= xfce4-notes-plugin>=0.11.1
-BUILDLINK_RECOMMENDED.xfce4-notes-plugin?= xfce4-notes-plugin>=0.11.1nb2
+BUILDLINK_API_DEPENDS.xfce4-notes-plugin+= xfce4-notes-plugin>=0.11.1
+BUILDLINK_ABI_DEPENDS.xfce4-notes-plugin?= xfce4-notes-plugin>=0.11.1nb2
BUILDLINK_PKGSRCDIR.xfce4-notes-plugin?= ../../x11/xfce4-notes-plugin
.endif # XFCE4_NOTES_PLUGIN_BUILDLINK3_MK
diff --git a/x11/xfce4-panel/buildlink3.mk b/x11/xfce4-panel/buildlink3.mk
index aebcc4d2284..53fa58f37b5 100644
--- a/x11/xfce4-panel/buildlink3.mk
+++ b/x11/xfce4-panel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/02/17 06:49:26 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/04/06 06:23:04 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_PANEL_BUILDLINK3_MK:= ${XFCE4_PANEL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-panel}
BUILDLINK_PACKAGES+= xfce4-panel
.if !empty(XFCE4_PANEL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-panel+= xfce4-panel>=4.2.3
-BUILDLINK_RECOMMENDED.xfce4-panel?= xfce4-panel>=4.2.3nb2
+BUILDLINK_API_DEPENDS.xfce4-panel+= xfce4-panel>=4.2.3
+BUILDLINK_ABI_DEPENDS.xfce4-panel?= xfce4-panel>=4.2.3nb2
BUILDLINK_PKGSRCDIR.xfce4-panel?= ../../x11/xfce4-panel
.endif # XFCE4_PANEL_BUILDLINK3_MK
diff --git a/x11/xfce4-session/buildlink3.mk b/x11/xfce4-session/buildlink3.mk
index e92f4252063..78da5f03192 100644
--- a/x11/xfce4-session/buildlink3.mk
+++ b/x11/xfce4-session/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/17 06:49:26 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:23:04 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_SESSION_BUILDLINK3_MK:= ${XFCE4_SESSION_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-session}
BUILDLINK_PACKAGES+= xfce4-session
.if !empty(XFCE4_SESSION_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-session+= xfce4-session>=4.2.3
-BUILDLINK_RECOMMENDED.xfce4-session?= xfce4-session>=4.2.3nb2
+BUILDLINK_API_DEPENDS.xfce4-session+= xfce4-session>=4.2.3
+BUILDLINK_ABI_DEPENDS.xfce4-session?= xfce4-session>=4.2.3nb2
BUILDLINK_PKGSRCDIR.xfce4-session?= ../../x11/xfce4-session
.endif # XFCE4_SESSION_BUILDLINK3_MK
diff --git a/x11/xfce4-taskbar-plugin/buildlink3.mk b/x11/xfce4-taskbar-plugin/buildlink3.mk
index 3424d462123..a30ea71ac63 100644
--- a/x11/xfce4-taskbar-plugin/buildlink3.mk
+++ b/x11/xfce4-taskbar-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/17 06:49:26 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:23:05 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_TASKBAR_PLUGIN_BUILDLINK3_MK:= ${XFCE4_TASKBAR_PLUGIN_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-taskbar-plugin}
BUILDLINK_PACKAGES+= xfce4-taskbar-plugin
.if !empty(XFCE4_TASKBAR_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-taskbar-plugin+= xfce4-taskbar-plugin>=0.2.2
-BUILDLINK_RECOMMENDED.xfce4-taskbar-plugin?= xfce4-taskbar-plugin>=0.2.2nb2
+BUILDLINK_API_DEPENDS.xfce4-taskbar-plugin+= xfce4-taskbar-plugin>=0.2.2
+BUILDLINK_ABI_DEPENDS.xfce4-taskbar-plugin?= xfce4-taskbar-plugin>=0.2.2nb2
BUILDLINK_PKGSRCDIR.xfce4-taskbar-plugin?= ../../x11/xfce4-taskbar-plugin
.endif # XFCE4_TASKBAR_PLUGIN_BUILDLINK3_MK
diff --git a/x11/xfce4-toys/buildlink3.mk b/x11/xfce4-toys/buildlink3.mk
index 47415f60176..e896893fdef 100644
--- a/x11/xfce4-toys/buildlink3.mk
+++ b/x11/xfce4-toys/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/02/17 06:49:26 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/04/06 06:23:05 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_TOYS_BUILDLINK3_MK:= ${XFCE4_TOYS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-toys}
BUILDLINK_PACKAGES+= xfce4-toys
.if !empty(XFCE4_TOYS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-toys+= xfce4-toys>=4.2.3
-BUILDLINK_RECOMMENDED.xfce4-toys?= xfce4-toys>=4.2.3nb2
+BUILDLINK_API_DEPENDS.xfce4-toys+= xfce4-toys>=4.2.3
+BUILDLINK_ABI_DEPENDS.xfce4-toys?= xfce4-toys>=4.2.3nb2
BUILDLINK_PKGSRCDIR.xfce4-toys?= ../../x11/xfce4-toys
.endif # XFCE4_TOYS_BUILDLINK3_MK
diff --git a/x11/xfce4-trigger-launcher/buildlink3.mk b/x11/xfce4-trigger-launcher/buildlink3.mk
index ac6aa1318ea..2ca046ca004 100644
--- a/x11/xfce4-trigger-launcher/buildlink3.mk
+++ b/x11/xfce4-trigger-launcher/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/02/17 06:49:26 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/04/06 06:23:05 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_TRIGGER_LAUNCHER_BUILDLINK3_MK:= ${XFCE4_TRIGGER_LAUNCHER_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-trigger-launcher}
BUILDLINK_PACKAGES+= xfce4-trigger-launcher
.if !empty(XFCE4_TRIGGER_LAUNCHER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-trigger-launcher+= xfce4-trigger-launcher>=4.2.3
-BUILDLINK_RECOMMENDED.xfce4-trigger-launcher?= xfce4-trigger-launcher>=4.2.3nb2
+BUILDLINK_API_DEPENDS.xfce4-trigger-launcher+= xfce4-trigger-launcher>=4.2.3
+BUILDLINK_ABI_DEPENDS.xfce4-trigger-launcher?= xfce4-trigger-launcher>=4.2.3nb2
BUILDLINK_PKGSRCDIR.xfce4-trigger-launcher?= ../../x11/xfce4-trigger-launcher
.endif # XFCE4_TRIGGER_LAUNCHER_BUILDLINK3_MK
diff --git a/x11/xfce4-utils/buildlink3.mk b/x11/xfce4-utils/buildlink3.mk
index 0dace7038f0..aefd98d4658 100644
--- a/x11/xfce4-utils/buildlink3.mk
+++ b/x11/xfce4-utils/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/03/20 06:29:09 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2006/04/06 06:23:05 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_UTILS_BUILDLINK3_MK:= ${XFCE4_UTILS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-utils}
BUILDLINK_PACKAGES+= xfce4-utils
.if !empty(XFCE4_UTILS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-utils+= xfce4-utils>=4.2.3
-BUILDLINK_RECOMMENDED.xfce4-utils?= xfce4-utils>=4.2.3nb3
+BUILDLINK_API_DEPENDS.xfce4-utils+= xfce4-utils>=4.2.3
+BUILDLINK_ABI_DEPENDS.xfce4-utils?= xfce4-utils>=4.2.3nb3
BUILDLINK_PKGSRCDIR.xfce4-utils?= ../../x11/xfce4-utils
.endif # XFCE4_UTILS_BUILDLINK3_MK
diff --git a/x11/xfce4-windowlist-plugin/buildlink3.mk b/x11/xfce4-windowlist-plugin/buildlink3.mk
index e197659ffe2..afb4cdaf9a8 100644
--- a/x11/xfce4-windowlist-plugin/buildlink3.mk
+++ b/x11/xfce4-windowlist-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/17 06:49:26 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:23:05 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_WINDOWLIST_PLUGIN_BUILDLINK3_MK:= ${XFCE4_WINDOWLIST_PLUGIN_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-windowlist-plugin}
BUILDLINK_PACKAGES+= xfce4-windowlist-plugin
.if !empty(XFCE4_WINDOWLIST_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-windowlist-plugin+= xfce4-windowlist-plugin>=0.1.0nb1
-BUILDLINK_RECOMMENDED.xfce4-windowlist-plugin?= xfce4-windowlist-plugin>=0.1.0nb3
+BUILDLINK_API_DEPENDS.xfce4-windowlist-plugin+= xfce4-windowlist-plugin>=0.1.0nb1
+BUILDLINK_ABI_DEPENDS.xfce4-windowlist-plugin?= xfce4-windowlist-plugin>=0.1.0nb3
BUILDLINK_PKGSRCDIR.xfce4-windowlist-plugin?= ../../x11/xfce4-windowlist-plugin
.endif # XFCE4_WINDOWLIST_PLUGIN_BUILDLINK3_MK
diff --git a/x11/xforms/buildlink3.mk b/x11/xforms/buildlink3.mk
index bac82ef1a85..b995c2f86f5 100644
--- a/x11/xforms/buildlink3.mk
+++ b/x11/xforms/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:11:47 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:23:05 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFORMS_BUILDLINK3_MK:= ${XFORMS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxforms}
BUILDLINK_PACKAGES+= xforms
.if !empty(XFORMS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xforms+= xforms>=1.0nb2
-BUILDLINK_RECOMMENDED.xforms+= xforms>=1.0nb5
+BUILDLINK_API_DEPENDS.xforms+= xforms>=1.0nb2
+BUILDLINK_ABI_DEPENDS.xforms+= xforms>=1.0nb5
BUILDLINK_PKGSRCDIR.xforms?= ../../x11/xforms
.endif # XFORMS_BUILDLINK3_MK
diff --git a/x11/xorg-libs/buildlink3.mk b/x11/xorg-libs/buildlink3.mk
index e1c440deebb..8dcdabc53a0 100644
--- a/x11/xorg-libs/buildlink3.mk
+++ b/x11/xorg-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/02/23 23:17:30 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2006/04/06 06:23:05 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XORG_LIBS_BUILDLINK3_MK:= ${XORG_LIBS_BUILDLINK3_MK}+
@@ -18,8 +18,8 @@ BUILDLINK_PACKAGES:= xorg-libs ${BUILDLINK_PACKAGES}
.if !empty(XORG_LIBS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xorg-libs+= xorg-libs>=6.9.0
-BUILDLINK_RECOMMENDED.xorg-libs?= xorg-libs>=6.9.0nb2
+BUILDLINK_API_DEPENDS.xorg-libs+= xorg-libs>=6.9.0
+BUILDLINK_ABI_DEPENDS.xorg-libs?= xorg-libs>=6.9.0nb2
BUILDLINK_PKGSRCDIR.xorg-libs?= ../../x11/xorg-libs
BUILDLINK_LIBDIRS.xorg-libs?= ${X11ROOT_PREFIX}/lib
BUILDLINK_TRANSFORM.xorg-libs+= -e "s|/${X11ROOT_PREFIX}/|/|"
diff --git a/x11/xorg-libs/builtin.mk b/x11/xorg-libs/builtin.mk
index 7e85d9df883..ff7d083d711 100644
--- a/x11/xorg-libs/builtin.mk
+++ b/x11/xorg-libs/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.4 2006/03/30 18:06:19 jlam Exp $
+# $NetBSD: builtin.mk,v 1.5 2006/04/06 06:23:05 reed Exp $
BUILTIN_PKG:= xorg-libs
@@ -43,7 +43,7 @@ USE_BUILTIN.xorg-libs= ${IS_BUILTIN.xorg-libs}
. if defined(BUILTIN_PKG.xorg-libs) && \
!empty(IS_BUILTIN.xorg-libs:M[yY][eE][sS])
USE_BUILTIN.xorg-libs= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.xorg-libs}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.xorg-libs}
. if !empty(USE_BUILTIN.xorg-libs:M[yY][eE][sS])
USE_BUILTIN.xorg-libs!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.xorg-libs:Q}; then \
diff --git a/x11/xosd/buildlink3.mk b/x11/xosd/buildlink3.mk
index 0c835d3f9a0..99942c73238 100644
--- a/x11/xosd/buildlink3.mk
+++ b/x11/xosd/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:11:48 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:23:05 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XOSD_BUILDLINK3_MK:= ${XOSD_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxosd}
BUILDLINK_PACKAGES+= xosd
.if !empty(XOSD_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xosd+= xosd>=2.2.12
-BUILDLINK_RECOMMENDED.xosd+= xosd>=2.2.12nb2
+BUILDLINK_API_DEPENDS.xosd+= xosd>=2.2.12
+BUILDLINK_ABI_DEPENDS.xosd+= xosd>=2.2.12nb2
BUILDLINK_PKGSRCDIR.xosd?= ../../x11/xosd
.endif # XOSD_BUILDLINK3_MK
diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common
index dd1eece6c3f..64299fcfe10 100644
--- a/x11/xscreensaver/Makefile.common
+++ b/x11/xscreensaver/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.85 2005/12/05 20:51:20 rillig Exp $
+# $NetBSD: Makefile.common,v 1.86 2006/04/06 06:23:05 reed Exp $
#
DISTNAME= xscreensaver-4.22
@@ -10,7 +10,7 @@ MAINTAINER= wiz@NetBSD.org
HOMEPAGE= http://www.jwz.org/xscreensaver/
BUILD_USES_MSGFMT= yes
-BUILDLINK_DEPENDS.Xrandr+= Xrandr>=1.0.2
+BUILDLINK_API_DEPENDS.Xrandr+= Xrandr>=1.0.2
USE_PKGLOCALEDIR= yes
USE_X11= yes
diff --git a/x11/xscreensaver/buildlink3.mk b/x11/xscreensaver/buildlink3.mk
index 8754c9b360b..a8d2279bbd6 100644
--- a/x11/xscreensaver/buildlink3.mk
+++ b/x11/xscreensaver/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:11:49 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:23:05 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XSCREENSAVER_BUILDLINK3_MK:= ${XSCREENSAVER_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxscreensaver}
BUILDLINK_PACKAGES+= xscreensaver
.if !empty(XSCREENSAVER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xscreensaver+= xscreensaver>=4.14
-BUILDLINK_RECOMMENDED.xscreensaver?= xscreensaver>=4.22nb3
+BUILDLINK_API_DEPENDS.xscreensaver+= xscreensaver>=4.14
+BUILDLINK_ABI_DEPENDS.xscreensaver?= xscreensaver>=4.22nb3
BUILDLINK_PKGSRCDIR.xscreensaver?= ../../x11/xscreensaver
.endif # XSCREENSAVER_BUILDLINK3_MK
diff --git a/x11/xview-lib/buildlink3.mk b/x11/xview-lib/buildlink3.mk
index a3f56f7a54a..88f536086c2 100644
--- a/x11/xview-lib/buildlink3.mk
+++ b/x11/xview-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:11:50 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:23:05 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XVIEW_LIB_BUILDLINK3_MK:= ${XVIEW_LIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxview-lib}
BUILDLINK_PACKAGES+= xview-lib
.if !empty(XVIEW_LIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xview-lib+= xview-lib>=3.2.1
-BUILDLINK_RECOMMENDED.xview-lib?= xview-lib>=3.2.1nb6
+BUILDLINK_API_DEPENDS.xview-lib+= xview-lib>=3.2.1
+BUILDLINK_ABI_DEPENDS.xview-lib?= xview-lib>=3.2.1nb6
BUILDLINK_PKGSRCDIR.xview-lib?= ../../x11/xview-lib
.endif # XVIEW_LIB_BUILDLINK3_MK
diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index 8443c4c2c24..c05b10916cf 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2006/03/30 21:22:41 jmmv Exp $
+# $NetBSD: Makefile,v 1.32 2006/04/06 06:23:05 reed Exp $
#
DISTNAME= zenity-2.14.0
@@ -17,7 +17,7 @@ USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
USE_TOOLS+= gmake pkg-config
-BUILDLINK_DEPENDS.glib2+= glib2>=2.8.0
+BUILDLINK_API_DEPENDS.glib2+= glib2>=2.8.0
.include "../../devel/GConf2/schemas.mk"
.include "../../devel/gettext-lib/buildlink3.mk"