Date: Wed, 4 Feb 2015 16:37:21 +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: r378406 - in head/net: . wireshark wireshark-qt5 Message-ID: <201502041637.t14GbL3h027634@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marcus Date: Wed Feb 4 16:37:21 2015 New Revision: 378406 URL: https://svnweb.freebsd.org/changeset/ports/378406 QAT: https://qat.redports.org/buildarchive/r378406/ Log: Add support for building wireshark with Qt 5 GUI support. Note: not all of the GTK+ features have been ported to Qt yet. PR: 196728 Submitted by: olevole@olevole.ru Added: head/net/wireshark-qt5/ head/net/wireshark-qt5/Makefile (contents, props changed) Modified: head/net/Makefile head/net/wireshark/Makefile Modified: head/net/Makefile ============================================================================== --- head/net/Makefile Wed Feb 4 15:54:27 2015 (r378405) +++ head/net/Makefile Wed Feb 4 16:37:21 2015 (r378406) @@ -1255,6 +1255,7 @@ SUBDIR += widentd SUBDIR += wireshark SUBDIR += wireshark-lite + SUBDIR += wireshark-qt5 SUBDIR += wizd SUBDIR += wlan2eth SUBDIR += wmlj Added: head/net/wireshark-qt5/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/wireshark-qt5/Makefile Wed Feb 4 16:37:21 2015 (r378406) @@ -0,0 +1,11 @@ +# $FreeBSD$ + +MASTERDIR= ${.CURDIR}/../wireshark +COMMENT= Powerful network analyzer/capture tool (QT package) + +CONFLICTS= wireshark-[0-9]* + +OPTIONS_EXCLUDE= GTK3 +OPTIONS_DEFAULT= SNMP ADNS PCRE IPV6 GEOIP GSSAPI X11 QT5 + +.include "${MASTERDIR}/Makefile" Modified: head/net/wireshark/Makefile ============================================================================== --- head/net/wireshark/Makefile Wed Feb 4 15:54:27 2015 (r378405) +++ head/net/wireshark/Makefile Wed Feb 4 16:37:21 2015 (r378406) @@ -1,7 +1,7 @@ # Created by: Bill Fumerola <billf@chc-chimes.com> # $FreeBSD$ -PORTNAME?= wireshark +PORTNAME= wireshark PORTVERSION= 1.12.3 CATEGORIES= net ipv6 MASTER_SITES= http://www.wireshark.org/download/src/ \ @@ -12,11 +12,12 @@ MASTER_SITES= http://www.wireshark.org/d 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 +LICENSE= GPLv2 + DATADIR_NAME= wireshark USE_PERL5= build @@ -24,6 +25,8 @@ USES= alias gettext gmake iconv libtool python:build tar:bzip2 WANT_GNOME= yes USE_OPENSSL= yes +CONFLICTS?= wireshark-qt5-[0-9]* + CONFIGURE_ARGS+= --program-transform-name="" \ --with-ssl=${OPENSSLBASE} \ --with-qt=no @@ -51,7 +54,11 @@ PLIST_SUB+= ${x:tu}=bin/$x \ .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 + +OPTIONS_RADIO= GUI +OPTIONS_RADIO_GUI= GTK3 QT5 + +OPTIONS_DEFAULT?= SNMP ADNS PCRE IPV6 GEOIP GSSAPI X11 GTK3 RTP_DESC= Enable support for playing back RTP streams ADNS_DESC= Enable asynchronous DNS lookup support @@ -63,12 +70,8 @@ ADNS_DESC= Enable asynchronous DNS look USE_XORG= x11 .endif -.include <bsd.port.options.mk> - .if ${PORT_OPTIONS:MX11} PLIST_SUB+= WIRESHARK=bin/wireshark WIRESHARK_MAN="" -USE_GNOME+= gtk30 -CONFIGURE_ARGS+=--with-gtk3=yes .else PLIST_SUB+= WIRESHARK="@comment wireshark not built" \ WIRESHARK_MAN="@comment wireshark not built " @@ -77,6 +80,23 @@ CONFIGURE_ARGS+= --enable-wireshark=no \ --disable-gtktest .endif +.if ${PORT_OPTIONS:MGTK3} +USE_GNOME+= gtk30 +CONFIGURE_ARGS+= --with-gtk2=no \ + --with-gtk3=yes \ + --with-qt=no +.endif + +.if ${PORT_OPTIONS:MQT5} +CONFIGURE_ARGS+= --with-gtk2=no \ + --with-gtk3=no \ + --with-qt=yes +USE_QT5+= core widgets printsupport buildtools_build +PKGNAMESUFFIX+= -qt5 +MAKE_ENV+= PATH="${PATH}:${LOCALBASE}/lib/qt5/bin" +CONFIGURE_ENV+= PATH="${PATH}:${LOCALBASE}/lib/qt5/bin" +.endif + GNU_CONFIGURE= yes PLIST_SUB+= PORTVERSION=${PORTVERSION} @@ -165,12 +185,15 @@ PKG_MESSAGE= ${FILESDIR}/pkg-message post-patch: @${REINPLACE_CMD} -e 's|llua|llua-${LUA_VER}|g ; \ - s|-DGDK_PIXBUF_DISABLE_DEPRECATED||g ; \ + s|-DGDK_PIXBUF_DISABLE_DEPRECATED||g ; \ s|-Wl,--as-needed|| ' \ ${WRKSRC}/configure post-install: ${INSTALL_DATA} ${WRKSRC}/image/hi48-app-wireshark.png \ - ${STAGEDIR}${DATADIR} + ${STAGEDIR}${DATADIR} +.if ${PORT_OPTIONS:MQT5} + ${MV} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-qt ${STAGEDIR}${PREFIX}/bin/${PORTNAME} +.endif .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502041637.t14GbL3h027634>