After phoenix-bin update to 0.6, it expects plugins to be in the

lib/MozillaFirebird-linux directory.  Fix package to install plugins inside
it, and depend on phoenix-bin>=0.6.  Bump PKGREVISION.

10 files changed, 30 insertions, 25 deletions

diff --git a/www/phoenix-bin-acroread/Makefile b/www/phoenix-bin-acroread/Makefile
index 5784b085846..2cc907d9d60 100644
--- a/www/phoenix-bin-acroread/Makefile
+++ b/www/phoenix-bin-acroread/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/05/07 16:29:38 kei Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/24 10:36:03 jmmv Exp $
 
 DISTNAME= 		phoenix-bin-acroread-1.0
-PKGREVISION=		1
+PKGREVISION=		2
 
 MAINTAINER=		kei@netbsd.org
 COMMENT=		Acrobat Reader 4 plugin for phoenix-bin
diff --git a/www/phoenix-bin-acroread/Makefile.common b/www/phoenix-bin-acroread/Makefile.common
index 82dd4f07d57..59ead1e2772 100644
--- a/www/phoenix-bin-acroread/Makefile.common
+++ b/www/phoenix-bin-acroread/Makefile.common
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.1 2003/05/07 16:29:38 kei Exp $
+# $NetBSD: Makefile.common,v 1.2 2003/05/24 10:36:03 jmmv Exp $
 
 WRKSRC=			${WRKDIR}
 CATEGORIES=		www print
 MASTER_SITES=		# empty
 DISTFILES=		# empty
 
-DEPENDS+=		phoenix-bin-[0-9]*:../../www/phoenix-bin
+DEPENDS+=		phoenix-bin>=0.6:../../www/phoenix-bin
 
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
 PLATFORM=		intellinux
@@ -20,6 +20,6 @@ PLIST_SUBST+=		PLATFORM=${PLATFORM}
 
 do-install:
 	${LN} -s ${PREFIX}/${ACROREAD}/Browsers/${PLATFORM}/nppdf.so \
-		${PREFIX}/lib/phoenix-linux/plugins/nppdf.so
+		${PREFIX}/lib/MozillaFirebird-linux/plugins/nppdf.so
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/phoenix-bin-acroread/PLIST b/www/phoenix-bin-acroread/PLIST
index b918915ad87..2dfd8eb3760 100644
--- a/www/phoenix-bin-acroread/PLIST
+++ b/www/phoenix-bin-acroread/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.2 2003/05/07 16:29:38 kei Exp $
-@exec ${LN} -s %D/${ACROREAD}/Browsers/${PLATFORM}/nppdf.so %D/lib/phoenix-linux/plugins/nppdf.so
-lib/phoenix-linux/plugins/nppdf.so
+@comment $NetBSD: PLIST,v 1.3 2003/05/24 10:36:03 jmmv Exp $
+@exec ${LN} -s %D/${ACROREAD}/Browsers/${PLATFORM}/nppdf.so %D/lib/MozillaFirebird-linux/plugins/nppdf.so
+lib/MozillaFirebird-linux/plugins/nppdf.so
diff --git a/www/phoenix-bin-acroread3/Makefile b/www/phoenix-bin-acroread3/Makefile
index e900946e820..1c00aebb014 100644
--- a/www/phoenix-bin-acroread3/Makefile
+++ b/www/phoenix-bin-acroread3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/05/07 16:32:17 kei Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/24 10:36:03 jmmv Exp $
 
 DISTNAME= 		phoenix-bin-acroread3-1.0
+PKGREVISION=		1
 
 MAINTAINER=		kei@netbsd.org
 COMMENT=		Acrobat Reader 3 plugin for phoenix-bin
diff --git a/www/phoenix-bin-acroread5/Makefile b/www/phoenix-bin-acroread5/Makefile
index 56fea8e180d..47c6864dc21 100644
--- a/www/phoenix-bin-acroread5/Makefile
+++ b/www/phoenix-bin-acroread5/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/05/07 16:33:04 kei Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/24 10:36:03 jmmv Exp $
 
 DISTNAME= 		phoenix-bin-acroread5-1.0
+PKGREVISION=		1
 
 MAINTAINER=		kei@netbsd.org
 COMMENT=		Acrobat Reader 5 plugin for phoenix-bin
diff --git a/www/phoenix-bin-flash/Makefile b/www/phoenix-bin-flash/Makefile
index b72fd894636..a3653bde274 100644
--- a/www/phoenix-bin-flash/Makefile
+++ b/www/phoenix-bin-flash/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/04/29 13:37:09 kei Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/24 10:36:04 jmmv Exp $
 
 DISTNAME=		install_flash_player_6_${DISTUNAME}
 PKGNAME=		phoenix-bin-flash-${FLASH_VERS:S/r/./}
+PKGREVISION=		1
 CATEGORIES=		www graphics
 MASTER_SITES=		http://download.macromedia.com/pub/shockwave/flash/${SUB}/
 
@@ -20,7 +21,7 @@ SUB=			english/${DISTUNAME}/${FLASH_VERS}
 FLASH_VERS=		6.0r79
 DEPENDS+=		suse_compat>=6.3:../../emulators/${SUSE_DIR_PREFIX}_compat
 DEPENDS+=		suse_x11>=6.3:../../emulators/${SUSE_DIR_PREFIX}_x11
-DEPENDS+=		phoenix-bin>=0.5:../../www/phoenix-bin
+DEPENDS+=		phoenix-bin>=0.6:../../www/phoenix-bin
 DISTUNAME=		linux
 WRKNAME=		install_flash_player_6_${DISTUNAME}
 
@@ -36,7 +37,7 @@ NO_BUILD=		yes
 CHECK_SHLIBS=		no
 CRYPTO=			yes
 
-MOZ_NAME=		phoenix-linux
+MOZ_NAME=		MozillaFirebird-linux
 WRKSRC=			${WRKDIR}/${WRKNAME}
 NS_PLUGINS_DIR=		${PREFIX}/lib/${MOZ_NAME}/plugins
 
diff --git a/www/phoenix-bin-java/Makefile b/www/phoenix-bin-java/Makefile
index beb90d003cc..c86bb320e41 100644
--- a/www/phoenix-bin-java/Makefile
+++ b/www/phoenix-bin-java/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/04/29 13:38:59 kei Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/24 10:36:04 jmmv Exp $
 
 DISTNAME=		phoenix-bin-java-1.0
+PKGREVISION=		1
 WRKSRC=			${WRKDIR}
 CATEGORIES=		www lang
 MASTER_SITES=		# empty
@@ -10,7 +11,7 @@ MAINTAINER=		kei@netbsd.org
 COMMENT=		Java Run Time Environment (JRE) 1.3 plugin for phoenix-bin
 
 DEPENDS+=		sun-jre13-[0-9]*:../../lang/sun-jre13/
-DEPENDS+=		phoenix-bin-[0-9]*:../../www/phoenix-bin/
+DEPENDS+=		phoenix-bin>=0.6:../../www/phoenix-bin/
 
 ONLY_FOR_PLATFORM=	NetBSD-1.[6-9]*-i386
 
@@ -21,6 +22,6 @@ NO_CONFIGURE=		YES
 NO_BUILD=		YES
 
 do-install:
-			${LN} -s ${PREFIX}/java/sun-1.3.1/plugin/i386/ns600/libjavaplugin_oji.so ${PREFIX}/lib/phoenix-linux/plugins/libjavaplugin_oji.so
+			${LN} -s ${PREFIX}/java/sun-1.3.1/plugin/i386/ns600/libjavaplugin_oji.so ${PREFIX}/lib/MozillaFirebird-linux/plugins/libjavaplugin_oji.so
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/phoenix-bin-java/PLIST b/www/phoenix-bin-java/PLIST
index bcbc885c83a..81411cc7fd9 100644
--- a/www/phoenix-bin-java/PLIST
+++ b/www/phoenix-bin-java/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/04/29 13:38:59 kei Exp $
-@exec ${LN} -s %D/java/sun-1.3.1/plugin/i386/ns600/libjavaplugin_oji.so %D/lib/phoenix-linux/plugins/libjavaplugin_oji.so
-lib/phoenix-linux/plugins/libjavaplugin_oji.so
+@comment $NetBSD: PLIST,v 1.2 2003/05/24 10:36:04 jmmv Exp $
+@exec ${LN} -s %D/java/sun-1.3.1/plugin/i386/ns600/libjavaplugin_oji.so %D/lib/MozillaFirebird-linux/plugins/libjavaplugin_oji.so
+lib/MozillaFirebird-linux/plugins/libjavaplugin_oji.so
diff --git a/www/phoenix-bin-realplayer/Makefile b/www/phoenix-bin-realplayer/Makefile
index 2f06d952636..dd8ced3c66a 100644
--- a/www/phoenix-bin-realplayer/Makefile
+++ b/www/phoenix-bin-realplayer/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/04/29 13:41:08 kei Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/24 10:36:04 jmmv Exp $
 
 DISTNAME= 		phoenix-bin-realplayer-1.0
+PKGREVISION=		1
 WRKSRC=			${WRKDIR}
 CATEGORIES=		www audio graphics
 MASTER_SITES=		# empty
@@ -9,7 +10,7 @@ DISTFILES=		# empty
 MAINTAINER=		kei@netbsd.org
 COMMENT=		RealAudio and RealVideo player plugin for phoenix-bin
 
-DEPENDS+=		phoenix-bin-[0-9]*:../../www/phoenix-bin
+DEPENDS+=		phoenix-bin>=0.6:../../www/phoenix-bin
 DEPENDS+=		realplayer-[0-9]*:../../audio/realplayer
 
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
@@ -20,6 +21,6 @@ NO_BUILD=		YES
 
 do-install:
 			${LN} -s ${PREFIX}/lib/netscape/plugins/rpnp.so \
-				${PREFIX}/lib/phoenix-linux/plugins/rpnp.so
+				${PREFIX}/lib/MozillaFirebird-linux/plugins/rpnp.so
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/phoenix-bin-realplayer/PLIST b/www/phoenix-bin-realplayer/PLIST
index 4fcc7d49d79..67869841f75 100644
--- a/www/phoenix-bin-realplayer/PLIST
+++ b/www/phoenix-bin-realplayer/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/04/29 13:41:08 kei Exp $
-@exec ${LN} -s %D/lib/netscape/plugins/rpnp.so %D/lib/phoenix-linux/plugins/rpnp.so
-lib/phoenix-linux/plugins/rpnp.so
+@comment $NetBSD: PLIST,v 1.2 2003/05/24 10:36:04 jmmv Exp $
+@exec ${LN} -s %D/lib/netscape/plugins/rpnp.so %D/lib/MozillaFirebird-linux/plugins/rpnp.so
+lib/MozillaFirebird-linux/plugins/rpnp.so