From owner-svn-ports-all@FreeBSD.ORG Mon Mar 10 18:16:46 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0FFD7D8C; Mon, 10 Mar 2014 18:16:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id F0998BC2; Mon, 10 Mar 2014 18:16:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2AIGj6g087283; Mon, 10 Mar 2014 18:16:45 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2AIGifa087278; Mon, 10 Mar 2014 18:16:44 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201403101816.s2AIGifa087278@svn.freebsd.org> From: Jung-uk Kim Date: Mon, 10 Mar 2014 18:16:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r347791 - in head/java/bootstrap-openjdk: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Mar 2014 18:16:46 -0000 Author: jkim Date: Mon Mar 10 18:16:44 2014 New Revision: 347791 URL: http://svnweb.freebsd.org/changeset/ports/347791 QAT: https://qat.redports.org/buildarchive/r347791/ Log: - Update to r347418. - Re-enable mixed mode by default. Now we know it is not our problem. - Do not build with system zlib and include libstdc++.so.6 in the distfile to avoid misc/compat8x dependency. Deleted: head/java/bootstrap-openjdk/files/ Modified: head/java/bootstrap-openjdk/Makefile head/java/bootstrap-openjdk/Makefile.update head/java/bootstrap-openjdk/distinfo.amd64 head/java/bootstrap-openjdk/distinfo.i386 head/java/bootstrap-openjdk/pkg-plist Modified: head/java/bootstrap-openjdk/Makefile ============================================================================== --- head/java/bootstrap-openjdk/Makefile Mon Mar 10 18:09:41 2014 (r347790) +++ head/java/bootstrap-openjdk/Makefile Mon Mar 10 18:16:44 2014 (r347791) @@ -18,8 +18,8 @@ RUN_DEPENDS= ${LOCALBASE}/share/java/zi: ONLY_FOR_ARCH= amd64 i386 DISTINFO_FILE= ${.CURDIR}/distinfo.${ARCH} -DISTVERSION_amd64= r333271 -DISTVERSION_i386= r333271 +DISTVERSION_amd64= r347418 +DISTVERSION_i386= r347418 JDK_NAME= openjdk JDK_PORT= openjdk6 @@ -32,12 +32,15 @@ WRKSRC= ${WRKDIR}/${JDK_ROOT} INSTALLDIR= ${STAGEDIR}${PREFIX}/${JDK_ROOT} -.include - -.if ${OSVERSION} >= 900010 -RUN_DEPENDS+= ${LOCALBASE}/lib/compat/libz.so.5:${PORTSDIR}/misc/compat8x +.if !exists(/usr/lib/libstdc++.so.6) +PLIST_SUB+= LIBSTDCXX="" +.else +EXCLUDE_EXP= -not -name libstdc++.so.6 +PLIST_SUB+= LIBSTDCXX="@comment " .endif +.include + .if ${ARCH} == "i386" PLIST_SUB+= CLIENTVM="" .else @@ -45,7 +48,7 @@ PLIST_SUB+= CLIENTVM="@comment " .endif do-install: - @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${INSTALLDIR} + @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${INSTALLDIR} "${EXCLUDE_EXP}" @cd ${WRKSRC} && ${COPYTREE_BIN} "bin jre/bin" ${INSTALLDIR} update: Modified: head/java/bootstrap-openjdk/Makefile.update ============================================================================== --- head/java/bootstrap-openjdk/Makefile.update Mon Mar 10 18:09:41 2014 (r347790) +++ head/java/bootstrap-openjdk/Makefile.update Mon Mar 10 18:16:44 2014 (r347791) @@ -17,6 +17,8 @@ LOCALBASE?= /usr/local .include "${PORTSDIR}/Mk/bsd.commands.mk" +FT2_PORTDIR!= ${REALPATH} ${PORTSDIR}/print/freetype2 +FT2_IMAGEDIR?= ${FT2_PORTDIR}/work/stage/usr/local JDK_PORTDIR!= ${REALPATH} ${PORTSDIR}/java/${JDK_PORT} JDK_IMAGEDIR?= ${JDK_PORTDIR}/work/stage/usr/local/${JDK_PORT} @@ -32,21 +34,26 @@ PORTREVISION!= ${GET_REVISION} 2>/dev/nu DISTDIR?= ${.CURDIR} DISTFILE= ${JDK_PORT}-${ARCH}-r${PORTREVISION}.tar.xz DISTINFO_FILE= ${.CURDIR}/distinfo.${ARCH} -EXTRA_PATCHES= ${.CURDIR}/files/bootstrap.patch MAKEFILE= ${.CURDIR}/Makefile PLIST?= ${.CURDIR}/pkg-plist PLIST_SUB= ARCH="${ARCH}" JDK_ROOT="." -BUILD_ARGS= BATCH=yes -BUILD_ARGS+= EXTRA_PATCHES="${EXTRA_PATCHES}" -BUILD_ARGS+= PORT_DBDIR=/var/empty -BUILD_ARGS+= WITHOUT_ICEDTEA=yes +BUILD_ARGS= BATCH=yes PORT_DBDIR=/var/empty +BUILD_ENV= __MAKE_CONF=/dev/null PATH="${PATH}" +FT2_BUILD_ARGS= ${BUILD_ARGS} +FT2_BUILD_ARGS+=CONFIGURE_ARGS="--without-bzip2 --without-png --without-zlib" +JDK_BUILD_ARGS= ${BUILD_ARGS} +JDK_BUILD_ARGS+=java_openjdk6_UNSET=ICEDTEA +JDK_BUILD_ARGS+=ALT_FREETYPE_HEADERS_PATH="${FT2_IMAGEDIR}/include" +JDK_BUILD_ARGS+=ALT_FREETYPE_LIB_PATH="${FT2_IMAGEDIR}/lib" +JDK_BUILD_ARGS+=SYSTEM_ZLIB=false ZLIB_LIBS="" .if ${ARCH} == "i386" PLIST_SUB+= CLIENTVM="" .else PLIST_SUB+= CLIENTVM="@comment " .endif +PLIST_SUB+= LIBSTDCXX="" all: @${ECHO} "" @@ -66,8 +73,11 @@ all: @${ECHO} "==============================================================" @${ECHO} "" .if !defined(NO_BUILD) - @${SETENV} -i PATH="${PATH}" __MAKE_CONF=/dev/null \ - ${MAKE} -C "${JDK_PORTDIR}" ${BUILD_ARGS} stage + @${SETENV} -i ${BUILD_ENV} \ + ${MAKE} -C "${FT2_PORTDIR}" ${FT2_BUILD_ARGS} stage + @${SETENV} -i ${BUILD_ENV} \ + ${MAKE} -C "${JDK_PORTDIR}" ${JDK_BUILD_ARGS} stage + @${CP} -p /usr/lib/libstdc++.so.6 "${JDK_IMAGEDIR}/jre/lib/${ARCH}" @${FIND} "${JDK_IMAGEDIR}" -type f \ -exec ${STRIP_CMD} -s {} \; 2> /dev/null .endif @@ -88,7 +98,7 @@ all: @${ECHO} "Finished at "`${SETENV} LANG=C date -u`"." @${ECHO} "" @${ECHO} "You may clean up the build directory if everything looks okay," - @${ECHO} "e.g., 'rm -fr ${JDK_PORTDIR}/work'." + @${ECHO} "e.g., 'rm -fr ${FT2_PORTDIR}/work ${JDK_PORTDIR}/work'." @${ECHO} "" @${ECHO} "==============================================================" @${ECHO} "" Modified: head/java/bootstrap-openjdk/distinfo.amd64 ============================================================================== --- head/java/bootstrap-openjdk/distinfo.amd64 Mon Mar 10 18:09:41 2014 (r347790) +++ head/java/bootstrap-openjdk/distinfo.amd64 Mon Mar 10 18:16:44 2014 (r347791) @@ -1,2 +1,2 @@ -SHA256 (openjdk6-amd64-r333271.tar.xz) = a37ad2c34c621bccf8762eb9447945741baa67b1fc085ca3d85e110b2780fe8d -SIZE (openjdk6-amd64-r333271.tar.xz) = 21935920 +SHA256 (openjdk6-amd64-r347418.tar.xz) = 658be1259c3c6802bcef708f186ff244a0a9a5ecd1a9229758ddbc6624db8b46 +SIZE (openjdk6-amd64-r347418.tar.xz) = 22318856 Modified: head/java/bootstrap-openjdk/distinfo.i386 ============================================================================== --- head/java/bootstrap-openjdk/distinfo.i386 Mon Mar 10 18:09:41 2014 (r347790) +++ head/java/bootstrap-openjdk/distinfo.i386 Mon Mar 10 18:16:44 2014 (r347791) @@ -1,2 +1,2 @@ -SHA256 (openjdk6-i386-r333271.tar.xz) = 1583de7df6b9f0003222b7d48176150a6ce0bb63cb1bda476a1f998e65020a3b -SIZE (openjdk6-i386-r333271.tar.xz) = 22054372 +SHA256 (openjdk6-i386-r347418.tar.xz) = dd4929fe7600c0294ac0d1fc2ac5392b1a77308dd8c7c65e8afd9d4492e0135c +SIZE (openjdk6-i386-r347418.tar.xz) = 22421440 Modified: head/java/bootstrap-openjdk/pkg-plist ============================================================================== --- head/java/bootstrap-openjdk/pkg-plist Mon Mar 10 18:09:41 2014 (r347790) +++ head/java/bootstrap-openjdk/pkg-plist Mon Mar 10 18:16:44 2014 (r347791) @@ -33,6 +33,7 @@ %%JDK_ROOT%%/jre/lib/%%ARCH%%/liblcms.so %%JDK_ROOT%%/jre/lib/%%ARCH%%/libnet.so %%JDK_ROOT%%/jre/lib/%%ARCH%%/libnio.so +%%LIBSTDCXX%%%%JDK_ROOT%%/jre/lib/%%ARCH%%/libstdc++.so.6 %%JDK_ROOT%%/jre/lib/%%ARCH%%/libverify.so %%JDK_ROOT%%/jre/lib/%%ARCH%%/libzip.so %%CLIENTVM%%%%JDK_ROOT%%/jre/lib/%%ARCH%%/client/libjvm.so