From 8feb88e6e060f6ea89eea8c532bf75715d8cec4e Mon Sep 17 00:00:00 2001 From: Greg Lewis Date: Fri, 18 Feb 2005 17:21:52 +0000 Subject: . Move the invocation of unregistervm to the top of the packing list. This ensures that this command is run before the files in the package are deleted (which is necessary for it to correctly delete the symbolic links created by registervm). Approved by: phantom (maintainer) --- java/jdk14/Makefile | 2 +- java/jdk15/Makefile | 2 +- java/jdk16/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'java') diff --git a/java/jdk14/Makefile b/java/jdk14/Makefile index 1f4020bed97c..ccab2f26af0d 100644 --- a/java/jdk14/Makefile +++ b/java/jdk14/Makefile @@ -312,6 +312,7 @@ do-install: ${MKDIR} ${PREFIX}/jdk${JDK_VERSION} cd ${JDKIMAGEDIR} && ${FIND} . \ | ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION} + @${ECHO_MSG} "@unexec ${LOCALBASE}/bin/unregistervm ${PREFIX}/jdk${JDK_VERSION}/bin/java" >> ${TMPPLIST} ${FIND} -s ${JDKIMAGEDIR} -not -type d | \ ${SED} -ne 's#${JDKIMAGEDIR}#jdk${JDK_VERSION}#p' >> ${TMPPLIST} .if defined(WITH_DEBUG) @@ -329,7 +330,6 @@ do-install: @${FIND} -s -d ${PREFIX}/jdk${JDK_VERSION} -type d | \ ${SED} -ne 's#^${PREFIX}/#@dirrm #p' >> ${TMPPLIST} @${ECHO_MSG} "@exec ${LOCALBASE}/bin/registervm ${PREFIX}/jdk${JDK_VERSION}/bin/java # FREEBSD-JDK${JDK_VERSION}" >> ${TMPPLIST} - @${ECHO_MSG} "@unexec ${LOCALBASE}/bin/unregistervm ${PREFIX}/jdk${JDK_VERSION}/bin/java" >> ${TMPPLIST} post-install: .if !defined(MINIMAL) diff --git a/java/jdk15/Makefile b/java/jdk15/Makefile index f1d2f1ce3db8..70168c904c34 100644 --- a/java/jdk15/Makefile +++ b/java/jdk15/Makefile @@ -258,6 +258,7 @@ do-install: ${MKDIR} ${PREFIX}/jdk${JDK_VERSION} cd ${JDKIMAGEDIR} && ${FIND} . \ | ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION} + @${ECHO_MSG} "@unexec ${LOCALBASE}/bin/unregistervm ${PREFIX}/jdk${JDK_VERSION}/bin/java" >> ${TMPPLIST} @${FIND} -s ${JDKIMAGEDIR} -not -type d | \ ${SED} -ne 's#^${JDKIMAGEDIR}#jdk${JDK_VERSION}#p' >> ${TMPPLIST} .if defined(WITH_DEBUG) @@ -269,7 +270,6 @@ do-install: @${FIND} -s -d ${PREFIX}/jdk${JDK_VERSION} -type d | \ ${SED} -ne 's#^${PREFIX}/#@dirrm #p' >> ${TMPPLIST} @${ECHO_MSG} "@exec ${LOCALBASE}/bin/registervm ${PREFIX}/jdk${JDK_VERSION}/bin/java # FREEBSD-JDK${JDK_VERSION}" >> ${TMPPLIST} - @${ECHO_MSG} "@unexec ${LOCALBASE}/bin/unregistervm ${PREFIX}/jdk${JDK_VERSION}/bin/java" >> ${TMPPLIST} # XXX: put unregistervm into install script ? post-install: diff --git a/java/jdk16/Makefile b/java/jdk16/Makefile index f1d2f1ce3db8..70168c904c34 100644 --- a/java/jdk16/Makefile +++ b/java/jdk16/Makefile @@ -258,6 +258,7 @@ do-install: ${MKDIR} ${PREFIX}/jdk${JDK_VERSION} cd ${JDKIMAGEDIR} && ${FIND} . \ | ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION} + @${ECHO_MSG} "@unexec ${LOCALBASE}/bin/unregistervm ${PREFIX}/jdk${JDK_VERSION}/bin/java" >> ${TMPPLIST} @${FIND} -s ${JDKIMAGEDIR} -not -type d | \ ${SED} -ne 's#^${JDKIMAGEDIR}#jdk${JDK_VERSION}#p' >> ${TMPPLIST} .if defined(WITH_DEBUG) @@ -269,7 +270,6 @@ do-install: @${FIND} -s -d ${PREFIX}/jdk${JDK_VERSION} -type d | \ ${SED} -ne 's#^${PREFIX}/#@dirrm #p' >> ${TMPPLIST} @${ECHO_MSG} "@exec ${LOCALBASE}/bin/registervm ${PREFIX}/jdk${JDK_VERSION}/bin/java # FREEBSD-JDK${JDK_VERSION}" >> ${TMPPLIST} - @${ECHO_MSG} "@unexec ${LOCALBASE}/bin/unregistervm ${PREFIX}/jdk${JDK_VERSION}/bin/java" >> ${TMPPLIST} # XXX: put unregistervm into install script ? post-install: -- cgit v1.2.3