ports/104931: [PATCH] java/diablo-jdk15: fix plugin installation path

[Marcin Wisnicki]

>Number:         104931
>Category:       ports
>Synopsis:       [PATCH] java/diablo-jdk15: fix plugin installation path
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Oct 30 15:00:34 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Marcin Wisnicki
>Release:        FreeBSD 6.2-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD ghost.pnet.one.pl 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #0: Fri Oct 27 06:01:27 CEST 2006
>Description:
Change X11BASE to LOCALBASE to unbreak Java plugin support

Similar fix should be applied to java/diablo-jre15

Port maintainer (glewis at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- diablo-jdk-1.5.0.07.01_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/java/diablo-jdk15.orig/Makefile /usr/ports/java/diablo-jdk15/Makefile
--- /usr/ports/java/diablo-jdk15.orig/Makefile	Thu Oct  5 00:36:16 2006
+++ /usr/ports/java/diablo-jdk15/Makefile	Mon Oct 30 15:52:17 2006
@@ -7,6 +7,7 @@
 
 PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}.${RELEASE_VERSION}.${BUILD_VERSION}
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	#
 PKGNAMEPREFIX=	diablo-
diff -ruN --exclude=CVS /usr/ports/java/diablo-jdk15.orig/files/pkg-deinstall.in /usr/ports/java/diablo-jdk15/files/pkg-deinstall.in
--- /usr/ports/java/diablo-jdk15.orig/files/pkg-deinstall.in	Thu Apr  6 17:20:45 2006
+++ /usr/ports/java/diablo-jdk15/files/pkg-deinstall.in	Mon Oct 30 15:14:27 2006
@@ -12,7 +12,7 @@
 # Remove the plugin
 
 # Plugin location variables
-BROWSERPLUGINDIR=%%X11BASE%%/lib/browser_plugins
+BROWSERPLUGINDIR=%%LOCALBASE%%/lib/browser_plugins
 if [ `echo "$1" | grep jdk` ]; then
 	DIABLOPLUGINDIR=${PKG_PREFIX}/diablo-jdk1.5.0/jre/plugin/i386/ns7
 else
diff -ruN --exclude=CVS /usr/ports/java/diablo-jdk15.orig/files/pkg-install.in /usr/ports/java/diablo-jdk15/files/pkg-install.in
--- /usr/ports/java/diablo-jdk15.orig/files/pkg-install.in	Fri Jul  7 21:24:00 2006
+++ /usr/ports/java/diablo-jdk15/files/pkg-install.in	Mon Oct 30 15:14:43 2006
@@ -12,7 +12,7 @@
 # Attempt to install a link for the browser plugin during post-install
 if [ "$2" = "POST-INSTALL" ]; then
 	# Plugin location variables
-	BROWSERPLUGINDIR=%%X11BASE%%/lib/browser_plugins
+	BROWSERPLUGINDIR=%%LOCALBASE%%/lib/browser_plugins
 	if [ `echo "$1" | grep jdk` ]; then
 		DIABLOPLUGINDIR=${PKG_PREFIX}/diablo-jdk1.5.0/jre/plugin/`uname -p`/ns7
 	else
--- diablo-jdk-1.5.0.07.01_1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: