- Do not allow selecting both DEBUG and FASTDEBUG options. [1]

- Re-enable -Werror for HotSpot build with GCC.
- Revert couple of unnecessary local changes to reduce diff.
- Add inactive pages as availble memory.  Note it is a cosmetic change.

PR:		ports/182907 [1]

3 files changed, 18 insertions, 35 deletions

diff --git a/java/openjdk6-jre/Makefile b/java/openjdk6-jre/Makefile
index e4c29c2ab185..051f4402754c 100644
--- a/java/openjdk6-jre/Makefile
+++ b/java/openjdk6-jre/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	java devel
 PKGNAMESUFFIX=	-jre
 
diff --git a/java/openjdk6/Makefile b/java/openjdk6/Makefile
index ac0eaa647dfa..f5809ab2f9a0 100644
--- a/java/openjdk6/Makefile
+++ b/java/openjdk6/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	openjdk6
 PORTVERSION=	b28
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:ant,} \
 		http://download.java.net/openjdk/jtreg/promoted/4.1/b05/:jtreg \
@@ -39,7 +39,9 @@ SOUND_DESC=	Enable sound support
 TZUPDATE_DESC=	Update the time zone data
 
 .if !defined(BUILD_JRE)
-OPTIONS_DEFINE+=DEBUG FASTDEBUG TEST
+OPTIONS_DEFINE+=TEST
+OPTIONS_RADIO=	Debugging
+OPTIONS_RADIO_Debugging=	DEBUG FASTDEBUG
 DEBUG_DESC=	Enable legacy debugging support
 FASTDEBUG_DESC=	Include fastdebug build
 TEST_DESC=	Add support for running regression test
@@ -48,7 +50,7 @@ TEST_DESC=	Add support for running regression test
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 PKGINSTALL=	${WRKDIR}/pkg-install
 
-USES=		gmake iconv motif
+USES=		compiler gmake iconv motif
 
 .include <bsd.port.options.mk>
 .include "${.CURDIR}/../openjdk6/Makefile.icedtea"
@@ -117,9 +119,6 @@ MAKE_ENV=	LANG=C LC_ALL=C OS= \
 		MILESTONE=fcs \
 		JDK_UPDATE_VERSION=${UPDATE_VERSION}
 
-# XXX Turn off -Werror from HotSpot.
-MAKE_ENV+=	COMPILER_WARNINGS_FATAL=false
-
 # XXX Turn off parallel build by default.
 _MAKE_JOBS=	#
 MAKE_ENV+=	ALT_PARALLEL_COMPILE_JOBS=${MAKE_JOBS_NUMBER} \
@@ -130,7 +129,6 @@ ALL_TARGET=	debug_build
 OPENJDK_OSARCH=	bsd-${ARCH:S/i386/i586/}-debug
 .else
 OPENJDK_OSARCH=	bsd-${ARCH:S/i386/i586/}
-MAKE_ENV+=	WARNINGS_ARE_ERRORS=-w
 .endif
 
 # disable FASTDEBUG_BUILD by default to improve compile time.
@@ -192,6 +190,13 @@ ICONV_INCLUDE=	-I${LOCALBASE}/include
 ICONV_LIBS=	-L${LOCALBASE}/lib ${ICONV_LIB}
 .endif
 
+.if defined(COMPILER_TYPE) && ${COMPILER_TYPE} == "clang"
+MAKE_ENV+=	COMPILER_WARNINGS_FATAL=false
+.if empty(PORT_OPTIONS:MDEBUG) && empty(PORT_OPTIONS:MFASTDEBUG)
+MAKE_ENV+=	WARNINGS_ARE_ERRORS=-w
+.endif
+.endif
+
 post-extract:
 	@for d in ${COPYDIRS}; do \
 		${MKDIR} `echo ${WRKSRC}/$$d | ${SED} 's/linux/bsd/g;'`; \
@@ -280,7 +285,7 @@ do-install:
 .else
 	@cd ${WRKSRC}/build/${OPENJDK_OSARCH}/j2sdk-image && \
 	    ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/openjdk6 \
-	    "! ( -type d -name bin -prune )"
+	    "-not ( -type d -name bin -prune )"
 	@cd ${WRKSRC}/build/${OPENJDK_OSARCH}/j2sdk-image && \
 	    ${COPYTREE_BIN} "bin jre/bin" ${STAGEDIR}${PREFIX}/openjdk6
 	@cd ${WRKSRC}/build/${OPENJDK_OSARCH}/j2sdk-image && \
diff --git a/java/openjdk6/files/patch-set b/java/openjdk6/files/patch-set
index 418dafc446bd..b9905915252f 100644
--- a/java/openjdk6/files/patch-set
+++ b/java/openjdk6/files/patch-set
@@ -266,17 +266,6 @@
  endif
  
  # _BOOTDIR1: First choice for a Bootstrap JDK, previous released JDK.
---- corba/make/common/shared/Defs-java.gmk
-+++ corba/make/common/shared/Defs-java.gmk
-@@ -38,7 +38,7 @@
-   #   Suspect this may not be needed anymore.
-   JAVA_MEM_FLAGS   += -Xms$(MAX_VM_MEMORY)m -XX:-Inline
- else
--  JAVA_MEM_FLAGS   += -Xms$(MIN_VM_MEMORY)m -XX:PermSize=32m -XX:MaxPermSize=160m
-+  JAVA_MEM_FLAGS   += -Xms$(MIN_VM_MEMORY)m
- endif
- 
- # 
 --- corba/make/common/shared/Defs-utils.gmk
 +++ corba/make/common/shared/Defs-utils.gmk
 @@ -53,6 +53,13 @@
@@ -681,14 +670,14 @@
 +  static const char *vm_stats[] = {
 +    "vm.stats.vm.v_free_count",
 +    "vm.stats.vm.v_cache_count",
-+    /* "vm.stats.vm.v_inactive_count", */
-+    NULL
++    "vm.stats.vm.v_inactive_count"
 +  };
 +  size_t size;
 +  julong free_pages;
 +  u_int i, npages;
 +
-+  for (i = 0, free_pages = 0, size = sizeof(npages); vm_stats[i] != NULL; i++) {
++  for (i = 0, free_pages = 0; i < nitems(vm_stats); i++) {
++    size = sizeof(npages);
 +    if (sysctlbyname(vm_stats[i], &npages, &size, NULL, 0) == -1) {
 +      free_pages = 0;
 +      break;
@@ -827,7 +816,7 @@
 +  size_t mibsize, size;
 +  int mib[16], n, total = 0, used = 0;
 +
-+  mibsize = sizeof(mib) / sizeof(mib[0]);
++  mibsize = nitems(mib);
 +  if (sysctlnametomib("vm.swap_info", mib, &mibsize) != -1) {
 +    for (n = 0; ; n++) {
 +      mib[mibsize] = n;
@@ -1713,17 +1702,6 @@
  # Import JDK images allow for partial builds, components not built are
  #    imported (or copied from) these import areas when needed.
  
---- jdk/make/common/shared/Defs-java.gmk
-+++ jdk/make/common/shared/Defs-java.gmk
-@@ -42,7 +42,7 @@
-   #   Suspect this may not be needed anymore.
-   JAVA_MEM_FLAGS   += -Xms$(MAX_VM_MEMORY)m -XX:-Inline
- else
--  JAVA_MEM_FLAGS   += -Xms$(MIN_VM_MEMORY)m -XX:PermSize=32m -XX:MaxPermSize=160m
-+  JAVA_MEM_FLAGS   += -Xms$(MIN_VM_MEMORY)m
- endif
- 
- # 
 --- jdk/make/common/shared/Defs-utils.gmk
 +++ jdk/make/common/shared/Defs-utils.gmk
 @@ -80,6 +80,13 @@