[pkgsrc/trunk]: pkgsrc/mk Doing USE_TOOLS+=cmake in the configure stage is to...

[markd <markd%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4dfa73d7d363
branches:  trunk
changeset: 536619:4dfa73d7d363
user:      markd <markd%pkgsrc.org@localhost>
date:      Tue Dec 18 10:18:39 2007 +0000

description:
Doing USE_TOOLS+=cmake in the configure stage is too late so move it
to tools.  Also cmake wants cpack to exist in the same directory so
toolise it and make cmake and cpack imply each other.

diffstat:

 mk/configure/cmake.mk |   3 +--
 mk/tools/bsd.tools.mk |   3 ++-
 mk/tools/cmake.mk     |  14 ++++++++++++++
 mk/tools/defaults.mk  |   3 ++-
 mk/tools/replace.mk   |  22 ++++++++++++----------
 5 files changed, 31 insertions(+), 14 deletions(-)

diffs (102 lines):

diff -r bdb06c14cf76 -r 4dfa73d7d363 mk/configure/cmake.mk
--- a/mk/configure/cmake.mk     Tue Dec 18 10:15:15 2007 +0000
+++ b/mk/configure/cmake.mk     Tue Dec 18 10:18:39 2007 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: cmake.mk,v 1.1 2007/12/12 01:00:39 markd Exp $
+# $NetBSD: cmake.mk,v 1.2 2007/12/18 10:18:39 markd Exp $
 
 _CMAKE_DIR=    ${BUILDLINK_DIR}/cmake-Modules
 
-USE_TOOLS+=    cmake
 CMAKE_ARGS+=   -DCMAKE_INSTALL_PREFIX:PATH=${PREFIX}
 CMAKE_ARGS+=   -DCMAKE_MODULE_PATH:PATH=${_CMAKE_DIR}
 
diff -r bdb06c14cf76 -r 4dfa73d7d363 mk/tools/bsd.tools.mk
--- a/mk/tools/bsd.tools.mk     Tue Dec 18 10:15:15 2007 +0000
+++ b/mk/tools/bsd.tools.mk     Tue Dec 18 10:18:39 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.tools.mk,v 1.47 2007/03/15 22:54:25 rillig Exp $
+# $NetBSD: bsd.tools.mk,v 1.48 2007/12/18 10:18:40 markd Exp $
 #
 # Copyright (c) 2005, 2006 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -155,6 +155,7 @@
 .include "${PKGSRCDIR}/mk/tools/ldconfig.mk"
 .include "${PKGSRCDIR}/mk/tools/rpcgen.mk"
 .include "${PKGSRCDIR}/mk/tools/strip.mk"
+.include "${PKGSRCDIR}/mk/tools/cmake.mk"
 .include "${PKGSRCDIR}/mk/tools/imake.mk"
 .include "${PKGSRCDIR}/mk/tools/replace.mk"
 .include "${PKGSRCDIR}/mk/tools/perl.mk"
diff -r bdb06c14cf76 -r 4dfa73d7d363 mk/tools/cmake.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mk/tools/cmake.mk Tue Dec 18 10:18:39 2007 +0000
@@ -0,0 +1,14 @@
+# $NetBSD: cmake.mk,v 1.1 2007/12/18 10:18:44 markd Exp $
+#
+
+# This file needs to be included before replace.mk as it modifies the
+# USE_TOOLS variables that are used by replace.mk.
+#
+.if defined(USE_CMAKE)
+USE_TOOLS+=    cmake cpack
+.endif
+
+# cmake and cpack imply each other
+.if !empty(USE_TOOLS:Mcmake) || !empty(USE_TOOLS:Mcpack)
+USE_TOOLS+=    cmake cpack
+.endif
diff -r bdb06c14cf76 -r 4dfa73d7d363 mk/tools/defaults.mk
--- a/mk/tools/defaults.mk      Tue Dec 18 10:15:15 2007 +0000
+++ b/mk/tools/defaults.mk      Tue Dec 18 10:18:39 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: defaults.mk,v 1.53 2007/12/12 01:00:40 markd Exp $
+# $NetBSD: defaults.mk,v 1.54 2007/12/18 10:18:49 markd Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -66,6 +66,7 @@
 _TOOLS_VARNAME.cmake=          CMAKE
 _TOOLS_VARNAME.cmp=            CMP
 _TOOLS_VARNAME.cp=             CP
+_TOOLS_VARNAME.cpack=          CPACK
 _TOOLS_VARNAME.csh=            CSH
 _TOOLS_VARNAME.cut=            CUT
 _TOOLS_VARNAME.date=           DATE
diff -r bdb06c14cf76 -r 4dfa73d7d363 mk/tools/replace.mk
--- a/mk/tools/replace.mk       Tue Dec 18 10:15:15 2007 +0000
+++ b/mk/tools/replace.mk       Tue Dec 18 10:18:39 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.202 2007/12/12 01:00:40 markd Exp $
+# $NetBSD: replace.mk,v 1.203 2007/12/18 10:18:49 markd Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -283,16 +283,18 @@
 .  endif
 .endfor
 
-.if !defined(TOOLS_IGNORE.cmake) && !empty(_USE_TOOLS:Mcmake)
-.  if !empty(PKGPATH:Mdevel/cmake)
-MAKEFLAGS+=                    TOOLS_IGNORE.cmake=
-.  elif !empty(_TOOLS_USE_PKGSRC.cmake:M[yY][eE][sS])
-TOOLS_DEPENDS.cmake?=          cmake>=2.4.6nb3:../../devel/cmake
-TOOLS_CREATE+=                 cmake
-TOOLS_FIND_PREFIX+=            TOOLS_PREFIX.cmake=cmake
-TOOLS_PATH.cmake=              ${TOOLS_PREFIX.cmake}/bin/cmake
+.for _t_ in cmake cpack
+.  if !defined(TOOLS_IGNORE.${_t_}) && !empty(_USE_TOOLS:M${_t_})
+.    if !empty(PKGPATH:Mdevel/cmake)
+MAKEFLAGS+=                    TOOLS_IGNORE.${_t_}=
+.    elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS])
+TOOLS_DEPENDS.${_t_}?=         cmake>=2.4.6nb3:../../devel/cmake
+TOOLS_CREATE+=                 ${_t_}
+TOOLS_FIND_PREFIX+=            TOOLS_PREFIX.${_t_}=cmake
+TOOLS_PATH.${_t_}=             ${TOOLS_PREFIX.${_t_}}/bin/${_t_}
+.    endif
 .  endif
-.endif
+.endfor
 
 .if !defined(TOOLS_IGNORE.csh) && !empty(_USE_TOOLS:Mcsh)
 .  if !empty(PKGPATH:Mshells/tcsh)