[Midnightbsd-cvs] CVS Commit: mports/Mk: OSVERSION

[laffer1 at midnightbsd.org]

Log Message:
-----------
OSVERSION

Modified Files:
--------------
    mports/Mk:
        bsd.java.mk (r1.3 -> r1.4)
        bsd.openssl.mk (r1.2 -> r1.3)
        bsd.wx.mk (r1.2 -> r1.3)

-------------- next part --------------
Index: bsd.openssl.mk
===================================================================
RCS file: /home/cvs/mports/Mk/bsd.openssl.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -LMk/bsd.openssl.mk -LMk/bsd.openssl.mk -u -r1.2 -r1.3
--- Mk/bsd.openssl.mk
+++ Mk/bsd.openssl.mk
@@ -106,27 +106,14 @@
 OPENSSLBASE=		${LOCALBASE}
 .if defined(WITH_OPENSSL_BETA)
 OPENSSL_PORT?=		security/openssl-beta
-.if ( ${OSVERSION} >= 600100 )
 OPENSSL_SHLIBVER?=	5
-.else
-OPENSSL_SHLIBVER?=	4
-.endif
 .elif defined(WITH_OPENSSL_STABLE)
 OPENSSL_PORT?=		security/openssl-stable
-.if ( ${OSVERSION} >= 600100 )
 OPENSSL_SHLIBVER?=	4
 .else
-OPENSSL_SHLIBVER?=	3
-.endif
-.else
 OPENSSL_PORT?=		security/openssl
-.if ( ${OSVERSION} >= 600100 )
 OPENSSL_SHLIBVER?=	5
-.else
-OPENSSL_SHLIBVER?=	4
 .endif
-.endif
-
 
 OPENSSLDIR=		${OPENSSLBASE}/openssl
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libcrypto.so.${OPENSSL_SHLIBVER}:${PORTSDIR}/${OPENSSL_PORT}
Index: bsd.java.mk
===================================================================
RCS file: /home/cvs/mports/Mk/bsd.java.mk,v
retrieving revision 1.3
retrieving revision 1.4
diff -LMk/bsd.java.mk -LMk/bsd.java.mk -u -r1.3 -r1.4
--- Mk/bsd.java.mk
+++ Mk/bsd.java.mk
@@ -213,10 +213,8 @@
 # Enforce preferred Java ports according to OS
 .		if ${ARCH} == "amd64"
 _JAVA_PREFERRED_PORTS+=	JAVA_PORT_NATIVE_BSDJAVA_JDK_1_5
-.		elif ${OSVERSION} >= 500000
-_JAVA_PREFERRED_PORTS+=	JAVA_PORT_NATIVE_FREEBSD_JDK_1_5
 .		else
-_JAVA_PREFERRED_PORTS+=	JAVA_PORT_NATIVE_BSDJAVA_JDK_1_5
+_JAVA_PREFERRED_PORTS+=	JAVA_PORT_NATIVE_FREEBSD_JDK_1_5
 .		endif
 
 # List all JDK ports
Index: bsd.wx.mk
===================================================================
RCS file: /home/cvs/mports/Mk/bsd.wx.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -LMk/bsd.wx.mk -LMk/bsd.wx.mk -u -r1.2 -r1.3
--- Mk/bsd.wx.mk
+++ Mk/bsd.wx.mk
@@ -199,7 +199,7 @@
 # Check if Unicode will be used.
 
 .	for __WANT_WX in ${WANT_WX}
-.		if defined(WITH_UNICODE) && ${OSVERSION} >= 500000 && \
+.		if defined(WITH_UNICODE) && \
 		   (${_WX_VERS_UC_ALL:M${__WANT_WX}} != "" || ${WANT_WX:L} == "yes")
 _WX_WANT_UNICODE=		yes
 .		endif
@@ -368,7 +368,7 @@
 
 # Requested by the user (optional).
 
-.if defined(WITH_UNICODE) && ${OSVERSION} >= 500000
+.if defined(WITH_UNICODE)
 .	for ver in ${_WX_VER_UC}
 .		if ${_WX_VERS_UC_ALL:M${ver}} != ""
 WX_UNICODE=				yes
@@ -379,9 +379,7 @@
 # Requested by the port (mandatory).
 
 .if defined(WX_UNICODE)
-.	if ${OSVERSION} < 500000
-_WX_IGNORE?=			requires FreeBSD versions >= 5.X (because of Unicode)
-.	elif empty(_WX_VER_UC)
+.	if empty(_WX_VER_UC)
 _WX_IGNORE?=			selected a WxWidgets version which does not support Unicode: ${_WX_VER_MERGED}
 .	endif
 .endif