Index: waf.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/waf/waf.mk,v
retrieving revision 1.4
diff -u -r1.4 waf.mk
--- waf.mk	18 Jun 2016 10:30:14 -0000	1.4
+++ waf.mk	18 Jun 2016 16:53:54 -0000
@@ -23,8 +23,11 @@
 WAF_ARGS+=		--mandir=${PREFIX}/${PKGMANDIR}
 .endif
 
+WAF_REPLACE_EXECUTABLE?=        yes
+.if !empty(WAF_REPLACE_EXECUTABLE:M[yY][eE][sS])
 post-extract:
 	cp ${PREFIX}/bin/waf ${WRKSRC}
+.endif
 
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${WAF_ENV} ./waf ${WAF_ARGS} ${WAF_CONFIGURE_ARGS} configure