ports/116700: [FIX] java/jdk16: fix make build with WITHOUT_WEB=yes on i386 platform

[Sunpoet Po-Chuan Hsieh]

>Number:         116700
>Category:       ports
>Synopsis:       [FIX] java/jdk16: fix make build with WITHOUT_WEB=yes on i386 platform
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Sep 28 04:20:01 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Sunpoet Po-Chuan Hsieh
>Release:        FreeBSD 6.2-STABLE i386
>Organization:
SUNPOET.net
>Environment:
System: FreeBSD IRIS.sunpoet.net 6.2-STABLE FreeBSD 6.2-STABLE #7: Fri Aug 3 04:37:18 CST 2007 sunpoet at IRIS.sunpoet.net:/usr/obj/usr/src/sys/sunpoet i386
	
>Description:
On i386 platform, make build with WITHOUT_WEB=yes leads to pack jar files including the following files:
1. ${WRKSRC}/control/build/bsd-i586/j2re-image/lib/plugin.jar
2. ${WRKSRC}/control/build/bsd-i586/j2re-image/lib/javaws.jar
3. ${WRKSRC}/control/build/bsd-i586/j2re-image/lib/deploy.jar
Since ${WRKSRC}/deploy/make/Makefile was removed, these three files will not be generated.
Thus, exclude them from CP_JRE_PACKED_JARS in order to fix make build on i386 platform.
	
>How-To-Repeat:
% cd /usr/ports/java/jdk16
% make WITHOUT_WEB=yes

...

gmake PACK_OUTPUTDIR=/usr/ports/works/usr/ports/java/jdk16/work/control/build/bsd-i586/pack/pack-jre-jars \
                VAR_IMAGE_DIR=/usr/ports/works/usr/ports/java/jdk16/work/control/build/bsd-i586/j2re-image \
                JARS_TO_PACK="lib/ext/localedata.jar lib/javaws.jar lib/deploy.jar" \
                EXTRA_PACKOPTS="--strip-debug" \
                pack-jars
gmake[3]: Entering directory `/usr/ports/works/usr/ports/java/jdk16/work/install/make/pack'
mkdir -p /usr/ports/works/usr/ports/java/jdk16/work/control/build/bsd-i586/pack/pack-jre-jars
for i in lib/ext/localedata.jar lib/javaws.jar lib/deploy.jar ; do \
            ls -l /usr/ports/works/usr/ports/java/jdk16/work/control/build/bsd-i586/j2re-image/$i | nawk '{printf("Packing %s %s bytes\n",$9, $5)}'  ; \
            mkdir -p /usr/ports/works/usr/ports/java/jdk16/work/control/build/bsd-i586/pack/pack-jre-jars/`dirname $i` ; \
            mkdir -p /usr/ports/works/usr/ports/java/jdk16/work/control/build/bsd-i586/j2re-image/`dirname $i` ; \
            /usr/ports/works/usr/ports/java/jdk16/work/control/build/bsd-i586/bin/pack200 -J-esa -J-ea  -J-Xmx512m "--no-gzip" "--config-file=pack.all.properties" --strip-debug /usr/ports/works/usr/ports/java/jdk16/work/control/build/bsd-i586/pack/pack-jre-jars/`dirname $i`/`basename $i .jar`.pack /usr/ports/works/usr/ports/java/jdk16/work/control/build/bsd-i586/j2re-image/$i || exit 1 ; \
            rm -f /usr/ports/works/usr/ports/java/jdk16/work/control/build/bsd-i586/j2re-image/$i ; \
            /usr/ports/works/usr/ports/java/jdk16/work/control/build/bsd-i586/bin/unpack200  "-v"  /usr/ports/works/usr/ports/java/jdk16/work/control/build/bsd-i586/pack/pack-jre-jars/`dirname $i`/`basename $i .jar`.pack /usr/ports/works/usr/ports/java/jdk16/work/control/build/bsd-i586/j2re-image/$i || exit 1 ; \
        done
Packing /usr/ports/works/usr/ports/java/jdk16/work/control/build/bsd-i586/j2re-image/lib/ext/localedata.jar 466969 bytes
Unpacking from /usr/ports/works/usr/ports/java/jdk16/work/control/build/bsd-i586/pack/pack-jre-jars/lib/ext/localedata.pack to /usr/ports/works/usr/ports/java/jdk16/work/control/build/bsd-i586/j2re-image/lib/ext/localedata.jar
com.sun.java.util.jar.pack.unpack.log.file=-
unpack.deflate.hint=(not set)
com.sun.java.util.jar.pack.unpack.remove.packfile=false
com.sun.java.util.jar.pack.verbose=1
com.sun.java.util.jar.pack.unpack.modification.time=(not set)
unpacker completed with status=0
A total of 651129 bytes were read in 1 segment(s).
A total of 811684 file content bytes were written.
A total of 110 files (of which 100 are classes) were written to output.
ls: /usr/ports/works/usr/ports/java/jdk16/work/control/build/bsd-i586/j2re-image/lib/plugin.jar: No such file or directory
Exception in thread "main" java.util.zip.ZipException: error in opening zip file
        at java.util.zip.ZipFile.open(Native Method)
        at java.util.zip.ZipFile.<init>(ZipFile.java:114)
        at java.util.jar.JarFile.<init>(JarFile.java:133)
        at java.util.jar.JarFile.<init>(JarFile.java:97)
        at com.sun.java.util.jar.pack.Driver.main(Driver.java:235)
gmake[3]: *** [pack-jars] Error 1
gmake[3]: Leaving directory `/usr/ports/works/usr/ports/java/jdk16/work/install/make/pack'
gmake[2]: *** [pack-jre] Error 2
gmake[2]: Leaving directory `/usr/ports/works/usr/ports/java/jdk16/work/install/make/pack'
gmake[1]: *** [all] Error 1
gmake[1]: Leaving directory `/usr/ports/works/usr/ports/java/jdk16/work/install/make'
gmake: *** [install-build] Error 2
*** Error code 2

Stop in /usr/ports/java/jdk16.
	
>Fix:
--- /usr/ports/java/jdk16/Makefile.orig	2007-09-12 03:39:35.000000000 +0800
+++ /usr/ports/java/jdk16/Makefile	2007-09-27 08:46:49.000000000 +0800
@@ -312,6 +312,11 @@
 	done
 .if defined(WITHOUT_WEB)
 	@${RM} ${WRKDIR}/deploy/make/Makefile
+	@${REINPLACE_CMD} \
+		-e 's|CP_JRE_PACKED_JARS += lib/plugin.jar|#CP_JRE_PACKED_JARS += lib/plugin.jar|' \
+		-e 's|CP_JRE_PACKED_JARS += lib/javaws.jar|#CP_JRE_PACKED_JARS += lib/javaws.jar|' \
+		-e 's|CP_JRE_PACKED_JARS += lib/deploy.jar|#CP_JRE_PACKED_JARS += lib/deploy.jar|' \
+			${WRKDIR}/install/make/common/Pack.gmk
 .endif
 
 .if defined(WITH_LINUX_BOOTSTRAP)
	
>Release-Note:
>Audit-Trail:
>Unformatted: