Attachment 71326 Details for Bug 103920 – jdk14.patch

[patch] jdk14.patch

jdk14.patch (text/plain), 5.92 KB, created by Mario Sergio Fujikawa Ferreira on 2006-10-03 01:10:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mario Sergio Fujikawa Ferreira

Created: 2006-10-03 01:10:17 UTC

Size: 5.92 KB

patch

obsolete

>--- Makefile.orig	Sun Sep  3 22:55:34 2006
>+++ Makefile	Mon Oct  2 08:11:02 2006
>@@ -14,6 +14,7 @@
> SCSL_SRCFILE=	j2sdk-${JDK_VERSION:S/./_/g}-src-scsl.zip
> SCSL_BINFILE=	j2sdk-${JDK_VERSION:S/./_/g}-bin-scsl.zip
> PATCHSETFILE=	bsd-jdk14-patches-${JDK_PATCHSET_VERSION}.tar.gz
>+POLICYFILE=	jce_policy-${JDK_VERSION:S/./_/g}.zip
> DISTFILES=	${SCSL_SRCFILE} ${SCSL_BINFILE} ${PATCHSETFILE}
> 
> MAINTAINER=	glewis@FreeBSD.org
>@@ -24,9 +25,12 @@
> 		zip:${PORTSDIR}/archivers/zip \
> 		${LOCALBASE}/include/nspr/prtypes.h:${PORTSDIR}/devel/nspr
> RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper
>-.if !defined(MINIMAL)
>-RUN_DEPENDS+=	${X11BASE}/lib/X11/fonts/URW/fonts.dir:${PORTSDIR}/x11-fonts/urwfonts
>-.endif
>+
>+
>+OPTIONS=	DEBUG	"Enable debugging support"	off \
>+		IPV6	"Enable IPv6 support"		off \
>+		POLICY	"Install the Unlimited Strength Policy Files"	off \
>+		WEB	"Enable the browser plugin and Java Web Start"	on
> 
> .if defined(WITH_OPENMOTIF_JDK)
> BUILD_DEPENDS+=	${NONEXISTENT}:${PORTSDIR}/x11-toolkits/open-motif-jdk:extract
>@@ -64,6 +68,15 @@
> 
> .include <bsd.port.pre.mk>
> 
>+.if defined(WITH_POLICY)
>+DISTFILES+=	${POLICYFILE}
>+EXTRACT_ONLY+=	${POLICYFILE}
>+.endif
>+
>+.if defined(WITH_WEB)
>+RUN_DEPENDS+=	${X11BASE}/lib/X11/fonts/URW/fonts.dir:${PORTSDIR}/x11-fonts/urwfonts
>+.endif
>+
> .if defined(WITH_OPENMOTIF_JDK)
> OPENMOTIF_DIR=	${WRKDIR}/jdkmotif
> .else
>@@ -98,7 +111,7 @@
> 
> # workaround to handle both 'zip' and 'tar.gz' distfiles
> USE_ZIP=	YES
>-EXTRACT_ONLY=	${SCSL_SRCFILE} ${SCSL_BINFILE}
>+EXTRACT_ONLY+=	${SCSL_SRCFILE} ${SCSL_BINFILE}
> 
> ONLY_FOR_ARCHS=	i386
> USE_GMAKE=	YES
>@@ -113,7 +126,7 @@
> 		CLASSPATH="" \
> 		LD_LIBRARY_PATH="" \
> 		MAKEFLAGS=""
>-.if defined(MINIMAL)
>+.if defined(WITHOUT_WEB)
> MAKE_ENV+=	NO_PLUGIN="YES" \
> 		NO_JAVAWS="YES"
> .endif
>@@ -126,11 +139,11 @@
> JDKIMAGEDIR=	${WRKSRC}/../build/bsd-i586/j2sdk-image
> JDKIMAGEDIR_G=	${WRKSRC}/../build/bsd-i586/j2sdk-debug-image
> 
>-.if !defined(WITH_IPV6)
>+.if defined(WITHOUT_IPV6)
> EXTRA_PATCHES+=	${PATCHDIR}/disable-ipv6.patch
> .endif
> 
>-.if defined(MINIMAL)
>+.if defined(WITHOUT_WEB)
> PKGNAMESUFFIX=	-minimal
> .endif
> 
>@@ -147,7 +160,8 @@
> 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}) || !exists(${DISTDIR}/${PATCHSETFILE}))#{
>+.if !defined(PACKAGE_BUILDING) && (!exists(${DISTDIR}/${SCSL_SRCFILE}) || !exists(${DISTDIR}/${SCSL_BINFILE}) || (defined(WITH_POLICY) && !exists(${DISTDIR}/${POLICYFILE})) || !exists(${DISTDIR}/${PATCHSETFILE}))#{
>+_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
>@@ -167,12 +181,20 @@
> IGNORE += SCSL Binaries file, ${SCSL_BINFILE}
> .endif#}
> IGNORE += .\n\n
>-.if !exists(${DISTDIR}/${PATCHSETFILE})#{
>+.if !exists(${DISTDIR}/${PATCHSETFILE}) || (defined(WITH_POLICY) && !exists(${DISTDIR}/${POLICYFILE}))#{
> IGNORE += In addition, please
> .endif#}
>-.elif !exists(${DISTDIR}/${PATCHSETFILE})
>+.elif !exists(${DISTDIR}/${PATCHSETFILE}) || (defined(WITH_POLICY) && !exists(${DISTDIR}/${POLICYFILE}))#}{
> IGNORE += Please
> .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 Jurisdiction Policy Files\" link for\n\
>+\"Other Downloads\" to obtain the JCE policy file, ${POLICYFILE}.\n\n
>+.if !exists(${DISTDIR}/${PATCHSETFILE})#{
>+IGNORE += In addition, please
>+.endif#}
>+.endif#}
> .if !exists(${DISTDIR}/${PATCHSETFILE})#{
> IGNORE += download the patchset, ${PATCHSETFILE}, from\n\
> http://www.eyesbeyond.com/freebsddom/java/jdk14.html.\n\n
>@@ -214,16 +236,6 @@
> 	@${ECHO_MSG} "mounted."
> 	@${ECHO_MSG}
> .endif
>-	@${ECHO_MSG} "Following port compile time options are available:"
>-	@${ECHO_MSG}
>-	@${ECHO_MSG} "    WITH_DEBUG  - install JDK binaries and libraries"
>-	@${ECHO_MSG} "                  with debuging support"
>-	@${ECHO_MSG}
>-	@${ECHO_MSG} "    MINIMAL     - don't build/install mozilla java"
>-	@${ECHO_MSG} "                  plugin, javaws and JDK demos"
>-	@${ECHO_MSG}
>-	@${ECHO_MSG} "    WITH_IPV6   - enable JDK IPv6 support"
>-	@${ECHO_MSG}
> 
> pre-patch:
> 	@cd ${WRKDIR} &&  \
>@@ -301,13 +313,7 @@
> 	@${RM} -rf ${JDKIMAGEDIR}/man/ja_JP.eucJP
> 
> pre-install:
>-.if !defined(WITH_DEBUG)
>-	@${ECHO_MSG}
>-	@${ECHO_MSG} "Please use \`make -DWITH_DEBUG' if you want to install libraries and binaries"
>-	@${ECHO_MSG} "with debugging support."
>-	@${ECHO_MSG}
>-.endif
>-.if defined(MINIMAL)
>+.if defined(WITHOUT_WEB)
> 	@${RM} -rf ${JDKIMAGEDIR}/demo
> .endif
> 
>@@ -326,7 +332,10 @@
> .endif
> 	${INSTALL_DATA} ${FILESDIR}/cacerts \
> 		${PREFIX}/jdk${JDK_VERSION}/jre/lib/security/cacerts
>-.if !defined(MINIMAL)
>+.if defined(WITH_POLICY)
>+	${INSTALL_DATA} ${WRKDIR}/jce/*.jar ${PREFIX}/jdk${JDK_VERSION}/jre/lib/security
>+.endif
>+.if defined(WITH_WEB)
> 	${INSTALL_DATA} ${FILESDIR}/cacerts \
> 		${PREFIX}/jdk${JDK_VERSION}/jre/javaws/cacerts
> .endif
>@@ -335,7 +344,7 @@
> 	@${ECHO_MSG} "@exec ${LOCALBASE}/bin/registervm ${PREFIX}/jdk${JDK_VERSION}/bin/java # FREEBSD-JDK${JDK_VERSION}" >> ${TMPPLIST}
> 
> post-install:
>-.if !defined(MINIMAL)
>+.if defined(WITH_WEB)
> 	${FIND} "${PREFIX}/jdk${JDK_VERSION}/jre/plugin" -type d | ${XARGS} ${CHMOD} a+rx
> .endif
> 	@${LOCALBASE}/bin/registervm "${PREFIX}/jdk${JDK_VERSION}/bin/java # FREEBSD-JDK${JDK_VERSION}"
>--- distinfo.orig	Sun Sep  3 23:07:47 2006
>+++ distinfo	Sun Oct  1 23:47:01 2006
>@@ -7,3 +7,6 @@
> MD5 (bsd-jdk14-patches-8.tar.gz) = e6f5bd43e8e8d46bd29f193d6f256462
> SHA256 (bsd-jdk14-patches-8.tar.gz) = 71e9891f5457b73f3ee055688053bb2cee209749f0ea9da596df6eef929bbbc3
> SIZE (bsd-jdk14-patches-8.tar.gz) = 1148395
>+MD5 (jce_policy-1_4_2.zip) = ff961c5f5326191c5ac2e4624d756f7e
>+SHA256 (jce_policy-1_4_2.zip) = 7bf6d683602686321affc0071ad2fc3890c19cf5bb5cc16a963052e17588c097
>+SIZE (jce_policy-1_4_2.zip) = 12195

Actions: View | Diff

Attachments on bug 103920: 71326