Date: Wed, 3 Nov 2004 11:14:07 +0900 (JST) From: UMENO Takashi <umeno@rr.iij4u.or.jp> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/73438: Update port: net/ethereal to 0.10.7 Message-ID: <200411030214.iA32E7s8027419@belldandy.unnumbered.net> Resent-Message-ID: <200411030220.iA32KM1b098011@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 73438 >Category: ports >Synopsis: Update port: net/ethereal to 0.10.7 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Nov 03 02:20:22 GMT 2004 >Closed-Date: >Last-Modified: >Originator: UMENO Takashi >Release: FreeBSD 4.10-STABLE i386 >Organization: individual >Environment: System: FreeBSD belldandy.unnumbered.net 4.10-STABLE FreeBSD 4.10-STABLE #0: Thu Oct 14 22:42:47 JST 2004 umeno@belldandy.unnumbered.net:/usr/obj/usr/src/sys/SAKUYA22 i386 >Description: Update port: net/ethereal to 0.10.7 >How-To-Repeat: N/A >Fix: diff -urN ethereal.orig/Makefile ethereal/Makefile --- ethereal.orig/Makefile Sat Aug 14 16:46:44 2004 +++ ethereal/Makefile Wed Nov 3 10:29:49 2004 @@ -6,7 +6,7 @@ # PORTNAME= ethereal -PORTVERSION= 0.10.6 +PORTVERSION= 0.10.7 CATEGORIES= net ipv6 MASTER_SITES= ftp://ftp.ethereal.com/pub/ethereal/all-versions/ \ ftp://gd.tuwien.ac.at/infosys/security/ethereal/all-versions/ \ @@ -23,7 +23,7 @@ CONFIGURE_ARGS+= --program-transform-name="" INSTALLS_SHLIB= yes -.for x in capinfo editcap idl2eth mergecap text2pcap +.for x in capinfos editcap idl2eth mergecap text2pcap .if defined(LITE) PLIST_SUB+= ${x:U}="@comment $x not installed" CONFIGURE_ARGS+= --enable-$x=no diff -urN ethereal.orig/distinfo ethereal/distinfo --- ethereal.orig/distinfo Sat Aug 14 16:46:44 2004 +++ ethereal/distinfo Sun Oct 24 00:27:32 2004 @@ -1,2 +1,2 @@ -MD5 (ethereal-0.10.6.tar.bz2) = 722a2529c3a19b5b81c825bca444baea -SIZE (ethereal-0.10.6.tar.bz2) = 5046796 +MD5 (ethereal-0.10.7.tar.bz2) = eebd6cc45a45d68332b2c053aac0c484 +SIZE (ethereal-0.10.7.tar.bz2) = 5170212 diff -urN ethereal.orig/files/patch-configure ethereal/files/patch-configure --- ethereal.orig/files/patch-configure Sat Aug 14 16:46:44 2004 +++ ethereal/files/patch-configure Wed Nov 3 08:49:44 2004 @@ -1,24 +1,22 @@ ---- configure.orig Thu Aug 12 22:04:27 2004 -+++ configure Fri Aug 13 18:40:18 2004 -@@ -15934,7 +15934,7 @@ - KRB5_LIBS="-lkrb5 -lasn1 $SSL_LIBS -lroken -lcrypt -lresolv" - ethereal_save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -L$krb5_dir/lib" -- ac_krb5_version=`grep -i heimdal $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*heimdal.*$/HEIMDAL/i'` -+ ac_krb5_version=`grep -i heimdal $krb5_dir/include/krb5.h | head -n 1 | tr "[:lower:]" "[:upper:]" sed 's/^.*heimdal.*$/HEIMDAL/'` - else - # Extract the first word of "krb5-config", so it can be a program name with args. - set dummy krb5-config; ac_word=$2 -@@ -15977,10 +15977,10 @@ +--- configure.orig Thu Oct 21 11:50:23 2004 ++++ configure Wed Nov 3 08:48:56 2004 +@@ -16089,7 +16089,7 @@ + # + CFLAGS="$CFLAGS -I$krb5_dir/include" + CPPFLAGS="$CPPFLAGS -I$krb5_dir/include" +- ac_heimdal_version=`grep heimdal $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*heimdal.*$/HEIMDAL/'` ++ ac_heimdal_version=`grep -i heimdal $krb5_dir/include/krb5.h | head -n 1 | tr "[:lower:]" "[:upper:]" sed 's/^.*heimdal.*$/HEIMDAL/'` + ac_mit_version=`grep 'Massachusetts Institute of Technology' $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*Massachusetts Institute of Technology.*$/MIT/'` + ac_krb5_version="$ac_heimdal_version$ac_mit_version" + if test "x$ac_krb5_version" = "xHEIMDAL" +@@ -16147,8 +16147,8 @@ if test -x "$KRB5_CONFIG" then - KRB5_FLAGS=`"$KRB5_CONFIG" --cflags` +- KRB5_LIBS=`"$KRB5_CONFIG" --libs` + KRB5_FLAGS=`"$KRB5_CONFIG" --cflags | sed -e 's/@INCLUDE_des@//g'` - CFLAGS="$CFLAGS $KRB5_FLAGS" - CPPFLAGS="$CPPFLAGS $KRB5_FLAGS" -- KRB5_LIBS=`"$KRB5_CONFIG" --libs | sed 's/-lcrypto//'` + KRB5_LIBS=`"$KRB5_CONFIG" --libs | sed 's/-lcrypto//' | sed -e 's/@INCLUDE_des@//g'` - KRB5_LIBS="$KRB5_LIBS $SSL_LIBS" - # Looks like krb5-config is lacking -lresolv on some systems - echo "$as_me:$LINENO: checking whether library list looks OK" >&5 + CFLAGS="$CFLAGS $KRB5_FLAGS" + CPPFLAGS="$CPPFLAGS $KRB5_FLAGS" + # diff -urN ethereal.orig/pkg-plist ethereal/pkg-plist --- ethereal.orig/pkg-plist Sat Aug 14 16:46:44 2004 +++ ethereal/pkg-plist Wed Nov 3 10:52:25 2004 @@ -1,4 +1,4 @@ -%%CAPINFO%% +%%CAPINFOS%% bin/dftest %%EDITCAP%% %%ETHEREAL%% @@ -33,9 +33,10 @@ lib/libwiretap.so lib/libwiretap.so.0 share/ethereal/AUTHORS-SHORT -share/ethereal/capinfo.html +share/ethereal/capinfos.html share/ethereal/diameter/dictionary.dtd share/ethereal/diameter/dictionary.xml +share/ethereal/diameter/imscxdx.xml share/ethereal/diameter/mobileipv4.xml share/ethereal/diameter/nasreq.xml share/ethereal/diameter/sunping.xml @@ -49,7 +50,6 @@ share/ethereal/help/getting_started.txt share/ethereal/help/overview.txt share/ethereal/help/toc -share/ethereal/help/well_known.txt share/ethereal/idl2eth.html share/ethereal/manuf share/ethereal/mergecap.html >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200411030214.iA32E7s8027419>