pkg/38516: Patches for firefox-bin-java to accept multiple versions

["César Catrián Carreño" <ccatrian%eml.cc@localhost>]

>Number:         38516
>Category:       pkg
>Synopsis:       Patches for firefox-bin-java to accept multiple versions
>Confidential:   no
>Severity:       non-critical
>Priority:       high
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sat Apr 26 16:15:01 +0000 2008
>Originator:     César Catrián Carreño
>Release:        NetBSD 4.99.44 i386
>Organization:
>Environment:


System: NetBSD 4.99.44 (Basado en GENERIC: 1.781) #0: Sat Mar 22 18:07:59 CLT 
2008
        
cetrox%core.cjc.cl@localhost:/home/cetrox/src/netbsd-current/src/sys/arch/i386/compile/SAT



>Description:


The package firefox-bin-java only supports sun-jre15. With the patches will be
supporting sun-jre14, sun-jre15 and sun-jre6, or the JRE version referenced
by PKG_JVM.


>How-To-Repeat:





>Fix:


--- www/firefox-bin-java/Makefile.common.orig   2008-04-23 22:59:00.000000000 
-0400
+++ www/firefox-bin-java/Makefile.common        2008-04-26 11:23:53.000000000 
-0400
@@ -1,14 +1,12 @@
 # $NetBSD: Makefile.common,v 1.8 2008/03/07 05:43:42 jlam Exp $

-DISTNAME=              ${MOZ_BIN}-java-1.2
+DISTNAME=              ${MOZ_BIN}-java-1.3
 CATEGORIES=            www lang
 MASTER_SITES=          # empty
 DISTFILES=             # empty
 
 MAINTAINER=            kei%NetBSD.org@localhost
-COMMENT?=              Java Run Time Environment (JRE) 1.5 plugin for 
firefox-bin
-
-DEPENDS+=              sun-jre15-[0-9]*:../../lang/sun-jre15
+COMMENT?=              Java Run Time Environment (JRE) plugin for firefox-bin
 
 EMUL_PLATFORMS=                linux-i386

@@ -31,7 +29,8 @@
 PLIST_SRC=             ${.CURDIR}/../firefox-bin-java/PLIST
 
 NS_PLUGINS_DIR=        ${PREFIX}/lib/${MOZ_NAME}/plugins
-PLUGIN=                
${PREFIX}/java/sun-1.5/plugin/i386/ns7/libjavaplugin_oji.so
+
+.include "options.mk"
 
 do-install:
        ${INSTALL_DATA_DIR} ${DESTDIR}${NS_PLUGINS_DIR}


--- /dev/null   2008-04-26 11:52:43.000000000 -0400
+++ www/firefox-bin-java/options.mk     2008-04-26 11:27:09.000000000 -0400
@@ -0,0 +1,29 @@
+$NetBSD$
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.firefox-bin-java
+PKG_SUPPORTED_OPTIONS= sun-jre14 sun-jre15 sun-jre6
+
+.include "../../mk/java-env.mk"
+
+.if defined(PKG_JVM)
+PKG_SUGGESTED_OPTIONS=  ${PKG_JVM:S/dk/re/}
+.else
+PKG_SUGGESTED_OPTIONS=  sun-jre6
+.endif
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Msun-jre14)
+DEPENDS+=      sun-jre14-[0-9]*:../../lang/sun-jre14
+PLUGIN=         ${PREFIX}/java/sun-1.4/plugin/i386/ns610/libjavaplugin_oji.so
+.endif
+
+.if !empty(PKG_OPTIONS:Msun-jre15)
+DEPENDS+=       sun-jre15-[0-9]*:../../lang/sun-jre15
+PLUGIN=         ${PREFIX}/java/sun-1.5/plugin/i386/ns7/libjavaplugin_oji.so
+.endif
+
+.if !empty(PKG_OPTIONS:Msun-jre6)
+DEPENDS+=       sun-jre6-[0-9]*:../../lang/sun-jre6
+PLUGIN=         ${PREFIX}/java/sun-6/plugin/i386/ns7/libjavaplugin_oji.so
+.endif