diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2001-11-27 01:10:46 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2001-11-27 01:10:46 +0000 |
| commit | b9fa2ab71bd2b7d2d89bf4ea5e7e64a5dbdc233e (patch) | |
| tree | 1bab29b1dd03a6e4e6206dc4b3d4b23a0456cbf0 /www/linux-opera-devel | |
| parent | Upgrade to 6.0-20011122.1. (diff) | |
Oops, previous revision didn't set OPERA_DIR correctly.
Notes
Notes:
svn path=/head/; revision=50603
Diffstat (limited to 'www/linux-opera-devel')
| -rw-r--r-- | www/linux-opera-devel/Makefile | 4 | ||||
| -rw-r--r-- | www/linux-opera-devel/files/patch-aa | 22 |
2 files changed, 21 insertions, 5 deletions
diff --git a/www/linux-opera-devel/Makefile b/www/linux-opera-devel/Makefile index 1cb1e5f5a31e..88d386331414 100644 --- a/www/linux-opera-devel/Makefile +++ b/www/linux-opera-devel/Makefile @@ -8,6 +8,7 @@ PORTNAME= opera PKGNAMEPREFIX= linux- PORTVERSION= 6.0-20011122.1 +PORTREVISION= 1 CATEGORIES= www linux MASTER_SITES= http://opera.online.no/linux/600/tp1/ \ ftp://ftp.opera.com/pub/opera/linux/600/tp1/ @@ -25,7 +26,8 @@ NO_BUILD= yes NO_FILTER_SHLIBS=yes do-configure: - ${PERL} -p -i -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/install.sh + ${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g; s|%%DATADIR%%|${DATADIR}|g'\ + ${WRKSRC}/install.sh do-install: (cd ${WRKSRC} && ./install.sh \ diff --git a/www/linux-opera-devel/files/patch-aa b/www/linux-opera-devel/files/patch-aa index 0dad53b4a19f..db78da601a33 100644 --- a/www/linux-opera-devel/files/patch-aa +++ b/www/linux-opera-devel/files/patch-aa @@ -1,5 +1,5 @@ ---- install.sh.orig Tue Nov 27 00:56:59 2001 -+++ install.sh Tue Nov 27 01:01:20 2001 +--- install.sh.orig Thu Nov 22 12:38:09 2001 ++++ install.sh Tue Nov 27 02:05:55 2001 @@ -228,7 +228,16 @@ mvv='' # SunOS mv (no -v verbose option) ;; @@ -18,19 +18,33 @@ ;; i[3456]86:Linux) +@@ -477,10 +486,10 @@ + + # Opera enviroment + if test \"\${OPERA_DIR}\" = '' ; then +- if test -d /usr/share/opera ; then +- OPERA_DIR=/usr/share/opera ++ if test -d %%DATADIR%% ; then ++ OPERA_DIR=%%DATADIR%% + else +- echo \"OPERA_DIR unset and not in default location (/usr/share/opera)\" ++ echo \"OPERA_DIR unset and not in default location (%%DATADIR%%)\" + exit 1 + fi + fi @@ -491,18 +500,11 @@ for DIR in \\ \"\${HOME}/.opera/plugins\" \\ ${plugin_dir} \\ - /usr/lib/opera/plugins \\ - /usr/local/Acrobat4/Browsers/intellinux \\ -+ %%PREFIX%%/lib/opera/plugins \\ -+ %%PREFIX%%/Acrobat4/Browsers/intellinux \\ - /usr/java/jre1.3.1/plugin/i386/ns4 \\ - /usr/lib/RealPlayer8/Plugins \\ - /usr/lib/realplay/plugins \\ - /usr/lib/RealPlayer8 \\ - /usr/lib/realplay \\ ++ %%PREFIX%%/lib/opera/plugins \\ ++ %%PREFIX%%/Acrobat4/Browsers/intellinux \\ + %%PREFIX%%/java/linux-*jdk*/jre/plugin/i386/ns4 \\ \"\${HOME}/.netscape/plugins\" \\ - /opt/netscape/plugins \\ |