CVS commit: pkgsrc/devel/waf

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Jan  9 23:09:58 UTC 2020

Modified Files:
        pkgsrc/devel/waf: waf.mk

Log Message:
waf: Not replacing the executable by default is probably a good idea.

"Waf script '2.0.19' and library '2.0.18' do not match (directory '/home/nia/pkgsrc/audio/suil/work/suil-0.10.6')"


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/waf/waf.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/waf/waf.mk
diff -u pkgsrc/devel/waf/waf.mk:1.9 pkgsrc/devel/waf/waf.mk:1.10
--- pkgsrc/devel/waf/waf.mk:1.9 Wed Jan  8 13:15:09 2020
+++ pkgsrc/devel/waf/waf.mk     Thu Jan  9 23:09:58 2020
@@ -1,4 +1,4 @@
-# $NetBSD: waf.mk,v 1.9 2020/01/08 13:15:09 wiz Exp $
+# $NetBSD: waf.mk,v 1.10 2020/01/09 23:09:58 nia Exp $
 
 # XXX why does this does not respect the standard pkgsrc variables like
 # CONFIGURE_ENV et al?
@@ -26,12 +26,14 @@ WAF_HAS_MANDIR?=    yes
 WAF_ARGS+=             --mandir=${PREFIX}/${PKGMANDIR}
 .endif
 
-WAF_REPLACE_EXECUTABLE?=       yes
+WAF_REPLACE_EXECUTABLE?=       no
 .if !empty(WAF_REPLACE_EXECUTABLE:M[yY][eE][sS])
 TOOL_DEPENDS+= waf-[0-9]*:../../devel/waf
 
 post-extract:
        cp ${PREFIX}/bin/waf ${WRKSRC}
+.else
+.  include "../../lang/python/tool.mk"
 .endif
 
 do-configure: