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

2 files changed, 1 insertions, 52 deletions

diff --git a/multimedia/v4l-utils/Makefile b/multimedia/v4l-utils/Makefile
index ec44f480ce35..f547ad293fed 100644
--- a/multimedia/v4l-utils/Makefile
+++ b/multimedia/v4l-utils/Makefile
@@ -22,12 +22,6 @@ USE_LDCONFIG=	yes
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/utils
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 800000
-EXTRA_PATCHES=	${FILESDIR}/extra-strnlen
-.endif
-
 post-patch:
 	@${RM} ${WRKSRC}/../include/linux/videodev2.h
 	@${REINPLACE_CMD} -e 's|#include <sys/klog.h>||g' \
@@ -39,4 +33,4 @@ post-patch:
 		${WRKSRC}/v4l2-ctl/ivtv-ctl.c \
 		${WRKSRC}/../include/linux/ivtv.h
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/multimedia/v4l-utils/files/extra-strnlen b/multimedia/v4l-utils/files/extra-strnlen
deleted file mode 100644
index 3954167d8bad..000000000000
--- a/multimedia/v4l-utils/files/extra-strnlen
+++ /dev/null
@@ -1,45 +0,0 @@
-copied from src/lib/libc/string/strnlen.c
-Copyright (c) 2009 David Schultz <das@FreeBSD.org>
-
---- v4l2-compliance/v4l2-compliance.cpp.orig	2011-06-04 11:03:04.000000000 +0200
-+++ v4l2-compliance/v4l2-compliance.cpp	2011-06-04 11:03:34.000000000 +0200
-@@ -56,6 +56,18 @@ enum Option {
- 	OptLast = 256
- };
- 
-+static size_t
-+strnlen(const char *s, size_t maxlen)
-+{
-+        size_t len;
-+ 
-+        for (len = 0; len < maxlen; len++, s++) {
-+                if (!*s)
-+                        break;
-+        }
-+        return (len);
-+}
-+
- static char options[OptLast];
- 
- static int app_result;
---- v4l2-compliance/v4l2-test-controls.cpp.orig	2011-06-04 11:12:52.000000000 +0200
-+++ v4l2-compliance/v4l2-test-controls.cpp	2011-06-04 11:13:06.000000000 +0200
-@@ -32,6 +32,18 @@
- #include <vector>
- #include "v4l2-compliance.h"
- 
-+static size_t
-+strnlen(const char *s, size_t maxlen)
-+{
-+        size_t len;
-+ 
-+        for (len = 0; len < maxlen; len++, s++) {
-+                if (!*s)
-+                        break;
-+        }
-+        return (len);
-+}
-+
- static int checkQCtrl(struct node *node, struct test_queryctrl &qctrl)
- {
- 	struct v4l2_querymenu qmenu;