pkgsrc/wm/fluxbox/Makefile

42 lines
1 KiB
Makefile
Raw Normal View History

# $NetBSD: Makefile,v 1.37 2006/04/22 09:22:16 rillig Exp $
#
DISTNAME= fluxbox-0.9.15.1
PKGREVISION= 1
CATEGORIES= wm x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fluxbox/}
Upgrade wm/fluxbox to 0.1.14 using patches provided by Juan in PR pkg/19341. While we're at it, remove conflict with blackbox since this release does not use blackbox-nls files anymore and we can depend on bsetroot as blackbox and openbox do. Changes for 0.1.14: *02/11/08: * Minor update in fluxbox-generate_menu (Han) * Fixed blackbox.cat to fluxbox.cat nls/* *02/11/07: * Fixed tab font on restart bug. Theme.cc/hh, Screen.cc * Fixed crash bug in rotated font implementation. XFontImp.cc * Fixed caps-, num- and scrolllock maskes in Alt+drag/resize Window.cc *02/11/25: * Fixed vertical tabs for XFontImp XFontImp.cc/hh, Font.hh/cc, Tab.cc, Screen.cc, DrawUtil.cc/hh *02/11/24: * Removed interlace compile time option (Henrik) Image.hh/cc * Fixed bug [ 641136 ] OpenOffice 1.0.1 aborts (Simon) Ewmh.cc * Fixed bug [ 561602 ] Problem using ToggleDecor in terminals (Simon) Window.cc/hh * Fixed bug [ 642189 ] Wrong AA font on init (Simon) Font.cc Changes for 0.1.13: *02/11/17: * Fixed bug in toggleTab Window.cc * Fixed alignment bug in Tab Tab.cc * Fixed HAVE_XFT_UTF8 check (Simon) configure.in, XftFontImp.cc *02/11/15: * Fixed antialias bug in toolbar * Fixed bug [ 627897 ] Clicking tab leads to crashing X-Server. Tab.cc *02/11/14: * Fixed bug [ 604958 ] Menu not (full) visible when tabs bottom Rootmenu.cc/hh * Fixed bug [ 581588 ] Toolbar auto-hiding Toolbar.cc *02/11/13: * Clean up in Slit Slit.cc/hh, Screen.cc * Fixed caps, num and scroll lock modifier checks (fixed Bug: [ 522673 ] Numlock not handled correctly in Solaris) Keys.cc/hh *02/11/12: * Updated fluxbox-generate_menu (Han) * Fixed alignment in window label Window.cc * Fixed history in FbRun * Updated FbRun to use the new font system * Removed window size limitation, fixes Debian bug #159709 (Simon) Window.cc * Fixed geometry/position window size and alignment problem (Simon) Screen.cc *02/11/03: * Fixed Toolbar workspace label text color. Theme.cc *02/10/25: * Renamed Icon.hh/cc to Iconmenu.hh/cc * Clean up (fixed bug [ 608945 ] xmms crashes fluxbox ) BaseDisplay.hh/cc, Screen.cc/hh, Tab.cc, Window.cc *02/10/24: * Updated fluxbox-generate_menu (Thanks Han) *02/10/23: * Fixed auto_ptr assignment so it compiles with gcc 2.95.x fluxbox.cc, Window.cc * Minor cleaning in Windowmenu.cc/hh *02/10/22: * Fixed isGroupable for FluxboxWindow, It should report if the window is groupable if it's not transient, nonresiable and nonmaximizable Window.hh/cc *02/10/20: * Updated it_IT translation (Thanks Filippo Pappalardo) *02/10/19: * Fixed terminal option for fluxbox-generate_menu (Thanks Han) * Fixed bug [ 604634 ] Fluxbox 0.1.11 menu on iconbar problem Toolbar.cc * Fixed ascent and descent in FontImps * Added testsuit for FbTk::Font src/tests/testFont.cc, src/tests/Makefile * Updated fluxbox-generate_menu it_IT locales and added DEFAULT_TERM value (Thanks Filippo Pappalardo) *02/10/18: * Added it_IT locales to fluxbox-generate_menu and updated data/nls/it_IT (Thanks Filippo Pappalardo) *02/10/16: * Fixed UTF-8 for antialias fonts XftFontImp.cc/hh, Font.cc * Fixed support for: _NET_WM_DESKTOP, _NET_NUMBER_OF_DESKTOPS, CVSURRENT_DESKTOP, _NET_ACTIVE_WINDOW, _NET_CLOSE_WINDOW Ewmh.hh/cc *02/10/15: * Conditional compile/linking of Xft specific files src/Makefile.am, configure.in * Antialias in Windowmenu, Tab and geometry window Window.cc, Screen.cc, Toolbar.cc, Theme.cc/hh, Tab.cc, IconBar.cc * Antialias option in Configmenu Configmenu.cc, Screen.cc/hh, Theme.cc/hh *02/10/14: * Added XftFontImp.hh/cc for Xft font support. Compile with --enable-xft *02/10/13: * Minor cleaning in configure.in * Fixed grab reconfigure bug Window.cc * Fixed UTF-8 support in XmbFontImp.cc * Moved font system specific stuff from Font.hh/cc to font implementation classes. * Added FontImp.hh, XFontImp.hh/cc, XmbFontImp.hh/cc For the new font implementation bridge pattern. *02/10/11: * Fixed support for _NET_WM_STATE with _NET_WM_STATE_STICKY and _NET_WM_STATE_SHADED Ewmh.cc *02/10/02: * Added Ewmh.hh/cc for Extended Window Manager Hints *02/09/21: * New menu item (Thanks Han) fluxbox-generate_menu * Latvian language support (Thanks Artis Trops) *02/09/14: * Fixed bug [ 604463 ] mplayer fullscreen fails (Henrik) Window.cc * Added Color.cc and moved color handling from Image.cc to it. (Henrik) * Added Texture.cc and Texture::setFromString (Henrik) * Proper handling of sticky windows when cycling (Simon)
2002-12-10 21:39:08 +01:00
EXTRACT_SUFX= .tar.bz2
MAINTAINER= tonio@NetBSD.org
HOMEPAGE= http://fluxbox.sourceforge.net/
COMMENT= Window Manager for X based on Blackbox
Update wm/fluxbox to 0.9.9, based on patch sent by Stefan Kruger in PR pkg/25468. News in 0.9.9: * New commands: * Deiconify <mode> <dest> * Where mode is: * last - deiconify last iconified window * lastworkspace (default) - deiconify last iconified window from current workspace * all - deiconify all iconified windows * allworkspace - deiconify all iconfied windows from current workspace * and dest is: * current (default) - deiconify them on current windows * origin - deiconify them where they were * originquiet - deiconify to old workspace but dont follow * SendToNextWorkspace <num> * sends current window forward <num> workspaces * SendToPrevWorkspace <num> * sends current window backward <num> workspaces * WindowMenu * popups the window menu * New resources: * session.tabsAttachArea: <mode> * where mode is: * Window - dropping tabs to any part of the destination-window leads to attaching to that frame (default) * Titlebar - dropping tabs only to the titlebar of the destination- window leads to attaching to that frame * session.screen<num>.overlay.lineWidth: <integer> * session.screen<num>.overlay.lineStyle: * Valid arguments: LineSolid, LineOnOffDash LineDoubleDash * session.screen<num>.overlay.joinStyle: * Valid arguments: JoinRound, JoindMiter, JoinBevel * session.screen<num>.overlay.capStyle: * Valid arguments: CapNotLast, CapRound, CapButt, CapProjecting * KDE dockapps docks in systray inside toolbar now * Support aspect ratio hints * Optional decoration on transient windows * Added ! as a comment char in keys file * Improved rendering speed while changing workspace * Improved checking for compiler and compiler version * Improved transparent rendering speed * Remember hidden state for apps * [IconHidden] hides the app from the icon bar * [FocusHidden] hides the app from the list to be reachable via Next/PrevWindow * [Hidden] is [IconHidden] + [FocusHidden] Example ~/.fluxbox/apps: [IconHidden] {true} * Expands tilde for slitlist file * Using WM_CLASS instead of NAME in slitlist file * Window snapping to other windows * More support for Extended Window Manager Hints: * _NET_WM_WINDOW_TYPE * _NET_WM_WINDOW_TYPE_DOCK * _NET_WM_STATE_ABOVE * _NET_WM_STATE_BELOW * _NET_WM_CLIENT_LIST_STACKING * _NET_WM_DESKTOP_VIEWPORT * _NET_WM_DESKTOP_GEOMETRY * _NET_WORKAREA * _NET_ACTIVE_WINDOW * _NET_WM_STATE_HIDDEN * _NET_WM_STATE_SKIP_TASKBAR * sl_SI nls * Updated nl_NL locales * fbrun news: * cycling in tab completion * completes binaries from your $PATH * if you want to use old history tab-complete, press Ctrl-tab * completes path names * Control-C clears the text * Fixed cursor bug * fluxbox-generate_menu news: * Updated German locales * More firefox support * portability fixes * improve menu reloading * more menu entries * French locales * Portuguese locales Bug fixes: * Decoration bug with mwm hint + remember * Drawing issues with big menus * _MOTIF_WM_HINTS decoration toggle bug * No-text-in-iconbar bug on restart * Menu time stamp on root menu * placeWindow caused spinning with screens higher than width e.g. vertical xinerama * compiles in cygwin * update of keys on keymap change * infinite loop in fbrun * window size bug in no-decor windows on start/restart * The _NET_MOVERESIZE_WINDOW crash bug * mplayer -vo xvid bug * menu keyboard navigation bug
2004-05-13 06:29:12 +02:00
USE_LANGUAGES= c c++
GNU_CONFIGURE= YES
USE_TOOLS+= gmake
Update fluxbox to 0.9.12; closes PR/29780. Changes: News in 0.9.12: * Added Imlib2 support (./configure --enable-imlib2) [default=disabled] Fluxbox can now load *.png, *.jpg and other image-formats. * Added Tab command, which goes to a specific tab number action: Tab ex: Mod1 1 :Tab 1 Mod2 3 :Tab 3 * Added support for hsetroot to fbsetbg Bug fixes: * Fix for #1091710 (SystemTray is not covered by StyleStuff) SystemTray is now configurable via styles thru the toolbar.systray.* - resource, it falls back to the look of the clock * Warnings on amd64 (#1099278, #1099950) * WithdrawnState handling) (#1087220) * Windows dont respect toolbar.border.width (#996298) * Fixed "remove last workspace" bug * Fixed problems with gtk2-fullscreen-mode (gimp2, galeon etc) * missing header (#1080323) * Update ClockTool when timeformat changed (#1026096) News in 0.9.11: * Slit: * wheel or middle/right click in slit menu moves items up/down * Save slit list menu item * (Re)added dragNdrop ordering of tabs * Better visualisation of the RememberState in RememberMenu * iconbar: * new resources: session.*.iconbar.wheelMode: <mode> On - enable mousewheeling on the iconbuttons Off - disables mousewheeling on the iconbuttons Screen - uses the settings of desktopWheeling session.*.iconbar.deiconifyMode: <mode> Current - deiconifies the window on current workspace Follow - deiconifies the window on the workspace it was iconified from and jumps to that workspace SemiFollow - acts as 'Current' for windows that were actually iconified, and as 'follow' for the others * Added option to specify what to do with windows, that got activated on a different workspaces than the current one (thru NET_ACTIVE_WINDOW for example, guinotification-plugin from gaim) session.screen0.followModel: <value> Ignore - ignore the activated window Follow - go to the workspace of the window Current | CurrentWorkspace | Fetch - get the window onto the current workspace * session.focusTabMinWidth: defines the guaranteed minimize size of the focused tab in percent of the whole window * New command: export | setenv sets the enviroment of fluxbox to a given value export NAME=VALUE setenv NAME VALUE * Alpha values are no longer in theme, but are in init file. Possible values are (all beginning with session.screenN.), * means changed/new: - menu.alpha (*) - slit.alpha - window.focus.alpha (*) - window.unfocus.alpha (*) - toolbar.alpha (*) Bug fixes: * Fix to avoid gentoo bug #72703 also reported at http://www.securityfocus.com/archive/1/382398/2004-11-24/2004-11-30/2 * Fix for a java-bug (wrong opened subwindows) * Fix for hiding menu when menufile changed * Fix for segfault at startup * fbrun doesnt overlap screenborders anymore * Fixed Wine + Paradise Poker Client problem. * Fix UnderMousePlacement, patch #1052534, close #1048000 * Some changes to avoid invisible fonts * Fix memleaks * A few fixes to compile fluxbox with icc and mipspro(irix) #1045785 * Fixed a problem when system-date is set back * Fixed some TextBox issues with some "untypeable" keys * Fix a couple of bugs with transparency in toolbar/buttons * Fix crash when in windowmenu->submenu and closing the app * other bug fixes: #1057499 #1046472 #1052095 #1034522 #1039658
2005-03-24 16:00:40 +01:00
USE_LIBTOOL= YES
.include "../../mk/bsd.prefs.mk"
BUILDLINK_TRANSFORM+= rename:-O2:-O1
2005-09-05 01:41:47 +02:00
CONFIGURE_ARGS+= --enable-shape
Update wm/fluxbox to 0.9.10. Changes: * Old styles should look like they used to * New actions: * directional focus movement: FocusUp, FocusDown, FocusLeft, FocusRight * other: RaiseLayer, LowerLayer, Exit * Added apps file matching on WM_WINDOW_ROLE * use "role=string". Particularly useful for gaim+gimp windows [app] (role=buddy_list) ... * Window menu file * new resource: * session.screen<num>.windowMenu: <filename> * The menu file format is the same as the normal ~/.fluxbox/menu but with some special menu items: [iconify], [maximize], [shade], [close], [extramenus] [layer], [sendto] + the all the other menu items that you can use in the normal root menu (i.e [exec] (aterm) {aterm}) The [extramenus] will add "remember" menu example: session.screen0.windowMenu: ~/.fluxbox/windowmenu [begin] [exec] (aterm) {aterm} [maximize] [shade] [close] [end] * Added [wallpapers|wallpapermenu|rootcommands] to possible menuitems * [wallpapers] (directory) {rootcommand} creates a submenu in the menu to click on the wallpaper one wants. default rootcommand is fbsetbg * Improved menu transparent rendering speed and the text is not transparent anymore so you are able to see the text even if you have 100% transparency * New menu theme items: * menu.titleHeight: <integer> * menu.itemHeight: <integer> The height of the item/title will be the biggest of font height + bevel and the specified height, so the text will always fit. * Added icons in menu and improved menu loading speed * New option for menu file: [key] (label) {argument to key} <the icon filename> example: [exec] (aterm) {aterm} <terminal.xpm> * Improve rendering speed of toolbar * Supports _NET_WM_WINDOW_TYPE_DESKTOP * eg nautilus desktop windows are on the bottom, not tabable, etc * Added some new options font loading: *.font: fontname-size:option,specoption1:key=val;key2=val2 etc eg: *.font: Verdana-10:bold,shadow:offsetx=2;offsety=4;color=green *.font: Verdana-10:halo:color=blue possible specoptions atm: halo: color=colorname shadow: color=colorname offsetx=number (negative allowed) offsety=number (negative allowed) * Fixed so one can use to use this in the apps-file: [Layer] {number | literal} ex: [Layer] {BOTTOM} while literal is one of DESKTOP BOTTOM NORMAL TOP DOCK ABOVEDOCK MENU * fluxbox-generate_menu: * Preliminary basic support for icons in fluxbox-generate_menu put a <progname>.xpm into ~/.fluxbox/icons. e.g. Eterm.xpm
2004-09-02 23:56:32 +02:00
CONFIGURE_ARGS+= --enable-nls
Update fluxbox to 0.9.4. Changes: * Keyboard navigation in menus * Keys: Up/Down: select menu item Left/Right: go in/out from sub menus Escape: close menu and return focus to windows Enter: run/execute/toggle menu item To set input focus on the menu you either click on the title bar or bring it up with key bindings * New action strings * ArrangeWindows This will arrange the windows on the current desktop * ShowDesktop This will iconify all windows on the current desktop * The same action strings that are in keys file can now be used in the menu example: [ArrangeWindows] (arrange windows) * New theme items * toolbar.button.borderWidth: <integer> * toolbar.borderWidth: <integer> * toolbar.bevelWidth: <integer> * toolbar.borderColor: <color> * slit.borderWidth: <integer> * slit.bevelWidth: <integer> * slit.borderColor: <color> * [startup] option in remember file Can now add entries to apps file like: [startup] {xterm} Then "xterm" will be launched on fluxbox startup. Can also give a screen option: [startup] (screen=1) {xterm} will start it on screen 1 rather than the default 0. * Rounded corners on menu, windows and toolbar Theme items: * menu.roundCorners: <shape item> * toolbar.shaped: <boolean> * window.roundCorners: <shape item> Shape item can be: TopLeft TopRight BottomLeft and/or BottomRight example: menu.roundCorners: TopRight BottomLeft * The current style is now marked in the style menu * Compile time option for toolbar --disable-toolbar --enable-toolbar (default) * Emacs style key bindings in fbrun * Tab completion in fbrun * Group persistence over a restart * Maximization stop on slit and toolbar (check Maximize Over menu items) * Support for _NET_WM_STRUT * Regular expression support for remember Bug fixes: * Toggle maximize vertical/horizontal * Slit/Toolbar auto hide bug * Button alignment bug in title bar * Trailing whitespace in group file resource * Group cycling Based on patch by Tom Hensel [ tom at replic8 dot net ].
2003-07-28 19:50:07 +02:00
CONFIGURE_ARGS+= --enable-xinerama
Update wm/fluxbox to 0.9.10. Changes: * Old styles should look like they used to * New actions: * directional focus movement: FocusUp, FocusDown, FocusLeft, FocusRight * other: RaiseLayer, LowerLayer, Exit * Added apps file matching on WM_WINDOW_ROLE * use "role=string". Particularly useful for gaim+gimp windows [app] (role=buddy_list) ... * Window menu file * new resource: * session.screen<num>.windowMenu: <filename> * The menu file format is the same as the normal ~/.fluxbox/menu but with some special menu items: [iconify], [maximize], [shade], [close], [extramenus] [layer], [sendto] + the all the other menu items that you can use in the normal root menu (i.e [exec] (aterm) {aterm}) The [extramenus] will add "remember" menu example: session.screen0.windowMenu: ~/.fluxbox/windowmenu [begin] [exec] (aterm) {aterm} [maximize] [shade] [close] [end] * Added [wallpapers|wallpapermenu|rootcommands] to possible menuitems * [wallpapers] (directory) {rootcommand} creates a submenu in the menu to click on the wallpaper one wants. default rootcommand is fbsetbg * Improved menu transparent rendering speed and the text is not transparent anymore so you are able to see the text even if you have 100% transparency * New menu theme items: * menu.titleHeight: <integer> * menu.itemHeight: <integer> The height of the item/title will be the biggest of font height + bevel and the specified height, so the text will always fit. * Added icons in menu and improved menu loading speed * New option for menu file: [key] (label) {argument to key} <the icon filename> example: [exec] (aterm) {aterm} <terminal.xpm> * Improve rendering speed of toolbar * Supports _NET_WM_WINDOW_TYPE_DESKTOP * eg nautilus desktop windows are on the bottom, not tabable, etc * Added some new options font loading: *.font: fontname-size:option,specoption1:key=val;key2=val2 etc eg: *.font: Verdana-10:bold,shadow:offsetx=2;offsety=4;color=green *.font: Verdana-10:halo:color=blue possible specoptions atm: halo: color=colorname shadow: color=colorname offsetx=number (negative allowed) offsety=number (negative allowed) * Fixed so one can use to use this in the apps-file: [Layer] {number | literal} ex: [Layer] {BOTTOM} while literal is one of DESKTOP BOTTOM NORMAL TOP DOCK ABOVEDOCK MENU * fluxbox-generate_menu: * Preliminary basic support for icons in fluxbox-generate_menu put a <progname>.xpm into ~/.fluxbox/icons. e.g. Eterm.xpm
2004-09-02 23:56:32 +02:00
Update fluxbox to 0.9.12; closes PR/29780. Changes: News in 0.9.12: * Added Imlib2 support (./configure --enable-imlib2) [default=disabled] Fluxbox can now load *.png, *.jpg and other image-formats. * Added Tab command, which goes to a specific tab number action: Tab ex: Mod1 1 :Tab 1 Mod2 3 :Tab 3 * Added support for hsetroot to fbsetbg Bug fixes: * Fix for #1091710 (SystemTray is not covered by StyleStuff) SystemTray is now configurable via styles thru the toolbar.systray.* - resource, it falls back to the look of the clock * Warnings on amd64 (#1099278, #1099950) * WithdrawnState handling) (#1087220) * Windows dont respect toolbar.border.width (#996298) * Fixed "remove last workspace" bug * Fixed problems with gtk2-fullscreen-mode (gimp2, galeon etc) * missing header (#1080323) * Update ClockTool when timeformat changed (#1026096) News in 0.9.11: * Slit: * wheel or middle/right click in slit menu moves items up/down * Save slit list menu item * (Re)added dragNdrop ordering of tabs * Better visualisation of the RememberState in RememberMenu * iconbar: * new resources: session.*.iconbar.wheelMode: <mode> On - enable mousewheeling on the iconbuttons Off - disables mousewheeling on the iconbuttons Screen - uses the settings of desktopWheeling session.*.iconbar.deiconifyMode: <mode> Current - deiconifies the window on current workspace Follow - deiconifies the window on the workspace it was iconified from and jumps to that workspace SemiFollow - acts as 'Current' for windows that were actually iconified, and as 'follow' for the others * Added option to specify what to do with windows, that got activated on a different workspaces than the current one (thru NET_ACTIVE_WINDOW for example, guinotification-plugin from gaim) session.screen0.followModel: <value> Ignore - ignore the activated window Follow - go to the workspace of the window Current | CurrentWorkspace | Fetch - get the window onto the current workspace * session.focusTabMinWidth: defines the guaranteed minimize size of the focused tab in percent of the whole window * New command: export | setenv sets the enviroment of fluxbox to a given value export NAME=VALUE setenv NAME VALUE * Alpha values are no longer in theme, but are in init file. Possible values are (all beginning with session.screenN.), * means changed/new: - menu.alpha (*) - slit.alpha - window.focus.alpha (*) - window.unfocus.alpha (*) - toolbar.alpha (*) Bug fixes: * Fix to avoid gentoo bug #72703 also reported at http://www.securityfocus.com/archive/1/382398/2004-11-24/2004-11-30/2 * Fix for a java-bug (wrong opened subwindows) * Fix for hiding menu when menufile changed * Fix for segfault at startup * fbrun doesnt overlap screenborders anymore * Fixed Wine + Paradise Poker Client problem. * Fix UnderMousePlacement, patch #1052534, close #1048000 * Some changes to avoid invisible fonts * Fix memleaks * A few fixes to compile fluxbox with icc and mipspro(irix) #1045785 * Fixed a problem when system-date is set back * Fixed some TextBox issues with some "untypeable" keys * Fix a couple of bugs with transparency in toolbar/buttons * Fix crash when in windowmenu->submenu and closing the app * other bug fixes: #1057499 #1046472 #1052095 #1034522 #1039658
2005-03-24 16:00:40 +01:00
.include "options.mk"
SUBST_CLASSES+= cmds
SUBST_STAGE.cmds= post-build
SUBST_MESSAGE.cmds= Fixing command names in data files.
SUBST_SED.cmds= -e 's|bsetroot|fbsetroot|g'
SUBST_FILES.cmds= data/README.style data/styles/Artwiz\
data/styles/MerleyKay data/styles/Outcomes\
data/styles/Rampage data/styles/Results\
data/styles/Spiff
.include "../../converters/libiconv/buildlink3.mk"
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.
2005-06-01 20:02:37 +02:00
.include "../../mk/x11.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"