- Update to 8.0, see the changelog for details:

	http://www.opera.com/linux/changelogs/800/

- Use DATADIR in plist.
- To upgrade, please read in either pkg-descr or UPDATING for detail
- The pkg-descr will be update when opera.com is in less traffic.
- Copy pkg-message in UPDATING. As for www/opera maintainer/committer,
  you can just add 'www/opera' when it updates to 8.0.

1 files changed, 49 insertions, 62 deletions

diff --git a/www/linux-opera-devel/files/patch-ini::pluginpath.ini b/www/linux-opera-devel/files/patch-ini::pluginpath.ini
index 3a28727b8700..beb796f948cb 100644
--- a/www/linux-opera-devel/files/patch-ini::pluginpath.ini
+++ b/www/linux-opera-devel/files/patch-ini::pluginpath.ini
@@ -1,73 +1,60 @@
---- ini/pluginpath.ini.orig	Fri Feb  4 17:45:25 2005
-+++ ini/pluginpath.ini	Fri Feb  4 17:45:53 2005
-@@ -1,44 +1,26 @@
--Opera Preferences version 2.0

--; Do not edit this file while Opera is running

--; This file is stored in UTF-8 encoding

--

--[Paths]

--$PWD/plugins=1

--$HOME/.opera/plugins=1

--/usr/lib/opera/plugins=1

--/usr/lib/opera/plugins=1

--/usr/local/lib/opera/plugins=1

--/opt/lib/opera/plugins=1

--/opt/opera/lib/opera/plugins=1

--

--; Adobe Acrobat

--/usr/local/Acrobat5/Browsers/intellinux=1

--/usr/local/Acrobat4/Browsers/intellinux=1

--/usr/lib/Acrobat5/Browsers/intellinux=1

--/usr/lib/Acrobat4/Browsers/intellinux=1

--/usr/X11R6/lib/Acrobat5/Browsers/intellinux=1

--/usr/X11R6/lib/Acrobat4/Browsers/intellinux=1

--/opt/Acrobat5/Browsers/intellinux=1

--/opt/Acrobat4/Browsers/intellinux=1

--/usr/Acrobat5/Browsers/intellinux=1

--/usr/Acrobat4/Browsers/intellinux=1

--

--; Realplayer

--/usr/lib/RealPlayer8/Plugins=1

--/usr/lib/realplay/plugins=1

--/usr/lib/RealPlayer8=1

--/usr/lib/realplay=1

--

--; Netscape Plug-in Paths

--$HOME/.netscape6/plugins=1

--$HOME/.netscape/plugins=1

--/opt/netscape/plugins=1

--/usr/lib/netscape/plugins=1

--/usr/local/netscape/plugins=1

--/usr/local/lib/netscape/plugins=1

--$HOME/.kde/.konqueror/nsplugins=1

--

--; Since Mozilla supports NS plugins, there might

--; be some in the Mozilla plugin directory.

--/usr/lib/mozilla/plugins=1

--/usr/X11R6/lib/mozilla/plugins=1

-+Opera Preferences version 2.0
-+; Do not edit this file while Opera is running
-+; This file is stored in UTF-8 encoding
-+
-+[Paths]
+--- ini/pluginpath.ini.orig	Tue Mar  1 16:31:51 2005
++++ ini/pluginpath.ini	Tue Mar  1 16:33:00 2005
+@@ -3,46 +3,24 @@
+ ; This file is stored in UTF-8 encoding
+ 
+ [Paths]
+-$PWD/plugins=1
+-$HOME/.opera/plugins=1
+-/usr/lib/opera/plugins=1
+-/usr/lib/opera/plugins=1
+-/usr/local/lib/opera/plugins=1
+-/opt/lib/opera/plugins=1
+-/opt/opera/lib/opera/plugins=1
 +$HOME/.linux-opera/plugins=1
 +%%PREFIX%%/share/linux-opera/plugins=1
-+
-+; Adobe Acrobat
+ 
+ ; Adobe Acrobat
+-/usr/local/Acrobat5/Browsers/intellinux=1
+-/usr/local/Acrobat4/Browsers/intellinux=1
+-/usr/lib/Acrobat5/Browsers/intellinux=1
+-/usr/lib/Acrobat4/Browsers/intellinux=1
+-/usr/X11R6/lib/Acrobat5/Browsers/intellinux=1
+-/usr/X11R6/lib/Acrobat4/Browsers/intellinux=1
+-/opt/Acrobat5/Browsers/intellinux=1
+-/opt/Acrobat4/Browsers/intellinux=1
+-/usr/Acrobat5/Browsers/intellinux=1
+-/usr/Acrobat4/Browsers/intellinux=1
 +%%LOCALBASE%%/Acrobat5/Browsers/intellinux=1
 +
 +; Flash player
 +%%LOCALBASE%%/lib/linux-flashplugin6=1
 +%%LOCALBASE%%/lib/linux-flashplugin7=1
-+
-+; Realplayer
+ 
+ ; Realplayer
+-/usr/lib/RealPlayer8/Plugins=1
+-/usr/lib/realplay/plugins=1
+-/usr/lib/RealPlayer8=1
+-/usr/lib/realplay=1
 +%%LOCALBASE%%/lib/RealPlayer=1
 +%%LOCALBASE%%/lib/RealPlayer/plugins=1
-+
-+; Netscape Plug-in Paths
-+$HOME/.netscape/plugins=1
+ 
+ ; Netscape Plug-in Paths
+-$HOME/.netscape6/plugins=1
+ $HOME/.netscape/plugins=1
+-/opt/netscape/plugins=1
+-/usr/lib/netscape/plugins=1
+-/usr/local/netscape/plugins=1
+-/usr/local/lib/netscape/plugins=1
+-$HOME/.kde/.konqueror/nsplugins=1
 +%%LOCALBASE%%/lib/netscape-linux/plugins=1
-+
-+; Since Mozilla supports NS plugins, there might
-+; be some in the Mozilla plugin directory.
+ 
+ ; Since Mozilla supports NS plugins, there might
+ ; be some in the Mozilla plugin directory.
+-/usr/lib/mozilla/plugins=1
+-/usr/X11R6/lib/mozilla/plugins=1
+-/usr/lib/browser-plugins=1
+-
+-[KDE]
+-plugins=$HOME/.kde/share/config/kcmnspluginrc
 +%%LOCALBASE%%/lib/linux-mozilla/plugins=1