From 6e54503ac840b95786cce0e162bd65727ea0754e Mon Sep 17 00:00:00 2001
From: Greg Lewis <glewis@FreeBSD.org>
Date: Thu, 16 Dec 2004 15:38:17 +0000
Subject: . Move pkg-install to files/pkg-install.in since it is modified
 before use.   This also fixes a problem that when being modified it wasn't
 specified   by absolute path.

Reported by:	Robert Backhaus <robbak@robbak.com>
---
 java/javavmwrapper/Makefile             |  3 ++-
 java/javavmwrapper/files/pkg-install.in | 20 ++++++++++++++++++++
 java/javavmwrapper/pkg-install          | 20 --------------------
 3 files changed, 22 insertions(+), 21 deletions(-)
 create mode 100644 java/javavmwrapper/files/pkg-install.in
 delete mode 100644 java/javavmwrapper/pkg-install

(limited to 'java')

diff --git a/java/javavmwrapper/Makefile b/java/javavmwrapper/Makefile
index 5847d198aac8..dd1e360fd174 100644
--- a/java/javavmwrapper/Makefile
+++ b/java/javavmwrapper/Makefile
@@ -36,7 +36,8 @@ do-configure:
 	       -e 's|%%JAVALIBDIR%%|${JAVALIBDIR}|;' \
 		${SRC}/${_script}.sh >${WRKDIR}/${_script}.sh
 .endfor
-	${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|;' pkg-install > ${PKGINSTALL}
+	${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|;' \
+		${FILESDIR}/pkg-install.in > ${PKGINSTALL}
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/classpath.sh ${PREFIX}/bin/classpath
diff --git a/java/javavmwrapper/files/pkg-install.in b/java/javavmwrapper/files/pkg-install.in
new file mode 100644
index 000000000000..e76f047b4f77
--- /dev/null
+++ b/java/javavmwrapper/files/pkg-install.in
@@ -0,0 +1,20 @@
+#!/bin/sh
+#
+# $FreeBSD: /tmp/pcvs/ports/java/javavmwrapper/files/pkg-install.in,v 1.1 2004-12-16 15:38:17 glewis Exp $
+
+LOCALBASE=%%LOCALBASE%%
+
+# This script runs during post-install
+if [ "x${2}" != "xPOST-INSTALL" ]; then
+    exit 0
+fi
+
+# Ensure all JDKs and JREs are installed
+for jvm in "${LOCALBASE}"/*jdk* "${LOCALBASE}"/*jre*; do
+    if [ -x "${jvm}/bin/java" ]; then
+        "${PKG_PREFIX}"/bin/registervm "${jvm}/bin/java"
+    fi
+done
+
+# Ensure all VMs are configured correctly
+"${PKG_PREFIX}"/bin/checkvms
diff --git a/java/javavmwrapper/pkg-install b/java/javavmwrapper/pkg-install
deleted file mode 100644
index 8f6d67f8195a..000000000000
--- a/java/javavmwrapper/pkg-install
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-LOCALBASE=%%LOCALBASE%%
-
-# This script runs during post-install
-if [ "x${2}" != "xPOST-INSTALL" ]; then
-    exit 0
-fi
-
-# Ensure all JDKs and JREs are installed
-for jvm in "${LOCALBASE}"/*jdk* "${LOCALBASE}"/*jre*; do
-    if [ -x "${jvm}/bin/java" ]; then
-        "${PKG_PREFIX}"/bin/registervm "${jvm}/bin/java"
-    fi
-done
-
-# Ensure all VMs are configured correctly
-"${PKG_PREFIX}"/bin/checkvms
-- 
cgit v1.2.3