update the MozillaFirebird-bin-acroread packages to work with

Firefox 0.8 and reflect Firebird -> Firefox rename.

16 files changed, 61 insertions, 66 deletions

diff --git a/www/Makefile b/www/Makefile
index 381e5132356..8a7346c5158 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.293 2004/02/09 10:40:28 grant Exp $
+# $NetBSD: Makefile,v 1.294 2004/02/10 12:26:24 grant Exp $
 #
 
 COMMENT=	Packages related to the World Wide Web
@@ -6,9 +6,6 @@ COMMENT=	Packages related to the World Wide Web
 SUBDIR+=	Mosaic
 SUBDIR+=	MozillaFirebird
 SUBDIR+=	MozillaFirebird-bin
-SUBDIR+=	MozillaFirebird-bin-acroread
-SUBDIR+=	MozillaFirebird-bin-acroread3
-SUBDIR+=	MozillaFirebird-bin-acroread5
 SUBDIR+=	MozillaFirebird-bin-flash
 SUBDIR+=	MozillaFirebird-bin-java
 SUBDIR+=	MozillaFirebird-bin-nightly
@@ -80,6 +77,9 @@ SUBDIR+=	emacs-w3m
 SUBDIR+=	epiphany
 SUBDIR+=	fcgi
 SUBDIR+=	firefox-bin
+SUBDIR+=	firefox-bin-acroread
+SUBDIR+=	firefox-bin-acroread3
+SUBDIR+=	firefox-bin-acroread5
 SUBDIR+=	firefox-gtk2-bin
 SUBDIR+=	galeon
 SUBDIR+=	galway
diff --git a/www/MozillaFirebird-bin-acroread/DESCR b/www/MozillaFirebird-bin-acroread/DESCR
deleted file mode 100644
index fd853109c20..00000000000
--- a/www/MozillaFirebird-bin-acroread/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-phoenix-bin-acroread package provides Adobe Acrobat Reader 4 plugin for
-phoenix-bin package.
diff --git a/www/MozillaFirebird-bin-acroread/Makefile b/www/MozillaFirebird-bin-acroread/Makefile
deleted file mode 100644
index 7e66c183c55..00000000000
--- a/www/MozillaFirebird-bin-acroread/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2003/10/18 10:46:26 grant Exp $
-
-DISTNAME= 		MozillaFirebird-bin-acroread-1.0
-
-MAINTAINER=		kei@NetBSD.org
-COMMENT=		Acrobat Reader 4 plugin for MozillaFirebird-bin
-
-DEPENDS+=		acroread-4.[0-9]*:../../print/acroread
-CONFLICTS+=		phoenix-bin-acroread3-[0-9]*
-CONFLICTS+=		phoenix-bin-acroread3-[0-9]*
-CONFLICTS+=		MozillaFirebird-bin-acroread5-[0-9]*
-CONFLICTS+=		MozillaFirebird-bin-acroread5-[0-9]*
-
-ACROREAD=		Acrobat4
-
-.include "../../www/MozillaFirebird-bin-acroread/Makefile.common"
diff --git a/www/MozillaFirebird-bin-acroread/PLIST b/www/MozillaFirebird-bin-acroread/PLIST
deleted file mode 100644
index 50c4323174b..00000000000
--- a/www/MozillaFirebird-bin-acroread/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2003/09/27 14:13:08 grant 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/MozillaFirebird-bin-acroread3/DESCR b/www/MozillaFirebird-bin-acroread3/DESCR
deleted file mode 100644
index be6786015ef..00000000000
--- a/www/MozillaFirebird-bin-acroread3/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-phoenix-bin-acroread3 package provides Adobe Acrobat Reader 3 plugin for
-phoenix-bin package.
diff --git a/www/MozillaFirebird-bin-acroread3/Makefile b/www/MozillaFirebird-bin-acroread3/Makefile
deleted file mode 100644
index 356ef335ef7..00000000000
--- a/www/MozillaFirebird-bin-acroread3/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2003/10/18 10:46:26 grant Exp $
-
-DISTNAME= 		MozillaFirebird-bin-acroread3-1.0
-
-MAINTAINER=		kei@NetBSD.org
-COMMENT=		Acrobat Reader 3 plugin for MozillaFirebird-bin
-
-DEPENDS+=		acroread5-5.[0-9]*:../../print/acroread
-CONFLICTS+=		phoenix-bin-acroread-[0-9]*
-CONFLICTS+=		phoenix-bin-acroread5-[0-9]*
-CONFLICTS+=		MozillaFirebird-bin-acroread-[0-9]*
-CONFLICTS+=		MozillaFirebird-bin-acroread5-[0-9]*
-
-ACROREAD=		Acrobat3
-
-.include "../../www/MozillaFirebird-bin-acroread/Makefile.common"
diff --git a/www/MozillaFirebird-bin-acroread5/DESCR b/www/MozillaFirebird-bin-acroread5/DESCR
deleted file mode 100644
index 9a148998d55..00000000000
--- a/www/MozillaFirebird-bin-acroread5/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-phoenix-bin-acroread5 package provides Adobe Acrobat Reader 5 plugin for
-phoenix-bin package.
diff --git a/www/MozillaFirebird-bin-acroread5/Makefile b/www/MozillaFirebird-bin-acroread5/Makefile
deleted file mode 100644
index 92223bd0712..00000000000
--- a/www/MozillaFirebird-bin-acroread5/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2003/10/18 10:46:26 grant Exp $
-
-DISTNAME= 		MozillaFirebird-bin-acroread5-1.0
-
-MAINTAINER=		kei@NetBSD.org
-COMMENT=		Acrobat Reader 5 plugin for MozillaFirebird-bin
-
-DEPENDS+=		acroread5-5.[0-9]*:../../print/acroread5
-CONFLICTS+=		phoenix-bin-acroread3-[0-9]*
-CONFLICTS+=		phoenix-bin-acroread-[0-9]*
-CONFLICTS+=		MozillaFirebird-bin-acroread3-[0-9]*
-CONFLICTS+=		MozillaFirebird-bin-acroread-[0-9]*
-
-ACROREAD=		Acrobat5
-
-.include "../../www/MozillaFirebird-bin-acroread/Makefile.common"
diff --git a/www/firefox-bin-acroread/DESCR b/www/firefox-bin-acroread/DESCR
new file mode 100644
index 00000000000..b8d01204bf2
--- /dev/null
+++ b/www/firefox-bin-acroread/DESCR
@@ -0,0 +1,2 @@
+This package provides Adobe Acrobat Reader 4 plugin for the Linux
+version of the firefox-bin package.
diff --git a/www/firefox-bin-acroread/Makefile b/www/firefox-bin-acroread/Makefile
new file mode 100644
index 00000000000..4c98cf48a00
--- /dev/null
+++ b/www/firefox-bin-acroread/Makefile
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile,v 1.1 2004/02/10 12:26:24 grant Exp $
+
+DISTNAME= 		MozillaFirebird-bin-acroread-1.0
+
+MAINTAINER=		kei@NetBSD.org
+COMMENT=		Acrobat Reader 4 plugin for firefox-bin
+
+DEPENDS+=		acroread-4.[0-9]*:../../print/acroread
+CONFLICTS+=		firefox-bin-acroread3-[0-9]*
+CONFLICTS+=		firefox-bin-acroread5-[0-9]*
+
+ACROREAD=		Acrobat4
+
+.include "../../www/firefox-bin-acroread/Makefile.common"
diff --git a/www/MozillaFirebird-bin-acroread/Makefile.common b/www/firefox-bin-acroread/Makefile.common
index 977b8499b77..a743d3adc2e 100644
--- a/www/MozillaFirebird-bin-acroread/Makefile.common
+++ b/www/firefox-bin-acroread/Makefile.common
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile.common,v 1.2 2004/01/20 12:27:57 agc Exp $
+# $NetBSD: Makefile.common,v 1.1 2004/02/10 12:26:24 grant Exp $
 
+PKGNAME=		${DISTNAME:C|MozillaFirebird|firefox|}
 CATEGORIES=		www print
 MASTER_SITES=		# empty
 DISTFILES=		# empty
 
-DEPENDS+=		MozillaFirebird-bin>=0.6.1:../../www/MozillaFirebird-bin
+DEPENDS+=		firefox-bin>=0.8:../../www/firefox-bin
 
-ONLY_FOR_PLATFORM=	NetBSD-*-i386
+ONLY_FOR_PLATFORM=	Linux-*-i386 NetBSD-*-i386
 PLATFORM=		intellinux
 
 WRKSRC=			${WRKDIR}
@@ -14,10 +15,10 @@ NO_CHECKSUM=		YES
 NO_CONFIGURE=		YES
 NO_BUILD=		YES
 
-PLIST_SRC=		../../www/MozillaFirebird-bin-acroread/PLIST
+PLIST_SRC=		../../www/firefox-bin-acroread/PLIST
 PLIST_SUBST+=		ACROREAD=${ACROREAD}
 PLIST_SUBST+=		PLATFORM=${PLATFORM}
-NS_PLUGINS_DIR=         ${PREFIX}/lib/MozillaFirebird-linux/plugins
+NS_PLUGINS_DIR=		${PREFIX}/lib/firefox-linux/plugins
 
 do-install:
 	${INSTALL_DATA_DIR} ${NS_PLUGINS_DIR}
diff --git a/www/firefox-bin-acroread/PLIST b/www/firefox-bin-acroread/PLIST
new file mode 100644
index 00000000000..71fda87e409
--- /dev/null
+++ b/www/firefox-bin-acroread/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2004/02/10 12:26:24 grant Exp $
+@exec ${LN} -s %D/${ACROREAD}/Browsers/${PLATFORM}/nppdf.so %D/lib/firefox-linux/plugins/nppdf.so
+lib/firefox-linux/plugins/nppdf.so
diff --git a/www/firefox-bin-acroread3/DESCR b/www/firefox-bin-acroread3/DESCR
new file mode 100644
index 00000000000..1f8f2f750ec
--- /dev/null
+++ b/www/firefox-bin-acroread3/DESCR
@@ -0,0 +1,2 @@
+This package provides Adobe Acrobat Reader 3 plugin for the Linux
+version of the firefox-bin package.
diff --git a/www/firefox-bin-acroread3/Makefile b/www/firefox-bin-acroread3/Makefile
new file mode 100644
index 00000000000..84a02bccbda
--- /dev/null
+++ b/www/firefox-bin-acroread3/Makefile
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile,v 1.1 2004/02/10 12:26:24 grant Exp $
+
+DISTNAME= 		MozillaFirebird-bin-acroread3-1.0
+
+MAINTAINER=		kei@NetBSD.org
+COMMENT=		Acrobat Reader 3 plugin for firefox-bin
+
+DEPENDS+=		acroread3-3.[0-9]*:../../print/acroread
+CONFLICTS+=		firefox-bin-acroread-[0-9]*
+CONFLICTS+=		firefox-bin-acroread5-[0-9]*
+
+ACROREAD=		Acrobat3
+
+.include "../../www/firefox-bin-acroread/Makefile.common"
diff --git a/www/firefox-bin-acroread5/DESCR b/www/firefox-bin-acroread5/DESCR
new file mode 100644
index 00000000000..14345b19845
--- /dev/null
+++ b/www/firefox-bin-acroread5/DESCR
@@ -0,0 +1,2 @@
+This package provides Adobe Acrobat Reader 5 plugin for the Linux
+version of the firefox-bin package.
diff --git a/www/firefox-bin-acroread5/Makefile b/www/firefox-bin-acroread5/Makefile
new file mode 100644
index 00000000000..28e0f882bc9
--- /dev/null
+++ b/www/firefox-bin-acroread5/Makefile
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile,v 1.1 2004/02/10 12:26:24 grant Exp $
+
+DISTNAME= 		MozillaFirebird-bin-acroread5-1.0
+
+MAINTAINER=		kei@NetBSD.org
+COMMENT=		Acrobat Reader 5 plugin for firefox-bin
+
+DEPENDS+=		acroread5-5.[0-9]*:../../print/acroread5
+CONFLICTS+=		firefox-bin-acroread3-[0-9]*
+CONFLICTS+=		firefox-bin-acroread-[0-9]*
+
+ACROREAD=		Acrobat5
+
+.include "../../www/firefox-bin-acroread/Makefile.common"