packages: netdude/netdude-am.patch, netdude/netdude-paths.patch - updated f...
lisu
lisu at pld-linux.org
Tue Sep 15 13:00:11 CEST 2009
Author: lisu Date: Tue Sep 15 11:00:11 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- updated for 0.5.0
---- Files affected:
packages/netdude:
netdude-am.patch (1.1 -> 1.2) , netdude-paths.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: packages/netdude/netdude-am.patch
diff -u packages/netdude/netdude-am.patch:1.1 packages/netdude/netdude-am.patch:1.2
--- packages/netdude/netdude-am.patch:1.1 Wed Jun 25 20:10:03 2003
+++ packages/netdude/netdude-am.patch Tue Sep 15 13:00:06 2009
@@ -1,147 +1,171 @@
-diff -Naur netdude-0.3.3/Makefile.am netdude-0.3.3-p/Makefile.am
---- netdude-0.3.3/Makefile.am Thu Oct 24 12:10:50 2002
-+++ netdude-0.3.3-p/Makefile.am Wed Jun 25 18:20:36 2003
+--- netdude-0.5.0/Makefile.am~ 2005-05-03 23:53:10.000000000 +0200
++++ netdude-0.5.0/Makefile.am 2009-09-14 14:55:44.000000000 +0200
@@ -1,4 +1,4 @@
--SUBDIRS = libltdl src plugins protocols intl po pixmaps doc
-+SUBDIRS = src plugins protocols intl po pixmaps doc
+-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 -Naur netdude-0.3.3/plugins/Makefile.am netdude-0.3.3-p/plugins/Makefile.am
---- netdude-0.3.3/plugins/Makefile.am Thu Oct 17 19:42:49 2002
-+++ netdude-0.3.3-p/plugins/Makefile.am Wed Jun 25 18:39:19 2003
-@@ -7,7 +7,7 @@
+--- netdude-0.5.0/plugins/ChecksumFix/Makefile.am~ 2005-03-17 15:09:45.000000000 +0100
++++ netdude-0.5.0/plugins/ChecksumFix/Makefile.am 2009-09-14 14:59:37.000000000 +0200
+@@ -5,7 +5,7 @@
LIBS =
- LDFLAGS = -L$(top_srcdir)/src
--INCLUDES = @GTK_CFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_builddir)/include
-+INCLUDES = @GTK_CFLAGS@ -I$(top_srcdir) -I$(top_builddir)/include
-
- pkgdir = $(pkgdatadir)/plugins
-
-diff -Naur netdude-0.3.3/protocols/arp/Makefile.am netdude-0.3.3-p/protocols/arp/Makefile.am
---- netdude-0.3.3/protocols/arp/Makefile.am Sun Sep 22 19:26:21 2002
-+++ netdude-0.3.3-p/protocols/arp/Makefile.am Wed Jun 25 18:40:54 2003
-@@ -4,7 +4,7 @@
- MAINTAINERCLEANFILES = Makefile.in
-
- LDFLAGS = -L$(top_srcdir)/src
--INCLUDES = @GTK_CFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_builddir)/include -W -Wall
-+INCLUDES = @GTK_CFLAGS@ -I$(top_srcdir) -I$(top_builddir)/include -W -Wall
-
- pkgdir = $(pkgdatadir)/protocols
- pkgincludedir = $(includedir)/netdude/protocols/arp
-diff -Naur netdude-0.3.3/protocols/ether/Makefile.am netdude-0.3.3-p/protocols/ether/Makefile.am
---- netdude-0.3.3/protocols/ether/Makefile.am Sun Sep 22 19:25:58 2002
-+++ netdude-0.3.3-p/protocols/ether/Makefile.am Wed Jun 25 18:40:02 2003
-@@ -6,7 +6,7 @@
- MAINTAINERCLEANFILES = Makefile.in
-
- LDFLAGS = -L$(top_srcdir)/src
--INCLUDES = @GTK_CFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_builddir)/include -W -Wall
-+INCLUDES = @GTK_CFLAGS@ -I$(top_srcdir) -I$(top_builddir)/include -W -Wall
-
- pkgdir = $(pkgdatadir)/protocols
-
-diff -Naur netdude-0.3.3/protocols/fddi/Makefile.am netdude-0.3.3-p/protocols/fddi/Makefile.am
---- netdude-0.3.3/protocols/fddi/Makefile.am Sun Sep 22 19:26:10 2002
-+++ netdude-0.3.3-p/protocols/fddi/Makefile.am Wed Jun 25 18:40:30 2003
-@@ -4,7 +4,7 @@
- MAINTAINERCLEANFILES = Makefile.in
-
- LDFLAGS = -L$(top_srcdir)/src
--INCLUDES = @GTK_CFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_builddir)/include -W -Wall
-+INCLUDES = @GTK_CFLAGS@ -I$(top_srcdir) -I$(top_builddir)/include -W -Wall
-
- pkgdir = $(pkgdatadir)/protocols
- pkgincludedir = $(includedir)/netdude/protocols/fddi
-diff -Naur netdude-0.3.3/protocols/icmp/Makefile.am netdude-0.3.3-p/protocols/icmp/Makefile.am
---- netdude-0.3.3/protocols/icmp/Makefile.am Sun Sep 22 19:26:06 2002
-+++ netdude-0.3.3-p/protocols/icmp/Makefile.am Wed Jun 25 18:40:12 2003
-@@ -4,7 +4,7 @@
- MAINTAINERCLEANFILES = Makefile.in
-
- LDFLAGS = -L$(top_srcdir)/src
--INCLUDES = @GTK_CFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/include -W -Wall
-+INCLUDES = @GTK_CFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/include -W -Wall
-
- pkgdir = $(pkgdatadir)/protocols
- pkgincludedir = $(includedir)/netdude/protocols/icmp
-diff -Naur netdude-0.3.3/protocols/ip/Makefile.am netdude-0.3.3-p/protocols/ip/Makefile.am
---- netdude-0.3.3/protocols/ip/Makefile.am Sun Sep 22 19:26:24 2002
-+++ netdude-0.3.3-p/protocols/ip/Makefile.am Wed Jun 25 18:40:58 2003
-@@ -6,7 +6,7 @@
- MAINTAINERCLEANFILES = Makefile.in
-
- LDFLAGS = -L$(top_srcdir)/src
--INCLUDES = @GTK_CFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_builddir)/include -W -Wall
-+INCLUDES = @GTK_CFLAGS@ -I$(top_srcdir) -I$(top_builddir)/include -W -Wall
-
- pkgdir = $(pkgdatadir)/protocols
-
-diff -Naur netdude-0.3.3/protocols/linux-sll/Makefile.am netdude-0.3.3-p/protocols/linux-sll/Makefile.am
---- netdude-0.3.3/protocols/linux-sll/Makefile.am Sun Sep 22 19:25:46 2002
-+++ netdude-0.3.3-p/protocols/linux-sll/Makefile.am Wed Jun 25 18:39:54 2003
-@@ -4,7 +4,7 @@
- MAINTAINERCLEANFILES = Makefile.in
-
- LDFLAGS = -L$(top_srcdir)/src
--INCLUDES = @GTK_CFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_builddir)/include -W -Wall
-+INCLUDES = @GTK_CFLAGS@ -I$(top_srcdir) -I$(top_builddir)/include -W -Wall
-
- pkgdir = $(pkgdatadir)/protocols
- pkgincludedir = $(includedir)/netdude/protocols/sll
-diff -Naur netdude-0.3.3/protocols/snap/Makefile.am netdude-0.3.3-p/protocols/snap/Makefile.am
---- netdude-0.3.3/protocols/snap/Makefile.am Sun Sep 22 19:26:02 2002
-+++ netdude-0.3.3-p/protocols/snap/Makefile.am Wed Jun 25 18:40:07 2003
-@@ -4,7 +4,7 @@
- MAINTAINERCLEANFILES = Makefile.in
-
- LDFLAGS = -L$(top_srcdir)/src
--INCLUDES = @GTK_CFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_builddir)/include -W -Wall
-+INCLUDES = @GTK_CFLAGS@ -I$(top_srcdir) -I$(top_builddir)/include -W -Wall
-
- pkgdir = $(pkgdatadir)/protocols
- pkgincludedir = $(includedir)/netdude/protocols/snap
-diff -Naur netdude-0.3.3/protocols/tcp/Makefile.am netdude-0.3.3-p/protocols/tcp/Makefile.am
---- netdude-0.3.3/protocols/tcp/Makefile.am Sun Sep 22 19:26:17 2002
-+++ netdude-0.3.3-p/protocols/tcp/Makefile.am Wed Jun 25 18:40:48 2003
-@@ -4,7 +4,7 @@
- MAINTAINERCLEANFILES = Makefile.in
-
- LDFLAGS = -L$(top_srcdir)/src
--INCLUDES = @GTK_CFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_builddir)/include -W -Wall
-+INCLUDES = @GTK_CFLAGS@ -I$(top_srcdir) -I$(top_builddir)/include -W -Wall
-
- pkgdir = $(pkgdatadir)/protocols
- pkgincludedir = $(includedir)/netdude/protocols/tcp
-diff -Naur netdude-0.3.3/protocols/udp/Makefile.am netdude-0.3.3-p/protocols/udp/Makefile.am
---- netdude-0.3.3/protocols/udp/Makefile.am Sun Sep 22 19:26:14 2002
-+++ netdude-0.3.3-p/protocols/udp/Makefile.am Wed Jun 25 18:40:37 2003
-@@ -4,7 +4,7 @@
- MAINTAINERCLEANFILES = Makefile.in
-
- LDFLAGS = -L$(top_srcdir)/src
--INCLUDES = @GTK_CFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_builddir)/include -W -Wall
-+INCLUDES = @GTK_CFLAGS@ -I$(top_srcdir) -I$(top_builddir)/include -W -Wall
-
- pkgdir = $(pkgdatadir)/protocols
- pkgincludedir = $(includedir)/netdude/protocols/udp
-diff -Naur netdude-0.3.3/src/Makefile.am netdude-0.3.3-p/src/Makefile.am
---- netdude-0.3.3/src/Makefile.am Sun Sep 22 18:35:43 2002
-+++ netdude-0.3.3-p/src/Makefile.am Wed Jun 25 18:39:00 2003
+ AM_LDFLAGS = -L$(top_srcdir)/src
+-INCLUDES = @gtk_cflags@ @LIBNETDUDE_CFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
++INCLUDES = @gtk_cflags@ @LIBNETDUDE_CFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/src -W -Wall
+
+ pkgdir = $(pkgdatadir)/$(version_major)/plugins
+
+--- netdude-0.5.0/plugins/BPF-Filter/Makefile.am~ 2005-03-17 15:09:44.000000000 +0100
++++ netdude-0.5.0/plugins/BPF-Filter/Makefile.am 2009-09-14 15:00:32.000000000 +0200
+@@ -5,7 +5,7 @@
+
+ LIBS =
+ AM_LDFLAGS = -L$(top_srcdir)/src
+-INCLUDES = @gtk_cflags@ @LIBNETDUDE_CFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
++INCLUDES = @gtk_cflags@ @LIBNETDUDE_CFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/src -W -Wall
+
+ pkgdir = $(pkgdatadir)/$(version_major)/plugins
+
+--- netdude-0.5.0/protocols/tcp/Makefile.am~ 2005-03-17 15:09:46.000000000 +0100
++++ netdude-0.5.0/protocols/tcp/Makefile.am 2009-09-14 15:01:13.000000000 +0200
+@@ -5,7 +5,7 @@
+
+ AM_LDFLAGS = -L$(top_srcdir)/src
+ INCLUDES = @gtk_cflags@ @LIBNETDUDE_CFLAGS@ -I$(top_srcdir) \
+- -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
++ -I$(top_srcdir)/src -W -Wall
+
+ pkgdir = $(pkgdatadir)/$(version_major)/protocols
+ pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/tcp
+--- netdude-0.5.0/protocols/linux-sll/Makefile.am~ 2005-03-17 15:09:46.000000000 +0100
++++ netdude-0.5.0/protocols/linux-sll/Makefile.am 2009-09-14 15:01:53.000000000 +0200
+@@ -5,7 +5,7 @@
+
+ AM_LDFLAGS = -L$(top_srcdir)/src
+ INCLUDES = @gtk_cflags@ @LIBNETDUDE_CFLAGS@ -I$(top_srcdir) \
+- -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
++ -I$(top_srcdir)/src -W -Wall
+
+ pkgdir = $(pkgdatadir)/$(version_major)/protocols
+ pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/linux-sll
+--- netdude-0.5.0/protocols/fddi/Makefile.am~ 2005-03-17 15:09:45.000000000 +0100
++++ netdude-0.5.0/protocols/fddi/Makefile.am 2009-09-14 15:02:35.000000000 +0200
+@@ -5,7 +5,7 @@
+
+ AM_LDFLAGS = -L$(top_srcdir)/src
+ INCLUDES = @gtk_cflags@ @LIBNETDUDE_CFLAGS@ -I$(top_srcdir) \
+- -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
++ -I$(top_srcdir)/src -W -Wall
+
+ pkgdir = $(pkgdatadir)/$(version_major)/protocols
+ pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/fddi
+--- netdude-0.5.0/protocols/ip/Makefile.am~ 2005-03-17 15:09:46.000000000 +0100
++++ netdude-0.5.0/protocols/ip/Makefile.am 2009-09-14 15:03:07.000000000 +0200
+@@ -5,7 +5,7 @@
+
+ AM_LDFLAGS = -L$(top_srcdir)/src
+ INCLUDES = @gtk_cflags@ @LIBNETDUDE_CFLAGS@ -I$(top_srcdir) \
+- -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
++ -I$(top_srcdir)/src -W -Wall
+
+ pkgdir = $(pkgdatadir)/$(version_major)/protocols
+ pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/ip
+--- netdude-0.5.0/protocols/vlan/Makefile.am~ 2007-11-13 20:02:04.000000000 +0100
++++ netdude-0.5.0/protocols/vlan/Makefile.am 2009-09-14 15:03:43.000000000 +0200
+@@ -5,7 +5,7 @@
+
+ AM_LDFLAGS = -L$(top_srcdir)/src
+ INCLUDES = @gtk_cflags@ @LIBNETDUDE_CFLAGS@ -I$(top_srcdir) \
+- -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
++ -I$(top_srcdir)/src -W -Wall
+
+ pkgdir = $(pkgdatadir)/$(version_major)/protocols
+ pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/vlan
+--- netdude-0.5.0/protocols/icmp/Makefile.am~ 2005-03-17 15:09:45.000000000 +0100
++++ netdude-0.5.0/protocols/icmp/Makefile.am 2009-09-14 15:04:25.000000000 +0200
+@@ -5,7 +5,7 @@
+
+ AM_LDFLAGS = -L$(top_srcdir)/src
+ INCLUDES = @gtk_cflags@ @LIBNETDUDE_CFLAGS@ -I$(top_srcdir) \
+- -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
++ -I$(top_srcdir)/src -W -Wall
+
+ pkgdir = $(pkgdatadir)/$(version_major)/protocols
+ pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/icmp
+--- netdude-0.5.0/protocols/ether/Makefile.am~ 2005-03-17 15:09:45.000000000 +0100
++++ netdude-0.5.0/protocols/ether/Makefile.am 2009-09-14 15:04:55.000000000 +0200
+@@ -5,7 +5,7 @@
+
+ AM_LDFLAGS = -L$(top_srcdir)/src
+ INCLUDES = @gtk_cflags@ @LIBNETDUDE_CFLAGS@ -I$(top_srcdir) \
+- -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
++ -I$(top_srcdir)/src -W -Wall
+
+ pkgdir = $(pkgdatadir)/$(version_major)/protocols
+ pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/ether
+--- netdude-0.5.0/protocols/pcap/Makefile.am~ 2007-03-06 23:43:26.000000000 +0100
++++ netdude-0.5.0/protocols/pcap/Makefile.am 2009-09-14 15:05:31.000000000 +0200
+@@ -5,7 +5,7 @@
+
+ AM_LDFLAGS = -L$(top_srcdir)/src
+ INCLUDES = @gtk_cflags@ @LIBNETDUDE_CFLAGS@ -I$(top_srcdir) \
+- -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
++ -I$(top_srcdir)/src -W -Wall
+
+ pkgdir = $(pkgdatadir)/$(version_major)/protocols
+ pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/pcap
+--- netdude-0.5.0/protocols/arp/Makefile.am~ 2005-03-17 15:09:45.000000000 +0100
++++ netdude-0.5.0/protocols/arp/Makefile.am 2009-09-14 15:05:58.000000000 +0200
+@@ -5,7 +5,7 @@
+
+ AM_LDFLAGS = -L$(top_srcdir)/src
+ INCLUDES = @gtk_cflags@ @LIBNETDUDE_CFLAGS@ -I$(top_srcdir) \
+- -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
++ -I$(top_srcdir)/src -W -Wall
+
+ pkgdir = $(pkgdatadir)/$(version_major)/protocols
+ pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/arp
+--- netdude-0.5.0/protocols/snap/Makefile.am~ 2005-03-17 15:09:46.000000000 +0100
++++ netdude-0.5.0/protocols/snap/Makefile.am 2009-09-14 15:06:37.000000000 +0200
+@@ -5,7 +5,7 @@
+
+ AM_LDFLAGS = -L$(top_srcdir)/src
+ INCLUDES = @gtk_cflags@ @LIBNETDUDE_CFLAGS@ -I$(top_srcdir) \
+- -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
++ -I$(top_srcdir)/src -W -Wall
+
+ pkgdir = $(pkgdatadir)/$(version_major)/protocols
+ pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/snap
+--- netdude-0.5.0/protocols/udp/Makefile.am~ 2005-03-17 15:09:46.000000000 +0100
++++ netdude-0.5.0/protocols/udp/Makefile.am 2009-09-14 15:07:13.000000000 +0200
+@@ -5,7 +5,7 @@
+
+ AM_LDFLAGS = -L$(top_srcdir)/src
+ INCLUDES = @gtk_cflags@ @LIBNETDUDE_CFLAGS@ -I$(top_srcdir) \
+- -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
++ -I$(top_srcdir)/src -W -Wall
+
+ pkgdir = $(pkgdatadir)/$(version_major)/protocols
+ pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/udp
+--- netdude-0.5.0/src/Makefile.am~ 2008-08-28 15:54:39.000000000 +0200
++++ netdude-0.5.0/src/Makefile.am 2009-09-14 15:09:12.000000000 +0200
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
INCLUDES = \
-- -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_builddir)/include \
-+ -I$(top_srcdir) -I$(top_builddir)/include \
- @gtk_cflags@ @glib_cflags@ -W -Wall ## -DMEMDEBUG
-
- bin_PROGRAMS = netdude
-@@ -68,4 +68,4 @@
- support.c support.h \
+- -I$(top_srcdir) -I$(top_srcdir)/libltdl \
++ -I$(top_srcdir) \
+ -I$(top_srcdir)/src @gtk_cflags@ \
+ -DLIBNETDUDE_CFLAGS="\"@LIBNETDUDE_CFLAGS@\"" \
+ -DGTK_CFLAGS="\"@gtk_cflags@\"" \
+@@ -75,7 +75,7 @@
gtkhex.c gtkhex.h
--netdude_LDADD = $(top_builddir)/libltdl/libltdlc.la @gtk_libs@ @glib_libs@
-+netdude_LDADD = -lltdl @gtk_libs@ @glib_libs@
+ netdude_LDADD = \
+- $(top_builddir)/libltdl/libltdlc.la @gtk_libs@ @LIBNETDUDE_LIBS@
++ -lltdl @gtk_libs@ @LIBNETDUDE_LIBS@
+
+ netdude_LDFLAGS = -export-dynamic
+
================================================================
Index: packages/netdude/netdude-paths.patch
diff -u packages/netdude/netdude-paths.patch:1.1 packages/netdude/netdude-paths.patch:1.2
--- packages/netdude/netdude-paths.patch:1.1 Wed Jun 25 20:10:03 2003
+++ packages/netdude/netdude-paths.patch Tue Sep 15 13:00:06 2009
@@ -1,142 +1,164 @@
-diff -Naur netdude-0.3.3/plugins/Makefile.am netdude-0.3.3-p/plugins/Makefile.am
---- netdude-0.3.3/plugins/Makefile.am Wed Jun 25 18:55:59 2003
-+++ netdude-0.3.3-p/plugins/Makefile.am Wed Jun 25 18:56:13 2003
-@@ -9,7 +9,7 @@
- LDFLAGS = -L$(top_srcdir)/src
- INCLUDES = @GTK_CFLAGS@ -I$(top_srcdir) -I$(top_builddir)/include
-
--pkgdir = $(pkgdatadir)/plugins
-+pkgdir = $(pkglibdir)/plugins
-
- pkg_LTLIBRARIES = nd_cksumfix.la nd_dummyplugin.la
-
-diff -Naur netdude-0.3.3/protocols/arp/Makefile.am netdude-0.3.3-p/protocols/arp/Makefile.am
---- netdude-0.3.3/protocols/arp/Makefile.am Wed Jun 25 18:55:59 2003
-+++ netdude-0.3.3-p/protocols/arp/Makefile.am Wed Jun 25 18:56:52 2003
-@@ -6,7 +6,7 @@
- LDFLAGS = -L$(top_srcdir)/src
- INCLUDES = @GTK_CFLAGS@ -I$(top_srcdir) -I$(top_builddir)/include -W -Wall
-
--pkgdir = $(pkgdatadir)/protocols
-+pkgdir = $(pkglibdir)/protocols
- pkgincludedir = $(includedir)/netdude/protocols/arp
+--- netdude-0.5.0/plugins/ChecksumFix/Makefile.am~ 2009-09-14 15:10:25.000000000 +0200
++++ netdude-0.5.0/plugins/ChecksumFix/Makefile.am 2009-09-14 15:12:54.000000000 +0200
+@@ -7,7 +7,7 @@
+ AM_LDFLAGS = -L$(top_srcdir)/src
+ INCLUDES = @gtk_cflags@ @LIBNETDUDE_CFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/src -W -Wall
+
+-pkgdir = $(pkgdatadir)/$(version_major)/plugins
++pkgdir = $(pkglibdir)/$(version_major)/plugins
+
+ pkg_LTLIBRARIES = nd_cksumfix.la
+
+--- netdude-0.5.0/plugins/BPF-Filter/Makefile.am~ 2009-09-14 15:10:25.000000000 +0200
++++ netdude-0.5.0/plugins/BPF-Filter/Makefile.am 2009-09-14 15:13:35.000000000 +0200
+@@ -7,7 +7,7 @@
+ AM_LDFLAGS = -L$(top_srcdir)/src
+ INCLUDES = @gtk_cflags@ @LIBNETDUDE_CFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/src -W -Wall
+
+-pkgdir = $(pkgdatadir)/$(version_major)/plugins
++pkgdir = $(pkglibdir)/$(version_major)/plugins
+
+ pkg_LTLIBRARIES = nd_bpf.la
+
+--- netdude-0.5.0/protocols/tcp/Makefile.am~ 2009-09-14 15:10:25.000000000 +0200
++++ netdude-0.5.0/protocols/tcp/Makefile.am 2009-09-14 15:14:20.000000000 +0200
+@@ -7,7 +7,7 @@
+ INCLUDES = @gtk_cflags@ @LIBNETDUDE_CFLAGS@ -I$(top_srcdir) \
+ -I$(top_srcdir)/src -W -Wall
+
+-pkgdir = $(pkgdatadir)/$(version_major)/protocols
++pkgdir = $(pkglibdir)/$(version_major)/protocols
+ pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/tcp
- pkg_LTLIBRARIES = nd_arp.la
-diff -Naur netdude-0.3.3/protocols/ether/Makefile.am netdude-0.3.3-p/protocols/ether/Makefile.am
---- netdude-0.3.3/protocols/ether/Makefile.am Wed Jun 25 18:55:59 2003
-+++ netdude-0.3.3-p/protocols/ether/Makefile.am Wed Jun 25 18:57:07 2003
-@@ -8,7 +8,7 @@
- LDFLAGS = -L$(top_srcdir)/src
- INCLUDES = @GTK_CFLAGS@ -I$(top_srcdir) -I$(top_builddir)/include -W -Wall
-
--pkgdir = $(pkgdatadir)/protocols
-+pkgdir = $(pkglibdir)/protocols
-
- pkg_LTLIBRARIES = nd_ethernet.la
+ pkg_LTLIBRARIES = nd_tcp.la
+--- netdude-0.5.0/protocols/linux-sll/Makefile.am~ 2009-09-14 15:10:25.000000000 +0200
++++ netdude-0.5.0/protocols/linux-sll/Makefile.am 2009-09-14 15:14:57.000000000 +0200
+@@ -7,7 +7,7 @@
+ INCLUDES = @gtk_cflags@ @LIBNETDUDE_CFLAGS@ -I$(top_srcdir) \
+ -I$(top_srcdir)/src -W -Wall
+
+-pkgdir = $(pkgdatadir)/$(version_major)/protocols
++pkgdir = $(pkglibdir)/$(version_major)/protocols
+ pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/linux-sll
-diff -Naur netdude-0.3.3/protocols/fddi/Makefile.am netdude-0.3.3-p/protocols/fddi/Makefile.am
---- netdude-0.3.3/protocols/fddi/Makefile.am Wed Jun 25 18:55:59 2003
-+++ netdude-0.3.3-p/protocols/fddi/Makefile.am Wed Jun 25 18:57:14 2003
-@@ -6,7 +6,7 @@
- LDFLAGS = -L$(top_srcdir)/src
- INCLUDES = @GTK_CFLAGS@ -I$(top_srcdir) -I$(top_builddir)/include -W -Wall
-
--pkgdir = $(pkgdatadir)/protocols
-+pkgdir = $(pkglibdir)/protocols
- pkgincludedir = $(includedir)/netdude/protocols/fddi
+ pkg_LTLIBRARIES = nd_sll.la
+--- netdude-0.5.0/protocols/fddi/Makefile.am~ 2009-09-14 15:10:25.000000000 +0200
++++ netdude-0.5.0/protocols/fddi/Makefile.am 2009-09-14 15:15:33.000000000 +0200
+@@ -7,7 +7,7 @@
+ INCLUDES = @gtk_cflags@ @LIBNETDUDE_CFLAGS@ -I$(top_srcdir) \
+ -I$(top_srcdir)/src -W -Wall
+
+-pkgdir = $(pkgdatadir)/$(version_major)/protocols
++pkgdir = $(pkglibdir)/$(version_major)/protocols
+ pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/fddi
pkg_LTLIBRARIES = nd_fddi.la
-diff -Naur netdude-0.3.3/protocols/icmp/Makefile.am netdude-0.3.3-p/protocols/icmp/Makefile.am
---- netdude-0.3.3/protocols/icmp/Makefile.am Wed Jun 25 18:55:59 2003
-+++ netdude-0.3.3-p/protocols/icmp/Makefile.am Wed Jun 25 18:57:12 2003
-@@ -6,7 +6,7 @@
- LDFLAGS = -L$(top_srcdir)/src
- INCLUDES = @GTK_CFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/include -W -Wall
-
--pkgdir = $(pkgdatadir)/protocols
-+pkgdir = $(pkglibdir)/protocols
- pkgincludedir = $(includedir)/netdude/protocols/icmp
-
- pkg_LTLIBRARIES = nd_icmp.la
-diff -Naur netdude-0.3.3/protocols/ip/Makefile.am netdude-0.3.3-p/protocols/ip/Makefile.am
---- netdude-0.3.3/protocols/ip/Makefile.am Wed Jun 25 18:55:59 2003
-+++ netdude-0.3.3-p/protocols/ip/Makefile.am Wed Jun 25 18:56:46 2003
-@@ -8,7 +8,7 @@
- LDFLAGS = -L$(top_srcdir)/src
- INCLUDES = @GTK_CFLAGS@ -I$(top_srcdir) -I$(top_builddir)/include -W -Wall
-
--pkgdir = $(pkgdatadir)/protocols
-+pkgdir = $(pkglibdir)/protocols
+--- netdude-0.5.0/protocols/ip/Makefile.am~ 2009-09-14 15:10:25.000000000 +0200
++++ netdude-0.5.0/protocols/ip/Makefile.am 2009-09-14 15:15:58.000000000 +0200
+@@ -7,7 +7,7 @@
+ INCLUDES = @gtk_cflags@ @LIBNETDUDE_CFLAGS@ -I$(top_srcdir) \
+ -I$(top_srcdir)/src -W -Wall
+
+-pkgdir = $(pkgdatadir)/$(version_major)/protocols
++pkgdir = $(pkglibdir)/$(version_major)/protocols
+ pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/ip
pkg_LTLIBRARIES = nd_ip.la
+--- netdude-0.5.0/protocols/vlan/Makefile.am~ 2009-09-14 15:10:25.000000000 +0200
++++ netdude-0.5.0/protocols/vlan/Makefile.am 2009-09-14 15:16:25.000000000 +0200
+@@ -7,7 +7,7 @@
+ INCLUDES = @gtk_cflags@ @LIBNETDUDE_CFLAGS@ -I$(top_srcdir) \
+ -I$(top_srcdir)/src -W -Wall
+
+-pkgdir = $(pkgdatadir)/$(version_major)/protocols
++pkgdir = $(pkglibdir)/$(version_major)/protocols
+ pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/vlan
+
+ pkg_LTLIBRARIES = nd_vlan.la
+--- netdude-0.5.0/protocols/icmp/Makefile.am~ 2009-09-14 15:10:25.000000000 +0200
++++ netdude-0.5.0/protocols/icmp/Makefile.am 2009-09-14 15:17:05.000000000 +0200
+@@ -7,7 +7,7 @@
+ INCLUDES = @gtk_cflags@ @LIBNETDUDE_CFLAGS@ -I$(top_srcdir) \
+ -I$(top_srcdir)/src -W -Wall
+
+-pkgdir = $(pkgdatadir)/$(version_major)/protocols
++pkgdir = $(pkglibdir)/$(version_major)/protocols
+ pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/icmp
-diff -Naur netdude-0.3.3/protocols/linux-sll/Makefile.am netdude-0.3.3-p/protocols/linux-sll/Makefile.am
---- netdude-0.3.3/protocols/linux-sll/Makefile.am Wed Jun 25 18:55:59 2003
-+++ netdude-0.3.3-p/protocols/linux-sll/Makefile.am Wed Jun 25 18:57:04 2003
-@@ -6,7 +6,7 @@
- LDFLAGS = -L$(top_srcdir)/src
- INCLUDES = @GTK_CFLAGS@ -I$(top_srcdir) -I$(top_builddir)/include -W -Wall
-
--pkgdir = $(pkgdatadir)/protocols
-+pkgdir = $(pkglibdir)/protocols
- pkgincludedir = $(includedir)/netdude/protocols/sll
+ pkg_LTLIBRARIES = nd_icmp.la
+--- netdude-0.5.0/protocols/ether/Makefile.am~ 2009-09-14 15:10:25.000000000 +0200
++++ netdude-0.5.0/protocols/ether/Makefile.am 2009-09-14 15:17:27.000000000 +0200
+@@ -7,7 +7,7 @@
+ INCLUDES = @gtk_cflags@ @LIBNETDUDE_CFLAGS@ -I$(top_srcdir) \
+ -I$(top_srcdir)/src -W -Wall
+
+-pkgdir = $(pkgdatadir)/$(version_major)/protocols
++pkgdir = $(pkglibdir)/$(version_major)/protocols
+ pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/ether
- pkg_LTLIBRARIES = nd_sll.la
-diff -Naur netdude-0.3.3/protocols/snap/Makefile.am netdude-0.3.3-p/protocols/snap/Makefile.am
---- netdude-0.3.3/protocols/snap/Makefile.am Wed Jun 25 18:55:59 2003
-+++ netdude-0.3.3-p/protocols/snap/Makefile.am Wed Jun 25 18:57:10 2003
-@@ -6,7 +6,7 @@
- LDFLAGS = -L$(top_srcdir)/src
- INCLUDES = @GTK_CFLAGS@ -I$(top_srcdir) -I$(top_builddir)/include -W -Wall
-
--pkgdir = $(pkgdatadir)/protocols
-+pkgdir = $(pkglibdir)/protocols
- pkgincludedir = $(includedir)/netdude/protocols/snap
+ pkg_LTLIBRARIES = nd_ethernet.la
+--- netdude-0.5.0/protocols/pcap/Makefile.am~ 2009-09-14 15:10:25.000000000 +0200
++++ netdude-0.5.0/protocols/pcap/Makefile.am 2009-09-14 15:17:48.000000000 +0200
+@@ -7,7 +7,7 @@
+ INCLUDES = @gtk_cflags@ @LIBNETDUDE_CFLAGS@ -I$(top_srcdir) \
+ -I$(top_srcdir)/src -W -Wall
+
+-pkgdir = $(pkgdatadir)/$(version_major)/protocols
++pkgdir = $(pkglibdir)/$(version_major)/protocols
+ pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/pcap
+
+ pkg_LTLIBRARIES = nd_pcap.la
+--- netdude-0.5.0/protocols/arp/Makefile.am~ 2009-09-14 15:10:25.000000000 +0200
++++ netdude-0.5.0/protocols/arp/Makefile.am 2009-09-14 15:18:18.000000000 +0200
+@@ -7,7 +7,7 @@
+ INCLUDES = @gtk_cflags@ @LIBNETDUDE_CFLAGS@ -I$(top_srcdir) \
+ -I$(top_srcdir)/src -W -Wall
+
+-pkgdir = $(pkgdatadir)/$(version_major)/protocols
++pkgdir = $(pkglibdir)/$(version_major)/protocols
+ pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/arp
- pkg_LTLIBRARIES = nd_snap.la
-diff -Naur netdude-0.3.3/protocols/tcp/Makefile.am netdude-0.3.3-p/protocols/tcp/Makefile.am
---- netdude-0.3.3/protocols/tcp/Makefile.am Wed Jun 25 18:55:59 2003
-+++ netdude-0.3.3-p/protocols/tcp/Makefile.am Wed Jun 25 18:57:20 2003
-@@ -6,7 +6,7 @@
- LDFLAGS = -L$(top_srcdir)/src
- INCLUDES = @GTK_CFLAGS@ -I$(top_srcdir) -I$(top_builddir)/include -W -Wall
-
--pkgdir = $(pkgdatadir)/protocols
-+pkgdir = $(pkglibdir)/protocols
- pkgincludedir = $(includedir)/netdude/protocols/tcp
+ pkg_LTLIBRARIES = nd_arp.la
+--- netdude-0.5.0/protocols/snap/Makefile.am~ 2009-09-14 15:10:25.000000000 +0200
++++ netdude-0.5.0/protocols/snap/Makefile.am 2009-09-14 15:18:44.000000000 +0200
+@@ -7,7 +7,7 @@
+ INCLUDES = @gtk_cflags@ @LIBNETDUDE_CFLAGS@ -I$(top_srcdir) \
+ -I$(top_srcdir)/src -W -Wall
+
+-pkgdir = $(pkgdatadir)/$(version_major)/protocols
++pkgdir = $(pkglibdir)/$(version_major)/protocols
+ pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/snap
- pkg_LTLIBRARIES = nd_tcp.la
-diff -Naur netdude-0.3.3/protocols/udp/Makefile.am netdude-0.3.3-p/protocols/udp/Makefile.am
---- netdude-0.3.3/protocols/udp/Makefile.am Wed Jun 25 18:55:59 2003
-+++ netdude-0.3.3-p/protocols/udp/Makefile.am Wed Jun 25 18:57:17 2003
-@@ -6,7 +6,7 @@
- LDFLAGS = -L$(top_srcdir)/src
- INCLUDES = @GTK_CFLAGS@ -I$(top_srcdir) -I$(top_builddir)/include -W -Wall
-
--pkgdir = $(pkgdatadir)/protocols
-+pkgdir = $(pkglibdir)/protocols
- pkgincludedir = $(includedir)/netdude/protocols/udp
+ pkg_LTLIBRARIES = nd_snap.la
+--- netdude-0.5.0/protocols/udp/Makefile.am~ 2009-09-14 15:10:25.000000000 +0200
++++ netdude-0.5.0/protocols/udp/Makefile.am 2009-09-14 15:19:15.000000000 +0200
+@@ -7,7 +7,7 @@
+ INCLUDES = @gtk_cflags@ @LIBNETDUDE_CFLAGS@ -I$(top_srcdir) \
+ -I$(top_srcdir)/src -W -Wall
+
+-pkgdir = $(pkgdatadir)/$(version_major)/protocols
++pkgdir = $(pkglibdir)/$(version_major)/protocols
+ pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/udp
pkg_LTLIBRARIES = nd_udp.la
-diff -Naur netdude-0.3.3/configure.ac netdude-0.3.3-p/configure.ac
---- netdude-0.3.3/configure.ac Tue Nov 12 18:58:41 2002
-+++ netdude-0.3.3-p/configure.ac Wed Jun 25 20:00:45 2003
-@@ -50,14 +50,14 @@
+--- netdude-0.5.0/configure.in~ 2008-08-28 15:58:22.000000000 +0200
++++ netdude-0.5.0/configure.in 2009-09-14 15:22:48.000000000 +0200
+@@ -80,14 +80,14 @@
dnl ##################################################
dnl # Set PACKAGE_DATA_DIR in config.h.
dnl ##################################################
-if test "x${datadir}" = 'x${prefix}/share'; then
+if test "x${libdir}" = 'x${prefix}/lib'; then
if test "x${prefix}" = "xNONE"; then
-- AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}", [The data dir of the package])
-+ AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/lib/${PACKAGE}", [The data dir of the package])
+- packagedatadir="${ac_default_prefix}/share/${PACKAGE}"
++ packagedatadir="${ac_default_prefix}/lib/${PACKAGE}"
else
-- AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [The data dir of the package])
-+ AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/lib/${PACKAGE}", [The data dir of the package])
+- packagedatadir="${prefix}/share/${PACKAGE}"
++ packagedatadir="${prefix}/lib/${PACKAGE}"
fi
else
-- AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}", [The data dir of the package])
-+ AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${libdir}/${PACKAGE}", [The data dir of the package])
+- packagedatadir="${datadir}/${PACKAGE}"
++ packagedatadir="${libdir}/${PACKAGE}"
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/netdude/netdude-am.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/netdude/netdude-paths.patch?r1=1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list