Added qt5 as an option.

Avoid SDK build on OS X.

5 files changed, 69 insertions, 26 deletions

diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index 9f1b13b8690..8bb419e234b 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.139 2015/10/21 09:12:10 wiz Exp $
+# $NetBSD: Makefile,v 1.140 2015/11/06 17:35:26 adam Exp $
 
 DISTNAME=	wireshark-1.12.8
 CATEGORIES=	net
@@ -56,6 +56,10 @@ REPLACE_PYTHON+=	tools/rdps.py
 USE_BUILTIN.libpcap=	no
 .endif
 
+.if ${OPSYS} == "Darwin"
+CONFIGURE_ARGS+=	--disable-osx-deploy-target
+.endif
+
 # Extra post install targets are in options.mk
 post-install: ${POST_INSTALL_TARGETS}
 
diff --git a/net/wireshark/PLIST b/net/wireshark/PLIST
index c27d0ce2942..a0fc74e14df 100644
--- a/net/wireshark/PLIST
+++ b/net/wireshark/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2015/09/12 19:03:59 tnn Exp $
+@comment $NetBSD: PLIST,v 1.28 2015/11/06 17:35:26 adam Exp $
 bin/capinfos
 bin/captype
 bin/dftest
@@ -11,6 +11,7 @@ bin/reordercap
 bin/text2pcap
 bin/tshark
 ${PLIST.gtk3}bin/wireshark
+${PLIST.qt5}bin/wireshark-qt
 lib/libfiletap.la
 lib/libwireshark.la
 lib/libwiretap.la
@@ -38,7 +39,7 @@ man/man1/rawshark.1
 man/man1/reordercap.1
 man/man1/text2pcap.1
 man/man1/tshark.1
-${PLIST.gtk3}man/man1/wireshark.1
+${PLIST.icons}man/man1/wireshark.1
 man/man4/wireshark-filter.4
 ${PLIST.gtk3}share/applications/wireshark.desktop
 ${PLIST.icons}share/icons/hicolor/128x128/mimetypes/application-vnd.tcpdump.pcap.png
diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo
index 7a381577d39..38b0bba343c 100644
--- a/net/wireshark/distinfo
+++ b/net/wireshark/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.84 2015/10/21 09:12:10 wiz Exp $
+$NetBSD: distinfo,v 1.85 2015/11/06 17:35:26 adam Exp $
 
 SHA1 (wireshark-1.12.8.tar.bz2) = d8c23120525a2f3505e822b7684e7367bcd0ba70
 RMD160 (wireshark-1.12.8.tar.bz2) = bf87fd1e3404d04f6123d09798b46ea5b2af49e9
@@ -11,3 +11,4 @@ SHA1 (patch-bb) = 2f6b72aeb99d87821ee6917d6c4c29a276d2e3a8
 SHA1 (patch-bc) = 052ede4ba58502117fe7b355e22a906ff65b773e
 SHA1 (patch-ca) = 08c4ae23739fbec238b02a2d0398b4a157f9c077
 SHA1 (patch-help_Makefile.in) = 8d7c27aa5d2c8b7998e4f7235fefaedd52059386
+SHA1 (patch-ui_qt_Makefile.in) = b26c11d7515b3b333c9e9853281fc4e06d7d8007
diff --git a/net/wireshark/options.mk b/net/wireshark/options.mk
index 3b3cac364f5..3b4c8d646c0 100644
--- a/net/wireshark/options.mk
+++ b/net/wireshark/options.mk
@@ -1,18 +1,39 @@
-# $NetBSD: options.mk,v 1.10 2015/10/21 09:12:10 wiz Exp $
+# $NetBSD: options.mk,v 1.11 2015/11/06 17:35:26 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.wireshark
-PKG_SUPPORTED_OPTIONS=	gtk3 lua
+PKG_SUPPORTED_OPTIONS=	gtk3 lua qt5
 PKG_SUGGESTED_OPTIONS=	gtk3 lua
 PKG_OPTIONS_LEGACY_OPTS+=	gtk2:gtk3
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=		gtk3
-PLIST_VARS+=		icons
+PLIST_VARS+=		gtk3 icons qt5
 
-.if !empty(PKG_OPTIONS:Mgtk3)
-CONFIGURE_ARGS+=	--enable-wireshark
+.if empty(PKG_OPTIONS:Mqt5)
+CONFIGURE_ARGS+=	--without-qt
+.else
+CONFIGURE_ARGS+=	--with-qt
+CONFIGURE_ENV+=		MOC=${QTDIR}/bin/moc
+CONFIGURE_ENV+=		RCC=${QTDIR}/bin/rcc
+CONFIGURE_ENV+=		UIC=${QTDIR}/bin/uic
+# RCC is not configured, so fix it here; see patch-ui_qt_Makefile.in
+SUBST_CLASSES+=		fix-rcc
+SUBST_MESSAGE.fix-rcc=	Fixing rcc path.
+SUBST_STAGE.fix-rcc=	pre-configure
+SUBST_FILES.fix-rcc=	ui/qt/Makefile.in
+SUBST_SED.fix-rcc=	-e 's,@RCC@,${QTDIR}/bin/rcc,'
+PLIST.qt5=		yes
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.  if ${OPSYS} == "Darwin"
+.include "../../x11/qt5-qtmacextras/buildlink3.mk"
+.  else
+.include "../../x11/qt5-qtx11extras/buildlink3.mk"
+.  endif
+.endif
+
+.if empty(PKG_OPTIONS:Mgtk3)
+CONFIGURE_ARGS+=	--without-gtk3
+.else
 CONFIGURE_ARGS+=	--with-gtk3
-CONFIGURE_ARGS+=	--without-qt # XXX make this an option
 PLIST.gtk3=		yes
 POST_INSTALL_TARGETS+=	install-gtk-desktop
 .include "../../x11/gtk3/buildlink3.mk"
@@ -22,13 +43,12 @@ install-gtk-desktop:
 	${INSTALL_DATA} ${WRKSRC}/wireshark.desktop \
 		${DESTDIR}${PREFIX}/share/applications
 
-.else
-CONFIGURE_ARGS+=	--disable-wireshark
 .endif
 
 # We might install the qt front end one day as well,
 # so have a generic icon target
-.if !empty(PKG_OPTIONS:Mgtk3)
+.if !empty(PKG_OPTIONS:Mgtk3) || !empty(PKG_OPTIONS:Mqt5)
+CONFIGURE_ARGS+=	--enable-wireshark
 PLIST.icons=		yes
 POST_INSTALL_TARGETS+=	install-icons
 INSTALLATION_DIRS+=	share/applications
@@ -37,15 +57,15 @@ ICON_COLORS=		hi lo
 ICON_SIZES=		16 32 48
 MIMEICON_SIZES=		16 24 32 48 64 128 256
 
-.for c in ${ICON_COLORS}
-.for d in ${ICON_SIZES}
+.  for c in ${ICON_COLORS}
+.    for d in ${ICON_SIZES}
 INSTALLATION_DIRS+=	share/icons/${c}color/${d}x${d}/apps
-.endfor
-.endfor
+.    endfor
+.  endfor
 
-.for d in ${MIMEICON_SIZES}
+.  for d in ${MIMEICON_SIZES}
 INSTALLATION_DIRS+=	share/icons/hicolor/${d}x${d}/mimetypes
-.endfor
+.  endfor
 
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
@@ -54,17 +74,19 @@ INSTALLATION_DIRS+=	share/icons/hicolor/${d}x${d}/mimetypes
 install-icons:
 	${INSTALL_DATA} ${WRKSRC}/image/wsicon.svg \
 		${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/wireshark.svg
-.for c in ${ICON_COLORS}
-.for d in ${ICON_SIZES}
+.  for c in ${ICON_COLORS}
+.    for d in ${ICON_SIZES}
 	${INSTALL_DATA} ${WRKSRC}/image/${c}${d}-app-wireshark.png \
 		${DESTDIR}${PREFIX}/share/icons/${c}color/${d}x${d}/apps/wireshark.png
-.endfor
-.endfor
+.    endfor
+.  endfor
 
-.for d in ${MIMEICON_SIZES}
+.  for d in ${MIMEICON_SIZES}
 	${INSTALL_DATA} ${WRKSRC}/image/WiresharkDoc-${d}.png \
 		${DESTDIR}${PREFIX}/share/icons/hicolor/${d}x${d}/mimetypes/application-vnd.tcpdump.pcap.png
-.endfor
+.  endfor
+.else
+CONFIGURE_ARGS+=	--disable-wireshark
 .endif
 
 PLIST_VARS+=		lua
diff --git a/net/wireshark/patches/patch-ui_qt_Makefile.in b/net/wireshark/patches/patch-ui_qt_Makefile.in
new file mode 100644
index 00000000000..efb9650e8b7
--- /dev/null
+++ b/net/wireshark/patches/patch-ui_qt_Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-ui_qt_Makefile.in,v 1.1 2015/11/06 17:35:26 adam Exp $
+
+RCC is not configured; see also options.mk.
+
+--- ui/qt/Makefile.in.orig	2015-11-06 17:00:29.000000000 +0000
++++ ui/qt/Makefile.in
+@@ -1688,7 +1688,7 @@ wireshark-tap-register.c: $(WIRESHARK_QT
+ 
+ .qrc.rcc.cpp:
+ 	$(MKDIR_P) $(@D)
+-	$(AM_V_RCC)rcc -name `basename $< .qrc` -o $@ $<
++	$(AM_V_RCC)@RCC@ -name `basename $< .qrc` -o $@ $<
+ 
+ ui_%.h: %.ui
+ 	$(AM_V_UIC)$(UIC) $< -o $@