From brix@fangorn.brixandersen.dk  Mon Oct 16 18:30:18 2006
Return-Path: <brix@fangorn.brixandersen.dk>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id C145716A4DE;
	Mon, 16 Oct 2006 18:30:18 +0000 (UTC)
	(envelope-from brix@fangorn.brixandersen.dk)
Received: from ns2.pil.dk (ns2.pil.dk [195.41.47.38])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4778743F50;
	Mon, 16 Oct 2006 18:27:07 +0000 (GMT)
	(envelope-from brix@fangorn.brixandersen.dk)
Received: from fangorn.brixandersen.dk (osgiliath.brixandersen.dk [87.53.223.189])
	by ns2.pil.dk (Postfix) with ESMTP id A10477BA222;
	Mon, 16 Oct 2006 20:26:52 +0200 (CEST)
Received: by fangorn.brixandersen.dk (Postfix, from userid 1001)
	id 6779D2E04B; Mon, 16 Oct 2006 20:26:52 +0200 (CEST)
Message-Id: <20061016182652.6779D2E04B@fangorn.brixandersen.dk>
Date: Mon, 16 Oct 2006 20:26:52 +0200 (CEST)
From: Henrik Brix Andersen <henrik@brixandersen.dk>
Reply-To: Henrik Brix Andersen <henrik@brixandersen.dk>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Greg Lewis <glewis@FreeBSD.org>
Subject: java/diablo-jdk15 installs its plug-in to X11BASE, preventing www/firefox from seeing it
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>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:    glewis
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Oct 16 18:40:21 GMT 2006
>Closed-Date:    Mon Nov 06 19:47:43 GMT 2006
>Last-Modified:  Mon Nov  6 19:50:19 GMT 2006
>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@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:
Responsible-Changed-From-To: freebsd-ports-bugs->glewis 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Oct 16 18:42:42 UTC 2006 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=104476 
State-Changed-From-To: open->closed 
State-Changed-By: glewis 
State-Changed-When: Mon Nov 6 19:47:40 UTC 2006 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=104476 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/104476: commit references a PR
Date: Mon,  6 Nov 2006 19:48:46 +0000 (UTC)

 glewis      2006-11-06 19:47:17 UTC
 
   FreeBSD ports repository
 
   Modified files:
     java/diablo-jre15    Makefile 
     java/diablo-jre15/files pkg-deinstall.in pkg-install.in 
     java/diablo-jdk15    Makefile 
     java/diablo-jdk15/files pkg-deinstall.in pkg-install.in 
   Log:
   . Chase the X11BASE -> LOCALBASE change for the browser plugin directories.
   
   PR:             104476
   Submitted by:   Henrik Brix Andersen <henrik@brixandersen.dk>
   
   Revision  Changes    Path
   1.5       +1 -0      ports/java/diablo-jdk15/Makefile
   1.2       +2 -2      ports/java/diablo-jdk15/files/pkg-deinstall.in
   1.3       +2 -2      ports/java/diablo-jdk15/files/pkg-install.in
   1.5       +1 -0      ports/java/diablo-jre15/Makefile
   1.2       +2 -2      ports/java/diablo-jre15/files/pkg-deinstall.in
   1.3       +2 -2      ports/java/diablo-jre15/files/pkg-install.in
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
