svn commit: r373494 - in head/lang: perl5.14 perl5.16 perl5.18 perl5.20

[Mathieu Arnold]

Author: mat
Date: Thu Nov 27 15:19:51 2014
New Revision: 373494
URL: https://svnweb.freebsd.org/changeset/ports/373494
QAT: https://qat.redports.org/buildarchive/r373494/

Log:
  /usr/bin/env is in SETENV, not ENV, and sometime, ENV=$USER/.shrc, which of
  course, won't work.
  
  Noticed by:	Richard Clayton
  Sponsored by:	Absolight

Modified:
  head/lang/perl5.14/Makefile
  head/lang/perl5.16/Makefile
  head/lang/perl5.18/Makefile
  head/lang/perl5.20/Makefile

Modified: head/lang/perl5.14/Makefile
==============================================================================
--- head/lang/perl5.14/Makefile	Thu Nov 27 15:14:39 2014	(r373493)
+++ head/lang/perl5.14/Makefile	Thu Nov 27 15:19:51 2014	(r373494)
@@ -226,7 +226,7 @@ post-install:
 	${MKDIR} ${STAGEDIR}${SITE_ARCH}/sys
 	# h2ph needs perl, but perl is not installed, it's only
 	# staged, so, use the one in WRKDIR 
-	(cd /usr/include && ${ENV} LD_LIBRARY_PATH=${WRKSRC} \
+	(cd /usr/include && ${SETENV} LD_LIBRARY_PATH=${WRKSRC} \
 		${WRKSRC}/perl -I ${WRKSRC}/lib ${STAGEDIR}${PREFIX}/bin/h2ph \
 		-d ${STAGEDIR}${SITE_ARCH} *.h machine/*.h sys/*.h >/dev/null)
 	@${FIND} ${STAGEDIR}${SITE_ARCH} -name '*.ph' | sed -e 's|${STAGEDIR}||' >> ${TMPPLIST}

Modified: head/lang/perl5.16/Makefile
==============================================================================
--- head/lang/perl5.16/Makefile	Thu Nov 27 15:14:39 2014	(r373493)
+++ head/lang/perl5.16/Makefile	Thu Nov 27 15:19:51 2014	(r373494)
@@ -226,7 +226,7 @@ post-install:
 	${MKDIR} ${STAGEDIR}${SITE_ARCH}/sys
 	# h2ph needs perl, but perl is not installed, it's only
 	# staged, so, use the one in WRKDIR 
-	(cd /usr/include && ${ENV} LD_LIBRARY_PATH=${WRKSRC} \
+	(cd /usr/include && ${SETENV} LD_LIBRARY_PATH=${WRKSRC} \
 		${WRKSRC}/perl -I ${WRKSRC}/lib ${STAGEDIR}${PREFIX}/bin/h2ph \
 		-d ${STAGEDIR}${SITE_ARCH} *.h machine/*.h sys/*.h >/dev/null)
 	@${FIND} ${STAGEDIR}${SITE_ARCH} -name '*.ph' | sed -e 's|${STAGEDIR}||' >> ${TMPPLIST}

Modified: head/lang/perl5.18/Makefile
==============================================================================
--- head/lang/perl5.18/Makefile	Thu Nov 27 15:14:39 2014	(r373493)
+++ head/lang/perl5.18/Makefile	Thu Nov 27 15:19:51 2014	(r373494)
@@ -205,7 +205,7 @@ post-install:
 	${MKDIR} ${STAGEDIR}${SITE_ARCH}/sys
 	# h2ph needs perl, but perl is not installed, it's only
 	# staged, so, use the one in WRKDIR 
-	(cd /usr/include && ${ENV} LD_LIBRARY_PATH=${WRKSRC} \
+	(cd /usr/include && ${SETENV} LD_LIBRARY_PATH=${WRKSRC} \
 		${WRKSRC}/perl -I ${WRKSRC}/lib ${STAGEDIR}${PREFIX}/bin/h2ph \
 		-d ${STAGEDIR}${SITE_ARCH} *.h machine/*.h sys/*.h >/dev/null)
 	@${FIND} ${STAGEDIR}${SITE_ARCH} -name '*.ph' | sed -e 's|${STAGEDIR}||' >> ${TMPPLIST}

Modified: head/lang/perl5.20/Makefile
==============================================================================
--- head/lang/perl5.20/Makefile	Thu Nov 27 15:14:39 2014	(r373493)
+++ head/lang/perl5.20/Makefile	Thu Nov 27 15:19:51 2014	(r373494)
@@ -201,7 +201,7 @@ post-install:
 	${MKDIR} ${STAGEDIR}${SITE_ARCH}/sys
 	# h2ph needs perl, but perl is not installed, it's only
 	# staged, so, use the one in WRKDIR 
-	(cd /usr/include && ${ENV} LD_LIBRARY_PATH=${WRKSRC} \
+	(cd /usr/include && ${SETENV} LD_LIBRARY_PATH=${WRKSRC} \
 		${WRKSRC}/perl -I ${WRKSRC}/lib ${STAGEDIR}${PREFIX}/bin/h2ph \
 		-d ${STAGEDIR}${SITE_ARCH} *.h machine/*.h sys/*.h >/dev/null)
 	@${FIND} ${STAGEDIR}${SITE_ARCH} -name '*.ph' | sed -e 's|${STAGEDIR}||' >> ${TMPPLIST}