diff options
| author | jlam <jlam@pkgsrc.org> | 2008-04-12 22:42:57 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2008-04-12 22:42:57 +0000 |
| commit | 841dfa0e7aaa6a0f0cce2901291d1d938dd0fc0a (patch) | |
| tree | fdd67c81079412bf94013749a954125434a9baca /net/wireshark | |
| parent | 6874584eae20f517f70816571f6d4ac696db16b3 (diff) | |
| download | pkgsrc-841dfa0e7aaa6a0f0cce2901291d1d938dd0fc0a.tar.gz | |
Convert to use PLIST_VARS instead of manually passing "@comment "
through PLIST_SUBST to the plist module.
Diffstat (limited to 'net/wireshark')
| -rw-r--r-- | net/wireshark/PLIST | 6 | ||||
| -rw-r--r-- | net/wireshark/options.mk | 9 |
2 files changed, 7 insertions, 8 deletions
diff --git a/net/wireshark/PLIST b/net/wireshark/PLIST index 6977e47dc90..45e42e3c380 100644 --- a/net/wireshark/PLIST +++ b/net/wireshark/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2008/03/31 13:13:40 tron Exp $ +@comment $NetBSD: PLIST,v 1.11 2008/04/12 22:43:08 jlam Exp $ bin/capinfos bin/dftest bin/dumpcap @@ -9,7 +9,7 @@ bin/randpkt bin/rawshark bin/text2pcap bin/tshark -${WIRESHARK}bin/wireshark +${PLIST.x11}bin/wireshark lib/libwireshark.la lib/libwiretap.la lib/wireshark/plugins/${PKGVERSION}/agentx.la @@ -50,7 +50,7 @@ man/man1/mergecap.1 man/man1/rawshark.1 man/man1/text2pcap.1 man/man1/tshark.1 -${WIRESHARK}man/man1/wireshark.1 +${PLIST.x11}man/man1/wireshark.1 man/man4/wireshark-filter.4 share/wireshark/AUTHORS-SHORT share/wireshark/COPYING diff --git a/net/wireshark/options.mk b/net/wireshark/options.mk index 8f1943acc22..dcb9034d9fd 100644 --- a/net/wireshark/options.mk +++ b/net/wireshark/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2008/02/13 20:10:20 tron Exp $ +# $NetBSD: options.mk,v 1.2 2008/04/12 22:43:09 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.wireshark PKG_SUPPORTED_OPTIONS= x11 @@ -6,14 +6,13 @@ PKG_SUGGESTED_OPTIONS= x11 .include "../../mk/bsd.options.mk" +PLIST_VARS+= x11 + .if !empty(PKG_OPTIONS:Mx11) CONFIGURE_ARGS+= --enable-gtk2 CONFIGURE_ARGS+= --with-gtk-prefix=${BUILDLINK_PREFIX.gtk2} - -PLIST_SUBST+= WIRESHARK= +PLIST.x11= yes .include "../../x11/gtk2/buildlink3.mk" .else CONFIGURE_ARGS+= --disable-wireshark - -PLIST_SUBST+= WIRESHARK="@comment " .endif |