--- ini/pluginpath.ini.orig	Thu Sep 21 22:22:23 2006
+++ ini/pluginpath.ini	Thu Sep 21 22:26:00 2006
@@ -2,58 +2,34 @@
 ; Do not edit this file while Opera is running
 ; This file is stored in UTF-8 encoding
 
-[KDE]
-plugins=$HOME/.kde/share/config/kcmnspluginrc
-
 [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
-/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
+%%X11BASE%%/Acrobat5/Browsers/intellinux=1
 
-; Realplayer
-/usr/lib/RealPlayer8/Plugins=1
-/usr/lib/realplay/plugins=1
-/usr/lib/RealPlayer8=1
-/usr/lib/realplay=1
+; Flash player
+%%LOCALBASE%%/lib/linux-flashplugin6=1
+%%LOCALBASE%%/lib/linux-flashplugin7=1
+%%X11BASE%%/lib/linux-flashplugin6=1
+%%X11BASE%%/lib/linux-flashplugin7=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
+; Realplayer
+%%LOCALBASE%%/lib/RealPlayer=1
+%%LOCALBASE%%/lib/RealPlayer/plugins=1
+%%X11BASE%%/lib/RealPlayer=1
+%%X11BASE%%/lib/RealPlayer/plugins=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
-/usr/lib64/browser-plugins=1
-/usr/lib/browser-plugins=1
+%%LOCALBASE%%/lib/linux-mozilla/plugins=1
+%%X11BASE%%/lib/linux-mozilla/plugins=1
+
+; Global plugins path in FreeBSD. Need this for
+; the Adobe Acrobat7 and other plugins too.
+%%LOCALBASE%%/lib/browser_linux_plugins=1
+%%X11BASE%%/lib/browser_linux_plugins=1
+%%LOCALBASE%%/lib/npapi/symlinks/linux-opera=1
+%%X11BASE%%/lib/npapi/symlinks/linux-opera=1