Import of pkgsrc-2015Q2

mk/wrapper/bsd.wrapper.mk

@@ -1,4 +1,4 @@
-# $NetBSD: bsd.wrapper.mk,v 1.91 2014/11/25 18:27:49 joerg Exp $
+# $NetBSD: bsd.wrapper.mk,v 1.93 2015/04/27 19:59:07 jperkin Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -49,15 +49,6 @@
 
 .include "../../mk/wrapper/wrapper-defs.mk"
 
-# pkgsrc bmake does not (yet) correctly handle ${VAR} > 0 because
-# ${VAR} is treated as a string, so we must use a string comparison
-# operator.
-.if ${PKG_DEBUG_LEVEL} != "0" || defined(PKG_VERBOSE)
-ECHO_WRAPPER_MSG?=	${ECHO}
-.else
-ECHO_WRAPPER_MSG?=	${TRUE}
-.endif
-
 .PHONY: generate-wrappers
 
 .include "../../mk/buildlink3/bsd.buildlink3.mk"
@@ -65,9 +56,7 @@ ECHO_WRAPPER_MSG?=	${TRUE}
 # Prepend ${WRAPPER_BINDIR} to the PATH so that the wrappers are found
 # first when searching for executables.
 #
-.if ${USE_CWRAPPERS:tl} == "no"
 PREPEND_PATH+=		${WRAPPER_BINDIR}
-.endif
 
 ###
 ### BEGIN: after the barrier
@@ -451,8 +440,8 @@ ${_WRAP_COOKIE.${_wrappee_}}:						\
 		${_WRAP_TRANSFORM.${_wrappee_}}
 	${RUN} 								\
 	wrapper="${WRAPPER_${_wrappee_}:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//}"; \
-	if [ -x "$$wrapper" ]; then ${ECHO_WRAPPER_MSG} "=> $$wrapper already exists. Skipping"; exit 0; fi; \
-	${ECHO_WRAPPER_MSG} "=> Creating ${_wrappee_} wrapper: $$wrapper"; \
+	if [ -x "$$wrapper" ]; then ${ECHO_BUILDLINK_MSG} "=> $$wrapper already exists. Skipping"; exit 0; fi; \
+	${ECHO_BUILDLINK_MSG} "=> Creating ${_wrappee_} wrapper: $$wrapper"; \
         gen_wrapper=yes;						\
 	wrappee="${PKG_${_wrappee_}:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//}"; \
 	case $$wrappee in						\
@@ -476,7 +465,7 @@ ${_WRAP_COOKIE.${_wrappee_}}:						\
 		IFS="$$save_IFS";					\
 		if ${TEST} ! -x "$$wrappee"; then			\
 			gen_wrapper=no;					\
-			${ECHO_WRAPPER_MSG} "Warning: unable to generate ${_wrappee_} wrapper script: \`$$wrappee'"; \
+			${ECHO_BUILDLINK_MSG} "Warning: unable to generate ${_wrappee_} wrapper script: \`$$wrappee'"; \
 		fi;							\
 		;;							\
 	esac;								\
@@ -500,7 +489,7 @@ ${_alias_}: ${_WRAP_COOKIE.${_wrappee_}}
 	${RUN} 								\
 	wrapper="${WRAPPER_${_wrappee_}:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//}"; \
 	if [ ! -x ${.TARGET} -a -x $$wrapper ]; then			\
-		${ECHO_WRAPPER_MSG} "=> Linking ${_wrappee_} wrapper: ${.TARGET}"; \
+		${ECHO_BUILDLINK_MSG} "=> Linking ${_wrappee_} wrapper: ${.TARGET}"; \
 		${LN} -f${WRAPPER_USE_SYMLINK:Ds} $$wrapper ${.TARGET};	\
 	fi
 .    endif

mk/wrapper/buildcmd

@@ -1,4 +1,4 @@
-# $NetBSD: buildcmd,v 1.6 2012/04/13 06:36:08 wiz Exp $
+# $NetBSD: buildcmd,v 1.9 2015/04/26 07:59:58 tnn Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -67,7 +67,7 @@ case $arg in
 	;;
 ######################################################################
 # Treat the '--as-needed' and '--no-as-needed' arguments to ld as if
-# thay are libraries so that they still surround the given library.
+# they are libraries so that they still surround the given library.
 # WARNING: this may not work if the wrapper reorders libraries.
 ######################################################################
 -l*|--as-needed|--no-as-needed)

mk/wrapper/wrapper-defs.mk

@@ -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.5 2015/04/29 14:23:23 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} == "yes"
+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