aboutsummaryrefslogtreecommitdiffstats
path: root/www
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2001-11-27 09:10:46 +0800
committerdes <des@FreeBSD.org>2001-11-27 09:10:46 +0800
commitfc76be6cb20ebee523ae5049a2dd6fb259f1694d (patch)
tree08dd353eb8b07ffda3214dbdb6cc5b887eb9b6ba /www
parent42c3fab253f9cbc395fd14e24e769492e4f0408e (diff)
downloadfreebsd-ports-gnome-fc76be6cb20ebee523ae5049a2dd6fb259f1694d.tar.gz
freebsd-ports-gnome-fc76be6cb20ebee523ae5049a2dd6fb259f1694d.tar.zst
freebsd-ports-gnome-fc76be6cb20ebee523ae5049a2dd6fb259f1694d.zip
Oops, previous revision didn't set OPERA_DIR correctly.
Diffstat (limited to 'www')
-rw-r--r--www/linux-opera-devel/Makefile4
-rw-r--r--www/linux-opera-devel/files/patch-aa22
-rw-r--r--www/linux-opera/Makefile4
-rw-r--r--www/linux-opera/files/patch-aa22
-rw-r--r--www/linux-opera7/Makefile4
-rw-r--r--www/linux-opera7/files/patch-aa22
6 files changed, 63 insertions, 15 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 \\
diff --git a/www/linux-opera/Makefile b/www/linux-opera/Makefile
index 1cb1e5f5a31e..88d386331414 100644
--- a/www/linux-opera/Makefile
+++ b/www/linux-opera/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/files/patch-aa b/www/linux-opera/files/patch-aa
index 0dad53b4a19f..db78da601a33 100644
--- a/www/linux-opera/files/patch-aa
+++ b/www/linux-opera/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 \\
diff --git a/www/linux-opera7/Makefile b/www/linux-opera7/Makefile
index 1cb1e5f5a31e..88d386331414 100644
--- a/www/linux-opera7/Makefile
+++ b/www/linux-opera7/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-opera7/files/patch-aa b/www/linux-opera7/files/patch-aa
index 0dad53b4a19f..db78da601a33 100644
--- a/www/linux-opera7/files/patch-aa
+++ b/www/linux-opera7/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 \\