[106732] trunk/dports/net/wireshark/Portfile

ricci at macports.org ricci at macports.org
Thu Jun 6 14:24:28 PDT 2013


Revision: 106732
          https://trac.macports.org/changeset/106732
Author:   ricci at macports.org
Date:     2013-06-06 14:24:28 -0700 (Thu, 06 Jun 2013)
Log Message:
-----------
wireshark:
	resolve #39353 by removing python related variants as wireshark 1.10.0 does not build with python
	resolve #39367 by adding dependency on c-ares when built with +no_adns

Modified Paths:
--------------
    trunk/dports/net/wireshark/Portfile

Modified: trunk/dports/net/wireshark/Portfile
===================================================================
--- trunk/dports/net/wireshark/Portfile	2013-06-06 21:05:42 UTC (rev 106731)
+++ trunk/dports/net/wireshark/Portfile	2013-06-06 21:24:28 UTC (rev 106732)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 name		wireshark
 version		1.10.0
-revision	0
+revision	1
 categories	net
 license		{GPL-2 GPL-3}
 maintainers	darkart.com:opendarwin.org
@@ -67,13 +67,14 @@
 
 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
-}
+## 1.10.0 doesn't include python options in configure
+## if {[variant_isset no_python]} {
+## } elseif {[variant_isset python25]} {
+## } elseif {[variant_isset python26]} {
+## } elseif {[variant_isset python27]} {
+## } else {
+## 	default_variants +no_python
+## }
 
 
 pre-destroot {
@@ -103,6 +104,7 @@
 	configure.args-delete	--with-adns=${prefix} \
 							--without-c-ares
 	depends_lib-delete	port:adns
+	depends_lib-append	port:c-ares
 }
 
 variant no_gnutls {
@@ -140,25 +142,26 @@
 	depends_lib-delete	port:libgeoip
 }
 
-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
-}
+## 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
+## }
+## 
+## 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
+## }
+## 
+## 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
+## }
+## 
+## variant no_python description {do not build python interface} conflicts python25 python26 python27 {
+## 	configure.args-append	--without-python
+## }
 
-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
-}
-
-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
-}
-
-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}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130606/1c354e52/attachment.html>


More information about the macports-changes mailing list