Update to 7.20-B9 (aka 20030905)

Submitted by:	Arjan van Leeuwen <avleeuwen@piwebs.com> (maintainer)
PR:		56498

8 files changed, 12 insertions, 62 deletions

diff --git a/www/opera-devel/Makefile b/www/opera-devel/Makefile
index f7b4c1c5edb..3ffa1739b14 100644
--- a/www/opera-devel/Makefile
+++ b/www/opera-devel/Makefile
@@ -6,19 +6,9 @@
 #
 
 PORTNAME=	opera
-PORTVERSION=	7.20.20030827
+PORTVERSION=	7.20.20030905
 CATEGORIES=	www
-MASTER_SITES=	http://mirrors.pmmf.hu/mirror/opera/unix/freebsd/720/beta7/en/static/ \
-		ftp://ftp.planetmirror.com/pub/opera/unix/freebsd/720/beta7/en/static/ \
-		http://public.planetmirror.com/pub/opera/unix/freebsd/720/beta7/en/static/ \
-		http://gd.tuwien.ac.at/infosys/browsers/opera/unix/freebsd/720/beta7/en/static/ \
-		ftp://ftp.opera.com/pub/opera/unix/freebsd/720/beta7/en/static/ \
-		ftp://ftp.uit.no/pub/www/opera/unix/freebsd/720/beta7/en/static/ \
-		ftp://ftp.task.gda.pl/pub/opera/unix/freebsd/720/beta7/en/static/ \
-		http://ftp.task.gda.pl/pub/opera/unix/freebsd/720/beta7/en/static/ \
-		ftp://ftp.sunet.se/pub/www/clients/Opera/unix/freebsd/720/beta7/en/static/ \
-		http://ftp.sunet.se/pub/www/clients/Opera/unix/freebsd/720/beta7/en/static/ \
-		http://sunsite.cnlab-switch.ch/ftp/mirror/opera/unix/freebsd/720/beta7/en/static/
+MASTER_SITES=	http://snapshot.opera.com/unix/7.20-Beta-9/intel-freebsd/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/0./0-/}.1-static-qt.i386.freebsd
 
 MAINTAINER=	avleeuwen@piwebs.com
diff --git a/www/opera-devel/distinfo b/www/opera-devel/distinfo
index b88ea43fc1a..bf2f8cb633c 100644
--- a/www/opera-devel/distinfo
+++ b/www/opera-devel/distinfo
@@ -1 +1 @@
-MD5 (opera-7.20-20030827.1-static-qt.i386.freebsd.tar.bz2) = d857d099ab047a6c6b77f6066703920a
+MD5 (opera-7.20-20030905.1-static-qt.i386.freebsd.tar.bz2) = 710f3512ed79f1d83f909e5670d7b27f
diff --git a/www/opera-devel/files/patch-install.sh b/www/opera-devel/files/patch-install.sh
index 733442180c2..79239df17a0 100644
--- a/www/opera-devel/files/patch-install.sh
+++ b/www/opera-devel/files/patch-install.sh
@@ -38,24 +38,6 @@
  
      wrapper_file="${wrapper_dir}/opera"
      
-@@ -909,7 +901,7 @@
- 
-     # Workaround for the \"preloaded libXt\" problem.
-     # To disable the first workaround, comment the next line.
--    JAVA_WORKAROUND=`LD_PRELOAD=\"\${OPERA_JAVA_DIR}/libawt.so\" /bin/echo works 2>/dev/null`
-+    #JAVA_WORKAROUND=`LD_PRELOAD=\"\${OPERA_JAVA_DIR}/libawt.so\" /bin/echo works 2>/dev/null`
- 
-     if test \"\${JAVA_WORKAROUND}\" = 'works'; then
-         LD_PRELOAD=\"\${OPERA_JAVA_DIR}/libawt.so\"
-@@ -918,7 +910,7 @@
-     fi
- else
-     # To disable the second workaround, comment the next line.
--    JAVA_WORKAROUND2=`LD_PRELOAD=\"libawt.so\" /bin/echo works 2>/dev/null`
-+    #JAVA_WORKAROUND2=`LD_PRELOAD=\"libawt.so\" /bin/echo works 2>/dev/null`
-     if test \"\${JAVA_WORKAROUND2}\" = 'works'; then
-         LD_PRELOAD=\"libawt.so\"
-         OPERA_FORCE_JAVA_ENABLED=\"1\"
 @@ -943,11 +935,8 @@
  
  # Acrobat Reader
diff --git a/www/opera-devel/pkg-plist b/www/opera-devel/pkg-plist
index c8cbc12af68..937c70f194b 100644
--- a/www/opera-devel/pkg-plist
+++ b/www/opera-devel/pkg-plist
@@ -67,6 +67,8 @@ share/opera/java/opera.policy
 share/opera/jsconsole.html
 share/opera/lngcode.txt
 share/opera/locale/english.lng
+share/opera/locale/en/lngcode.txt
+share/opera/locale/en/search.ini
 share/opera/opera6.adr
 share/opera/plugins/libnpp.so
 share/opera/plugins/operamotifwrapper
@@ -106,6 +108,7 @@ share/opera/styles/wml.css
 @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
diff --git a/www/opera/Makefile b/www/opera/Makefile
index f7b4c1c5edb..3ffa1739b14 100644
--- a/www/opera/Makefile
+++ b/www/opera/Makefile
@@ -6,19 +6,9 @@
 #
 
 PORTNAME=	opera
-PORTVERSION=	7.20.20030827
+PORTVERSION=	7.20.20030905
 CATEGORIES=	www
-MASTER_SITES=	http://mirrors.pmmf.hu/mirror/opera/unix/freebsd/720/beta7/en/static/ \
-		ftp://ftp.planetmirror.com/pub/opera/unix/freebsd/720/beta7/en/static/ \
-		http://public.planetmirror.com/pub/opera/unix/freebsd/720/beta7/en/static/ \
-		http://gd.tuwien.ac.at/infosys/browsers/opera/unix/freebsd/720/beta7/en/static/ \
-		ftp://ftp.opera.com/pub/opera/unix/freebsd/720/beta7/en/static/ \
-		ftp://ftp.uit.no/pub/www/opera/unix/freebsd/720/beta7/en/static/ \
-		ftp://ftp.task.gda.pl/pub/opera/unix/freebsd/720/beta7/en/static/ \
-		http://ftp.task.gda.pl/pub/opera/unix/freebsd/720/beta7/en/static/ \
-		ftp://ftp.sunet.se/pub/www/clients/Opera/unix/freebsd/720/beta7/en/static/ \
-		http://ftp.sunet.se/pub/www/clients/Opera/unix/freebsd/720/beta7/en/static/ \
-		http://sunsite.cnlab-switch.ch/ftp/mirror/opera/unix/freebsd/720/beta7/en/static/
+MASTER_SITES=	http://snapshot.opera.com/unix/7.20-Beta-9/intel-freebsd/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/0./0-/}.1-static-qt.i386.freebsd
 
 MAINTAINER=	avleeuwen@piwebs.com
diff --git a/www/opera/distinfo b/www/opera/distinfo
index b88ea43fc1a..bf2f8cb633c 100644
--- a/www/opera/distinfo
+++ b/www/opera/distinfo
@@ -1 +1 @@
-MD5 (opera-7.20-20030827.1-static-qt.i386.freebsd.tar.bz2) = d857d099ab047a6c6b77f6066703920a
+MD5 (opera-7.20-20030905.1-static-qt.i386.freebsd.tar.bz2) = 710f3512ed79f1d83f909e5670d7b27f
diff --git a/www/opera/files/patch-install.sh b/www/opera/files/patch-install.sh
index 733442180c2..79239df17a0 100644
--- a/www/opera/files/patch-install.sh
+++ b/www/opera/files/patch-install.sh
@@ -38,24 +38,6 @@
  
      wrapper_file="${wrapper_dir}/opera"
      
-@@ -909,7 +901,7 @@
- 
-     # Workaround for the \"preloaded libXt\" problem.
-     # To disable the first workaround, comment the next line.
--    JAVA_WORKAROUND=`LD_PRELOAD=\"\${OPERA_JAVA_DIR}/libawt.so\" /bin/echo works 2>/dev/null`
-+    #JAVA_WORKAROUND=`LD_PRELOAD=\"\${OPERA_JAVA_DIR}/libawt.so\" /bin/echo works 2>/dev/null`
- 
-     if test \"\${JAVA_WORKAROUND}\" = 'works'; then
-         LD_PRELOAD=\"\${OPERA_JAVA_DIR}/libawt.so\"
-@@ -918,7 +910,7 @@
-     fi
- else
-     # To disable the second workaround, comment the next line.
--    JAVA_WORKAROUND2=`LD_PRELOAD=\"libawt.so\" /bin/echo works 2>/dev/null`
-+    #JAVA_WORKAROUND2=`LD_PRELOAD=\"libawt.so\" /bin/echo works 2>/dev/null`
-     if test \"\${JAVA_WORKAROUND2}\" = 'works'; then
-         LD_PRELOAD=\"libawt.so\"
-         OPERA_FORCE_JAVA_ENABLED=\"1\"
 @@ -943,11 +935,8 @@
  
  # Acrobat Reader
diff --git a/www/opera/pkg-plist b/www/opera/pkg-plist
index c8cbc12af68..937c70f194b 100644
--- a/www/opera/pkg-plist
+++ b/www/opera/pkg-plist
@@ -67,6 +67,8 @@ share/opera/java/opera.policy
 share/opera/jsconsole.html
 share/opera/lngcode.txt
 share/opera/locale/english.lng
+share/opera/locale/en/lngcode.txt
+share/opera/locale/en/search.ini
 share/opera/opera6.adr
 share/opera/plugins/libnpp.so
 share/opera/plugins/operamotifwrapper
@@ -106,6 +108,7 @@ share/opera/styles/wml.css
 @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