diff options
| author | bapt <bapt@FreeBSD.org> | 2014-05-27 18:20:08 +0800 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2014-05-27 18:20:08 +0800 |
| commit | 2b2374c83d04d44aa7e6f035fde13db482cd0428 (patch) | |
| tree | f4ba3f0e172a794e416adc1ab260cc5a0c338a75 /net | |
| parent | 3ef0a361e00a44bcea1e4fe1a04856dba97909f4 (diff) | |
| download | freebsd-ports-gnome-2b2374c83d04d44aa7e6f035fde13db482cd0428.tar.gz freebsd-ports-gnome-2b2374c83d04d44aa7e6f035fde13db482cd0428.tar.zst freebsd-ports-gnome-2b2374c83d04d44aa7e6f035fde13db482cd0428.zip | |
Fix detection of lua
Diffstat (limited to 'net')
| -rw-r--r-- | net/wireshark/Makefile | 15 | ||||
| -rw-r--r-- | net/wireshark/files/patch-configure | 23 |
2 files changed, 7 insertions, 31 deletions
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile index e2593b6fe07d..2373e4eb5e2f 100644 --- a/net/wireshark/Makefile +++ b/net/wireshark/Makefile @@ -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 lookup support USE_XORG= x11 .endif -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> .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 <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/wireshark/files/patch-configure b/net/wireshark/files/patch-configure index 685576b101db..7e6ea41480ba 100644 --- a/net/wireshark/files/patch-configure +++ b/net/wireshark/files/patch-configure @@ -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. # |