Module Name:	pkgsrc
Committed By:	jlam
Date:		Wed Oct 24 22:11:17 UTC 2001

Modified Files:
	pkgsrc: Packages.txt
	pkgsrc/audio/gmp3info: Makefile
	pkgsrc/audio/gqmpeg: Makefile
	pkgsrc/audio/snd: Makefile
	pkgsrc/audio/wsoundserver: Makefile
	pkgsrc/audio/xmms-crossfade: Makefile
	pkgsrc/audio/xmms-dflowers: Makefile
	pkgsrc/audio/xmms-dscope: Makefile
	pkgsrc/audio/xmms-dspectogram: Makefile
	pkgsrc/audio/xmms-dspectralizer: Makefile
	pkgsrc/audio/xmms-gdancer: Makefile
	pkgsrc/audio/xmms-neato: Makefile
	pkgsrc/audio/xmms-vismsa: Makefile
	pkgsrc/audio/xsidplay: Makefile
	pkgsrc/cad/dinotrace: Makefile
	pkgsrc/cad/felt: Makefile
	pkgsrc/cad/ng-spice: Makefile
	pkgsrc/cad/qcad: Makefile
	pkgsrc/cad/vipec: Makefile
	pkgsrc/chat/gaim: Makefile
	pkgsrc/chat/gtkyahoo: Makefile
	pkgsrc/chat/kyahoo: Makefile
	pkgsrc/comms/jpilot: Makefile
	pkgsrc/comms/jpilot-expense: Makefile
	pkgsrc/comms/jpilot-syncmal: Makefile
	pkgsrc/comms/jpilot-synctime: Makefile
	pkgsrc/comms/pilot-link: Makefile
	pkgsrc/converters/psiconv: Makefile
	pkgsrc/converters/wv: Makefile
	pkgsrc/databases/gtksql: Makefile
	pkgsrc/databases/tk-postgresql: Makefile
	pkgsrc/devel/GConf: Makefile
	pkgsrc/devel/SDL: Makefile
	pkgsrc/devel/bonobo: Makefile
	pkgsrc/devel/ddd: Makefile
	pkgsrc/devel/gcvs: Makefile
	pkgsrc/devel/libdockapp: Makefile
	pkgsrc/devel/libglade: Makefile
	pkgsrc/devel/maketool: Makefile
	pkgsrc/editors/abiword: Makefile
	pkgsrc/editors/nedit: Makefile
	pkgsrc/editors/vim-gtk: Makefile
	pkgsrc/editors/vim-xaw: Makefile
	pkgsrc/emulators/vice: Makefile
	pkgsrc/emulators/zsnes: Makefile
	pkgsrc/games/baduki: Makefile
	pkgsrc/games/clanbomber: Makefile
	pkgsrc/games/fire: Makefile
	pkgsrc/games/freeciv-client: Makefile
	pkgsrc/games/freeciv-client-gtk: Makefile
	pkgsrc/games/gnome-chess: Makefile
	pkgsrc/games/imaze: Makefile
	pkgsrc/games/kulki: Makefile
	pkgsrc/games/lbreakout: Makefile
	pkgsrc/games/nethack-qt: Makefile
	pkgsrc/games/nethack-x11: Makefile
	pkgsrc/games/newvox: Makefile
	pkgsrc/games/pacman: Makefile
	pkgsrc/games/xboard: Makefile
	pkgsrc/games/xconq: Makefile
	pkgsrc/games/xracer: Makefile
	pkgsrc/graphics/ImageMagick: Makefile
	pkgsrc/graphics/Ngraph: Makefile
	pkgsrc/graphics/SDL-image: Makefile
	pkgsrc/graphics/autotrace: Makefile
	pkgsrc/graphics/avifile-devel: Makefile
	pkgsrc/graphics/clanlib: Makefile
	pkgsrc/graphics/dx: Makefile
	pkgsrc/graphics/fnlib: Makefile
	pkgsrc/graphics/freetype-utils: Makefile
	pkgsrc/graphics/gd: Makefile
	pkgsrc/graphics/geomview: Makefile
	pkgsrc/graphics/gfract: Makefile
	pkgsrc/graphics/gimp: Makefile
	pkgsrc/graphics/gle: Makefile
	pkgsrc/graphics/gqview: Makefile
	pkgsrc/graphics/imlib: Makefile
	pkgsrc/graphics/libwmf: Makefile
	pkgsrc/graphics/php4-gd: Makefile
	pkgsrc/graphics/tcm: Makefile
	pkgsrc/graphics/xzgv: Makefile
	pkgsrc/mail/sylpheed: Makefile
	pkgsrc/math/R: Makefile
	pkgsrc/math/gnumeric: Makefile
	pkgsrc/math/grace: Makefile
	pkgsrc/math/xmgr: Makefile
	pkgsrc/mk: x11.buildlink.mk
	pkgsrc/net/gtk-gnutella: Makefile
	pkgsrc/news/pan: Makefile
	pkgsrc/print/gnome-print: Makefile
	pkgsrc/print/mgv: Makefile
	pkgsrc/print/xpdf: Makefile
	pkgsrc/print/xpp: Makefile
	pkgsrc/sysutils/asapm: Makefile
	pkgsrc/sysutils/fsviewer: Makefile
	pkgsrc/sysutils/gkrellm: Makefile
	pkgsrc/sysutils/xnc: Makefile
	pkgsrc/sysutils/xosview: Makefile
	pkgsrc/sysutils/xps: Makefile
	pkgsrc/time/asclock-gtk: Makefile
	pkgsrc/time/glclock: Makefile
	pkgsrc/time/plan: Makefile
	pkgsrc/wm/afterstep: Makefile
	pkgsrc/wm/amaterus: Makefile
	pkgsrc/wm/enlightenment: Makefile
	pkgsrc/wm/flwm: Makefile
	pkgsrc/wm/icewm: Makefile
	pkgsrc/wm/icewm-gnome: Makefile
	pkgsrc/wm/windowmaker: Makefile
	pkgsrc/wm/wmakerconf: Makefile
	pkgsrc/www/Mosaic: Makefile
	pkgsrc/www/amaya: Makefile
	pkgsrc/www/gtkhtml: Makefile
	pkgsrc/x11/Xbae: Makefile
	pkgsrc/x11/XmHTML: Makefile
	pkgsrc/x11/controlcenter: Makefile
	pkgsrc/x11/ebuilder: Makefile
	pkgsrc/x11/eterm: Makefile
	pkgsrc/x11/fltk: Makefile
	pkgsrc/x11/gnome-core: Makefile
	pkgsrc/x11/gnome-libs: Makefile
	pkgsrc/x11/gtk: Makefile
	pkgsrc/x11/gtk--: Makefile
	pkgsrc/x11/p5-Tk: Makefile
	pkgsrc/x11/qt2-designer-kde: Makefile
	pkgsrc/x11/qt2-libs: Makefile
	pkgsrc/x11/qwt: Makefile
	pkgsrc/x11/rxvt: Makefile
	pkgsrc/x11/tk: Makefile buildlink.mk
	pkgsrc/x11/wmessage: Makefile
	pkgsrc/x11/wmfire: Makefile
	pkgsrc/x11/wmweather: Makefile
	pkgsrc/x11/wterm: Makefile
	pkgsrc/x11/xpenguins: Makefile
	pkgsrc/x11/xpmroot: Makefile
	pkgsrc/x11/xteddy: Makefile
	pkgsrc/x11/xteddy2: Makefile

Log Message:
I am a triple idiot.  The only relevant variable that x11.buildlink.mk
redefines about which buildlink.mk files would care is BUILDLINK_X11_DIR,
which points to the location of the X11R6 hierarchy used during building.
If x11.buildlink.mk isn't included, then BUILDLINK_X11_DIR defaults to
${X11BASE} (set in bsd.pkg.mk), so its value is always safe to use.  Remove
the ifdefs surrounding the use of BUILDLINK_X11_DIR in tk/buildlink.mk and
revert changes to move x11.buildlink.mk before the other buildlink.mk files.


To generate a diff of this commit:
cvs rdiff -r1.204 -r1.205 pkgsrc/Packages.txt
cvs rdiff -r1.7 -r1.8 pkgsrc/audio/gmp3info/Makefile
cvs rdiff -r1.43 -r1.44 pkgsrc/audio/gqmpeg/Makefile
cvs rdiff -r1.26 -r1.27 pkgsrc/audio/snd/Makefile
cvs rdiff -r1.9 -r1.10 pkgsrc/audio/wsoundserver/Makefile
cvs rdiff -r1.7 -r1.8 pkgsrc/audio/xmms-crossfade/Makefile
cvs rdiff -r1.10 -r1.11 pkgsrc/audio/xmms-dflowers/Makefile
cvs rdiff -r1.8 -r1.9 pkgsrc/audio/xmms-dscope/Makefile
cvs rdiff -r1.8 -r1.9 pkgsrc/audio/xmms-dspectogram/Makefile
cvs rdiff -r1.8 -r1.9 pkgsrc/audio/xmms-dspectralizer/Makefile
cvs rdiff -r1.4 -r1.5 pkgsrc/audio/xmms-gdancer/Makefile
cvs rdiff -r1.3 -r1.4 pkgsrc/audio/xmms-neato/Makefile
cvs rdiff -r1.3 -r1.4 pkgsrc/audio/xmms-vismsa/Makefile
cvs rdiff -r1.19 -r1.20 pkgsrc/audio/xsidplay/Makefile
cvs rdiff -r1.12 -r1.13 pkgsrc/cad/dinotrace/Makefile
cvs rdiff -r1.16 -r1.17 pkgsrc/cad/felt/Makefile
cvs rdiff -r1.8 -r1.9 pkgsrc/cad/ng-spice/Makefile
cvs rdiff -r1.6 -r1.7 pkgsrc/cad/qcad/Makefile
cvs rdiff -r1.25 -r1.26 pkgsrc/cad/vipec/Makefile
cvs rdiff -r1.9 -r1.10 pkgsrc/chat/gaim/Makefile
cvs rdiff -r1.2 -r1.3 pkgsrc/chat/gtkyahoo/Makefile
cvs rdiff -r1.4 -r1.5 pkgsrc/chat/kyahoo/Makefile
cvs rdiff -r1.23 -r1.24 pkgsrc/comms/jpilot/Makefile
cvs rdiff -r1.7 -r1.8 pkgsrc/comms/jpilot-expense/Makefile
cvs rdiff -r1.9 -r1.10 pkgsrc/comms/jpilot-syncmal/Makefile
cvs rdiff -r1.6 -r1.7 pkgsrc/comms/jpilot-synctime/Makefile
cvs rdiff -r1.25 -r1.26 pkgsrc/comms/pilot-link/Makefile
cvs rdiff -r1.14 -r1.15 pkgsrc/converters/psiconv/Makefile
cvs rdiff -r1.15 -r1.16 pkgsrc/converters/wv/Makefile
cvs rdiff -r1.19 -r1.20 pkgsrc/databases/gtksql/Makefile
cvs rdiff -r1.9 -r1.10 pkgsrc/databases/tk-postgresql/Makefile
cvs rdiff -r1.21 -r1.22 pkgsrc/devel/GConf/Makefile
cvs rdiff -r1.24 -r1.25 pkgsrc/devel/SDL/Makefile
cvs rdiff -r1.20 -r1.21 pkgsrc/devel/bonobo/Makefile
cvs rdiff -r1.37 -r1.38 pkgsrc/devel/ddd/Makefile
cvs rdiff -r1.5 -r1.6 pkgsrc/devel/gcvs/Makefile
cvs rdiff -r1.5 -r1.6 pkgsrc/devel/libdockapp/Makefile
cvs rdiff -r1.33 -r1.34 pkgsrc/devel/libglade/Makefile
cvs rdiff -r1.18 -r1.19 pkgsrc/devel/maketool/Makefile
cvs rdiff -r1.37 -r1.38 pkgsrc/editors/abiword/Makefile
cvs rdiff -r1.17 -r1.18 pkgsrc/editors/nedit/Makefile
cvs rdiff -r1.28 -r1.29 pkgsrc/editors/vim-gtk/Makefile
cvs rdiff -r1.18 -r1.19 pkgsrc/editors/vim-xaw/Makefile
cvs rdiff -r1.20 -r1.21 pkgsrc/emulators/vice/Makefile
cvs rdiff -r1.2 -r1.3 pkgsrc/emulators/zsnes/Makefile
cvs rdiff -r1.22 -r1.23 pkgsrc/games/baduki/Makefile
cvs rdiff -r1.11 -r1.12 pkgsrc/games/clanbomber/Makefile
cvs rdiff -r1.5 -r1.6 pkgsrc/games/fire/Makefile
cvs rdiff -r1.13 -r1.14 pkgsrc/games/freeciv-client/Makefile
cvs rdiff -r1.12 -r1.13 pkgsrc/games/freeciv-client-gtk/Makefile
cvs rdiff -r1.6 -r1.7 pkgsrc/games/gnome-chess/Makefile
cvs rdiff -r1.12 -r1.13 pkgsrc/games/imaze/Makefile
cvs rdiff -r1.9 -r1.10 pkgsrc/games/kulki/Makefile
cvs rdiff -r1.10 -r1.11 pkgsrc/games/lbreakout/Makefile
cvs rdiff -r1.28 -r1.29 pkgsrc/games/nethack-qt/Makefile
cvs rdiff -r1.14 -r1.15 pkgsrc/games/nethack-x11/Makefile
cvs rdiff -r1.5 -r1.6 pkgsrc/games/newvox/Makefile
cvs rdiff -r1.14 -r1.15 pkgsrc/games/pacman/Makefile
cvs rdiff -r1.13 -r1.14 pkgsrc/games/xboard/Makefile
cvs rdiff -r1.11 -r1.12 pkgsrc/games/xconq/Makefile
cvs rdiff -r1.19 -r1.20 pkgsrc/games/xracer/Makefile
cvs rdiff -r1.79 -r1.80 pkgsrc/graphics/ImageMagick/Makefile
cvs rdiff -r1.4 -r1.5 pkgsrc/graphics/Ngraph/Makefile
cvs rdiff -r1.3 -r1.4 pkgsrc/graphics/SDL-image/Makefile
cvs rdiff -r1.6 -r1.7 pkgsrc/graphics/autotrace/Makefile
cvs rdiff -r1.21 -r1.22 pkgsrc/graphics/avifile-devel/Makefile
cvs rdiff -r1.23 -r1.24 pkgsrc/graphics/clanlib/Makefile
cvs rdiff -r1.10 -r1.11 pkgsrc/graphics/dx/Makefile
cvs rdiff -r1.13 -r1.14 pkgsrc/graphics/fnlib/Makefile
cvs rdiff -r1.9 -r1.10 pkgsrc/graphics/freetype-utils/Makefile
cvs rdiff -r1.32 -r1.33 pkgsrc/graphics/gd/Makefile
cvs rdiff -r1.16 -r1.17 pkgsrc/graphics/geomview/Makefile
cvs rdiff -r1.4 -r1.5 pkgsrc/graphics/gfract/Makefile
cvs rdiff -r1.74 -r1.75 pkgsrc/graphics/gimp/Makefile
cvs rdiff -r1.5 -r1.6 pkgsrc/graphics/gle/Makefile
cvs rdiff -r1.24 -r1.25 pkgsrc/graphics/gqview/Makefile
cvs rdiff -r1.59 -r1.60 pkgsrc/graphics/imlib/Makefile
cvs rdiff -r1.26 -r1.27 pkgsrc/graphics/libwmf/Makefile
cvs rdiff -r1.5 -r1.6 pkgsrc/graphics/php4-gd/Makefile
cvs rdiff -r1.9 -r1.10 pkgsrc/graphics/tcm/Makefile
cvs rdiff -r1.10 -r1.11 pkgsrc/graphics/xzgv/Makefile
cvs rdiff -r1.7 -r1.8 pkgsrc/mail/sylpheed/Makefile
cvs rdiff -r1.27 -r1.28 pkgsrc/math/R/Makefile
cvs rdiff -r1.38 -r1.39 pkgsrc/math/gnumeric/Makefile
cvs rdiff -r1.15 -r1.16 pkgsrc/math/grace/Makefile
cvs rdiff -r1.12 -r1.13 pkgsrc/math/xmgr/Makefile
cvs rdiff -r1.10 -r1.11 pkgsrc/mk/x11.buildlink.mk
cvs rdiff -r1.11 -r1.12 pkgsrc/net/gtk-gnutella/Makefile
cvs rdiff -r1.4 -r1.5 pkgsrc/news/pan/Makefile
cvs rdiff -r1.42 -r1.43 pkgsrc/print/gnome-print/Makefile
cvs rdiff -r1.5 -r1.6 pkgsrc/print/mgv/Makefile
cvs rdiff -r1.2 -r1.3 pkgsrc/print/xpdf/Makefile
cvs rdiff -r1.14 -r1.15 pkgsrc/print/xpp/Makefile
cvs rdiff -r1.18 -r1.19 pkgsrc/sysutils/asapm/Makefile
cvs rdiff -r1.4 -r1.5 pkgsrc/sysutils/fsviewer/Makefile
cvs rdiff -r1.8 -r1.9 pkgsrc/sysutils/gkrellm/Makefile
cvs rdiff -r1.2 -r1.3 pkgsrc/sysutils/xnc/Makefile
cvs rdiff -r1.37 -r1.38 pkgsrc/sysutils/xosview/Makefile
cvs rdiff -r1.17 -r1.18 pkgsrc/sysutils/xps/Makefile
cvs rdiff -r1.8 -r1.9 pkgsrc/time/asclock-gtk/Makefile
cvs rdiff -r1.5 -r1.6 pkgsrc/time/glclock/Makefile
cvs rdiff -r1.8 -r1.9 pkgsrc/time/plan/Makefile
cvs rdiff -r1.17 -r1.18 pkgsrc/wm/afterstep/Makefile
cvs rdiff -r1.4 -r1.5 pkgsrc/wm/amaterus/Makefile
cvs rdiff -r1.7 -r1.8 pkgsrc/wm/enlightenment/Makefile
cvs rdiff -r1.7 -r1.8 pkgsrc/wm/flwm/Makefile
cvs rdiff -r1.7 -r1.8 pkgsrc/wm/icewm/Makefile
cvs rdiff -r1.6 -r1.7 pkgsrc/wm/icewm-gnome/Makefile
cvs rdiff -r1.22 -r1.23 pkgsrc/wm/windowmaker/Makefile
cvs rdiff -r1.9 -r1.10 pkgsrc/wm/wmakerconf/Makefile
cvs rdiff -r1.32 -r1.33 pkgsrc/www/Mosaic/Makefile
cvs rdiff -r1.14 -r1.15 pkgsrc/www/amaya/Makefile
cvs rdiff -r1.15 -r1.16 pkgsrc/www/gtkhtml/Makefile
cvs rdiff -r1.11 -r1.12 pkgsrc/x11/Xbae/Makefile
cvs rdiff -r1.23 -r1.24 pkgsrc/x11/XmHTML/Makefile
cvs rdiff -r1.33 -r1.34 pkgsrc/x11/controlcenter/Makefile
cvs rdiff -r1.13 -r1.14 pkgsrc/x11/ebuilder/Makefile
cvs rdiff -r1.12 -r1.13 pkgsrc/x11/eterm/Makefile
cvs rdiff -r1.22 -r1.23 pkgsrc/x11/fltk/Makefile
cvs rdiff -r1.71 -r1.72 pkgsrc/x11/gnome-core/Makefile
cvs rdiff -r1.72 -r1.73 pkgsrc/x11/gnome-libs/Makefile
cvs rdiff -r1.67 -r1.68 pkgsrc/x11/gtk/Makefile
cvs rdiff -r1.19 -r1.20 pkgsrc/x11/gtk--/Makefile
cvs rdiff -r1.24 -r1.25 pkgsrc/x11/p5-Tk/Makefile
cvs rdiff -r1.5 -r1.6 pkgsrc/x11/qt2-designer-kde/Makefile
cvs rdiff -r1.13 -r1.14 pkgsrc/x11/qt2-libs/Makefile
cvs rdiff -r1.12 -r1.13 pkgsrc/x11/qwt/Makefile
cvs rdiff -r1.29 -r1.30 pkgsrc/x11/rxvt/Makefile
cvs rdiff -r1.14 -r1.15 pkgsrc/x11/tk/Makefile
cvs rdiff -r1.7 -r1.8 pkgsrc/x11/tk/buildlink.mk
cvs rdiff -r1.14 -r1.15 pkgsrc/x11/wmessage/Makefile
cvs rdiff -r1.9 -r1.10 pkgsrc/x11/wmfire/Makefile
cvs rdiff -r1.7 -r1.8 pkgsrc/x11/wmweather/Makefile
cvs rdiff -r1.15 -r1.16 pkgsrc/x11/wterm/Makefile
cvs rdiff -r1.9 -r1.10 pkgsrc/x11/xpenguins/Makefile
cvs rdiff -r1.21 -r1.22 pkgsrc/x11/xpmroot/Makefile
cvs rdiff -r1.8 -r1.9 pkgsrc/x11/xteddy/Makefile
cvs rdiff -r1.8 -r1.9 pkgsrc/x11/xteddy2/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.