Revision: 144305 https://trac.macports.org/changeset/144305 Author: mojca@macports.org Date: 2016-01-06 04:09:25 -0800 (Wed, 06 Jan 2016) Log Message: ----------- wireshark: whitespace only Modified Paths: -------------- trunk/dports/net/wireshark/Portfile Modified: trunk/dports/net/wireshark/Portfile =================================================================== --- trunk/dports/net/wireshark/Portfile 2016-01-06 03:35:11 UTC (rev 144304) +++ trunk/dports/net/wireshark/Portfile 2016-01-06 12:09:25 UTC (rev 144305) @@ -1,75 +1,72 @@ +# -*- 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 # $Id$ -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 +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 -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. +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. -master_sites http://www.wireshark.org/download/src/ \ - http://www.wireshark.org/download/src/all-versions/ +master_sites http://www.wireshark.org/download/src/ \ + http://www.wireshark.org/download/src/all-versions/ -checksums md5 988a4595a4a87dafb3c4870ea40e89b5 \ +checksums md5 988a4595a4a87dafb3c4870ea40e89b5 \ sha1 d8c23120525a2f3505e822b7684e7367bcd0ba70 \ rmd160 bf87fd1e3404d04f6123d09798b46ea5b2af49e9 -use_bzip2 yes +use_bzip2 yes -conflicts wireshark-devel +conflicts wireshark-devel -patchfiles patch-configure.diff +patchfiles patch-configure.diff -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 +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 -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 +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 - configure.ldflags-append "-Wl,-search_paths_first" default_variants +gnutls +libgcrypt +ipv6 +libsmi +geoip +rtp +ssl if {![variant_isset qt] && ![variant_isset gtk3]} { - default_variants +x11 + default_variants +x11 } ## 1.10.0 doesn't include python options in configure @@ -78,156 +75,149 @@ ## } elseif {[variant_isset python26]} { ## } elseif {[variant_isset python27]} { ## } else { -## default_variants +no_python +## default_variants +no_python ## } pre-destroot { - 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/ + 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/ } if {[string match *llvm-gcc-4.2* ${configure.compiler}]} { - # see #32386 - configure.cflags -fno-var-tracking + # see #32386 + configure.cflags -fno-var-tracking } variant adns description {use adns library for async. dns resolution instead of the default c-ares library} { - 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 + 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 } variant gnutls { - configure.args-delete --without-gnutls - configure.args-append --with-gnutls=yes - depends_lib-append port:gnutls + configure.args-delete --without-gnutls + configure.args-append --with-gnutls=yes + depends_lib-append port:gnutls } variant libgcrypt { - configure.args-delete --with-gcrypt=no - configure.args-append --with-libgcrypt-prefix=${prefix} - depends_lib-append port:libgcrypt + configure.args-delete --with-gcrypt=no + configure.args-append --with-libgcrypt-prefix=${prefix} + depends_lib-append port:libgcrypt } variant ipv6 { - configure.args-delete --disable-ipv6 - configure.args-append --enable-ipv6 + configure.args-delete --disable-ipv6 + configure.args-append --enable-ipv6 } # https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10881 #variant lua { -# configure.args-delete --without-lua -# configure.args-append --with-lua=${prefix} -# depends_lib-append port:lua +# configure.args-delete --without-lua +# configure.args-append --with-lua=${prefix} +# depends_lib-append port:lua #} variant libsmi { - configure.args-delete --without-libsmi - configure.args-append --with-libsmi=${prefix} - depends_lib-append port:libsmi + configure.args-delete --without-libsmi + configure.args-append --with-libsmi=${prefix} + depends_lib-append port:libsmi } variant geoip { - configure.args-delete --without-geoip - configure.args-append --with-geoip=${prefix} - depends_lib-append port:libgeoip + configure.args-delete --without-geoip + configure.args-append --with-geoip=${prefix} + depends_lib-append port:libgeoip } ## 1.10.0 doesn't include python options in configure ## variant python25 description {use python25 for the experimental python interface} conflicts no_python python26 python27 { -## configure.args-append --with-python=${prefix} -## depends_lib-append port:python25 +## configure.args-append --with-python=${prefix} +## depends_lib-append port:python25 ## } -## +## ## variant python26 description {use python26 for the experimental python interface} conflicts no_python python25 python27 { -## configure.args-append --with-python=${prefix} -## depends_lib-append port:python26 +## configure.args-append --with-python=${prefix} +## depends_lib-append port: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} -## depends_lib-append port:python27 +## configure.args-append --with-python=${prefix}/lib/wireshark/python/${version} +## depends_lib-append port:python27 ## } -## +## ## variant no_python description {do not build python interface} conflicts python25 python26 python27 { -## configure.args-append --without-python +## configure.args-append --without-python ## } -variant qt description {use qt for the GUI} conflicts x11 gtk3 { +variant qt description {use qt for the GUI} conflicts x11 gtk3 { ## qt 5.3.1 doesn't work at this point, wireshark needs to be adjusted for Qt 5. -## 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 +## 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 } variant rtp description {add rtp support} { - configure.args-delete --without-portaudio - configure.args-append --with-portaudio=${prefix} - depends_lib-append port:portaudio + configure.args-delete --without-portaudio + configure.args-append --with-portaudio=${prefix} + depends_lib-append port:portaudio } variant ssl { - configure.args-delete --without-ssl - depends_lib-append path:lib/libssl.dylib:openssl + configure.args-delete --without-ssl + depends_lib-append path:lib/libssl.dylib:openssl } -## 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 +## 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 - configure.args-delete --disable-wireshark - configure.args-append --with-qt=no - configure.args-append --with-gtk2=yes - configure.args-append --with-gtk3=no + configure.args-delete --disable-wireshark + configure.args-append --with-qt=no + configure.args-append --with-gtk2=yes + configure.args-append --with-gtk3=no } -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 +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 } - -livecheck.type regex -livecheck.url ${homepage}download.html -livecheck.regex "Stable Release \\((\\d+(?:\\.\\d+)*)" -# -##EOF - - -# -##EOF +livecheck.type regex +livecheck.url ${homepage}download.html +livecheck.regex "Stable Release \\((\\d+(?:\\.\\d+)*)"