Date: Mon, 17 Dec 2012 06:23:45 +0000 (UTC) From: Joe Marcus Clarke <marcus@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r309065 - in head/net/wireshark: . files Message-ID: <201212170623.qBH6NjJD032328@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marcus Date: Mon Dec 17 06:23:44 2012 New Revision: 309065 URL: http://svnweb.freebsd.org/changeset/ports/309065 Log: Update to 1.8.4. * Respect WITHOUT_GSSAPI [1] * Fix Lua support PR: 174049 [1] Submitted by: Kimmo Paasiala <kpaasial@gmail.com> [1] Modified: head/net/wireshark/Makefile head/net/wireshark/distinfo head/net/wireshark/files/patch-configure Modified: head/net/wireshark/Makefile ============================================================================== --- head/net/wireshark/Makefile Mon Dec 17 06:18:30 2012 (r309064) +++ head/net/wireshark/Makefile Mon Dec 17 06:23:44 2012 (r309065) @@ -6,8 +6,7 @@ # PORTNAME?= wireshark -PORTVERSION= 1.8.3 -PORTREVISION= 1 +PORTVERSION= 1.8.4 CATEGORIES= net ipv6 MASTER_SITES= http://www.wireshark.org/download/src/ \ http://ftp.uni-kl.de/pub/wireshark/src/ \ @@ -69,7 +68,8 @@ OPTIONS= RTP "Enable support for playing IPV6 "Enable IPv6 support" on \ GEOIP "Enable GeoIP lookups" on \ LUA "Enable LUA scripting integration" off \ - CARES "Asynchronous DNS resolution via c-ares" off + CARES "Asynchronous DNS resolution via c-ares" off \ + GSSAPI "Enable Kerberos support" on .endif .include <bsd.port.pre.mk> @@ -167,12 +167,16 @@ LIB_DEPENDS+= gcrypt:${PORTSDIR}/securit CONFIGURE_ARGS+=--with-libgcrypt-prefix=${LOCALBASE} .endif +.if defined(WITHOUT_GSSAPI) +CONFIGURE_ARGS+=--with-krb5=no +.endif + MAN1+= dumpcap.1 tshark.1 MAN4+= wireshark-filter.4 post-patch: - @${REINPLACE_CMD} -e 's|lua5\.1|lua${LUA_VER_STR}|g ; \ - s|-llua${LUA_VER_STR}|${LUA_LIBDIR}/liblua.a|g' \ + @${REINPLACE_CMD} -e 's|%%LUA_INCDIR%%|${LUA_INCDIR}|g ; \ + s|%%LUA_LIBDIR%%|${LUA_LIBDIR}|g' \ ${WRKSRC}/configure post-install: Modified: head/net/wireshark/distinfo ============================================================================== --- head/net/wireshark/distinfo Mon Dec 17 06:18:30 2012 (r309064) +++ head/net/wireshark/distinfo Mon Dec 17 06:23:44 2012 (r309065) @@ -1,2 +1,2 @@ -SHA256 (wireshark-1.8.3.tar.bz2) = 83a85ff506b5e2a70f03c49de7af291802404983a23c7779e0f4ac3e672a2fb3 -SIZE (wireshark-1.8.3.tar.bz2) = 24123989 +SHA256 (wireshark-1.8.4.tar.bz2) = cae9ec0cb9fa0b732a76c0f72f8c15d763f8cdc2e389cda2da6c48c24559faac +SIZE (wireshark-1.8.4.tar.bz2) = 24164286 Modified: head/net/wireshark/files/patch-configure ============================================================================== --- head/net/wireshark/files/patch-configure Mon Dec 17 06:18:30 2012 (r309064) +++ head/net/wireshark/files/patch-configure Mon Dec 17 06:23:44 2012 (r309065) @@ -1,20 +1,43 @@ ---- configure.orig 2010-08-29 18:20:30.000000000 -0400 -+++ configure 2010-09-04 17:19:07.000000000 -0400 -@@ -22487,7 +22487,7 @@ $as_echo "yes" >&6; } +--- 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. # - CFLAGS="$CFLAGS -I$krb5_dir/include" CPPFLAGS="$CPPFLAGS -I$krb5_dir/include" - ac_heimdal_version=`grep heimdal $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*heimdal.*$/HEIMDAL/'` + ac_heimdal_version=`grep heimdal $krb5_dir/include/krb5.h | head -n 1 | tr "[:lower:]" "[:upper:]" sed 's/^.*heimdal.*$/HEIMDAL/'` # MIT Kerberos moved krb5.h to krb5/krb5.h starting with release 1.5 ac_mit_version_olddir=`grep 'Massachusetts Institute of Technology' $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*Massachusetts Institute of Technology.*$/MIT/'` ac_mit_version_newdir=`grep 'Massachusetts Institute of Technology' $krb5_dir/include/krb5/krb5.h | head -n 1 | sed 's/^.*Massachusetts Institute of Technology.*$/MIT/'` -@@ -22546,7 +22546,7 @@ fi +@@ -26547,7 +26547,7 @@ fi if test -x "$KRB5_CONFIG" then - KRB5_FLAGS=`"$KRB5_CONFIG" --cflags` + KRB5_FLAGS=`"$KRB5_CONFIG" --cflags | sed -e 's/@INCLUDE_des@//g'` KRB5_LIBS=`"$KRB5_CONFIG" --libs` - CFLAGS="$CFLAGS $KRB5_FLAGS" CPPFLAGS="$CPPFLAGS $KRB5_FLAGS" + #
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212170623.qBH6NjJD032328>