[pkgsrc/trunk]: pkgsrc/www/firefox-bin-java Prepare for firefox-gtk2-bin-java...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/aef3cbaa7c1b
branches:  trunk
changeset: 481324:aef3cbaa7c1b
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Oct 01 19:20:27 2004 +0000

description:
Prepare for firefox-gtk2-bin-java package, and fix comment and a bug in
the binary package.

diffstat:

 www/firefox-bin-java/DESCR           |   2 +-
 www/firefox-bin-java/Makefile        |  29 ++---------------------------
 www/firefox-bin-java/Makefile.common |  34 ++++++++++++++++++++++++++++++++++
 www/firefox-bin-java/PLIST           |   6 +++---
 4 files changed, 40 insertions(+), 31 deletions(-)

diffs (92 lines):

diff -r da252628ef62 -r aef3cbaa7c1b www/firefox-bin-java/DESCR
--- a/www/firefox-bin-java/DESCR        Fri Oct 01 13:36:56 2004 +0000
+++ b/www/firefox-bin-java/DESCR        Fri Oct 01 19:20:27 2004 +0000
@@ -1,2 +1,2 @@
 This package package provides Sun Java Run Time Environment (JRE)
-plugin for firefox-bin package.
+plugin for the firefox-bin package.
diff -r da252628ef62 -r aef3cbaa7c1b www/firefox-bin-java/Makefile
--- a/www/firefox-bin-java/Makefile     Fri Oct 01 13:36:56 2004 +0000
+++ b/www/firefox-bin-java/Makefile     Fri Oct 01 19:20:27 2004 +0000
@@ -1,31 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2004/10/01 10:37:33 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/10/01 19:20:27 wiz Exp $
+.include "Makefile.common"
 
-DISTNAME=              firefox-bin-java-1.1
-PKGREVISION=           1
-CATEGORIES=            www lang
-MASTER_SITES=          # empty
-DISTFILES=             # empty
-
-MAINTAINER=            kei%NetBSD.org@localhost
-COMMENT=               Java Run Time Environment (JRE) 1.3 plugin for firefox-bin
-
-DEPENDS+=              sun-jre14-[0-9]*:../../lang/sun-jre14
 DEPENDS+=              firefox-bin>=0.8:../../www/firefox-bin
 
-ONLY_FOR_PLATFORM=     Linux-*-i386 NetBSD-1.6*-i386 NetBSD-[2-9]*-i386
-
-WRKSRC=                        ${WRKDIR}
-NO_CHECKSUM=           YES
-NO_BUILDLINK=          YES
-NO_EXTRACT=            YES
-NO_CONFIGURE=          YES
-NO_BUILD=              YES
-
-NS_PLUGINS_DIR=        ${PREFIX}/lib/firefox-linux/plugins
-PLUGIN=                ${PREFIX}/java/sun-1.4/plugin/i386/ns610-gcc32/libjavaplugin_oji.so
-
-do-install:
-       ${INSTALL_DATA_DIR} ${NS_PLUGINS_DIR}
-       ${LN} -s ${PLUGIN} ${NS_PLUGINS_DIR}/libjavaplugin_oji.so
-
 .include "../../mk/bsd.pkg.mk"
diff -r da252628ef62 -r aef3cbaa7c1b www/firefox-bin-java/Makefile.common
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/firefox-bin-java/Makefile.common      Fri Oct 01 19:20:27 2004 +0000
@@ -0,0 +1,34 @@
+# $NetBSD: Makefile.common,v 1.1 2004/10/01 19:20:27 wiz Exp $
+
+DISTNAME=              ${MOZ_BIN}-java-1.1
+PKGREVISION=           1
+CATEGORIES=            www lang
+MASTER_SITES=          # empty
+DISTFILES=             # empty
+
+MAINTAINER=            kei%NetBSD.org@localhost
+COMMENT?=              Java Run Time Environment (JRE) 1.4 plugin for firefox-bin
+
+DEPENDS+=              sun-jre14-[0-9]*:../../lang/sun-jre14
+
+ONLY_FOR_PLATFORM=     Linux-*-i386 NetBSD-1.6*-i386 NetBSD-[2-9]*-i386
+
+WRKSRC=                        ${WRKDIR}
+NO_CHECKSUM=           YES
+NO_BUILDLINK=          YES
+NO_EXTRACT=            YES
+NO_CONFIGURE=          YES
+NO_BUILD=              YES
+
+MOZ_NAME?=             firefox-linux
+MOZ_BIN?=              ${MOZ_NAME:S/linux/bin/}
+
+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.4/plugin/i386/ns610-gcc32/libjavaplugin_oji.so
+
+do-install:
+       ${INSTALL_DATA_DIR} ${NS_PLUGINS_DIR}
+       ${LN} -s ${PLUGIN} ${NS_PLUGINS_DIR}/libjavaplugin_oji.so
diff -r da252628ef62 -r aef3cbaa7c1b www/firefox-bin-java/PLIST
--- a/www/firefox-bin-java/PLIST        Fri Oct 01 13:36:56 2004 +0000
+++ b/www/firefox-bin-java/PLIST        Fri Oct 01 19:20:27 2004 +0000
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.2 2004/06/16 18:16:59 abs Exp $
-@exec ${LN} -s %D/java/sun-1.3.1/plugin/i386/ns600/libjavaplugin_oji.so %D/lib/firefox-linux/plugins/libjavaplugin_oji.so
-lib/firefox-linux/plugins/libjavaplugin_oji.so
+@comment $NetBSD: PLIST,v 1.3 2004/10/01 19:20:27 wiz Exp $
+@exec ${LN} -s %D/java/sun-1.4/plugin/i386/ns600/libjavaplugin_oji.so %D/lib/${MOZ_NAME}/plugins/libjavaplugin_oji.so
+lib/${MOZ_NAME}/plugins/libjavaplugin_oji.so