svn commit: r315798 - in head: devel/libtai math/libjbigi net-mgmt/zenoss

[Bryan Drewery]

Author: bdrewery
Date: Sat Apr 13 21:12:26 2013
New Revision: 315798
URL: http://svnweb.freebsd.org/changeset/ports/315798

Log:
  - Fix builds when ENV is set and not executable by using proper SETENV for /usr/bin/env
    This fixes all cases of incorrect ENV/SETENV usage.
  
  Approved by:	portmgr (implicit)
  With hat:	portmgr
  PR:		ports/173559

Modified:
  head/devel/libtai/Makefile
  head/math/libjbigi/Makefile
  head/net-mgmt/zenoss/Makefile

Modified: head/devel/libtai/Makefile
==============================================================================
--- head/devel/libtai/Makefile	Sat Apr 13 18:03:34 2013	(r315797)
+++ head/devel/libtai/Makefile	Sat Apr 13 21:12:26 2013	(r315798)
@@ -46,7 +46,7 @@ pre-install:
 .endfor
 
 post-build:
-	@${ENV} LD_LIBRARY_PATH=${WRKSRC} \
+	@${SETENV} LD_LIBRARY_PATH=${WRKSRC} \
 		${WRKSRC}/leapsecs < ${WRKSRC}/leapsecs.txt > \
 		${WRKSRC}/leapsecs.dat
 

Modified: head/math/libjbigi/Makefile
==============================================================================
--- head/math/libjbigi/Makefile	Sat Apr 13 18:03:34 2013	(r315797)
+++ head/math/libjbigi/Makefile	Sat Apr 13 21:12:26 2013	(r315798)
@@ -52,12 +52,12 @@ do-build:
 .ifdef(JBIGI_BUILD_JCPUID)
 # jcpuid
 	cd ${BUILD_WRKSRC}/jcpuid && \
-		${ENV} ${JBIGI_BUILD_ENV} \
+		${SETENV} ${JBIGI_BUILD_ENV} \
 			${SH} ./build.sh
 .endif
 # jbigi
 	cd ${BUILD_WRKSRC}/jbigi && \
-		${ENV} ${JBIGI_BUILD_ENV} \
+		${SETENV} ${JBIGI_BUILD_ENV} \
 			${SH} ./build_jbigi.sh dynamic
 ## prepare jar
 .ifdef(JBIGI_BUILD_JCPUID)

Modified: head/net-mgmt/zenoss/Makefile
==============================================================================
--- head/net-mgmt/zenoss/Makefile	Sat Apr 13 18:03:34 2013	(r315797)
+++ head/net-mgmt/zenoss/Makefile	Sat Apr 13 21:12:26 2013	(r315798)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	zenoss
-# Date created:		19 April 2011
-# Whom:			Phil Phillips
-#
+# Created by: Phil Phillips
 # $FreeBSD$
-#
 
 PORTNAME=	zenoss
 PORTVERSION=	3.1.0
@@ -97,7 +93,7 @@ do-install:
 		&& ${LN} -sF ${ZENHOME}/libdata/pkgconfig \
 		${ZENHOME}/lib/pkgconfig
 
-	@cd ${WRKSRC} && ${ENV} ${BUILD_ENV} SVNVERSION=${FALSE} bash ./build.sh 2>/dev/null
+	@cd ${WRKSRC} && ${SETENV} ${BUILD_ENV} SVNVERSION=${FALSE} bash ./build.sh 2>/dev/null
 
 	@${RM} ${ZENHOME}/lib/pkgconfig