kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
pkgsrc/mk/dirs.mk

75 lines
1.7 KiB
Makefile
Raw Normal View History

Always use xdg-dirs for modular Xorg, xdg-x11-dirs would just redirect anyway.
2007-01-08 16:20:28 +01:00
# $NetBSD: dirs.mk,v 1.9 2007/01/08 15:20:28 joerg Exp $
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 17:26:41 +02:00
#
.if !defined(DIRS_MK)
DIRS_MK= # defined
_USE_GNOME1_DIRS= # empty
_USE_GNOME2_DIRS= # empty
Support texmf-dirs.
2006-04-07 01:09:06 +02:00
_USE_TEXMF_DIRS= # empty
Enable theme-dirs.
2004-12-24 11:06:41 +01:00
_USE_THEME_DIRS= # empty
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 17:26:41 +02:00
_USE_XDG_DIRS= # empty
_USE_XDG_X11_DIRS= # empty
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 23:15:01 +02:00
_USE_XFREE86_DIRS= # empty
Depend on xorg-dirs where appropiate, as was done for XFree86 by jmmv@.
2004-07-29 09:27:43 +02:00
_USE_XORG_DIRS= # empty
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 17:26:41 +02:00
.for dir in ${USE_DIRS}
pkg:= ${dir:C/-[^-]*$//}
ver:= ${dir:C/^.*-//}
. if ${pkg} == "gnome1" && ${_USE_GNOME1_DIRS} < ${ver}
_USE_GNOME1_DIRS:= ${ver}
. elif ${pkg} == "gnome2" && ${_USE_GNOME2_DIRS} < ${ver}
_USE_GNOME2_DIRS:= ${ver}
Support texmf-dirs.
2006-04-07 01:09:06 +02:00
. elif ${pkg} == "texmf" && ${_USE_TEXMF_DIRS} < ${ver}
_USE_TEXMF_DIRS:= ${ver}
Enable theme-dirs.
2004-12-24 11:06:41 +01:00
. elif ${pkg} == "theme" && ${_USE_THEME_DIRS} < ${ver}
_USE_THEME_DIRS:= ${ver}
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 21:30:22 +02:00
. elif ${pkg} == "xdg" && ${_USE_XDG_DIRS} < ${ver} && !defined(USE_X11BASE)
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 17:26:41 +02:00
_USE_XDG_DIRS:= ${ver}
Fix some comparisson strings to handle XFree86/xorg dirs.mk files properly, PR pkg/26576: Kouichirou Hiratsuka.
2004-08-07 16:44:05 +02:00
. elif ${pkg} == "xdg-x11" && ${_USE_XDG_X11_DIRS} < ${ver} && \
defined(USE_X11BASE)
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 17:26:41 +02:00
_USE_XDG_X11_DIRS:= ${ver}
Fix some comparisson strings to handle XFree86/xorg dirs.mk files properly, PR pkg/26576: Kouichirou Hiratsuka.
2004-08-07 16:44:05 +02:00
. elif ${pkg} == "xorg" && ${_USE_XORG_DIRS} < ${ver}
Depend on xorg-dirs where appropiate, as was done for XFree86 by jmmv@.
2004-07-29 09:27:43 +02:00
_USE_XORG_DIRS:= ${ver}
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 17:26:41 +02:00
. endif
.endfor
.undef ver
.undef pkg
.undef dir
.if !empty(_USE_GNOME1_DIRS)
. include "../../misc/gnome1-dirs/dirs.mk"
.endif
.if !empty(_USE_GNOME2_DIRS)
. include "../../misc/gnome2-dirs/dirs.mk"
.endif
Support texmf-dirs.
2006-04-07 01:09:06 +02:00
.if !empty(_USE_TEXMF_DIRS)
. include "../../print/texmf-dirs/dirs.mk"
.endif
Enable theme-dirs.
2004-12-24 11:06:41 +01:00
.if !empty(_USE_THEME_DIRS)
. include "../../misc/theme-dirs/dirs.mk"
.endif
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 17:26:41 +02:00
.if !empty(_USE_XDG_DIRS)
. include "../../misc/xdg-dirs/dirs.mk"
.endif
.if !empty(_USE_XDG_X11_DIRS)
Always use xdg-dirs for modular Xorg, xdg-x11-dirs would just redirect anyway.
2007-01-08 16:20:28 +01:00
. if ${X11_TYPE} == "modular"
. include "../../misc/xdg-dirs/dirs.mk"
. else
. include "../../misc/xdg-x11-dirs/dirs.mk"
. endif
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 17:26:41 +02:00
.endif
Depend on xorg-dirs where appropiate, as was done for XFree86 by jmmv@.
2004-07-29 09:27:43 +02:00
.if !empty(_USE_XORG_DIRS)
. include "../../misc/xorg-dirs/dirs.mk"
.endif
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 17:26:41 +02:00
.endif # !defined(DIRS_MK)
Reference in a new issue Copy permalink