Index: head/java/openjdk6/Makefile =================================================================== --- head/java/openjdk6/Makefile (revision 420765) +++ head/java/openjdk6/Makefile (revision 420766) @@ -1,347 +1,347 @@ # Created by: Brian Gardner # $FreeBSD$ PORTNAME= openjdk6 PORTVERSION= b39 PORTEPOCH= 1 CATEGORIES= java devel MASTER_SITES= APACHE/ant/binaries/:ant \ https://java.net/downloads/openjdk6/:jdk \ LOCAL/jkim:jdk,jtreg DISTNAME= openjdk-6-src-${PORTVERSION}-${OPENJDK_BUILDDATE} DISTFILES= ${ANTFILE}:ant \ ${DISTNAME}${EXTRACT_SUFX}:jdk 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= ${DISTNAME}${EXTRACT_SUFX} BUILD_DEPENDS= ${LOCALBASE}/bin/zip:archivers/zip \ ${LOCALBASE}/bin/unzip:archivers/unzip \ ${LOCALBASE}/include/cups/cups.h:print/cups LIB_DEPENDS= libfreetype.so:print/freetype2 RUN_DEPENDS= javavm:java/javavmwrapper \ dejavu>0:x11-fonts/dejavu OPENJDK_BUILDDATE= 03_may_2016 OPTIONS_DEFINE= ICEDTEA IPV6 POLICY SOUND TZUPDATE OPTIONS_DEFAULT=ICEDTEA TZUPDATE ICEDTEA_DESC= Apply additional patches from IcedTea POLICY_DESC= Install the Unlimited Strength Policy Files SOUND_DESC= Enable sound support TZUPDATE_DESC= Update the time zone data .if !defined(BUILD_JRE) OPTIONS_DEFINE+=TEST OPTIONS_RADIO= DEVEL DEVEL_DESC= Build for OpenJDK development OPTIONS_RADIO_DEVEL= DEBUG FASTDEBUG DEBUG_DESC= Enable legacy debugging support FASTDEBUG_DESC= Include fastdebug build TEST_DESC= Add support for running regression test .endif USES= compiler gmake iconv motif tar:xz .include .include "${.CURDIR}/../openjdk6/Makefile.icedtea" .include "${.CURDIR}/../openjdk6/Makefile.test" EXTRA_PATCHES+= ${ICEDTEA_PATCHES} # java extracts directly to the cwd WRKSRC= ${WRKDIR} USE_XORG= x11 xext xi xt xtst # do not depend on devel/apache-ant to avoid circular dependency, but # use .tar.bz2 distfile to avoid duplicated downloads -ANTVERSION= 1.9.6 +ANTVERSION= 1.9.7 ANTFILE= apache-ant-${ANTVERSION}-bin.tar.bz2 JTREG_BUILD= b05_29_nov_2012 JTREGFILE= jtreg-4.1-bin-${JTREG_BUILD}.zip UPDATE_VERSION= 32 .if ${PORT_OPTIONS:MIPV6} CATEGORIES+= ipv6 .endif .if ${PORT_OPTIONS:MTZUPDATE} RUN_DEPENDS+= java-zoneinfo>0:java/java-zoneinfo .endif # avoid ARCH in MAKEFLAGS, breaks build NOPRECIOUSMAKEVARS= yes ONLY_FOR_ARCHS= amd64 i386 BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk6 \ ${LOCALBASE}/bootstrap-openjdk # do we have valid native jdk installed? .for CJDK in ${BOOTSTRAP_JDKS} . if !defined(BOOTSTRAPJDKDIR) && exists(${CJDK}/bin/javac) BOOTSTRAPJDKDIR= ${CJDK} . endif .endfor # if no valid jdk found, set dependency .if !defined(BOOTSTRAPJDKDIR) BOOTSTRAPJDKDIR?= ${LOCALBASE}/bootstrap-openjdk BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/bootstrap-openjdk .endif MAKE_ENV= LANG=C LC_ALL=C OS= \ ALT_JDK_IMPORT_PATH=${BOOTSTRAPJDKDIR} \ ALT_BOOTDIR=${BOOTSTRAPJDKDIR} \ ALT_CACERTS_FILE=${FILESDIR}/cacerts \ ALT_CUPS_HEADERS_PATH=${LOCALBASE}/include \ ALT_CUPS_LIB_PATH=${LOCALBASE}/lib \ ALT_FREETYPE_HEADERS_PATH=${LOCALBASE}/include \ ALT_FREETYPE_LIB_PATH=${LOCALBASE}/lib \ ALT_X11_PATH=${LOCALBASE} \ ALT_PACKAGE_PATH=${LOCALBASE} \ ANT_HOME=${WRKDIR}/apache-ant-${ANTVERSION} \ JAVACMD=${BOOTSTRAPJDKDIR}/bin/java \ BUILD_NUMBER=${PORTVERSION} \ NO_DOCS=true \ MILESTONE=fcs \ JDK_UPDATE_VERSION=${UPDATE_VERSION} # XXX Turn off parallel build by default. MAKE_JOBS_UNSAFE= yes MAKE_ENV+= HOTSPOT_BUILD_JOBS=${MAKE_JOBS_NUMBER} .if ${PORT_OPTIONS:MDEBUG} ALL_TARGET= debug_build OPENJDK_OSARCH= bsd-${ARCH:S/i386/i586/}-debug .else OPENJDK_OSARCH= bsd-${ARCH:S/i386/i586/} .endif # disable FASTDEBUG_BUILD by default to improve compile time. .if ${PORT_OPTIONS:MFASTDEBUG} MAKE_ENV+= SKIP_FASTDEBUG_BUILD=false .else MAKE_ENV+= SKIP_FASTDEBUG_BUILD=true .endif .if empty(PORT_OPTIONS:MIPV6) MAKE_ENV+= DONT_ENABLE_IPV6="YES" .endif .if ${PORT_OPTIONS:MPOLICY} MAKE_ENV+= UNLIMITED_CRYPTO="YES" .endif .if ${PORT_OPTIONS:MSOUND} EXTRA_PATCHES+= ${FILESDIR}/alsa-enable.patch LIB_DEPENDS+= libasound.so:audio/alsa-lib RUN_DEPENDS+= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins .else EXTRA_PATCHES+= ${FILESDIR}/alsa-disable.patch .endif .if ${PORT_OPTIONS:MTEST} DISTFILES+= ${JTREGFILE}:jtreg EXTRACT_ONLY+= ${JTREGFILE} BUILD_DEPENDS+= dejavu>0:x11-fonts/dejavu USES+= display:test .else EXTRA_PATCHES+= ${FILESDIR}/test_gamma-disable.patch .endif COPYDIRS= \ jdk/src/linux/doc/man COPYFILES= \ corba/make/common/Defs-linux.gmk \ corba/make/common/shared/Defs-linux.gmk \ hotspot/src/os/linux/vm/decoder_linux.cpp \ jdk/make/com/sun/tools/attach/mapfile-linux \ jdk/make/common/Defs-linux.gmk \ jdk/make/common/shared/Defs-linux.gmk \ jdk/make/java/nio/mapfile-linux \ jdk/make/netbeans/common/architectures/name-Linux.properties \ jdk/make/sun/awt/mapfile-vers-linux \ jdk/make/tools/sharing/classlist.linux \ jdk/src/solaris/classes/java/lang/UNIXProcess.java.linux \ jdk/src/solaris/classes/sun/tools/attach/LinuxAttachProvider.java \ jdk/src/solaris/classes/sun/tools/attach/LinuxVirtualMachine.java \ jdk/src/solaris/hpi/include/largefile_linux.h \ jdk/src/solaris/native/java/net/linux_close.c \ jdk/src/solaris/native/sun/tools/attach/LinuxVirtualMachine.c .include .if ${COMPILER_TYPE} == clang .if ${COMPILER_VERSION} >= 35 MAKE_ENV+= COMPILER_WARNINGS_FATAL=false .endif MAKE_ENV+= USE_CLANG=true .endif # GCC is broken with PCH: https://lists.freebsd.org/pipermail/svn-src-all/2015-March/101722.html .if ${COMPILER_TYPE} == gcc MAKE_ENV+= USE_PRECOMPILED_HEADER=0 .endif .if empty(ICONV_LIB) ICONV_CPPFLAGS= -DLIBICONV_PLUG .else ICONV_CPPFLAGS= -I${LOCALBASE}/include ICONV_LDFLAGS= -L${LOCALBASE}/lib ${ICONV_LIB} .endif ZLIB_LDFLAGS?= -lz post-extract: @for d in ${COPYDIRS}; do \ ${MKDIR} `echo ${WRKSRC}/$$d | ${SED} 's/linux/bsd/g;'`; \ cd ${WRKSRC}/$$d; \ for f in *; do \ if [ -f $$f ]; then \ t=`echo ${WRKSRC}/$$d/$$f | ${SED} 's/linux/bsd/g; s/Linux/Bsd/g'`; \ ${SED} 's/linux/bsd/g; s/Linux/Bsd/g; s/LINUX/BSD/g' < $$f > $$t; \ fi; \ done; \ done @for f in ${COPYFILES}; do \ t=`echo $$f | ${SED} 's/linux/bsd/g; s/Linux/Bsd/g'`; \ ${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.in > \ ${WRKSRC}/jdk/test/Makefile @${FIND} ${WRKSRC}/jdk/test -type f -name \*.sh -exec ${SED} -i "" \ -e s/Linux/FreeBSD/g {} \; post-patch: @${REINPLACE_CMD} -e "s|%%CXX_LDFLAGS%%|${CXX_LDFLAGS}|" \ ${WRKSRC}/corba/make/common/Defs-bsd.gmk \ ${WRKSRC}/jdk/make/common/Defs-bsd.gmk .if ${COMPILER_TYPE} == "clang" @${REINPLACE_CMD} -e "s|-fno-omit-frame-pointer|-fno-omit-frame-pointer -mno-omit-leaf-frame-pointer|" \ ${WRKSRC}/corba/make/common/Defs-bsd.gmk \ ${WRKSRC}/hotspot/make/bsd/makefiles/amd64.make \ ${WRKSRC}/jdk/make/common/Defs-bsd.gmk .endif @${REINPLACE_CMD} -e "s|%%ICONV_CPPFLAGS%%|${ICONV_CPPFLAGS}|" \ -e "s|%%ICONV_LDFLAGS%%|${ICONV_LDFLAGS}|" \ ${WRKSRC}/Makefile ${WRKSRC}/jdk/make/java/instrument/Makefile \ ${WRKSRC}/jdk/make/java/npt/Makefile \ ${WRKSRC}/jdk/make/sun/splashscreen/Makefile @${REINPLACE_CMD} -e "s|%%ZLIB_LDFLAGS%%|${ZLIB_LDFLAGS}|" \ ${WRKSRC}/jdk/make/com/sun/java/pack/Makefile \ ${WRKSRC}/jdk/make/common/Program.gmk \ ${WRKSRC}/jdk/make/java/jli/Makefile \ ${WRKSRC}/jdk/make/java/zip/Makefile \ ${WRKSRC}/jdk/make/tools/freetypecheck/Makefile @${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|" \ ${WRKSRC}/hotspot/src/os/bsd/vm/os_bsd.cpp \ ${WRKSRC}/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java \ ${WRKSRC}/jdk/src/share/classes/sun/print/PSPrinterJob.java .if defined(BUILD_JRE) @${REINPLACE_CMD} -e "s|%%JAVA_HOME%%|${PREFIX}/openjdk6-jre|" \ ${WRKSRC}/hotspot/src/os/posix/launcher/java_md.c \ ${WRKSRC}/jdk/src/solaris/bin/java_md.c .else @${REINPLACE_CMD} -e "s|%%JAVA_HOME%%|${PREFIX}/openjdk6|" \ ${WRKSRC}/hotspot/src/os/posix/launcher/java_md.c \ ${WRKSRC}/jdk/src/solaris/bin/java_md.c .endif post-build: .if ${PORT_OPTIONS:MTZUPDATE} @# Update time zones .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 .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 .endif .endif .if ${PORT_OPTIONS:MTEST} @${ECHO_MSG} "" @${ECHO_MSG} "Run \"make test\" to execute regression test (it could take a few hours to complete)." .if defined(DISPLAY) @${ECHO_MSG} "Unset the environment DISPLAY variable to run tests in a virtual X server." .endif @${ECHO_MSG} "" .endif do-install: .if defined(BUILD_JRE) @cd ${WRKSRC}/build/${OPENJDK_OSARCH}/j2re-image && \ ${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 @cd ${WRKSRC}/build/${OPENJDK_OSARCH}/j2sdk-image && \ ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/openjdk6 \ "-not ( -type d -name bin -prune )" @cd ${WRKSRC}/build/${OPENJDK_OSARCH}/j2sdk-image && \ ${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} @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 .if defined(BUILD_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,^\./,@dir openjdk6-jre/,' >> ${TMPPLIST} @${ECHO_CMD} '@javavm ${PREFIX}/openjdk6-jre/bin/java' >> ${TMPPLIST} .else @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,^\./,@dir openjdk6/,' >> ${TMPPLIST} @${ECHO_CMD} '@javavm ${PREFIX}/openjdk6/bin/java' >> ${TMPPLIST} .if ${PORT_OPTIONS:MFASTDEBUG} @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,^\./,@dir openjdk6-fastdebug/,' >> ${TMPPLIST} @${ECHO_CMD} "@javavm ${PREFIX}/openjdk6-fastdebug/bin/java" >> ${TMPPLIST} .endif .endif .include Index: head/java/openjdk6/distinfo =================================================================== --- head/java/openjdk6/distinfo (revision 420765) +++ head/java/openjdk6/distinfo (revision 420766) @@ -1,6 +1,7 @@ -SHA256 (apache-ant-1.9.6-bin.tar.bz2) = a43b0928960d63d6b1e2bed37e1ce4fd8fa1788ba84e08388bfe9513f02e8db3 -SIZE (apache-ant-1.9.6-bin.tar.bz2) = 4385004 +TIMESTAMP = 1472019288 +SHA256 (apache-ant-1.9.7-bin.tar.bz2) = be2ff3026cc655dc002bbcce100bd6724d448c63f702aa82b6d9899b22db7808 +SIZE (apache-ant-1.9.7-bin.tar.bz2) = 4392108 SHA256 (openjdk-6-src-b39-03_may_2016.tar.xz) = d11dc2ababe88e7891f1abbd7fa4fe033a65dea22c071331a641374b3247717f SIZE (openjdk-6-src-b39-03_may_2016.tar.xz) = 33887004 SHA256 (jtreg-4.1-bin-b05_29_nov_2012.zip) = 9291eb4a14501232b35614e88686ff66ad8b69d0098dbd4322b28f97b672653d SIZE (jtreg-4.1-bin-b05_29_nov_2012.zip) = 5993382 Index: head/java/openjdk7/Makefile =================================================================== --- head/java/openjdk7/Makefile (revision 420765) +++ head/java/openjdk7/Makefile (revision 420766) @@ -1,206 +1,206 @@ # Created by: Greg Lewis # $FreeBSD$ PORTNAME= openjdk PORTVERSION= ${JDK_MAJOR_VERSION}.${PORT_MINOR_VERSION}.${PORT_BUILD_NUMBER} PORTEPOCH= 1 CATEGORIES= java devel MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}u${JDK_MINOR_VERSION}/promoted/b${JDK_BUILD_NUMBER}/ \ http://download.java.net/jaxp/1.4.5/:jaxp \ http://icedtea.classpath.org/download/drops/:jaxp \ http://download.java.net/glassfish/components/jax-ws/openjdk/jdk7/:jaxws \ http://icedtea.classpath.org/download/drops/:jaxws \ https://java.net/downloads/jax-ws/JDK7/:jaf \ http://icedtea.classpath.org/download/drops/:jaf \ APACHE/ant/binaries/:ant PATCH_SITES= LOCAL/glewis/openjdk7 DISTFILES= ${JDK_SRC_DISTFILE}${EXTRACT_SUFX} \ ${ANT_DISTFILE}${EXTRACT_SUFX}:ant EXTRACT_ONLY= ${JDK_SRC_DISTFILE}${EXTRACT_SUFX} \ ${ANT_DISTFILE}${EXTRACT_SUFX} PATCHFILES= patch-7u45-b30.xz \ patch-7u51-b30.xz \ patch-7u55-b31.xz \ patch-7u60-b30.xz \ patch-7u65-b31.xz \ patch-7u71-b14.xz \ patch-7u76-b31.xz \ patch-7u80-b32.xz \ patch-7u85-b02.xz \ patch-7u91-b02.xz \ patch-7u95-b00.xz \ patch-7u101-b00.xz \ patch-7u111-b01.xz MAINTAINER?= glewis@FreeBSD.org COMMENT?= Java Development Kit 7 LICENSE= GPLv2 WRKSRC= ${WRKDIR}/${PORTNAME} USES= compiler dos2unix iconv gmake zip USE_XORG+= x11 xext xi xrender xt xtst MAKE_ARGS= CC=${CC:Q} CXX=${CXX:Q} HOST_CC=${CC:Q} OPTIONS_DEFINE= POLICY TZUPDATE OPTIONS_DEFAULT= POLICY TZUPDATE DEBUG_DESC= Enable extra debugging info POLICY_DESC= Install the Unlimited Strength Policy Files TZUPDATE_DESC= Update the time zone data JAVAVMS_COMMENT= OpenJDK${JDK_MAJOR_VERSION} .if !defined(BUILD_JRE) OPTIONS_DEFINE+= DEBUG INSTALLDIR= ${PREFIX}/${PORTNAME}${JDK_MAJOR_VERSION} .else JAVAVMS_COMMENT+= JRE INSTALLDIR= ${PREFIX}/${PORTNAME}${JDK_MAJOR_VERSION}-jre .endif PORT_MINOR_VERSION= 111 PORT_BUILD_NUMBER= 01 JDK_MAJOR_VERSION= 7 JDK_MINOR_VERSION= 40 JDK_BUILD_NUMBER= 43 JDK_BUILD_DATE= 26_aug_2013 JDK_SRC_DISTFILE= ${PORTNAME}-${JDK_MAJOR_VERSION}u${JDK_MINOR_VERSION}-fcs-src-b${JDK_BUILD_NUMBER}-${JDK_BUILD_DATE} # Use our own version of ant to avoid circular dependencies -ANT_VERSION= 1.9.4 +ANT_VERSION= 1.9.7 ANT_DISTFILE= apache-ant-${ANT_VERSION}-bin LIB_DEPENDS+= libasound.so:audio/alsa-lib \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 BUILD_DEPENDS+= zip:archivers/zip \ ${UNZIP_CMD}:archivers/unzip \ ${LOCALBASE}/include/cups/cups.h:print/cups RUN_DEPENDS+= javavm:java/javavmwrapper \ dejavu>0:x11-fonts/dejavu DOS2UNIX_FILES= jdk/src/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_en.properties OPENJDK_OSARCH= bsd-${ARCH:S/i386/i586/} NOPRECIOUSMAKEVARS= yes ONLY_FOR_ARCHS= i386 amd64 _MAKE_JOBS= # MAKE_ENV+= LANG="C" \ LC_ALL="C" \ JAVA_HOME="" \ CLASSPATH="" \ LD_LIBRARY_PATH="" \ MAKEFLAGS="" \ ALT_BOOTDIR="${BOOTSTRAPJDKDIR}" \ ALT_FREETYPE_HEADERS_PATH="${LOCALBASE}/include" \ ALT_FREETYPE_LIB_PATH="${LOCALBASE}/lib" \ ALT_CUPS_HEADERS_PATH="${LOCALBASE}/include" \ ALT_X11_PATH="${LOCALBASE}" \ ALT_PKG_PATH="${LOCALBASE}" \ ALT_PACKAGE_PATH="${LOCALBASE}" \ ANT_HOME="${WRKDIR}/apache-ant-${ANT_VERSION}" \ JAVACMD=${BOOTSTRAPJDKDIR}/bin/java \ X11DIR="${LOCALBASE}" \ LOCALDIR="${LOCALBASE}" \ COMPILER_WARNINGS_FATAL="false" \ NO_DOCS="true" \ SKIP_COMPARE_IMAGES="true" \ SKIP_FASTDEBUG_BUILD="true" \ SKIP_DEBUG_BUILD="true" \ ZIP_DEBUGINFO_FILES=0 \ ENABLE_FULL_DEBUG_SYMBOLS=0 \ PTHREAD_LIBS="-lpthread" \ MILESTONE="fcs" \ JDK_MICRO_VERSION="0_${PORT_MINOR_VERSION}" \ BUILD_NUMBER="b${PORT_BUILD_NUMBER}" MAKE_ENV+= HOTSPOT_BUILD_JOBS=${MAKE_JOBS_NUMBER} BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk7 \ ${LOCALBASE}/openjdk6 \ ${LOCALBASE}/bootstrap-openjdk DEBUG_MAKE_ENV= ALT_OBJCOPY=${NONEXISTENT} POLICY_MAKE_ENV= UNLIMITED_CRYPTO=1 TZUPDATE_RUN_DEPENDS= java-zoneinfo>0:java/java-zoneinfo .include # do we have valid native jdk installed? .for BJDK in ${BOOTSTRAP_JDKS} . if !defined(BOOTSTRAPJDKDIR) && exists(${BJDK}/bin/javac) BOOTSTRAPJDKDIR= ${BJDK} . endif .endfor # if no valid jdk found, set dependency .if !defined(BOOTSTRAPJDKDIR) BOOTSTRAPJDKDIR?= ${LOCALBASE}/bootstrap-openjdk BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/bootstrap-openjdk .endif .include # GCC is broken with PCH: https://lists.freebsd.org/pipermail/svn-src-all/2015-March/101722.html .if ${COMPILER_TYPE} == gcc MAKE_ENV+= USE_PRECOMPILED_HEADER=0 .endif .if empty(ICONV_LIB) MAKE_ENV+= EXTRA_CFLAGS=-DLIBICONV_PLUG .endif post-patch: @${REINPLACE_CMD} "s|%%LOCALBASE%%|${LOCALBASE}|" \ ${WRKSRC}/hotspot/src/os/bsd/vm/os_bsd.cpp \ ${WRKSRC}/jdk/src/share/classes/sun/print/PSPrinterJob.java .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 .endif .if ${PORT_OPTIONS:MTZUPDATE} pre-install: @# Update time zones .if !defined(BUILD_JRE) @${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 .else @${RM} -rf ${WRKSRC}/build/${OPENJDK_OSARCH}/j2re-image/lib/zi @${LN} -s -f ${LOCALBASE}/share/java/zi \ ${WRKSRC}/build/${OPENJDK_OSARCH}/j2re-image/lib .endif .endif do-install: @${MKDIR} ${STAGEDIR}${INSTALLDIR} .if !defined(BUILD_JRE) cd ${WRKSRC}/build/${OPENJDK_OSARCH}/j2sdk-image && \ ${PAX} -rw . ${STAGEDIR}${INSTALLDIR} ${INSTALL_DATA} \ ${WRKSRC}/build/${OPENJDK_OSARCH}/btjars/compilefontconfig.jar \ ${WRKSRC}/build/${OPENJDK_OSARCH}/btjars/javazic.jar \ ${STAGEDIR}${INSTALLDIR}/jre/lib/ ${INSTALL_DATA} ${FILESDIR}/cacerts \ ${STAGEDIR}${INSTALLDIR}/jre/lib/security/cacerts .else cd ${WRKSRC}/build/${OPENJDK_OSARCH}/j2re-image && \ ${PAX} -rw . ${STAGEDIR}${INSTALLDIR} ${INSTALL_DATA} ${FILESDIR}/cacerts \ ${STAGEDIR}${INSTALLDIR}/lib/security/cacerts .endif @${ECHO} "@javavm ${INSTALLDIR}/bin/java" >> ${TMPPLIST} @${FIND} -s ${STAGEDIR}${INSTALLDIR} -not -type d | ${SORT} | \ ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST} @${FIND} ${STAGEDIR}${INSTALLDIR} -type d -empty | ${SORT} -r | \ ${SED} -e 's,^${STAGEDIR}${PREFIX}/,@dir ,' >> ${TMPPLIST} .include Index: head/java/openjdk7/distinfo =================================================================== --- head/java/openjdk7/distinfo (revision 420765) +++ head/java/openjdk7/distinfo (revision 420766) @@ -1,31 +1,31 @@ -TIMESTAMP = 1463840428 +TIMESTAMP = 1472019396 SHA256 (openjdk-7u40-fcs-src-b43-26_aug_2013.zip) = 00f8ea561876cbcad174ba3ca7a9ae10b50df46a782ac64c2ac57ac357b50596 SIZE (openjdk-7u40-fcs-src-b43-26_aug_2013.zip) = 104575196 -SHA256 (apache-ant-1.9.4-bin.zip) = 973d97d656e65561e2753823de6cf6db35570aaf93eeec6e7cb3d68e1ec4d0e8 -SIZE (apache-ant-1.9.4-bin.zip) = 8309406 +SHA256 (apache-ant-1.9.7-bin.zip) = b28c5ea0b5ea90bb4ad6bab229b6a56ac4461760a251a12567803a69259cd9de +SIZE (apache-ant-1.9.7-bin.zip) = 8317465 SHA256 (patch-7u45-b30.xz) = f0ab28db8819a72b82236d98c6780a0fa063cf4d2f45f26105545559e630a1b3 SIZE (patch-7u45-b30.xz) = 156968 SHA256 (patch-7u51-b30.xz) = af1143952a0f67535c2bdf586b7089af1d525f544974e989fe7b273a925b8359 SIZE (patch-7u51-b30.xz) = 170476 SHA256 (patch-7u55-b31.xz) = 30d4ae0e98e639dca060f7dc8289fe8af345e93258c8642cad1378725330afa9 SIZE (patch-7u55-b31.xz) = 109908 SHA256 (patch-7u60-b30.xz) = 1132c6c32f515b735b7b3f78670ec81c3161b7afe8a10f21f68f851c2e776a4c SIZE (patch-7u60-b30.xz) = 324180 SHA256 (patch-7u65-b31.xz) = acde33caa1691a6a1bcb4cab71ea01ce73df616d02d023bda053e3f728850d72 SIZE (patch-7u65-b31.xz) = 87776 SHA256 (patch-7u71-b14.xz) = 2fa4622c55d55e27679ef99ce5d528210d66982abdfae53bf7fa9850e160db27 SIZE (patch-7u71-b14.xz) = 66484 SHA256 (patch-7u76-b31.xz) = a9ddaf7ee121b29bff9cd0300e7939640f6933223d81a484fa2db575cbb7f3de SIZE (patch-7u76-b31.xz) = 315184 SHA256 (patch-7u80-b32.xz) = 095e2f074125a3804710b7276fd96b743befb0472c3a3b5fd3a695511a10ff23 SIZE (patch-7u80-b32.xz) = 674268 SHA256 (patch-7u85-b02.xz) = 87699747b28ae80cb168f1e2af3dcff65cc0ef9a74decebcf4ee1868b117f971 SIZE (patch-7u85-b02.xz) = 78796 SHA256 (patch-7u91-b02.xz) = b18c3843d656340fcca0e9b0eb0410a598dbce9c53c84fc6fde53d189bf44829 SIZE (patch-7u91-b02.xz) = 152344 SHA256 (patch-7u95-b00.xz) = bb522469cedcd31ff15fde745ab5717bd012c52ce2e25d1180b3338b90f755a3 SIZE (patch-7u95-b00.xz) = 91612 SHA256 (patch-7u101-b00.xz) = 8406d9f453b91c4e31e5a6a0a1769c3da87e3e3bf7a4c567024f7f929f555702 SIZE (patch-7u101-b00.xz) = 121752 SHA256 (patch-7u111-b01.xz) = d46ffd30a6fa6d8ce40231e6dadcabf491a347e2afea87302f38bab5e2bee523 SIZE (patch-7u111-b01.xz) = 273552