4 files changed, 38 insertions, 65 deletions

diff --git a/www/opera-devel/Makefile b/www/opera-devel/Makefile
index 5b6b9c0f9fc6..8aab5d7994b8 100644
--- a/www/opera-devel/Makefile
+++ b/www/opera-devel/Makefile
@@ -8,16 +8,30 @@
 PORTNAME=	opera
 PORTVERSION=	${OPERA_VER}.${OPERA_DATE}
 CATEGORIES=	www ipv6
-MASTER_SITES=	http://snapshot.opera.com/unix/${OPERA_VER}-${OPERA_REL}/intel-freebsd/en/
+MASTER_SITES=	http://ftp.scarlet.be/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
+		ftp://ftp.planetmirror.com/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
+		http://www.mehok.uni-miskolc.hu/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
+		ftp://ftp.heanet.ie/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
+		ftp://opera.nsc.no/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
+		http://ftp.task.gda.pl/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
+		ftp://ftp.idilis.ro/mirrors/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
+		http://www.fastmirrors.org/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
+		http://ftp.sunet.se/pub/www/clients/Opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
+		ftp://mirror.switch.ch/mirror/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
+		ftp://ftp.tiscali.nl/pub/mirrors/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
+		http://ftp.ankara.edu.tr/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
+		ftp://files.downloadthat.com/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
+		ftp://ftp.opera.com/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/
 PKGNAMESUFFIX=	-devel
 DISTNAME=	${PORTNAME}-${OPERA_VER}-${OPERA_DATE}.1-static-qt.i386.freebsd-en
 
 MAINTAINER=	avleeuwen@piwebs.com
 COMMENT=	A blazingly fast, full-featured, standards-compliant browser
 
-OPERA_VER=	7.60
-OPERA_REL=	Preview-4
-OPERA_DATE=	20041203
+OPERA_VER=	8.0
+OPERA_MINVER=	0b1
+OPERA_REL=	beta
+OPERA_DATE=	20050104
 
 DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
diff --git a/www/opera-devel/distinfo b/www/opera-devel/distinfo
index 0c3c2de9b101..94b76a5822fa 100644
--- a/www/opera-devel/distinfo
+++ b/www/opera-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (opera-7.60-20041203.1-static-qt.i386.freebsd-en.tar.bz2) = 75b452a0417d14c56098799b878911d1
-SIZE (opera-7.60-20041203.1-static-qt.i386.freebsd-en.tar.bz2) = 4854660
+MD5 (opera-8.0-20050104.1-static-qt.i386.freebsd-en.tar.bz2) = 03918608165eb8b71c9c16d63a111c48
+SIZE (opera-8.0-20050104.1-static-qt.i386.freebsd-en.tar.bz2) = 4841094
diff --git a/www/opera-devel/files/patch-search.ini b/www/opera-devel/files/patch-search.ini
index b20d720f1ea7..a01d848595c5 100644
--- a/www/opera-devel/files/patch-search.ini
+++ b/www/opera-devel/files/patch-search.ini
@@ -1,25 +1,25 @@
---- search.ini.orig	Wed Oct 27 23:43:00 2004
-+++ search.ini	Wed Oct 27 23:40:35 2004
-@@ -32,14 +32,40 @@
+--- search.ini.orig	Fri Jan  7 17:39:59 2005
++++ search.ini	Fri Jan  7 17:44:13 2005
+@@ -409,8 +409,34 @@
  Nameid=0
  
- [Search Engine 3]
+ [Search Engine 34]
 -Name=Google Linu&x
 -URL=http://www.google.com/linux?q=%s&sourceid=opera&num=%i&ie=utf-8&oe=utf-8
 +Name=Google &BSD
 +URL=http://www.google.com/bsd?q=%s&sourceid=opera&num=%i&ie=utf-8&oe=utf-8
- Query=
- Key=x
- Is post=0
- Has endseparator=0
- Encoding=utf-8
- Search Type=1
++Query=
++Key=x
++Is post=0
++Has endseparator=0
++Encoding=utf-8
++Search Type=0
 +Verbtext=17063
 +Position=-1
 +Nameid=0
 +
-+[Search Engine 4]
-+Name=FreBSD &PRs
++[Search Engine 35]
++Name=FreeBSD &PRs
 +URL=http://www.freebsd.org/cgi/query-pr.cgi?pr=%s
 +Query=
 +Key=x
@@ -31,15 +31,9 @@
 +Position=-1
 +Nameid=0
 +
-+[Search Engine 5]
++[Search Engine 36]
 +Name=FreshP&orts
 +URL=http://www.freshports.org/search.php?query=%s
-+Query=
-+Key=x
-+Is post=0
-+Has endseparator=0
-+Encoding=utf-8
-+Search Type=0
- Verbtext=17063
- Position=-1
- Nameid=0
+ Query=
+ Key=x
+ Is post=0
diff --git a/www/opera-devel/pkg-plist b/www/opera-devel/pkg-plist
index 43933468e474..be27fd4bac49 100644
--- a/www/opera-devel/pkg-plist
+++ b/www/opera-devel/pkg-plist
@@ -1,7 +1,6 @@
 @comment $FreeBSD$
 bin/opera-devel
 %%DOCSDIR%%/LICENSE
-%%DOCSDIR%%/help
 %%DATADIR%%/bin/missingsyms.so
 %%DATADIR%%/bin/opera
 %%DATADIR%%/bin/spellcheck.so
@@ -9,41 +8,6 @@ bin/opera-devel
 %%DATADIR%%/chartables.bin
 %%DATADIR%%/config/opera6rc
 %%DATADIR%%/config/opera6rc.fixed
-%%DATADIR%%/help/advertising.html
-%%DATADIR%%/help/background.png
-%%DATADIR%%/help/chat.html
-%%DATADIR%%/help/dialogs.html
-%%DATADIR%%/help/filetypes.html
-%%DATADIR%%/help/fonts.html
-%%DATADIR%%/help/glossary.html
-%%DATADIR%%/help/help.css
-%%DATADIR%%/help/history.html
-%%DATADIR%%/help/index.html
-%%DATADIR%%/help/input.html
-%%DATADIR%%/help/keyboard.html
-%%DATADIR%%/help/languages.html
-%%DATADIR%%/help/layout.html
-%%DATADIR%%/help/license.txt
-%%DATADIR%%/help/m2.html
-%%DATADIR%%/help/mail.html
-%%DATADIR%%/help/menus.html
-%%DATADIR%%/help/mouse.html
-%%DATADIR%%/help/multimedia.html
-%%DATADIR%%/help/network.html
-%%DATADIR%%/help/page.html
-%%DATADIR%%/help/panels.html
-%%DATADIR%%/help/paths.html
-%%DATADIR%%/help/personal.html
-%%DATADIR%%/help/preferences.html
-%%DATADIR%%/help/privacy.html
-%%DATADIR%%/help/search.html
-%%DATADIR%%/help/security.html
-%%DATADIR%%/help/skin.html
-%%DATADIR%%/help/sounds.html
-%%DATADIR%%/help/start.html
-%%DATADIR%%/help/toc.html
-%%DATADIR%%/help/toolbars.html
-%%DATADIR%%/help/windows.html
 %%DATADIR%%/hhd.ssr
 %%DATADIR%%/html40_entities.dtd
 %%DATADIR%%/images/background.gif
@@ -74,9 +38,11 @@ bin/opera-devel
 %%DATADIR%%/ini/unix_keyboard.ini
 %%DATADIR%%/java/opera.jar
 %%DATADIR%%/java/opera.policy
+%%DATADIR%%/jsconsole.html
 %%DATADIR%%/lngcode.txt
 %%DATADIR%%/locale/en/default.adr
 %%DATADIR%%/locale/en/lngcode.txt
+%%DATADIR%%/locale/en/license.txt
 %%DATADIR%%/locale/en/search.ini
 %%DATADIR%%/locale/english.lng
 %%DATADIR%%/opera6.adr
@@ -126,7 +92,6 @@ bin/opera-devel
 @dirrm %%DATADIR%%/java
 @dirrm %%DATADIR%%/ini
 @dirrm %%DATADIR%%/images
-@dirrm %%DATADIR%%/help
 @dirrm %%DATADIR%%/config
 @dirrm %%DATADIR%%/bin
 @dirrm %%DATADIR%%