diff options
author | joerg <joerg@pkgsrc.org> | 2012-11-16 20:10:20 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2012-11-16 20:10:20 +0000 |
commit | a0b56a25142f0d33b80d39cb6c25dc7b3f1a1f37 (patch) | |
tree | dbecfc0cf6d4981384a4f3155191f640ba48b927 | |
parent | ad88ba6576f71ea91a64c0389539e97a09d7962d (diff) | |
download | pkgsrc-a0b56a25142f0d33b80d39cb6c25dc7b3f1a1f37.tar.gz |
Don't use unportable -I-.
-rw-r--r-- | net/LaBrea/distinfo | 17 | ||||
-rw-r--r-- | net/LaBrea/patches/patch-ab | 17 | ||||
-rw-r--r-- | net/LaBrea/patches/patch-src_Makefile.am | 9 | ||||
-rw-r--r-- | net/LaBrea/patches/patch-src_Makefile.in | 13 | ||||
-rw-r--r-- | net/LaBrea/patches/patch-src_bget.c | 13 | ||||
-rw-r--r-- | net/LaBrea/patches/patch-src_ctl.c | 31 | ||||
-rw-r--r-- | net/LaBrea/patches/patch-src_getopt.c | 13 | ||||
-rw-r--r-- | net/LaBrea/patches/patch-src_getopt1.c | 13 | ||||
-rw-r--r-- | net/LaBrea/patches/patch-src_labrea.c | 26 | ||||
-rw-r--r-- | net/LaBrea/patches/patch-src_labrea__init.c | 32 | ||||
-rw-r--r-- | net/LaBrea/patches/patch-src_lbio.c | 33 | ||||
-rw-r--r-- | net/LaBrea/patches/patch-src_pkt.c | 15 | ||||
-rw-r--r-- | net/LaBrea/patches/patch-src_pkt__handler.c | 29 | ||||
-rw-r--r-- | net/LaBrea/patches/patch-src_syslog.c | 25 | ||||
-rw-r--r-- | net/LaBrea/patches/patch-src_utils.c | 43 |
15 files changed, 325 insertions, 4 deletions
diff --git a/net/LaBrea/distinfo b/net/LaBrea/distinfo index 9fc3c4dec21..6da99edbafc 100644 --- a/net/LaBrea/distinfo +++ b/net/LaBrea/distinfo @@ -1,7 +1,20 @@ -$NetBSD: distinfo,v 1.5 2006/06/06 19:47:48 joerg Exp $ +$NetBSD: distinfo,v 1.6 2012/11/16 20:10:20 joerg Exp $ SHA1 (labrea-2.5-stable-1.tar.gz) = 8f374b05cc50294b2773bda98f8317cf5b102067 RMD160 (labrea-2.5-stable-1.tar.gz) = 27078ab4b4efdd3f0e8233cac228295bc5a5cf47 Size (labrea-2.5-stable-1.tar.gz) = 210494 bytes SHA1 (patch-aa) = f3b7b2556513a90b24b5adf73a99da28462d33e4 -SHA1 (patch-ab) = 0a53983fd42e6e05242b317464e6c40ac0296518 +SHA1 (patch-ab) = 8a7d091795b0740384651d9e68b95a94af02e1df +SHA1 (patch-src_Makefile.am) = 56c4709cc58beca503e22f2ce9a9345f9f16a687 +SHA1 (patch-src_Makefile.in) = c4b40eca2a36aacf34c7002bcb16f77d65f4f777 +SHA1 (patch-src_bget.c) = 315878e2a1474782323e0c140a8669dfc4143501 +SHA1 (patch-src_ctl.c) = a34625f2833c9d29f502e4511710932c828e15b5 +SHA1 (patch-src_getopt.c) = 8ef6823d92b2387261826a64bdec7d77eeb86b16 +SHA1 (patch-src_getopt1.c) = a8e0b262d0b1964c0c8e183d4287c9d22c1f8d6a +SHA1 (patch-src_labrea.c) = 7649f79ce50064661fb3cf4dc6ab50a6f8066ef9 +SHA1 (patch-src_labrea__init.c) = ca4beab6f498dac1efd3c7e68ce7eab1ededbc6b +SHA1 (patch-src_lbio.c) = c9ea4af31a70395ecc83cfeeaf7ec5acdd63f315 +SHA1 (patch-src_pkt.c) = d2db16a001a7603765422f9f2adf9accf261cd48 +SHA1 (patch-src_pkt__handler.c) = 74bdb6964a6758059f6a27b18439479aab6d6bff +SHA1 (patch-src_syslog.c) = f9b3c699478496e13ca6dca2043c026d117872a5 +SHA1 (patch-src_utils.c) = 7342c619a3b1beb0a9aae6f66ed0179022d7daa9 diff --git a/net/LaBrea/patches/patch-ab b/net/LaBrea/patches/patch-ab index f26a0c55da6..8c05f5378d8 100644 --- a/net/LaBrea/patches/patch-ab +++ b/net/LaBrea/patches/patch-ab @@ -1,7 +1,20 @@ -$NetBSD: patch-ab,v 1.1 2006/06/06 19:47:48 joerg Exp $ +$NetBSD: patch-ab,v 1.2 2012/11/16 20:10:20 joerg Exp $ ---- src/pcaputil.c.orig 2006-06-06 19:44:41.000000000 +0000 +--- src/pcaputil.c.orig 2003-09-12 21:23:39.000000000 +0000 +++ src/pcaputil.c +@@ -47,9 +47,9 @@ + #include <stdlib.h> + #include <string.h> + +-#include "labrea.h" +-#include "utils.h" +-#include "pcaputil.h" ++#include "../inc/labrea.h" ++#include "../inc/utils.h" ++#include "../inc/pcaputil.h" + + pcap_t * + pcap_open(char *device) @@ -64,7 +64,7 @@ pcap_open(char *device) if ((pcap = pcap_open_live(device, 31337, 1, PCAP_TIMEOUT, ebuf)) == NULL) return (NULL); diff --git a/net/LaBrea/patches/patch-src_Makefile.am b/net/LaBrea/patches/patch-src_Makefile.am new file mode 100644 index 00000000000..06a1a5652f0 --- /dev/null +++ b/net/LaBrea/patches/patch-src_Makefile.am @@ -0,0 +1,9 @@ +$NetBSD: patch-src_Makefile.am,v 1.1 2012/11/16 20:10:20 joerg Exp $ + +--- src/Makefile.am.orig 2012-11-16 11:46:13.000000000 +0000 ++++ src/Makefile.am +@@ -4,3 +4,3 @@ + +-AM_CPPFLAGS = -I../inc -I- @DNETINC@ @PCAPINC@ ++AM_CPPFLAGS = @DNETINC@ @PCAPINC@ + diff --git a/net/LaBrea/patches/patch-src_Makefile.in b/net/LaBrea/patches/patch-src_Makefile.in new file mode 100644 index 00000000000..cde784263c3 --- /dev/null +++ b/net/LaBrea/patches/patch-src_Makefile.in @@ -0,0 +1,13 @@ +$NetBSD: patch-src_Makefile.in,v 1.1 2012/11/16 20:10:20 joerg Exp $ + +--- src/Makefile.in.orig 2012-11-16 11:46:22.000000000 +0000 ++++ src/Makefile.in +@@ -121,7 +121,7 @@ sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + +-AM_CPPFLAGS = -I../inc -I- @DNETINC@ @PCAPINC@ ++AM_CPPFLAGS = @DNETINC@ @PCAPINC@ + + sbin_PROGRAMS = labrea + diff --git a/net/LaBrea/patches/patch-src_bget.c b/net/LaBrea/patches/patch-src_bget.c new file mode 100644 index 00000000000..cecc522cd45 --- /dev/null +++ b/net/LaBrea/patches/patch-src_bget.c @@ -0,0 +1,13 @@ +$NetBSD: patch-src_bget.c,v 1.1 2012/11/16 20:10:20 joerg Exp $ + +--- src/bget.c.orig 2003-09-09 20:55:03.000000000 +0000 ++++ src/bget.c +@@ -468,7 +468,7 @@ extern char *sprintf(); /* + /* Declare the interface, including the requested buffer size type, + bufsize. */ + +-#include "bget.h" ++#include "../inc/bget.h" + + #define MemSize int /* Type for size arguments to memxxx() + functions such as memcmp(). */ diff --git a/net/LaBrea/patches/patch-src_ctl.c b/net/LaBrea/patches/patch-src_ctl.c new file mode 100644 index 00000000000..a51d5c46f5a --- /dev/null +++ b/net/LaBrea/patches/patch-src_ctl.c @@ -0,0 +1,31 @@ +$NetBSD: patch-src_ctl.c,v 1.1 2012/11/16 20:10:20 joerg Exp $ + +--- src/ctl.c.orig 2003-09-12 21:23:39.000000000 +0000 ++++ src/ctl.c +@@ -39,19 +39,19 @@ + #ifdef HAVE_ERR_H + #include <err.h> + #else +-#include "err.h" ++#include "../inc/err.h" + #endif + + #ifdef HAVE_WINDOWS_H + #include <windows.h> + #endif + +-#include "labrea.h" +-#include "bget.h" +-#include "pkt.h" +-#include "utils.h" +-#include "lbio.h" +-#include "ctl.h" ++#include "../inc/labrea.h" ++#include "../inc/bget.h" ++#include "../inc/pkt.h" ++#include "../inc/utils.h" ++#include "../inc/lbio.h" ++#include "../inc/ctl.h" + + + /* diff --git a/net/LaBrea/patches/patch-src_getopt.c b/net/LaBrea/patches/patch-src_getopt.c new file mode 100644 index 00000000000..b1264c23cac --- /dev/null +++ b/net/LaBrea/patches/patch-src_getopt.c @@ -0,0 +1,13 @@ +$NetBSD: patch-src_getopt.c,v 1.1 2012/11/16 20:10:21 joerg Exp $ + +--- src/getopt.c.orig 2003-09-09 20:55:03.000000000 +0000 ++++ src/getopt.c +@@ -105,7 +105,7 @@ + GNU application programs can use a third alternative mode in which + they can distinguish the relative order of options and other arguments. */ + +-#include "getopt.h" ++#include "../inc/getopt.h" + + /* For communication from `getopt' to the caller. + When `getopt' finds an option that takes an argument, diff --git a/net/LaBrea/patches/patch-src_getopt1.c b/net/LaBrea/patches/patch-src_getopt1.c new file mode 100644 index 00000000000..8e312974cda --- /dev/null +++ b/net/LaBrea/patches/patch-src_getopt1.c @@ -0,0 +1,13 @@ +$NetBSD: patch-src_getopt1.c,v 1.1 2012/11/16 20:10:21 joerg Exp $ + +--- src/getopt1.c.orig 2003-09-09 20:55:03.000000000 +0000 ++++ src/getopt1.c +@@ -22,7 +22,7 @@ + #include "config.h" + #endif + +-#include "getopt.h" ++#include "../inc/getopt.h" + + #if !defined __STDC__ || !__STDC__ + /* This is a separate conditional since some stdc systems diff --git a/net/LaBrea/patches/patch-src_labrea.c b/net/LaBrea/patches/patch-src_labrea.c new file mode 100644 index 00000000000..431347f2b79 --- /dev/null +++ b/net/LaBrea/patches/patch-src_labrea.c @@ -0,0 +1,26 @@ +$NetBSD: patch-src_labrea.c,v 1.1 2012/11/16 20:10:21 joerg Exp $ + +--- src/labrea.c.orig 2003-09-12 21:23:39.000000000 +0000 ++++ src/labrea.c +@@ -42,15 +42,15 @@ + #ifdef HAVE_ERR_H + #include <err.h> + #else +-#include "err.h" ++#include "../inc/err.h" + #endif + + +-#include "labrea.h" +-#include "ctl.h" +-#include "utils.h" +-#include "lbio.h" +-#include "pkt_handler.h" ++#include "../inc/labrea.h" ++#include "../inc/ctl.h" ++#include "../inc/utils.h" ++#include "../inc/lbio.h" ++#include "../inc/pkt_handler.h" + + /* Definitions of main control structures */ + io_t io; diff --git a/net/LaBrea/patches/patch-src_labrea__init.c b/net/LaBrea/patches/patch-src_labrea__init.c new file mode 100644 index 00000000000..ee48f8b7033 --- /dev/null +++ b/net/LaBrea/patches/patch-src_labrea__init.c @@ -0,0 +1,32 @@ +$NetBSD: patch-src_labrea__init.c,v 1.1 2012/11/16 20:10:21 joerg Exp $ + +--- src/labrea_init.c.orig 2003-09-12 21:23:39.000000000 +0000 ++++ src/labrea_init.c +@@ -38,20 +38,20 @@ + #ifdef HAVE_GETOPT_H + #include <getopt.h> + #else +-#include "getopt.h" ++#include "../inc/getopt.h" + #endif + + #ifdef HAVE_ERR_H + #include <err.h> + #else +-#include "err.h" ++#include "../inc/err.h" + #endif + +-#include "labrea.h" +-#include "pcaputil.h" +-#include "ctl.h" +-#include "utils.h" +-#include "lbio.h" ++#include "../inc/labrea.h" ++#include "../inc/pcaputil.h" ++#include "../inc/ctl.h" ++#include "../inc/utils.h" ++#include "../inc/lbio.h" + + int input_error = FALSE; /* True if errors on input */ + diff --git a/net/LaBrea/patches/patch-src_lbio.c b/net/LaBrea/patches/patch-src_lbio.c new file mode 100644 index 00000000000..20978fe8d93 --- /dev/null +++ b/net/LaBrea/patches/patch-src_lbio.c @@ -0,0 +1,33 @@ +$NetBSD: patch-src_lbio.c,v 1.1 2012/11/16 20:10:21 joerg Exp $ + +--- src/lbio.c.orig 2003-09-12 21:23:39.000000000 +0000 ++++ src/lbio.c +@@ -33,20 +33,20 @@ + #ifdef HAVE_ERR_H + #include <err.h> + #else +-#include "err.h" ++#include "../inc/err.h" + #endif + + #ifdef HAVE_STDLIB_H + #include <stdlib.h> + #endif + +-#include "labrea.h" +-#include "bget.h" +-#include "pkt.h" +-#include "ctl.h" +-#include "utils.h" +-#include "pcaputil.h" +-#include "lbio.h" ++#include "../inc/labrea.h" ++#include "../inc/bget.h" ++#include "../inc/pkt.h" ++#include "../inc/ctl.h" ++#include "../inc/utils.h" ++#include "../inc/pcaputil.h" ++#include "../inc/lbio.h" + + #ifdef WIN32 + /* has to be here to avoid compile errors with bpf structs */ diff --git a/net/LaBrea/patches/patch-src_pkt.c b/net/LaBrea/patches/patch-src_pkt.c new file mode 100644 index 00000000000..04e52f79caf --- /dev/null +++ b/net/LaBrea/patches/patch-src_pkt.c @@ -0,0 +1,15 @@ +$NetBSD: patch-src_pkt.c,v 1.1 2012/11/16 20:10:21 joerg Exp $ + +--- src/pkt.c.orig 2003-09-12 21:23:39.000000000 +0000 ++++ src/pkt.c +@@ -38,8 +38,8 @@ + #include <stdlib.h> + #include <string.h> + +-#include "bget.h" +-#include "pkt.h" ++#include "../inc/bget.h" ++#include "../inc/pkt.h" + + void + pkt_init(int size) diff --git a/net/LaBrea/patches/patch-src_pkt__handler.c b/net/LaBrea/patches/patch-src_pkt__handler.c new file mode 100644 index 00000000000..b4270d7438e --- /dev/null +++ b/net/LaBrea/patches/patch-src_pkt__handler.c @@ -0,0 +1,29 @@ +$NetBSD: patch-src_pkt__handler.c,v 1.1 2012/11/16 20:10:21 joerg Exp $ + +--- src/pkt_handler.c.orig 2003-09-12 21:23:39.000000000 +0000 ++++ src/pkt_handler.c +@@ -34,16 +34,16 @@ + #ifdef HAVE_ERR_H + #include <err.h> + #else +-#include "err.h" ++#include "../inc/err.h" + #endif + +-#include "labrea.h" +-#include "pkt.h" +-#include "bget.h" +-#include "ctl.h" +-#include "lbio.h" +-#include "utils.h" +-#include "pkt_handler.h" ++#include "../inc/labrea.h" ++#include "../inc/pkt.h" ++#include "../inc/bget.h" ++#include "../inc/ctl.h" ++#include "../inc/lbio.h" ++#include "../inc/utils.h" ++#include "../inc/pkt_handler.h" + + + /* diff --git a/net/LaBrea/patches/patch-src_syslog.c b/net/LaBrea/patches/patch-src_syslog.c new file mode 100644 index 00000000000..bc749d889f6 --- /dev/null +++ b/net/LaBrea/patches/patch-src_syslog.c @@ -0,0 +1,25 @@ +$NetBSD: patch-src_syslog.c,v 1.1 2012/11/16 20:10:21 joerg Exp $ + +--- src/syslog.c.orig 2003-09-09 20:55:03.000000000 +0000 ++++ src/syslog.c +@@ -43,14 +43,14 @@ + #ifdef HAVE_ERR_H + #include <err.h> + #else +-#include "err.h" ++#include "../inc/err.h" + #endif + +-#include "syslog_name.h" +-#include "syslog.h" +-#include "utils.h" +-#include "labrea.h" +-#include "ctl.h" ++#include "../inc/syslog_name.h" ++#include "../inc/syslog.h" ++#include "../inc/utils.h" ++#include "../inc/labrea.h" ++#include "../inc/ctl.h" + + + #define TBUF_LEN 2048 diff --git a/net/LaBrea/patches/patch-src_utils.c b/net/LaBrea/patches/patch-src_utils.c new file mode 100644 index 00000000000..14dd8e3df1e --- /dev/null +++ b/net/LaBrea/patches/patch-src_utils.c @@ -0,0 +1,43 @@ +$NetBSD: patch-src_utils.c,v 1.1 2012/11/16 20:10:21 joerg Exp $ + +--- src/utils.c.orig 2012-11-16 11:44:53.000000000 +0000 ++++ src/utils.c +@@ -48,7 +48,7 @@ + #ifdef HAVE_SYSLOG_H + #include <syslog.h> + #else +-#include "syslog.h" ++#include "../inc/syslog.h" + #endif + + #include <errno.h> +@@ -56,7 +56,7 @@ + #ifdef HAVE_ERR_H + #include <err.h> + #else +-#include "err.h" ++#include "../inc/err.h" + #endif + + #ifdef HAVE_WINSOCK_H +@@ -67,13 +67,13 @@ + #include <windows.h> + #endif + +-#include "bget.h" +-#include "pkt.h" +-#include "labrea.h" +-#include "pcaputil.h" +-#include "ctl.h" +-#include "lbio.h" +-#include "utils.h" ++#include "../inc/bget.h" ++#include "../inc/pkt.h" ++#include "../inc/labrea.h" ++#include "../inc/pcaputil.h" ++#include "../inc/ctl.h" ++#include "../inc/lbio.h" ++#include "../inc/utils.h" + + + void |