diff options
author | mef <mef> | 2013-05-09 05:42:53 +0000 |
---|---|---|
committer | mef <mef> | 2013-05-09 05:42:53 +0000 |
commit | ef4ea1729d4eee16cfadc69f8fe07e243c9d910e (patch) | |
tree | 1a00105081fa6995a92d0a112585107cb15d58bc /net | |
parent | b6ca283d270711470b0c205262086779b2007f94 (diff) | |
download | pkgsrc-ef4ea1729d4eee16cfadc69f8fe07e243c9d910e.tar.gz |
DragonFly support is being Added, but not completed yet.
NOT_FOR_PLATFORM= DragonFly-*-* is in Makefile.
The function interfaces_update in src/daemon/lldpd.{c,h} has to be fixed.
Diffstat (limited to 'net')
-rw-r--r-- | net/lldpd/Makefile | 4 | ||||
-rw-r--r-- | net/lldpd/distinfo | 7 | ||||
-rw-r--r-- | net/lldpd/patches/patch-config.h.in | 16 | ||||
-rw-r--r-- | net/lldpd/patches/patch-configure | 51 | ||||
-rw-r--r-- | net/lldpd/patches/patch-m4_os.m4 | 14 | ||||
-rw-r--r-- | net/lldpd/patches/patch-src_daemon_lldpd.c | 23 | ||||
-rw-r--r-- | net/lldpd/patches/patch-src_daemon_priv.c | 31 |
7 files changed, 144 insertions, 2 deletions
diff --git a/net/lldpd/Makefile b/net/lldpd/Makefile index 802090d285d..45267917e98 100644 --- a/net/lldpd/Makefile +++ b/net/lldpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2013/05/09 02:05:55 obache Exp $ +# $NetBSD: Makefile,v 1.3 2013/05/09 05:42:53 mef Exp $ DISTNAME= lldpd-0.7.2 CATEGORIES= net @@ -12,6 +12,8 @@ LICENSE= isc # if available. To avoid this, use `--without-readline` as a configure # option. +NOT_FOR_PLATFORM= DragonFly-*-* + PKG_INSTALLATION_TYPES= overwrite pkgviews USE_LIBTOOL= yes diff --git a/net/lldpd/distinfo b/net/lldpd/distinfo index b50a0bcee6a..dc92fbe723d 100644 --- a/net/lldpd/distinfo +++ b/net/lldpd/distinfo @@ -1,5 +1,10 @@ -$NetBSD: distinfo,v 1.1 2013/05/09 01:39:42 mef Exp $ +$NetBSD: distinfo,v 1.2 2013/05/09 05:42:53 mef Exp $ SHA1 (lldpd-0.7.2.tar.gz) = 2c2f9e41ec7accd78a48cd80361cebb3e24ce261 RMD160 (lldpd-0.7.2.tar.gz) = ec018def05aed186b3e60cbfda67f9bc52750475 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_lldpd.c) = 1cf700e4cd6849449734f1435bb94f125b98ec3b +SHA1 (patch-src_daemon_priv.c) = 25daafd24f6eceea02b201fbd2cf324f0ff21379 diff --git a/net/lldpd/patches/patch-config.h.in b/net/lldpd/patches/patch-config.h.in new file mode 100644 index 00000000000..462e99a0c96 --- /dev/null +++ b/net/lldpd/patches/patch-config.h.in @@ -0,0 +1,16 @@ +$NetBSD: patch-config.h.in,v 1.1 2013/05/09 05:42:53 mef Exp $ + +Add DragonFly support. This is generated by autoheader 2.69 + +--- config.h.in.orig 2013-05-09 13:46:10.955989000 +0900 ++++ config.h.in 2013-05-09 13:48:31.000000000 +0900 +@@ -126,6 +126,9 @@ + /* Define if libc defines __progname */ + #undef HAVE___PROGNAME + ++/* Host operating system is DragonFly */ ++#undef HOST_OS_DRAGONFLY ++ + /* Host operating system is FreeBSD */ + #undef HOST_OS_FREEBSD + diff --git a/net/lldpd/patches/patch-configure b/net/lldpd/patches/patch-configure new file mode 100644 index 00000000000..b2bec00e387 --- /dev/null +++ b/net/lldpd/patches/patch-configure @@ -0,0 +1,51 @@ +$NetBSD: patch-configure,v 1.1 2013/05/09 05:42:53 mef Exp $ + +Add DragonFly support. This is generated by autoconf 2.69. + +--- configure.orig 2013-05-09 12:22:10.768547000 +0900 ++++ configure 2013-05-09 12:22:16.538636000 +0900 +@@ -668,6 +668,8 @@ PKG_CONFIG + LIBOBJS + HOST_OS_OSX_FALSE + HOST_OS_OSX_TRUE ++HOST_OS_DRAGONFLY_FALSE ++HOST_OS_DRAGONFLY_TRUE + HOST_OS_NETBSD_FALSE + HOST_OS_NETBSD_TRUE + HOST_OS_OPENBSD_FALSE +@@ -19472,6 +19474,24 @@ else + fi + + case $host_os in ++ dragonfly*) ++ os="DragonFly" ++ ++cat >>confdefs.h <<_ACEOF ++#define HOST_OS_DRAGONFLY 1 ++_ACEOF ++ ++ ;; ++ esac ++ if test x"$os" = x"DragonFly"; then ++ HOST_OS_DRAGONFLY_TRUE= ++ HOST_OS_DRAGONFLY_FALSE='#' ++else ++ HOST_OS_DRAGONFLY_TRUE='#' ++ HOST_OS_DRAGONFLY_FALSE= ++fi ++ ++ case $host_os in + darwin*) + os="Mac OS X" + +@@ -21821,6 +21841,10 @@ if test -z "${HOST_OS_NETBSD_TRUE}" && t + as_fn_error $? "conditional \"HOST_OS_NETBSD\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi ++if test -z "${HOST_OS_DRAGONFLY_TRUE}" && test -z "${HOST_OS_DRAGONFLY_FALSE}"; then ++ as_fn_error $? "conditional \"HOST_OS_DRAGONFLY\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi + if test -z "${HOST_OS_OSX_TRUE}" && test -z "${HOST_OS_OSX_FALSE}"; then + as_fn_error $? "conditional \"HOST_OS_OSX\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 diff --git a/net/lldpd/patches/patch-m4_os.m4 b/net/lldpd/patches/patch-m4_os.m4 new file mode 100644 index 00000000000..77450bfbaed --- /dev/null +++ b/net/lldpd/patches/patch-m4_os.m4 @@ -0,0 +1,14 @@ +$NetBSD: patch-m4_os.m4,v 1.1 2013/05/09 05:42:53 mef Exp $ + +Add DragonFly support. Run autoconf if changed. + +--- m4/os.m4.orig 2013-05-09 12:19:37.356190000 +0900 ++++ m4/os.m4 2013-05-09 12:20:17.026800000 +0900 +@@ -21,6 +21,7 @@ AC_DEFUN([lldp_CHECK_OS], [ + lldp_DEFINE_OS(freebsd*|kfreebsd*, FreeBSD, FREEBSD) + lldp_DEFINE_OS(openbsd*, OpenBSD, OPENBSD) + lldp_DEFINE_OS(netbsd*, NetBSD, NETBSD) ++ lldp_DEFINE_OS(dragonfly*, DragonFly, DRAGONFLY) + lldp_DEFINE_OS(darwin*, [Mac OS X], OSX) + + if test x"$os" = x; then diff --git a/net/lldpd/patches/patch-src_daemon_lldpd.c b/net/lldpd/patches/patch-src_daemon_lldpd.c new file mode 100644 index 00000000000..8782e341b06 --- /dev/null +++ b/net/lldpd/patches/patch-src_daemon_lldpd.c @@ -0,0 +1,23 @@ +$NetBSD: patch-src_daemon_lldpd.c,v 1.1 2013/05/09 05:42:53 mef Exp $ + +Add DragonFly support. + +--- src/daemon/lldpd.c~ 2013-04-13 17:21:43.000000000 +0900 ++++ src/daemon/lldpd.c 2013-05-09 13:53:17.252539000 +0900 +@@ -40,6 +40,7 @@ + #if defined HOST_OS_FREEBSD || \ + defined HOST_OS_OPENBSD || \ + defined HOST_OS_NETBSD || \ ++ defined HOST_OS_DRAGONFLY || \ + defined HOST_OS_OSX + # include <sys/param.h> + # include <sys/sysctl.h> +@@ -873,7 +874,7 @@ lldpd_forwarding_enabled(void) + rc = 1; + close(f); + } +-#elif defined HOST_OS_FREEBSD || defined HOST_OS_OPENBSD || defined HOST_OS_NETBSD || defined HOST_OS_OSX ++#elif defined HOST_OS_FREEBSD || defined HOST_OS_OPENBSD || defined HOST_OS_NETBSD || defined HOST_OS_OSX || defined HOST_OS_DRAGONFLY + int n, mib[4] = { + CTL_NET, + PF_INET, diff --git a/net/lldpd/patches/patch-src_daemon_priv.c b/net/lldpd/patches/patch-src_daemon_priv.c new file mode 100644 index 00000000000..7dc14848737 --- /dev/null +++ b/net/lldpd/patches/patch-src_daemon_priv.c @@ -0,0 +1,31 @@ +$NetBSD: patch-src_daemon_priv.c,v 1.1 2013/05/09 05:42:53 mef Exp $ + +Add DragonFly support. + +--- src/daemon/priv.c.orig 2013-05-09 12:26:14.352290000 +0900 ++++ src/daemon/priv.c 2013-05-09 12:27:54.003821000 +0900 +@@ -42,6 +42,7 @@ + #endif + #if defined HOST_OS_FREEBSD || \ + HOST_OS_NETBSD || \ ++ HOST_OS_DRAGONFLY || \ + HOST_OS_OPENBSD || \ + HOST_OS_OSX + # include <net/bpf.h> +@@ -406,6 +407,7 @@ asroot_iface_init() + #elif defined HOST_OS_FREEBSD || \ + defined HOST_OS_OPENBSD || \ + defined HOST_OS_NETBSD || \ ++ defined HOST_OS_DRAGONFLY || \ + defined HOST_OS_OSX + int n = 0; + int enable, required; +@@ -538,7 +540,7 @@ asroot_iface_multicast() + dlp->sdl_alen = ETHER_ADDR_LEN; + dlp->sdl_slen = 0; + must_read(remote, LLADDR(dlp), ETHER_ADDR_LEN); +-#elif defined HOST_OS_OPENBSD || defined HOST_OS_NETBSD ++#elif defined HOST_OS_OPENBSD || defined HOST_OS_NETBSD || defined HOST_OS_DRAGONFLY + struct sockaddr *sap = (struct sockaddr *)&ifr.ifr_addr; + sap->sa_len = sizeof(struct sockaddr); + sap->sa_family = AF_UNSPEC; |