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

8 files changed, 9 insertions, 70 deletions

diff --git a/security/fprint_demo/Makefile b/security/fprint_demo/Makefile
index 94a67978bda4..94b53109a1c5 100644
--- a/security/fprint_demo/Makefile
+++ b/security/fprint_demo/Makefile
@@ -17,18 +17,12 @@ LIB_DEPENDS=	libfprint.so:${PORTSDIR}/security/libfprint
 USE_AUTOTOOLS=	autoconf automake
 AUTOMAKE_ARGS=	-a
 GNU_CONFIGURE=	yes
-USES=		pkgconfig
+USES=		pkgconfig desktop-file-utils
 USE_GNOME=	atk glib20 gtk20 pango
 INSTALLS_ICONS=	yes
 
 WRKSRC=	${WRKDIR}
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 800069
-IGNORE=		libfprint will not compile on FreeBSD < 8
-.endif
-
 CONFIGURE_ENV+=	CRYPTO_CFLAGS=-I${OPENSSLINC} \
 		CRYPTO_LIBS=-lcrypto
 CFLAGS+=	-DHAVE_MEMMEM
@@ -36,14 +30,4 @@ CFLAGS+=	-DHAVE_MEMMEM
 pre-configure:
 	cd ${WRKDIR} && ${ACLOCAL}
 
-post-install:
-	@-update-desktop-database
-	@${ECHO}
-	@${ECHO} =========================================================================
-	@${ECHO}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO}
-	@${ECHO} =========================================================================
-	@${ECHO}
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/fwbuilder/Makefile b/security/fwbuilder/Makefile
index d648ec2f7d5b..13279a16f058 100644
--- a/security/fwbuilder/Makefile
+++ b/security/fwbuilder/Makefile
@@ -58,7 +58,7 @@ CONFIGURE_ARGS=	--with-docdir=${DOCSDIR} --with-qtdir=${QTDIR} \
 		--prefix=${PREFIX}
 MAKE_ARGS+=	QTDIR="${QTDIR}" \
 		QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
-MAKE_ENV=	INSTALL_ROOT=${STAGEDIR}
+MAKE_ENV=	INSTALL_ROOT=${STAGEDIR} CCACHE_DISABLE=yes
 USE_LDCONFIG=	yes
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
@@ -66,10 +66,6 @@ PORTDOCS=	*
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 800107
-MAKE_ENV+=	CCACHE_DISABLE=yes
-.endif
-
 .if  ${OSVERSION} >= 1000055
 # IMPORTANT: Newer versions of rcs will NOT work with fwbuilder.
 RUN_DEPENDS=	rcs:${PORTSDIR}/devel/rcs57
diff --git a/security/oidentd/Makefile b/security/oidentd/Makefile
index 103d570b76fb..662e6079dcb7 100644
--- a/security/oidentd/Makefile
+++ b/security/oidentd/Makefile
@@ -23,9 +23,9 @@ PLIST_FILES+=	man/man${man:E}/${man}.gz
 .endfor
 USE_CSTD=	gnu89
 
-OPTIONS_DEFINE=	IPV6 MASQ
-OPTIONS_DEFAULT=	MASQ
-MASQ_DESC=	Enable NAT/IP masq support
+OPTIONS_DEFINE=	IPV6
+
+CONFIGURE_ARGS=--disable-masq
 
 .include <bsd.port.options.mk>
 
@@ -35,10 +35,6 @@ CONFIGURE_ARGS+=--disable-ipv6
 CATEGORIES+=	ipv6
 .endif
 
-.if ! ${PORT_OPTIONS:MMASQ} || ${OSVERSION} >= 800000
-CONFIGURE_ARGS+=--disable-masq
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's,/etc/,${PREFIX}&,g' ${WRKSRC}/src/oidentd.h
 	@${REINPLACE_CMD} -e 's|\[5-9\]||g;s|\[4-9\]||g' ${WRKSRC}/configure
diff --git a/security/openbsm-devel/Makefile b/security/openbsm-devel/Makefile
index d619b415a04e..d72fce8e123e 100644
--- a/security/openbsm-devel/Makefile
+++ b/security/openbsm-devel/Makefile
@@ -32,16 +32,12 @@ VARAUDIT=	/var/audit
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 902000 && ${OSVERSION} >= 800000
+.if ${OSVERSION} < 902000
 NEEDVARDIRS=	""
 .else
 NEEDVARDIRS=	"@comment "
 .endif
 
-.if ${OSVERSION} <= 800000
-IGNORE=		requires FreeBSD 8.x or above
-.endif
-
 .if ${OSVERSION} >= 1000000
 IGNORE=		is not needed under FreeBSD 10.x or higher
 .endif
@@ -50,7 +46,7 @@ post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libauditd.so.0.0.0
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libbsm.so.0.0.0
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/auditfilter_noop.so.0.0.0
-.if ${OSVERSION} < 902000 && ${OSVERSION} >= 800000
+.if ${OSVERSION} < 902000
 	@${MKDIR} -m 0770 \
 		${STAGEDIR}${VARAUDIT}/dist ${STAGEDIR}${VARAUDIT}/remote
 .endif
diff --git a/security/ossec-hids-server/Makefile b/security/ossec-hids-server/Makefile
index 283cc422c493..72e98a29e098 100644
--- a/security/ossec-hids-server/Makefile
+++ b/security/ossec-hids-server/Makefile
@@ -37,10 +37,6 @@ PLIST_SUB=	PORTNAME=${PORTNAME}
 PORTDOCS=	BUGS CONFIG CONTRIBUTORS INSTALL LICENSE
 
 .include <bsd.port.pre.mk>
-.if ${OSVERSION} < 800067
-# Add string function that didn't exist until 8.x
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src__os_csyslogd__csyslogd.c
-.endif
 
 .if !defined(CLIENT_ONLY)
 .if ${PORT_OPTIONS:MMYSQL}
diff --git a/security/ossec-hids-server/files/extra-patch-src__os_csyslogd__csyslogd.c b/security/ossec-hids-server/files/extra-patch-src__os_csyslogd__csyslogd.c
deleted file mode 100644
index 73ee689e1595..000000000000
--- a/security/ossec-hids-server/files/extra-patch-src__os_csyslogd__csyslogd.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./src/os_csyslogd/csyslogd.c.orig	2013-01-15 16:31:13.000000000 -0500
-+++ ./src/os_csyslogd/csyslogd.c	2013-01-15 16:32:23.000000000 -0500
-@@ -23,7 +23,16 @@
- #include "csyslogd.h"
- #include "os_net/os_net.h"
- 
-+#ifndef HAVE_STRNLEN
-+size_t strnlen(char *s, size_t maxlen)
-+{
-+    size_t i;
- 
-+    for (i= 0; i < maxlen && *s != '\0'; i++, s++)
-+        ;
-+    return i;
-+}
-+#endif
- 
- /* OS_SyslogD: Monitor the alerts and sends them via syslog.
-  * Only return in case of error.
diff --git a/security/pam_fprint/Makefile b/security/pam_fprint/Makefile
index e3ac18550049..983332629e97 100644
--- a/security/pam_fprint/Makefile
+++ b/security/pam_fprint/Makefile
@@ -29,13 +29,7 @@ PLIST_FILES+=	bin/pam_fprint_enroll \
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 800069
-IGNORE=		dependency libfprint will not compile on FreeBsd < 8
-.endif
-
 pre-configure:
 	cd ${WRKDIR} && ${ACLOCAL}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/pam_jail/Makefile b/security/pam_jail/Makefile
index 376abe30c0e2..e6bdd91512f4 100644
--- a/security/pam_jail/Makefile
+++ b/security/pam_jail/Makefile
@@ -21,10 +21,6 @@ do-install:
 	${LN} -sf pam_jail.so.1 ${STAGEDIR}${PREFIX}/lib/pam_jail.so
 	${INSTALL_MAN} ${WRKSRC}/pam_jail.8 ${STAGEDIR}${PREFIX}/man/man8/
 
-.if ${OSVERSION} < 800000
-BROKEN=		jail version not supported
-.endif
-
 .if ${ARCH} == "sparc64"
 BROKEN=		Does not compile on sparc64
 .endif