Remove always-false/true conditions based on OSVERSION 500000

2 files changed, 21 insertions, 30 deletions

diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index 3f79c4ccc54a..ea5091b3fcab 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -96,12 +96,6 @@ CONFIGURE_ARGS+=--with-logdir=${LOGDIR} \
 		--without-rlm_sql_sybase \
 		--without-rlm_sql_unixodbc
 
-.if ${OSVERSION} < 500000 && ${OPENSSLBASE} == "/usr"
-PLIST_SUB+=	4SSL="@comment "
-.else
-PLIST_SUB+=	4SSL=""
-.endif
-
 .if ${ARCH} == amd64
 CONFIGURE_ARGS+=	--with-pic
 .endif
@@ -197,7 +191,7 @@ USE_PERL5=	yes
 .endif
 
 # rlm_perl does not build on 4.x
-.if ${OSVERSION} < 500000 || defined(WITH_NOPERL)
+.if defined(WITH_NOPERL)
 CONFIGURE_ARGS+=--without-rlm_perl
 PLIST_SUB+=	RLMPERL="@comment "
 .else
@@ -226,9 +220,6 @@ post-patch:
 		${REINPLACE_CMD} -e "s:\$$(R)\$$(raddbdir):${EXAMPLESDIR}/raddb:g" {} \;
 # Clean up after the last operation (so as not to get unwanted files when installing doc/)
 	@${FIND} -E ${WRKSRC} -regex '.*/Makefile(\.in)?\.(orig|bak)$$' -delete
-.if ${OSVERSION} < 500000
-	@${REINPLACE_CMD} -e 's/-DNO_OPENSSL//' ${WRKSRC}/configure.in
-.endif
 
 pre-configure:
 # Force the rebuild of some configures from configure.in, as we're patching
diff --git a/net/freeradius/pkg-plist b/net/freeradius/pkg-plist
index 1209522478e2..2a6f3e298ca2 100644
--- a/net/freeradius/pkg-plist
+++ b/net/freeradius/pkg-plist
@@ -156,26 +156,26 @@ lib/rlm_eap_mschapv2-%%PORTVERSION%%.so
 lib/rlm_eap_mschapv2.a
 lib/rlm_eap_mschapv2.la
 lib/rlm_eap_mschapv2.so
-%%4SSL%%lib/rlm_eap_peap-%%PORTVERSION%%.la
-%%4SSL%%lib/rlm_eap_peap-%%PORTVERSION%%.so
-%%4SSL%%lib/rlm_eap_peap.a
-%%4SSL%%lib/rlm_eap_peap.la
-%%4SSL%%lib/rlm_eap_peap.so
+lib/rlm_eap_peap-%%PORTVERSION%%.la
+lib/rlm_eap_peap-%%PORTVERSION%%.so
+lib/rlm_eap_peap.a
+lib/rlm_eap_peap.la
+lib/rlm_eap_peap.so
 lib/rlm_eap_sim-%%PORTVERSION%%.la
 lib/rlm_eap_sim-%%PORTVERSION%%.so
 lib/rlm_eap_sim.a
 lib/rlm_eap_sim.la
 lib/rlm_eap_sim.so
-%%4SSL%%lib/rlm_eap_tls-%%PORTVERSION%%.la
-%%4SSL%%lib/rlm_eap_tls-%%PORTVERSION%%.so
-%%4SSL%%lib/rlm_eap_tls.a
-%%4SSL%%lib/rlm_eap_tls.la
-%%4SSL%%lib/rlm_eap_tls.so
-%%4SSL%%lib/rlm_eap_ttls-%%PORTVERSION%%.la
-%%4SSL%%lib/rlm_eap_ttls-%%PORTVERSION%%.so
-%%4SSL%%lib/rlm_eap_ttls.a
-%%4SSL%%lib/rlm_eap_ttls.la
-%%4SSL%%lib/rlm_eap_ttls.so
+lib/rlm_eap_tls-%%PORTVERSION%%.la
+lib/rlm_eap_tls-%%PORTVERSION%%.so
+lib/rlm_eap_tls.a
+lib/rlm_eap_tls.la
+lib/rlm_eap_tls.so
+lib/rlm_eap_ttls-%%PORTVERSION%%.la
+lib/rlm_eap_ttls-%%PORTVERSION%%.so
+lib/rlm_eap_ttls.a
+lib/rlm_eap_ttls.la
+lib/rlm_eap_ttls.so
 %%EXPM%%lib/rlm_example-%%PORTVERSION%%.la
 %%EXPM%%lib/rlm_example-%%PORTVERSION%%.so
 %%EXPM%%lib/rlm_example.a
@@ -226,11 +226,11 @@ lib/rlm_ns_mta_md5-%%PORTVERSION%%.so
 lib/rlm_ns_mta_md5.a
 lib/rlm_ns_mta_md5.la
 lib/rlm_ns_mta_md5.so
-%%4SSL%%lib/rlm_otp-%%PORTVERSION%%.la
-%%4SSL%%lib/rlm_otp-%%PORTVERSION%%.so
-%%4SSL%%lib/rlm_otp.a
-%%4SSL%%lib/rlm_otp.la
-%%4SSL%%lib/rlm_otp.so
+lib/rlm_otp-%%PORTVERSION%%.la
+lib/rlm_otp-%%PORTVERSION%%.so
+lib/rlm_otp.a
+lib/rlm_otp.la
+lib/rlm_otp.so
 lib/rlm_pam-%%PORTVERSION%%.la
 lib/rlm_pam-%%PORTVERSION%%.so
 lib/rlm_pam.a