Subject: CVS commit: pkgsrc
From: Johnny C. Lam
Date: 2004-03-18 10:12:18
Message id: 20040318091218.4DFB92DA1D@cvs.netbsd.org

Log Message:
Fix serious bug where BUILDLINK_PACKAGES wasn't being ordered properly
by moving the inclusion of buildlink3.mk files outside of the protected
region.  This bug would be seen by users that have set PREFER_PKGSRC
or PREFER_NATIVE to non-default values.

BUILDLINK_PACKAGES should be ordered so that for any package in the
list, that package doesn't depend on any packages to the left of it
in the list.  This ordering property is used to check for builtin
packages in the correct order.  The problem was that including a
buildlink3.mk file for <pkg> correctly ensured that <pkg> was removed
from BUILDLINK_PACKAGES and appended to the end.  However, since the
inclusion of any other buildlink3.mk files within that buildlink3.mk
was in a region that was protected against multiple inclusion, those
dependencies weren't also moved to the end of BUILDLINK_PACKAGES.

Files:
RevisionActionfile
1.3modifypkgsrc/archivers/libcomprex/buildlink3.mk
1.2modifypkgsrc/archivers/zziplib/buildlink3.mk
1.7modifypkgsrc/audio/SDL_mixer/buildlink3.mk
1.2modifypkgsrc/audio/SDL_sound/buildlink3.mk
1.8modifypkgsrc/audio/arts/buildlink3.mk
1.6modifypkgsrc/audio/esound/buildlink3.mk
1.3modifypkgsrc/audio/flac/buildlink3.mk
1.4modifypkgsrc/audio/gnome-speech/buildlink3.mk
1.4modifypkgsrc/audio/id3lib/buildlink3.mk
1.5modifypkgsrc/audio/libcddb/buildlink3.mk
1.3modifypkgsrc/audio/libid3tag/buildlink3.mk
1.4modifypkgsrc/audio/libmikmod/buildlink3.mk
1.3modifypkgsrc/audio/libsamplerate/buildlink3.mk
1.3modifypkgsrc/audio/libshout/buildlink3.mk
1.4modifypkgsrc/audio/libvorbis/buildlink3.mk
1.6modifypkgsrc/audio/musicbrainz/buildlink3.mk
1.6modifypkgsrc/audio/py-ogg/buildlink3.mk
1.3modifypkgsrc/audio/rplay/buildlink3.mk
1.3modifypkgsrc/audio/speex/buildlink3.mk
1.3modifypkgsrc/audio/sweep/buildlink3.mk
1.2modifypkgsrc/audio/wsoundserver/buildlink3.mk
1.2modifypkgsrc/audio/xfce4-mixer/buildlink3.mk
1.2modifypkgsrc/audio/xfce4-xmms-plugin/buildlink3.mk
1.3modifypkgsrc/audio/xmms/buildlink3.mk
1.2modifypkgsrc/audio/xmms-meta-input/buildlink3.mk
1.4modifypkgsrc/cad/libgeda/buildlink3.mk
1.3modifypkgsrc/chat/ekg/buildlink3.mk
1.4modifypkgsrc/chat/jabberd/buildlink3.mk
1.4modifypkgsrc/chat/loudmouth/buildlink3.mk
1.3modifypkgsrc/comms/jpilot/buildlink3.mk
1.3modifypkgsrc/comms/pilot-link-libs/buildlink3.mk
1.3modifypkgsrc/converters/wv/buildlink3.mk
1.13modifypkgsrc/databases/db/buildlink3.mk
1.7modifypkgsrc/databases/db3/buildlink3.mk
1.11modifypkgsrc/databases/db4/buildlink3.mk
1.3modifypkgsrc/databases/gnome-mime-data/buildlink3.mk
1.4modifypkgsrc/databases/libgda/buildlink3.mk
1.4modifypkgsrc/databases/libgnomedb/buildlink3.mk
1.8modifypkgsrc/databases/openldap/buildlink3.mk
1.8modifypkgsrc/databases/p5-DBI/buildlink3.mk
1.5modifypkgsrc/databases/rrdtool/buildlink3.mk
1.3modifypkgsrc/devel/GConf/buildlink3.mk
1.3modifypkgsrc/devel/GConf2/buildlink3.mk
1.3modifypkgsrc/devel/GConf2-ui/buildlink3.mk
1.6modifypkgsrc/devel/SDL/buildlink3.mk
1.2modifypkgsrc/devel/SDL_gfx/buildlink3.mk
1.2modifypkgsrc/devel/SDL_ttf/buildlink3.mk
1.2modifypkgsrc/devel/SDLmm/buildlink3.mk
1.2modifypkgsrc/devel/apr/buildlink3.mk
1.4modifypkgsrc/devel/at-spi/buildlink3.mk
1.4modifypkgsrc/devel/atk/buildlink3.mk
1.3modifypkgsrc/devel/devIL/buildlink3.mk
1.4modifypkgsrc/devel/eel2/buildlink3.mk
1.3modifypkgsrc/devel/gail/buildlink3.mk
1.19modifypkgsrc/devel/gettext-lib/buildlink3.mk
1.3modifypkgsrc/devel/giblib/buildlink3.mk
1.6modifypkgsrc/devel/glib/buildlink3.mk
1.6modifypkgsrc/devel/glib2/buildlink3.mk
1.3modifypkgsrc/devel/libast/buildlink3.mk
1.4modifypkgsrc/devel/libbonobo/buildlink3.mk
1.3modifypkgsrc/devel/libbonoboui/buildlink3.mk
1.2modifypkgsrc/devel/libdockapp/buildlink3.mk
1.3modifypkgsrc/devel/libglade/buildlink3.mk
1.3modifypkgsrc/devel/libglade2/buildlink3.mk
1.3modifypkgsrc/devel/libgnome/buildlink3.mk
1.3modifypkgsrc/devel/libgnomeui/buildlink3.mk
1.3modifypkgsrc/devel/libgphoto2/buildlink3.mk
1.3modifypkgsrc/devel/libgsf/buildlink3.mk
1.3modifypkgsrc/devel/libidn/buildlink3.mk
1.6modifypkgsrc/devel/libslang/buildlink3.mk
1.4modifypkgsrc/devel/libstroke/buildlink3.mk
1.3modifypkgsrc/devel/libtar/buildlink3.mk
1.3modifypkgsrc/devel/libwnck/buildlink3.mk
1.3modifypkgsrc/devel/oaf/buildlink3.mk
1.3modifypkgsrc/devel/ogre/buildlink3.mk
1.4modifypkgsrc/devel/pango/buildlink3.mk
1.3modifypkgsrc/devel/physfs/buildlink3.mk
1.6modifypkgsrc/devel/popt/buildlink3.mk
1.2modifypkgsrc/devel/subversion/buildlink3.mk
1.2modifypkgsrc/devel/tcl-tclcl/buildlink3.mk
1.3modifypkgsrc/emulators/libspectrum/buildlink3.mk
1.12modifypkgsrc/fonts/Xft2/buildlink3.mk
1.16modifypkgsrc/fonts/fontconfig/buildlink3.mk
1.4modifypkgsrc/fonts/gucharmap/buildlink3.mk
1.3modifypkgsrc/games/gnome2-games/buildlink3.mk
1.4modifypkgsrc/graphics/ImageMagick/buildlink3.mk
1.5modifypkgsrc/graphics/OpenRM/buildlink3.mk
1.7modifypkgsrc/graphics/SDL_image/buildlink3.mk
1.5modifypkgsrc/graphics/cairo/buildlink3.mk
1.4modifypkgsrc/graphics/cal3d/buildlink3.mk
1.2modifypkgsrc/graphics/fnlib/buildlink3.mk
1.7modifypkgsrc/graphics/freetype-lib/buildlink3.mk
1.8modifypkgsrc/graphics/gd/buildlink3.mk
1.3modifypkgsrc/graphics/gdk-pixbuf/buildlink3.mk
1.3modifypkgsrc/graphics/gdk-pixbuf-gnome/buildlink3.mk
1.4modifypkgsrc/graphics/gle/buildlink3.mk
1.25modifypkgsrc/graphics/glu/buildlink3.mk
1.7modifypkgsrc/graphics/glut/buildlink3.mk
1.4modifypkgsrc/graphics/gtkglext/buildlink3.mk
1.4modifypkgsrc/graphics/imlib/buildlink3.mk
1.4modifypkgsrc/graphics/imlib2/buildlink3.mk
1.3modifypkgsrc/graphics/jasper/buildlink3.mk
1.3modifypkgsrc/graphics/libexif/buildlink3.mk
1.4modifypkgsrc/graphics/libgdiplus/buildlink3.mk
1.3modifypkgsrc/graphics/libgnomecanvas/buildlink3.mk
1.3modifypkgsrc/graphics/librsvg2/buildlink3.mk
1.3modifypkgsrc/graphics/libwmf/buildlink3.mk
1.4modifypkgsrc/graphics/mng/buildlink3.mk
1.4modifypkgsrc/graphics/netpbm/buildlink3.mk
1.3modifypkgsrc/graphics/plotutils/buildlink3.mk
1.6modifypkgsrc/graphics/png/buildlink3.mk
1.3modifypkgsrc/graphics/py-imaging/buildlink3.mk
1.7modifypkgsrc/graphics/tiff/buildlink3.mk
1.2modifypkgsrc/inputmethod/sj3-lib/buildlink3.mk
1.5modifypkgsrc/lang/gcc/buildlink3.mk
1.8modifypkgsrc/lang/gcc3-c/buildlink3.mk
1.9modifypkgsrc/lang/gcc3-c++/buildlink3.mk
1.9modifypkgsrc/lang/gcc3-f77/buildlink3.mk
1.9modifypkgsrc/lang/gcc3-java/buildlink3.mk
1.9modifypkgsrc/lang/gcc3-objc/buildlink3.mk
1.3modifypkgsrc/lang/guile/buildlink3.mk
1.4modifypkgsrc/lang/librep/buildlink3.mk
1.5modifypkgsrc/lang/mono/buildlink3.mk
1.4modifypkgsrc/lang/pnet/buildlink3.mk
1.3modifypkgsrc/lang/pnetC/buildlink3.mk
1.3modifypkgsrc/lang/pnetlib/buildlink3.mk
1.2modifypkgsrc/lang/tcl-expect/buildlink3.mk
1.2modifypkgsrc/lang/tcl-otcl/buildlink3.mk
1.3modifypkgsrc/mail/libesmtp/buildlink3.mk
1.3modifypkgsrc/mail/sylpheed-claws/buildlink3.mk
1.2modifypkgsrc/math/gsl/buildlink3.mk
1.2modifypkgsrc/meta-pkgs/xfce4/buildlink3.mk
1.3modifypkgsrc/multimedia/mjpegtools/buildlink3.mk
1.2modifypkgsrc/multimedia/openquicktime/buildlink3.mk
1.4modifypkgsrc/multimedia/xine-lib/buildlink3.mk
1.4modifypkgsrc/net/ORBit/buildlink3.mk
1.5modifypkgsrc/net/ORBit2/buildlink3.mk
1.2modifypkgsrc/net/SDL_net/buildlink3.mk
1.3modifypkgsrc/net/gnet/buildlink3.mk
1.3modifypkgsrc/net/gnet1/buildlink3.mk
1.5modifypkgsrc/net/libIDL/buildlink3.mk
1.3modifypkgsrc/net/netatalk/buildlink3.mk
1.5modifypkgsrc/net/py-ORBit/buildlink3.mk
1.7modifypkgsrc/print/cups/buildlink3.mk
1.3modifypkgsrc/print/gimp-print-lib/buildlink3.mk
1.3modifypkgsrc/print/libgnomeprint/buildlink3.mk
1.3modifypkgsrc/print/libgnomeprintui/buildlink3.mk
1.4modifypkgsrc/print/pdflib/buildlink3.mk
1.2modifypkgsrc/print/xfce4-print/buildlink3.mk
1.5modifypkgsrc/security/gnutls/buildlink3.mk
1.3modifypkgsrc/security/gpgme/buildlink3.mk
1.3modifypkgsrc/security/gsasl/buildlink3.mk
1.4modifypkgsrc/security/libgcrypt/buildlink3.mk
1.4modifypkgsrc/security/libgpg-error/buildlink3.mk
1.4modifypkgsrc/security/libksba/buildlink3.mk
1.4modifypkgsrc/security/libtcpa/buildlink3.mk
1.3modifypkgsrc/security/opencdk/buildlink3.mk
1.17modifypkgsrc/security/openssl/buildlink3.mk
1.3modifypkgsrc/sysutils/gkrellm/buildlink3.mk
1.5modifypkgsrc/sysutils/gnome-vfs/buildlink3.mk
1.4modifypkgsrc/sysutils/gnome-vfs2/buildlink3.mk
1.5modifypkgsrc/sysutils/nautilus/buildlink3.mk
1.2modifypkgsrc/sysutils/xfce4-diskperf-plugin/buildlink3.mk
1.2modifypkgsrc/sysutils/xfce4-netload-plugin/buildlink3.mk
1.2modifypkgsrc/sysutils/xfce4-systemload-plugin/buildlink3.mk
1.3modifypkgsrc/textproc/enchant/buildlink3.mk
1.4modifypkgsrc/textproc/gnome-spell/buildlink3.mk
1.3modifypkgsrc/textproc/gtkspell/buildlink3.mk
1.3modifypkgsrc/textproc/intltool/buildlink3.mk
1.3modifypkgsrc/textproc/libcroco/buildlink3.mk
1.4modifypkgsrc/textproc/libpathan/buildlink3.mk
1.3modifypkgsrc/textproc/libxml/buildlink3.mk
1.4modifypkgsrc/textproc/libxml2/buildlink3.mk
1.4modifypkgsrc/textproc/libxslt/buildlink3.mk
1.3modifypkgsrc/textproc/opensp/buildlink3.mk
1.4modifypkgsrc/textproc/py-xml/buildlink3.mk
1.4modifypkgsrc/textproc/scrollkeeper/buildlink3.mk
1.3modifypkgsrc/textproc/xalan-c/buildlink3.mk
1.3modifypkgsrc/textproc/xerces-c/buildlink3.mk
1.6modifypkgsrc/time/py-mxDateTime/buildlink3.mk
1.2modifypkgsrc/time/xfce4-datetime-plugin/buildlink3.mk
1.4modifypkgsrc/wm/metacity/buildlink3.mk
1.3modifypkgsrc/wm/openbox/buildlink3.mk
1.3modifypkgsrc/wm/windowmaker/buildlink3.mk
1.2modifypkgsrc/wm/xfce4-wm/buildlink3.mk
1.2modifypkgsrc/wm/xfce4-wm-themes/buildlink3.mk
1.3modifypkgsrc/www/ap-perl/buildlink3.mk
1.2modifypkgsrc/www/apache2/buildlink3.mk
1.3modifypkgsrc/www/curl/buildlink3.mk
1.4modifypkgsrc/www/libgtkhtml/buildlink3.mk
1.3modifypkgsrc/www/libwww/buildlink3.mk
1.2modifypkgsrc/www/neon/buildlink3.mk
1.3modifypkgsrc/x11/Xfixes/buildlink3.mk
1.14modifypkgsrc/x11/Xrandr/buildlink3.mk
1.31modifypkgsrc/x11/Xrender/buildlink3.mk
1.5modifypkgsrc/x11/blt/buildlink3.mk
1.3modifypkgsrc/x11/fltk/buildlink3.mk
1.2modifypkgsrc/x11/fox/buildlink3.mk
1.3modifypkgsrc/x11/gnome-desktop/buildlink3.mk
1.6modifypkgsrc/x11/gnome-libs/buildlink3.mk
1.5modifypkgsrc/x11/gnome-mag/buildlink3.mk
1.3modifypkgsrc/x11/gnome-panel/buildlink3.mk
1.4modifypkgsrc/x11/gnome2-control-center/buildlink3.mk
1.9modifypkgsrc/x11/gtk/buildlink3.mk
1.8modifypkgsrc/x11/gtk2/buildlink3.mk
1.3modifypkgsrc/x11/gtk2-engines/buildlink3.mk
1.2modifypkgsrc/x11/gtkglarea/buildlink3.mk
1.3modifypkgsrc/x11/gtkglarea2/buildlink3.mk
1.2modifypkgsrc/x11/gtkmm/buildlink3.mk
1.3modifypkgsrc/x11/gtksourceview/buildlink3.mk
1.3modifypkgsrc/x11/lablgtk/buildlink3.mk
1.2modifypkgsrc/x11/libxfce4gui/buildlink3.mk
1.2modifypkgsrc/x11/libxfce4mcs/buildlink3.mk
1.2modifypkgsrc/x11/libxfce4util/buildlink3.mk
1.4modifypkgsrc/x11/libxklavier/buildlink3.mk
1.3modifypkgsrc/x11/libzvt/buildlink3.mk
1.3modifypkgsrc/x11/paragui/buildlink3.mk
1.5modifypkgsrc/x11/py-gnome2/buildlink3.mk
1.6modifypkgsrc/x11/py-gtk2/buildlink3.mk
1.8modifypkgsrc/x11/tk/buildlink3.mk
1.2modifypkgsrc/x11/tk83/buildlink3.mk
1.3modifypkgsrc/x11/vte/buildlink3.mk
1.3modifypkgsrc/x11/wxGTK/buildlink3.mk
1.13modifypkgsrc/x11/xcursor/buildlink3.mk
1.2modifypkgsrc/x11/xfce4-clipman-plugin/buildlink3.mk
1.2modifypkgsrc/x11/xfce4-desktop/buildlink3.mk
1.2modifypkgsrc/x11/xfce4-mcs-manager/buildlink3.mk
1.2modifypkgsrc/x11/xfce4-mcs-plugins/buildlink3.mk
1.2modifypkgsrc/x11/xfce4-notes-plugin/buildlink3.mk
1.2modifypkgsrc/x11/xfce4-panel/buildlink3.mk
1.2modifypkgsrc/x11/xfce4-utils/buildlink3.mk
1.3modifypkgsrc/x11/xscreensaver/buildlink3.mk