Prepare for firefox-gtk2-bin-java package, and fix comment and a bug in

the binary package.

4 files changed, 40 insertions, 31 deletions

diff --git a/www/firefox-bin-java/DESCR b/www/firefox-bin-java/DESCR
index e127c65f2fe..0d81e6eaff8 100644
--- a/www/firefox-bin-java/DESCR
+++ b/www/firefox-bin-java/DESCR
@@ -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 --git a/www/firefox-bin-java/Makefile b/www/firefox-bin-java/Makefile
index 7bb13c5f468..39f719596d4 100644
--- a/www/firefox-bin-java/Makefile
+++ b/www/firefox-bin-java/Makefile
@@ -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
-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 --git a/www/firefox-bin-java/Makefile.common b/www/firefox-bin-java/Makefile.common
new file mode 100644
index 00000000000..36f9128fe30
--- /dev/null
+++ b/www/firefox-bin-java/Makefile.common
@@ -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
+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 --git a/www/firefox-bin-java/PLIST b/www/firefox-bin-java/PLIST
index ca0de5fbf36..01109afd3aa 100644
--- a/www/firefox-bin-java/PLIST
+++ b/www/firefox-bin-java/PLIST
@@ -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