[94583] trunk/dports/net/wireshark/Portfile
ricci at macports.org
ricci at macports.org
Fri Jun 22 21:53:30 PDT 2012
Revision: 94583
https://trac.macports.org/changeset/94583
Author: ricci at macports.org
Date: 2012-06-22 21:53:26 -0700 (Fri, 22 Jun 2012)
Log Message:
-----------
wireshark:
rev-bump to 1.8.0
invert most variants to be no_* so default build will have them
i.e. ipv6 is now included by default, +no_ipv6 turns off ipv6 support
remove +pcre as wireshark no longer builds with pcre (configure knows not of pcre)
add +geoip to include geoip lookups (note: requires installing geoip data, such as the GeoLiteCity port)
resolves #32168
Modified Paths:
--------------
trunk/dports/net/wireshark/Portfile
Modified: trunk/dports/net/wireshark/Portfile
===================================================================
--- trunk/dports/net/wireshark/Portfile 2012-06-23 04:17:29 UTC (rev 94582)
+++ trunk/dports/net/wireshark/Portfile 2012-06-23 04:53:26 UTC (rev 94583)
@@ -2,8 +2,8 @@
PortSystem 1.0
name wireshark
-version 1.6.8
-revision 1
+version 1.8.0
+revision 0
categories net
maintainers darkart.com:opendarwin.org
description Graphical network analyzer and capture tool
@@ -18,9 +18,9 @@
master_sites http://www.wireshark.org/download/src/ \
http://www.wireshark.org/download/src/all-versions/
-checksums md5 dcdc5f4904af5804b622c955a30974e2 \
- sha1 fb79058c66944581b822e4d8370848f953cfc9d4 \
- rmd160 858ee1bdcf61658356c1acd386135eb071205dd6
+checksums md5 3eca81253800a0089d0f957e75853b05 \
+ sha1 d45b2828fc6dfac697f752f146e6cf43f4776047 \
+ rmd160 944f2ef662fc432ce0ab22f9efd9195366fc1763
use_bzip2 yes
@@ -29,33 +29,48 @@
depends_build \
port:pkgconfig
depends_lib \
- port:bzip2 \
- port:c-ares \
+ port:adns \
+ port:libgcrypt \
+ port:libgeoip \
path:lib/pkgconfig/glib-2.0.pc:glib2 \
+ port:libsmi \
+ port:lua \
+ port:gnutls \
port:gtk2 \
port:openssl \
+ port:portaudio \
port:libpcap \
port:zlib
configure.args \
- --without-libsmi \
+ --with-libsmi=${prefix} \
--disable-usr-local \
- --without-adns \
- --with-c-ares=${prefix} \
- --without-pcre \
- --disable-ipv6 \
+ --with-adns=${prefix} \
+ --without-c-ares \
+ --with-geoip=${prefix} \
+ --with-gnutls=yes \
+ --with-libgcrypt-prefix=${prefix} \
+ --with-lua=${prefix} \
+ --enable-ipv6 \
--with-pcap=${prefix} \
--with-ssl=${prefix} \
--with-zlib=${prefix} \
--mandir=\\\${prefix}/share/man \
--infodir=\\\${prefix}/share/info \
- --without-portaudio \
- --disable-warnings-as-errors \
- --without-gnutls \
- --without-python
+ --with-portaudio=${prefix} \
+ --disable-warnings-as-errors
configure.ldflags-append "-Wl,-search_paths_first"
+if {[variant_isset no_python]} {
+} elseif {[variant_isset python25]} {
+} elseif {[variant_isset python26]} {
+} elseif {[variant_isset python27]} {
+} else {
+ default_variants +no_python
+}
+
+
pre-destroot {
xinstall -d ${destroot}${prefix}/include/wireshark/epan/crypt/
xinstall -d ${destroot}${prefix}/include/wireshark/epan/dfilter/
@@ -77,71 +92,74 @@
configure.cflags -fno-var-tracking
}
-variant adns description {use adns library for async. dns resolution instead of the default c-ares library} {
- configure.args-append --with-adns=${prefix} \
+variant no_adns description {don't use adns library for async. dns resolution instead of the default c-ares library} {
+ configure.args-append --without-adns \
+ --with-c-ares=${prefix}
+ configure.args-delete --with-adns=${prefix} \
--without-c-ares
- configure.args-delete --without-adns \
- --with-c-ares=${prefix}
- depends_lib-append port:adns
+ depends_lib-delete port:adns
}
-variant gnutls {
- configure.args-append --with-gnutls=yes
- depends_lib-append port:gnutls
+variant no_gnutls {
+ configure.args-append --without-gnutls
+ configure.args-delete --with-gnutls=yes
+ depends_lib-delete port:gnutls
}
-variant libgcrypt {
- configure.args-append --with-libgcrypt-prefix=${prefix}
- depends_lib-append port:libgcrypt
+variant no_libgcrypt {
+ configure.args-append --with-gcrypt=no
+ configure.args-delete --with-libgcrypt-prefix=${prefix}
+ depends_lib-delete port:libgcrypt
}
-variant ipv6 {
- configure.args-append --enable-ipv6
- configure.args-delete --disable-ipv6
+variant no_ipv6 {
+ configure.args-append --disable-ipv6
+ configure.args-delete --enable-ipv6
}
-variant lua {
- configure.args-delete --without-lua
- configure.args-append --with-lua=${prefix}
- depends_lib-append port:lua
+variant no_lua {
+ configure.args-append --without-lua
+ configure.args-delete --with-lua=${prefix}
+ depends_lib-delete port:lua
}
-variant libsmi {
- configure.args-append --with-libsmi=${prefix}
- configure.args-delete --without-libsmi
- depends_lib-append port:libsmi
+variant no_libsmi {
+ configure.args-append --without-libsmi
+ configure.args-delete --with-libsmi=${prefix}
+ depends_lib-delete port:libsmi
}
-variant pcre {
- configure.args-append --with-pcre=${prefix}
- configure.args-delete --without-pcre
- depends_lib-append port:pcre
+variant no_geoip {
+ configure.args-append --without-geoip
+ configure.args-delete --with-geoip=${prefix}
+ depends_lib-delete port:libgeoip
}
-variant python25 description {use python25 for the experimental python interface} conflicts python26 python27 {
+variant python25 description {use python25 for the experimental python interface} conflicts no_python python26 python27 {
configure.args-append --with-python=${prefix}
- configure.args-delete --without-python
depends_lib-append port:python25
}
-variant python26 description {use python26 for the experimental python interface} conflicts python25 python27 {
+variant python26 description {use python26 for the experimental python interface} conflicts no_python python25 python27 {
configure.args-append --with-python=${prefix}
- configure.args-delete --without-python
depends_lib-append port:python26
}
-variant python27 description {use python27 for the experimental python interface} conflicts python25 python26 {
+variant python27 description {use python27 for the experimental python interface} conflicts no_python python25 python26 {
configure.args-append --with-python=${prefix}/lib/wireshark/python/${version}
- configure.args-delete --without-python
depends_lib-append port:python27
}
-variant rtp description {add rtp support with portaudio} {
- configure.args-append --with-portaudio=${prefix}
- configure.args-delete --without-portaudio
- depends_lib-append port:portaudio
+variant no_python description {do not build python interface} conflicts python25 python26 python27 {
+ configure.args-append --without-python
}
+variant no_rtp description {remove rtp support} {
+ configure.args-append --without-portaudio
+ configure.args-delete --with-portaudio=${prefix}
+ depends_lib-delete port:portaudio
+}
+
variant no_ssl {
configure.args-append --without-ssl
depends_lib-delete port:openssl
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120622/13357244/attachment-0001.html>
More information about the macports-changes
mailing list