pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/wireshark Add a new option "lua" to enable support...
details: https://anonhg.NetBSD.org/pkgsrc/rev/c1c0e1ecc601
branches: trunk
changeset: 575501:c1c0e1ecc601
user: tron <tron%pkgsrc.org@localhost>
date: Sat May 15 20:27:28 2010 +0000
description:
Add a new option "lua" to enable support for Lua scripts and turn it on
by default. Bump package revisions as the binary package changed.
Suggested by Jonathan Kollasch in private e-mail.
diffstat:
net/wireshark/Makefile | 3 ++-
net/wireshark/PLIST | 5 ++++-
net/wireshark/options.mk | 17 ++++++++++++++---
3 files changed, 20 insertions(+), 5 deletions(-)
diffs (75 lines):
diff -r 1cc19f653d62 -r c1c0e1ecc601 net/wireshark/Makefile
--- a/net/wireshark/Makefile Sat May 15 20:27:15 2010 +0000
+++ b/net/wireshark/Makefile Sat May 15 20:27:28 2010 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2010/05/13 07:03:22 tron Exp $
+# $NetBSD: Makefile,v 1.45 2010/05/15 20:27:28 tron Exp $
DISTNAME= wireshark-1.2.8
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= http://www.wireshark.org/download/src/ \
${MASTER_SITE_SOURCEFORGE:=wireshark/}
diff -r 1cc19f653d62 -r c1c0e1ecc601 net/wireshark/PLIST
--- a/net/wireshark/PLIST Sat May 15 20:27:15 2010 +0000
+++ b/net/wireshark/PLIST Sat May 15 20:27:28 2010 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2010/04/08 10:03:31 adam Exp $
+@comment $NetBSD: PLIST,v 1.18 2010/05/15 20:27:28 tron Exp $
bin/capinfos
bin/dftest
bin/dumpcap
@@ -46,6 +46,7 @@
share/wireshark/capinfos.html
share/wireshark/cfilters
share/wireshark/colorfilters
+${PLIST.lua}share/wireshark/console.lua
share/wireshark/dfilters
share/wireshark/diameter/Ericsson.xml
share/wireshark/diameter/TGPPGmb.xml
@@ -63,6 +64,7 @@
share/wireshark/diameter/nasreq.xml
share/wireshark/diameter/sip.xml
share/wireshark/diameter/sunping.xml
+${PLIST.lua}share/wireshark/dtd_gen.lua
share/wireshark/dtds/dc.dtd
share/wireshark/dtds/itunes.dtd
share/wireshark/dtds/mscml.dtd
@@ -85,6 +87,7 @@
share/wireshark/help/overview.txt
share/wireshark/help/toc
share/wireshark/idl2wrs.html
+${PLIST.lua}share/wireshark/init.lua
share/wireshark/ipmap.html
share/wireshark/manuf
share/wireshark/mergecap.html
diff -r 1cc19f653d62 -r c1c0e1ecc601 net/wireshark/options.mk
--- a/net/wireshark/options.mk Sat May 15 20:27:15 2010 +0000
+++ b/net/wireshark/options.mk Sat May 15 20:27:28 2010 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.3 2010/04/08 10:03:31 adam Exp $
+# $NetBSD: options.mk,v 1.4 2010/05/15 20:27:28 tron Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.wireshark
-PKG_SUPPORTED_OPTIONS= gtk2
-PKG_SUGGESTED_OPTIONS= gtk2
+PKG_SUPPORTED_OPTIONS= gtk2 lua
+PKG_SUGGESTED_OPTIONS= gtk2 lua
.include "../../mk/bsd.options.mk"
@@ -16,3 +16,14 @@
.else
CONFIGURE_ARGS+= --disable-wireshark
.endif
+
+PLIST_VARS+= lua
+
+.if empty(PKG_OPTIONS:Mlua)
+CONFIGURE_ARGS+= --with-lua=no
+.else
+.include "../../lang/lua/buildlink3.mk"
+
+CONFIGURE_ARGS+= --with-lua=${BUILDLINK_PREFIX.lua}
+PLIST.lua= yes
+.endif
Home |
Main Index |
Thread Index |
Old Index