From owner-svn-ports-head@FreeBSD.ORG Tue May 27 10:20:09 2014 Return-Path: Delivered-To: svn-ports-head@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 DA5691E4; Tue, 27 May 2014 10:20:08 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BB8A4281A; Tue, 27 May 2014 10:20:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4RAK8uv023574; Tue, 27 May 2014 10:20:08 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4RAK8vZ023571; Tue, 27 May 2014 10:20:08 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201405271020.s4RAK8vZ023571@svn.freebsd.org> From: Baptiste Daroussin Date: Tue, 27 May 2014 10:20:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r355480 - in head/net/wireshark: . 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-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 May 2014 10:20:09 -0000 Author: bapt Date: Tue May 27 10:20:08 2014 New Revision: 355480 URL: http://svnweb.freebsd.org/changeset/ports/355480 QAT: https://qat.redports.org/buildarchive/r355480/ Log: Fix detection of lua Modified: head/net/wireshark/Makefile head/net/wireshark/files/patch-configure Modified: head/net/wireshark/Makefile ============================================================================== --- head/net/wireshark/Makefile Tue May 27 10:15:28 2014 (r355479) +++ head/net/wireshark/Makefile Tue May 27 10:20:08 2014 (r355480) @@ -21,8 +21,7 @@ DATADIR_NAME= wireshark USE_PERL5= build USE_PYTHON_BUILD=yes -USES= iconv gettext pkgconfig gmake perl5 -USE_BZIP2= yes +USES= iconv gettext pkgconfig gmake perl5 tar:bzip2 WANT_GNOME= yes USE_OPENSSL= yes CONFIGURE_ENV= LIBS="${WIRESHARK_LIBS}" @@ -66,7 +65,7 @@ ADNS_DESC= Enable asynchronous DNS look USE_XORG= x11 .endif -.include +.include .if ${PORT_OPTIONS:MX11} PLIST_SUB+= WIRESHARK=bin/wireshark WIRESHARK_MAN="" @@ -104,7 +103,8 @@ CONFIGURE_ARGS+= --with-pcre=no .if ${PORT_OPTIONS:MLUA} && !defined(LITE) USES+= lua:51 -CONFIGURE_ARGS+=--with-lua=${LUA_PREFIX} +CONFIGURE_ARGS+=--with-lua=${PREFIX} +CPPFLAGS+= -I${LUA_INCDIR} PLIST_SUB+= LUA="" .else CONFIGURE_ARGS+=--without-lua @@ -166,13 +166,12 @@ CONFIGURE_ARGS+=--with-krb5=no .endif post-patch: - @${REINPLACE_CMD} -e 's|%%LUA_INCDIR%%|${LUA_INCDIR}|g ; \ - s|-Wl,--as-needed|| ; \ - s|%%LUA_LIBDIR%%|${LUA_LIBDIR}|g' \ + @${REINPLACE_CMD} -e 's|llua|llua-${LUA_VER}|g ; \ + s|-Wl,--as-needed|| ' \ ${WRKSRC}/configure post-install: ${INSTALL_DATA} ${WRKSRC}/image/hi48-app-wireshark.png \ ${STAGEDIR}${DATADIR} -.include +.include Modified: head/net/wireshark/files/patch-configure ============================================================================== --- head/net/wireshark/files/patch-configure Tue May 27 10:15:28 2014 (r355479) +++ head/net/wireshark/files/patch-configure Tue May 27 10:20:08 2014 (r355480) @@ -1,28 +1,5 @@ --- configure.orig 2012-11-28 13:51:02.000000000 -0500 +++ configure 2012-12-17 01:11:49.000000000 -0500 -@@ -25305,9 +25305,9 @@ $as_echo "yes" >&6; } - # searches the specified directory. - # - wireshark_save_CPPFLAGS="$CPPFLAGS" -- CPPFLAGS="$CPPFLAGS -I$lua_dir/include" -+ CPPFLAGS="$CPPFLAGS -I%%LUA_INCDIR%%" - wireshark_save_LIBS="$LIBS" -- LIBS="$LIBS -L$lua_dir/lib -llua -lm" -+ LIBS="$LIBS -L%%LUA_LIBDIR%% -llua -lm" - wireshark_save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -L$lua_dir/lib" - else -@@ -25512,8 +25512,8 @@ if test "x$ac_cv_lib_lua_luaL_register" - # Put the "-I" and "-L" flags for lua into - # LUA_INCLUDES and LUA_LIBS, respectively. - # -- LUA_LIBS="-L$lua_dir/lib -llua -lm" -- LUA_INCLUDES="-I$lua_dir/include" -+ LUA_LIBS="-L%%LUA_LIBDIR%% -llua -lm" -+ LUA_INCLUDES="-I%%LUA_INCDIR%%" - else - LUA_LIBS="-llua -lm" - LUA_INCLUDES="" @@ -26487,7 +26487,7 @@ $as_echo "yes" >&6; } # searches the specified directory. #