Attachment 64973 Details for Bug 96425 – file.diff

[patch] file.diff

file.diff (text/plain), 8.90 KB, created by Wesley Shields on 2006-04-27 19:20:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Wesley Shields

Created: 2006-04-27 19:20:04 UTC

Size: 8.90 KB

patch

obsolete

>diff -ruN net/netdude.orig/Makefile net/netdude/Makefile
>--- net/netdude.orig/Makefile	Tue Mar  7 03:27:07 2006
>+++ net/netdude/Makefile	Thu Apr 27 12:20:10 2006
>@@ -7,13 +7,12 @@
> #
> 
> PORTNAME=	netdude
>-PORTVERSION=	0.4.5
>-PORTREVISION=	1
>+PORTVERSION=	0.4.6
> CATEGORIES=	net
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	${PORTNAME}
> 
>-MAINTAINER=	yb@bashibuzuk.net
>+MAINTAINER=	wxs@csh.rit.edu
> COMMENT=	NETwork DUmp data Displayer and Editor for tcpdump tracefiles
> 
> LIB_DEPENDS=	netdude.0:${PORTSDIR}/net/libnetdude
>@@ -27,7 +26,7 @@
> USE_GMAKE=	yes
> USE_GNOME=	glib12 gtk12
> INSTALLS_SHLIB=	yes
>-USE_REINPLACE=	yes
>+USE_LIBTOOL_VER=	15
> 
> MAN1=	netdude.1
> 
>diff -ruN net/netdude.orig/distinfo net/netdude/distinfo
>--- net/netdude.orig/distinfo	Sun Jan 22 16:23:18 2006
>+++ net/netdude/distinfo	Wed Apr 26 14:57:56 2006
>@@ -1,3 +1,3 @@
>-MD5 (netdude-0.4.5.tar.gz) = b53832fe2bf3772b00e7e0ad9ff50c3c
>-SHA256 (netdude-0.4.5.tar.gz) = 5bf490249f951013ca0efd21a3d8d99a1630c92397bef932492d2c738d88aba4
>-SIZE (netdude-0.4.5.tar.gz) = 1291820
>+MD5 (netdude-0.4.6.tar.gz) = db4f36c484c57f856a73d5019714b7b0
>+SHA256 (netdude-0.4.6.tar.gz) = 0690316f40bdc837751ae1e8a74f63a3f6c2dafbd12a660ced3eb9606432c142
>+SIZE (netdude-0.4.6.tar.gz) = 1159507
>diff -ruN net/netdude.orig/files/patch-Makefile.in net/netdude/files/patch-Makefile.in
>--- net/netdude.orig/files/patch-Makefile.in	Tue May  4 02:47:18 2004
>+++ net/netdude/files/patch-Makefile.in	Thu Apr 27 07:47:57 2006
>@@ -1,11 +1,11 @@
>---- Makefile.in.orig	Wed Feb  4 13:46:55 2004
>-+++ Makefile.in	Wed Feb  4 13:47:24 2004
>-@@ -116,7 +116,7 @@
>+--- Makefile.in.orig	Thu Apr 27 07:47:39 2006
>++++ Makefile.in	Thu Apr 27 07:47:47 2006
>+@@ -94,7 +94,7 @@
>  lndtool = @lndtool@
>  version_major = @version_major@
>  version_minor = @version_minor@
>--SUBDIRS = libltdl src plugins protocols intl po pixmaps doc m4
>-+SUBDIRS = src plugins protocols intl po pixmaps doc m4
>+-SUBDIRS = libltdl src plugins protocols pixmaps doc
>++SUBDIRS = src plugins protocols pixmaps doc
>  
>  MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
>                         config.h.in config.sub configure install-sh \
>diff -ruN net/netdude.orig/files/patch-configure net/netdude/files/patch-configure
>--- net/netdude.orig/files/patch-configure	Sun Oct 13 09:11:31 2002
>+++ net/netdude/files/patch-configure	Thu Apr 27 07:48:30 2006
>@@ -1,6 +1,6 @@
>---- configure.orig	Fri Oct 11 23:43:36 2002
>-+++ configure	Fri Oct 11 23:44:16 2002
>-@@ -418,7 +418,7 @@
>+--- configure.orig	Thu Apr 27 07:48:08 2006
>++++ configure	Thu Apr 27 07:48:23 2006
>+@@ -430,7 +430,7 @@
>  PACKAGE_BUGREPORT=
>  
>  ac_unique_file="src/nd.h"
>@@ -9,12 +9,3 @@
>  # Factoring default headers for most tests.
>  ac_includes_default="\
>  #include <stdio.h>
>-@@ -2634,7 +2634,7 @@
>- 
>- 
>- 
>--subdirs="$subdirs libltdl"
>-+subdirs="$subdirs"
>- 
>- 
>- 
>diff -ruN net/netdude.orig/files/patch-src::Makefile.in net/netdude/files/patch-src::Makefile.in
>--- net/netdude.orig/files/patch-src::Makefile.in	Tue May  4 02:47:18 2004
>+++ net/netdude/files/patch-src::Makefile.in	Thu Apr 27 09:43:49 2006
>@@ -1,6 +1,6 @@
>---- src/Makefile.in.orig	Sun Jan 25 21:02:59 2004
>-+++ src/Makefile.in	Sun Jan 25 21:03:36 2004
>-@@ -196,8 +196,7 @@
>+--- src/Makefile.in.orig	Thu Apr 27 09:43:27 2006
>++++ src/Makefile.in	Thu Apr 27 09:43:39 2006
>+@@ -171,8 +171,7 @@
>  	gtkhex.c gtkhex.h
>  
>  
>@@ -10,7 +10,7 @@
>  
>  subdir = src
>  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
>-@@ -218,7 +217,6 @@
>+@@ -193,7 +192,6 @@
>  	callbacks.$(OBJEXT) interface.$(OBJEXT) support.$(OBJEXT) \
>  	gtkhex.$(OBJEXT)
>  netdude_OBJECTS = $(am_netdude_OBJECTS)
>diff -ruN net/netdude.orig/pkg-plist net/netdude/pkg-plist
>--- net/netdude.orig/pkg-plist	Tue May  4 02:47:18 2004
>+++ net/netdude/pkg-plist	Thu Apr 27 09:55:28 2006
>@@ -59,6 +59,7 @@
> %%PORTDOCS%%%%DOCSDIR%%/a5243.html
> %%PORTDOCS%%%%DOCSDIR%%/a5244.html
> %%PORTDOCS%%%%DOCSDIR%%/a5246.html
>+%%PORTDOCS%%%%DOCSDIR%%/a5397.html
> %%PORTDOCS%%%%DOCSDIR%%/api.html
> %%PORTDOCS%%%%DOCSDIR%%/b5232.html
> %%PORTDOCS%%%%DOCSDIR%%/b5234.html
>@@ -73,8 +74,10 @@
> %%PORTDOCS%%%%DOCSDIR%%/b5255.html
> %%PORTDOCS%%%%DOCSDIR%%/b5256.html
> %%PORTDOCS%%%%DOCSDIR%%/b5258.html
>+%%PORTDOCS%%%%DOCSDIR%%/b5409.html
> %%PORTDOCS%%%%DOCSDIR%%/c101.html
> %%PORTDOCS%%%%DOCSDIR%%/c102.html
>+%%PORTDOCS%%%%DOCSDIR%%/c105.html
> %%PORTDOCS%%%%DOCSDIR%%/c20.html
> %%PORTDOCS%%%%DOCSDIR%%/c261.html
> %%PORTDOCS%%%%DOCSDIR%%/c267.html
>@@ -90,10 +93,12 @@
> %%PORTDOCS%%%%DOCSDIR%%/c314.html
> %%PORTDOCS%%%%DOCSDIR%%/c317.html
> %%PORTDOCS%%%%DOCSDIR%%/c448.html
>+%%PORTDOCS%%%%DOCSDIR%%/c455.html
> %%PORTDOCS%%%%DOCSDIR%%/c61.html
> %%PORTDOCS%%%%DOCSDIR%%/c67.html
> %%PORTDOCS%%%%DOCSDIR%%/c69.html
> %%PORTDOCS%%%%DOCSDIR%%/c70.html
>+%%PORTDOCS%%%%DOCSDIR%%/c71.html
> %%PORTDOCS%%%%DOCSDIR%%/c89.html
> %%PORTDOCS%%%%DOCSDIR%%/c93.html
> %%PORTDOCS%%%%DOCSDIR%%/c95.html
>@@ -130,50 +135,50 @@
> %%PORTDOCS%%%%DOCSDIR%%/netdude-nd-trace-area-gui.html
> %%PORTDOCS%%%%DOCSDIR%%/netdude-nd-trace-registry.html
> %%PORTDOCS%%%%DOCSDIR%%/stylesheet.css
>-share/netdude/0.4/plugins/nd_cksumfix.so
>-share/netdude/0.4/plugins/nd_cksumfix.la
>-share/netdude/0.4/plugins/nd_cksumfix.a
>-share/netdude/0.4/plugins/nd_bpf.so
>-share/netdude/0.4/plugins/nd_bpf.la
>-share/netdude/0.4/plugins/nd_bpf.a
>-share/netdude/0.4/protocols/nd_arp.so
>-share/netdude/0.4/protocols/nd_arp.la
>-share/netdude/0.4/protocols/nd_arp.a
>-share/netdude/0.4/protocols/nd_ethernet.so
>-share/netdude/0.4/protocols/nd_ethernet.la
>-share/netdude/0.4/protocols/nd_ethernet.a
>-share/netdude/0.4/protocols/nd_fddi.so
>-share/netdude/0.4/protocols/nd_fddi.la
>-share/netdude/0.4/protocols/nd_fddi.a
>-share/netdude/0.4/protocols/nd_icmp.so
>-share/netdude/0.4/protocols/nd_icmp.la
>-share/netdude/0.4/protocols/nd_icmp.a
>-share/netdude/0.4/protocols/nd_ip.so
>-share/netdude/0.4/protocols/nd_ip.la
>-share/netdude/0.4/protocols/nd_ip.a
>-share/netdude/0.4/protocols/nd_sll.so
>-share/netdude/0.4/protocols/nd_sll.la
>-share/netdude/0.4/protocols/nd_sll.a
>-share/netdude/0.4/protocols/nd_snap.so
>-share/netdude/0.4/protocols/nd_snap.la
>-share/netdude/0.4/protocols/nd_snap.a
>-share/netdude/0.4/protocols/nd_tcp.so
>-share/netdude/0.4/protocols/nd_tcp.la
>-share/netdude/0.4/protocols/nd_tcp.a
>-share/netdude/0.4/protocols/nd_udp.so
>-share/netdude/0.4/protocols/nd_udp.la
>-share/netdude/0.4/protocols/nd_udp.a
>-share/netdude/0.4/pixmaps/incomplete.xpm
>-share/netdude/0.4/pixmaps/delete.xpm
>-share/netdude/0.4/pixmaps/delete_okay.xpm
>-share/netdude/0.4/pixmaps/question.xpm
>-share/netdude/0.4/pixmaps/exclamation.xpm
>-share/netdude/0.4/pixmaps/netdude_small.xpm
>-share/netdude/0.4/pixmaps/netdude_splash.xpm
>-share/netdude/0.4/pixmaps/apply_to_all.xpm
>-share/netdude/0.4/pixmaps/apply_to_part.xpm
>-share/netdude/0.4/pixmaps/apply_to_sel.xpm
>-share/netdude/0.4/pixmaps/netdude-icon.png
>+%%DATADIR%%/0.4/plugins/nd_cksumfix.so
>+%%DATADIR%%/0.4/plugins/nd_cksumfix.la
>+%%DATADIR%%/0.4/plugins/nd_cksumfix.a
>+%%DATADIR%%/0.4/plugins/nd_bpf.so
>+%%DATADIR%%/0.4/plugins/nd_bpf.la
>+%%DATADIR%%/0.4/plugins/nd_bpf.a
>+%%DATADIR%%/0.4/protocols/nd_arp.so
>+%%DATADIR%%/0.4/protocols/nd_arp.la
>+%%DATADIR%%/0.4/protocols/nd_arp.a
>+%%DATADIR%%/0.4/protocols/nd_ethernet.so
>+%%DATADIR%%/0.4/protocols/nd_ethernet.la
>+%%DATADIR%%/0.4/protocols/nd_ethernet.a
>+%%DATADIR%%/0.4/protocols/nd_fddi.so
>+%%DATADIR%%/0.4/protocols/nd_fddi.la
>+%%DATADIR%%/0.4/protocols/nd_fddi.a
>+%%DATADIR%%/0.4/protocols/nd_icmp.so
>+%%DATADIR%%/0.4/protocols/nd_icmp.la
>+%%DATADIR%%/0.4/protocols/nd_icmp.a
>+%%DATADIR%%/0.4/protocols/nd_ip.so
>+%%DATADIR%%/0.4/protocols/nd_ip.la
>+%%DATADIR%%/0.4/protocols/nd_ip.a
>+%%DATADIR%%/0.4/protocols/nd_sll.so
>+%%DATADIR%%/0.4/protocols/nd_sll.la
>+%%DATADIR%%/0.4/protocols/nd_sll.a
>+%%DATADIR%%/0.4/protocols/nd_snap.so
>+%%DATADIR%%/0.4/protocols/nd_snap.la
>+%%DATADIR%%/0.4/protocols/nd_snap.a
>+%%DATADIR%%/0.4/protocols/nd_tcp.so
>+%%DATADIR%%/0.4/protocols/nd_tcp.la
>+%%DATADIR%%/0.4/protocols/nd_tcp.a
>+%%DATADIR%%/0.4/protocols/nd_udp.so
>+%%DATADIR%%/0.4/protocols/nd_udp.la
>+%%DATADIR%%/0.4/protocols/nd_udp.a
>+%%DATADIR%%/0.4/pixmaps/incomplete.xpm
>+%%DATADIR%%/0.4/pixmaps/delete.xpm
>+%%DATADIR%%/0.4/pixmaps/delete_okay.xpm
>+%%DATADIR%%/0.4/pixmaps/question.xpm
>+%%DATADIR%%/0.4/pixmaps/exclamation.xpm
>+%%DATADIR%%/0.4/pixmaps/netdude_small.xpm
>+%%DATADIR%%/0.4/pixmaps/netdude_splash.xpm
>+%%DATADIR%%/0.4/pixmaps/apply_to_all.xpm
>+%%DATADIR%%/0.4/pixmaps/apply_to_part.xpm
>+%%DATADIR%%/0.4/pixmaps/apply_to_sel.xpm
>+%%DATADIR%%/0.4/pixmaps/netdude-icon.png
> @dirrm include/netdude/0.4/protocols/fddi
> @dirrm include/netdude/0.4/protocols/snap
> @dirrm include/netdude/0.4/protocols
>@@ -181,8 +186,8 @@
> @dirrm include/netdude
> %%PORTDOCS%%@dirrm %%DOCSDIR%%/images
> %%PORTDOCS%%@dirrm %%DOCSDIR%%
>-@dirrm share/netdude/0.4/plugins
>-@dirrm share/netdude/0.4/protocols
>-@dirrm share/netdude/0.4/pixmaps
>-@dirrm share/netdude/0.4
>-@dirrm share/netdude
>+@dirrm %%DATADIR%%/0.4/plugins
>+@dirrm %%DATADIR%%/0.4/protocols
>+@dirrm %%DATADIR%%/0.4/pixmaps
>+@dirrm %%DATADIR%%/0.4
>+@dirrm %%DATADIR%%
>--------------------------- END NETDUDE PATCH -----------------------

Actions: View | Diff

Attachments on bug 96425: 64973 | 64974 | 64975