Index: head/net/wireshark/Makefile =================================================================== --- head/net/wireshark/Makefile (revision 355479) +++ head/net/wireshark/Makefile (revision 355480) @@ -1,178 +1,177 @@ # Created by: Bill Fumerola # $FreeBSD$ PORTNAME?= wireshark PORTVERSION= 1.10.7 CATEGORIES= net ipv6 MASTER_SITES= http://www.wireshark.org/download/src/ \ http://ftp.uni-kl.de/pub/wireshark/src/ \ http://wireshark.askapache.com/download/src/all-versions/ \ ftp://ftp.uni-kl.de/pub/wireshark/src/ \ http://prdownloads.sourceforge.net/wireshark/ \ http://ftp.yz.yamagata-u.ac.jp/pub/network/security/wireshark/src/ \ ftp://ftp.yz.yamagata-u.ac.jp/pub/network/security/wireshark/src/ \ http://wireshark.zing.org/download/src/ DISTNAME= ${DATADIR_NAME}-${PORTVERSION} MAINTAINER= marcus@FreeBSD.org COMMENT?= Powerful network analyzer/capture tool 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}" CONFIGURE_ARGS+= --program-transform-name="" \ --with-ssl=${OPENSSLBASE} USE_LDCONFIG= yes DATADIR= ${PREFIX}/share/${DATADIR_NAME} LDFLAGS+= -L${LOCALBASE}/lib CFLAGS+= -funit-at-a-time DESKTOP_ENTRIES= "Wireshark" "Network Protocol Analyzer" \ "${DATADIR}/hi48-app-wireshark.png" \ "wireshark" "System;Monitor;GTK;" true WIRESHARK_LIBS= .for x in capinfos editcap mergecap rawshark text2pcap dftest randpkt \ reordercap .if defined(LITE) PLIST_SUB+= ${x:tu}="@comment $x not installed" \ ${x:tu}_MAN="@comment $x not installed " CONFIGURE_ARGS+= --enable-$x=no .else PLIST_SUB+= ${x:tu}=bin/$x \ ${x:tu}_MAN="" .endif .endfor .if !defined(LITE) OPTIONS_DEFINE= RTP SNMP ADNS PCRE IPV6 GEOIP LUA CARES GSSAPI X11 \ GNUTLS GCRYPT THREADS OPTIONS_DEFAULT= SNMP ADNS PCRE IPV6 GEOIP GSSAPI X11 RTP_DESC= Enable support for playing back RTP streams ADNS_DESC= Enable asynchronous DNS lookup support .endif .include .if ${PORT_OPTIONS:MX11} USE_XORG= x11 .endif -.include +.include .if ${PORT_OPTIONS:MX11} PLIST_SUB+= WIRESHARK=bin/wireshark WIRESHARK_MAN="" USE_GNOME+= gtk20 WIRESHARK_LIBS+=${PTHREAD_LIBS} .else PLIST_SUB+= WIRESHARK="@comment wireshark not built" \ WIRESHARK_MAN="@comment wireshark not built " USE_GNOME+= glib20 CONFIGURE_ARGS+= --enable-wireshark=no \ --disable-gtktest .endif GNU_CONFIGURE= yes LIBTOOLFILES= configure wiretap/configure PLIST_SUB+= PORTVERSION=${PORTVERSION} .if ${PORT_OPTIONS:MIPV6} CONFIGURE_ARGS+= --enable-ipv6=yes .else CONFIGURE_ARGS+= --enable-ipv6=no .endif # XXX - untested .if ${PORT_OPTIONS:MTHREADS} CONFIGURE_ARGS+= --enable-threads .endif .if ${PORT_OPTIONS:MPCRE} && !defined(LITE) LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre CONFIGURE_ARGS+= --with-pcre=${LOCALBASE}/lib .else CONFIGURE_ARGS+= --with-pcre=no .endif .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 PLIST_SUB+= LUA="@comment " .endif .if ${PORT_OPTIONS:MRTP} && !defined(LITE) LIB_DEPENDS+= libportaudio.so:${PORTSDIR}/audio/portaudio CONFIGURE_ARGS+=--with-portaudio=${LOCALBASE} WIRESHARK_LIBS+=${PTHREAD_LIBS} .else CONFIGURE_ARGS+=--without-portaudio .endif .if ${PORT_OPTIONS:MSNMP} && !defined(LITE) LIB_DEPENDS+= libsmi.so:${PORTSDIR}/net-mgmt/libsmi CONFIGURE_ARGS+= --with-libsmi=${LOCALBASE} .else CONFIGURE_ARGS+= --with-libsmi=no .endif .if ${PORT_OPTIONS:MADNS} && !defined(LITE) LIB_DEPENDS+= libadns.so:${PORTSDIR}/dns/adns CONFIGURE_ARGS+= --with-adns=${LOCALBASE}/lib .else CONFIGURE_ARGS+= --with-adns=no .endif .if ${PORT_OPTIONS:MCARES} && !defined(LITE) LIB_DEPENDS+= libcares.so:${PORTSDIR}/dns/c-ares CONFIGURE_ARGS+= --with-c-ares=${LOCALBASE}/lib .else CONFIGURE_ARGS+= --with-c-ares=no .endif .if ${PORT_OPTIONS:MGEOIP} && !defined(LITE) LIB_DEPENDS+= libGeoIP.so:${PORTSDIR}/net/GeoIP CONFIGURE_ARGS+= --with-geoip=${LOCALBASE}/lib .else CONFIGURE_ARGS+= --with-geoip=no .endif .if ${PORT_OPTIONS:MGNUTLS} LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls \ libgcrypt.so:${PORTSDIR}/security/libgcrypt CONFIGURE_ARGS+=--with-libgcrypt-prefix=${LOCALBASE} \ --with-gnutls=yes .else CONFIGURE_ARGS+=--with-gnutls=no .endif .if ${PORT_OPTIONS:MGCRYPT} LIB_DEPENDS+= libgcrypt.so:${PORTSDIR}/security/libgcrypt CONFIGURE_ARGS+=--with-libgcrypt-prefix=${LOCALBASE} .endif .if ! ${PORT_OPTIONS:MGSSAPI} 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 Index: head/net/wireshark/files/patch-configure =================================================================== --- head/net/wireshark/files/patch-configure (revision 355479) +++ head/net/wireshark/files/patch-configure (revision 355480) @@ -1,43 +1,20 @@ --- 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. # 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/'` @@ -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` CPPFLAGS="$CPPFLAGS $KRB5_FLAGS" #