[Midnightbsd-cvs] mports [16886] trunk/java/bootstrap-openjdk/Makefile.update: update update

[laffer1 at midnightbsd.org]

Revision: 16886
          http://svnweb.midnightbsd.org/mports/?rev=16886
Author:   laffer1
Date:     2014-09-07 00:46:05 -0400 (Sun, 07 Sep 2014)
Log Message:
-----------
update update

Modified Paths:
--------------
    trunk/java/bootstrap-openjdk/Makefile.update

Modified: trunk/java/bootstrap-openjdk/Makefile.update
===================================================================
--- trunk/java/bootstrap-openjdk/Makefile.update	2014-09-07 04:45:03 UTC (rev 16885)
+++ trunk/java/bootstrap-openjdk/Makefile.update	2014-09-07 04:46:05 UTC (rev 16886)
@@ -17,8 +17,10 @@
 
 .include "${PORTSDIR}/Mk/components/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/build/bsd-${ARCH:S/i386/i586/}/j2sdk-image
+JDK_IMAGEDIR?=	${JDK_PORTDIR}/work/stage/usr/local/${JDK_PORT}
 
 GET_REVISION=	${LOCALBASE}/bin/svnversion ${JDK_PORTDIR}
 TAR?=		/usr/bin/tar
@@ -36,11 +38,22 @@
 PLIST?=		${.CURDIR}/pkg-plist
 PLIST_SUB=	ARCH="${ARCH}" JDK_ROOT="."
 
+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_LDFLAGS=""
+
 .if ${ARCH} == "i386"
 PLIST_SUB+=	CLIENTVM=""
 .else
 PLIST_SUB+=	CLIENTVM="@comment "
 .endif
+PLIST_SUB+=	LIBSTDCXX=""
 
 all:
 	@${ECHO} ""
@@ -60,7 +73,15 @@
 	@${ECHO} "=============================================================="
 	@${ECHO} ""
 .if !defined(NO_BUILD)
-	@${SETENV} -i PATH=${PATH} ${MAKE} -C "${JDK_PORTDIR}" BATCH=yes
+	@${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}"
+	@${CP} -p "${FT2_IMAGEDIR}/lib/libfreetype.so.6" \
+	    "${JDK_IMAGEDIR}/jre/lib/${ARCH}"
+	@${FIND} "${JDK_IMAGEDIR}" -type f \
+	    -exec ${STRIP_CMD} -s {} \; 2> /dev/null
 .endif
 	@cd "${JDK_IMAGEDIR}" && \
 	${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${PLIST} | \
@@ -79,7 +100,7 @@
 	@${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} ""