java/104627: Makefile jdk14 broken

[Patrick Eisenacher]

>Number:         104627
>Category:       java
>Synopsis:       Makefile jdk14 broken
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-java
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Oct 20 19:00:37 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Patrick Eisenacher
>Release:        4.11
>Organization:
>Environment:
FreeBSD eagleeye.test-intern.org 4.11-STABLE FreeBSD 4.11-STABLE #0: Mon Oct  2 13:04:24 CEST 2006     root at eagleeye.test-intern.org:/usr/obj/usr/src/sys/GENERIC  i386
>Description:
if one of the required external files is missing, make fails because some weird characters have slipped into the corresponding conditional tests in the Makefile
>How-To-Repeat:
cd /usr/ports/java/jdk14/
make build
>Fix:
just remove the surplus characters from the Makefile

Patch attached with submission follows:

--- Makefile	Thu Oct 19 21:54:42 2006
+++ Makefile.new	Thu Oct 19 21:56:23 2006
@@ -160,48 +160,48 @@
 LD_LIBRARY_PATH_FILES=	../../hotspot/src/os/bsd/vm/os_bsd.cpp
 
 # Check for JDK sources and patch file
-.if !defined(PACKAGE_BUILDING) && (!exists(${DISTDIR}/${SCSL_SRCFILE}) || !exists(${DISTDIR}/${SCSL_BINFILE}) || (defined(WITH_POLICY) && !exists(${DISTDIR}/${POLICYFILE})) || !exists(${DISTDIR}/${PATCHSETFILE}))#{
+.if !defined(PACKAGE_BUILDING) && (!exists(${DISTDIR}/${SCSL_SRCFILE}) || !exists(${DISTDIR}/${SCSL_BINFILE}) || (defined(WITH_POLICY) && !exists(${DISTDIR}/${POLICYFILE})) || !exists(${DISTDIR}/${PATCHSETFILE}))
 ECHO_MSG=/usr/bin/printf
 IGNORE= :\n\
 Due to licensing restrictions, certain files must be fetched manually.\n\n
-.if !exists(${DISTDIR}/${SCSL_SRCFILE}) || !exists(${DISTDIR}/${SCSL_BINFILE})#{
+.if !exists(${DISTDIR}/${SCSL_SRCFILE}) || !exists(${DISTDIR}/${SCSL_BINFILE})
 IGNORE += Please open http://www.sun.com/software/java2/download.html\n\
 in a web browser and follow the \"Download\" link for the\n\
 \"Java 2 SDK ${JDK_VERSION}\".  You will be required to log in and register,\n\
 but you can create an account on this page.  After registration and\n\
 accepting the Sun Community Source License, download the\n
-.if !exists(${DISTDIR}/${SCSL_SRCFILE})#{
+.if !exists(${DISTDIR}/${SCSL_SRCFILE})
 IGNORE += SCSL Source file, ${SCSL_SRCFILE}
-.endif#}
-.if !exists(${DISTDIR}/${SCSL_BINFILE})#{
-.if !exists(${DISTDIR}/${SCSL_SRCFILE})#{
+.endif
+.if !exists(${DISTDIR}/${SCSL_BINFILE})
+.if !exists(${DISTDIR}/${SCSL_SRCFILE})
 IGNORE += and the\n
-.endif#}
+.endif
 IGNORE += SCSL Binaries file, ${SCSL_BINFILE}
-.endif#}
+.endif
 IGNORE += .\n\n
-.if !exists(${DISTDIR}/${PATCHSETFILE}) || (defined(WITH_POLICY) && !exists(${DISTDIR}/${POLICYFILE}))#{
+.if !exists(${DISTDIR}/${PATCHSETFILE}) || (defined(WITH_POLICY) && !exists(${DISTDIR}/${POLICYFILE}))
 IGNORE += In addition, please
-.endif#}
-.elif !exists(${DISTDIR}/${PATCHSETFILE}) || (defined(WITH_POLICY) && !exists(${DISTDIR}/${POLICYFILE}))#}{
+.endif
+.elif !exists(${DISTDIR}/${PATCHSETFILE}) || (defined(WITH_POLICY) && !exists(${DISTDIR}/${POLICYFILE}))
 IGNORE += Please
-.endif#}
-.if defined(WITH_POLICY) && !exists(${DISTDIR}/${POLICYFILE})#{
+.endif
+.if defined(WITH_POLICY) && !exists(${DISTDIR}/${POLICYFILE})
 IGNORE += open http://java.sun.com/products/jce/index-14.html\n\
 in a web browser and follow the \"Download JCE Unlimited Strength\n\
 Jurisdiction Policy Files\" link for \"Other Downloads\" to obtain the\n\
 JCE policy file, ${POLICYFILE}.\n\n
-.if !exists(${DISTDIR}/${PATCHSETFILE})#{
+.if !exists(${DISTDIR}/${PATCHSETFILE})
 IGNORE += In addition, please
-.endif#}
-.endif#}
-.if !exists(${DISTDIR}/${PATCHSETFILE})#{
+.endif
+.endif
+.if !exists(${DISTDIR}/${PATCHSETFILE})
 IGNORE += download the patchset, ${PATCHSETFILE}, from\n\
 http://www.eyesbeyond.com/freebsddom/java/jdk14.html.\n\n
-.endif#}
+.endif
 IGNORE += Please place the downloaded file(s) in ${DISTDIR}
 IGNORE += \n and restart the build.\n\n
-.endif#}
+.endif
 
 # JDK 1.4.2 require recent version of FreeBSD due to recent libc_r updates.
 # Make check for reqiuired primities as early as possible

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