From owner-svn-ports-head@FreeBSD.ORG Sat Apr 13 21:12:27 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
by hub.freebsd.org (Postfix) with ESMTP id B7FE9813;
Sat, 13 Apr 2013 21:12:27 +0000 (UTC)
(envelope-from bdrewery@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 92A1F1434;
Sat, 13 Apr 2013 21:12:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3DLCRnD093219;
Sat, 13 Apr 2013 21:12:27 GMT
(envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3DLCRUv093213;
Sat, 13 Apr 2013 21:12:27 GMT
(envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201304132112.r3DLCRUv093213@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Sat, 13 Apr 2013 21:12:27 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
svn-ports-head@freebsd.org
Subject: svn commit: r315798 - in head: devel/libtai math/libjbigi
net-mgmt/zenoss
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
<svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
<mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
<mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Apr 2013 21:12:27 -0000
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