diff options
| author | jschauma <jschauma> | 2005-04-18 16:20:25 +0000 |
|---|---|---|
| committer | jschauma <jschauma> | 2005-04-18 16:20:25 +0000 |
| commit | ffaab1e42a4e72ebe9fb7a11778aa7dde5126c23 (patch) | |
| tree | f2b263d690990babe0ac35e69bfdd953701f977c /www/netscape7-acroread | |
| parent | a6dca1d8ca1f751c9503a60a3e18ee5275b7e9b9 (diff) | |
| download | pkgsrc-ffaab1e42a4e72ebe9fb7a11778aa7dde5126c23.tar.gz | |
Adjust and correct for addition of -acroread7 based plugins.
Diffstat (limited to 'www/netscape7-acroread')
| -rw-r--r-- | www/netscape7-acroread/DESCR | 3 | ||||
| -rw-r--r-- | www/netscape7-acroread/Makefile | 4 | ||||
| -rw-r--r-- | www/netscape7-acroread/Makefile.common | 5 | ||||
| -rw-r--r-- | www/netscape7-acroread/PLIST | 4 |
4 files changed, 10 insertions, 6 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 |