[pkgsrc/trunk]: pkgsrc/mk Move cwrappers WRAPPER_DIR and WRAPPER_BINDIR to wr...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a3cffe778ac0
branches:  trunk
changeset: 650939:a3cffe778ac0
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Tue Apr 28 21:15:01 2015 +0000

description:
Move cwrappers WRAPPER_DIR and WRAPPER_BINDIR to wrapper-defs.mk, it is
included by bsd.prefs.mk so we need to ensure consistency.

diffstat:

 mk/cwrappers.mk            |  7 ++-----
 mk/wrapper/wrapper-defs.mk |  7 ++++++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diffs (47 lines):

diff -r f5c9d2713c09 -r a3cffe778ac0 mk/cwrappers.mk
--- a/mk/cwrappers.mk   Tue Apr 28 21:08:34 2015 +0000
+++ b/mk/cwrappers.mk   Tue Apr 28 21:15:01 2015 +0000
@@ -1,15 +1,12 @@
-# $NetBSD: cwrappers.mk,v 1.24 2015/04/28 21:08:34 jperkin Exp $
+# $NetBSD: cwrappers.mk,v 1.25 2015/04/28 21:15:01 jperkin Exp $
 #
 # This Makefile fragment implements integration of pkgtools/cwrappers.
 
+.include "../../mk/wrapper/wrapper-defs.mk"
 .include "../../mk/buildlink3/bsd.buildlink3.mk"
 
 BUILD_DEPENDS+=                cwrappers>=20150314:../../pkgtools/cwrappers
 
-# Public variables used by pkgsrc infrastructure and packages.
-WRAPPER_DIR=           ${WRKDIR}/.cwrapper
-WRAPPER_BINDIR=                ${WRAPPER_DIR}/bin
-
 # XXX This should be PREFIX, but USE_CROSSBASE overrides it.
 CWRAPPERS_SRC_DIR=     ${LOCALBASE}/libexec/cwrappers
 CWRAPPERS_CONFIG_DIR=  ${WRKDIR}/.cwrapper/config
diff -r f5c9d2713c09 -r a3cffe778ac0 mk/wrapper/wrapper-defs.mk
--- a/mk/wrapper/wrapper-defs.mk        Tue Apr 28 21:08:34 2015 +0000
+++ b/mk/wrapper/wrapper-defs.mk        Tue Apr 28 21:15:01 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: wrapper-defs.mk,v 1.3 2009/05/06 10:28:01 tron Exp $
+# $NetBSD: wrapper-defs.mk,v 1.4 2015/04/28 21:15:01 jperkin Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -37,11 +37,16 @@
 .if !defined(WRAPPER_DEFS_MK)
 WRAPPER_DEFS_MK=       defined
 
+.if ${USE_CWRAPPERS:tl} != "no"
+WRAPPER_DIR=           ${WRKDIR}/.cwrapper
+WRAPPER_BINDIR=                ${WRAPPER_DIR}/bin
+.else
 WRAPPER_DIR=           ${WRKDIR}/.wrapper
 WRAPPER_BINDIR=                ${WRAPPER_DIR}/bin
 WRAPPER_TMPDIR=                ${WRAPPER_DIR}/tmp
 WRAPPER_SRCDIR=                ${.CURDIR}/../../mk/wrapper
 WRAPPER_BIN_SH?=       ${SH}
 WRAPPER_SHELL?=                ${WRAPPER_BIN_SH}
+.endif
 
 .endif # WRAPPER_DEFS_MK