10 files changed, 56 insertions, 44 deletions

diff --git a/www/linux-opera-devel/Makefile b/www/linux-opera-devel/Makefile
index af67b06e904a..c9f192d99fcf 100644
--- a/www/linux-opera-devel/Makefile
+++ b/www/linux-opera-devel/Makefile
@@ -35,9 +35,9 @@ ONLY_FOR_ARCHS=	i386 amd64
 
 NO_BUILD=	yes
 
-OPERA_VER=	9.01
-OPERA_DATE=	20060728
-OPERA_BUILD=	400
+OPERA_VER=	9.02
+OPERA_DATE=	20060919
+OPERA_BUILD=	434
 DATADIR=	${PREFIX}/share/${UNIQUENAME}
 DOCSDIR=	${PREFIX}/share/doc/${UNIQUENAME}
 
diff --git a/www/linux-opera-devel/distinfo b/www/linux-opera-devel/distinfo
index 33532428b82e..0794ca21fd8b 100644
--- a/www/linux-opera-devel/distinfo
+++ b/www/linux-opera-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (opera-9.01-20060728.1-static-qt.i386-en.tar.bz2) = 3dad6ab16f0ccdbd728f3f531dd74e79
-SHA256 (opera-9.01-20060728.1-static-qt.i386-en.tar.bz2) = 38086051d09658d29b325370925219acd875a7cfe159fff98c08df8b674dc702
-SIZE (opera-9.01-20060728.1-static-qt.i386-en.tar.bz2) = 6690353
+MD5 (opera-9.02-20060919.1-static-qt.i386-en.tar.bz2) = d6c5eb5fa495fedb60b48d98daf365c3
+SHA256 (opera-9.02-20060919.1-static-qt.i386-en.tar.bz2) = 5836a16165465b2c955f0737a093b5ebd9a42a7e2df1bd5a843c4e9d1a27bada
+SIZE (opera-9.02-20060919.1-static-qt.i386-en.tar.bz2) = 6711741
diff --git a/www/linux-opera-devel/files/patch-ini::pluginpath.ini b/www/linux-opera-devel/files/patch-ini::pluginpath.ini
index 870c8e0c7f17..f6a21e25c2d2 100644
--- a/www/linux-opera-devel/files/patch-ini::pluginpath.ini
+++ b/www/linux-opera-devel/files/patch-ini::pluginpath.ini
@@ -1,8 +1,12 @@
---- ini/pluginpath.ini.orig	Fri Jun 16 06:18:52 2006
-+++ ini/pluginpath.ini	Tue Aug  1 13:07:18 2006
-@@ -3,57 +3,33 @@
+--- 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
@@ -71,9 +75,7 @@
 -/usr/lib/browser-plugins=1
 +%%LOCALBASE%%/lib/linux-mozilla/plugins=1
 +%%X11BASE%%/lib/linux-mozilla/plugins=1
- 
--[KDE]
--plugins=$HOME/.kde/share/config/kcmnspluginrc
++
 +; Global plugins path in FreeBSD. Need this for
 +; the Adobe Acrobat7 and other plugins too.
 +%%LOCALBASE%%/lib/browser_linux_plugins=1
diff --git a/www/linux-opera-devel/files/patch-install.sh b/www/linux-opera-devel/files/patch-install.sh
index 72ead549e1ec..f0693eb784ae 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	Fri Jul 28 08:10:44 2006
-+++ install.sh	Wed Aug  2 19:11:33 2006
+--- install.sh.orig	Thu Sep 21 22:27:04 2006
++++ install.sh	Thu Sep 21 22:38:24 2006
 @@ -805,10 +805,9 @@
      case "${machine}:${os}" in
  	x86:Linux|x86_64:Linux|x86:AnyBSD|x86_64:AnyBSD|x86:OpenBSD)
@@ -187,17 +187,21 @@
  
      # Documentation
      debug_msg 1 "Documentation"
-@@ -1242,9 +1182,6 @@
+@@ -1242,13 +1182,6 @@
  	mkdir $mkdirv $mkdirp $share_dir/ini/
  	chmod $chmodv 755 $share_dir/ini
  	cp $cpv $cpf $cpR ini/* $share_dir/ini/
 -	if test -f $share_dir/ini/pluginpath.ini
--	then echo ${str_localdirplugin} >> $share_dir/ini/pluginpath.ini
+-	then (
+-	    echo
+-	    echo '; locally installed:'
+-	    echo "${str_localdirplugin}=1"
+-	    ) >> $share_dir/ini/pluginpath.ini
 -	fi
      fi
  
      mkdir $mkdirv $mkdirp $share_dir/locale/
-@@ -1336,43 +1273,11 @@
+@@ -1340,43 +1273,11 @@
  
      if test -z "${OPERADESTDIR}"
      then
@@ -242,7 +246,7 @@
  	fi
  
      fi # OPERADESTDIR
-@@ -1424,19 +1329,19 @@
+@@ -1428,19 +1329,19 @@
      # arg1 = location
      # arg2 = type
  
@@ -265,7 +269,7 @@
  Name[af]=opera
  Name[eo]=Opero
  Name[zu]=I Opera
-@@ -1460,7 +1365,7 @@
+@@ -1464,7 +1365,7 @@
  GenericName[ven]=Buronza ya Webu
  GenericName[xh]=Umkhangeli Zincwadi Zokubhaliweyo
  GenericName[zu]=Umkhangeli zincwadi we Web
@@ -274,7 +278,7 @@
  Terminal=false"
  
  # Application is not a category, according to
-@@ -1475,25 +1380,26 @@
+@@ -1479,25 +1380,26 @@
  	if test "${2}" = "xdg"; then
  	    desktop_contain="${desktop_contain}
  Categories=Application;Qt;Network;WebBrowser;X-Ximian-Main;X-Ximian-Toplevel
@@ -307,7 +311,7 @@
  
      echo "${desktop_contain}" > ${desktop_file}
      chmod $chmodv 644 ${desktop_file}
-@@ -1524,55 +1430,28 @@
+@@ -1528,55 +1430,28 @@
  
      debug_msg 0 "in icons()"
  
diff --git a/www/linux-opera-devel/pkg-message b/www/linux-opera-devel/pkg-message
index c563dd06aa50..5cfd452d222e 100644
--- a/www/linux-opera-devel/pkg-message
+++ b/www/linux-opera-devel/pkg-message
@@ -1,5 +1,5 @@
 ##
-Changelog for 9.01 Final: http://www.opera.com/docs/changelogs/linux/901/
+Changelog for 9.02 Final: http://www.opera.com/docs/changelogs/linux/902/
 
 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. As for the
diff --git a/www/linux-opera/Makefile b/www/linux-opera/Makefile
index af67b06e904a..c9f192d99fcf 100644
--- a/www/linux-opera/Makefile
+++ b/www/linux-opera/Makefile
@@ -35,9 +35,9 @@ ONLY_FOR_ARCHS=	i386 amd64
 
 NO_BUILD=	yes
 
-OPERA_VER=	9.01
-OPERA_DATE=	20060728
-OPERA_BUILD=	400
+OPERA_VER=	9.02
+OPERA_DATE=	20060919
+OPERA_BUILD=	434
 DATADIR=	${PREFIX}/share/${UNIQUENAME}
 DOCSDIR=	${PREFIX}/share/doc/${UNIQUENAME}
 
diff --git a/www/linux-opera/distinfo b/www/linux-opera/distinfo
index 33532428b82e..0794ca21fd8b 100644
--- a/www/linux-opera/distinfo
+++ b/www/linux-opera/distinfo
@@ -1,3 +1,3 @@
-MD5 (opera-9.01-20060728.1-static-qt.i386-en.tar.bz2) = 3dad6ab16f0ccdbd728f3f531dd74e79
-SHA256 (opera-9.01-20060728.1-static-qt.i386-en.tar.bz2) = 38086051d09658d29b325370925219acd875a7cfe159fff98c08df8b674dc702
-SIZE (opera-9.01-20060728.1-static-qt.i386-en.tar.bz2) = 6690353
+MD5 (opera-9.02-20060919.1-static-qt.i386-en.tar.bz2) = d6c5eb5fa495fedb60b48d98daf365c3
+SHA256 (opera-9.02-20060919.1-static-qt.i386-en.tar.bz2) = 5836a16165465b2c955f0737a093b5ebd9a42a7e2df1bd5a843c4e9d1a27bada
+SIZE (opera-9.02-20060919.1-static-qt.i386-en.tar.bz2) = 6711741
diff --git a/www/linux-opera/files/patch-ini::pluginpath.ini b/www/linux-opera/files/patch-ini::pluginpath.ini
index 870c8e0c7f17..f6a21e25c2d2 100644
--- a/www/linux-opera/files/patch-ini::pluginpath.ini
+++ b/www/linux-opera/files/patch-ini::pluginpath.ini
@@ -1,8 +1,12 @@
---- ini/pluginpath.ini.orig	Fri Jun 16 06:18:52 2006
-+++ ini/pluginpath.ini	Tue Aug  1 13:07:18 2006
-@@ -3,57 +3,33 @@
+--- 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
@@ -71,9 +75,7 @@
 -/usr/lib/browser-plugins=1
 +%%LOCALBASE%%/lib/linux-mozilla/plugins=1
 +%%X11BASE%%/lib/linux-mozilla/plugins=1
- 
--[KDE]
--plugins=$HOME/.kde/share/config/kcmnspluginrc
++
 +; Global plugins path in FreeBSD. Need this for
 +; the Adobe Acrobat7 and other plugins too.
 +%%LOCALBASE%%/lib/browser_linux_plugins=1
diff --git a/www/linux-opera/files/patch-install.sh b/www/linux-opera/files/patch-install.sh
index 72ead549e1ec..f0693eb784ae 100644
--- a/www/linux-opera/files/patch-install.sh
+++ b/www/linux-opera/files/patch-install.sh
@@ -1,5 +1,5 @@
---- install.sh.orig	Fri Jul 28 08:10:44 2006
-+++ install.sh	Wed Aug  2 19:11:33 2006
+--- install.sh.orig	Thu Sep 21 22:27:04 2006
++++ install.sh	Thu Sep 21 22:38:24 2006
 @@ -805,10 +805,9 @@
      case "${machine}:${os}" in
  	x86:Linux|x86_64:Linux|x86:AnyBSD|x86_64:AnyBSD|x86:OpenBSD)
@@ -187,17 +187,21 @@
  
      # Documentation
      debug_msg 1 "Documentation"
-@@ -1242,9 +1182,6 @@
+@@ -1242,13 +1182,6 @@
  	mkdir $mkdirv $mkdirp $share_dir/ini/
  	chmod $chmodv 755 $share_dir/ini
  	cp $cpv $cpf $cpR ini/* $share_dir/ini/
 -	if test -f $share_dir/ini/pluginpath.ini
--	then echo ${str_localdirplugin} >> $share_dir/ini/pluginpath.ini
+-	then (
+-	    echo
+-	    echo '; locally installed:'
+-	    echo "${str_localdirplugin}=1"
+-	    ) >> $share_dir/ini/pluginpath.ini
 -	fi
      fi
  
      mkdir $mkdirv $mkdirp $share_dir/locale/
-@@ -1336,43 +1273,11 @@
+@@ -1340,43 +1273,11 @@
  
      if test -z "${OPERADESTDIR}"
      then
@@ -242,7 +246,7 @@
  	fi
  
      fi # OPERADESTDIR
-@@ -1424,19 +1329,19 @@
+@@ -1428,19 +1329,19 @@
      # arg1 = location
      # arg2 = type
  
@@ -265,7 +269,7 @@
  Name[af]=opera
  Name[eo]=Opero
  Name[zu]=I Opera
-@@ -1460,7 +1365,7 @@
+@@ -1464,7 +1365,7 @@
  GenericName[ven]=Buronza ya Webu
  GenericName[xh]=Umkhangeli Zincwadi Zokubhaliweyo
  GenericName[zu]=Umkhangeli zincwadi we Web
@@ -274,7 +278,7 @@
  Terminal=false"
  
  # Application is not a category, according to
-@@ -1475,25 +1380,26 @@
+@@ -1479,25 +1380,26 @@
  	if test "${2}" = "xdg"; then
  	    desktop_contain="${desktop_contain}
  Categories=Application;Qt;Network;WebBrowser;X-Ximian-Main;X-Ximian-Toplevel
@@ -307,7 +311,7 @@
  
      echo "${desktop_contain}" > ${desktop_file}
      chmod $chmodv 644 ${desktop_file}
-@@ -1524,55 +1430,28 @@
+@@ -1528,55 +1430,28 @@
  
      debug_msg 0 "in icons()"
  
diff --git a/www/linux-opera/pkg-message b/www/linux-opera/pkg-message
index c563dd06aa50..5cfd452d222e 100644
--- a/www/linux-opera/pkg-message
+++ b/www/linux-opera/pkg-message
@@ -1,5 +1,5 @@
 ##
-Changelog for 9.01 Final: http://www.opera.com/docs/changelogs/linux/901/
+Changelog for 9.02 Final: http://www.opera.com/docs/changelogs/linux/902/
 
 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. As for the