From b2a96c6df1c8809216eced623ec37a8372b3216e Mon Sep 17 00:00:00 2001
From: Pav Lucistnik <pav@FreeBSD.org>
Date: Tue, 6 Jan 2009 17:59:31 +0000
Subject: - Remove conditional checks for FreeBSD 5.x and older

---
 security/cyrus-sasl2/Makefile | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to 'security/cyrus-sasl2')

diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index 1c568d31fe79..83d4ee954577 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -170,7 +170,7 @@ CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
 CONFIGURE_ARGS+=--enable-gssapi=${KRB5_HOME} --with-gss_impl=mit
 .elif !defined(WITHOUT_GSSAPI) && defined(HEIMDAL_HOME) && exists(${HEIMDAL_HOME}/lib/libgssapi.a)
 CONFIGURE_ARGS+=--enable-gssapi=${HEIMDAL_HOME} --with-gss_impl=heimdal
-.elif !defined(WITHOUT_GSSAPI) && ( defined(MAKE_KERBEROS5) || ${OSVERSION} > 500105 ) && exists(/usr/lib/libkrb5.a)
+.elif !defined(WITHOUT_GSSAPI) && exists(/usr/lib/libkrb5.a)
 CONFIGURE_ARGS+=--enable-gssapi
 .else
 CONFIGURE_ARGS+=--disable-gssapi
@@ -178,7 +178,6 @@ GSSAPI=	"@comment "
 .endif
 
 # KERBEROS 4 was removed in FreeBSD 5.0-CURRENT
-.if ${OSVERSION} > 500105
 .if defined(WITH_KERBEROS4)
 LIB_DEPENDS+=	krb.2:${PORTSDIR}/security/krb4
 CONFIGURE_ARGS+=--enable-krb4=${LOCALBASE}/krb4
@@ -186,15 +185,6 @@ CONFIGURE_ARGS+=--enable-krb4=${LOCALBASE}/krb4
 CONFIGURE_ARGS+=--disable-krb4
 EBONES=	"@comment "
 .endif
-.elif exists(/usr/lib/libkrb.a) && defined(MAKE_KERBEROS4) && !defined(WITHOUT_KERBEROS4)
-CONFIGURE_ARGS+=--enable-krb4
-.elif !exists(/usr/lib/libkrb.a) && defined(WITH_KERBEROS4)
-LIB_DEPENDS+=	krb.2:${PORTSDIR}/security/krb4
-CONFIGURE_ARGS+=--enable-krb4=${LOCALBASE}/krb4
-.else
-CONFIGURE_ARGS+=--disable-krb4
-EBONES=	"@comment "
-.endif
 
 .if ${OPENSSLBASE} == /usr
 CONFIGURE_ARGS+=--with-openssl=yes
-- 
cgit v1.2.3