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, 18 insertions, 40 deletions

diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index 615f5375e58d..d191b36b53a4 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -115,9 +115,7 @@ BDB_LIB_NAME=	no
 EXTRA_PATCHES+=	${WRKSRC}/contrib/drac_auth.patch
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-configure.in \
 		${FILESDIR}/extra-patch-cmulocal::ucdsnmp.m4
-.if ${OSVERSION} >= 800037
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-cmulocal::sasl2.m4
-.endif
 USE_AUTOTOOLS=	autoconf autoheader
 .endif
 
@@ -131,10 +129,6 @@ PLIST_SUB+=	MANCONF="@comment "
 CONFIGURE_ARGS+=--disable-gssapi
 .endif
 
-.if ${OSVERSION} >= 800037
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-configure
-.endif
-
 CYRUS_USER?=	cyrus
 CYRUS_GROUP?=	cyrus
 
diff --git a/mail/cyrus-imapd23/files/extra-patch-configure b/mail/cyrus-imapd23/files/extra-patch-configure
deleted file mode 100644
index 7c3f5c046a22..000000000000
--- a/mail/cyrus-imapd23/files/extra-patch-configure
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: configure
-diff -u configure.orig configure
---- configure.orig	2011-09-09 03:03:46.000000000 +0900
-+++ configure	2011-09-14 13:16:52.766364908 +0900
-@@ -9540,7 +9540,7 @@
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lgssapi ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} $LIBS"
-+LIBS="-lgssapi ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} -lhx509 $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -9842,7 +9842,7 @@
-     GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a ${K5SUPSTATIC}"
-   elif test "$gss_impl" = "heimdal"; then
-     CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL"
--    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err"
-+    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err -lhx509"
-     GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libasn1.a $gssapi_dir/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}"
-   elif test "$gss_impl" = "cybersafe03"; then
- # Version of CyberSafe with two libraries
diff --git a/mail/cyrus-imapd23/files/patch-configure b/mail/cyrus-imapd23/files/patch-configure
index 32ccf2519645..a9c9bfb4a2d0 100644
--- a/mail/cyrus-imapd23/files/patch-configure
+++ b/mail/cyrus-imapd23/files/patch-configure
@@ -19,6 +19,24 @@ diff -u configure.orig configure
  		LIBS="$LIBS -lpcre -lpcreposix";
  
  $as_echo "#define ENABLE_REGEX /**/" >>confdefs.h
+@@ -9540,7 +9540,7 @@
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lgssapi ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} $LIBS"
++LIBS="-lgssapi ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} -lhx509 $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -9842,7 +9842,7 @@
+     GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a ${K5SUPSTATIC}"
+   elif test "$gss_impl" = "heimdal"; then
+     CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL"
+-    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err"
++    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err -lhx509"
+     GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libasn1.a $gssapi_dir/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}"
+   elif test "$gss_impl" = "cybersafe03"; then
+ # Version of CyberSafe with two libraries
 @@ -10781,7 +10784,7 @@
  
  $as_echo "#define HAVE_UCDSNMP 1" >>confdefs.h
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index caf7909381ea..9bd466cec36b 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -109,9 +109,7 @@ BDB_LIB_NAME=	no
 .endif
 
 .if ${PORT_OPTIONS:MDRAC}
-.if ${OSVERSION} >= 800037
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-cmulocal::sasl2.m4
-.endif
 USE_AUTOTOOLS=	autoconf autoheader
 .endif
 
@@ -125,10 +123,6 @@ PLIST_SUB+=	MANCONF="@comment "
 CONFIGURE_ARGS+=--disable-gssapi
 .endif
 
-.if ${OSVERSION} >= 800037
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-configure
-.endif
-
 CYRUS_USER?=	cyrus
 CYRUS_GROUP?=	cyrus
 
diff --git a/mail/cyrus-imapd24/files/extra-patch-configure b/mail/cyrus-imapd24/files/patch-configure
index 4d3deee12dcf..4d3deee12dcf 100644
--- a/mail/cyrus-imapd24/files/extra-patch-configure
+++ b/mail/cyrus-imapd24/files/patch-configure
diff --git a/mail/cyrus-imapd25/Makefile b/mail/cyrus-imapd25/Makefile
index 44eaed5179a4..dabe98bcf40c 100644
--- a/mail/cyrus-imapd25/Makefile
+++ b/mail/cyrus-imapd25/Makefile
@@ -123,9 +123,7 @@ PLIST_SUB+=	CLAMAV="@comment "
 
 .if ${PORT_OPTIONS:MDRAC}
 IGNORE=		DRAC is not available
-# .if ${OSVERSION} >= 800037
 # EXTRA_PATCHES+=	${FILESDIR}/extra-patch-cmulocal__sasl2.m4
-# .endif
 # USE_AUTOTOOLS=	autoconf autoheader
 .endif
 
diff --git a/mail/milter-skem/Makefile b/mail/milter-skem/Makefile
index 163fcb6dd106..1b133c3176c5 100644
--- a/mail/milter-skem/Makefile
+++ b/mail/milter-skem/Makefile
@@ -34,10 +34,6 @@ OPTIONS_DEFAULT=	SKEM_NETINET
 BROKEN=		Does not compile on powerpc
 .endif
 
-.if ${OSVERSION} >= 700011
-EXTRA_PATCHES=  files/timet.patch
-.endif
-
 MAKE_ENV+=	PTHREAD_LIBS="-lpthread"
 
 .for o in ${PORT_OPTIONS:MSKEM_*}
diff --git a/mail/milter-skem/files/timet.patch b/mail/milter-skem/files/patch-cleanup.c
index d125f076815b..d125f076815b 100644
--- a/mail/milter-skem/files/timet.patch
+++ b/mail/milter-skem/files/patch-cleanup.c