<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[144402] trunk/dports/net/wireshark/Portfile</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/144402">144402</a></dd>
<dt>Author</dt> <dd>ricci@macports.org</dd>
<dt>Date</dt> <dd>2016-01-07 13:42:08 -0800 (Thu, 07 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>net/wireshark:
reverting non-maintainer changes.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsnetwiresharkPortfile">trunk/dports/net/wireshark/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsnetwiresharkPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/wireshark/Portfile (144401 => 144402)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/wireshark/Portfile 2016-01-07 21:22:41 UTC (rev 144401)
+++ trunk/dports/net/wireshark/Portfile 2016-01-07 21:42:08 UTC (rev 144402)
</span><span class="lines">@@ -1,72 +1,75 @@
</span><del>-# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</del><span class="cx"> # $Id$
</span><span class="cx">
</span><del>-PortSystem 1.0
-name wireshark
-version 1.12.8
-revision 1
-categories net
-license {GPL-2 GPL-3}
-maintainers darkart.com:opendarwin.org
-description Graphical network analyzer and capture tool
-homepage http://wireshark.org/
-platforms darwin
</del><ins>+PortSystem 1.0
+name wireshark
+version 1.12.8
+revision 1
+categories net
+license {GPL-2 GPL-3}
+maintainers darkart.com:opendarwin.org
+description Graphical network analyzer and capture tool
+homepage http://wireshark.org/
+platforms darwin
</ins><span class="cx">
</span><del>-long_description A network analyzer that lets you capture and \
- interactively browse Ethernet frames. \
- Packet data can be read from a file, or live from a local \
- network interface.
</del><ins>+long_description A network analyzer that lets you capture and \
+ interactively browse Ethernet frames. \
+ Packet data can be read from a file, or live from a local \
+ network interface.
</ins><span class="cx">
</span><del>-master_sites http://www.wireshark.org/download/src/ \
- http://www.wireshark.org/download/src/all-versions/
</del><ins>+master_sites http://www.wireshark.org/download/src/ \
+ http://www.wireshark.org/download/src/all-versions/
</ins><span class="cx">
</span><del>-checksums md5 988a4595a4a87dafb3c4870ea40e89b5 \
</del><ins>+checksums md5 988a4595a4a87dafb3c4870ea40e89b5 \
</ins><span class="cx"> sha1 d8c23120525a2f3505e822b7684e7367bcd0ba70 \
</span><span class="cx"> rmd160 bf87fd1e3404d04f6123d09798b46ea5b2af49e9
</span><span class="cx">
</span><del>-use_bzip2 yes
</del><ins>+use_bzip2 yes
</ins><span class="cx">
</span><del>-conflicts wireshark-devel
</del><ins>+conflicts wireshark-devel
</ins><span class="cx">
</span><del>-patchfiles patch-configure.diff
</del><ins>+patchfiles patch-configure.diff
</ins><span class="cx">
</span><del>-depends_build port:pkgconfig
-depends_lib port:c-ares \
- port:gettext \
- port:kerberos5 \
- port:libcomerr \
- port:libgpg-error \
- path:lib/pkgconfig/glib-2.0.pc:glib2 \
- port:libpcap \
- port:zlib
</del><ins>+depends_build \
+ port:pkgconfig
+depends_lib \
+ port:c-ares \
+ port:gettext \
+ port:kerberos5 \
+ port:libcomerr \
+ port:libgpg-error \
+ path:lib/pkgconfig/glib-2.0.pc:glib2 \
+ port:libpcap \
+ port:zlib
</ins><span class="cx">
</span><del>-configure.args --disable-osx-deploy-target \
- --without-libsmi \
- --disable-usr-local \
- --without-adns \
- --with-c-ares=${prefix} \
- --without-geoip \
- --without-gnutls \
- --with-gcrypt=no \
- --without-lua \
- --disable-ipv6 \
- --with-pcap=${prefix} \
- --with-ssl=${prefix} \
- --with-zlib=${prefix} \
- --mandir=\\\${prefix}/share/man \
- --infodir=\\\${prefix}/share/info \
- --without-portaudio \
- --disable-warnings-as-errors \
- --with-krb5=${prefix} \
- --without-ssl \
- --disable-wireshark
</del><ins>+configure.args \
+ --disable-osx-deploy-target \
+ --without-libsmi \
+ --disable-usr-local \
+ --without-adns \
+ --with-c-ares=${prefix} \
+ --without-geoip \
+ --without-gnutls \
+ --with-gcrypt=no \
+ --without-lua \
+ --disable-ipv6 \
+ --with-pcap=${prefix} \
+ --with-ssl=${prefix} \
+ --with-zlib=${prefix} \
+ --mandir=\\\${prefix}/share/man \
+ --infodir=\\\${prefix}/share/info \
+ --without-portaudio \
+ --disable-warnings-as-errors \
+ --with-krb5=${prefix} \
+ --without-ssl \
+ --disable-wireshark
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> configure.ldflags-append "-Wl,-search_paths_first"
</span><span class="cx">
</span><span class="cx"> default_variants +gnutls +libgcrypt +ipv6 +libsmi +geoip +rtp +ssl
</span><span class="cx">
</span><span class="cx"> if {![variant_isset qt] && ![variant_isset gtk3]} {
</span><del>- default_variants +x11
</del><ins>+ default_variants +x11
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ## 1.10.0 doesn't include python options in configure
</span><span class="lines">@@ -75,149 +78,156 @@
</span><span class="cx"> ## } elseif {[variant_isset python26]} {
</span><span class="cx"> ## } elseif {[variant_isset python27]} {
</span><span class="cx"> ## } else {
</span><del>-## default_variants +no_python
</del><ins>+## default_variants +no_python
</ins><span class="cx"> ## }
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> pre-destroot {
</span><del>- xinstall -d ${destroot}${prefix}/include/wireshark/epan/crypt/
- xinstall -d ${destroot}${prefix}/include/wireshark/epan/dfilter/
- xinstall -d ${destroot}${prefix}/include/wireshark/epan/dissectors/
- xinstall -d ${destroot}${prefix}/include/wireshark/epan/ftypes/
- xinstall -d ${destroot}${prefix}/include/wireshark/wiretap/
- xinstall -m 644 -W ${worksrcpath}/ color.h config.h register.h ${destroot}${prefix}/include/wireshark/
- eval xinstall -m 644 [glob ${worksrcpath}/epan/*.h] ${destroot}${prefix}/include/wireshark/epan/
- eval xinstall -m 644 [glob ${worksrcpath}/epan/crypt/*.h] ${destroot}${prefix}/include/wireshark/epan/crypt/
- eval xinstall -m 644 [glob ${worksrcpath}/epan/dfilter/*.h] ${destroot}${prefix}/include/wireshark/epan/dfilter/
- eval xinstall -m 644 [glob ${worksrcpath}/epan/dissectors/*.h] ${destroot}${prefix}/include/wireshark/epan/dissectors/
- eval xinstall -m 644 [glob ${worksrcpath}/epan/ftypes/*.h] ${destroot}${prefix}/include/wireshark/epan/ftypes/
- eval xinstall -m 644 [glob ${worksrcpath}/wiretap/*.h] ${destroot}${prefix}/include/wireshark/wiretap/
</del><ins>+ xinstall -d ${destroot}${prefix}/include/wireshark/epan/crypt/
+ xinstall -d ${destroot}${prefix}/include/wireshark/epan/dfilter/
+ xinstall -d ${destroot}${prefix}/include/wireshark/epan/dissectors/
+ xinstall -d ${destroot}${prefix}/include/wireshark/epan/ftypes/
+ xinstall -d ${destroot}${prefix}/include/wireshark/wiretap/
+ xinstall -m 644 -W ${worksrcpath}/ color.h config.h register.h ${destroot}${prefix}/include/wireshark/
+ eval xinstall -m 644 [glob ${worksrcpath}/epan/*.h] ${destroot}${prefix}/include/wireshark/epan/
+ eval xinstall -m 644 [glob ${worksrcpath}/epan/crypt/*.h] ${destroot}${prefix}/include/wireshark/epan/crypt/
+ eval xinstall -m 644 [glob ${worksrcpath}/epan/dfilter/*.h] ${destroot}${prefix}/include/wireshark/epan/dfilter/
+ eval xinstall -m 644 [glob ${worksrcpath}/epan/dissectors/*.h] ${destroot}${prefix}/include/wireshark/epan/dissectors/
+ eval xinstall -m 644 [glob ${worksrcpath}/epan/ftypes/*.h] ${destroot}${prefix}/include/wireshark/epan/ftypes/
+ eval xinstall -m 644 [glob ${worksrcpath}/wiretap/*.h] ${destroot}${prefix}/include/wireshark/wiretap/
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if {[string match *llvm-gcc-4.2* ${configure.compiler}]} {
</span><del>- # see #32386
- configure.cflags -fno-var-tracking
</del><ins>+ # see #32386
+ configure.cflags -fno-var-tracking
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant adns description {use adns library for async. dns resolution instead of the default c-ares library} {
</span><del>- configure.args-delete --without-adns \
- --with-c-ares=${prefix}
- configure.args-append --with-adns=${prefix} \
- --without-c-ares
- depends_lib-append port:adns
- depends_lib-delete port:c-ares
</del><ins>+ configure.args-delete --without-adns \
+ --with-c-ares=${prefix}
+ configure.args-append --with-adns=${prefix} \
+ --without-c-ares
+ depends_lib-append port:adns
+ depends_lib-delete port:c-ares
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant gnutls {
</span><del>- configure.args-delete --without-gnutls
- configure.args-append --with-gnutls=yes
- depends_lib-append port:gnutls
</del><ins>+ configure.args-delete --without-gnutls
+ configure.args-append --with-gnutls=yes
+ depends_lib-append port:gnutls
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant libgcrypt {
</span><del>- configure.args-delete --with-gcrypt=no
- configure.args-append --with-libgcrypt-prefix=${prefix}
- depends_lib-append port:libgcrypt
</del><ins>+ configure.args-delete --with-gcrypt=no
+ configure.args-append --with-libgcrypt-prefix=${prefix}
+ depends_lib-append port:libgcrypt
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant ipv6 {
</span><del>- configure.args-delete --disable-ipv6
- configure.args-append --enable-ipv6
</del><ins>+ configure.args-delete --disable-ipv6
+ configure.args-append --enable-ipv6
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10881
</span><span class="cx"> #variant lua {
</span><del>-# configure.args-delete --without-lua
-# configure.args-append --with-lua=${prefix}
-# depends_lib-append port:lua
</del><ins>+# configure.args-delete --without-lua
+# configure.args-append --with-lua=${prefix}
+# depends_lib-append port:lua
</ins><span class="cx"> #}
</span><span class="cx">
</span><span class="cx"> variant libsmi {
</span><del>- configure.args-delete --without-libsmi
- configure.args-append --with-libsmi=${prefix}
- depends_lib-append port:libsmi
</del><ins>+ configure.args-delete --without-libsmi
+ configure.args-append --with-libsmi=${prefix}
+ depends_lib-append port:libsmi
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant geoip {
</span><del>- configure.args-delete --without-geoip
- configure.args-append --with-geoip=${prefix}
- depends_lib-append port:libgeoip
</del><ins>+ configure.args-delete --without-geoip
+ configure.args-append --with-geoip=${prefix}
+ depends_lib-append port:libgeoip
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ## 1.10.0 doesn't include python options in configure
</span><span class="cx"> ## variant python25 description {use python25 for the experimental python interface} conflicts no_python python26 python27 {
</span><del>-## configure.args-append --with-python=${prefix}
-## depends_lib-append port:python25
</del><ins>+## configure.args-append --with-python=${prefix}
+## depends_lib-append port:python25
</ins><span class="cx"> ## }
</span><del>-##
</del><ins>+##
</ins><span class="cx"> ## variant python26 description {use python26 for the experimental python interface} conflicts no_python python25 python27 {
</span><del>-## configure.args-append --with-python=${prefix}
-## depends_lib-append port:python26
</del><ins>+## configure.args-append --with-python=${prefix}
+## depends_lib-append port:python26
</ins><span class="cx"> ## }
</span><del>-##
</del><ins>+##
</ins><span class="cx"> ## variant python27 description {use python27 for the experimental python interface} conflicts no_python python25 python26 {
</span><del>-## configure.args-append --with-python=${prefix}/lib/wireshark/python/${version}
-## depends_lib-append port:python27
</del><ins>+## configure.args-append --with-python=${prefix}/lib/wireshark/python/${version}
+## depends_lib-append port:python27
</ins><span class="cx"> ## }
</span><del>-##
</del><ins>+##
</ins><span class="cx"> ## variant no_python description {do not build python interface} conflicts python25 python26 python27 {
</span><del>-## configure.args-append --without-python
</del><ins>+## configure.args-append --without-python
</ins><span class="cx"> ## }
</span><span class="cx">
</span><del>-variant qt description {use qt for the GUI} conflicts x11 gtk3 {
</del><ins>+variant qt description {use qt for the GUI} conflicts x11 gtk3 {
</ins><span class="cx"> ## qt 5.3.1 doesn't work at this point, wireshark needs to be adjusted for Qt 5.
</span><del>-## depends_lib-append port:qt5-mac
- PortGroup qt4 1.0
- configure.args-delete --disable-wireshark
- configure.args-append --with-qt=yes
- configure.args-append --with-gtk2=no
- configure.args-append --with-gtk3=no
</del><ins>+## depends_lib-append port:qt5-mac
+ PortGroup qt4 1.0
+ configure.args-delete --disable-wireshark
+ configure.args-append --with-qt=yes
+ configure.args-append --with-gtk2=no
+ configure.args-append --with-gtk3=no
</ins><span class="cx"> }
</span><span class="cx"> variant rtp description {add rtp support} {
</span><del>- configure.args-delete --without-portaudio
- configure.args-append --with-portaudio=${prefix}
- depends_lib-append port:portaudio
</del><ins>+ configure.args-delete --without-portaudio
+ configure.args-append --with-portaudio=${prefix}
+ depends_lib-append port:portaudio
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant ssl {
</span><del>- configure.args-delete --without-ssl
- depends_lib-append path:lib/libssl.dylib:openssl
</del><ins>+ configure.args-delete --without-ssl
+ depends_lib-append path:lib/libssl.dylib:openssl
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-## variant x11 conflicts qt {
-variant x11 description {use X11 (gtk2) for GUI} conflicts qt gtk3 {
- depends_lib-append port:gtk2 \
- port:atk \
- path:lib/pkgconfig/cairo.pc:cairo \
- port:fontconfig \
- port:freetype \
- port:gdk-pixbuf2 \
- path:lib/pkgconfig/pango.pc:pango \
- port:xorg-libX11 \
- port:xorg-libXcomposite \
- port:xorg-libXcursor \
- port:xorg-libXdamage \
- port:xorg-libXext \
- port:xorg-libXfixes \
- port:xorg-libXi \
- port:xorg-libXinerama \
- port:xorg-libXrandr \
- port:xrender
</del><ins>+## variant x11 conflicts qt {
+variant x11 description {use X11 (gtk2) for GUI} conflicts qt gtk3 {
+ depends_lib-append port:gtk2 \
+ port:atk \
+ path:lib/pkgconfig/cairo.pc:cairo \
+ port:fontconfig \
+ port:freetype \
+ port:gdk-pixbuf2 \
+ path:lib/pkgconfig/pango.pc:pango \
+ port:xorg-libX11 \
+ port:xorg-libXcomposite \
+ port:xorg-libXcursor \
+ port:xorg-libXdamage \
+ port:xorg-libXext \
+ port:xorg-libXfixes \
+ port:xorg-libXi \
+ port:xorg-libXinerama \
+ port:xorg-libXrandr \
+ port:xrender
</ins><span class="cx">
</span><del>- configure.args-delete --disable-wireshark
- configure.args-append --with-qt=no
- configure.args-append --with-gtk2=yes
- configure.args-append --with-gtk3=no
</del><ins>+ configure.args-delete --disable-wireshark
+ configure.args-append --with-qt=no
+ configure.args-append --with-gtk2=yes
+ configure.args-append --with-gtk3=no
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-variant gtk3 description {use X11 (gtk3) for GUI} conflicts qt x11 {
- depends_lib-append port:gtk3
- configure.args-delete --disable-wireshark
- configure.args-append --with-qt=no
- configure.args-append --with-gtk2=no
- configure.args-append --with-gtk3=yes
</del><ins>+variant gtk3 description {use X11 (gtk3) for GUI} conflicts qt x11 {
+ depends_lib-append port:gtk3
+ configure.args-delete --disable-wireshark
+ configure.args-append --with-qt=no
+ configure.args-append --with-gtk2=no
+ configure.args-append --with-gtk3=yes
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-livecheck.type regex
-livecheck.url ${homepage}download.html
-livecheck.regex "Stable Release \\((\\d+(?:\\.\\d+)*)"
</del><ins>+
+livecheck.type regex
+livecheck.url ${homepage}download.html
+livecheck.regex "Stable Release \\((\\d+(?:\\.\\d+)*)"
+#
+##EOF
+
+
+#
+##EOF
</ins></span></pre>
</div>
</div>
</body>
</html>