diff options
author | Jeremy Messenger <mezz@FreeBSD.org> | 2005-09-20 20:05:24 +0000 |
---|---|---|
committer | Jeremy Messenger <mezz@FreeBSD.org> | 2005-09-20 20:05:24 +0000 |
commit | ea53e0d21ba2ec667a4ddf0d6ef86416d939e270 (patch) | |
tree | 59ca9fa937120747e1ad97bb659b0f2c5ed3b516 /www | |
parent | . Update to patchset 2: (diff) |
Update to 8.50, see ChangeLog for detail:
http://www.opera.com/docs/changelogs/linux/850/
On another note, Opera is now free and no longer has ad banners.
http://www.opera.com/free/
Notes
Notes:
svn path=/head/; revision=143247
Diffstat (limited to 'www')
-rw-r--r-- | www/linux-opera-devel/Makefile | 4 | ||||
-rw-r--r-- | www/linux-opera-devel/distinfo | 4 | ||||
-rw-r--r-- | www/linux-opera-devel/files/patch-ini::pluginpath.ini | 16 | ||||
-rw-r--r-- | www/linux-opera-devel/files/patch-install.sh | 55 | ||||
-rw-r--r-- | www/linux-opera-devel/pkg-message | 2 | ||||
-rw-r--r-- | www/linux-opera/Makefile | 4 | ||||
-rw-r--r-- | www/linux-opera/distinfo | 4 | ||||
-rw-r--r-- | www/linux-opera/files/patch-ini::pluginpath.ini | 16 | ||||
-rw-r--r-- | www/linux-opera/files/patch-install.sh | 55 | ||||
-rw-r--r-- | www/linux-opera/pkg-message | 2 |
10 files changed, 96 insertions, 66 deletions
diff --git a/www/linux-opera-devel/Makefile b/www/linux-opera-devel/Makefile index fa8eb78ad1c2..54e16fe63d9d 100644 --- a/www/linux-opera-devel/Makefile +++ b/www/linux-opera-devel/Makefile @@ -39,8 +39,8 @@ ONLY_FOR_ARCHS= i386 NO_BUILD= yes -OPERA_VER= 8.02 -OPERA_DATE= 20050727 +OPERA_VER= 8.50 +OPERA_DATE= 20050916 DATADIR= ${PREFIX}/share/${UNIQUENAME} DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME} diff --git a/www/linux-opera-devel/distinfo b/www/linux-opera-devel/distinfo index 436658b2f63f..7af40aa76cce 100644 --- a/www/linux-opera-devel/distinfo +++ b/www/linux-opera-devel/distinfo @@ -1,2 +1,2 @@ -MD5 (opera-8.02-20050727.1-static-qt.i386-en.tar.bz2) = 7f85aef69221803413b859b9e04df959 -SIZE (opera-8.02-20050727.1-static-qt.i386-en.tar.bz2) = 5855649 +MD5 (opera-8.50-20050916.1-static-qt.i386-en.tar.bz2) = e66b6e4460610b7cebacb6d33e255ed7 +SIZE (opera-8.50-20050916.1-static-qt.i386-en.tar.bz2) = 5800086 diff --git a/www/linux-opera-devel/files/patch-ini::pluginpath.ini b/www/linux-opera-devel/files/patch-ini::pluginpath.ini index 725f30efedbd..121d96a941bb 100644 --- a/www/linux-opera-devel/files/patch-ini::pluginpath.ini +++ b/www/linux-opera-devel/files/patch-ini::pluginpath.ini @@ -1,6 +1,6 @@ ---- ini/pluginpath.ini.orig Wed Jun 15 04:17:40 2005 -+++ ini/pluginpath.ini Sun Jun 19 00:33:33 2005 -@@ -3,46 +3,31 @@ +--- ini/pluginpath.ini.orig Tue Sep 20 14:13:09 2005 ++++ ini/pluginpath.ini Tue Sep 20 14:14:28 2005 +@@ -3,56 +3,31 @@ ; This file is stored in UTF-8 encoding [Paths] @@ -15,14 +15,24 @@ +%%PREFIX%%/share/linux-opera/plugins=1 ; Adobe Acrobat +-/usr/local/Acrobat7.0/Browsers/intellinux=1 +-/usr/local/Acrobat7/Browsers/intellinux=1 -/usr/local/Acrobat5/Browsers/intellinux=1 -/usr/local/Acrobat4/Browsers/intellinux=1 +-/usr/lib/Acrobat7.0/Browsers/intellinux=1 +-/usr/lib/Acrobat7/Browsers/intellinux=1 -/usr/lib/Acrobat5/Browsers/intellinux=1 -/usr/lib/Acrobat4/Browsers/intellinux=1 +-/usr/X11R6/lib/Acrobat7.0/Browsers/intellinux=1 +-/usr/X11R6/lib/Acrobat7/Browsers/intellinux=1 -/usr/X11R6/lib/Acrobat5/Browsers/intellinux=1 -/usr/X11R6/lib/Acrobat4/Browsers/intellinux=1 +-/opt/Acrobat7.0/Browsers/intellinux=1 +-/opt/Acrobat7/Browsers/intellinux=1 -/opt/Acrobat5/Browsers/intellinux=1 -/opt/Acrobat4/Browsers/intellinux=1 +-/usr/Acrobat7.0/Browsers/intellinux=1 +-/usr/Acrobat7/Browsers/intellinux=1 -/usr/Acrobat5/Browsers/intellinux=1 -/usr/Acrobat4/Browsers/intellinux=1 +%%LOCALBASE%%/Acrobat5/Browsers/intellinux=1 diff --git a/www/linux-opera-devel/files/patch-install.sh b/www/linux-opera-devel/files/patch-install.sh index 97d5a58c31e1..fedbbd0114de 100644 --- a/www/linux-opera-devel/files/patch-install.sh +++ b/www/linux-opera-devel/files/patch-install.sh @@ -1,5 +1,5 @@ ---- install.sh.orig Wed Jun 15 04:17:40 2005 -+++ install.sh Sun Jun 19 01:39:11 2005 +--- install.sh.orig Fri Sep 16 05:16:47 2005 ++++ install.sh Tue Sep 20 14:52:09 2005 @@ -761,10 +761,9 @@ case "${machine}:${os}" in i[3456]86:Linux|x86_64:Linux|i[3456]86:FreeBSD|i[3456]86:NetBSD|i[3456]86:OpenBSD) @@ -200,7 +200,7 @@ if test -f plugins/libnpp.so then cp $cpv $cpf plugins/libnpp.so $plugin_dir/ -@@ -1293,36 +1225,13 @@ +@@ -1293,47 +1225,9 @@ if test -z "${OPERADESTDIR}"; then @@ -211,7 +211,7 @@ - echo "System wide configuration files:" - echo " $config_dir/opera6rc" - echo " $config_dir/opera6rc.fixed" -- echo " cannot be prefixed" +- echo " cannot be installed with the prefix \"$prefix\"." - if con_firm "Do you want to install them"; then - backup $config_dir/opera6rc opera6rc config - backup $config_dir/opera6rc.fixed opera6rc.fixed config @@ -224,24 +224,31 @@ - echo " System wide configuration files:" - echo " $config_dir/opera6rc" - echo " $config_dir/opera6rc.fixed" -- echo " were not installed" +- echo " were not installed." - fi - - # Shorcuts and Icons -- icons -+# icons - gnome - kde 3 -- kde 2 -- kde1 -- mandrake -+# kde 2 -+# kde1 -+# mandrake +- # Shorcuts and Icons +- bool_icons=1 # install icons by default +- +- if test "$flag_mode" = "--force" -o "$flag_mode" = "--prefix="; then +- echo +- echo "Shortcut icons cannot be installed with the prefix \"$prefix\"." +- if not con_firm "Do you still want to install them"; then +- bool_icons=0 +- fi +- fi +- + if test "${bool_icons}" -ne 0; then +- icons + gnome + kde 3 +- kde 2 +- kde1 +- mandrake + fi fi # OPERADESTDIR - -@@ -1367,15 +1276,16 @@ +@@ -1379,15 +1273,16 @@ { # arg1 = location @@ -263,7 +270,7 @@ echo "${desktop_contain}" > ${desktop_file} chmod $chmodv 644 ${desktop_file} -@@ -1451,74 +1361,26 @@ +@@ -1463,74 +1358,26 @@ debug_msg 1 "in gnome()" @@ -312,10 +319,10 @@ + cp $cpv $share_dir/images/opera.xpm %%X11BASE%%/share/gnome/pixmaps/linux-opera.xpm fi - # end /opt/gnome share -- -- elif test -d /usr/share/gnome/; then + # end %%X11BASE%%/share/gnome icon +- elif test -d /usr/share/gnome/; then +- - # /usr/share/gnome icon - if test ! -d /usr/share/gnome/pixmaps/; then - if test -w /usr/share/gnome; then @@ -355,7 +362,7 @@ } kde() -@@ -1527,39 +1389,31 @@ +@@ -1539,38 +1386,30 @@ debug_msg 1 "in kde()" @@ -405,8 +412,6 @@ - chmod $chmodv 755 /usr/share/applnk/Networking/WWW - fi - if test -w /usr/share/applnk/Networking/WWW; then generate_desktop /usr/share/applnk/Networking/WWW ${1}; fi -- fi -+ fi + fi } - kde1() diff --git a/www/linux-opera-devel/pkg-message b/www/linux-opera-devel/pkg-message index 05939304fb55..55d402c50a97 100644 --- a/www/linux-opera-devel/pkg-message +++ b/www/linux-opera-devel/pkg-message @@ -1,5 +1,5 @@ ## -Changelog for 8.02 Final: http://www.opera.com/linux/changelogs/802/ +Changelog for 8.50 Final: http://www.opera.com/docs/changelogs/linux/850/ If you are upgrade from version 7.x or below, it is recommend for you to backup your personal "~/.linux-opera" directory and remove it. It can be done diff --git a/www/linux-opera/Makefile b/www/linux-opera/Makefile index fa8eb78ad1c2..54e16fe63d9d 100644 --- a/www/linux-opera/Makefile +++ b/www/linux-opera/Makefile @@ -39,8 +39,8 @@ ONLY_FOR_ARCHS= i386 NO_BUILD= yes -OPERA_VER= 8.02 -OPERA_DATE= 20050727 +OPERA_VER= 8.50 +OPERA_DATE= 20050916 DATADIR= ${PREFIX}/share/${UNIQUENAME} DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME} diff --git a/www/linux-opera/distinfo b/www/linux-opera/distinfo index 436658b2f63f..7af40aa76cce 100644 --- a/www/linux-opera/distinfo +++ b/www/linux-opera/distinfo @@ -1,2 +1,2 @@ -MD5 (opera-8.02-20050727.1-static-qt.i386-en.tar.bz2) = 7f85aef69221803413b859b9e04df959 -SIZE (opera-8.02-20050727.1-static-qt.i386-en.tar.bz2) = 5855649 +MD5 (opera-8.50-20050916.1-static-qt.i386-en.tar.bz2) = e66b6e4460610b7cebacb6d33e255ed7 +SIZE (opera-8.50-20050916.1-static-qt.i386-en.tar.bz2) = 5800086 diff --git a/www/linux-opera/files/patch-ini::pluginpath.ini b/www/linux-opera/files/patch-ini::pluginpath.ini index 725f30efedbd..121d96a941bb 100644 --- a/www/linux-opera/files/patch-ini::pluginpath.ini +++ b/www/linux-opera/files/patch-ini::pluginpath.ini @@ -1,6 +1,6 @@ ---- ini/pluginpath.ini.orig Wed Jun 15 04:17:40 2005 -+++ ini/pluginpath.ini Sun Jun 19 00:33:33 2005 -@@ -3,46 +3,31 @@ +--- ini/pluginpath.ini.orig Tue Sep 20 14:13:09 2005 ++++ ini/pluginpath.ini Tue Sep 20 14:14:28 2005 +@@ -3,56 +3,31 @@ ; This file is stored in UTF-8 encoding [Paths] @@ -15,14 +15,24 @@ +%%PREFIX%%/share/linux-opera/plugins=1 ; Adobe Acrobat +-/usr/local/Acrobat7.0/Browsers/intellinux=1 +-/usr/local/Acrobat7/Browsers/intellinux=1 -/usr/local/Acrobat5/Browsers/intellinux=1 -/usr/local/Acrobat4/Browsers/intellinux=1 +-/usr/lib/Acrobat7.0/Browsers/intellinux=1 +-/usr/lib/Acrobat7/Browsers/intellinux=1 -/usr/lib/Acrobat5/Browsers/intellinux=1 -/usr/lib/Acrobat4/Browsers/intellinux=1 +-/usr/X11R6/lib/Acrobat7.0/Browsers/intellinux=1 +-/usr/X11R6/lib/Acrobat7/Browsers/intellinux=1 -/usr/X11R6/lib/Acrobat5/Browsers/intellinux=1 -/usr/X11R6/lib/Acrobat4/Browsers/intellinux=1 +-/opt/Acrobat7.0/Browsers/intellinux=1 +-/opt/Acrobat7/Browsers/intellinux=1 -/opt/Acrobat5/Browsers/intellinux=1 -/opt/Acrobat4/Browsers/intellinux=1 +-/usr/Acrobat7.0/Browsers/intellinux=1 +-/usr/Acrobat7/Browsers/intellinux=1 -/usr/Acrobat5/Browsers/intellinux=1 -/usr/Acrobat4/Browsers/intellinux=1 +%%LOCALBASE%%/Acrobat5/Browsers/intellinux=1 diff --git a/www/linux-opera/files/patch-install.sh b/www/linux-opera/files/patch-install.sh index 97d5a58c31e1..fedbbd0114de 100644 --- a/www/linux-opera/files/patch-install.sh +++ b/www/linux-opera/files/patch-install.sh @@ -1,5 +1,5 @@ ---- install.sh.orig Wed Jun 15 04:17:40 2005 -+++ install.sh Sun Jun 19 01:39:11 2005 +--- install.sh.orig Fri Sep 16 05:16:47 2005 ++++ install.sh Tue Sep 20 14:52:09 2005 @@ -761,10 +761,9 @@ case "${machine}:${os}" in i[3456]86:Linux|x86_64:Linux|i[3456]86:FreeBSD|i[3456]86:NetBSD|i[3456]86:OpenBSD) @@ -200,7 +200,7 @@ if test -f plugins/libnpp.so then cp $cpv $cpf plugins/libnpp.so $plugin_dir/ -@@ -1293,36 +1225,13 @@ +@@ -1293,47 +1225,9 @@ if test -z "${OPERADESTDIR}"; then @@ -211,7 +211,7 @@ - echo "System wide configuration files:" - echo " $config_dir/opera6rc" - echo " $config_dir/opera6rc.fixed" -- echo " cannot be prefixed" +- echo " cannot be installed with the prefix \"$prefix\"." - if con_firm "Do you want to install them"; then - backup $config_dir/opera6rc opera6rc config - backup $config_dir/opera6rc.fixed opera6rc.fixed config @@ -224,24 +224,31 @@ - echo " System wide configuration files:" - echo " $config_dir/opera6rc" - echo " $config_dir/opera6rc.fixed" -- echo " were not installed" +- echo " were not installed." - fi - - # Shorcuts and Icons -- icons -+# icons - gnome - kde 3 -- kde 2 -- kde1 -- mandrake -+# kde 2 -+# kde1 -+# mandrake +- # Shorcuts and Icons +- bool_icons=1 # install icons by default +- +- if test "$flag_mode" = "--force" -o "$flag_mode" = "--prefix="; then +- echo +- echo "Shortcut icons cannot be installed with the prefix \"$prefix\"." +- if not con_firm "Do you still want to install them"; then +- bool_icons=0 +- fi +- fi +- + if test "${bool_icons}" -ne 0; then +- icons + gnome + kde 3 +- kde 2 +- kde1 +- mandrake + fi fi # OPERADESTDIR - -@@ -1367,15 +1276,16 @@ +@@ -1379,15 +1273,16 @@ { # arg1 = location @@ -263,7 +270,7 @@ echo "${desktop_contain}" > ${desktop_file} chmod $chmodv 644 ${desktop_file} -@@ -1451,74 +1361,26 @@ +@@ -1463,74 +1358,26 @@ debug_msg 1 "in gnome()" @@ -312,10 +319,10 @@ + cp $cpv $share_dir/images/opera.xpm %%X11BASE%%/share/gnome/pixmaps/linux-opera.xpm fi - # end /opt/gnome share -- -- elif test -d /usr/share/gnome/; then + # end %%X11BASE%%/share/gnome icon +- elif test -d /usr/share/gnome/; then +- - # /usr/share/gnome icon - if test ! -d /usr/share/gnome/pixmaps/; then - if test -w /usr/share/gnome; then @@ -355,7 +362,7 @@ } kde() -@@ -1527,39 +1389,31 @@ +@@ -1539,38 +1386,30 @@ debug_msg 1 "in kde()" @@ -405,8 +412,6 @@ - chmod $chmodv 755 /usr/share/applnk/Networking/WWW - fi - if test -w /usr/share/applnk/Networking/WWW; then generate_desktop /usr/share/applnk/Networking/WWW ${1}; fi -- fi -+ fi + fi } - kde1() diff --git a/www/linux-opera/pkg-message b/www/linux-opera/pkg-message index 05939304fb55..55d402c50a97 100644 --- a/www/linux-opera/pkg-message +++ b/www/linux-opera/pkg-message @@ -1,5 +1,5 @@ ## -Changelog for 8.02 Final: http://www.opera.com/linux/changelogs/802/ +Changelog for 8.50 Final: http://www.opera.com/docs/changelogs/linux/850/ If you are upgrade from version 7.x or below, it is recommend for you to backup your personal "~/.linux-opera" directory and remove it. It can be done |