Changed option name from 'x11' to 'gtk2', as GTK2 can be built without X11

support (e.g. on Mac OS X). Tested - works on Mac OS X without X11.
This commit is contained in:
adam 2010-04-08 10:03:31 +00:00
parent 9cd000ba73
commit 97bcd31d81
2 changed files with 9 additions and 9 deletions

View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.16 2010/04/04 11:40:25 tron Exp $ @comment $NetBSD: PLIST,v 1.17 2010/04/08 10:03:31 adam Exp $
bin/capinfos bin/capinfos
bin/dftest bin/dftest
bin/dumpcap bin/dumpcap
@ -9,7 +9,7 @@ bin/randpkt
bin/rawshark bin/rawshark
bin/text2pcap bin/text2pcap
bin/tshark bin/tshark
${PLIST.x11}bin/wireshark ${PLIST.gtk2}bin/wireshark
lib/libwireshark.la lib/libwireshark.la
lib/libwiretap.la lib/libwiretap.la
lib/libwsutil.la lib/libwsutil.la
@ -39,7 +39,7 @@ man/man1/mergecap.1
man/man1/rawshark.1 man/man1/rawshark.1
man/man1/text2pcap.1 man/man1/text2pcap.1
man/man1/tshark.1 man/man1/tshark.1
${PLIST.x11}man/man1/wireshark.1 ${PLIST.gtk2}man/man1/wireshark.1
man/man4/wireshark-filter.4 man/man4/wireshark-filter.4
share/wireshark/AUTHORS-SHORT share/wireshark/AUTHORS-SHORT
share/wireshark/COPYING share/wireshark/COPYING

View file

@ -1,17 +1,17 @@
# $NetBSD: options.mk,v 1.2 2008/04/12 22:43:09 jlam Exp $ # $NetBSD: options.mk,v 1.3 2010/04/08 10:03:31 adam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.wireshark PKG_OPTIONS_VAR= PKG_OPTIONS.wireshark
PKG_SUPPORTED_OPTIONS= x11 PKG_SUPPORTED_OPTIONS= gtk2
PKG_SUGGESTED_OPTIONS= x11 PKG_SUGGESTED_OPTIONS= gtk2
.include "../../mk/bsd.options.mk" .include "../../mk/bsd.options.mk"
PLIST_VARS+= x11 PLIST_VARS+= gtk2
.if !empty(PKG_OPTIONS:Mx11) .if !empty(PKG_OPTIONS:Mgtk2)
CONFIGURE_ARGS+= --enable-gtk2 CONFIGURE_ARGS+= --enable-gtk2
CONFIGURE_ARGS+= --with-gtk-prefix=${BUILDLINK_PREFIX.gtk2} CONFIGURE_ARGS+= --with-gtk-prefix=${BUILDLINK_PREFIX.gtk2}
PLIST.x11= yes PLIST.gtk2= yes
.include "../../x11/gtk2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk"
.else .else
CONFIGURE_ARGS+= --disable-wireshark CONFIGURE_ARGS+= --disable-wireshark