Use the new @javavm

5 files changed, 7 insertions, 21 deletions

diff --git a/java/linux-oracle-jdk18/pkg-plist b/java/linux-oracle-jdk18/pkg-plist
index 9223b8b867c4..b295165100d3 100644
--- a/java/linux-oracle-jdk18/pkg-plist
+++ b/java/linux-oracle-jdk18/pkg-plist
@@ -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
diff --git a/java/linux-oracle-jre18/pkg-plist b/java/linux-oracle-jre18/pkg-plist
index 6e6668e0fdb2..b8801c89bc90 100644
--- a/java/linux-oracle-jre18/pkg-plist
+++ b/java/linux-oracle-jre18/pkg-plist
@@ -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
diff --git a/java/openjdk6/Makefile b/java/openjdk6/Makefile
index 1b2b2950aba8..43c870dedab2 100644
--- a/java/openjdk6/Makefile
+++ b/java/openjdk6/Makefile
@@ -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 <bsd.port.options.mk>
@@ -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 <bsd.port.post.mk>
diff --git a/java/openjdk7/Makefile b/java/openjdk7/Makefile
index 8a6811941106..69a68757c235 100644
--- a/java/openjdk7/Makefile
+++ b/java/openjdk7/Makefile
@@ -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 <bsd.port.post.mk>
diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile
index 584dbc846a90..3684033e5dae 100644
--- a/java/openjdk8/Makefile
+++ b/java/openjdk8/Makefile
@@ -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 <bsd.port.post.mk>