summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Lewis <glewis@FreeBSD.org>2005-02-17 19:41:13 +0000
committerGreg Lewis <glewis@FreeBSD.org>2005-02-17 19:41:13 +0000
commit6253055c5534604e4dd5b80641da443d68ee61a6 (patch)
tree9650f806120b6368426d39deb528c4da292122a2
parent. Move the invocation of unregistervm to the top of the packing list. (diff)
. 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).
-rw-r--r--java/jdk11/pkg-plist2
-rw-r--r--java/jdk12/pkg-plist2
-rw-r--r--java/jdk13/pkg-plist2
-rw-r--r--java/jre/pkg-plist2
4 files changed, 4 insertions, 4 deletions
diff --git a/java/jdk11/pkg-plist b/java/jdk11/pkg-plist
index ca22216c270e..7c9186ce4fb4 100644
--- a/java/jdk11/pkg-plist
+++ b/java/jdk11/pkg-plist
@@ -1,3 +1,4 @@
+@unexec %%LOCALBASE%%/bin/unregistervm "%D/jdk%%JDK_VERSION%%/bin/java"
jdk%%JDK_VERSION%%/include/freebsd/byteorder_md.h
jdk%%JDK_VERSION%%/include/freebsd/timeval_md.h
jdk%%JDK_VERSION%%/include/freebsd/sysmacros_md.h
@@ -519,7 +520,6 @@ jdk%%JDK_VERSION%%/index.html
@exec mkdir -p %D/share/doc/java
@unexec rmdir %D/share/doc/java 2>/dev/null || true
@exec %%LOCALBASE%%/bin/registervm "%D/jdk%%JDK_VERSION%%/bin/java # JDK%%JDK_VERSION%%"
-@unexec %%LOCALBASE%%/bin/unregistervm "%D/jdk%%JDK_VERSION%%/bin/java"
@dirrm jdk%%JDK_VERSION%%/lib/security
@dirrm jdk%%JDK_VERSION%%/lib/locale/ja_JP.UTF-8/app-defaults
@dirrm jdk%%JDK_VERSION%%/lib/locale/ja_JP.UTF-8
diff --git a/java/jdk12/pkg-plist b/java/jdk12/pkg-plist
index 6f99656363b8..775627151f4e 100644
--- a/java/jdk12/pkg-plist
+++ b/java/jdk12/pkg-plist
@@ -1,3 +1,4 @@
+@unexec %%LOCALBASE%%/bin/unregistervm "%D/jdk%%JDK_VERSION%%/bin/java"
jdk%%JDK_VERSION%%/COPYRIGHT
jdk%%JDK_VERSION%%/LICENSE
jdk%%JDK_VERSION%%/README
@@ -764,7 +765,6 @@ jdk%%JDK_VERSION%%/src.jar
@exec mkdir -p %D/share/doc/java
@unexec rmdir %D/share/doc/java 2>/dev/null || true
@exec %%LOCALBASE%%/bin/registervm "%D/jdk%%JDK_VERSION%%/bin/java # JDK%%JDK_VERSION%%"
-@unexec %%LOCALBASE%%/bin/unregistervm "%D/jdk%%JDK_VERSION%%/bin/java"
@dirrm jdk%%JDK_VERSION%%/lib
@dirrm jdk%%JDK_VERSION%%/jre/lib/security
@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ja_JP.UTF-8/app-defaults
diff --git a/java/jdk13/pkg-plist b/java/jdk13/pkg-plist
index 926257cd3cb7..46421d6f989c 100644
--- a/java/jdk13/pkg-plist
+++ b/java/jdk13/pkg-plist
@@ -1,3 +1,4 @@
+@unexec %%LOCALBASE%%/bin/unregistervm "%D/jdk%%JDK_VERSION%%/bin/java"
jdk%%JDK_VERSION%%/COPYRIGHT
jdk%%JDK_VERSION%%/LICENSE
jdk%%JDK_VERSION%%/LICENSE.fr
@@ -928,7 +929,6 @@ jdk%%JDK_VERSION%%/src.jar
@exec mkdir -p %D/share/doc/java
@unexec rmdir %D/share/doc/java 2>/dev/null || true
@exec %%LOCALBASE%%/bin/registervm "%D/jdk%%JDK_VERSION%%/bin/java # FREEBSD-JDK%%JDK_VERSION%%"
-@unexec %%LOCALBASE%%/bin/unregistervm "%D/jdk%%JDK_VERSION%%/bin/java"
@dirrm jdk%%JDK_VERSION%%/man/man1
@dirrm jdk%%JDK_VERSION%%/man
@dirrm jdk%%JDK_VERSION%%/lib/i386
diff --git a/java/jre/pkg-plist b/java/jre/pkg-plist
index 24faf3098567..062655480c8e 100644
--- a/java/jre/pkg-plist
+++ b/java/jre/pkg-plist
@@ -1,3 +1,4 @@
+@unexec %%LOCALBASE%%/bin/unregistervm "%D/jre%%JRE_VERSION%%/bin/java"
jre%%JRE_VERSION%%/CHANGES
jre%%JRE_VERSION%%/COPYRIGHT
jre%%JRE_VERSION%%/LICENSE
@@ -50,7 +51,6 @@ 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/jre%%JRE_VERSION%%/bin/java # JRE%%JRE_VERSION%%"
-@unexec %%LOCALBASE%%/bin/unregistervm "%D/jre%%JRE_VERSION%%/bin/java"
@dirrm jre%%JRE_VERSION%%/lib/security
@dirrm jre%%JRE_VERSION%%/lib/i386/green_threads
@dirrm jre%%JRE_VERSION%%/lib/i386