Commit graph

5 commits

Author SHA1 Message Date
xtraeme
bdd9977873 Fix some comparisson strings to handle XFree86/xorg dirs.mk files properly,
PR pkg/26576: Kouichirou Hiratsuka.
2004-08-07 14:44:05 +00:00
xtraeme
8acbcaea77 Depend on xorg-dirs where appropiate, as was done for XFree86 by jmmv@. 2004-07-29 07:27:43 +00:00
jmmv
ebf2fd7dbc Add support for the XFree86-dirs package in mk/dirs.mk, by modifying it to
work properly with it.  Agreed with xtraeme@.
2004-04-14 21:15:01 +00:00
jmmv
c8cb1c5b0d Drop the disctinction of xdg and xdg-x11 from USE_DIRS POV. We can choose
which one is required in an automatic way by checking USE_X11BASE.  This
simplifies things and avoids possible problems in the future due to confusion.
2004-04-14 19:30:22 +00:00
jmmv
6bb0eff02e Rework the way to use the -dirs packages (ATM, xdg-dirs, xdg-x11-dirs,
gnome1-dirs and gnome2-dirs):

- Introduce a global USE_DIRS variable, which takes pairs of names and
  versions.  For example, an xdg-1.1 value will request the use of the
  xdg-dirs package, at least version 1.1.  This variable must always be
  appended to.  If there are duplicates with different versions, the
  one with the higher number will be picked up.

- Introduce the mk/dirs.mk file, which is automatically included by
  bsd.pkg.mk when USE_DIRS is not empty.  It parses the variable's value
  and includes the required dirs.mk files, present in each -dirs package.

- For each -dirs package, add a dirs.mk file that defines a variable
  holding the list of directories provided by it, adds a dependency on
  that package, and modifies the PRINT_PLIST_AWK variable to output
  comments for the directories handled by it.

- Drop some Makefile.common files that only make things difficult and
  more confusing now (in favour of the new dirs.mk files).  The only thing
  to worry about is to keep version numbers consistent across xdg-* and
  gnome*-* packages, but that will be easier to handle.

The main reason for this change is to be able to modify PRINT_PLIST_AWK in
a clean way, but I hope this will improve clarity too.  Also, this simplifies
the addition of future -dirs packages (if needed) in a consistent way.
2004-04-14 15:26:41 +00:00