Index: /usr/ports/Mk/bsd.port.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.484
diff -u -u -r1.484 bsd.port.mk
--- /usr/ports/Mk/bsd.port.mk	4 Feb 2004 04:27:04 -0000	1.484
+++ /usr/ports/Mk/bsd.port.mk	3 Mar 2004 20:04:23 -0000
@@ -960,6 +960,11 @@
 WHICH?=		/usr/bin/which
 XARGS?=		/usr/bin/xargs
 YACC?=		/usr/bin/yacc
+.if exists(/usr/sbin/sysctl)
+SYSCTL?=	/usr/sbin/sysctl
+.else
+SYSCTL?=	/sbin/sysctl
+.endif
 
 # ECHO is defined in /usr/share/mk/sys.mk, which can either be "echo",
 # or "true" if the make flag -s is given.  Use ECHO_CMD where you mean
@@ -989,11 +994,18 @@
 
 # Get __FreeBSD_version
 .if !defined(OSVERSION)
-.if exists(/sbin/sysctl)
-OSVERSION!=	/sbin/sysctl -n kern.osreldate
-.else
-OSVERSION!=	/usr/sbin/sysctl -n kern.osreldate
+OSVERSION!=	${SYSCTL} -n kern.osreldate
 .endif
+
+.if !defined(IS_JAILED)
+.   if ${OSVERSION} >= 502102
+IS_JAILED!=	${SYSCTL} -n security.jail.jailed
+.       if ${IS_JAILED} == 1
+IS_JAILED=	YES
+.       else
+.undef IS_JAILED
+.       endif
+.    endif
 .endif
 
 # Get the object format.
@@ -2636,11 +2648,7 @@
 .if defined(GNU_CONFIGURE)
 # Maximum command line length
 .if !defined(CONFIGURE_MAX_CMD_LEN)
-.if exists(/sbin/sysctl)
-CONFIGURE_MAX_CMD_LEN!=	/sbin/sysctl -n kern.argmax
-.else
-CONFIGURE_MAX_CMD_LEN!=	/usr/sbin/sysctl -n kern.argmax
-.endif
+CONFIGURE_MAX_CMD_LEN!=	${SYSCTL} -n kern.argmax
 .endif
 CONFIGURE_ARGS+=	--prefix=${PREFIX} ${CONFIGURE_TARGET}
 CONFIGURE_ENV+=		lt_cv_sys_max_cmd_len=${CONFIGURE_MAX_CMD_LEN}