ports/104476: java/diablo-jdk15 installs its plug-in to X11BASE, preventing www/firefox from seeing it

[Henrik Brix Andersen]

>Number:         104476
>Category:       ports
>Synopsis:       java/diablo-jdk15 installs its plug-in to X11BASE, preventing www/firefox from seeing it
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Oct 16 18:40:21 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Henrik Brix Andersen
>Release:        FreeBSD 6.2-PRERELEASE i386
>Organization:
pil.dk 
>Environment:
System: FreeBSD fangorn.brixandersen.dk 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #20: Mon Oct 16 11:21:02 CEST 2006 root at fangorn.brixandersen.dk:/usr/obj/usr/src/sys/FANGORN i386


	
>Description:
Recent versions of www/firefox was moved from X11BASE to LOCALBASE,
but java/diablo-jdk15 still installs its plug-into X11BASE, thus
preventing www/firefox from detecting the plug-in.

The java/diablo-jre15 port suffers from the same problem (and the same
fix applies).

	
>How-To-Repeat:
Install www/firefox and java/diablo-jdk15 (or java/diablo-jre15),
lauch firefox and type "about:plug-ins" in the URL. Notice that the
diablo java plug-in isn't listed.

	
>Fix:
The patch below moves the plug-in from java/diablo-jdk from X11BASE to
LOCALBASE. Should be applied to java/diablo-jre15 as well.

	

--- diablo-jdk.diff begins here ---
diff -ur /usr/ports/java/diablo-jdk15/Makefile diablo-jdk15/Makefile
--- /usr/ports/java/diablo-jdk15/Makefile	Mon Oct  2 21:50:34 2006
+++ diablo-jdk15/Makefile	Mon Oct 16 20:16:28 2006
@@ -7,6 +7,7 @@
 
 PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}.${RELEASE_VERSION}.${BUILD_VERSION}
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	#
 PKGNAMEPREFIX=	diablo-
diff -ur /usr/ports/java/diablo-jdk15/files/pkg-deinstall.in diablo-jdk15/files/pkg-deinstall.in
--- /usr/ports/java/diablo-jdk15/files/pkg-deinstall.in	Thu Apr  6 17:20:45 2006
+++ diablo-jdk15/files/pkg-deinstall.in	Mon Oct 16 20:13:30 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 -ur /usr/ports/java/diablo-jdk15/files/pkg-install.in diablo-jdk15/files/pkg-install.in
--- /usr/ports/java/diablo-jdk15/files/pkg-install.in	Wed Jul  5 22:15:23 2006
+++ diablo-jdk15/files/pkg-install.in	Mon Oct 16 20:13:15 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.diff ends here ---


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