pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk Don't have USE_TOOLS+=imake replace USE_IMAKE. Rat...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/0ad03aae57d5
branches:  trunk
changeset: 493921:0ad03aae57d5
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon May 16 18:01:12 2005 +0000

description:
Don't have USE_TOOLS+=imake replace USE_IMAKE.  Rather let the former
specify that imake is used by the package, while the latter triggers
the special do-configure process.

diffstat:

 mk/bsd.pkg.mk     |  4 ++--
 mk/tools/imake.mk |  5 +----
 2 files changed, 3 insertions(+), 6 deletions(-)

diffs (37 lines):

diff -r 8d701121c0e8 -r 0ad03aae57d5 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Mon May 16 17:54:51 2005 +0000
+++ b/mk/bsd.pkg.mk     Mon May 16 18:01:12 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1665 2005/05/16 15:20:15 jlam Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1666 2005/05/16 18:01:12 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -1873,7 +1873,7 @@
            ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}
 .    endfor
 .  endif
-.  if defined(USE_IMAKE) || !empty(USE_TOOLS:Mimake)
+.  if defined(USE_IMAKE)
 .    for DIR in ${CONFIGURE_DIRS}
        ${_PKG_SILENT}${_PKG_DEBUG}cd ${DIR} && ${SETENV} ${SCRIPTS_ENV} XPROJECTROOT=${X11BASE} ${XMKMF}
 .    endfor
diff -r 8d701121c0e8 -r 0ad03aae57d5 mk/tools/imake.mk
--- a/mk/tools/imake.mk Mon May 16 17:54:51 2005 +0000
+++ b/mk/tools/imake.mk Mon May 16 18:01:12 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: imake.mk,v 1.8 2005/05/15 23:27:44 jlam Exp $
+# $NetBSD: imake.mk,v 1.9 2005/05/16 18:01:13 jlam Exp $
 #
 # This Makefile fragment handles packages that need imake and xmkmf
 # to build X11-related packages.  The correct imake and xmkmf tools
@@ -33,9 +33,6 @@
 # rules as for other replacement tools.
 #
 
-# Continue to allow USE_IMAKE until packages have been taught to use the
-# new syntax.
-#
 .if defined(USE_IMAKE)
 USE_TOOLS+=    imake
 .endif



Home | Main Index | Thread Index | Old Index