8 files changed, 12 insertions, 8 deletions

diff --git a/x11/XFree86-4-clients/Makefile b/x11/XFree86-4-clients/Makefile
index 4c60a7b7d234..794220f3be48 100644
--- a/x11/XFree86-4-clients/Makefile
+++ b/x11/XFree86-4-clients/Makefile
@@ -3,7 +3,7 @@
 # Date created:         5 January 1995
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.54 1999/03/19 22:35:25 asami Exp $
+# $Id: Makefile,v 1.55 1999/07/20 22:14:55 jmz Exp $
 #
 
 DISTNAME=	xc
@@ -25,6 +25,7 @@ ALL_TARGET=	World
 INSTALL_TARGET=	install install.man
 DIST_SUBDIR=	xc
 PATCH_DIST_ARGS=-p0 -E -d ${WRKDIR} --quiet
+SCRIPTS_ENV=	OSVERSION=${OSVERSION}
 # can't use USE_X_PREFIX here -- it will cause a circular dependency
 PREFIX=		${X11BASE}
 MTREE_FILE=	/etc/mtree/BSD.x11.dist
diff --git a/x11/XFree86-4-clients/scripts/configure b/x11/XFree86-4-clients/scripts/configure
index 7a2771866ab1..7b0dd6664444 100644
--- a/x11/XFree86-4-clients/scripts/configure
+++ b/x11/XFree86-4-clients/scripts/configure
@@ -227,7 +227,7 @@ else
   ELF=no
 fi
 
-if [ ! `uname -r|grep ^2` ]; then
+if [ ${OSVERSION} -ge 300000 ]; then
 cat <<'END'
 
  FreeBSD-3.x has support for Secure RPC.
diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile
index 4c60a7b7d234..794220f3be48 100644
--- a/x11/XFree86-4-libraries/Makefile
+++ b/x11/XFree86-4-libraries/Makefile
@@ -3,7 +3,7 @@
 # Date created:         5 January 1995
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.54 1999/03/19 22:35:25 asami Exp $
+# $Id: Makefile,v 1.55 1999/07/20 22:14:55 jmz Exp $
 #
 
 DISTNAME=	xc
@@ -25,6 +25,7 @@ ALL_TARGET=	World
 INSTALL_TARGET=	install install.man
 DIST_SUBDIR=	xc
 PATCH_DIST_ARGS=-p0 -E -d ${WRKDIR} --quiet
+SCRIPTS_ENV=	OSVERSION=${OSVERSION}
 # can't use USE_X_PREFIX here -- it will cause a circular dependency
 PREFIX=		${X11BASE}
 MTREE_FILE=	/etc/mtree/BSD.x11.dist
diff --git a/x11/XFree86-4-libraries/scripts/configure b/x11/XFree86-4-libraries/scripts/configure
index 7a2771866ab1..7b0dd6664444 100644
--- a/x11/XFree86-4-libraries/scripts/configure
+++ b/x11/XFree86-4-libraries/scripts/configure
@@ -227,7 +227,7 @@ else
   ELF=no
 fi
 
-if [ ! `uname -r|grep ^2` ]; then
+if [ ${OSVERSION} -ge 300000 ]; then
 cat <<'END'
 
  FreeBSD-3.x has support for Secure RPC.
diff --git a/x11/XFree86-4/Makefile b/x11/XFree86-4/Makefile
index 4c60a7b7d234..794220f3be48 100644
--- a/x11/XFree86-4/Makefile
+++ b/x11/XFree86-4/Makefile
@@ -3,7 +3,7 @@
 # Date created:         5 January 1995
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.54 1999/03/19 22:35:25 asami Exp $
+# $Id: Makefile,v 1.55 1999/07/20 22:14:55 jmz Exp $
 #
 
 DISTNAME=	xc
@@ -25,6 +25,7 @@ ALL_TARGET=	World
 INSTALL_TARGET=	install install.man
 DIST_SUBDIR=	xc
 PATCH_DIST_ARGS=-p0 -E -d ${WRKDIR} --quiet
+SCRIPTS_ENV=	OSVERSION=${OSVERSION}
 # can't use USE_X_PREFIX here -- it will cause a circular dependency
 PREFIX=		${X11BASE}
 MTREE_FILE=	/etc/mtree/BSD.x11.dist
diff --git a/x11/XFree86-4/scripts/configure b/x11/XFree86-4/scripts/configure
index 7a2771866ab1..7b0dd6664444 100644
--- a/x11/XFree86-4/scripts/configure
+++ b/x11/XFree86-4/scripts/configure
@@ -227,7 +227,7 @@ else
   ELF=no
 fi
 
-if [ ! `uname -r|grep ^2` ]; then
+if [ ${OSVERSION} -ge 300000 ]; then
 cat <<'END'
 
  FreeBSD-3.x has support for Secure RPC.
diff --git a/x11/XFree86/Makefile b/x11/XFree86/Makefile
index 4c60a7b7d234..794220f3be48 100644
--- a/x11/XFree86/Makefile
+++ b/x11/XFree86/Makefile
@@ -3,7 +3,7 @@
 # Date created:         5 January 1995
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.54 1999/03/19 22:35:25 asami Exp $
+# $Id: Makefile,v 1.55 1999/07/20 22:14:55 jmz Exp $
 #
 
 DISTNAME=	xc
@@ -25,6 +25,7 @@ ALL_TARGET=	World
 INSTALL_TARGET=	install install.man
 DIST_SUBDIR=	xc
 PATCH_DIST_ARGS=-p0 -E -d ${WRKDIR} --quiet
+SCRIPTS_ENV=	OSVERSION=${OSVERSION}
 # can't use USE_X_PREFIX here -- it will cause a circular dependency
 PREFIX=		${X11BASE}
 MTREE_FILE=	/etc/mtree/BSD.x11.dist
diff --git a/x11/XFree86/scripts/configure b/x11/XFree86/scripts/configure
index 7a2771866ab1..7b0dd6664444 100644
--- a/x11/XFree86/scripts/configure
+++ b/x11/XFree86/scripts/configure
@@ -227,7 +227,7 @@ else
   ELF=no
 fi
 
-if [ ! `uname -r|grep ^2` ]; then
+if [ ${OSVERSION} -ge 300000 ]; then
 cat <<'END'
 
  FreeBSD-3.x has support for Secure RPC.