From 1c9b9b269f5dff3a890def2445cd32b22f06d716 Mon Sep 17 00:00:00 2001 From: Greg Lewis Date: Thu, 17 Feb 2005 19:57:59 +0000 Subject: [PATCH] . 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). --- java/linux-blackdown-jdk12/pkg-plist | 2 +- java/linux-blackdown-jdk13/pkg-plist | 2 +- java/linux-blackdown-jdk14/pkg-plist | 2 +- java/linux-blackdown-jre11/pkg-plist | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/java/linux-blackdown-jdk12/pkg-plist b/java/linux-blackdown-jdk12/pkg-plist index 7b5100f1b593..8b255e17c37f 100644 --- a/java/linux-blackdown-jdk12/pkg-plist +++ b/java/linux-blackdown-jdk12/pkg-plist @@ -1,3 +1,4 @@ +@unexec %%LOCALBASE%%/bin/unregistervm "%D/%%T%%/bin/java" %%T%%/COPYRIGHT %%T%%/LICENSE %%T%%/README @@ -725,7 +726,6 @@ @exec mkdir -p %D/share/doc/java @unexec rmdir %D/share/doc/java 2>/dev/null || true @exec %%LOCALBASE%%/bin/registervm "%D/%%T%%/bin/java # Linux-Blackdown-JDK%%PORTVERSION%%" -@unexec %%LOCALBASE%%/bin/unregistervm "%D/%%T%%/bin/java" @dirrm %%T%%/lib @dirrm %%T%%/jre/lib/security @dirrm %%T%%/jre/lib/locale/ja_JP.UTF-8/app-defaults diff --git a/java/linux-blackdown-jdk13/pkg-plist b/java/linux-blackdown-jdk13/pkg-plist index ba889361bd3a..2a06e36789cf 100644 --- a/java/linux-blackdown-jdk13/pkg-plist +++ b/java/linux-blackdown-jdk13/pkg-plist @@ -1,3 +1,4 @@ +@unexec %%LOCALBASE%%/bin/unregistervm "%D/%%T%%/bin/java" %%T%%/jre/bin/i386/green_threads/java %%T%%/jre/bin/i386/green_threads/keytool %%T%%/jre/bin/i386/green_threads/policytool @@ -967,7 +968,6 @@ @exec mkdir -p %D/share/doc/java @unexec rmdir %D/share/doc/java 2>/dev/null || true @exec %%LOCALBASE%%/bin/registervm "%D/%%T%%/bin/java # Linux-Blackdown-JDK%%PORTVERSION%%" -@unexec %%LOCALBASE%%/bin/unregistervm "%D/%%T%%/bin/java" @dirrm %%T%%/jre/bin/i386/green_threads @dirrm %%T%%/jre/bin/i386/native_threads @dirrm %%T%%/jre/bin/i386 diff --git a/java/linux-blackdown-jdk14/pkg-plist b/java/linux-blackdown-jdk14/pkg-plist index f82bab331d89..f836335d9396 100644 --- a/java/linux-blackdown-jdk14/pkg-plist +++ b/java/linux-blackdown-jdk14/pkg-plist @@ -1,3 +1,4 @@ +@unexec %%LOCALBASE%%/bin/unregistervm "%D/%%T%%/bin/java" %%T%%/COPYRIGHT %%T%%/INSTALL %%T%%/LICENSE @@ -1544,7 +1545,6 @@ @exec mkdir -p %D/share/doc/java @unexec rmdir %D/share/doc/java 2>/dev/null || true @exec %%LOCALBASE%%/bin/registervm "%D/%%T%%/bin/java # Linux-Blackdown-JDK%%PORTVERSION%%" -@unexec %%LOCALBASE%%/bin/unregistervm "%D/%%T%%/bin/java" @dirrm %%T%%/man/man1 @dirrm %%T%%/man/ja_JP.eucJP/man1 @dirrm %%T%%/man/ja_JP.eucJP diff --git a/java/linux-blackdown-jre11/pkg-plist b/java/linux-blackdown-jre11/pkg-plist index 84da0baae91d..7b0eced47287 100644 --- a/java/linux-blackdown-jre11/pkg-plist +++ b/java/linux-blackdown-jre11/pkg-plist @@ -1,3 +1,4 @@ +@unexec %%LOCALBASE%%/bin/unregistervm "%D/linux-blackdown-jre%%JRE_VERSION%%/bin/java" linux-blackdown-jre%%JRE_VERSION%%/COPYRIGHT linux-blackdown-jre%%JRE_VERSION%%/LICENSE linux-blackdown-jre%%JRE_VERSION%%/README @@ -71,7 +72,6 @@ linux-blackdown-jre%%JRE_VERSION%%/lib/serialver.properties @exec mkdir -p %D/share/doc/java @unexec rmdir %D/share/doc/java 2>/dev/null || true @exec %%LOCALBASE%%/bin/registervm "%D/linux-blackdown-jre%%JRE_VERSION%%/bin/java # Linux-Blackdown-JRE%%JRE_VERSION%%" -@unexec %%LOCALBASE%%/bin/unregistervm "%D/linux-blackdown-jre%%JRE_VERSION%%/bin/java" @dirrm linux-blackdown-jre%%JRE_VERSION%%/lib/security @dirrm linux-blackdown-jre%%JRE_VERSION%%/lib/i686/native_threads @dirrm linux-blackdown-jre%%JRE_VERSION%%/lib/i686/green_threads