mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-27 05:10:36 +00:00
- Support staging.
- Fix fastdebug installation. - Update jtreg version to Build b05. - Refine r327353. Use an extra patch instead. - Install proper license file. OpenJDK6 has GPLv2 + "Classpath" exception.
This commit is contained in:
parent
c1addf8494
commit
0c79f0cee3
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=329749
@ -1,6 +1,6 @@
|
||||
# $FreeBSD$
|
||||
|
||||
PORTREVISION= 9
|
||||
PORTREVISION= 10
|
||||
CATEGORIES= java devel
|
||||
PKGNAMESUFFIX= -jre
|
||||
|
||||
@ -10,5 +10,4 @@ BUILD_JRE= yes
|
||||
MASTERDIR= ${.CURDIR}/../openjdk6
|
||||
UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX}
|
||||
|
||||
NO_STAGE= yes
|
||||
.include "${MASTERDIR}/Makefile"
|
||||
|
@ -3,32 +3,31 @@
|
||||
|
||||
PORTNAME= openjdk6
|
||||
PORTVERSION= b27
|
||||
PORTREVISION?= 7
|
||||
PORTREVISION?= 8
|
||||
CATEGORIES= java devel
|
||||
MASTER_SITES= http://download.java.net/openjdk/jdk6/promoted/${PORTVERSION}/ \
|
||||
MASTER_SITES= ${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:ant,} \
|
||||
http://download.java.net/jaxp/openjdk/jdk6/:jaxp \
|
||||
http://download.java.net/glassfish/components/jax-ws/openjdk/jdk6/:jaxws \
|
||||
https://java.net/downloads/jax-ws/OpenJDK6/:jaf \
|
||||
http://icedtea.classpath.org/download/drops/:jaxp \
|
||||
http://icedtea.classpath.org/download/drops/:jaxws \
|
||||
https://java.net/downloads/jax-ws/OpenJDK6/:jaf \
|
||||
http://icedtea.classpath.org/download/drops/:jaf \
|
||||
http://icedtea.wildebeest.org/download/drops/:jaxp \
|
||||
http://icedtea.wildebeest.org/download/drops/:jaxws \
|
||||
http://icedtea.wildebeest.org/download/drops/:jaf \
|
||||
${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:ant,} \
|
||||
http://download.java.net/openjdk/jtreg/promoted/4.1/${JTREGVERSION}/:jtreg
|
||||
http://download.java.net/glassfish/components/jax-ws/openjdk/jdk6/:jaxws \
|
||||
http://icedtea.classpath.org/download/drops/:jaxws \
|
||||
http://download.java.net/openjdk/jtreg/promoted/4.1/b05/:jtreg \
|
||||
http://download.java.net/openjdk/jdk6/promoted/${PORTVERSION}/
|
||||
DISTNAME= openjdk-6-src-${PORTVERSION}-${OPENJDK_BUILDDATE}
|
||||
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
|
||||
DISTFILES= ${ANTFILE}:ant \
|
||||
${JAXPFILE}:jaxp \
|
||||
${JAXWSFILE}:jaxws \
|
||||
${JAFFILE}:jaf \
|
||||
${ANTFILE}:ant
|
||||
${JAXWSFILE}:jaxws \
|
||||
${DISTNAME}${EXTRACT_SUFX}
|
||||
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} ${ANTFILE}
|
||||
|
||||
MAINTAINER= java@FreeBSD.org
|
||||
COMMENT?= Oracle's Java 6 virtual machine release under the GPL v2
|
||||
|
||||
LICENSE= GPLv2
|
||||
LICENSE_FILE= ${WRKSRC}/LICENSE
|
||||
LICENSE_DISTFILES=${JAXPFILE} ${JAFFILE} ${JAXWSFILE} ${DISTNAME}${EXTRACT_SUFX}
|
||||
|
||||
BUILD_DEPENDS= ${LOCALBASE}/bin/zip:${PORTSDIR}/archivers/zip \
|
||||
${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \
|
||||
@ -53,9 +52,11 @@ FASTDEBUG_DESC= Include fastdebug build
|
||||
TEST_DESC= Add support for running regression test
|
||||
.endif
|
||||
|
||||
PKGDEINSTALL= ${WRKDIR}/pkg-deinstall
|
||||
PKGINSTALL= ${WRKDIR}/pkg-install
|
||||
|
||||
USES= gmake iconv motif
|
||||
|
||||
NO_STAGE= yes
|
||||
.include <bsd.port.options.mk>
|
||||
.include "${.CURDIR}/../openjdk6/Makefile.icedtea"
|
||||
|
||||
@ -66,21 +67,21 @@ WRKSRC= ${WRKDIR}
|
||||
|
||||
USE_XORG= x11 xext xi xt xtst
|
||||
|
||||
JAXP_BUILD= 144_05
|
||||
JAXPFILE= jaxp${JAXP_BUILD}.zip
|
||||
JAXWS_BUILD= 2_1_6-2011_06_13
|
||||
JAXWSFILE= jdk6-jaxws${JAXWS_BUILD}.zip
|
||||
JAF_BUILD= b20
|
||||
JAFFILE= jdk6-jaf-${JAF_BUILD}.zip
|
||||
JTREGVERSION= b04
|
||||
JTREGFILE= jtreg-4.1-bin-${JTREGVERSION}_14_mar_2012.zip
|
||||
UPDATE_VERSION= 32
|
||||
|
||||
# do not depend on devel/apache-ant to avoid circular dependency, but
|
||||
# use .tar.bz2 distfile to avoid duplicated downloads
|
||||
ANTVERSION= 1.8.4
|
||||
ANTFILE= apache-ant-${ANTVERSION}-bin.tar.bz2
|
||||
|
||||
JAXP_BUILD= 144_05
|
||||
JAXPFILE= jaxp${JAXP_BUILD}.zip
|
||||
JAF_BUILD= b20
|
||||
JAFFILE= jdk6-jaf-${JAF_BUILD}.zip
|
||||
JAXWS_BUILD= 2_1_6-2011_06_13
|
||||
JAXWSFILE= jdk6-jaxws${JAXWS_BUILD}.zip
|
||||
JTREG_BUILD= b05_29_nov_2012
|
||||
JTREGFILE= jtreg-4.1-bin-${JTREG_BUILD}.zip
|
||||
UPDATE_VERSION= 32
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
.if ${PORT_OPTIONS:MIPV6}
|
||||
@ -226,27 +227,27 @@ post-extract:
|
||||
${SED} 's/linux/bsd/g; s/Linux/Bsd/g' < ${WRKSRC}/$$f > ${WRKSRC}/$$t; \
|
||||
done
|
||||
@${SED} 's/solaris/bsd/g; s/Solaris/Bsd/g' \
|
||||
< ${WRKSRC}/jdk/src/solaris/hpi/native_threads/src/threads_solaris.c \
|
||||
> ${WRKSRC}/jdk/src/solaris/hpi/native_threads/src/threads_bsd.c
|
||||
@${SED} "s|/usr/local|${LOCALBASE}|" < ${FILESDIR}/fontconfig.properties \
|
||||
> ${WRKSRC}/jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties
|
||||
@${SED} "s|%%LOCALBASE%%|${LOCALBASE}|" < ${FILESDIR}/Makefile.test \
|
||||
> ${WRKSRC}/jdk/test/Makefile
|
||||
@${FIND} ${WRKSRC}/jdk/test -type f -name \*.sh -exec ${SED} -i "" -e s/Linux/FreeBSD/g {} \;
|
||||
${WRKSRC}/jdk/src/solaris/hpi/native_threads/src/threads_solaris.c > \
|
||||
${WRKSRC}/jdk/src/solaris/hpi/native_threads/src/threads_bsd.c
|
||||
@${SED} "s|/usr/local|${LOCALBASE}|" \
|
||||
${FILESDIR}/fontconfig.properties > \
|
||||
${WRKSRC}/jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties
|
||||
@${SED} "s|%%LOCALBASE%%|${LOCALBASE}|" ${FILESDIR}/Makefile.test > \
|
||||
${WRKSRC}/jdk/test/Makefile
|
||||
@${FIND} ${WRKSRC}/jdk/test -type f -name \*.sh -exec ${SED} -i "" \
|
||||
-e s/Linux/FreeBSD/g {} \;
|
||||
|
||||
post-patch:
|
||||
@${REINPLACE_CMD} "s|/lib:/usr/lib|/lib:/usr/lib:${LOCALBASE}/lib|" \
|
||||
${WRKSRC}/hotspot/src/os/bsd/vm/os_bsd.cpp
|
||||
@${REINPLACE_CMD} \
|
||||
-e "s|/lib:/usr/lib|/lib:/usr/lib:${LOCALBASE}/lib|" \
|
||||
${WRKSRC}/hotspot/src/os/bsd/vm/os_bsd.cpp
|
||||
.if ${PORT_OPTIONS:MPOLICY}
|
||||
@${REINPLACE_CMD} 's|build-policy install-limited|build-policy install-unlimited|' \
|
||||
${WRKSRC}/jdk/make/javax/crypto/Makefile
|
||||
@${REINPLACE_CMD} \
|
||||
-e 's|policy install-limited|policy install-unlimited|' \
|
||||
${WRKSRC}/jdk/make/javax/crypto/Makefile
|
||||
.endif
|
||||
.if empty(ICONV_LIB)
|
||||
@${REINPLACE_CMD} 's| -liconv||' \
|
||||
${WRKSRC}/Makefile \
|
||||
${WRKSRC}/jdk/make/sun/splashscreen/Makefile \
|
||||
${WRKSRC}/jdk/make/java/npt/Makefile \
|
||||
${WRKSRC}/jdk/make/java/instrument/Makefile
|
||||
@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/libiconv.patch
|
||||
.endif
|
||||
|
||||
post-build:
|
||||
@ -255,11 +256,11 @@ post-build:
|
||||
.if defined(BUILD_JRE)
|
||||
@${RM} -rf ${WRKSRC}/build/${OPENJDK_OSARCH}/j2re-image/lib/zi
|
||||
@${LN} -s -f ${LOCALBASE}/share/java/zi \
|
||||
${WRKSRC}/build/${OPENJDK_OSARCH}/j2re-image/lib
|
||||
${WRKSRC}/build/${OPENJDK_OSARCH}/j2re-image/lib
|
||||
.else
|
||||
@${RM} -rf ${WRKSRC}/build/${OPENJDK_OSARCH}/j2sdk-image/jre/lib/zi
|
||||
@${LN} -s -f ${LOCALBASE}/share/java/zi \
|
||||
${WRKSRC}/build/${OPENJDK_OSARCH}/j2sdk-image/jre/lib
|
||||
${WRKSRC}/build/${OPENJDK_OSARCH}/j2sdk-image/jre/lib
|
||||
.endif
|
||||
.endif
|
||||
.if ${PORT_OPTIONS:MTEST}
|
||||
@ -272,7 +273,9 @@ post-build:
|
||||
|
||||
test: build-depends build
|
||||
.if !defined(DISPLAY)
|
||||
@${LOCALBASE}/bin/Xvfb :1001 -screen 0 800x600x24 -fp ${LOCALBASE}/lib/X11/fonts/misc > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
|
||||
@${LOCALBASE}/bin/Xvfb :1001 -screen 0 800x600x24 \
|
||||
-fp ${LOCALBASE}/lib/X11/fonts/misc > /dev/null 2>&1 & \
|
||||
${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
|
||||
.endif
|
||||
@-(cd ${WRKSRC}/jdk/test; ${SETENV} ${MAKE_ENV} ${GMAKE} tests)
|
||||
.if !defined(DISPLAY)
|
||||
@ -286,74 +289,85 @@ test: build-depends build
|
||||
|
||||
do-install:
|
||||
.if defined(BUILD_JRE)
|
||||
@${MKDIR} ${PREFIX}/openjdk6-jre/
|
||||
@cd ${WRKSRC}/build/${OPENJDK_OSARCH}/j2re-image && \
|
||||
${COPYTREE_SHARE} . ${PREFIX}/openjdk6-jre
|
||||
@${CHOWN} ${BINOWN}:${BINGRP} ${PREFIX}/openjdk6-jre/bin/* \
|
||||
${PREFIX}/openjdk6-jre/lib/${ARCH}/jexec
|
||||
@${CHMOD} ${BINMODE} ${PREFIX}/openjdk6-jre/bin/* \
|
||||
${PREFIX}/openjdk6-jre/lib/${ARCH}/jexec
|
||||
@${ECHO_MSG} "@unexec ${LOCALBASE}/bin/unregistervm ${PREFIX}/openjdk6-jre/bin/java" >> ${TMPPLIST}
|
||||
@${FIND} -s ${PREFIX}/openjdk6-jre -not -type d | \
|
||||
${SED} -e 's#^${PREFIX}/##' >> ${TMPPLIST}
|
||||
@${ECHO} "@exec mkdir ${PREFIX}/openjdk6-jre/lib/applet" >> ${TMPPLIST}
|
||||
@${FIND} ${PREFIX}/openjdk6-jre -type d | ${SORT} -r | \
|
||||
${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
|
||||
@${ECHO_MSG} "@exec ${LOCALBASE}/bin/registervm '${PREFIX}/openjdk6-jre/bin/java # OpenJDK6 JRE'" >> ${TMPPLIST}
|
||||
${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/openjdk6-jre \
|
||||
"-not ( -type d -name bin -prune )"
|
||||
@cd ${WRKSRC}/build/${OPENJDK_OSARCH}/j2re-image && \
|
||||
${COPYTREE_BIN} bin ${STAGEDIR}${PREFIX}/openjdk6-jre
|
||||
@cd ${WRKSRC}/build/${OPENJDK_OSARCH}/j2re-image && \
|
||||
${INSTALL_PROGRAM} lib/${ARCH}/jexec \
|
||||
${STAGEDIR}${PREFIX}/openjdk6-jre/lib/${ARCH}
|
||||
.else
|
||||
@${MKDIR} ${PREFIX}/openjdk6/
|
||||
@cd ${WRKSRC}/build/${OPENJDK_OSARCH}/j2sdk-image && \
|
||||
${COPYTREE_SHARE} . ${PREFIX}/openjdk6
|
||||
@${INSTALL_DATA} ${WRKSRC}/build/${OPENJDK_OSARCH}/btjars/compilefontconfig.jar ${WRKSRC}/build/${OPENJDK_OSARCH}/btjars/javazic.jar ${PREFIX}/openjdk6/jre/lib/
|
||||
@for dir in `${FIND} ${PREFIX}/openjdk6 -name bin -type d`; do \
|
||||
${CHOWN} -h -R ${BINOWN}:${BINGRP} $$dir; \
|
||||
${FIND} $$dir -type f -exec ${CHMOD} ${BINMODE} "{}" \; ; \
|
||||
done
|
||||
@${CHOWN} ${BINOWN}:${BINGRP} \
|
||||
${PREFIX}/openjdk6/jre/lib/${ARCH}/jexec
|
||||
@${CHMOD} ${BINMODE} \
|
||||
${PREFIX}/openjdk6/jre/lib/${ARCH}/jexec
|
||||
.if ${PORT_OPTIONS:MFASTDEBUG}
|
||||
@${MKDIR} ${PREFIX}/openjdk6-fastdebug/
|
||||
${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/openjdk6 \
|
||||
"! ( -type d -name bin -prune )"
|
||||
@cd ${WRKSRC}/build/${OPENJDK_OSARCH}/j2sdk-image && \
|
||||
${COPYTREE_SHARE} . ${PREFIX}/openjdk6-fastdebug
|
||||
@for dir in `${FIND} ${PREFIX}/openjdk6-fastdebug -name bin -type d`; do \
|
||||
${CHOWN} -h -R ${BINOWN}:${BINGRP} $$dir; \
|
||||
${FIND} $$dir -type f -exec ${CHMOD} ${BINMODE} "{}" \; ; \
|
||||
done
|
||||
@${CHOWN} ${BINOWN}:${BINGRP} \
|
||||
${PREFIX}/openjdk6-fastdebug/jre/lib/${ARCH}/jexec
|
||||
@${CHMOD} ${BINMODE} \
|
||||
${PREFIX}/openjdk6-fastdebug/jre/lib/${ARCH}/jexec
|
||||
.endif
|
||||
@${ECHO_MSG} "@unexec ${LOCALBASE}/bin/unregistervm ${PREFIX}/openjdk6/bin/java" >> ${TMPPLIST}
|
||||
@${FIND} -s ${PREFIX}/openjdk6 -not -type d | \
|
||||
${SED} -e 's#^${PREFIX}/##' >> ${TMPPLIST}
|
||||
@${ECHO} "@exec mkdir ${PREFIX}/openjdk6/jre/lib/applet" >> ${TMPPLIST}
|
||||
@${FIND} ${PREFIX}/openjdk6 -type d | ${SORT} -r | \
|
||||
${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
|
||||
@${ECHO_MSG} "@exec ${LOCALBASE}/bin/registervm '${PREFIX}/openjdk6/bin/java # OpenJDK6'" >> ${TMPPLIST}
|
||||
${COPYTREE_BIN} "bin jre/bin" ${STAGEDIR}${PREFIX}/openjdk6
|
||||
@cd ${WRKSRC}/build/${OPENJDK_OSARCH}/j2sdk-image && \
|
||||
${INSTALL_PROGRAM} jre/lib/${ARCH}/jexec \
|
||||
${STAGEDIR}${PREFIX}/openjdk6/jre/lib/${ARCH}
|
||||
@cd ${WRKSRC}/build/${OPENJDK_OSARCH}/btjars && \
|
||||
${INSTALL_DATA} compilefontconfig.jar javazic.jar \
|
||||
${STAGEDIR}${PREFIX}/openjdk6/jre/lib
|
||||
.if ${PORT_OPTIONS:MFASTDEBUG}
|
||||
@${ECHO_MSG} "@unexec ${LOCALBASE}/bin/unregistervm ${PREFIX}/openjdk6-fastdebug/bin/java" >> ${TMPPLIST}
|
||||
@${FIND} -s ${PREFIX}/openjdk6-fastdebug -not -type d | \
|
||||
${SED} -e 's#^${PREFIX}/##' >> ${TMPPLIST}
|
||||
@${ECHO} "@exec mkdir ${PREFIX}/openjdk6-fastdebug/jre/lib/applet" >> ${TMPPLIST}
|
||||
@${FIND} ${PREFIX}/openjdk6-fastdebug -type d | ${SORT} -r | \
|
||||
${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
|
||||
@${ECHO_MSG} "@exec ${LOCALBASE}/bin/registervm '${PREFIX}/openjdk6-fastdebug/bin/java # OpenJDK6'" >> ${TMPPLIST}
|
||||
@cd ${WRKSRC}/build/${OPENJDK_OSARCH}-fastdebug/j2sdk-image && \
|
||||
${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/openjdk6-fastdebug \
|
||||
"-not ( -type d -name bin -prune )"
|
||||
@cd ${WRKSRC}/build/${OPENJDK_OSARCH}-fastdebug/j2sdk-image && \
|
||||
${COPYTREE_BIN} "bin jre/bin" \
|
||||
${STAGEDIR}${PREFIX}/openjdk6-fastdebug
|
||||
@cd ${WRKSRC}/build/${OPENJDK_OSARCH}-fastdebug/j2sdk-image && \
|
||||
${INSTALL_PROGRAM} jre/lib/${ARCH}/jexec \
|
||||
${STAGEDIR}${PREFIX}/openjdk6-fastdebug/jre/lib/${ARCH}
|
||||
.endif
|
||||
.endif
|
||||
|
||||
post-install:
|
||||
@# Register the VM
|
||||
@${RM} -f ${TMPPLIST}
|
||||
@${ECHO} "#!/bin/sh" > ${PKGDEINSTALL}
|
||||
@${ECHO} "#!/bin/sh" > ${PKGINSTALL}
|
||||
.if defined(BUILD_JRE)
|
||||
@"${LOCALBASE}/bin/registervm" "${PREFIX}/openjdk6-jre/bin/java # OpenJDK6 JRE"
|
||||
@cd ${STAGEDIR}${PREFIX}/openjdk6-jre && \
|
||||
${FIND} -s . -not -type d | \
|
||||
${SED} -e 's,^\./,openjdk6-jre/,' >> ${TMPPLIST}
|
||||
@cd ${STAGEDIR}${PREFIX}/openjdk6-jre && \
|
||||
${FIND} -s . -type d -empty | \
|
||||
${SED} 's,^\./,@exec ${MKDIR} %D/openjdk6-jre/,' >> ${TMPPLIST}
|
||||
@cd ${STAGEDIR}${PREFIX}/openjdk6-jre && \
|
||||
${FIND} . -type d -not -depth 0 | ${SORT} -r | \
|
||||
${SED} 's,^\.,@dirrm openjdk6-jre/,' >> ${TMPPLIST}
|
||||
@${ECHO} "@dirrm openjdk6-jre" >> ${TMPPLIST}
|
||||
@${ECHO} '${TEST} $$2 = DEINSTALL && ${LOCALBASE}/bin/unregistervm ${PREFIX}/openjdk6-jre/bin/java' >> ${PKGDEINSTALL}
|
||||
@${ECHO} '${TEST} $$2 = POST-INSTALL && ${LOCALBASE}/bin/registervm "${PREFIX}/openjdk6-jre/bin/java # OpenJDK6 JRE"' >> ${PKGINSTALL}
|
||||
.else
|
||||
@"${LOCALBASE}/bin/registervm" "${PREFIX}/openjdk6/bin/java # OpenJDK6"
|
||||
@cd ${STAGEDIR}${PREFIX}/openjdk6 && \
|
||||
${FIND} -s . -not -type d | \
|
||||
${SED} -e 's,^\./,openjdk6/,' >> ${TMPPLIST}
|
||||
@cd ${STAGEDIR}${PREFIX}/openjdk6 && \
|
||||
${FIND} -s . -type d -empty | \
|
||||
${SED} 's,^\./,@exec ${MKDIR} %D/openjdk6/,' >> ${TMPPLIST}
|
||||
@cd ${STAGEDIR}${PREFIX}/openjdk6 && \
|
||||
${FIND} . -type d -not -depth 0 | ${SORT} -r | \
|
||||
${SED} 's,^\./,@dirrm openjdk6/,' >> ${TMPPLIST}
|
||||
@${ECHO} "@dirrm openjdk6" >> ${TMPPLIST}
|
||||
@${ECHO} '${TEST} $$2 = DEINSTALL && ${LOCALBASE}/bin/unregistervm ${PREFIX}/openjdk6/bin/java' >> ${PKGDEINSTALL}
|
||||
@${ECHO} '${TEST} $$2 = POST-INSTALL && ${LOCALBASE}/bin/registervm "${PREFIX}/openjdk6/bin/java # OpenJDK6"' >> ${PKGINSTALL}
|
||||
.if ${PORT_OPTIONS:MFASTDEBUG}
|
||||
@"${LOCALBASE}/bin/registervm" "${PREFIX}/openjdk6-fastdebug/bin/java # OpenJDK6"
|
||||
@cd ${STAGEDIR}${PREFIX}/openjdk6-fastdebug && \
|
||||
${FIND} -s . -not -type d | \
|
||||
${SED} -e 's,^\./,openjdk6-fastdebug/,' >> ${TMPPLIST}
|
||||
@cd ${STAGEDIR}${PREFIX}/openjdk6-fastdebug && \
|
||||
${FIND} -s . -type d -empty | \
|
||||
${SED} 's,^\./,@exec ${MKDIR} %D/openjdk6-fastdebug/,' >> ${TMPPLIST}
|
||||
@cd ${STAGEDIR}${PREFIX}/openjdk6-fastdebug && \
|
||||
${FIND} . -type d -not -depth 0 | ${SORT} -r | \
|
||||
${SED} 's,^\./,@dirrm openjdk6-fastdebug/,' >> ${TMPPLIST}
|
||||
@${ECHO} "@dirrm openjdk6-fastdebug" >> ${TMPPLIST}
|
||||
@${ECHO} '${TEST} $$2 = DEINSTALL && ${LOCALBASE}/bin/unregistervm ${PREFIX}/openjdk6-fastdebug/bin/java' >> ${PKGDEINSTALL}
|
||||
@${ECHO} '${TEST} $$2 = POST-INSTALL && ${LOCALBASE}/bin/registervm "${PREFIX}/openjdk6-fastdebug/bin/java # OpenJDK6"' >> ${PKGINSTALL}
|
||||
.endif
|
||||
.endif
|
||||
@${CAT} ${PKGMESSAGE}
|
||||
@${ECHO} "exit 0" >> ${PKGDEINSTALL}
|
||||
@${ECHO} "exit 0" >> ${PKGINSTALL}
|
||||
|
||||
.include <bsd.port.post.mk>
|
||||
|
@ -1,12 +1,12 @@
|
||||
SHA256 (openjdk-6-src-b27-26_oct_2012.tar.gz) = 044c3877b15940ff04f8aa817337f2878a00cc89674854557f1a02f15b1802a0
|
||||
SIZE (openjdk-6-src-b27-26_oct_2012.tar.gz) = 45789350
|
||||
SHA256 (jaxp144_05.zip) = c1a8a5a219fa55ecbf2ad43b66514335a3e96ccad40bd2ec9165a821343b2bff
|
||||
SIZE (jaxp144_05.zip) = 5976387
|
||||
SHA256 (jdk6-jaxws2_1_6-2011_06_13.zip) = 229040544e791f44906e8e7b6f6faf503c730a5d854275135f3925490d5c3be3
|
||||
SIZE (jdk6-jaxws2_1_6-2011_06_13.zip) = 5512710
|
||||
SHA256 (jdk6-jaf-b20.zip) = 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012
|
||||
SIZE (jdk6-jaf-b20.zip) = 71243
|
||||
SHA256 (apache-ant-1.8.4-bin.tar.bz2) = aeaed7d5c2b1e73ffc195d713931047ecc113b8c9844df5cbac2797007455069
|
||||
SIZE (apache-ant-1.8.4-bin.tar.bz2) = 4257152
|
||||
SHA256 (jtreg-4.1-bin-b04_14_mar_2012.zip) = 6d63447f3b70828b4d5f9e5c2416ba08ca00d54714a9d219837eae989df676c5
|
||||
SIZE (jtreg-4.1-bin-b04_14_mar_2012.zip) = 6126941
|
||||
SHA256 (jaxp144_05.zip) = c1a8a5a219fa55ecbf2ad43b66514335a3e96ccad40bd2ec9165a821343b2bff
|
||||
SIZE (jaxp144_05.zip) = 5976387
|
||||
SHA256 (jdk6-jaf-b20.zip) = 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012
|
||||
SIZE (jdk6-jaf-b20.zip) = 71243
|
||||
SHA256 (jdk6-jaxws2_1_6-2011_06_13.zip) = 229040544e791f44906e8e7b6f6faf503c730a5d854275135f3925490d5c3be3
|
||||
SIZE (jdk6-jaxws2_1_6-2011_06_13.zip) = 5512710
|
||||
SHA256 (openjdk-6-src-b27-26_oct_2012.tar.gz) = 044c3877b15940ff04f8aa817337f2878a00cc89674854557f1a02f15b1802a0
|
||||
SIZE (openjdk-6-src-b27-26_oct_2012.tar.gz) = 45789350
|
||||
SHA256 (jtreg-4.1-bin-b05_29_nov_2012.zip) = 9291eb4a14501232b35614e88686ff66ad8b69d0098dbd4322b28f97b672653d
|
||||
SIZE (jtreg-4.1-bin-b05_29_nov_2012.zip) = 5993382
|
||||
|
71
java/openjdk6/files/libiconv.patch
Normal file
71
java/openjdk6/files/libiconv.patch
Normal file
@ -0,0 +1,71 @@
|
||||
--- Makefile
|
||||
+++ Makefile
|
||||
@@ -241,9 +241,11 @@
|
||||
ifeq ($(OS_VENDOR), Apple)
|
||||
OTHER_LDLIBS += -liconv
|
||||
else
|
||||
- ifneq ($(OS_NAME), netbsd)
|
||||
- CPPFLAGS += -I$(PACKAGE_PATH)/include
|
||||
- OTHER_LDLIBS += -L$(PACKAGE_PATH)/lib -liconv
|
||||
+ ifneq ($(OS_NAME), freebsd)
|
||||
+ ifneq ($(OS_NAME), netbsd)
|
||||
+ CPPFLAGS += -I$(PACKAGE_PATH)/include
|
||||
+ OTHER_LDLIBS += -L$(PACKAGE_PATH)/lib -liconv
|
||||
+ endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
--- jdk/make/java/instrument/Makefile
|
||||
+++ jdk/make/java/instrument/Makefile
|
||||
@@ -112,10 +112,12 @@
|
||||
LDFLAGS += -Wl,--no-whole-archive
|
||||
endif
|
||||
|
||||
- ICONV_PATH = $(PACKAGE_PATH)
|
||||
+ ifneq ($(OS_VENDOR), FreeBSD)
|
||||
+ ICONV_PATH = $(PACKAGE_PATH)
|
||||
# Use CPPFLAGS instead of OTHER_INCLUDES to force this last
|
||||
- CPPFLAGS += -I$(ICONV_PATH)/include
|
||||
- OTHER_LDLIBS += -L$(ICONV_PATH)/lib -liconv
|
||||
+ CPPFLAGS += -I$(ICONV_PATH)/include
|
||||
+ OTHER_LDLIBS += -L$(ICONV_PATH)/lib -liconv
|
||||
+ endif
|
||||
else
|
||||
LDFLAGS += -L $(LIBDIR)/$(LIBARCH)/jli
|
||||
OTHER_LDLIBS += -ljli
|
||||
--- jdk/make/java/npt/Makefile
|
||||
+++ jdk/make/java/npt/Makefile
|
||||
@@ -75,9 +75,11 @@
|
||||
ifeq ($(OS_VENDOR), Apple)
|
||||
OTHER_LDLIBS += -liconv
|
||||
else
|
||||
- ifneq ($(OS_NAME), netbsd)
|
||||
- CPPFLAGS += -I$(PACKAGE_PATH)/include
|
||||
- OTHER_LDLIBS += -L$(PACKAGE_PATH)/lib -liconv
|
||||
+ ifneq ($(OS_NAME), freebsd)
|
||||
+ ifneq ($(OS_NAME), netbsd)
|
||||
+ CPPFLAGS += -I$(PACKAGE_PATH)/include
|
||||
+ OTHER_LDLIBS += -L$(PACKAGE_PATH)/lib -liconv
|
||||
+ endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
--- jdk/make/sun/splashscreen/Makefile
|
||||
+++ jdk/make/sun/splashscreen/Makefile
|
||||
@@ -74,9 +74,13 @@
|
||||
CFLAGS += -DPNG_NO_MMX_CODE
|
||||
ICONV_PATH = $(PACKAGE_PATH)
|
||||
CPPFLAGS += -I$(OPENWIN_HOME)/include \
|
||||
- -I$(OPENWIN_HOME)/include/X11/extensions \
|
||||
- -I$(ICONV_PATH)/include
|
||||
- OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext -L$(ICONV_PATH)/lib -liconv $(LIBM) -pthread
|
||||
+ -I$(OPENWIN_HOME)/include/X11/extensions
|
||||
+ OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM)
|
||||
+ ifneq ($(OS_NAME), freebsd)
|
||||
+ CPPFLAGS += -I$(ICONV_PATH)/include
|
||||
+ OTHER_LDLIBS += -L$(ICONV_PATH)/lib -liconv
|
||||
+ endif
|
||||
+ OTHER_LDLIBS += -pthread
|
||||
else
|
||||
CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions
|
||||
OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpthread
|
Loading…
Reference in New Issue
Block a user