diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile index bba77c96ce4..da674e5766f 100644 --- a/net/ethereal/Makefile +++ b/net/ethereal/Makefile @@ -1,12 +1,6 @@ -# Ports collection makefile for: ethereal -# Version required: 0.3.16 -# Date created: 8 Sep 1998 -# Whom: Jakob Schlyter -# More information: http://ethereal.zing.org/ - -# What port/package will be created +# $OpenBSD: Makefile,v 1.2 1999/01/30 20:12:21 marc Exp $ # -DISTNAME= ethereal-0.3.16 +DISTNAME= ethereal-0.5.1 CATEGORIES= net x11 # where to send comments about this port @@ -30,4 +24,9 @@ LIB_DEPENDS= gtk\\.1\\.:${PORTSDIR}/x11/gtk+ USE_X11= yes GNU_CONFIGURE= yes +# Ethereal puts what should be a shared data file in the "sysconfdir" +# I'm moving it to "${RREFIX}/share/ethereal" +# +CONFIGURE_ARGS= --sysconfdir="${PREFIX}/share/ethereal" + .include diff --git a/net/ethereal/files/md5 b/net/ethereal/files/md5 index 1fbe960c1eb..5f8522d9818 100644 --- a/net/ethereal/files/md5 +++ b/net/ethereal/files/md5 @@ -1 +1 @@ -MD5 (ethereal-0.3.16.tar.gz) = 49700f2373486e3f3324938acfe7e3ba +MD5 (ethereal-0.5.1.tar.gz) = 0cb4499458fb7d20950e704486921c63 diff --git a/net/ethereal/patches/patch-aa b/net/ethereal/patches/patch-aa index fc0c52ca345..93c54deb60c 100644 --- a/net/ethereal/patches/patch-aa +++ b/net/ethereal/patches/patch-aa @@ -1,19 +1,11 @@ -*** packet.c.orig Sat Sep 5 22:23:47 1998 ---- packet.c Tue Sep 8 18:48:45 1998 -*************** -*** 209,215 **** - case DLT_IEEE802 : - dissect_tr(pd, fd, tree); - break; -! case DLT_RAW : - dissect_raw(pd, fd, tree); - break; - } ---- 209,215 ---- - case DLT_IEEE802 : - dissect_tr(pd, fd, tree); - break; -! case DLT_LOOP : - dissect_raw(pd, fd, tree); - break; - } +--- packet.c.orig Sat Jan 2 22:22:32 1999 ++++ packet.c Wed Jan 20 01:09:46 1999 +@@ -401,7 +401,7 @@ + case DLT_PPP : + dissect_ppp(pd, fd, tree); + break; +- case DLT_RAW : ++ case DLT_LOOP : + dissect_raw(pd, fd, tree); + break; + } diff --git a/net/ethereal/patches/patch-ab b/net/ethereal/patches/patch-ab index bff9cb7224f..7d6d727bc37 100644 --- a/net/ethereal/patches/patch-ab +++ b/net/ethereal/patches/patch-ab @@ -1,6 +1,6 @@ ---- ethereal.c.~1~ Wed Sep 16 20:12:38 1998 -+++ ethereal.c Tue Sep 22 12:25:51 1998 -@@ -122,8 +122,21 @@ +--- ethereal.c.orig Tue Dec 29 05:08:17 1998 ++++ ethereal.c Wed Jan 20 01:10:24 1999 +@@ -163,8 +163,21 @@ /* reload so it goes in effect. Also we set data_out_file which tells the tcp code to output the data */ close_cap_file( &cf, info_bar, file_ctx); diff --git a/net/ethereal/pkg/PLIST b/net/ethereal/pkg/PLIST index e1c2494708c..326ecaf687b 100644 --- a/net/ethereal/pkg/PLIST +++ b/net/ethereal/pkg/PLIST @@ -1,2 +1,4 @@ bin/ethereal man/man1/ethereal.1 +share/ethereal/manuf +@dirrm share/ethereal