diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2012-11-01 17:25:59 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2012-11-01 17:25:59 +0000 |
| commit | 627eaadea82931b33a7387fc83f03b8f277552bc (patch) | |
| tree | 33dd1544e51d17f91e493c1dd5f18c7cc0758020 /java/bootstrap-openjdk/Makefile | |
| parent | Update to version 0.2.2.r553 (diff) | |
- Update to r306764.
- Generate distfiles directly from pkg-plist. This list was compiled from
running "ktrace -i -tn make" on openjdk6 and openjdk7 ports.
- Re-add jre/bin/java to work around a bug in openjdk7 build infrastructure.
It is not really necessary but langtools fails to build without it because
langtools/make/tools/GenStubs/GenStubs.java executes it based on java.home
property, which points to jre subdirectory. Note this problem only exists
on recent jdk7 langtools and jdk6 and jdk8 are not affected.
Feature safe: yes
Notes
Notes:
svn path=/head/; revision=306814
Diffstat (limited to 'java/bootstrap-openjdk/Makefile')
| -rw-r--r-- | java/bootstrap-openjdk/Makefile | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/java/bootstrap-openjdk/Makefile b/java/bootstrap-openjdk/Makefile index 38f13d22dcb6..517a3c12a8d6 100644 --- a/java/bootstrap-openjdk/Makefile +++ b/java/bootstrap-openjdk/Makefile @@ -2,9 +2,9 @@ PORTNAME= ${JDK_NAME} PORTVERSION= ${DISTVERSION_${ARCH}} -PORTREVISION= 1 CATEGORIES= java devel -MASTER_SITES= ${MASTER_SITE_LOCAL} +MASTER_SITES= ${MASTER_SITE_LOCAL} \ + http://people.freebsd.org/~jkim/ MASTER_SITE_SUBDIR= jkim PKGNAMEPREFIX= bootstrap- DISTNAME= ${JDK_PORT}-${ARCH}-${PORTVERSION} @@ -14,15 +14,13 @@ COMMENT= Oracle's Java 6 virtual machine release under the GPL v2 LICENSE= GPLv2 -BUILD_DEPENDS= ${LOCALBASE}/bin/registervm:${PORTSDIR}/java/javavmwrapper -RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper \ - ${LOCALBASE}/share/java/zi:${PORTSDIR}/java/java-zoneinfo +RUN_DEPENDS= ${LOCALBASE}/share/java/zi:${PORTSDIR}/java/java-zoneinfo ONLY_FOR_ARCH= amd64 i386 DISTINFO_FILE= ${.CURDIR}/distinfo.${ARCH} -DISTVERSION_amd64= r306294 -DISTVERSION_i386= r306294 +DISTVERSION_amd64= r306764 +DISTVERSION_i386= r306764 JDK_NAME= openjdk JDK_PORT= openjdk6 @@ -49,13 +47,10 @@ PLIST_SUB+= CLIENTVM="@comment " do-install: @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${INSTALLDIR} - @${CHOWN} ${BINOWN}:${BINGRP} ${INSTALLDIR}/bin/* - @${CHMOD} ${BINMODE} ${INSTALLDIR}/bin/* - @${ECHO_CMD} "@exec ${LOCALBASE}/bin/registervm '${INSTALLDIR}/bin/java # Bootstrap JDK'" >> ${TMPPLIST} - @${ECHO_CMD} "@unexec ${LOCALBASE}/bin/unregistervm ${INSTALLDIR}/bin/java" >> ${TMPPLIST} + @${CHOWN} ${BINOWN}:${BINGRP} ${INSTALLDIR}/bin/* ${INSTALLDIR}/jre/bin/* + @${CHMOD} ${BINMODE} ${INSTALLDIR}/bin/* ${INSTALLDIR}/jre/bin/* post-install: - @${LOCALBASE}/bin/registervm '${INSTALLDIR}/bin/java # Bootstrap JDK' @${CAT} ${PKGMESSAGE} update: |