diff options
| author | bad <bad@pkgsrc.org> | 2011-03-08 21:58:42 +0000 |
|---|---|---|
| committer | bad <bad@pkgsrc.org> | 2011-03-08 21:58:42 +0000 |
| commit | 8c6a64c8d540fb7164457a01403db48a56416868 (patch) | |
| tree | e97590a0334133c20452156348aaca79aa6f9d54 /www | |
| parent | 03160f5d2f99027a4befb11a822d0d142b300988 (diff) | |
| download | pkgsrc-8c6a64c8d540fb7164457a01403db48a56416868.tar.gz | |
Don't hardcode the location of the plugin. Make this work with Java 6.
Diffstat (limited to 'www')
| -rw-r--r-- | www/firefox-bin-java/Makefile.common | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/www/firefox-bin-java/Makefile.common b/www/firefox-bin-java/Makefile.common index c2d556d5bec..da2e8823e8e 100644 --- a/www/firefox-bin-java/Makefile.common +++ b/www/firefox-bin-java/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.11 2010/02/10 22:30:51 joerg Exp $ +# $NetBSD: Makefile.common,v 1.12 2011/03/08 21:58:42 bad Exp $ DISTNAME= ${MOZ_BIN}-java-1.2 CATEGORIES= www lang @@ -8,7 +8,9 @@ DISTFILES= # empty MAINTAINER= pkgsrc-users@NetBSD.org COMMENT?= Java Run Time Environment (JRE) 1.5 plugin for firefox-bin -DEPENDS+= sun-jre6-[0-9]*:../../lang/sun-jre6 +USE_JAVA= run +USE_JAVA2= yes +PKG_JVMS_ACCEPTED= jdk15 sun-jdk6 EMUL_PLATFORMS= linux-i386 @@ -30,8 +32,10 @@ PLIST_SUBST+= MOZ_NAME=${MOZ_NAME:Q} 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 +PLUGIN= ${PKG_JAVA_HOME}/plugin/i386/ns7/libjavaplugin_oji.so do-install: ${INSTALL_DATA_DIR} ${DESTDIR}${NS_PLUGINS_DIR} ${LN} -s ${PLUGIN} ${DESTDIR}${NS_PLUGINS_DIR}/libjavaplugin_oji.so + +.include "../../mk/java-vm.mk" |