[Midnightbsd-cvs] mports: java/diablo-jdk15: vm registration path fixed.

[laffer1 at midnightbsd.org]

Log Message:
-----------
vm registration path fixed.

Modified Files:
--------------
    mports/java/diablo-jdk15:
        Makefile (r1.4 -> r1.5)
    mports/java/diablo-jdk15/files:
        pkg-install.in (r1.2 -> r1.3)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/java/diablo-jdk15/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -Ljava/diablo-jdk15/Makefile -Ljava/diablo-jdk15/Makefile -u -r1.4 -r1.5
--- java/diablo-jdk15/Makefile
+++ java/diablo-jdk15/Makefile
@@ -110,9 +110,9 @@
 
 post-install:
 	# Register the VM
-	"${LOCALBASE}/bin/registervm" \
-	  "${INSTALL_DIR}/bin/java # DiabloCaffe${JDK_VERSION}"
+#	"${LOCALBASE}/bin/registervm" \
+#	  "${INSTALL_DIR}/bin/java # DiabloCaffe${JDK_VERSION}"
 	# Install the plugin
-	${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+#	${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.post.mk>
Index: pkg-install.in
===================================================================
RCS file: /home/cvs/mports/java/diablo-jdk15/files/pkg-install.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -Ljava/diablo-jdk15/files/pkg-install.in -Ljava/diablo-jdk15/files/pkg-install.in -u -r1.2 -r1.3
--- java/diablo-jdk15/files/pkg-install.in
+++ java/diablo-jdk15/files/pkg-install.in
@@ -2,7 +2,7 @@
 # $FreeBSD: ports/java/diablo-jdk15/files/pkg-install.in,v 1.3 2006/11/06 19:47:17 glewis Exp $
 
 # Set up a standard path
-PATH=/usr/bin:/bin
+PATH=/usr/bin:/bin:/usr/local/bin
 
 # Hack to prevent licensing from breaking bento.
 if [ "x${PACKAGE_BUILDING}" != "x" ]; then
@@ -11,6 +11,9 @@
 
 # Attempt to install a link for the browser plugin during post-install
 if [ "$2" = "POST-INSTALL" ]; then
+	# register
+	registervm \
+		"${PKG_PREFIX}/diablo-jdk1.5.0/bin/java # DiabloCaffe${JDK_VERSION}"	
 	# Plugin location variables
 	BROWSERPLUGINDIR=%%LOCALBASE%%/lib/browser_plugins
 	if [ `echo "$1" | grep jdk` ]; then