From owner-svn-ports-all@FreeBSD.ORG  Wed Feb 26 20:59:16 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id AEF16508;
 Wed, 26 Feb 2014 20:59:16 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9A0F41AF1;
 Wed, 26 Feb 2014 20:59:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1QKxGXV098514;
 Wed, 26 Feb 2014 20:59:16 GMT (envelope-from gerald@svn.freebsd.org)
Received: (from gerald@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1QKxGVm098513;
 Wed, 26 Feb 2014 20:59:16 GMT (envelope-from gerald@svn.freebsd.org)
Message-Id: <201402262059.s1QKxGVm098513@svn.freebsd.org>
From: Gerald Pfeifer <gerald@FreeBSD.org>
Date: Wed, 26 Feb 2014 20:59:16 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r346225 - head/graphics/visionworkbench
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Feb 2014 20:59:16 -0000

Author: gerald
Date: Wed Feb 26 20:59:16 2014
New Revision: 346225
URL: http://svnweb.freebsd.org/changeset/ports/346225
QAT: https://qat.redports.org/buildarchive/r346225/

Log:
  Replace the manual construction of ${LOCALBASE}/lib/${CC}, which is not
  appropriate for clang and fragile for GCC, by ${LDFLAGS}.
  
  This is not only more robust, ${LDFLAGS} will also provide -Wl,-rpath
  when necessary.
  
  Plus extend an existing CONFIGURE_ENV instead of overwriting it.
  
  With these changes, the configure problem that made the build fail
  goes away.  On FreeBSD 10.x and above there still are C++ errors
  later in the build, so leave the port BROKEN.
  
  Approved by:	swills (maintainer)
  With help from:	redports.org, mat, decke

Modified:
  head/graphics/visionworkbench/Makefile

Modified: head/graphics/visionworkbench/Makefile
==============================================================================
--- head/graphics/visionworkbench/Makefile	Wed Feb 26 20:42:52 2014	(r346224)
+++ head/graphics/visionworkbench/Makefile	Wed Feb 26 20:59:16 2014	(r346225)
@@ -47,7 +47,7 @@ CFLAGS+=	-Dtgammaf=tgamma
 CFLAGS+=	${PTHREAD_CFLAGS}
 LDFLAGS+=	${PTHREAD_LIBS}
 
-CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include ${CFLAGS}" \
+CONFIGURE_ENV+=	CFLAGS="-I${LOCALBASE}/include ${CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib ${LDFLAGS}"
 
 post-patch:
@@ -55,7 +55,7 @@ post-patch:
 
 pre-configure:
 	echo "HAVE_PKG_FLAPACK=yes" >> ${WRKSRC}/config.options
-	echo "PKG_FLAPACK_LDFLAGS=-L${LOCALBASE}/lib/${CC}" >> ${WRKSRC}/config.options
+	echo "PKG_FLAPACK_LDFLAGS=${LDFLAGS}" >> ${WRKSRC}/config.options
 	echo "HAVE_PKG_PYTHON=yes" >> ${WRKSRC}/config.options
 	echo "PYTHON_LDFLAGS=-L${PYTHON_LIBDIR} -lboost_python -l${PYTHON_VERSION} ${PTHREAD_LIBS}" >> ${WRKSRC}/config.options
 	echo "PYTHON_CPPFLAGS=-I${PYTHON_INCLUDEDIR}" >> ${WRKSRC}/config.options