pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc Massive cleanup of buildlink3.mk and builtin.mk files ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/eac6fffa4cf9
branches:  trunk
changeset: 495007:eac6fffa4cf9
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Jun 01 18:02:37 2005 +0000

description:
Massive cleanup of buildlink3.mk and builtin.mk files in pkgsrc.
Several changes are involved since they are all interrelated.  These
changes affect about 1000 files.

The first major change is rewriting bsd.builtin.mk as well as all of
the builtin.mk files to follow the new example in bsd.builtin.mk.
The loop to include all of the builtin.mk files needed by the package
is moved from bsd.builtin.mk and into bsd.buildlink3.mk.  bsd.builtin.mk
is now included by each of the individual builtin.mk files and provides
some common logic for all of the builtin.mk files.  Currently, this
includes the computation for whether the native or pkgsrc version of
the package is preferred.  This causes USE_BUILTIN.* to be correctly
set when one builtin.mk file includes another.

The second major change is teach the builtin.mk files to consider
files under ${LOCALBASE} to be from pkgsrc-controlled packages.  Most
of the builtin.mk files test for the presence of built-in software by
checking for the existence of certain files, e.g. <pthread.h>, and we
now assume that if that file is under ${LOCALBASE}, then it must be
from pkgsrc.  This modification is a nod toward LOCALBASE=/usr.  The
exceptions to this new check are the X11 distribution packages, which
are handled specially as noted below.

The third major change is providing builtin.mk and version.mk files
for each of the X11 distribution packages in pkgsrc.  The builtin.mk
file can detect whether the native X11 distribution is the same as
the one provided by pkgsrc, and the version.mk file computes the
version of the X11 distribution package, whether it's built-in or not.

The fourth major change is that the buildlink3.mk files for X11 packages
that install parts which are part of X11 distribution packages, e.g.
Xpm, Xcursor, etc., now use imake to query the X11 distribution for
whether the software is already provided by the X11 distribution.
This is more accurate than grepping for a symbol name in the imake
config files.  Using imake required sprinkling various builtin-imake.mk
helper files into pkgsrc directories.  These files are used as input
to imake since imake can't use stdin for that purpose.

The fifth major change is in how packages note that they use X11.
Instead of setting USE_X11, package Makefiles should now include
x11.buildlink3.mk instead.  This causes the X11 package buildlink3
and builtin logic to be executed at the correct place for buildlink3.mk
and builtin.mk files that previously set USE_X11, and fixes packages
that relied on buildlink3.mk files to implicitly note that X11 is
needed.  Package buildlink3.mk should also include x11.buildlink3.mk
when linking against the package libraries requires also linking
against the X11 libraries.  Where it was obvious, redundant inclusions
of x11.buildlink3.mk have been removed.

diffstat:

 archivers/bzip2/builtin.mk                        |   83 +++++--
 archivers/cxunzip/Makefile                        |    3 +-
 audio/SDL_mixer/Makefile                          |    3 +-
 audio/SDL_sound/Makefile                          |    3 +-
 audio/audacity/Makefile                           |    3 +-
 audio/bmp/Makefile.common                         |    3 +-
 audio/cdplayer/Makefile                           |    3 +-
 audio/csound4/Makefile                            |    3 +-
 audio/dap/Makefile                                |    3 +-
 audio/easytag/Makefile                            |    3 +-
 audio/festival/Makefile                           |    4 +-
 audio/freezetag/Makefile                          |    3 +-
 audio/gdcd/Makefile                               |    3 +-
 audio/gmp3info/Makefile                           |    4 +-
 audio/gnome-audio/Makefile                        |    5 +-
 audio/gnome-speech/Makefile                       |    4 +-
 audio/gqmpeg-devel/Makefile                       |    3 +-
 audio/gqmpeg/Makefile                             |    3 +-
 audio/kmp/Makefile                                |    3 +-
 audio/libao-arts/Makefile                         |    4 +-
 audio/libvisual-plugins/Makefile                  |    4 +-
 audio/libvisual/Makefile                          |    4 +-
 audio/madman/Makefile                             |    4 +-
 audio/mixer.app/Makefile                          |    3 +-
 audio/mpg123-nas/Makefile                         |    5 +-
 audio/muse/Makefile                               |    3 +-
 audio/musicbox/Makefile                           |    3 +-
 audio/rhythmbox/Makefile                          |    3 +-
 audio/rosegarden/Makefile                         |    5 +-
 audio/rsynth/Makefile                             |    4 +-
 audio/snd/Makefile                                |    3 +-
 audio/spiralloops/Makefile                        |    3 +-
 audio/spiralsynth/Makefile                        |    3 +-
 audio/streamtuner/Makefile                        |    3 +-
 audio/sweep/Makefile                              |    3 +-
 audio/tcl-snack/Makefile                          |    3 +-
 audio/terminatorx/Makefile                        |    3 +-
 audio/wmmp3/Makefile                              |    3 +-
 audio/wmusic/Makefile                             |    3 +-
 audio/xamp/Makefile                               |    3 +-
 audio/xanalyser/Makefile                          |    3 +-
 audio/xhippo/Makefile                             |    3 +-
 audio/xmms-alarm/Makefile                         |    3 +-
 audio/xmms-bezier/Makefile                        |    3 +-
 audio/xmms-blursk/Makefile                        |    3 +-
 audio/xmms-crossfade/Makefile                     |    3 +-
 audio/xmms-dflowers/Makefile                      |    3 +-
 audio/xmms-dscope/Makefile                        |    3 +-
 audio/xmms-dspectogram/Makefile                   |    3 +-
 audio/xmms-dspectral/Makefile                     |    3 +-
 audio/xmms-fmradio/Makefile                       |    3 +-
 audio/xmms-funtimedancer/Makefile                 |    4 +-
 audio/xmms-gdancer/Makefile                       |    3 +-
 audio/xmms-modplug/Makefile                       |    3 +-
 audio/xmms-neato/Makefile                         |    3 +-
 audio/xmms-paranormal/Makefile                    |    3 +-
 audio/xmms-synaesthesia/Makefile                  |    3 +-
 audio/xmms-vismsa/Makefile                        |    3 +-
 audio/xmms/Makefile.common                        |    3 +-
 audio/xmp/Makefile                                |    5 +-
 audio/yamt/Makefile                               |    3 +-
 biology/chemtool/Makefile                         |    3 +-
 biology/phylip/Makefile                           |    4 +-
 cad/dinotrace/Makefile                            |    3 +-
 cad/electric/Makefile                             |    3 +-
 cad/gtkwave/Makefile                              |    3 +-
 cad/magic/Makefile                                |    5 +-
 cad/ng-spice/Makefile                             |    6 +-
 cad/pcb-current/Makefile                          |    3 +-
 cad/qcad/Makefile                                 |    3 +-
 cad/spice/Makefile                                |    4 +-
 cad/vipec/Makefile                                |    3 +-
 cad/xchiplogo/Makefile                            |    4 +-
 chat/gaim-encryption/Makefile                     |    3 +-
 chat/gaim/Makefile                                |    3 +-
 chat/gnomeicu/Makefile                            |    3 +-
 chat/gtkyahoo/Makefile                            |    3 +-
 chat/psi/Makefile                                 |    3 +-
 chat/quirc/Makefile                               |    3 +-
 chat/xchat/Makefile.common                        |    3 +-
 chat/xchat2/Makefile                              |    3 +-
 chat/zephyr/Makefile                              |    4 +-
 comms/estic/Makefile                              |    5 +-
 comms/jpilot-syncmal/Makefile                     |    3 +-
 comms/jpilot/Makefile                             |    3 +-
 comms/p5-pilot-link/Makefile                      |    4 +-
 comms/pilot-link/Makefile                         |    3 +-
 comms/pilotmgr/Makefile                           |    4 +-
 comms/xisp/Makefile                               |    4 +-
 converters/libiconv/builtin.mk                    |  147 ++++++++------
 converters/wv/Makefile                            |    4 +-
 converters/xdeview/Makefile                       |    3 +-
 databases/gq/Makefile                             |    3 +-
 databases/libgda/Makefile.common                  |    4 +-
 databases/libgnomedb/Makefile                     |    3 +-
 databases/mergeant/Makefile                       |    3 +-
 databases/quicklist/Makefile                      |    3 +-
 databases/sqsh-x11/Makefile                       |    4 +-
 databases/tk-postgresql73/Makefile                |    3 +-
 databases/unixodbc-DataManager/Makefile           |    4 +-
 databases/unixodbc-ODBCConfig/Makefile            |    4 +-
 databases/xmysql/Makefile                         |    3 +-
 databases/xmysqladmin/Makefile                    |    3 +-
 databases/xsqlmenu/Makefile                       |    3 +-
 devel/GConf/Makefile                              |    4 +-
 devel/Gorm/Makefile                               |    3 +-
 devel/ProjectCenter/Makefile                      |    3 +-
 devel/Renaissance/Makefile                        |    3 +-
 devel/SDL/Makefile.common                         |    3 +-
 devel/SDL/buildlink3.mk                           |    3 +-
 devel/SDL_gfx/Makefile                            |    3 +-
 devel/SDL_ttf/Makefile                            |    3 +-
 devel/allegro/Makefile                            |    4 +-
 devel/anjuta/Makefile                             |    3 +-
 devel/at-spi/Makefile                             |    3 +-
 devel/binutils/builtin.mk                         |   78 +++++--
 devel/cdk/builtin.mk                              |   67 +++---
 devel/coconut/Makefile                            |    3 +-
 devel/cvsup-gui/Makefile                          |    5 +-
 devel/devIL/Makefile                              |    3 +-
 devel/devhelp/Makefile                            |    3 +-
 devel/dlcompat/builtin.mk                         |   93 ++++----
 devel/edcommon/Makefile                           |    3 +-
 devel/eel/Makefile                                |    3 +-
 devel/eel2/Makefile                               |    3 +-
 devel/gail/Makefile                               |    3 +-
 devel/gal2/Makefile                               |    3 +-
 devel/gal20/Makefile                              |    3 +-
 devel/gcvs/Makefile                               |    3 +-
 devel/gettext-lib/buildlink3.mk                   |    5 +-
 devel/gettext-lib/builtin.mk                      |  224 +++++++++++++--------
 devel/giblib/Makefile                             |    4 +-
 devel/glade2/Makefile.common                      |    3 +-
 devel/gnome2-libole2/Makefile                     |    4 +-
 devel/gnustep-base/Makefile                       |    4 +-
 devel/gnustep-examples/Makefile                   |    3 +-
 devel/gnustep-make/Makefile                       |    4 +-
 devel/gscope/Makefile                             |    3 +-
 devel/guile-gtk/Makefile                          |    3 +-
 devel/guile14-gtk/Makefile                        |    3 +-
 devel/jgrasp/Makefile                             |    4 +-
 devel/libast/Makefile                             |    4 +-
 devel/libbonoboui/Makefile                        |    3 +-
 devel/libdockapp/Makefile                         |    3 +-
 devel/libevent/builtin.mk                         |   43 +++-
 devel/libgetopt/builtin.mk                        |   65 +++++-
 devel/libglade2/Makefile                          |    3 +-
 devel/libgnomeui/Makefile                         |    3 +-
 devel/libmatchbox/Makefile                        |    3 +-
 devel/libstroke/Makefile                          |    4 +-
 devel/maketool/Makefile                           |    3 +-
 devel/ncurses/builtin.mk                          |  194 +++++++++---------
 devel/netbeans-ide/Makefile                       |    4 +-
 devel/ode/Makefile                                |    5 +-
 devel/ogre/Makefile                               |    3 +-
 devel/pango/Makefile                              |    3 +-
 devel/py-idle/Makefile                            |    4 +-
 devel/readline/builtin.mk                         |  179 +++++++++--------
 devel/tcl-tclcl/Makefile                          |    3 +-
 devel/zlib/builtin.mk                             |  123 ++++++-----
 editors/TeXmacs/Makefile                          |    4 +-
 editors/abiword/Makefile.common                   |    3 +-
 editors/beaver/Makefile                           |    4 +-
 editors/ce-x11/Makefile                           |    4 +-
 editors/cooledit/Makefile                         |    3 +-
 editors/dasher/Makefile                           |    3 +-
 editors/elvis-x11/Makefile                        |    3 +-
 editors/emacs/Makefile                            |    3 +-
 editors/emacs20/Makefile                          |    4 +-
 editors/gconf-editor/Makefile                     |    3 +-
 editors/gedit/Makefile                            |    3 +-
 editors/gice/Makefile                             |    3 +-
 editors/gnuserv/Makefile                          |    5 +-
 editors/gtranslator/Makefile                      |    3 +-
 editors/lyx-qt/Makefile.common                    |    4 +-
 editors/mule/Makefile                             |    5 +-
 editors/nedit/Makefile                            |    3 +-
 editors/poedit/Makefile                           |    3 +-
 editors/sam/Makefile                              |    4 +-
 editors/vigor/Makefile                            |    3 +-
 editors/vim-gtk/Makefile                          |    3 +-
 editors/vim-gtk2/Makefile                         |    3 +-
 editors/vim-motif/Makefile                        |    3 +-
 editors/vim-xaw/Makefile                          |    3 +-
 editors/wily/Makefile                             |    4 +-
 editors/xcoral/Makefile                           |    4 +-
 editors/xemacs-current/Makefile                   |    3 +-
 editors/xemacs/Makefile                           |    3 +-
 editors/xemacs/Makefile.pkg                       |    4 +-
 editors/xjed/Makefile                             |    4 +-
 editors/xvile/Makefile                            |    3 +-
 editors/xwpe/Makefile                             |    4 +-
 editors/yudit/Makefile                            |    4 +-
 emulators/BasiliskII/Makefile                     |    5 +-
 emulators/aranym/Makefile                         |    3 +-
 emulators/arcem/Makefile                          |    5 +-
 emulators/atari800/options.mk                     |    4 +-
 emulators/bochs/Makefile                          |    5 +-
 emulators/darcnes/Makefile                        |    4 +-
 emulators/dega/Makefile                           |    3 +-
 emulators/dgen/Makefile                           |    3 +-
 emulators/fmsx/Makefile                           |    5 +-
 emulators/fuse-utils/Makefile                     |    4 +-
 emulators/fuse/Makefile                           |    3 +-
 emulators/gcube/Makefile                          |    3 +-
 emulators/generator/Makefile                      |    3 +-
 emulators/gnuboy-sdl/Makefile                     |    3 +-
 emulators/gnuboy/Makefile                         |    5 +-
 emulators/gxemul/Makefile                         |    4 +-
 emulators/hatari/Makefile                         |    3 +-
 emulators/minivmac/Makefile                       |    5 +-
 emulators/openmsx/Makefile                        |    3 +-
 emulators/osf1_lib/Makefile                       |    4 +-
 emulators/palmosemulator/Makefile                 |    3 +-
 emulators/pcemu/Makefile                          |    5 +-
 emulators/pearpc/Makefile                         |    4 +-
 emulators/qemu/Makefile                           |    3 +-
 emulators/raine/Makefile                          |    4 +-
 emulators/snes9x/Makefile                         |    4 +-
 emulators/tuxnes/Makefile                         |    3 +-
 emulators/twin/Makefile                           |    5 +-
 emulators/uae/Makefile                            |    4 +-
 emulators/vice/Makefile                           |    3 +-
 emulators/wine/Makefile                           |    4 +-
 emulators/xcopilot/Makefile                       |    3 +-
 emulators/xm7/Makefile                            |    5 +-
 emulators/xmame/Makefile                          |    4 +-
 emulators/xmess/Makefile                          |    4 +-
 emulators/xtrs/Makefile                           |    4 +-
 emulators/zsnes/Makefile                          |    3 +-
 finance/gnofin/Makefile                           |    3 +-
 finance/gnucash-docs/Makefile                     |    4 +-
 finance/gnucash/Makefile                          |    3 +-
 fonts/XFree86-fontserver/Makefile                 |    4 +-
 fonts/Xft2/Makefile                               |    3 +-
 fonts/Xft2/builtin-imake.mk                       |   12 +
 fonts/Xft2/builtin.mk                             |  184 ++++++++----------
 fonts/fontconfig/builtin-imake.mk                 |   12 +
 fonts/fontconfig/builtin.mk                       |  128 +++++++-----
 fonts/fontforge/Makefile                          |    4 +-
 fonts/gucharmap/Makefile                          |    3 +-
 fonts/intlfonts/Makefile                          |    4 +-
 fonts/ja-shinonome/Makefile                       |    4 +-
 fonts/t1lib/Makefile                              |    5 +-
 fonts/ttmkfdir2/Makefile                          |    4 +-
 fonts/vfontcap-kochi/Makefile                     |    3 +-
 fonts/xmbdfed/Makefile                            |    3 +-
 fonts/xorg-fontserver/Makefile                    |    4 +-
 games/KoboDeluxe/Makefile                         |    3 +-
 games/abuse/Makefile                              |    4 +-
 games/angband-x11/Makefile                        |    4 +-
 games/baduki/Makefile                             |    3 +-
 games/battalion/Makefile                          |    4 +-
 games/battleball/Makefile                         |    5 +-
 games/boson/Makefile                              |    3 +-
 games/bzflag/Makefile                             |    4 +-
 games/cgoban/Makefile                             |    4 +-
 games/crack-attack/Makefile                       |    3 +-
 games/craft/Makefile                              |    4 +-
 games/criticalmass/Makefile                       |    3 +-
 games/crossfire-cli/Makefile                      |    3 +-
 games/crossfire-srv/Makefile                      |    3 +-
 games/d2x/Makefile                                |    3 +-
 games/dd2/Makefile                                |    3 +-
 games/defendguin/Makefile                         |    3 +-
 games/falcons-eye/Makefile                        |    3 +-
 games/finalbattle/Makefile                        |    3 +-
 games/fire/Makefile                               |    3 +-
 games/fkiss/Makefile                              |    4 +-
 games/foobillard/Makefile                         |    3 +-
 games/freeciv-client-gtk/Makefile                 |    3 +-
 games/freeciv-client-gtk2/Makefile                |    3 +-
 games/freeciv-client/Makefile                     |    3 +-
 games/galaxa/Makefile                             |    5 +-
 games/glaxium/Makefile                            |    3 +-
 games/glchess/Makefile                            |    3 +-
 games/gnocatan/Makefile                           |    3 +-
 games/gnome2-games/Makefile                       |    3 +-
 games/golddig/Makefile                            |    3 +-
 games/gtkgo/Makefile                              |    3 +-
 games/gturing/Makefile                            |    3 +-
 games/icbm3d/Makefile                             |    4 +-
 games/icebreaker/Makefile                         |    3 +-
 games/ketm/Makefile                               |    3 +-
 games/knightcap/Makefile                          |    4 +-
 games/lbreakout/Makefile                          |    3 +-
 games/lbreakout2/Makefile                         |    3 +-
 games/lgeneral/Makefile                           |    3 +-
 games/lincity/Makefile                            |    4 +-
 games/lmarbles/Makefile                           |    3 +-
 games/lpairs/Makefile                             |    3 +-
 games/ltris/Makefile                              |    3 +-
 games/maelstrom-sdl/Makefile                      |    3 +-
 games/mirrormagic/Makefile                        |    5 +-
 games/nethack-qt/Makefile                         |    3 +-
 games/nethack-x11/Makefile                        |    3 +-
 games/nethack/Makefile                            |    3 +-
 games/neverball/Makefile                          |    3 +-
 games/newvox/Makefile                             |    3 +-
 games/nighthawk/Makefile                          |    3 +-
 games/openmortal/Makefile                         |    3 +-
 games/openttd/Makefile                            |    3 +-
 games/plib/Makefile                               |    4 +-
 games/powermanga/Makefile                         |    3 +-
 games/quake/Makefile                              |    4 +-
 games/quake2forge/Makefile                        |    3 +-
 games/quake3arena-demo/Makefile                   |    4 +-
 games/quake3arena/Makefile                        |    5 +-
 games/quake6/Makefile                             |    4 +-
 games/quakeforge/Makefile                         |    3 +-
 games/rocksndiamonds/Makefile.common              |    5 +-
 games/rtcw/Makefile                               |    4 +-
 games/scummvm/options.mk                          |    4 +-
 games/sirius/Makefile                             |    3 +-
 games/spellcast/Makefile                          |    3 +-
 games/starfighter/Makefile                        |    3 +-
 games/tileworld/Makefile                          |    3 +-
 games/urban/Makefile                              |    3 +-
 games/wormz/Makefile                              |    5 +-
 games/xarchon/Makefile                            |    3 +-
 games/xboard/Makefile                             |    3 +-
 games/xbomb/Makefile                              |    5 +-
 games/xbomber/Makefile                            |    5 +-
 games/xbreaky/Makefile                            |    3 +-
 games/xdoom/Makefile                              |    3 +-
 games/xevil/Makefile                              |    3 +-
 games/xfreecell/Makefile                          |    3 +-
 games/xfrisk/Makefile                             |    3 +-
 games/xgalaga/Makefile                            |    3 +-
 games/xgospel/Makefile                            |    3 +-
 games/xjump/Makefile                              |    3 +-
 games/xmahjongg/Makefile                          |    4 +-
 games/xnibbles/Makefile                           |    3 +-
 games/xracer/Makefile                             |    4 +-
 games/xrick/Makefile                              |    3 +-
 games/xroach/Makefile                             |    4 +-
 games/xroads/Makefile                             |    4 +-
 games/xsc/Makefile                                |    5 +-
 games/xtris/Makefile                              |    4 +-
 games/xtux/Makefile                               |    3 +-
 games/xworm/Makefile                              |    5 +-
 games/xzip/Makefile                               |    3 +-
 games/zoom/Makefile                               |    3 +-
 geography/mapserver/Makefile                      |    3 +-
 geography/vis5d+/Makefile                         |    4 +-
 graphics/3DKit/Makefile.common                    |    5 +-
 graphics/Cenon/Makefile                           |    3 +-
 graphics/ImageMagick/options.mk                   |    4 +-
 graphics/ImageViewer/Makefile                     |    3 +-
 graphics/Mesa/Makefile.common                     |    4 +-
 graphics/Mesa/version.mk                          |   77 +------
 graphics/MesaLib/builtin-imake.mk                 |   12 +
 graphics/MesaLib/builtin.mk                       |  109 ++++++----
 graphics/Ngraph/Makefile                          |    3 +-
 graphics/OpenRM/Makefile                          |    4 +-
 graphics/PanoTools/Makefile                       |    5 +-
 graphics/SDL_image/Makefile                       |    3 +-
 graphics/aalib-x11/Makefile                       |    5 +-
 graphics/aalib-x11/buildlink3.mk                  |    5 +-
 graphics/aqsis/Makefile                           |    4 +-
 graphics/autotrace/Makefile                       |    4 +-
 graphics/aview-x11/Makefile                       |    3 +-
 graphics/blender/Makefile                         |    3 +-
 graphics/cairo/Makefile                           |    3 +-
 graphics/cal3d-examples/Makefile                  |    4 +-
 graphics/claraocr/Makefile                        |    4 +-
 graphics/cqcam/Makefile                           |    3 +-
 graphics/dia/Makefile.common                      |    3 +-
 graphics/dvdview/Makefile                         |    4 +-
 graphics/dxsamples/Makefile                       |    3 +-
 graphics/eog2/Makefile                            |    3 +-
 graphics/feh/Makefile                             |    4 +-
 graphics/flphoto/Makefile                         |    3 +-
 graphics/fly/Makefile                             |    3 +-
 graphics/fnlib/Makefile                           |    3 +-
 graphics/freeglut/Makefile                        |    4 +-
 graphics/freetype-utils/Makefile                  |    4 +-
 graphics/freetype2/builtin-imake.mk               |   12 +
 graphics/freetype2/builtin.mk                     |  116 ++++++----
 graphics/g2/Makefile                              |    4 +-
 graphics/gdk-pixbuf/Makefile.common               |    3 +-
 graphics/gfract/Makefile                          |    3 +-
 graphics/gifsicle/Makefile                        |    4 +-
 graphics/gimageview/Makefile                      |    3 +-
 graphics/gimp/Makefile                            |    3 +-
 graphics/gimp1-base/Makefile                      |    3 +-
 graphics/gimp1-data/Makefile                      |    3 +-
 graphics/giram/Makefile                           |    3 +-
 graphics/gle/Makefile                             |    4 +-
 graphics/glitz/Makefile                           |    4 +-
 graphics/gliv/Makefile                            |    3 +-
 graphics/glu/Makefile                             |    7 +-
 graphics/glu/builtin-imake.mk                     |   12 +
 graphics/glu/builtin.mk                           |  105 ++++++----
 graphics/glut/Makefile                            |   10 +-
 graphics/glut/buildlink3.mk                       |    6 +-
 graphics/gnome2-pixmaps/Makefile                  |    5 +-
 graphics/gnuplot/Makefile                         |    4 +-
 graphics/graphviz/Makefile                        |    3 +-
 graphics/gri/Makefile                             |    4 +-
 graphics/gtkglext/Makefile                        |    3 +-
 graphics/gtksee/Makefile                          |    3 +-
 graphics/hp2xx/Makefile                           |    4 +-
 graphics/iGMT/Makefile                            |    5 +-
 graphics/imlib/Makefile                           |    3 +-
 graphics/imlib2/Makefile                          |    4 +-
 graphics/ivtools/Makefile                         |    5 +-
 graphics/lib3ds/Makefile                          |    4 +-
 graphics/libart2/Makefile                         |    4 +-
 graphics/libgdiplus/Makefile                      |    3 +-
 graphics/libggi/Makefile                          |    3 +-
 graphics/libggi/buildlink3.mk                     |    4 +-
 graphics/libgii/Makefile                          |    4 +-
 graphics/libgii/buildlink3.mk                     |    7 +-
 graphics/libgnomecanvas/Makefile                  |    3 +-
 graphics/librsvg/Makefile                         |    3 +-
 graphics/librsvg2/Makefile.common                 |    3 +-
 graphics/libvideogfx/Makefile                     |    4 +-
 graphics/libwmf/Makefile                          |    4 +-
 graphics/mgl/Makefile                             |    4 +-
 graphics/mpeg2codec/Makefile                      |    4 +-
 graphics/openexr/Makefile                         |    3 +-
 graphics/p5-Image-Imlib2/Makefile                 |    4 +-
 graphics/p5-PerlMagick/Makefile                   |    4 +-
 graphics/pgraf/Makefile                           |    5 +-
 graphics/ploticus-examples/Makefile               |    5 +-
 graphics/ploticus/Makefile                        |    4 +-
 graphics/plotutils/Makefile                       |    4 +-
 graphics/povray/Makefile                          |    4 +-
 graphics/pstoedit/Makefile                        |    4 +-
 graphics/py-biggles/Makefile                      |    4 +-
 graphics/py-imagingtk/Makefile                    |    3 +-
 graphics/radiance/Makefile                        |    3 +-
 graphics/ruby-RMagick/Makefile                    |    4 +-
 graphics/ruby-imlib2/Makefile                     |    5 +-
 graphics/ruby-opengl/Makefile                     |    4 +-
 graphics/scigraphica/Makefile                     |    3 +-
 graphics/scrot/Makefile                           |    4 +-
 graphics/skencil/Makefile                         |    4 +-
 graphics/sodipodi/Makefile                        |    3 +-
 graphics/tuxpaint-config/Makefile                 |    3 +-
 graphics/urt/Makefile                             |    4 +-
 graphics/vcg/Makefile                             |    4 +-
 graphics/vtk/Makefile                             |    5 +-
 graphics/x11rec/Makefile                          |    4 +-
 graphics/xplot/Makefile                           |    4 +-
 graphics/xpm/Makefile                             |    9 +-
 graphics/xpm/buildlink3.mk                        |    7 +-
 graphics/xpm/builtin-imake.mk                     |   12 +
 graphics/xpm/builtin.mk                           |  133 ++++++++-----
 graphics/xsane/Makefile                           |    3 +-
 inputmethod/Chinput/Makefile                      |    3 +-
 inputmethod/libtabe/Makefile                      |    4 +-
 inputmethod/nabi/Makefile                         |    3 +-
 inputmethod/uim/Makefile                          |    3 +-
 inputmethod/unicon-im/Makefile                    |    4 +-
 inputmethod/xcin/Makefile                         |    3 +-
 lang/STk/Makefile                                 |    4 +-
 lang/drscheme/Makefile                            |    4 +-
 lang/eag/Makefile                                 |    4 +-
 lang/elk/Makefile                                 |    5 +-
 lang/erlang/Makefile                              |    4 +-
 lang/icon/Makefile                                |    4 +-
 lang/kaffe-x11/Makefile                           |    4 +-
 lang/pnetlib/Makefile                             |    4 +-
 lang/sather/Makefile                              |    3 +-
 lang/scm/Makefile                                 |    4 +-
 lang/squeak/Makefile                              |    4 +-
 lang/sr/Makefile                                  |    5 +-
 lang/stalin/Makefile                              |    4 +-
 lang/swi-prolog-packages/Makefile                 |    3 +-
 lang/tcl-otcl/Makefile                            |    3 +-
 lang/ucblogo/Makefile                             |    4 +-
 lang/yabasic/Makefile                             |    4 +-
 mail/GNUMail/Makefile                             |    3 +-
 mail/balsa2/Makefile                              |    3 +-
 mail/bbmail/Makefile                              |    5 +-
 mail/coolmail/Makefile                            |    4 +-
 mail/evolution/Makefile                           |    3 +-
 mail/evolution14/Makefile                         |    3 +-
 mail/exmh/Makefile                                |    5 +-
 mail/faces/Makefile                               |    3 +-
 mail/fetchmailconf/Makefile                       |    3 +-
 mail/libmilter/builtin.mk                         |   56 +++-
 mail/libmilter812/builtin.mk                      |   56 +++-
 mail/spruce/Makefile                              |    3 +-
 mail/sylpheed-claws/Makefile.common               |    5 +-
 mail/sylpheed-devel/Makefile                      |    3 +-
 mail/sylpheed/Makefile                            |    3 +-
 mail/wmbiff/Makefile                              |    3 +-
 mail/wmmail/Makefile                              |    3 +-
 mail/xbuffy/Makefile                              |    4 +-
 math/R/Makefile                                   |    3 +-
 math/gcalctool/Makefile                           |    3 +-
 math/gnumeric/Makefile                            |    3 +-
 math/gnumeric14/Makefile                          |    3 +-
 math/grpn/Makefile                                |    3 +-
 math/guppi/Makefile                               |    3 +-
 math/octave-forge/Makefile                        |    4 +-
 math/pari/Makefile                                |    4 +-
 math/snns/Makefile                                |    3 +-
 math/tasp-vsipl/Makefile                          |    5 +-
 math/vista/Makefile                               |    3 +-
 math/xgap/Makefile                                |    4 +-
 math/xlispstat/Makefile                           |    3 +-
 math/yacas/Makefile                               |    4 +-
 math/yorick/Makefile                              |    5 +-
 mbone/imm/Makefile                                |    3 +-
 mbone/vat/Makefile                                |    3 +-
 mbone/vic/Makefile                                |    3 +-
 meta-pkgs/gnome-base/Makefile                     |    3 +-
 meta-pkgs/gnome/Makefile                          |    3 +-
 meta-pkgs/gnustep/Makefile                        |    3 +-
 meta-pkgs/gtk2-extras/Makefile                    |    3 +-
 meta-pkgs/kde3/kde3.mk                            |    3 +-
 meta-pkgs/windowmaker-desktop/Makefile            |    3 +-
 meta-pkgs/xfce4/Makefile.common                   |    4 +-
 misc/9menu/Makefile                               |    5 +-
 misc/Addresses/Makefile                           |    3 +-
 misc/astrolog/Makefile                            |    4 +-
 misc/bbappconf/Makefile                           |    4 +-
 misc/bbweather/Makefile                           |    5 +-
 misc/celestia/Makefile.common                     |    4 +-
 misc/fooseti/Makefile                             |    3 +-
 misc/gnome2-user-docs/Makefile                    |    3 +-
 misc/gnome2-utils/Makefile                        |    3 +-
 misc/gok/Makefile                                 |    3 +-
 misc/gperiodic/Makefile                           |    3 +-
 misc/gxmame/Makefile                              |    3 +-
 misc/kp/Makefile                                  |    4 +-
 misc/molden/Makefile                              |    4 +-
 misc/nxtvepg/Makefile                             |    3 +-
 misc/openoffice/Makefile                          |    4 +-
 misc/root/Makefile                                |    3 +-
 misc/siag/Makefile                                |    3 +-
 misc/stellarium/Makefile                          |    3 +-
 misc/xdg-x11-dirs/Makefile                        |    3 +-
 misc/xtide/Makefile                               |    3 +-
 misc/yelp/Makefile                                |    3 +-
 misc/zorro/Makefile                               |    5 +-
 mk/bsd.pkg.mk                                     |    6 +-
 mk/bsd.pkg.use.mk                                 |   11 +-
 mk/buildlink3/bsd.buildlink3.mk                   |   27 +--
 mk/buildlink3/bsd.builtin.mk                      |  126 +++++------
 mk/buildlink3/find-files.mk                       |  101 +++++++++
 mk/buildlink3/find-libs.mk                        |   21 +-
 mk/db1.builtin.mk                                 |  121 +++++-----
 mk/defaults/mk.conf                               |    4 +-
 mk/dlopen.builtin.mk                              |  108 ++++++---
 mk/motif.buildlink3.mk                            |    5 +-
 mk/pthread.builtin.mk                             |   72 +++---
 mk/solaris-pam.builtin.mk                         |   68 ++++--
 mk/x11.buildlink3.mk                              |   22 ++
 mk/x11.builtin.mk                                 |    8 +
 mk/x11.version.mk                                 |   31 +++
 mk/xaw.buildlink3.mk                              |    3 +-
 multimedia/RealPlayerGold/Makefile                |    5 +-
 multimedia/alevt/Makefile                         |    3 +-
 multimedia/divxplayer/Makefile                    |    3 +-
 multimedia/ffmpeg/Makefile                        |    4 +-
 multimedia/gmencoder/Makefile                     |    3 +-
 multimedia/gnome2-media/Makefile                  |    3 +-
 multimedia/gst-plugins/Makefile                   |    4 +-
 multimedia/gstreamer/Makefile                     |    4 +-
 multimedia/gxine/Makefile                         |    3 +-
 multimedia/libflash/Makefile.common               |    5 +-
 multimedia/mmg/Makefile                           |    3 +-
 multimedia/moz-flash/Makefile                     |    4 +-
 multimedia/mplayer-plugin-firefox/Makefile.common |    4 +-
 multimedia/mplayer-share/Makefile.depends         |    5 +-
 multimedia/ogle/Makefile                          |    4 +-
 multimedia/ogle_gui/Makefile                      |    3 +-
 multimedia/smpeg/Makefile                         |    3 +-
 multimedia/totem/Makefile.common                  |    3 +-
 multimedia/vlc/Makefile                           |    3 +-
 multimedia/xawtv/Makefile                         |    3 +-
 multimedia/xine-ui/Makefile                       |    4 +-
 multimedia/xvid4conf/Makefile                     |    3 +-
 net/IglooFTP/Makefile                             |    3 +-
 net/amule/Makefile                                |    3 +-
 net/arla/Makefile                                 |    5 +-
 net/bind9/builtin.mk                              |   92 ++++++--
 net/bug-buddy/Makefile                            |    3 +-
 net/ed2k-gtk-gui/Makefile                         |    3 +-
 net/etherape/Makefile                             |    3 +-
 net/ethereal/Makefile                             |    3 +-
 net/gtk-gnutella/Makefile                         |    3 +-
 net/gtk_wicontrol/Makefile                        |    3 +-
 net/icsi-finger/Makefile                          |    5 +-
 net/libpcap/builtin.mk                            |  121 +++++++----
 net/mldonkey-gui/Makefile                         |    3 +-
 net/mtr-gtk/Makefile                              |    3 +-
 net/nam/Makefile                                  |    3 +-
 net/netbsd-tap/builtin.mk                         |   51 ++++-
 net/netsaint-base/Makefile.common                 |    5 +-
 net/ns/Makefile                                   |    3 +-
 net/pload/Makefile                                |    3 +-
 net/rdesktop/Makefile                             |    4 +-
 net/skype/Makefile                                |    4 +-
 net/tsclient/Makefile                             |    3 +-
 net/ttt/Makefile                                  |    3 +-
 net/vino/Makefile                                 |    3 +-
 net/wistumbler/Makefile                           |    3 +-
 net/x2vnc/Makefile                                |    4 +-
 net/xipdump/Makefile                              |    3 +-
 net/xtraceroute/Makefile                          |    3 +-
 net/ytalk-x11/Makefile                            |    4 +-
 parallel/clusterit/Makefile                       |    4 +-
 parallel/mpi-ch/Makefile                          |    3 +-
 parallel/openpbs/Makefile                         |    3 +-
 parallel/pvm3/Makefile                            |    5 +-
 parallel/sge/Makefile                             |    3 +-
 pkgtools/x11-links/Makefile                       |    5 +-
 pkgtools/x11-links/builtin.mk                     |   58 +-----
 pkgtools/x11-links/version.mk                     |   35 +++
 pkgtools/x11-links/xfree.mk                       |   13 +-
 pkgtools/xpkgwedge/Makefile                       |    5 +-
 print/advi/Makefile                               |    3 +-
 print/cjk-lyx/Makefile                            |    3 +-
 print/ggv2/Makefile                               |    3 +-
 print/ghostscript-esp/Makefile                    |    4 +-
 print/ghostscript-gnu-x11/Makefile                |    4 +-
 print/ghostscript-gnu/Makefile                    |    4 +-
 print/ghostscript/Makefile                        |    4 +-
 print/gimp-print/Makefile                         |    3 +-
 print/gnome-print/Makefile                        |    3 +-
 print/gpdf/Makefile                               |    3 +-
 print/gv/Makefile                                 |    3 +-
 print/imposter/Makefile                           |    3 +-
 print/ja-ptex/Makefile                            |    4 +-
 print/ja-vflib-utils/Makefile                     |    4 +-
 print/ja-vflib/Makefile                           |    4 +-
 print/ja-vfxdvik/Makefile                         |    4 +-
 print/lgrind/Makefile                             |    5 +-
 print/libgnomeprint/Makefile                      |    3 +-
 print/libgnomeprintui/Makefile                    |    3 +-
 print/mp/Makefile                                 |    3 +-
 print/scribus/Makefile                            |    3 +-
 print/teTeX-bin/Makefile.common                   |    4 +-
 print/teTeX1-bin/Makefile                         |    4 +-
 print/teTeX1/Makefile                             |    3 +-
 print/teTeX3-bin/Makefile.common                  |    4 +-
 print/texfamily/Makefile                          |    5 +-
 print/xpdf/Makefile                               |    3 +-
 print/xpp/Makefile                                |    3 +-
 security/PAM/builtin.mk                           |   81 +++++--
 security/dsniff/Makefile                          |    5 +-
 security/heimdal/builtin.mk                       |  137 +++++++-----
 security/kth-krb4/Makefile                        |    4 +-
 security/libdes/builtin.mk                        |   68 +++++-
 security/nessus-core/Makefile                     |    3 +-
 security/nessus/Makefile                          |    3 +-
 security/openpam/builtin.mk                       |   79 ++++--
 security/openssl/builtin.mk                       |  217 +++++++++-----------
 security/pflkm/builtin.mk                         |  100 +++++++--
 security/putty/Makefile                           |    3 +-
 security/qca-tls/Makefile                         |    3 +-
 security/qca/Makefile                             |    3 +-
 security/seahorse/Makefile                        |    3 +-
 security/skey/builtin.mk                          |   81 ++++---
 security/ssh2/Makefile                            |    4 +-
 security/ssh2/Makefile.common                     |    3 +-
 security/tcp_wrappers/builtin.mk                  |   49 ++++-
 sysutils/asapm/Makefile                           |    3 +-
 sysutils/bbsload/Makefile                         |    4 +-
 sysutils/burn/Makefile                            |    3 +-
 sysutils/fam/builtin.mk                           |   45 ++++-
 sysutils/file/builtin.mk                          |   56 ++++-
 sysutils/fsv/Makefile                             |    3 +-
 sysutils/fsviewer/Makefile                        |    3 +-
 sysutils/gentoo/Makefile                          |    3 +-
 sysutils/gkrellm/Makefile                         |    3 +-
 sysutils/gkrellm1/Makefile                        |    3 +-
 sysutils/gnome-vfs/Makefile                       |    3 +-
 sysutils/gnome2-system-monitor/Makefile           |    3 +-
 sysutils/gnometoaster/Makefile                    |    3 +-
 sysutils/grun/Makefile                            |    3 +-
 sysutils/gtk-send-pr/Makefile                     |    3 +-
 sysutils/gworkspace/Makefile                      |    3 +-
 sysutils/idesk/Makefile                           |    3 +-
 sysutils/lavaps/Makefile                          |    3 +-
 sysutils/mc/options.mk                            |    4 +-
 sysutils/medusa/Makefile                          |    4 +-
 sysutils/mtools/Makefile                          |    4 +-
 sysutils/nautilus-cd-burner/Makefile              |    3 +-
 sysutils/nautilus/Makefile                        |    3 +-
 sysutils/pftop/Makefile                           |    4 +-
 sysutils/psmisc/Makefile                          |    4 +-
 sysutils/rox-session/Makefile                     |    3 +-
 sysutils/rox/Makefile                             |    3 +-
 sysutils/screentest/Makefile                      |    3 +-
 sysutils/tkcron/Makefile                          |    5 +-
 sysutils/tpb/Makefile                             |    4 +-
 sysutils/ups-nut-cgi/Makefile                     |    4 +-
 sysutils/wmSMPmon/Makefile                        |    3 +-
 sysutils/wmcpuload/Makefile                       |    3 +-
 sysutils/wmmemmon/Makefile                        |    3 +-
 sysutils/xcdroast/Makefile                        |    3 +-
 sysutils/xenvstat/Makefile                        |    5 +-
 sysutils/xfe/Makefile                             |    4 +-
 sysutils/xhfs/Makefile                            |    3 +-
 sysutils/xmbmon/Makefile                          |    5 +-
 sysutils/xnc/Makefile                             |    4 +-
 sysutils/xuvmstat/Makefile                        |    5 +-
 textproc/catdoc-tk/Makefile                       |    3 +-
 textproc/expat/builtin-imake.mk                   |   12 +
 textproc/expat/builtin.mk                         |  120 ++++++----
 textproc/gtkspell/Makefile                        |    3 +-
 textproc/libcroco/Makefile                        |    3 +-
 textproc/stardic/Makefile                         |    3 +-
 time/bbdate/Makefile                              |    4 +-
 time/dclock/Makefile                              |    3 +-
 time/glclock/Makefile                             |    4 +-
 time/gnotime/Makefile                             |    3 +-
 time/ical/Makefile                                |    3 +-
 time/pclock/Makefile                              |    4 +-
 time/ptimetracker/Makefile                        |    3 +-
 time/rclock/Makefile                              |    3 +-
 time/xbeats/Makefile                              |    3 +-
 time/xdaliclock/Makefile                          |    4 +-
 time/xdkcal/Makefile                              |    5 +-
 time/xtu/Makefile                                 |    5 +-
 wm/3ddesktop/Makefile                             |    4 +-
 wm/aewm++/Makefile                                |    4 +-
 wm/afterstep/Makefile                             |    4 +-
 wm/afterstep1/Makefile                            |    3 +-
 wm/amaterus/Makefile                              |    3 +-
 wm/amiwm/Makefile                                 |    4 +-
 wm/bbconf/Makefile                                |    3 +-
 wm/bbkeys/Makefile                                |    4 +-
 wm/bbpager/Makefile                               |    5 +-
 wm/bbrun/Makefile                                 |    3 +-
 wm/blackbox/Makefile                              |    4 +-
 wm/bsetroot/Makefile                              |    4 +-
 wm/e16menuedit2/Makefile                          |    3 +-
 wm/econf/Makefile                                 |    3 +-
 wm/enlightenment/Makefile                         |    3 +-
 wm/ethemes/Makefile                               |    5 +-
 wm/evilwm/Makefile                                |    5 +-
 wm/fluxbox/Makefile                               |    4 +-
 wm/flwm/Makefile                                  |    3 +-
 wm/fvwm-devel/Makefile                            |    3 +-
 wm/fvwm2-themes/Makefile                          |    3 +-
 wm/golem/Makefile                                 |    3 +-
 wm/icewm/Makefile.common                          |    3 +-
 wm/ion/Makefile                                   |    4 +-
 wm/ion3-devel/Makefile                            |    4 +-
 wm/matchbox/Makefile                              |    3 +-
 wm/metacity/Makefile                              |    3 +-
 wm/novawm/Makefile                                |    3 +-
 wm/openbox/Makefile                               |    3 +-
 wm/openbox2/Makefile                              |    3 +-
 wm/oroborus/Makefile                              |    4 +-
 wm/pekwm/Makefile                                 |    3 +-
 wm/pwm/Makefile                                   |    4 +-
 wm/qvwm/Makefile                                  |    3 +-
 wm/ratpoison/Makefile                             |    4 +-
 wm/sawfish-themes/Makefile                        |    4 +-
 wm/sawfish/Makefile                               |    4 +-
 wm/sawfish/Makefile.common                        |    3 +-
 wm/skippy/Makefile                                |    3 +-
 wm/waimea/Makefile                                |    3 +-
 wm/wampager/Makefile                              |    3 +-
 wm/weewm/Makefile                                 |    5 +-
 wm/whiteBOX/Makefile                              |    3 +-
 wm/windowlab/Makefile                             |    3 +-
 wm/windowmaker/Makefile                           |    3 +-
 wm/wm2/Makefile                                   |    4 +-
 wm/wmctrl/Makefile                                |    4 +-
 wm/wmextra/Makefile                               |    3 +-
 wm/wmi/Makefile                                   |    3 +-
 wm/wmthemes/Makefile                              |    4 +-
 www/amaya/Makefile                                |    3 +-
 www/bluefish/Makefile                             |    3 +-
 www/dillo/Makefile                                |    3 +-
 www/galeon/Makefile                               |    3 +-
 www/glibwww/Makefile                              |    3 +-
 www/grail/Makefile                                |    3 +-
 www/htmldoc-x11/Makefile                          |    3 +-
 www/libgtkhtml/Makefile                           |    3 +-
 www/liferea/Makefile                              |    3 +-
 www/links-gui/Makefile                            |    4 +-
 www/mMosaic/Makefile                              |    3 +-
 www/mozilla/Makefile.common                       |    3 +-
 www/navigator3/Makefile                           |    4 +-
 www/ns-remote/Makefile                            |    5 +-
 www/p5-Apache-Gallery/Makefile                    |    4 +-
 www/w3m/Makefile.common                           |    4 +-
 x11/9term/Makefile                                |    4 +-
 x11/XFree86-clients/Makefile                      |    3 +-
 x11/XFree86-libs/builtin.mk                       |   73 +++++++
 x11/XFree86-libs/version.mk                       |   41 ++++
 x11/XFree86-server/Makefile                       |    4 +-
 x11/XaoS/Makefile                                 |    4 +-
 x11/Xaw-Xpm/buildlink3.mk                         |    5 +-
 x11/Xaw3d/buildlink3.mk                           |    3 +-
 x11/Xbae/Makefile                                 |    3 +-
 x11/Xcomposite/Makefile                           |    3 +-
 x11/Xcomposite/builtin-imake.mk                   |   12 +
 x11/Xcomposite/builtin.mk                         |   59 +++++-
 x11/Xfixes/Makefile                               |    4 +-
 x11/Xfixes/buildlink3.mk                          |    3 +-
 x11/Xfixes/builtin-imake.mk                       |   12 +
 x11/Xfixes/builtin.mk                             |   58 ++++-
 x11/Xrandr-mixedcase/buildlink3.mk                |    4 +-
 x11/Xrandr-mixedcase/builtin-imake.mk             |   12 +
 x11/Xrandr-mixedcase/builtin.mk                   |  196 +++++++++----------
 x11/Xrender/buildlink3.mk                         |    4 +-
 x11/Xrender/builtin-imake.mk                      |   12 +
 x11/Xrender/builtin.mk                            |  187 ++++++++---------
 x11/aterm/Makefile                                |    3 +-
 x11/bbapm/Makefile                                |    5 +-
 x11/blt/Makefile                                  |    3 +-
 x11/compositeext/builtin.mk                       |   60 ++++-
 x11/devilspie/Makefile                            |    4 +-
 x11/dfm/Makefile.common                           |    3 +-
 x11/dxpc/Makefile                                 |    4 +-
 x11/ebuilder/Makefile                             |    3 +-
 x11/eterm/Makefile                                |    4 +-
 x11/fbdesk/Makefile                               |    3 +-
 x11/fixesext/Makefile                             |    4 +-
 x11/fixesext/builtin.mk                           |   60 ++++-
 x11/fltk/Makefile                                 |    4 +-
 x11/fltk/buildlink3.mk                            |    3 +-
 x11/fox/Makefile                                  |    4 +-
 x11/fspanel/Makefile                              |    3 +-
 x11/gdm/Makefile                                  |    3 +-
 x11/gnome-desktop/Makefile                        |    3 +-
 x11/gnome-libs/Makefile                           |    3 +-
 x11/gnome-mag/Makefile                            |    3 +-
 x11/gnome-panel/Makefile                          |    3 +-
 x11/gnome-session/Makefile                        |    3 +-
 x11/gnome-themes-extras/Makefile                  |    3 +-
 x11/gnome-themes/Makefile                         |    3 +-
 x11/gnome2-applets/Makefile                       |    3 +-
 x11/gnome2-control-center/Makefile                |    3 +-
 x11/gnome2-terminal/Makefile                      |    3 +-
 x11/gnopernicus/Makefile                          |    3 +-
 x11/gnustep-back/Makefile                         |    3 +-
 x11/gnustep-gui/Makefile                          |    4 +-
 x11/gnustep-preferences/Makefile                  |    3 +-
 x11/gtk/Makefile                                  |    3 +-
 x11/gtk/buildlink3.mk                             |    5 +-
 x11/gtk2-engines/Makefile                         |    3 +-
 x11/gtk2/Makefile                                 |    3 +-
 x11/gtk2/buildlink3.mk                            |    4 +-
 x11/gtkmm/Makefile                                |    3 +-
 x11/gtkmm24/Makefile                              |    3 +-
 x11/gtkterm2/Makefile                             |    3 +-
 x11/gtoolkit/Makefile.common                      |    5 +-
 x11/hot-babe/Makefile                             |    3 +-
 x11/hsetroot/Makefile                             |    4 +-
 x11/imwheel/Makefile                              |    3 +-
 x11/keylaunch/Makefile                            |    5 +-
 x11/lablgtk/Makefile                              |    3 +-
 x11/labltk/Makefile                               |    3 +-
 x11/libxklavier/Makefile                          |    4 +-
 x11/libzvt/Makefile                               |    3 +-
 x11/mlterm/Makefile                               |    3 +-
 x11/mowitz/Makefile                               |    3 +-
 x11/mrxvt/Makefile                                |    3 +-
 x11/multi-aterm/Makefile                          |    3 +-
 x11/neXtaw/Makefile                               |    4 +-
 x11/neXtaw/buildlink3.mk                          |    3 +-
 x11/numlockx/Makefile                             |    5 +-
 x11/ocaml-graphics/Makefile                       |    4 +-
 x11/openmotif/Makefile                            |    4 +-
 x11/p5-Tk/Makefile                                |    4 +-
 x11/p5-gtk/Makefile.common                        |    4 +-
 x11/p5-gtk2/Makefile                              |    3 +-
 x11/py-Tk/Makefile                                |    3 +-
 x11/py-qt2-sip/Makefile                           |    3 +-
 x11/py-qt2/Makefile                               |    3 +-
 x11/py-qt3-base/Makefile                          |    3 +-
 x11/py-qt3-modules/Makefile                       |    3 +-
 x11/py-qt3-qscintilla/Makefile                    |    3 +-
 x11/py-qt3-sip/Makefile                           |    3 +-
 x11/qt1/Makefile                                  |    4 +-
 x11/qt1/buildlink3.mk                             |    4 +-
 x11/qt2-libs/Makefile.common                      |    4 +-
 x11/qt2/Makefile.common                           |    3 +-
 x11/qt3-libs/Makefile.common                      |    5 +-
 x11/qt3/Makefile                                  |    3 +-
 x11/qtarch/Makefile                               |    3 +-
 x11/qwspritefield/Makefile                        |    3 +-
 x11/randrext/buildlink3.mk                        |    8 +-
 x11/randrext/builtin.mk                           |  105 ++++++---
 x11/render/buildlink3.mk                          |    7 +-
 x11/render/builtin.mk                             |  105 ++++++---
 x11/ruby-fox/Makefile                             |    4 +-
 x11/ruby-gtk/Makefile                             |    3 +-
 x11/ruby-tcltklib/Makefile                        |    3 +-
 x11/ruby-tk/Makefile                              |    3 +-
 x11/ruby16-tcltklib/Makefile                      |    3 +-
 x11/ruby16-tk/Makefile                            |    3 +-
 x11/ssystem/Makefile                              |    3 +-
 x11/startup-notification/Makefile                 |    4 +-
 x11/tk-Tix/Makefile                               |    3 +-
 x11/tk/Makefile                                   |    4 +-
 x11/tk/buildlink3.mk                              |    5 +-
 x11/tk83/Makefile                                 |    4 +-
 x11/tk83/buildlink3.mk                            |    5 +-
 x11/tkman/Makefile                                |    5 +-
 x11/vte/Makefile                                  |    3 +-
 x11/wmfire/Makefile                               |    3 +-
 x11/wmfstatus/Makefile                            |    3 +-
 x11/wmweather/Makefile                            |    3 +-
 x11/wxGTK/Makefile                                |    3 +-
 x11/wxhaskell/Makefile                            |    3 +-
 x11/xbindkeys/Makefile.common                     |    5 +-
 x11/xcompmgr/Makefile                             |    3 +-
 x11/xcursor/Makefile                              |    3 +-
 x11/xcursor/buildlink3.mk                         |    4 +-
 x11/xcursor/builtin-imake.mk                      |   12 +
 x11/xcursor/builtin.mk                            |  119 +++++++----
 x11/xdesktopwaves/Makefile                        |    5 +-
 x11/xdialog/Makefile                              |    4 +-
 x11/xextensions/builtin.mk                        |   79 ++++--
 x11/xfstt/Makefile                                |    4 +-
 x11/xjman/Makefile                                |    3 +-
 x11/xkbd/Makefile                                 |    3 +-
 x11/xkbset/Makefile                               |    3 +-
 x11/xlockmore/Makefile.common                     |    4 +-
 x11/xmindpath/Makefile                            |    4 +-
 x11/xneko/Makefile                                |    5 +-
 x11/xnodecor/Makefile                             |    4 +-
 x11/xorg-clients/Makefile                         |    3 +-
 x11/xorg-libs/builtin.mk                          |   81 +++++++
 x11/xorg-libs/version.mk                          |   44 ++++
 x11/xorg-server/Makefile                          |    4 +-
 x11/xosd/Makefile.common                          |    4 +-
 x11/xpad/Makefile                                 |    3 +-
 x11/xpenguins/Makefile                            |    3 +-
 x11/xplanet/Makefile                              |    3 +-
 x11/xpmicons/Makefile                             |    4 +-
 x11/xpns/Makefile                                 |    4 +-
 x11/xrestop/Makefile                              |    4 +-
 x11/xservers/Makefile                             |    3 +-
 x11/xteddy/Makefile                               |    4 +-
 x11/xteddy2/Makefile                              |    3 +-
 x11/xterm/Makefile                                |    4 +-
 x11/xtermset/Makefile                             |    4 +-
 x11/xvattr/Makefile                               |    3 +-
 x11/xvidcap/Makefile.common                       |    4 +-
 x11/xworld/Makefile                               |    4 +-
 x11/xwrits/Makefile                               |    4 +-
 x11/zenity/Makefile                               |    3 +-
 947 files changed, 5036 insertions(+), 3853 deletions(-)

diffs (truncated from 23625 to 300 lines):

diff -r a2619f1708a3 -r eac6fffa4cf9 archivers/bzip2/builtin.mk
--- a/archivers/bzip2/builtin.mk        Wed Jun 01 17:45:57 2005 +0000
+++ b/archivers/bzip2/builtin.mk        Wed Jun 01 18:02:37 2005 +0000
@@ -1,36 +1,67 @@
-# $NetBSD: builtin.mk,v 1.2 2004/03/29 05:43:28 jlam Exp $
+# $NetBSD: builtin.mk,v 1.3 2005/06/01 18:02:37 jlam Exp $
+
+BUILTIN_PKG:=  bzip2
 
+BUILTIN_FIND_FILES_VAR:=       H_BZIP2
+BUILTIN_FIND_FILES.H_BZIP2=    /usr/include/bzlib.h
+BUILTIN_FIND_GREP.H_BZIP2=     BZ2_
+
+.include "../../mk/buildlink3/bsd.builtin.mk"
+
+###
+### Determine if there is a built-in implementation of the package and
+### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
+###
 .if !defined(IS_BUILTIN.bzip2)
 IS_BUILTIN.bzip2=      no
-.  if exists(/usr/include/bzlib.h)
-IS_BUILTIN.bzip2!=                                                     \
-       if ${GREP} -q "BZ2_" /usr/include/bzlib.h; then                 \
-               ${ECHO} "yes";                                          \
-       else                                                            \
-               ${ECHO} "no";                                           \
-       fi
+.  if empty(H_BZIP2:M${LOCALBASE}/*) && exists(${H_BZIP2})
+IS_BUILTIN.bzip2=      yes
 .  endif
-BUILDLINK_VARS+=       IS_BUILTIN.bzip2
-.endif # IS_BUILTIN.bzip2
-
-.if !defined(USE_BUILTIN.bzip2)
-USE_BUILTIN.bzip2?=    ${IS_BUILTIN.bzip2}
-PREFER.bzip2?=         pkgsrc
+.endif
+MAKEVARS+=     IS_BUILTIN.bzip2
 
-.  if defined(USE_BZIP2)
-.    if !empty(IS_BUILTIN.bzip2:M[nN][oO]) || \
-        (${PREFER.bzip2} == "pkgsrc")
+###
+### Determine whether we should use the built-in implementation if it
+### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no").
+###
+.if !defined(USE_BUILTIN.bzip2)
+.  if ${PREFER.bzip2} == "pkgsrc"
 USE_BUILTIN.bzip2=     no
+.  else
+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}
+.        if !empty(USE_BUILTIN.bzip2:M[yY][eE][sS])
+USE_BUILTIN.bzip2!=                                                    \
+       if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.bzip2:Q}; then  \
+               ${ECHO} yes;                                            \
+       else                                                            \
+               ${ECHO} no;                                             \
+       fi
+.        endif
+.      endfor
 .    endif
-.  endif
+#
+# Some platforms don't have a bzip2 implementation that can replace
+# pkgsrc bzip2.
+#
+_INCOMPAT_BZIP2?=      SunOS-5.[678]-* Darwin-*-*
+.    for _pattern_ in ${_INCOMPAT_BZIP2} ${INCOMPAT_BZIP2}
+.      if !empty(MACHINE_PLATFORM:M${_pattern_})
+USE_BUILTIN.bzip2=     no
+.      endif
+.    endfor
+.  endif  # PREFER.bzip2
+.endif
+MAKEVARS+=     USE_BUILTIN.bzip2
 
-# Solaris 9 has bzip2 1.0.1, build it on older versions.
-# Darwin only has a static libbz2.a.
+# if USE_BZIP2 is defined, then force the use of a true bzip2
+# implementation.
 #
-_INCOMPAT_BZIP2?=      SunOS-5.[678]-* Darwin-*
-.  for _pattern_ in ${_INCOMPAT_BZIP2} ${INCOMPAT_BZIP2}
-.    if !empty(MACHINE_PLATFORM:M${_pattern_})
+.if defined(USE_BZIP2)
+.  if !empty(IS_BUILTIN.bzip2:M[nN][oO])
 USE_BUILTIN.bzip2=     no
-.    endif
-.  endfor
-.endif # USE_BUILTIN.bzip2
+.  endif
+.endif
diff -r a2619f1708a3 -r eac6fffa4cf9 archivers/cxunzip/Makefile
--- a/archivers/cxunzip/Makefile        Wed Jun 01 17:45:57 2005 +0000
+++ b/archivers/cxunzip/Makefile        Wed Jun 01 18:02:37 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/05/22 20:07:36 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2005/06/01 18:02:37 jlam Exp $
 
 DISTNAME=      cxunzip-0.98
 PKGREVISION=   2
@@ -11,7 +11,6 @@
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
-USE_X11=       yes
 GNU_CONFIGURE= yes
 USE_TOOLS+=    gmake
 USE_LANGUAGES= c c++
diff -r a2619f1708a3 -r eac6fffa4cf9 audio/SDL_mixer/Makefile
--- a/audio/SDL_mixer/Makefile  Wed Jun 01 17:45:57 2005 +0000
+++ b/audio/SDL_mixer/Makefile  Wed Jun 01 18:02:37 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/06/01 14:11:26 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2005/06/01 18:02:37 jlam Exp $
 
 DISTNAME=      SDL_mixer-1.2.6
 PKGREVISION=   2
@@ -14,7 +14,6 @@
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
 USE_LIBTOOL=           YES
-USE_X11=               YES
 GNU_CONFIGURE=         YES
 
 CPPFLAGS=              -Dunix=1
diff -r a2619f1708a3 -r eac6fffa4cf9 audio/SDL_sound/Makefile
--- a/audio/SDL_sound/Makefile  Wed Jun 01 17:45:57 2005 +0000
+++ b/audio/SDL_sound/Makefile  Wed Jun 01 18:02:37 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:44:51 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/06/01 18:02:37 jlam Exp $
 #
 
 DISTNAME=              SDL_sound-1.0.1
@@ -12,7 +12,6 @@
 
 GNU_CONFIGURE=         YES
 USE_LIBTOOL=           YES
-USE_X11=               YES
 
 .include "../../audio/libmikmod/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
diff -r a2619f1708a3 -r eac6fffa4cf9 audio/audacity/Makefile
--- a/audio/audacity/Makefile   Wed Jun 01 17:45:57 2005 +0000
+++ b/audio/audacity/Makefile   Wed Jun 01 18:02:37 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/05/22 20:07:37 jlam Exp $
+# $NetBSD: Makefile,v 1.35 2005/06/01 18:02:37 jlam Exp $
 
 DISTNAME=      audacity-src-1.2.3
 PKGNAME=       audacity-1.2.3
@@ -16,7 +16,6 @@
 USE_TOOLS+=            gmake
 USE_LIBTOOL=           yes
 USE_PKGLOCALEDIR=      yes
-USE_X11=               yes
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --without-xaudio
 CONFIGURE_ARGS+=       --with-id3=system
diff -r a2619f1708a3 -r eac6fffa4cf9 audio/bmp/Makefile.common
--- a/audio/bmp/Makefile.common Wed Jun 01 17:45:57 2005 +0000
+++ b/audio/bmp/Makefile.common Wed Jun 01 18:02:37 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2005/04/28 22:16:31 jlam Exp $
+# $NetBSD: Makefile.common,v 1.11 2005/06/01 18:02:37 jlam Exp $
 #
 
 DISTNAME=      bmp-0.9.7
@@ -17,7 +17,6 @@
 USE_DIRS+=             xdg-1.1
 USE_LIBTOOL=           yes
 USE_PKGLOCALEDIR=      yes
-USE_X11=               yes
 
 CONFIGURE_ARGS+=       --disable-alsa
 CONFIGURE_ARGS+=       --disable-esd
diff -r a2619f1708a3 -r eac6fffa4cf9 audio/cdplayer/Makefile
--- a/audio/cdplayer/Makefile   Wed Jun 01 17:45:57 2005 +0000
+++ b/audio/cdplayer/Makefile   Wed Jun 01 18:02:37 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/05/22 20:07:37 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2005/06/01 18:02:37 jlam Exp $
 #
 
 DISTNAME=      cdplayer-0.4.2
@@ -10,7 +10,6 @@
 COMMENT=       GNUstep CD player with CDDB support
 
 WRKSRC=                ${WRKDIR}/${PKGBASE}
-USE_X11=       YES
 USE_TOOLS+=    gmake
 MAKEFILE=      GNUmakefile
 MAKE_ENV+=     ADDITIONAL_CPPFLAGS="-Wno-import"
diff -r a2619f1708a3 -r eac6fffa4cf9 audio/csound4/Makefile
--- a/audio/csound4/Makefile    Wed Jun 01 17:45:57 2005 +0000
+++ b/audio/csound4/Makefile    Wed Jun 01 18:02:37 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/05/23 20:40:47 ben Exp $
+# $NetBSD: Makefile,v 1.7 2005/06/01 18:02:37 jlam Exp $
 #
 
 DISTNAME=              csound-4.23f13gbs.0
@@ -16,7 +16,6 @@
 USE_TOOLS+=            gmake
 GNU_CONFIGURE=         yes
 USE_MAKEINFO=          yes
-USE_X11=               yes
 TEXINFO_REQD=          4.2
 CONFIGURE_ARGS+=       --enable-debug
 CFLAGS+=               -g
diff -r a2619f1708a3 -r eac6fffa4cf9 audio/dap/Makefile
--- a/audio/dap/Makefile        Wed Jun 01 17:45:57 2005 +0000
+++ b/audio/dap/Makefile        Wed Jun 01 18:02:37 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/04/11 21:44:51 tv Exp $
+# $NetBSD: Makefile,v 1.24 2005/06/01 18:02:37 jlam Exp $
 
 DISTNAME=              dap-2.1.2
 PKGREVISION=           5
@@ -14,7 +14,6 @@
 
 MAKE_ENV+=             X11PREFIX=${X11PREFIX}
 
-USE_X11=               yes
 USE_LANGUAGES=         c c++
 
 do-install:
diff -r a2619f1708a3 -r eac6fffa4cf9 audio/easytag/Makefile
--- a/audio/easytag/Makefile    Wed Jun 01 17:45:57 2005 +0000
+++ b/audio/easytag/Makefile    Wed Jun 01 18:02:37 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2005/05/22 20:07:37 jlam Exp $
+# $NetBSD: Makefile,v 1.47 2005/06/01 18:02:37 jlam Exp $
 #
 
 DISTNAME=      easytag-1.1
@@ -15,7 +15,6 @@
 GNU_CONFIGURE=         yes
 USE_DIRS+=             xdg-1.1
 USE_TOOLS+=            gmake
-USE_X11=               yes
 USE_PKGLOCALEDIR=      yes
 USE_LIBTOOL=           yes
 
diff -r a2619f1708a3 -r eac6fffa4cf9 audio/festival/Makefile
--- a/audio/festival/Makefile   Wed Jun 01 17:45:57 2005 +0000
+++ b/audio/festival/Makefile   Wed Jun 01 18:02:37 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/05/22 20:07:37 jlam Exp $
+# $NetBSD: Makefile,v 1.40 2005/06/01 18:02:37 jlam Exp $
 
 DISTNAME=      festival-1.95-beta
 PKGNAME=       festival-1.95beta
@@ -14,7 +14,6 @@
 
 WRKSRC=                ${WRKDIR}
 USE_TOOLS+=    gmake
-USE_X11=       yes
 
 SPEECHTOOLS=   ${WRKSRC}/speech_tools
 FESTIVAL=      ${WRKSRC}/festival
@@ -94,4 +93,5 @@
        ${INSTALL_MAN} ${FESTIVAL}/doc/festival_client.1 ${PREFIX}/man/man1/festival_client.1
 
 .include "../../audio/nas/buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r a2619f1708a3 -r eac6fffa4cf9 audio/freezetag/Makefile
--- a/audio/freezetag/Makefile  Wed Jun 01 17:45:57 2005 +0000
+++ b/audio/freezetag/Makefile  Wed Jun 01 18:02:37 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:44:52 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/06/01 18:02:37 jlam Exp $
 #
 
 DISTNAME=      freezetag-0.9.2
@@ -10,7 +10,6 @@
 HOMEPAGE=      http://katz.linuxpower.org/freezetag/
 COMMENT=       Id3 tag editor for GTK+-1.2.0 and higher
 
-USE_X11=               YES
 GNU_CONFIGURE=         YES
 
 .include "../../x11/gtk/buildlink3.mk"
diff -r a2619f1708a3 -r eac6fffa4cf9 audio/gdcd/Makefile
--- a/audio/gdcd/Makefile       Wed Jun 01 17:45:57 2005 +0000
+++ b/audio/gdcd/Makefile       Wed Jun 01 18:02:37 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/04/11 21:44:52 tv Exp $
+# $NetBSD: Makefile,v 1.29 2005/06/01 18:02:38 jlam Exp $
 #
 
 DISTNAME=      gdcd-0.2.1
@@ -11,7 +11,6 @@



Home | Main Index | Thread Index | Old Index