1 files changed, 143 insertions, 137 deletions

diff --git a/www/linux-opera/pkg-plist b/www/linux-opera/pkg-plist
index 8e98d4f5b13b..420b4c48cdbc 100644
--- a/www/linux-opera/pkg-plist
+++ b/www/linux-opera/pkg-plist
@@ -1,138 +1,144 @@
-bin/opera
-share/doc/opera/LICENSE
-share/doc/opera/help
-share/icons/opera.xpm
-share/opera/bin/m2.so
-share/opera/bin/missingsyms.so
-share/opera/bin/opera
-share/opera/bin/works
-share/opera/chartables.bin
-share/opera/config/opera6rc
-share/opera/config/opera6rc.fixed
-share/opera/help/advertising.html
-share/opera/help/background.png
-share/opera/help/dialogs.html
-share/opera/help/filetypes.html
-share/opera/help/fonts.html
-share/opera/help/glossary.html
-share/opera/help/help.css
-share/opera/help/history.html
-share/opera/help/hotlist.html
-share/opera/help/index.html
-share/opera/help/input.html
-share/opera/help/keyboard.html
-share/opera/help/languages.html
-share/opera/help/layout.html
-share/opera/help/license.txt
-share/opera/help/m2.html
-share/opera/help/mail.html
-share/opera/help/menus.html
-share/opera/help/mouse.html
-share/opera/help/multimedia.html
-share/opera/help/network.html
-share/opera/help/page.html
-share/opera/help/paths.html
-share/opera/help/personal.html
-share/opera/help/preferences.html
-share/opera/help/privacy.html
-share/opera/help/search.html
-share/opera/help/security.html
-share/opera/help/skin.html
-share/opera/help/sounds.html
-share/opera/help/start.html
-share/opera/help/toc.html
-share/opera/help/toolbars.html
-share/opera/help/windows.html
-share/opera/hhd.ssr
-share/opera/images/background.gif
-share/opera/images/blank.gif
-share/opera/images/drive.gif
-share/opera/images/file.gif
-share/opera/images/folder.gif
-share/opera/images/link.gif
-share/opera/images/opera.xpm
-share/opera/images/opera_16x16.png
-share/opera/images/opera_22x22.png
-share/opera/images/opera_32x32.png
-share/opera/images/opera_48x48.png
-share/opera/images/operabanner.png
-share/opera/images/shared.gif
-share/opera/images/splash.png
-share/opera/images/startup1.png
-share/opera/images/startup2.png
-share/opera/ini/dialog.ini
-share/opera/ini/fastforward.ini
-share/opera/ini/minimal_toolbar.ini
-share/opera/ini/standard_keyboard.ini
-share/opera/ini/standard_menu.ini
-share/opera/ini/standard_mouse.ini
-share/opera/ini/standard_toolbar.ini
-share/opera/ini/unix_keyboard.ini
-share/opera/java/opera.jar
-share/opera/java/opera.policy
-share/opera/jsconsole.html
-share/opera/lngcode.txt
-share/opera/locale/en/default.adr
-share/opera/locale/en/search.ini
-share/opera/locale/english.lng
-share/opera/opera6.adr
-share/opera/plugins/libnpp.so
-share/opera/plugins/operamotifwrapper
-share/opera/plugins/operamotifwrapper-3
-share/opera/plugins/operaplugincleaner
-share/opera/search.ini
-share/opera/skin/standard_skin.zip
-share/opera/skin/windows_skin.zip
-share/opera/styles/OPF.css
-share/opera/styles/about.css
-share/opera/styles/cache.css
-share/opera/styles/csr.css
-share/opera/styles/dir.css
-share/opera/styles/drives.css
-share/opera/styles/email.css
-share/opera/styles/history.css
-share/opera/styles/im.css
-share/opera/styles/info.css
-share/opera/styles/mime.css
-share/opera/styles/mimehead.css
-share/opera/styles/opf.css
-share/opera/styles/plugins.css
-share/opera/styles/user/accessibility.css
-share/opera/styles/user/contrastbw.css
-share/opera/styles/user/contrastwb.css
-share/opera/styles/user/debugwithoutline.css
-share/opera/styles/user/disabletables.css
-share/opera/styles/user/hidecertainsizes.css
-share/opera/styles/user/hidenonlinkimages.css
-share/opera/styles/user/imageandlinkonly.css
-share/opera/styles/user/nostalgia.css
-share/opera/styles/user/showstructure.css
-share/opera/styles/user/textonly.css
-share/opera/styles/user/userstyle.ini
-share/opera/styles/wml.css
-share/pixmaps/opera.xpm
-@dirrm share/opera/styles/user
-@dirrm share/opera/styles
-@dirrm share/opera/skin
-@dirrm share/opera/plugins
-@dirrm share/opera/locale/en
-@dirrm share/opera/locale
-@dirrm share/opera/java
-@dirrm share/opera/ini
-@dirrm share/opera/images
-@dirrm share/opera/help
-@dirrm share/opera/config
-@dirrm share/opera/bin
-@dirrm share/opera
-@dirrm share/doc/opera
+bin/linux-opera
+%%DOCSDIR%%/LICENSE
+%%DOCSDIR%%/help
+%%GNOME:%%share/gnome/apps/Internet/linux-opera.desktop
+%%GNOME:%%share/gnome/pixmaps/linux-opera.xpm
+share/linux-opera/bin/missingsyms.so
+share/linux-opera/bin/opera
+share/linux-opera/bin/spellcheck.so
+share/linux-opera/bin/works
+share/linux-opera/chartables.bin
+share/linux-opera/config/opera6rc
+share/linux-opera/config/opera6rc.bak
+share/linux-opera/config/opera6rc.fixed
+share/linux-opera/config/opera6rc.orig
+share/linux-opera/help/advertising.html
+share/linux-opera/help/background.png
+share/linux-opera/help/chat.html
+share/linux-opera/help/dialogs.html
+share/linux-opera/help/filetypes.html
+share/linux-opera/help/fonts.html
+share/linux-opera/help/glossary.html
+share/linux-opera/help/help.css
+share/linux-opera/help/history.html
+share/linux-opera/help/hotlist.html
+share/linux-opera/help/index.html
+share/linux-opera/help/input.html
+share/linux-opera/help/keyboard.html
+share/linux-opera/help/languages.html
+share/linux-opera/help/layout.html
+share/linux-opera/help/license.txt
+share/linux-opera/help/m2.html
+share/linux-opera/help/mail.html
+share/linux-opera/help/menus.html
+share/linux-opera/help/mouse.html
+share/linux-opera/help/multimedia.html
+share/linux-opera/help/network.html
+share/linux-opera/help/page.html
+share/linux-opera/help/panels.html
+share/linux-opera/help/paths.html
+share/linux-opera/help/personal.html
+share/linux-opera/help/preferences.html
+share/linux-opera/help/privacy.html
+share/linux-opera/help/search.html
+share/linux-opera/help/security.html
+share/linux-opera/help/skin.html
+share/linux-opera/help/sounds.html
+share/linux-opera/help/start.html
+share/linux-opera/help/toc.html
+share/linux-opera/help/toolbars.html
+share/linux-opera/help/windows.html
+share/linux-opera/hhd.ssr
+share/linux-opera/images/background.gif
+share/linux-opera/images/blank.gif
+share/linux-opera/images/drive.gif
+share/linux-opera/images/file.gif
+share/linux-opera/images/folder.gif
+share/linux-opera/images/link.gif
+share/linux-opera/images/opera.xpm
+share/linux-opera/images/opera_16x16.png
+share/linux-opera/images/opera_22x22.png
+share/linux-opera/images/opera_32x32.png
+share/linux-opera/images/opera_48x48.png
+share/linux-opera/images/operabanner.png
+share/linux-opera/images/shared.gif
+share/linux-opera/images/splash.png
+share/linux-opera/images/startup1.png
+share/linux-opera/images/startup2.png
+share/linux-opera/ini/dialog.ini
+share/linux-opera/ini/fastforward.ini
+share/linux-opera/ini/filehandler.ini
+share/linux-opera/ini/pluginpath.ini
+share/linux-opera/ini/spellcheck.ini
+share/linux-opera/ini/standard_keyboard.ini
+share/linux-opera/ini/standard_menu.ini
+share/linux-opera/ini/standard_mouse.ini
+share/linux-opera/ini/standard_toolbar.ini
+share/linux-opera/ini/unix_keyboard.ini
+share/linux-opera/java/opera.jar
+share/linux-opera/java/opera.policy
+share/linux-opera/jsconsole.html
+share/linux-opera/lngcode.txt
+share/linux-opera/locale/en/default.adr
+share/linux-opera/locale/en/lngcode.txt
+share/linux-opera/locale/en/search.ini
+share/linux-opera/locale/english.lng
+share/linux-opera/opera6.adr
+share/linux-opera/plugins/libnpp.so
+share/linux-opera/plugins/operamotifwrapper
+share/linux-opera/plugins/operamotifwrapper-3
+share/linux-opera/plugins/operaplugincleaner
+share/linux-opera/search.ini
+share/linux-opera/skin/standard_skin.zip
+share/linux-opera/skin/windows_skin.zip
+share/linux-opera/styles/OPF.css
+share/linux-opera/styles/about.css
+share/linux-opera/styles/cache.css
+share/linux-opera/styles/csr.css
+share/linux-opera/styles/dir.css
+share/linux-opera/styles/drives.css
+share/linux-opera/styles/email.css
+share/linux-opera/styles/history.css
+share/linux-opera/styles/im.css
+share/linux-opera/styles/info.css
+share/linux-opera/styles/mime.css
+share/linux-opera/styles/mimehead.css
+share/linux-opera/styles/opf.css
+share/linux-opera/styles/plugins.css
+share/linux-opera/styles/user/accessibility.css
+share/linux-opera/styles/user/contrastbw.css
+share/linux-opera/styles/user/contrastwb.css
+share/linux-opera/styles/user/debugwithoutline.css
+share/linux-opera/styles/user/disabletables.css
+share/linux-opera/styles/user/hidecertainsizes.css
+share/linux-opera/styles/user/hidenonlinkimages.css
+share/linux-opera/styles/user/imageandlinkonly.css
+share/linux-opera/styles/user/nostalgia.css
+share/linux-opera/styles/user/showstructure.css
+share/linux-opera/styles/user/textonly.css
+share/linux-opera/styles/user/userstyle.ini
+share/linux-opera/styles/wml.css
+share/pixmaps/linux-opera.xpm
+@dirrm share/linux-opera/styles/user
+@dirrm share/linux-opera/styles
+@dirrm share/linux-opera/skin
+@dirrm share/linux-opera/plugins
+@dirrm share/linux-opera/locale/en
+@dirrm share/linux-opera/locale
+@dirrm share/linux-opera/java
+@dirrm share/linux-opera/ini
+@dirrm share/linux-opera/images
+@dirrm share/linux-opera/help
+@dirrm share/linux-opera/config
+@dirrm share/linux-opera/bin
+@dirrm share/linux-opera
+@dirrm %%DOCSDIR%%
 
-%%GNOMELNK:%%share/gnome/apps/Internet/opera.desktop
-%%GNOME:%%share/gnome/pixmaps/opera.xpm
-
-@cwd %%LOCALBASE%%
-%%KDE:%%share/applnk/Internet/opera.desktop
-%%KDE2:%%share/applnk/Networking/WWW/opera.desktop
-
-@cwd /etc/X11
-wmconfig/opera
-%%APPLNK:%%applnk/Internet/opera.desktop
+%%KDE:%%@cwd %%LOCALBASE%%
+%%KDE:%%share/applnk/Internet/linux-opera.desktop
+%%KDE:%%share/icons/hicolor/22x22/apps/linux-opera.png
+%%KDE:%%share/icons/hicolor/32x32/apps/linux-opera.png
+%%KDE:%%share/icons/hicolor/48x48/apps/linux-opera.png
+%%KDE:%%share/icons/locolor/16x16/apps/linux-opera.png
+%%KDE:%%share/icons/locolor/22x22/apps/linux-opera.png
+%%KDE:%%share/icons/locolor/32x32/apps/linux-opera.png