From a75ff3339debc23945bc1639860f2ecd6e3c5af5 Mon Sep 17 00:00:00 2001 From: mef Date: Thu, 9 May 2013 06:55:56 +0000 Subject: DragonFly support is being added. More patches (net/agr/if_agrioctl.h is missing now). --- net/lldpd/distinfo | 5 +++- net/lldpd/patches/patch-src_daemon_Makefile.am | 18 +++++++++++ net/lldpd/patches/patch-src_daemon_Makefile.in | 26 ++++++++++++++++ .../patches/patch-src_daemon_interfaces-bsd.c | 35 ++++++++++++++++++++++ 4 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 net/lldpd/patches/patch-src_daemon_Makefile.am create mode 100644 net/lldpd/patches/patch-src_daemon_Makefile.in create mode 100644 net/lldpd/patches/patch-src_daemon_interfaces-bsd.c (limited to 'net') diff --git a/net/lldpd/distinfo b/net/lldpd/distinfo index dc92fbe723d..1f97a2c43c1 100644 --- a/net/lldpd/distinfo +++ b/net/lldpd/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2013/05/09 05:42:53 mef Exp $ +$NetBSD: distinfo,v 1.3 2013/05/09 06:55:56 mef Exp $ SHA1 (lldpd-0.7.2.tar.gz) = 2c2f9e41ec7accd78a48cd80361cebb3e24ce261 RMD160 (lldpd-0.7.2.tar.gz) = ec018def05aed186b3e60cbfda67f9bc52750475 @@ -6,5 +6,8 @@ Size (lldpd-0.7.2.tar.gz) = 1415698 bytes SHA1 (patch-config.h.in) = 703dfd083d845b982baba58a7e5ac220fea14450 SHA1 (patch-configure) = eda1e6a9df484a0b31e168b0ef69b9936afed613 SHA1 (patch-m4_os.m4) = 57e8b6dd6b8d7882dcabe33c75e43c72855ff1a3 +SHA1 (patch-src_daemon_Makefile.am) = cda573199373a5ab1db5bce0345a8e195a85b122 +SHA1 (patch-src_daemon_Makefile.in) = 469546d6a9c429fc9712f4a7eb389ad7b0a76ac1 +SHA1 (patch-src_daemon_interfaces-bsd.c) = cc8c9882d6b2f3146cd3d01e68bf9037913eae3b SHA1 (patch-src_daemon_lldpd.c) = 1cf700e4cd6849449734f1435bb94f125b98ec3b SHA1 (patch-src_daemon_priv.c) = 25daafd24f6eceea02b201fbd2cf324f0ff21379 diff --git a/net/lldpd/patches/patch-src_daemon_Makefile.am b/net/lldpd/patches/patch-src_daemon_Makefile.am new file mode 100644 index 00000000000..fe904cfaabd --- /dev/null +++ b/net/lldpd/patches/patch-src_daemon_Makefile.am @@ -0,0 +1,18 @@ +$NetBSD: patch-src_daemon_Makefile.am,v 1.1 2013/05/09 06:55:57 mef Exp $ + +Add DragonFly support. + +--- src/daemon/Makefile.am.orig 2013-04-13 17:18:24.000000000 +0900 ++++ src/daemon/Makefile.am 2013-05-09 14:47:09.802207000 +0900 +@@ -43,6 +43,11 @@ liblldpd_la_SOURCES += \ + interfaces-bsd.c \ + dmi-dummy.c + endif ++if HOST_OS_DRAGONFLY ++liblldpd_la_SOURCES += \ ++ interfaces-bsd.c \ ++ dmi-dummy.c ++endif + if HOST_OS_OSX + liblldpd_la_SOURCES += \ + interfaces-bsd.c \ diff --git a/net/lldpd/patches/patch-src_daemon_Makefile.in b/net/lldpd/patches/patch-src_daemon_Makefile.in new file mode 100644 index 00000000000..b263b12becd --- /dev/null +++ b/net/lldpd/patches/patch-src_daemon_Makefile.in @@ -0,0 +1,26 @@ +$NetBSD: patch-src_daemon_Makefile.in,v 1.1 2013/05/09 06:55:57 mef Exp $ + +Add DragonFly support. + +--- src/daemon/Makefile.in.orig 2013-04-20 10:06:23.000000000 +0900 ++++ src/daemon/Makefile.in 2013-05-09 14:53:36.188143000 +0900 +@@ -70,6 +70,10 @@ sbin_PROGRAMS = lldpd$(EXEEXT) + @HOST_OS_NETBSD_TRUE@ interfaces-bsd.c \ + @HOST_OS_NETBSD_TRUE@ dmi-dummy.c + ++@HOST_OS_DRAGONFLY_TRUE@am__append_4 = \ ++@HOST_OS_DRAGONFLY_TRUE@ interfaces-bsd.c \ ++@HOST_OS_DRAGONFLY_TRUE@ dmi-dummy.c ++ + @HOST_OS_OSX_TRUE@am__append_5 = \ + @HOST_OS_OSX_TRUE@ interfaces-bsd.c \ + @HOST_OS_OSX_TRUE@ dmi-osx.c +@@ -121,6 +125,8 @@ am__liblldpd_la_SOURCES_DIST = frame.h f + @HOST_OS_OPENBSD_TRUE@ liblldpd_la-dmi-openbsd.lo + @HOST_OS_NETBSD_TRUE@am__objects_4 = liblldpd_la-interfaces-bsd.lo \ + @HOST_OS_NETBSD_TRUE@ liblldpd_la-dmi-dummy.lo ++@HOST_OS_DRAGONFLY_TRUE@am__objects_4 = liblldpd_la-interfaces-bsd.lo \ ++@HOST_OS_DRAGONFLY_TRUE@ liblldpd_la-dmi-dummy.lo + @HOST_OS_OSX_TRUE@am__objects_5 = liblldpd_la-interfaces-bsd.lo \ + @HOST_OS_OSX_TRUE@ liblldpd_la-dmi-osx.lo + @USE_SNMP_TRUE@am__objects_6 = liblldpd_la-agent.lo \ diff --git a/net/lldpd/patches/patch-src_daemon_interfaces-bsd.c b/net/lldpd/patches/patch-src_daemon_interfaces-bsd.c new file mode 100644 index 00000000000..ce83b645869 --- /dev/null +++ b/net/lldpd/patches/patch-src_daemon_interfaces-bsd.c @@ -0,0 +1,35 @@ +$NetBSD: patch-src_daemon_interfaces-bsd.c,v 1.1 2013/05/09 06:55:57 mef Exp $ + +Add DragonFly support +(net/agr/if_agrioctl.h is missing, to be added). + +--- src/daemon/interfaces-bsd.c~ 2013-04-13 17:18:24.000000000 +0900 ++++ src/daemon/interfaces-bsd.c 2013-05-09 15:08:27.911845000 +0900 +@@ -39,6 +39,9 @@ + # include + # include + # include ++#elif defined HOST_OS_DRAGONFLY ++# include ++# include + #elif defined HOST_OS_OSX + # include + # include +@@ -74,7 +77,7 @@ + .ifbic_req = req + }; + +-#if defined HOST_OS_FREEBSD || defined HOST_OS_NETBSD || defined HOST_OS_OSX ++#if defined HOST_OS_FREEBSD || defined HOST_OS_NETBSD || defined HOST_OS_OSX || defined HOST_OS_DRAGONFLY + struct ifdrv ifd = { + .ifd_cmd = BRDGGIFS, + .ifd_len = sizeof(bifc), +@@ -163,7 +166,7 @@ + slave->upper = master; + } + master->type |= IFACE_BOND_T; +-#elif defined HOST_OS_NETBSD ++#elif defined HOST_OS_NETBSD || defined HOST_OS_DRAGONFLY + /* No max, we consider a maximum of 24 ports */ + char buf[sizeof(struct agrportinfo)*24] = {}; + size_t buflen = sizeof(buf); -- cgit v1.2.3