[102550] trunk/dports/net/wireshark

[ricci at macports.org]

Revision: 102550
          https://trac.macports.org/changeset/102550
Author:   ricci at macports.org
Date:     2013-02-04 11:11:56 -0800 (Mon, 04 Feb 2013)
Log Message:
-----------
wireshark:
	add patch to configure (files/patch-configure.diff) to find 'Massachusetts Institute of Technology' in krb5 header file even if line-wrapped
	bump revision just in case somebody got it installed

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

Added Paths:
-----------
    trunk/dports/net/wireshark/files/patch-configure.diff

Modified: trunk/dports/net/wireshark/Portfile
===================================================================
--- trunk/dports/net/wireshark/Portfile	2013-02-04 18:46:03 UTC (rev 102549)
+++ trunk/dports/net/wireshark/Portfile	2013-02-04 19:11:56 UTC (rev 102550)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 name		wireshark
 version		1.8.5
-revision	0
+revision	1
 categories	net
 license		{GPL-2 GPL-3}
 maintainers	darkart.com:opendarwin.org
@@ -27,7 +27,7 @@
 
 conflicts	wireshark-devel
 
-## patchfiles	patch-epan-dissectors-pacet-dtls.c.diff
+patchfiles	patch-configure.diff
 
 depends_build 		\
 		port:pkgconfig

Added: trunk/dports/net/wireshark/files/patch-configure.diff
===================================================================
--- trunk/dports/net/wireshark/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/net/wireshark/files/patch-configure.diff	2013-02-04 19:11:56 UTC (rev 102550)
@@ -0,0 +1,14 @@
+--- configure.b	2013-01-29 10:27:10.000000000 -0800
++++ configure	2013-02-04 10:42:55.000000000 -0800
+@@ -26489,8 +26489,9 @@
+ 	  CPPFLAGS="$CPPFLAGS -I$krb5_dir/include"
+ 	  ac_heimdal_version=`grep heimdal $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*heimdal.*$/HEIMDAL/'`
+ 	  # MIT Kerberos moved krb5.h to krb5/krb5.h starting with release 1.5
+-	  ac_mit_version_olddir=`grep 'Massachusetts Institute of Technology' $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*Massachusetts Institute of Technology.*$/MIT/'`
+-	  ac_mit_version_newdir=`grep 'Massachusetts Institute of Technology' $krb5_dir/include/krb5/krb5.h | head -n 1 | sed 's/^.*Massachusetts Institute of Technology.*$/MIT/'`
++
++	  ac_mit_version_olddir=`head -20 "$krb5_dir/include/krb5.h" | perl -e 'while (<>) {$line = $_; chomp $line; $allLines .= " $line";} if ($allLines =~ /Massachusetts.*Institute of Technology/s) {print "MIT";}'`
++	  ac_mit_version_newdir=`head -20 "$krb5_dir/include/krb5/krb5.h" | perl -e 'while (<>) {$line = $_; chomp $line; $allLines .= " $line";} if ($allLines =~ /Massachusetts.*Institute of Technology/s) {print "MIT";}'`
+ 	  ac_krb5_version="$ac_heimdal_version$ac_mit_version_olddir$ac_mit_version_newdir"
+ 	  if test "x$ac_krb5_version" = "xHEIMDAL"
+ 	  then
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130204/6f8134a8/attachment.html>