From owner-svn-ports-all@FreeBSD.ORG Fri Jun 28 13:06:36 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id B6D92CCC; Fri, 28 Jun 2013 13:06:36 +0000 (UTC) (envelope-from dinoex@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 9107518B5; Fri, 28 Jun 2013 13:06:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5SD6aRx058687; Fri, 28 Jun 2013 13:06:36 GMT (envelope-from dinoex@svn.freebsd.org) Received: (from dinoex@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5SD6a1r058686; Fri, 28 Jun 2013 13:06:36 GMT (envelope-from dinoex@svn.freebsd.org) Message-Id: <201306281306.r5SD6a1r058686@svn.freebsd.org> From: Dirk Meyer Date: Fri, 28 Jun 2013 13:06:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r321960 - head/graphics/graphviz/files 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.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jun 2013 13:06:36 -0000 Author: dinoex Date: Fri Jun 28 13:06:36 2013 New Revision: 321960 URL: http://svnweb.freebsd.org/changeset/ports/321960 Log: - fix clang regression with lua module Modified: head/graphics/graphviz/files/patch-configure Modified: head/graphics/graphviz/files/patch-configure ============================================================================== --- head/graphics/graphviz/files/patch-configure Fri Jun 28 12:13:35 2013 (r321959) +++ head/graphics/graphviz/files/patch-configure Fri Jun 28 13:06:36 2013 (r321960) @@ -1,5 +1,5 @@ ---- configure.orig 2013-01-14 04:23:16.000000000 +0100 -+++ configure 2013-01-26 20:03:12.000000000 +0100 +--- configure.orig 2013-02-14 14:30:22.000000000 +0100 ++++ configure 2013-06-28 08:33:36.000000000 +0200 @@ -17696,6 +17696,9 @@ *-apple-darwin* ) CFLAGS="${CFLAGS} -fno-common -Wall" @@ -10,7 +10,7 @@ *-freebsd* ) CFLAGS="${CFLAGS} -Wstrict-prototypes -Wpointer-arith -Wall -ffast-math" ;; -@@ -21373,7 +21376,9 @@ +@@ -21518,7 +21521,9 @@ LUA_INCLUDES="" LUA_LIBS="" @@ -21,3 +21,19 @@ if test -n "$lua_inc"; then CFLAGS="$CFLAGS -I$lua_inc" +@@ -21580,13 +21585,13 @@ + pkgconfig_lua_found=`$PKGCONFIG --exists lua$l 2>/dev/null` + if test "x$?" == "x0" ; then + LUA_VERSION=`$PKGCONFIG --modversion lua$l` +- LUA_INCLUDES="$LUA_CFLAGS "`$PKGCONFIG --cflags lua$l` ++ LUA_INCLUDES="$LUA_CFLAGS "`$PKGCONFIG --cflags-only-I lua$l` + LUA_LIBS="$LUA_LFLAGS "`$PKGCONFIG --libs lua$l` + LUA_INSTALL_DIR="/usr/lib$LIBPOSTFIX/lua/`$PKGCONFIG --variable=V lua`" + + pkgconfig_lualib_found=`$PKGCONFIG --exists lualib$l 2>/dev/null` + if test "x$?" == "x0"; then +- LUA_INCLUDES="$LUA_CFLAGS "`$PKGCONFIG --cflags lualib$l` ++ LUA_INCLUDES="$LUA_CFLAGS "`$PKGCONFIG --cflags-only-I lualib$l` + LUA_LIBS="$LUA_LFLAGS "`$PKGCONFIG --libs lualib$l` + fi + break