Adjust and correct for addition of -acroread7 based plugins.

16 files changed, 37 insertions, 20 deletions

diff --git a/www/netscape7-acroread/DESCR b/www/netscape7-acroread/DESCR
index cc6791be301..1782de5c203 100644
--- a/www/netscape7-acroread/DESCR
+++ b/www/netscape7-acroread/DESCR
@@ -1 +1,2 @@
-This package provides Adobe Acrobat Reader 4 plugin for the Netscape7 package.
+This package provides the Adobe Acrobat Reader 4 plugin for the Netscape7
+package.
diff --git a/www/netscape7-acroread/Makefile b/www/netscape7-acroread/Makefile
index d29507c2a71..b150b58327e 100644
--- a/www/netscape7-acroread/Makefile
+++ b/www/netscape7-acroread/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2004/02/13 17:39:55 jschauma Exp $
+# $NetBSD: Makefile,v 1.2 2005/04/18 16:20:25 jschauma Exp $
 
 DISTNAME= 		netscape7-acroread-1.0
 
@@ -8,7 +8,9 @@ COMMENT=		Acrobat Reader 4 plugin for netscape7
 DEPENDS+=		acroread-4.[0-9]*:../../print/acroread
 CONFLICTS+=		netscape7-acroread3-[0-9]*
 CONFLICTS+=		netscape7-acroread5-[0-9]*
+CONFLICTS+=		netscape7-acroread7-[0-9]*
 
 ACROREAD=		Acrobat4
+ACRO_SUBDIR=		Browsers
 
 .include "../../www/netscape7-acroread/Makefile.common"
diff --git a/www/netscape7-acroread/Makefile.common b/www/netscape7-acroread/Makefile.common
index 96bb54916ba..a06c9acb139 100644
--- a/www/netscape7-acroread/Makefile.common
+++ b/www/netscape7-acroread/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2004/02/13 17:39:55 jschauma Exp $
+# $NetBSD: Makefile.common,v 1.2 2005/04/18 16:20:25 jschauma Exp $
 
 PKGNAME=		${DISTNAME:C|MozillaFirebird|firefox|}
 CATEGORIES=		www print
@@ -17,12 +17,13 @@ NO_BUILD=		YES
 
 PLIST_SRC=		../../www/netscape7-acroread/PLIST
 PLIST_SUBST+=		ACROREAD=${ACROREAD}
+PLIST_SUBST+=		ACRO_SUBDIR=${ACRO_SUBDIR}
 PLIST_SUBST+=		PLATFORM=${PLATFORM}
 NS_PLUGINS_DIR=		${PREFIX}/lib/netscape/netscape7/plugins
 
 do-install:
 	${INSTALL_DATA_DIR} ${NS_PLUGINS_DIR}
-	${LN} -s ${PREFIX}/${ACROREAD}/Browsers/${PLATFORM}/nppdf.so \
+	${LN} -s ${PREFIX}/${ACROREAD}/${ACRO_SUBDIR}/${PLATFORM}/nppdf.so \
 		${NS_PLUGINS_DIR}/nppdf.so
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/netscape7-acroread/PLIST b/www/netscape7-acroread/PLIST
index 72f5bfbd244..b1fcde22ae9 100644
--- a/www/netscape7-acroread/PLIST
+++ b/www/netscape7-acroread/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2004/02/13 17:39:55 jschauma Exp $
-@exec ${LN} -s %D/${ACROREAD}/Browsers/${PLATFORM}/nppdf.so %D/lib/netscape/netscape7/plugins/nppdf.so
+@comment $NetBSD: PLIST,v 1.2 2005/04/18 16:20:25 jschauma Exp $
+@exec ${LN} -s %D/${ACROREAD}/${ACRO_SUBDIR}/${PLATFORM}/nppdf.so %D/lib/netscape/netscape7/plugins/nppdf.so
 lib/netscape/netscape7/plugins/nppdf.so
diff --git a/www/netscape7-acroread3/DESCR b/www/netscape7-acroread3/DESCR
index e6e7bb46222..69ba2aea8a4 100644
--- a/www/netscape7-acroread3/DESCR
+++ b/www/netscape7-acroread3/DESCR
@@ -1 +1,2 @@
-This package provides Adobe Acrobat Reader 3 plugin for the Netscape7 package.
+This package provides the Adobe Acrobat Reader 3 plugin for the Netscape7
+package.
diff --git a/www/netscape7-acroread3/Makefile b/www/netscape7-acroread3/Makefile
index 9de6abed0ee..84154736125 100644
--- a/www/netscape7-acroread3/Makefile
+++ b/www/netscape7-acroread3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2004/02/13 17:39:55 jschauma Exp $
+# $NetBSD: Makefile,v 1.2 2005/04/18 16:20:25 jschauma Exp $
 
 DISTNAME= 		netscape7-acroread3-1.0
 
@@ -8,7 +8,9 @@ COMMENT=		Acrobat Reader 3 plugin for netscape7
 DEPENDS+=		acroread3-3.[0-9]*:../../print/acroread3
 CONFLICTS+=		netscape7-acroread-[0-9]*
 CONFLICTS+=		netscape7-acroread5-[0-9]*
+CONFLICTS+=		netscape7-acroread7-[0-9]*
 
 ACROREAD=		Acrobat3
+ACRO_SUBDIR=		Browsers
 
 .include "../../www/netscape7-acroread/Makefile.common"
diff --git a/www/netscape7-acroread5/DESCR b/www/netscape7-acroread5/DESCR
index 4a387426dbf..7aabb187d47 100644
--- a/www/netscape7-acroread5/DESCR
+++ b/www/netscape7-acroread5/DESCR
@@ -1 +1,2 @@
-This package provides Adobe Acrobat Reader 5 plugin for the Netscape7 package.
+This package provides the Adobe Acrobat Reader 5 plugin for the Netscape7
+package.
diff --git a/www/netscape7-acroread5/Makefile b/www/netscape7-acroread5/Makefile
index 5713da45bc1..c44e20e052b 100644
--- a/www/netscape7-acroread5/Makefile
+++ b/www/netscape7-acroread5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2004/02/13 17:39:55 jschauma Exp $
+# $NetBSD: Makefile,v 1.2 2005/04/18 16:20:25 jschauma Exp $
 
 DISTNAME= 		netscape7-acroread5-1.0
 
@@ -8,7 +8,9 @@ COMMENT=		Acrobat Reader 5 plugin for netscape7
 DEPENDS+=		acroread5-5.[0-9]*:../../print/acroread5
 CONFLICTS+=		netscape7-acroread-[0-9]*
 CONFLICTS+=		netscape7-acroread3-[0-9]*
+CONFLICTS+=		netscape7-acroread7-[0-9]*
 
 ACROREAD=		Acrobat5
+ACRO_SUBDIR=		Browsers
 
 .include "../../www/netscape7-acroread/Makefile.common"
diff --git a/www/opera-acroread/DESCR b/www/opera-acroread/DESCR
index f13093635bc..2a238a6a078 100644
--- a/www/opera-acroread/DESCR
+++ b/www/opera-acroread/DESCR
@@ -1 +1 @@
-This package provides Adobe Acrobat Reader 4 plugin for the Opera package.
+This package provides the Adobe Acrobat Reader 4 plugin for the Opera package.
diff --git a/www/opera-acroread/Makefile b/www/opera-acroread/Makefile
index 493f0b57c9e..aae2fb915ec 100644
--- a/www/opera-acroread/Makefile
+++ b/www/opera-acroread/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/02/09 17:57:39 jschauma Exp $
+# $NetBSD: Makefile,v 1.3 2005/04/18 16:20:25 jschauma Exp $
 
 DISTNAME= 		opera-acroread-1.0
 PKGREVISION=		1
@@ -9,7 +9,9 @@ COMMENT=		Acrobat Reader 4 plugin for opera
 DEPENDS+=		acroread-4.[0-9]*:../../print/acroread
 CONFLICTS+=		opera-acroread3-[0-9]*
 CONFLICTS+=		opera-acroread5-[0-9]*
+CONFLICTS+=		opera-acroread7-[0-9]*
 
 ACROREAD=		Acrobat4
+ACRO_SUBDIR=		Browsers
 
 .include "../../www/netscape7-acroread/Makefile.common"
diff --git a/www/opera-acroread/Makefile.common b/www/opera-acroread/Makefile.common
index ae60f9d32dc..c2935dae1ce 100644
--- a/www/opera-acroread/Makefile.common
+++ b/www/opera-acroread/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2005/02/09 17:49:35 jschauma Exp $
+# $NetBSD: Makefile.common,v 1.3 2005/04/18 16:20:25 jschauma Exp $
 
 PKGNAME=		${DISTNAME:C|MozillaFirebird|firefox|}
 CATEGORIES=		www print
@@ -18,12 +18,13 @@ NO_BUILD=		YES
 
 PLIST_SRC=		../../www/opera-acroread/PLIST
 PLIST_SUBST+=		ACROREAD=${ACROREAD}
+PLIST_SUBST+=		ACRO_SUBDIR=${ACRO_SUBDIR}
 PLIST_SUBST+=		PLATFORM=${PLATFORM}
 NS_PLUGINS_DIR=		${PREFIX}/emul/linux/usr/lib/opera/plugins
 
 do-install:
 	${INSTALL_DATA_DIR} ${NS_PLUGINS_DIR}
-	${LN} -s ${PREFIX}/${ACROREAD}/Browsers/${PLATFORM}/nppdf.so \
+	${LN} -s ${PREFIX}/${ACROREAD}/${ACRO_SUBDIR}/${PLATFORM}/nppdf.so \
 		${NS_PLUGINS_DIR}/nppdf.so
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/opera-acroread/PLIST b/www/opera-acroread/PLIST
index 7bbf08065a7..1b88d0e9452 100644
--- a/www/opera-acroread/PLIST
+++ b/www/opera-acroread/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2004/02/13 18:05:12 jschauma Exp $
-@exec ${LN} -s %D/${ACROREAD}/Browsers/${PLATFORM}/nppdf.so %D/emul/linux/usr/lib/opera/plugins/nppdf.so
+@comment $NetBSD: PLIST,v 1.2 2005/04/18 16:20:25 jschauma Exp $
+@exec ${LN} -s %D/${ACROREAD}/${ACRO_SUBDIR}/${PLATFORM}/nppdf.so %D/emul/linux/usr/lib/opera/plugins/nppdf.so
 emul/linux/usr/lib/opera/plugins/nppdf.so
diff --git a/www/opera-acroread3/DESCR b/www/opera-acroread3/DESCR
index 74ca4eb19d5..16bf8a456a2 100644
--- a/www/opera-acroread3/DESCR
+++ b/www/opera-acroread3/DESCR
@@ -1 +1 @@
-This package provides Adobe Acrobat Reader 3 plugin for the Opera package.
+This package provides the Adobe Acrobat Reader 3 plugin for the Opera package.
diff --git a/www/opera-acroread3/Makefile b/www/opera-acroread3/Makefile
index 6869e0f5ecd..6e61e1562c6 100644
--- a/www/opera-acroread3/Makefile
+++ b/www/opera-acroread3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/02/09 17:57:39 jschauma Exp $
+# $NetBSD: Makefile,v 1.3 2005/04/18 16:20:25 jschauma Exp $
 
 DISTNAME= 		opera-acroread3-1.0
 PKGREVISION=		1
@@ -9,7 +9,9 @@ COMMENT=		Acrobat Reader 3 plugin for opera
 DEPENDS+=		acroread3-3.[0-9]*:../../print/acroread3
 CONFLICTS+=		opera-acroread-[0-9]*
 CONFLICTS+=		opera-acroread5-[0-9]*
+CONFLICTS+=		opera-acroread7-[0-9]*
 
 ACROREAD=		Acrobat3
+ACRO_SUBDIR=		Browsers
 
 .include "../../www/opera-acroread/Makefile.common"
diff --git a/www/opera-acroread5/DESCR b/www/opera-acroread5/DESCR
index fb3c1ae565d..e5a06abf75c 100644
--- a/www/opera-acroread5/DESCR
+++ b/www/opera-acroread5/DESCR
@@ -1 +1 @@
-This package provides Adobe Acrobat Reader 5 plugin for the Opera package.
+This package provides the Adobe Acrobat Reader 5 plugin for the Opera package.
diff --git a/www/opera-acroread5/Makefile b/www/opera-acroread5/Makefile
index af1fb73b09a..59e649ac7ea 100644
--- a/www/opera-acroread5/Makefile
+++ b/www/opera-acroread5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/02/09 17:57:39 jschauma Exp $
+# $NetBSD: Makefile,v 1.3 2005/04/18 16:20:25 jschauma Exp $
 
 DISTNAME= 		opera-acroread5-1.0
 PKGREVISION=		1
@@ -9,7 +9,9 @@ COMMENT=		Acrobat Reader 5 plugin for opera
 DEPENDS+=		acroread5-5.[0-9]*:../../print/acroread5
 CONFLICTS+=		opera-acroread-[0-9]*
 CONFLICTS+=		opera-acroread3-[0-9]*
+CONFLICTS+=		opera-acroread7-[0-9]*
 
 ACROREAD=		Acrobat5
+ACRO_SUBDIR=		Browsers
 
 .include "../../www/opera-acroread/Makefile.common"