From 0438143249634ab5028e53cb468d99a894c62995 Mon Sep 17 00:00:00 2001 From: Mathieu Arnold Date: Fri, 3 Apr 2015 11:26:48 +0000 Subject: Remove OSVERSION checks that do not make sense any more. For example (${OSVERSION} >= 900000 && ${OSVERSION} < 900021) is always true, as is (${OSVERSION} > 900002 || ${OSVERSION} < 900000 && ${OSVERSION} > 800107). Regarding patches, when an EXTRA_PATCHES is no longer needed, I remove it, when it is always needed, I renamed it, in one case, I merged two patches. Differential Revision: https://reviews.freebsd.org/D2209 --- net/ndisc6/Makefile | 4 ---- net/ndisc6/files/extra-patch-rdnssd__rdnssd.h | 18 ------------------ net/ndisc6/files/patch-rdnssd__rdnssd.h | 18 ++++++++++++++++++ 3 files changed, 18 insertions(+), 22 deletions(-) delete mode 100644 net/ndisc6/files/extra-patch-rdnssd__rdnssd.h create mode 100644 net/ndisc6/files/patch-rdnssd__rdnssd.h (limited to 'net/ndisc6') diff --git a/net/ndisc6/Makefile b/net/ndisc6/Makefile index f59ec5a8576e..32e78ba93a02 100644 --- a/net/ndisc6/Makefile +++ b/net/ndisc6/Makefile @@ -27,10 +27,6 @@ OPTIONS_DEFINE= DOCS NLS .include -.if ${OSVERSION} >= 803000 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-rdnssd__rdnssd.h -.endif - .if ${PORT_OPTIONS:MNLS} USES+= gettext LDFLAGS+= -lintl diff --git a/net/ndisc6/files/extra-patch-rdnssd__rdnssd.h b/net/ndisc6/files/extra-patch-rdnssd__rdnssd.h deleted file mode 100644 index 1aa03c3104b9..000000000000 --- a/net/ndisc6/files/extra-patch-rdnssd__rdnssd.h +++ /dev/null @@ -1,18 +0,0 @@ ---- rdnssd/rdnssd.h.orig 2011-07-23 01:03:38.000000000 +0400 -+++ rdnssd/rdnssd.h 2011-07-23 01:03:56.000000000 +0400 -@@ -32,15 +32,6 @@ - /* Belongs in */ - #define ND_OPT_RDNSS 25 - --struct nd_opt_rdnss --{ -- uint8_t nd_opt_rdnss_type; -- uint8_t nd_opt_rdnss_len; -- uint16_t nd_opt_rdnss_resserved1; -- uint32_t nd_opt_rdnss_lifetime; -- /* followed by one or more IPv6 addresses */ --}; -- - # ifdef __cplusplus - extern "C" { - # endif diff --git a/net/ndisc6/files/patch-rdnssd__rdnssd.h b/net/ndisc6/files/patch-rdnssd__rdnssd.h new file mode 100644 index 000000000000..1aa03c3104b9 --- /dev/null +++ b/net/ndisc6/files/patch-rdnssd__rdnssd.h @@ -0,0 +1,18 @@ +--- rdnssd/rdnssd.h.orig 2011-07-23 01:03:38.000000000 +0400 ++++ rdnssd/rdnssd.h 2011-07-23 01:03:56.000000000 +0400 +@@ -32,15 +32,6 @@ + /* Belongs in */ + #define ND_OPT_RDNSS 25 + +-struct nd_opt_rdnss +-{ +- uint8_t nd_opt_rdnss_type; +- uint8_t nd_opt_rdnss_len; +- uint16_t nd_opt_rdnss_resserved1; +- uint32_t nd_opt_rdnss_lifetime; +- /* followed by one or more IPv6 addresses */ +-}; +- + # ifdef __cplusplus + extern "C" { + # endif -- cgit v1.2.3