diff options
Diffstat (limited to 'www/opera/files')
| -rw-r--r-- | www/opera/files/patch-ini::pluginpath.ini | 17 | ||||
| -rw-r--r-- | www/opera/files/patch-install.sh | 53 |
2 files changed, 46 insertions, 24 deletions
diff --git a/www/opera/files/patch-ini::pluginpath.ini b/www/opera/files/patch-ini::pluginpath.ini index 5e5a871f544a..a3fed160132d 100644 --- a/www/opera/files/patch-ini::pluginpath.ini +++ b/www/opera/files/patch-ini::pluginpath.ini @@ -1,6 +1,6 @@ ---- ini/pluginpath.ini.orig Fri Dec 3 11:21:10 2004 -+++ ini/pluginpath.ini Fri Dec 3 22:55:00 2004 -@@ -3,40 +3,15 @@ +--- ini/pluginpath.ini.orig Fri Sep 16 19:19:04 2005 ++++ ini/pluginpath.ini Tue Sep 20 22:35:57 2005 +@@ -3,50 +3,16 @@ ; This file is stored in UTF-8 encoding [Paths] @@ -14,16 +14,27 @@ +%%LOCALBASE%%/share/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 ++%%X11BASE%%/Acrobat7/Browser/intellinux=1 +%%LOCALBASE%%/Acrobat5/Browsers/intellinux=1 +%%LOCALBASE%%/Acrobat4/Browsers/intellinux=1 diff --git a/www/opera/files/patch-install.sh b/www/opera/files/patch-install.sh index e9c54cb16a2d..012c46344886 100644 --- a/www/opera/files/patch-install.sh +++ b/www/opera/files/patch-install.sh @@ -1,5 +1,5 @@ ---- install.sh.orig Fri Apr 15 21:21:52 2005 -+++ install.sh Sat Jun 18 01:45:48 2005 +--- install.sh.orig Fri Sep 16 19:19:04 2005 ++++ install.sh Tue Sep 20 22:49:54 2005 @@ -373,7 +373,7 @@ mvv='' # SunOS mv (no -v verbose option) ;; @@ -146,7 +146,7 @@ # Documentation debug_msg 1 "Documentation" -@@ -1293,36 +1259,13 @@ +@@ -1293,47 +1259,16 @@ if test -z "${OPERADESTDIR}"; then @@ -157,7 +157,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 @@ -170,33 +170,44 @@ - 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 + bool_icons=1 # install icons by default - fi # OPERADESTDIR +- 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 ++ #icons + gnome + kde 3 +- kde 2 +- kde1 +- mandrake ++ #kde 2 ++ #kde1 ++ #mandrake + fi -@@ -1451,72 +1394,36 @@ + fi # OPERADESTDIR +@@ -1463,72 +1398,36 @@ debug_msg 1 "in gnome()" - if test -d /opt/gnome/; then -+ if test -d %%X11BASE%%/share/gnome/; then - +- - # /opt/gnome share - if test -d /opt/gnome/share; then -- ++ if test -d %%X11BASE%%/share/gnome/; then + - # /opt/gnome icon - if test ! -d /opt/gnome/share/pixmaps/; then - if test -w /opt/gnome/share; then @@ -282,7 +293,7 @@ fi # Add ximian here } -@@ -1527,39 +1434,31 @@ +@@ -1539,39 +1438,31 @@ debug_msg 1 "in kde()" |