Attachment 56074 Details for Bug 84644 – file.diff

[patch] file.diff

file.diff (text/plain), 3.14 KB, created by Bill Fenner on 2005-08-07 15:40:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bill Fenner

Created: 2005-08-07 15:40:08 UTC

Size: 3.14 KB

patch

obsolete

>--- Makefile.orig	Sun Aug  7 10:21:06 2005
>+++ Makefile	Sun Aug  7 10:25:13 2005
>@@ -142,42 +142,39 @@
> 
> LD_LIBRARY_PATH_FILES=	../../hotspot/src/os/bsd/vm/os_bsd.cpp
> 
>-# Check for JDK sources
>-.if !exists(${DISTDIR}/${SCSL_SRCFILE}) && !defined(PACKAGE_BUILDING)
>+# Check for JDK sources and patch file
>+.if !defined(PACKAGE_BUILDING) && (!exists(${DISTDIR}/${SCSL_SRCFILE}) || !exists(${DISTDIR}/${SCSL_BINFILE}) || !exists(${DISTDIR}/${PATCHSETFILE}))#{
> ECHO_MSG=/usr/bin/printf
> IGNORE= :\n\
>-Because of licensing restrictions, you must fetch the source distribution\n\
>-manually.  Please access http://www.sun.com/software/java2/download.html\n\
>+Because of licensing restrictions, you must fetch the certain files\n\
>+manually.
>+.if !exists(${DISTDIR}/${SCSL_SRCFILE}) || !exists(${DISTDIR}/${SCSL_BINFILE})#{
>+IGNORE += Please access http://www.sun.com/software/java2/download.html\n\
> with a web browser and follow the \"Download\" link for the\n\
>-\"Java(TM) SDK ${JDK_VERSION}\". You will be required to log in and register,\n\
>+\"Java(TM) 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, select \"J2SESDK\" and\n\
>-download the source file, ${SCSL_SRCFILE}.  Please place this file in\n\
>-${DISTDIR}.\n
>-.endif
>-.if !exists(${DISTDIR}/${SCSL_BINFILE}) && !defined(PACKAGE_BUILDING)
>-ECHO_MSG=/usr/bin/printf
>-IGNORE= :\n\
>-Because of licensing restrictions, you must fetch the source distribution\n\
>-manually.  Please access http://www.sun.com/software/java2/download.html\n\
>-with a web browser and follow the \"Download\" link for the\n\
>-\"Java(TM) 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, select \"J2SESDK\" and\n\
>-download the source file, ${SCSL_BINFILE}.  Please place this file in\n\
>-${DISTDIR}.\n
>-.endif
>-
>-# Check for patchset
>-.if !exists(${DISTDIR}/${PATCHSETFILE}) && !defined(PACKAGE_BUILDING)
>-ECHO_MSG=/usr/bin/printf
>-IGNORE= :\n\
>-The source distribution exists on your system, but due to\n\
>-licensing restrictions you still need to download the\n\
>+accepting the Sun Community Source License, download the\n
>+.if !exists(${DISTDIR}/${SCSL_SRCFILE})#{
>+IGNORE += SCSL Source file, ${SCSL_SRCFILE}
>+.endif#}
>+.if !exists(${DISTDIR}/${SCSL_BINFILE})#{
>+.if !exists(${DISTDIR}/${SCSL_SRCFILE})#{
>+IGNORE += and the\n
>+.endif#}
>+IGNORE += SCSL Binaries file, ${SCSL_BINFILE}
>+.endif#}
>+IGNORE += .\n
>+.if !exists(${DISTDIR}/${PATCHSETFILE})#{
>+IGNORE += In addition,
>+.endif#}
>+.endif#}
>+.if !exists(${DISTDIR}/${PATCHSETFILE})#{
>+IGNORE += You need to download the\n\
> patchset, ${PATCHSETFILE}, from\n\
>-http://www.eyesbeyond.com/freebsddom/java/jdk14.html.\n\
>-Please place the patchset in ${DISTDIR}.\n
>-.endif
>+http://www.eyesbeyond.com/freebsddom/java/jdk14.html.\n
>+.endif#}
>+IGNORE += \n Please place the downloaded files in ${DISTDIR}.\n
>+.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

Actions: View | Diff

Attachments on bug 84644: 56074