From owner-svn-ports-head@freebsd.org Sun Jul 31 12:43:55 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1C523BA91D6; Sun, 31 Jul 2016 12:43:55 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EDF871459; Sun, 31 Jul 2016 12:43:54 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6VChs9L057744; Sun, 31 Jul 2016 12:43:54 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6VChrgj057739; Sun, 31 Jul 2016 12:43:53 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201607311243.u6VChrgj057739@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sun, 31 Jul 2016 12:43:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r419367 - in head/java: linux-oracle-jdk18 linux-oracle-jre18 openjdk6 openjdk7 openjdk8 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 Jul 2016 12:43:55 -0000 Author: bapt Date: Sun Jul 31 12:43:53 2016 New Revision: 419367 URL: https://svnweb.freebsd.org/changeset/ports/419367 Log: Use the new @javavm Modified: head/java/linux-oracle-jdk18/pkg-plist head/java/linux-oracle-jre18/pkg-plist head/java/openjdk6/Makefile head/java/openjdk7/Makefile head/java/openjdk8/Makefile Modified: head/java/linux-oracle-jdk18/pkg-plist ============================================================================== --- head/java/linux-oracle-jdk18/pkg-plist Sun Jul 31 12:40:43 2016 (r419366) +++ head/java/linux-oracle-jdk18/pkg-plist Sun Jul 31 12:43:53 2016 (r419367) @@ -10,6 +10,7 @@ %%T%%/bin/jar %%T%%/bin/jarsigner %%T%%/bin/java +@javavm %%T%%/bin/java %%T%%/bin/java-rmi.cgi %%T%%/bin/javac %%T%%/bin/javadoc @@ -3416,7 +3417,5 @@ %%DEMO%%%%T%%/sample/webservices/EbayServer/src/ebay/server/ImageProvider.java %%DEMO%%%%T%%/sample/webservices/EbayServer/src/ebay/server/Main.java %%T%%/src.zip -@exec %%LOCALBASE%%/bin/registervm "%D/%%T%%/bin/java # Linux-Oracle-JDK%%PORTVERSION%%" -@unexec %%LOCALBASE%%/bin/unregistervm "%D/%%T%%/bin/java" @dir %%T%%/jre/lib/applet @dir %%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.engine/profileRegistry/JMC.profile/.data Modified: head/java/linux-oracle-jre18/pkg-plist ============================================================================== --- head/java/linux-oracle-jre18/pkg-plist Sun Jul 31 12:40:43 2016 (r419366) +++ head/java/linux-oracle-jre18/pkg-plist Sun Jul 31 12:43:53 2016 (r419367) @@ -6,6 +6,7 @@ %%T%%/Welcome.html %%T%%/bin/ControlPanel %%T%%/bin/java +@javavm %%T%%/bin/java %%T%%/bin/javaws %%T%%/bin/jcontrol %%T%%/bin/jjs @@ -298,6 +299,4 @@ %%T%%/plugin/desktop/sun_java.desktop %%T%%/plugin/desktop/sun_java.png %%T%%/release -@exec %%LOCALBASE%%/bin/registervm "%D/%%T%%/bin/java # Linux-Oracle-JRE%%PORTVERSION%%" -@unexec %%LOCALBASE%%/bin/unregistervm "%D/%%T%%/bin/java" @dir %%T%%/lib/applet Modified: head/java/openjdk6/Makefile ============================================================================== --- head/java/openjdk6/Makefile Sun Jul 31 12:40:43 2016 (r419366) +++ head/java/openjdk6/Makefile Sun Jul 31 12:43:53 2016 (r419367) @@ -46,9 +46,6 @@ FASTDEBUG_DESC= Include fastdebug build TEST_DESC= Add support for running regression test .endif -PKGDEINSTALL= ${WRKDIR}/pkg-deinstall -PKGINSTALL= ${WRKDIR}/pkg-install - USES= compiler gmake iconv motif tar:xz .include @@ -320,8 +317,6 @@ do-install: ${STAGEDIR}${PREFIX}/openjdk6-fastdebug/jre/lib/${ARCH} .endif .endif - @${ECHO_CMD} "#!/bin/sh" > ${PKGDEINSTALL} - @${ECHO_CMD} "#!/bin/sh" > ${PKGINSTALL} .if defined(BUILD_JRE) @cd ${STAGEDIR}${PREFIX}/openjdk6-jre && \ ${FIND} -s . -not -type d | \ @@ -329,8 +324,7 @@ do-install: @cd ${STAGEDIR}${PREFIX}/openjdk6-jre && \ ${FIND} -s . -type d -empty | \ ${SED} 's,^\./,@dir openjdk6-jre/,' >> ${TMPPLIST} - @${ECHO_CMD} '${TEST} $$2 = DEINSTALL && ${LOCALBASE}/bin/unregistervm ${PREFIX}/openjdk6-jre/bin/java' >> ${PKGDEINSTALL} - @${ECHO_CMD} '${TEST} $$2 = POST-INSTALL && ${LOCALBASE}/bin/registervm "${PREFIX}/openjdk6-jre/bin/java # OpenJDK6 JRE"' >> ${PKGINSTALL} + @${ECHO_CMD} '@javawm ${PREFIX}/openjdk6-jre/bin/java' >> ${TMPPLIST} .else @cd ${STAGEDIR}${PREFIX}/openjdk6 && \ ${FIND} -s . -not -type d | \ @@ -338,8 +332,7 @@ do-install: @cd ${STAGEDIR}${PREFIX}/openjdk6 && \ ${FIND} -s . -type d -empty | \ ${SED} 's,^\./,@dir openjdk6/,' >> ${TMPPLIST} - @${ECHO_CMD} '${TEST} $$2 = DEINSTALL && ${LOCALBASE}/bin/unregistervm ${PREFIX}/openjdk6/bin/java' >> ${PKGDEINSTALL} - @${ECHO_CMD} '${TEST} $$2 = POST-INSTALL && ${LOCALBASE}/bin/registervm "${PREFIX}/openjdk6/bin/java # OpenJDK6"' >> ${PKGINSTALL} + @${ECHO_CMD} '@javawm ${PREFIX}/openjdk6/bin/java' >> ${TMPPLIST} .if ${PORT_OPTIONS:MFASTDEBUG} @cd ${STAGEDIR}${PREFIX}/openjdk6-fastdebug && \ ${FIND} -s . -not -type d | \ @@ -347,11 +340,8 @@ do-install: @cd ${STAGEDIR}${PREFIX}/openjdk6-fastdebug && \ ${FIND} -s . -type d -empty | \ ${SED} 's,^\./,@dir openjdk6-fastdebug/,' >> ${TMPPLIST} - @${ECHO_CMD} '${TEST} $$2 = DEINSTALL && ${LOCALBASE}/bin/unregistervm ${PREFIX}/openjdk6-fastdebug/bin/java' >> ${PKGDEINSTALL} - @${ECHO_CMD} '${TEST} $$2 = POST-INSTALL && ${LOCALBASE}/bin/registervm "${PREFIX}/openjdk6-fastdebug/bin/java # OpenJDK6"' >> ${PKGINSTALL} + @${ECHO_CMD} "@javavm ${PREFIX}/openjdk6-fastdebug/bin/java" >> ${TMPPLIST} .endif .endif - @${ECHO_CMD} "exit 0" >> ${PKGDEINSTALL} - @${ECHO_CMD} "exit 0" >> ${PKGINSTALL} .include Modified: head/java/openjdk7/Makefile ============================================================================== --- head/java/openjdk7/Makefile Sun Jul 31 12:40:43 2016 (r419366) +++ head/java/openjdk7/Makefile Sun Jul 31 12:43:53 2016 (r419367) @@ -197,11 +197,10 @@ do-install: ${INSTALL_DATA} ${FILESDIR}/cacerts \ ${STAGEDIR}${INSTALLDIR}/lib/security/cacerts .endif - @${ECHO} "@unexec ${LOCALBASE}/bin/unregistervm ${INSTALLDIR}/bin/java" >> ${TMPPLIST} + @${ECHO} "@javawm ${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 # ${JAVAVMS_COMMENT}'" >> ${TMPPLIST} .include Modified: head/java/openjdk8/Makefile ============================================================================== --- head/java/openjdk8/Makefile Sun Jul 31 12:40:43 2016 (r419366) +++ head/java/openjdk8/Makefile Sun Jul 31 12:43:53 2016 (r419367) @@ -442,9 +442,8 @@ do-install: ${CHMOD} ${BINMODE} ${JDK_JVMDIR}/jexec ${JDK_JVMDIR}/jspawnhelper @${ECHO} "@dir ${INSTALLDIR}/lib/applet" >> ${TMPPLIST} .endif - @${ECHO} "@unexec ${LOCALBASE}/bin/unregistervm ${INSTALLDIR}/bin/java" >> ${TMPPLIST} + @${ECHO} "@javawm ${INSTALLDIR}/bin/java" >> ${TMPPLIST} @${FIND} ${STAGEDIR}${INSTALLDIR} -not -type d | ${SORT} | \ ${SED} -e 's|^${STAGEDIR}${PREFIX}/||' >> ${TMPPLIST} - @${ECHO} "@exec ${LOCALBASE}/bin/registervm '${INSTALLDIR}/bin/java # ${JAVAVMS_COMMENT}'" >> ${TMPPLIST} .include