ports/138348: patch to java/openjdk6 so that build works again

[Kurt Jaeger]

>Number:         138348
>Category:       ports
>Synopsis:       patch to java/openjdk6 so that build works again
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Aug 30 15:20:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Kurt Jaeger
>Release:        FreeBSD 7.2-STABLE amd64
>Organization:
-
>Environment:
FreeBSD f7.opsec.eu 7.2-STABLE FreeBSD 7.2-STABLE #0: Sun Aug 2 22:36:37 CEST 2009 pi at f7.opsec.eu:/usr/obj/usr/src/sys/REFSRV amd64
>Description:
java/openjdk6 fails to build due to small glitches in three .gmk files.
>How-To-Repeat:
cd /usr/ports/java/openjdk6
make

will fail, see http://opsec.eu/backup/openjdk6-portupgrade for a failed
build.
>Fix:
there is some patch for jdk/make/common/Release.gmk in files/patch-set.

The file in my patch replaces that part of patch-set.

Patch attached with submission follows:

# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	patch-Release.gmk
#	patch-corba-Defs
#	patch-jdk-Defs
#
echo x - patch-Release.gmk
sed 's/^X//' >patch-Release.gmk << '890ebc8c49609ee2d051b43d69d1d4cd'
X--- jdk/make/common/Release.gmk.orig	2009-04-24 09:33:54.000000000 +0200
X+++ jdk/make/common/Release.gmk	2009-08-30 16:20:22.000000000 +0200
X@@ -147,14 +147,13 @@
X 	tnameserv.1     \
X 	unpack200.1
X 
X-ifeq ($(ARCH_DATA_MODEL),32)
X+ifeq ($(BUILD_DEPLOY), true)
X   JRE_MAN_PAGES += javaws.1
X endif
X 
X JDK_MAN_PAGES =            \
X 	$(JRE_MAN_PAGES)   \
X 	appletviewer.1     \
X-        apt.1              \
X 	extcheck.1         \
X 	idlj.1             \
X 	jar.1              \
X@@ -193,6 +192,11 @@
X   JA_DIRNAME=ja_JP.$(JA_SOURCE_ENCODING)
X endif # linux
X 
X+ifeq ($(PLATFORM), bsd)
X+  MANBASEDIRS=$(JDK_TOPDIR)/src/bsd/doc $(IMPORTDOCDIR)
X+  MAN1SUBDIR = man
X+endif
X+
X define copy-man-pages
X $(MKDIR) -p $1/man/man1
X for manbase in $(MANBASEDIRS:%=%/$(MAN1SUBDIR)) ; do \
X@@ -325,6 +329,12 @@
X   SOURCE_DIRS += $(CLOSED_SRC)/share/classes
X endif
X 
X+ifeq ($(OS_VENDOR), OpenBSD)
X+  FILES_FROM_ARG=-I
X+else
X+  FILES_FROM_ARG=-T
X+endif
X+
X 
X #
X # Specific files and directories that will be filtered out from above areas.
X@@ -625,7 +635,7 @@
X 	($(CD) $(CLASSBINDIR) && \
X 	    $(BOOT_JAVA_CMD) -jar $(JARREORDER_JARFILE) \
X 		-o  $@.temp $(ABS_LIBDIR)/classlist $(NOT_RT_JAR_LIST) . )
X-	$(MV) $@.temp $@
X+	grep -v hotspot.log $@.temp > $@
X 	@($(CD) $(CLASSBINDIR) && $(java-vm-cleanup))
X 
X # Create the rt.jar file list & non-class files list
X@@ -982,7 +992,7 @@
X 	@# generated by the more efficient solaris/windows method of copying files.
X 	@# So for Linux, make use of the -T option (like Solaris' -I option) of
X 	@# obtaining the list of files from a file. MKS tar has no such option.
X-  ifeq ($(PLATFORM), linux)
X+  ifneq (,$(findstring $(PLATFORM), linux bsd))
X 	for d in $(SOURCE_DIRS); do \
X 	  $(RM) $(ABS_TEMPDIR)/src-files.list; \
X 	  ($(CD) $$d &&  \
X@@ -995,7 +1005,7 @@
X 	    done ; \
X 	  ) ; \
X 	  if [ -f  $(ABS_TEMPDIR)/src-files.list ] ; then \
X-	    ($(CD) $$d && $(TAR) cf - -T $(ABS_TEMPDIR)/src-files.list ) \
X+	    ($(CD) $$d && $(TAR) cf - $(FILES_FROM_ARG) $(ABS_TEMPDIR)/src-files.list ) \
X 	       | ($(CD) $(JDK_IMAGE_DIR)/src && $(TAR) xf -); \
X 	  fi; \
X 	done
890ebc8c49609ee2d051b43d69d1d4cd
echo x - patch-corba-Defs
sed 's/^X//' >patch-corba-Defs << 'bb0e8e9913f8f30cb7c77b319dee038e'
X--- corba/make/common/shared/Defs-java.gmk.orig	2009-08-30 16:23:08.000000000 +0200
X+++ corba/make/common/shared/Defs-java.gmk	2009-08-30 16:23:44.000000000 +0200
X@@ -38,7 +38,7 @@
X   #   Suspect this may not be needed anymore.
X   JAVA_MEM_FLAGS   += -Xms$(MAX_VM_MEMORY)m -XX:-Inline
X else
X-  JAVA_MEM_FLAGS   += -Xms$(MIN_VM_MEMORY)m -XX:PermSize=32m -XX:MaxPermSize=160m
X+  JAVA_MEM_FLAGS   += -Xms$(MIN_VM_MEMORY)m
X endif
X 
X # 
bb0e8e9913f8f30cb7c77b319dee038e
echo x - patch-jdk-Defs
sed 's/^X//' >patch-jdk-Defs << '434e45a2831dd0cefd8cba78356b6a48'
X--- jdk/make/common/shared/Defs-java.gmk.orig	2009-08-30 16:26:47.000000000 +0200
X+++ jdk/make/common/shared/Defs-java.gmk	2009-08-30 16:25:58.000000000 +0200
X@@ -42,7 +42,7 @@
X   #   Suspect this may not be needed anymore.
X   JAVA_MEM_FLAGS   += -Xms$(MAX_VM_MEMORY)m -XX:-Inline
X else
X-  JAVA_MEM_FLAGS   += -Xms$(MIN_VM_MEMORY)m -XX:PermSize=32m -XX:MaxPermSize=160m
X+  JAVA_MEM_FLAGS   += -Xms$(MIN_VM_MEMORY)m
X endif
X 
X # 
434e45a2831dd0cefd8cba78356b6a48
exit



>Release-Note:
>Audit-Trail:
>Unformatted: