Date: Thu, 2 Jul 2015 19:28:39 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r391181 - in head/java: . openjdk7 openjdk7-jre Message-ID: <201507021928.t62JSdYB042749@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Thu Jul 2 19:28:38 2015 New Revision: 391181 URL: https://svnweb.freebsd.org/changeset/ports/391181 Log: Add a slave port to create JRE-only package for java/openjdk7. Added: head/java/openjdk7-jre/ head/java/openjdk7-jre/Makefile (contents, props changed) Modified: head/java/Makefile head/java/openjdk7/Makefile Modified: head/java/Makefile ============================================================================== --- head/java/Makefile Thu Jul 2 18:36:27 2015 (r391180) +++ head/java/Makefile Thu Jul 2 19:28:38 2015 (r391181) @@ -100,6 +100,7 @@ SUBDIR += openjdk6 SUBDIR += openjdk6-jre SUBDIR += openjdk7 + SUBDIR += openjdk7-jre SUBDIR += openjdk8 SUBDIR += openjdk8-jre SUBDIR += phpeclipse Added: head/java/openjdk7-jre/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/openjdk7-jre/Makefile Thu Jul 2 19:28:38 2015 (r391181) @@ -0,0 +1,11 @@ +# $FreeBSD$ + +PKGNAMESUFFIX= -jre + +MAINTAINER= java@FreeBSD.org +COMMENT= Java Runtime Environment ${JDK_MAJOR_VERSION} + +BUILD_JRE= yes +MASTERDIR= ${.CURDIR}/../openjdk7 + +.include "${MASTERDIR}/Makefile" Modified: head/java/openjdk7/Makefile ============================================================================== --- head/java/openjdk7/Makefile Thu Jul 2 18:36:27 2015 (r391180) +++ head/java/openjdk7/Makefile Thu Jul 2 19:28:38 2015 (r391181) @@ -19,8 +19,8 @@ DISTFILES= ${JDK_SRC_DISTFILE}${EXTRACT_ EXTRACT_ONLY= ${JDK_SRC_DISTFILE}${EXTRACT_SUFX} \ ${ANT_DISTFILE}${EXTRACT_SUFX} -MAINTAINER= glewis@FreeBSD.org -COMMENT= Java Development Kit 7 +MAINTAINER?= glewis@FreeBSD.org +COMMENT?= Java Development Kit 7 LICENSE= GPLv2 @@ -30,12 +30,22 @@ 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= DEBUG POLICY TZUPDATE +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= 80 PORT_BUILD_NUMBER= 15 JDK_MAJOR_VERSION= 7 @@ -62,7 +72,6 @@ RUN_DEPENDS+= javavm:${PORTSDIR}/java/ja DOS2UNIX_FILES= jdk/src/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_en.properties OPENJDK_OSARCH= bsd-${ARCH:S/i386/i586/} -INSTALLDIR= ${PREFIX}/${PORTNAME}${JDK_MAJOR_VERSION} NOPRECIOUSMAKEVARS= yes @@ -149,22 +158,39 @@ post-patch: .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 + ${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} - @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 +.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} "@unexec ${LOCALBASE}/bin/unregistervm ${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} - @${ECHO} "@exec ${LOCALBASE}/bin/registervm '${INSTALLDIR}/bin/java # OpenJDK${JDK_MAJOR_VERSION}'" >> ${TMPPLIST} + @${ECHO} "@exec ${LOCALBASE}/bin/registervm '${INSTALLDIR}/bin/java # ${JAVAVMS_COMMENT}'" >> ${TMPPLIST} .include <bsd.port.post.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507021928.t62JSdYB042749>