[pkgsrc/trunk]: pkgsrc/www Adjust and correct for addition of -acroread7 base...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/www Adjust and correct for addition of -acroread7 base...
From: jschauma <jschauma%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 01:41:09 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/3cc714937d7b
branches:  trunk
changeset: 492704:3cc714937d7b
user:      jschauma <jschauma%pkgsrc.org@localhost>
date:      Mon Apr 18 16:20:25 2005 +0000

description:
Adjust and correct for addition of -acroread7 based plugins.

diffstat:

 www/netscape7-acroread/DESCR           |  3 ++-
 www/netscape7-acroread/Makefile        |  4 +++-
 www/netscape7-acroread/Makefile.common |  5 +++--
 www/netscape7-acroread/PLIST           |  4 ++--
 www/netscape7-acroread3/DESCR          |  3 ++-
 www/netscape7-acroread3/Makefile       |  4 +++-
 www/netscape7-acroread5/DESCR          |  3 ++-
 www/netscape7-acroread5/Makefile       |  4 +++-
 www/opera-acroread/DESCR               |  2 +-
 www/opera-acroread/Makefile            |  4 +++-
 www/opera-acroread/Makefile.common     |  5 +++--
 www/opera-acroread/PLIST               |  4 ++--
 www/opera-acroread3/DESCR              |  2 +-
 www/opera-acroread3/Makefile           |  4 +++-
 www/opera-acroread5/DESCR              |  2 +-
 www/opera-acroread5/Makefile           |  4 +++-
 16 files changed, 37 insertions(+), 20 deletions(-)

diffs (219 lines):

diff -r 30408dd63d8c -r 3cc714937d7b www/netscape7-acroread/DESCR
--- a/www/netscape7-acroread/DESCR      Mon Apr 18 16:19:54 2005 +0000
+++ b/www/netscape7-acroread/DESCR      Mon Apr 18 16:20:25 2005 +0000
@@ -1,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 -r 30408dd63d8c -r 3cc714937d7b www/netscape7-acroread/Makefile
--- a/www/netscape7-acroread/Makefile   Mon Apr 18 16:19:54 2005 +0000
+++ b/www/netscape7-acroread/Makefile   Mon Apr 18 16:20:25 2005 +0000
@@ -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 @@
 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 -r 30408dd63d8c -r 3cc714937d7b www/netscape7-acroread/Makefile.common
--- a/www/netscape7-acroread/Makefile.common    Mon Apr 18 16:19:54 2005 +0000
+++ b/www/netscape7-acroread/Makefile.common    Mon Apr 18 16:20:25 2005 +0000
@@ -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 @@
 
 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 -r 30408dd63d8c -r 3cc714937d7b www/netscape7-acroread/PLIST
--- a/www/netscape7-acroread/PLIST      Mon Apr 18 16:19:54 2005 +0000
+++ b/www/netscape7-acroread/PLIST      Mon Apr 18 16:20:25 2005 +0000
@@ -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 -r 30408dd63d8c -r 3cc714937d7b www/netscape7-acroread3/DESCR
--- a/www/netscape7-acroread3/DESCR     Mon Apr 18 16:19:54 2005 +0000
+++ b/www/netscape7-acroread3/DESCR     Mon Apr 18 16:20:25 2005 +0000
@@ -1,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 -r 30408dd63d8c -r 3cc714937d7b www/netscape7-acroread3/Makefile
--- a/www/netscape7-acroread3/Makefile  Mon Apr 18 16:19:54 2005 +0000
+++ b/www/netscape7-acroread3/Makefile  Mon Apr 18 16:20:25 2005 +0000
@@ -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 @@
 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 -r 30408dd63d8c -r 3cc714937d7b www/netscape7-acroread5/DESCR
--- a/www/netscape7-acroread5/DESCR     Mon Apr 18 16:19:54 2005 +0000
+++ b/www/netscape7-acroread5/DESCR     Mon Apr 18 16:20:25 2005 +0000
@@ -1,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 -r 30408dd63d8c -r 3cc714937d7b www/netscape7-acroread5/Makefile
--- a/www/netscape7-acroread5/Makefile  Mon Apr 18 16:19:54 2005 +0000
+++ b/www/netscape7-acroread5/Makefile  Mon Apr 18 16:20:25 2005 +0000
@@ -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 @@
 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 -r 30408dd63d8c -r 3cc714937d7b www/opera-acroread/DESCR
--- a/www/opera-acroread/DESCR  Mon Apr 18 16:19:54 2005 +0000
+++ b/www/opera-acroread/DESCR  Mon Apr 18 16:20:25 2005 +0000
@@ -1,1 +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 -r 30408dd63d8c -r 3cc714937d7b www/opera-acroread/Makefile
--- a/www/opera-acroread/Makefile       Mon Apr 18 16:19:54 2005 +0000
+++ b/www/opera-acroread/Makefile       Mon Apr 18 16:20:25 2005 +0000
@@ -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 @@
 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 -r 30408dd63d8c -r 3cc714937d7b www/opera-acroread/Makefile.common
--- a/www/opera-acroread/Makefile.common        Mon Apr 18 16:19:54 2005 +0000
+++ b/www/opera-acroread/Makefile.common        Mon Apr 18 16:20:25 2005 +0000
@@ -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 @@
 
 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 -r 30408dd63d8c -r 3cc714937d7b www/opera-acroread/PLIST
--- a/www/opera-acroread/PLIST  Mon Apr 18 16:19:54 2005 +0000
+++ b/www/opera-acroread/PLIST  Mon Apr 18 16:20:25 2005 +0000
@@ -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 -r 30408dd63d8c -r 3cc714937d7b www/opera-acroread3/DESCR
--- a/www/opera-acroread3/DESCR Mon Apr 18 16:19:54 2005 +0000
+++ b/www/opera-acroread3/DESCR Mon Apr 18 16:20:25 2005 +0000
@@ -1,1 +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 -r 30408dd63d8c -r 3cc714937d7b www/opera-acroread3/Makefile
--- a/www/opera-acroread3/Makefile      Mon Apr 18 16:19:54 2005 +0000
+++ b/www/opera-acroread3/Makefile      Mon Apr 18 16:20:25 2005 +0000
@@ -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 @@
 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 -r 30408dd63d8c -r 3cc714937d7b www/opera-acroread5/DESCR
--- a/www/opera-acroread5/DESCR Mon Apr 18 16:19:54 2005 +0000
+++ b/www/opera-acroread5/DESCR Mon Apr 18 16:20:25 2005 +0000
@@ -1,1 +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 -r 30408dd63d8c -r 3cc714937d7b www/opera-acroread5/Makefile
--- a/www/opera-acroread5/Makefile      Mon Apr 18 16:19:54 2005 +0000
+++ b/www/opera-acroread5/Makefile      Mon Apr 18 16:20:25 2005 +0000
@@ -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 @@
 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"
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Added p5-Email-Simple-1.92
Next by Date: [pkgsrc/trunk]: pkgsrc/devel/p5-Module-Pluggable Initial import of p5-Module-...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Added p5-Email-Simple-1.92
Next by Thread: [pkgsrc/trunk]: pkgsrc/devel/p5-Module-Pluggable Initial import of p5-Module-...
Indexes:
Home | Main Index | Thread Index | Old Index