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

13 files changed, 5 insertions, 86 deletions

diff --git a/devel/gearmand-devel/Makefile b/devel/gearmand-devel/Makefile
index 395c0bfdebfa..d97cfbdec6c5 100644
--- a/devel/gearmand-devel/Makefile
+++ b/devel/gearmand-devel/Makefile
@@ -47,12 +47,6 @@ TOKYOCAB_DESC=	Tokyo Cabinet support for persistent queue
 
 .include <bsd.port.options.mk>
 
-# Workaround for missing sigignore that wasn't introduced until
-# FreeBSD 8.0
-.if ${OSVERSION} < 800041
-BROKEN=	Does not compile without POSIX spawn() support
-.endif
-
 .if ${PORT_OPTIONS:MDRIZZLE}
 LIB_DEPENDS+=		libdrizzleso:${PORTSDIR}/databases/libdrizzle
 CONFIGURE_ARGS+=	--enable-libdrizzle
diff --git a/devel/gearmand/Makefile b/devel/gearmand/Makefile
index 2a7aad4f123b..ca355a09c6a1 100644
--- a/devel/gearmand/Makefile
+++ b/devel/gearmand/Makefile
@@ -45,12 +45,6 @@ TOKYOCAB_DESC=	Tokyo Cabinet support for persistent queue
 
 .include <bsd.port.options.mk>
 
-# Workaround for missing sigignore that wasn't introduced until
-# FreeBSD 8.0
-.if ${OSVERSION} < 800041
-BROKEN=	Does not compile without POSIX spawn() support
-.endif
-
 .if ${PORT_OPTIONS:MDRIZZLE}
 LIB_DEPENDS+=		libdrizzle.so:${PORTSDIR}/databases/libdrizzle
 CONFIGURE_ARGS+=	--enable-libdrizzle
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 5634393b1de6..a8ad68cdf240 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -56,13 +56,7 @@ GDB_DESC=	Install python gdb scripts
 .include <bsd.port.pre.mk>
 
 # doesn't build yet
-#.if (${OSVERSION} < 800000) \
-#	|| (${OSVERSION} >= 800000 && ${OSVERSION} < 802000)
-#	|| (${OSVERSION} >= 900000 && ${OSVERSION} < 900021)
 CONFIGURE_ARGS+=--disable-dtrace
-#.else
-#CONFIGURE_ARGS+=--enable-dtrace
-#.endif
 
 .if empty(ICONV_LIB)
 CONFIGURE_ARGS+=	--with-libiconv=native
diff --git a/devel/libdispatch/Makefile b/devel/libdispatch/Makefile
index c995418b1e46..f114677957d7 100644
--- a/devel/libdispatch/Makefile
+++ b/devel/libdispatch/Makefile
@@ -84,10 +84,6 @@ OPTIONS_DEFAULT=	CLANG
 CLANG_DESC=	Build with LLVM/Clang (required for blocks support)
 .endif
 
-.if ${OSVERSION} <= 800107 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900002)
-IGNORE=	is not supported on this OS version
-.endif
-
 .if ((${OSVERSION} > 900000) && (${OSVERSION} < 1000706))
 .if ${ARCH} == "powerpc
 BROKEN=		Does not configure on powerpc-9
diff --git a/devel/libg19/Makefile b/devel/libg19/Makefile
index ef507e4b00cc..47960cde8bad 100644
--- a/devel/libg19/Makefile
+++ b/devel/libg19/Makefile
@@ -20,10 +20,4 @@ PLIST_FILES=	include/libg19.h \
 		lib/libg19.so.1 \
 		lib/libg19.so.1.0.1
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 800069
-BROKEN=	libusb 1.0 or newer required.
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/libpasori/Makefile b/devel/libpasori/Makefile
index 8422de093004..ff5f50034f8b 100644
--- a/devel/libpasori/Makefile
+++ b/devel/libpasori/Makefile
@@ -21,11 +21,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 post-extract:
 	@${MKDIR} ${WRKSRC}/lib ${WRKSRC}/lpdump ${WRKSRC}/lptest
 	@${CP} ${FILESDIR}/Makefile ${WRKSRC}/Makefile
-.if ${OSVERSION} < 800069
-	@${CP} ${FILESDIR}/Makefile.lib ${WRKSRC}/lib/Makefile
-.else
 	@${CP} ${FILESDIR}/Makefile.lib.usb20 ${WRKSRC}/lib/Makefile
-.endif
 	@${CP} ${FILESDIR}/Makefile.lpdump ${WRKSRC}/lpdump/Makefile
 	@${CP} ${FILESDIR}/Makefile.lptest ${WRKSRC}/lptest/Makefile
 
diff --git a/devel/libpasori/files/Makefile.lib b/devel/libpasori/files/Makefile.lib
deleted file mode 100644
index 2996eee3d9cc..000000000000
--- a/devel/libpasori/files/Makefile.lib
+++ /dev/null
@@ -1,19 +0,0 @@
-# $FreeBSD$
-
-.PATH:		${.CURDIR}/../src
-
-LIB=		pasori
-SRCS=		libpasori_command.c libpasori_com_bsdugen.c \
-		libpasori_polling.c 
-INCS=		libpasori.h libpasori_com.h libpasori_command.h \
-		libpasori_config.h libpasori_liblocal.h
-
-LIBDIR=		${LOCALBASE}/lib
-INCLUDEDIR=	${LOCALBASE}/include 
-NO_PROFILE=
-SHLIB_MAJOR=	1
-
-CFLAGS+=	-D__LIBPASORI_WITH_BSDUGEN
-CFLAGS+=	-Wall -W
-
-.include <bsd.lib.mk>
diff --git a/devel/p4/Makefile.inc b/devel/p4/Makefile.inc
index 4127a7181f60..05c2fdb6aa7c 100644
--- a/devel/p4/Makefile.inc
+++ b/devel/p4/Makefile.inc
@@ -4,19 +4,15 @@
 .if ${ARCH} == amd64
 . if ${OSVERSION} >= 1000100
 PLATFORM=	freebsd100x86_64
-. elif ${OSVERSION} >= 700043
-PLATFORM=	freebsd70x86_64
 . else
-IGNORE=		unsupported OS release, sorry
+PLATFORM=	freebsd70x86_64
 . endif
 
 .elif ${ARCH} == i386
 . if ${OSVERSION} >= 1000100
 PLATFORM=	freebsd100x86
-. elif ${OSVERSION} >= 700043
-PLATFORM=	freebsd70x86
 . else
-IGNORE=		unsupported OS release, sorry
+PLATFORM=	freebsd70x86
 . endif
 
 .else
diff --git a/devel/p4web/Makefile b/devel/p4web/Makefile
index 118e62ef67da..773ececd42d0 100644
--- a/devel/p4web/Makefile
+++ b/devel/p4web/Makefile
@@ -40,19 +40,9 @@ LIB_DEPENDS+=	libstdc++.so.6:${PORTSDIR}/misc/compat9x
 
 # Figure out what to install
 .if ${ARCH} == amd64
-. if ${OSVERSION} >= 700043
 PLATFORM=	freebsd70x86_64
-. else
-IGNORE=		unsupported OS release, sorry
-. endif
-
 .elif ${ARCH} == i386
-. if ${OSVERSION} >= 700043
 PLATFORM=	freebsd70x86
-. else
-IGNORE=		unsupported OS release, sorry
-. endif
-
 .else
 IGNORE=		unsupported OS release, sorry
 .endif
diff --git a/devel/py-freebsd/Makefile b/devel/py-freebsd/Makefile
index 4bb0de6de215..84ebead9c188 100644
--- a/devel/py-freebsd/Makefile
+++ b/devel/py-freebsd/Makefile
@@ -19,11 +19,6 @@ USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.pre.mk>
 
-# Multi-IPv4/v6/no-IP jails.
-.if ${OSVERSION} >= 800056 || \
-    (${OSVERSION} < 800000 && ${OSVERSION} >= 701103)
-EXTRA_PATCHES+=	${FILESDIR}/freebsd8_patch-src-jail.c
-.endif
 .if ${OSVERSION} >= 900030
 EXTRA_PATCHES+=	${FILESDIR}/freebsd9_patch-src-sysctl.c
 .endif
diff --git a/devel/py-freebsd/files/freebsd8_patch-src-jail.c b/devel/py-freebsd/files/patch-src-jail.c
index 09de149a27a1..09de149a27a1 100644
--- a/devel/py-freebsd/files/freebsd8_patch-src-jail.c
+++ b/devel/py-freebsd/files/patch-src-jail.c
diff --git a/devel/rubygem-posix-spawn/Makefile b/devel/rubygem-posix-spawn/Makefile
index 9791b8b2c0b6..3b517b02ac77 100644
--- a/devel/rubygem-posix-spawn/Makefile
+++ b/devel/rubygem-posix-spawn/Makefile
@@ -14,9 +14,4 @@ USE_RUBYGEMS=	yes
 RUBYGEM_AUTOPLIST=	yes
 PLIST_FILES=	bin/posix-spawn-benchmark
 
-.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 800000
-IGNORE=		missing posix_spawnp
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/xc3sprog/Makefile b/devel/xc3sprog/Makefile
index bf66161a1541..4593bb8eb9d6 100644
--- a/devel/xc3sprog/Makefile
+++ b/devel/xc3sprog/Makefile
@@ -19,10 +19,4 @@ PLIST_FILES=	bin/xc3sprog
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xc3sprog ${STAGEDIR}${PREFIX}/bin
 
-.include <bsd.port.pre.mk>
-
-.if (${OSVERSION} < 800069)
-BROKEN=	doesn't build on FreeBSD prior libusb(8) integration to base system
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>