Wed Aug 31 19:40:44 2011 UTC ()
In a recent thread [1], the value of including USE_CMAKE=yes in the file
meta-pkgs/kde4/kde4.mk was discussed.  The conclusion was that it did
make sense to include that definition because kde4.mk is included by
packages that use the kde4 configure and build system, which is cmake.
Thus, they will need to define USE_CMAKE anyway and currently must do
so in addition to including kde4.mk.  This adds the needed definition
so that it is no longer necessary to do both things.

Many other packages currently include kde4.mk and also define USE_CMAKE.
In many cases they also define CMAKE_ARGS.  To avoid potential confusion
centering around wondering whether or not USE_CMAKE was forgotten (e.g.,
if readers do not know it is now defined in kde4.mk), the definition was
not removed from those packages.

Future package authors can determine whether or not it is clearer to
include the definition even though kde4.mk is also included.

[1] http://mail-index.netbsd.org/tech-pkg/2011/08/28/msg007595.html


(brook)
diff -r1.2 -r1.3 pkgsrc/meta-pkgs/kde4/kde4.mk
cvs diff -r1.2 -r1.3 pkgsrc/meta-pkgs/kde4/kde4.mk (expand / switch to unified diff)

--- pkgsrc/meta-pkgs/kde4/kde4.mk 2010/04/10 02:45:03 1.2
+++ pkgsrc/meta-pkgs/kde4/kde4.mk 2011/08/31 19:40:43 1.3
@@ -1,24 +1,25 @@ @@ -1,24 +1,25 @@
1# $NetBSD: kde4.mk,v 1.2 2010/04/10 02:45:03 markd Exp $ 1# $NetBSD: kde4.mk,v 1.3 2011/08/31 19:40:43 brook Exp $
2# 2#
3# This Makefile fragment is included by packages that use the KDE4 3# This Makefile fragment is included by packages that use the KDE4
4# configure-and-build process. 4# configure-and-build process.
5# 5#
6 6
7.if !defined(KDE4_MK) 7.if !defined(KDE4_MK)
8KDE4_MK= # defined 8KDE4_MK= # defined
9 9
10USE_PKGLOCALEDIR= YES 10USE_PKGLOCALEDIR= YES
11 11
 12USE_CMAKE= yes
12CMAKE_ARGS+= -DHTML_INSTALL_DIR=${PREFIX}/share/doc/kde/HTML 13CMAKE_ARGS+= -DHTML_INSTALL_DIR=${PREFIX}/share/doc/kde/HTML
13CMAKE_ARGS+= -DDATA_INSTALL_DIR=${PREFIX}/share/kde/apps 14CMAKE_ARGS+= -DDATA_INSTALL_DIR=${PREFIX}/share/kde/apps
14CMAKE_ARGS+= -DCONFIG_INSTALL_DIR=${PREFIX}/share/kde/config 15CMAKE_ARGS+= -DCONFIG_INSTALL_DIR=${PREFIX}/share/kde/config
15CMAKE_ARGS+= -DKCFG_INSTALL_DIR=${PREFIX}/share/kde/config.kcfg 16CMAKE_ARGS+= -DKCFG_INSTALL_DIR=${PREFIX}/share/kde/config.kcfg
16CMAKE_ARGS+= -DLOCALE_INSTALL_DIR=${PREFIX}/${PKGLOCALEDIR}/locale 17CMAKE_ARGS+= -DLOCALE_INSTALL_DIR=${PREFIX}/${PKGLOCALEDIR}/locale
17CMAKE_ARGS+= -DMIME_INSTALL_DIR=${PREFIX}/share/kde/mimelnk 18CMAKE_ARGS+= -DMIME_INSTALL_DIR=${PREFIX}/share/kde/mimelnk
18CMAKE_ARGS+= -DTEMPLATES_INSTALL_DIR=${PREFIX}/share/kde/templates 19CMAKE_ARGS+= -DTEMPLATES_INSTALL_DIR=${PREFIX}/share/kde/templates
19CMAKE_ARGS+= -DWALLPAPER_INSTALL_DIR=${PREFIX}/share/kde/wallpapers 20CMAKE_ARGS+= -DWALLPAPER_INSTALL_DIR=${PREFIX}/share/kde/wallpapers
20CMAKE_ARGS+= -DAUTOSTART_INSTALL_DIR=${PREFIX}/share/kde/autostart 21CMAKE_ARGS+= -DAUTOSTART_INSTALL_DIR=${PREFIX}/share/kde/autostart
21CMAKE_ARGS+= -DSYSCONF_INSTALL_DIR=${PKG_SYSCONFDIR:Q} 22CMAKE_ARGS+= -DSYSCONF_INSTALL_DIR=${PKG_SYSCONFDIR:Q}
22CMAKE_ARGS+= -DINFO_INSTALL_DIR=${PREFIX}/${PKGINFODIR} 23CMAKE_ARGS+= -DINFO_INSTALL_DIR=${PREFIX}/${PKGINFODIR}
23CMAKE_ARGS+= -DMAN_INSTALL_DIR=${PREFIX}/${PKGMANDIR} 24CMAKE_ARGS+= -DMAN_INSTALL_DIR=${PREFIX}/${PKGMANDIR}
24 25