[pkgsrc/trunk]: pkgsrc/mk Make USE_TOOLS+=imake imply USE_X11BASE=yes, along ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4f7163b6c655
branches:  trunk
changeset: 493982:4f7163b6c655
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue May 17 22:22:52 2005 +0000

description:
Make USE_TOOLS+=imake imply USE_X11BASE=yes, along with the other
variable definitions that apply when USE_IMAKE is defined.

diffstat:

 inputmethod/canna/Makefile.common |  3 +--
 mk/bsd.pkg.use.mk                 |  4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diffs (35 lines):

diff -r 594c15f28278 -r 4f7163b6c655 inputmethod/canna/Makefile.common
--- a/inputmethod/canna/Makefile.common Tue May 17 22:20:15 2005 +0000
+++ b/inputmethod/canna/Makefile.common Tue May 17 22:22:52 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2005/05/17 22:20:15 jlam Exp $
+# $NetBSD: Makefile.common,v 1.13 2005/05/17 22:22:52 jlam Exp $
 #
 # Canna common makefile.
 #
@@ -19,7 +19,6 @@
 .include "../canna/Makefile.version"
 
 USE_TOOLS+=    imake
-USE_X11BASE=   yes
 CANNA_SPOOL=   ${DESTDIR}/var/spool/canna
 CANNA_MODE=    0755
 
diff -r 594c15f28278 -r 4f7163b6c655 mk/bsd.pkg.use.mk
--- a/mk/bsd.pkg.use.mk Tue May 17 22:20:15 2005 +0000
+++ b/mk/bsd.pkg.use.mk Tue May 17 22:22:52 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.use.mk,v 1.10 2005/05/12 21:03:46 jlam Exp $
+#      $NetBSD: bsd.pkg.use.mk,v 1.11 2005/05/17 22:22:52 jlam Exp $
 #
 # Turn USE_* macros into proper depedency logic.  Included near the top of
 # bsd.pkg.mk, after bsd.prefs.mk.
@@ -7,7 +7,7 @@
 # ${PREFIX} selection
 ############################################################################
 
-.if defined(USE_IMAKE)
+.if defined(USE_IMAKE) || !empty(USE_TOOLS:Mimake)
 INSTALL_TARGET+=       ${NO_INSTALL_MANPAGES:D:Uinstall.man}
 USE_X11BASE?=          implied
 PLIST_SUBST+=          IMAKE_MAN_SOURCE_PATH=${IMAKE_MAN_SOURCE_PATH}