6 files changed, 282 insertions, 24 deletions

diff --git a/java/jdk14/Makefile b/java/jdk14/Makefile
index dd71c24a66da..f8782a5b0f8c 100644
--- a/java/jdk14/Makefile
+++ b/java/jdk14/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}p${JDK_PATCHSET_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	java devel
 MASTER_SITES=	# http://www.sun.com/software/java2/download.html
 #		 http://www.eyesbeyond.com/freebsddom/java/jdk14.html
@@ -99,16 +99,21 @@ http://www.eyesbeyond.com/freebsddom/java/jdk14.html.\n\
 Please place the patchset in ${DISTDIR}.\n
 .endif
 
+.if ${OSVERSION} > 500000
+LINKIT=	-lc_r
+.else
+LINKIT=	-pthread
+.endif
+
 # JDK 1.4.1 require recent version of FreeBSD due to recent libc_r updates.
-# These checks are not prefect but it's better than nothing.
-.if (${OSVERSION} < 470101 || ( ${OSVERSION} >= 500000 && ${OSVERSION} < 500043 ))
-ECHO_MSG=/usr/bin/printf
-IGNORE= :\n\
-You must have a version of FreeBSD later than 4.7-STABLE February 2003\n\
-or 5-CURRENT February 2003 to compile and use JDK 1.4.1.\n
+check-os:
+.if !defined(SKIP_OS_TEST)
+	@mkdir -p ${WRKDIR} ; \
+	gcc ${LINKIT} -o ${WRKDIR}/testos ${FILESDIR}/testos.c > /dev/null 2>&1 ; \
+	${WRKDIR}/testos 2>/dev/null
 .endif
 
-pre-fetch:
+pre-fetch:	check-os
 	@${ECHO_MSG}
 	@${ECHO_MSG} "To build JDK 1.4.1 port, you should have at least"
 	@${ECHO_MSG} "1.5Gb of disk space!"
diff --git a/java/jdk14/files/testos.c b/java/jdk14/files/testos.c
new file mode 100644
index 000000000000..e5c24160901d
--- /dev/null
+++ b/java/jdk14/files/testos.c
@@ -0,0 +1,81 @@
+/*-
+ * Copyright (c) 2003 Alexey Zelkin <phantom@FreeBSD.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * Test pthreads primitives for required functionality in order to run
+ * native FreeBSD JDK1.4.1 port.
+ *
+ * Returns:
+ *    0 - test passed
+ *    1 - general failure
+ *  200 - tests failed
+ *
+ * $FreeBSD$
+ */
+
+#include <stdio.h>
+#include <pthread.h>
+#include <pthread_np.h>
+
+#define TRY(call) {							\
+  if ((call) != 0) {							\
+    printf("LIBC_R TEST: Unexpected error.  Report to MAINTAINER\n");	\
+    exit(200);								\
+  }									\
+}
+
+void *
+doit(void *data)
+{
+	pthread_attr_t attr;
+	void *mystack = NULL;
+
+	TRY(pthread_attr_init(&attr));
+	TRY(pthread_attr_get_np(pthread_self(), &attr));
+	TRY(pthread_attr_getstackaddr(&attr, &mystack));
+
+	if (mystack == NULL) {
+		printf("LIBC_R TEST FAILED: libc_r update required\n");
+		exit(1);
+	}
+
+	printf("LIBC_R TEST PASSED: All Ok\n");
+	return(NULL);
+}
+
+int
+main()
+{
+	pthread_t tid;
+	pthread_attr_t attr;
+
+	int sz = 128*1024;
+
+	TRY(pthread_attr_init(&attr));
+	TRY(pthread_attr_setstacksize(&attr, sz));
+	TRY(pthread_create(&tid, &attr, doit, NULL));
+	TRY(pthread_join(tid, NULL));
+
+	exit(0);
+}
diff --git a/java/jdk15/Makefile b/java/jdk15/Makefile
index dd71c24a66da..f8782a5b0f8c 100644
--- a/java/jdk15/Makefile
+++ b/java/jdk15/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}p${JDK_PATCHSET_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	java devel
 MASTER_SITES=	# http://www.sun.com/software/java2/download.html
 #		 http://www.eyesbeyond.com/freebsddom/java/jdk14.html
@@ -99,16 +99,21 @@ http://www.eyesbeyond.com/freebsddom/java/jdk14.html.\n\
 Please place the patchset in ${DISTDIR}.\n
 .endif
 
+.if ${OSVERSION} > 500000
+LINKIT=	-lc_r
+.else
+LINKIT=	-pthread
+.endif
+
 # JDK 1.4.1 require recent version of FreeBSD due to recent libc_r updates.
-# These checks are not prefect but it's better than nothing.
-.if (${OSVERSION} < 470101 || ( ${OSVERSION} >= 500000 && ${OSVERSION} < 500043 ))
-ECHO_MSG=/usr/bin/printf
-IGNORE= :\n\
-You must have a version of FreeBSD later than 4.7-STABLE February 2003\n\
-or 5-CURRENT February 2003 to compile and use JDK 1.4.1.\n
+check-os:
+.if !defined(SKIP_OS_TEST)
+	@mkdir -p ${WRKDIR} ; \
+	gcc ${LINKIT} -o ${WRKDIR}/testos ${FILESDIR}/testos.c > /dev/null 2>&1 ; \
+	${WRKDIR}/testos 2>/dev/null
 .endif
 
-pre-fetch:
+pre-fetch:	check-os
 	@${ECHO_MSG}
 	@${ECHO_MSG} "To build JDK 1.4.1 port, you should have at least"
 	@${ECHO_MSG} "1.5Gb of disk space!"
diff --git a/java/jdk15/files/testos.c b/java/jdk15/files/testos.c
new file mode 100644
index 000000000000..e5c24160901d
--- /dev/null
+++ b/java/jdk15/files/testos.c
@@ -0,0 +1,81 @@
+/*-
+ * Copyright (c) 2003 Alexey Zelkin <phantom@FreeBSD.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * Test pthreads primitives for required functionality in order to run
+ * native FreeBSD JDK1.4.1 port.
+ *
+ * Returns:
+ *    0 - test passed
+ *    1 - general failure
+ *  200 - tests failed
+ *
+ * $FreeBSD$
+ */
+
+#include <stdio.h>
+#include <pthread.h>
+#include <pthread_np.h>
+
+#define TRY(call) {							\
+  if ((call) != 0) {							\
+    printf("LIBC_R TEST: Unexpected error.  Report to MAINTAINER\n");	\
+    exit(200);								\
+  }									\
+}
+
+void *
+doit(void *data)
+{
+	pthread_attr_t attr;
+	void *mystack = NULL;
+
+	TRY(pthread_attr_init(&attr));
+	TRY(pthread_attr_get_np(pthread_self(), &attr));
+	TRY(pthread_attr_getstackaddr(&attr, &mystack));
+
+	if (mystack == NULL) {
+		printf("LIBC_R TEST FAILED: libc_r update required\n");
+		exit(1);
+	}
+
+	printf("LIBC_R TEST PASSED: All Ok\n");
+	return(NULL);
+}
+
+int
+main()
+{
+	pthread_t tid;
+	pthread_attr_t attr;
+
+	int sz = 128*1024;
+
+	TRY(pthread_attr_init(&attr));
+	TRY(pthread_attr_setstacksize(&attr, sz));
+	TRY(pthread_create(&tid, &attr, doit, NULL));
+	TRY(pthread_join(tid, NULL));
+
+	exit(0);
+}
diff --git a/java/jdk16/Makefile b/java/jdk16/Makefile
index dd71c24a66da..f8782a5b0f8c 100644
--- a/java/jdk16/Makefile
+++ b/java/jdk16/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}p${JDK_PATCHSET_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	java devel
 MASTER_SITES=	# http://www.sun.com/software/java2/download.html
 #		 http://www.eyesbeyond.com/freebsddom/java/jdk14.html
@@ -99,16 +99,21 @@ http://www.eyesbeyond.com/freebsddom/java/jdk14.html.\n\
 Please place the patchset in ${DISTDIR}.\n
 .endif
 
+.if ${OSVERSION} > 500000
+LINKIT=	-lc_r
+.else
+LINKIT=	-pthread
+.endif
+
 # JDK 1.4.1 require recent version of FreeBSD due to recent libc_r updates.
-# These checks are not prefect but it's better than nothing.
-.if (${OSVERSION} < 470101 || ( ${OSVERSION} >= 500000 && ${OSVERSION} < 500043 ))
-ECHO_MSG=/usr/bin/printf
-IGNORE= :\n\
-You must have a version of FreeBSD later than 4.7-STABLE February 2003\n\
-or 5-CURRENT February 2003 to compile and use JDK 1.4.1.\n
+check-os:
+.if !defined(SKIP_OS_TEST)
+	@mkdir -p ${WRKDIR} ; \
+	gcc ${LINKIT} -o ${WRKDIR}/testos ${FILESDIR}/testos.c > /dev/null 2>&1 ; \
+	${WRKDIR}/testos 2>/dev/null
 .endif
 
-pre-fetch:
+pre-fetch:	check-os
 	@${ECHO_MSG}
 	@${ECHO_MSG} "To build JDK 1.4.1 port, you should have at least"
 	@${ECHO_MSG} "1.5Gb of disk space!"
diff --git a/java/jdk16/files/testos.c b/java/jdk16/files/testos.c
new file mode 100644
index 000000000000..e5c24160901d
--- /dev/null
+++ b/java/jdk16/files/testos.c
@@ -0,0 +1,81 @@
+/*-
+ * Copyright (c) 2003 Alexey Zelkin <phantom@FreeBSD.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * Test pthreads primitives for required functionality in order to run
+ * native FreeBSD JDK1.4.1 port.
+ *
+ * Returns:
+ *    0 - test passed
+ *    1 - general failure
+ *  200 - tests failed
+ *
+ * $FreeBSD$
+ */
+
+#include <stdio.h>
+#include <pthread.h>
+#include <pthread_np.h>
+
+#define TRY(call) {							\
+  if ((call) != 0) {							\
+    printf("LIBC_R TEST: Unexpected error.  Report to MAINTAINER\n");	\
+    exit(200);								\
+  }									\
+}
+
+void *
+doit(void *data)
+{
+	pthread_attr_t attr;
+	void *mystack = NULL;
+
+	TRY(pthread_attr_init(&attr));
+	TRY(pthread_attr_get_np(pthread_self(), &attr));
+	TRY(pthread_attr_getstackaddr(&attr, &mystack));
+
+	if (mystack == NULL) {
+		printf("LIBC_R TEST FAILED: libc_r update required\n");
+		exit(1);
+	}
+
+	printf("LIBC_R TEST PASSED: All Ok\n");
+	return(NULL);
+}
+
+int
+main()
+{
+	pthread_t tid;
+	pthread_attr_t attr;
+
+	int sz = 128*1024;
+
+	TRY(pthread_attr_init(&attr));
+	TRY(pthread_attr_setstacksize(&attr, sz));
+	TRY(pthread_create(&tid, &attr, doit, NULL));
+	TRY(pthread_join(tid, NULL));
+
+	exit(0);
+}