3 files changed, 147 insertions, 99 deletions

diff --git a/www/opera-devel/Makefile b/www/opera-devel/Makefile
index e0abdf804029..24b8558d6a1e 100644
--- a/www/opera-devel/Makefile
+++ b/www/opera-devel/Makefile
@@ -7,23 +7,44 @@
 
 PORTNAME=	opera
 PORTVERSION=	${OPERA_VER}
-PORTREVISION=	1
+#PORTREVISION=	1
 CATEGORIES=	www ipv6
-MASTER_SITES=	http://snapshot.opera.com/${MASTER_SITES_VER_PATH}/ \
+#MASTER_SITES=	http://snapshot.opera.com/${MASTER_SITES_VER_PATH}/ \
+#		http://T32.TecNik93.com/FreeBSD/others_ports/${PORTNAME}${PKGNAMESUFFIX}/sources/
+MASTER_SITES=	ftp://ftp.opera.com/pub/opera/${MASTER_SITES_VER_PATH} \
+		ftp://opera.inode.at/${MASTER_SITES_VER_PATH} \
+		http://gd.tuwien.ac.at/infosys/browsers/opera/${MASTER_SITES_VER_PATH} \
+		http://ftp.ucr.ac.cr/WWW/opera/${MASTER_SITES_VER_PATH} \
+		http://www.microrpm.ca/pub/opera/${MASTER_SITES_VER_PATH} \
+		http://opera.eurenet.net/${MASTER_SITES_VER_PATH} \
+		ftp://opera.ftp.fu-berlin.de/${MASTER_SITES_VER_PATH} \
+		http://ftp.ntua.gr/pub/www/Opera/${MASTER_SITES_VER_PATH} \
+		ftp://ftp.wayne.edu/opera/${MASTER_SITES_VER_PATH} \
+		http://mirrors.dedipower.com/opera/${MASTER_SITES_VER_PATH} \
+		ftp://ftp.mirror.ac.uk/sites/ftp.opera.com/${MASTER_SITES_VER_PATH} \
+		http://opera.nedmirror.nl/${MASTER_SITES_VER_PATH} \
+		ftp://ftp.tiscali.nl/pub/mirrors/opera/${MASTER_SITES_VER_PATH} \
+		http://mirrors.evolva.ro/opera/${MASTER_SITES_VER_PATH} \
+		http://ftp.iasi.roedu.net/mirrors/ftp.opera.com/${MASTER_SITES_VER_PATH} \
+		http://mirrors.xservers.ro/opera/${MASTER_SITES_VER_PATH} \
 		http://T32.TecNik93.com/FreeBSD/others_ports/${PORTNAME}${PKGNAMESUFFIX}/sources/
+#		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/en/${OPERA_ARCH}/${OPERA_LIB}/&,} \
+#		http://T32.TecNik93.com/FreeBSD/others_ports/${PORTNAME}${PKGNAMESUFFIX}/sources/
 PKGNAMESUFFIX=	-devel
-DISTNAME=	${PORTNAME}-${OPERA_VER}0-${OPERA_BUILD}.freebsd${OPERA_TYPE}-shared-qt3.${ARCH}
+DISTNAME=	${PORTNAME}-${OPERA_VER}.${OPERA_MINVER}-${OPERA_REL}-freebsd${OPERA_TYPE}-${OPERA_LIB}-qt3.${ARCH}
 
 MAINTAINER=	freebsd-maintainer@opera.com
 COMMENT=	Blazingly fast, full-featured, standards-compliant browser, devel version
 
-OPERA_VER=	10.0
-OPERA_MINVER=	Alpha-1
-OPERA_REL=	final
+OPERA_VER=	10
+OPERA_MINVER=	00
+OPERA_REL=	b1
 #OPERA_DATE=	20080422
-OPERA_BUILD=	4102
-MASTER_SITES_VER_PATH=	unix/${OPERA_VER}-${OPERA_MINVER}/${OPERA_ARCH}-freebsd
-WRKSRC=		${WRKDIR}/${DISTNAME}
+OPERA_BUILD=	4402
+MASTER_SITES_VER_PATH=	unix/freebsd/${OPERA_VER}${OPERA_MINVER}${OPERA_REL}/en/${OPERA_ARCH}/${OPERA_LIB}/
+# unix/${OPERA_VER}-${OPERA_MINVER}/${OPERA_ARCH}-freebsd
+WRKSRC=		${WRKDIR}/${PORTNAME}-${OPERA_VER}.${OPERA_MINVER}-${OPERA_BUILD}.freebsd${OPERA_TYPE}-${OPERA_LIB}-qt3.${ARCH}
+#		opera-10.00-4402.freebsd7-shared-qt3.i386
 
 DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
@@ -43,8 +64,10 @@ ONLY_FOR_ARCHS=	i386 amd64
 
 .if ${OSVERSION} >= 700000
 OPERA_TYPE=	7
+OPERA_LIB=	shared
 .else
 OPERA_TYPE=	6
+OPERA_LIB=	shared
 .endif
 
 .if !defined(WITHOUT_ASPELL)
@@ -53,7 +76,7 @@ LIB_DEPENDS+=	aspell.16:${PORTSDIR}/textproc/aspell
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/X11R6/lib/browser_plugins|${LOCALBASE}/lib/browser_plugins/symlinks/opera-devel|g' \
-		${WRKSRC}/usr/local/share/opera/ini/pluginpath.ini
+		${WRKSRC}/usr/local/share/opera/defaults/pluginpath.ini
 
 do-install:
 	@(cd ${WRKSRC} && ./install.sh --prefix=${PREFIX} --docdir=${DOCSDIR} --sharedir=${DATADIR} --exec_prefix=${DATADIR}/bin --plugindir=${DATADIR}/plugins)
diff --git a/www/opera-devel/distinfo b/www/opera-devel/distinfo
index 8aa885f25087..c3c5db0c7843 100644
--- a/www/opera-devel/distinfo
+++ b/www/opera-devel/distinfo
@@ -1,3 +1,15 @@
+MD5 (opera-10.00-b1-freebsd6-shared-qt3.amd64.tar.bz2) = 873d7e686c8497a6dfe6ed1b1fa364a7
+SHA256 (opera-10.00-b1-freebsd6-shared-qt3.amd64.tar.bz2) = d0c6d0b2d290f0eea0c1ad0525eed7018ffb4da6ac581ab992cfc1bdd4824700
+SIZE (opera-10.00-b1-freebsd6-shared-qt3.amd64.tar.bz2) = 7078619
+MD5 (opera-10.00-b1-freebsd7-shared-qt3.amd64.tar.bz2) = 49cb9a24b4184e75ab73623d98977481
+SHA256 (opera-10.00-b1-freebsd7-shared-qt3.amd64.tar.bz2) = bf80a8bbf5df3da8f6c2ea1c48e2e22fd8aa21ef989568f6b4c1ea2a00b1b9d7
+SIZE (opera-10.00-b1-freebsd7-shared-qt3.amd64.tar.bz2) = 6949201
+MD5 (opera-10.00-b1-freebsd6-shared-qt3.i386.tar.bz2) = d412fa9c92e63cb135dd13db712d6bcc
+SHA256 (opera-10.00-b1-freebsd6-shared-qt3.i386.tar.bz2) = 2e1f71d5be0bdc74b588a5342f93297f4a3833ef5af4f4b265eb1839c76e87b3
+SIZE (opera-10.00-b1-freebsd6-shared-qt3.i386.tar.bz2) = 6562944
+MD5 (opera-10.00-b1-freebsd7-shared-qt3.i386.tar.bz2) = 28aa688f8b27bf52571b90ca01372b9a
+SHA256 (opera-10.00-b1-freebsd7-shared-qt3.i386.tar.bz2) = 7c326de7d3d9f124f0a4dcfa1b25eea6ecb7066b299e6f9c48f00bdbbe88f983
+SIZE (opera-10.00-b1-freebsd7-shared-qt3.i386.tar.bz2) = 6381047
 MD5 (opera-10.00-4102.freebsd6-shared-qt3.amd64.tar.bz2) = 04b6293cce261d15f4e28fef56e0d896
 SHA256 (opera-10.00-4102.freebsd6-shared-qt3.amd64.tar.bz2) = 53f9f681ee228b0ad0f6d4329f6ff717aff2c133bed1c61b10a6008035692098
 SIZE (opera-10.00-4102.freebsd6-shared-qt3.amd64.tar.bz2) = 6937398
diff --git a/www/opera-devel/pkg-plist b/www/opera-devel/pkg-plist
index fee9437843b4..bbb7ac41f078 100644
--- a/www/opera-devel/pkg-plist
+++ b/www/opera-devel/pkg-plist
@@ -1,109 +1,122 @@
 bin/opera-devel
-%%DATADIR%%/svg-mo.dat
-%%DATADIR%%/skin/windows_skin.zip
-%%DATADIR%%/skin/standard_skin.zip
-%%DATADIR%%/opera6.adr
-%%DATADIR%%/svg-se.dat
-%%DATADIR%%/html40_entities.dtd
-%%DATADIR%%/svg-sebd.dat
-%%DATADIR%%/java/opera.policy
-%%DATADIR%%/java/opera.jar
-%%DATADIR%%/bin/works
+%%DATADIR%%/bin/missingsyms.so
+%%DATADIR%%/bin/opera
+%%DATADIR%%/bin/operaplugincleaner
 %%DATADIR%%/bin/operapluginwrapper
 %%DATADIR%%/bin/operapluginwrapper.freebsd
-%%DATADIR%%/bin/missingsyms.so
 %%DATADIR%%/bin/spellcheck.so
-%%DATADIR%%/bin/operaplugincleaner
-%%DATADIR%%/bin/opera
-%%DATADIR%%/styles/im.css
-%%DATADIR%%/styles/mime.css
-%%DATADIR%%/styles/warning.css
+%%DATADIR%%/bin/works
+%%DATADIR%%/defaults/bookmarks.adr
+%%DATADIR%%/defaults/feedreaders.ini
+%%DATADIR%%/defaults/filehandler.ini
+%%DATADIR%%/defaults/font.ini
+%%DATADIR%%/defaults/license.txt
+%%DATADIR%%/defaults/mailproviders.xml
+%%DATADIR%%/defaults/pluginpath.ini
+%%DATADIR%%/defaults/search.ini
+%%DATADIR%%/defaults/standard_speeddial.ini
+%%DATADIR%%/defaults/standard_trusted_repositories.ini
+%%DATADIR%%/defaults/webmailproviders.ini
+%%DATADIR%%/defaults/xmlentities.ini
+%%DATADIR%%/encoding.bin
+%%DATADIR%%/extra/missingplugin.svg
+%%DATADIR%%/extra/svg-mo.dat
+%%DATADIR%%/extra/svg-mobd.dat
+%%DATADIR%%/extra/svg-sa.dat
+%%DATADIR%%/extra/svg-sabd.dat
+%%DATADIR%%/extra/svg-se.dat
+%%DATADIR%%/extra/svg-sebd.dat
+%%DATADIR%%/html40_entities.dtd
+%%DATADIR%%/java/opera.jar
+%%DATADIR%%/java/opera.policy
+%%DATADIR%%/lngcode.txt
+%%DATADIR%%/locale/en-GB
+%%DATADIR%%/locale/en-GB/en-GB.lng
+%%DATADIR%%/locale/en/bookmarks.adr
+%%DATADIR%%/locale/en/en.lng
+%%DATADIR%%/locale/en/en.zip
+%%DATADIR%%/locale/en/license.txt
+%%DATADIR%%/locale/en/search.ini
+%%DATADIR%%/locale/en/standard_speeddial.ini
+%%DATADIR%%/scripts/common.js
+%%DATADIR%%/scripts/substance.js
+%%DATADIR%%/skin/standard_skin.zip
+%%DATADIR%%/styles/about.css
+%%DATADIR%%/styles/cache.css
 %%DATADIR%%/styles/certinfo.css
+%%DATADIR%%/styles/config.css
+%%DATADIR%%/styles/contentblock.css
+%%DATADIR%%/styles/debug.css
+%%DATADIR%%/styles/dir.css
 %%DATADIR%%/styles/error.css
-%%DATADIR%%/styles/cache.css
-%%DATADIR%%/styles/plugins.css
-%%DATADIR%%/styles/unstyledxml.css
-%%DATADIR%%/styles/webfeeds.html
-%%DATADIR%%/styles/user/toc.css
-%%DATADIR%%/styles/user/disableforms.css
-%%DATADIR%%/styles/user/disablebreaks.css
-%%DATADIR%%/styles/user/disablepositioning.css
-%%DATADIR%%/styles/user/disablefloats.css
-%%DATADIR%%/styles/user/altdebugger.css
-%%DATADIR%%/styles/user/structuretables.css
-%%DATADIR%%/styles/user/classid.css
-%%DATADIR%%/styles/user/structureblock.css
-%%DATADIR%%/styles/user/outline.css
-%%DATADIR%%/styles/user/disabletables.css
-%%DATADIR%%/styles/user/contrastwb.css
-%%DATADIR%%/styles/user/tablelayout.css
-%%DATADIR%%/styles/user/structureinline.css
-%%DATADIR%%/styles/user/contrastbw.css
-%%DATADIR%%/styles/user/accessibility.css
-%%DATADIR%%/styles/wml.css
 %%DATADIR%%/styles/history.css
-%%DATADIR%%/styles/images/red_right.png
-%%DATADIR%%/styles/images/flag.png
-%%DATADIR%%/styles/images/defaultFavicon.png
-%%DATADIR%%/styles/images/root.png
-%%DATADIR%%/styles/images/folder.png
-%%DATADIR%%/styles/images/red_left.png
-%%DATADIR%%/styles/images/darkBox.png
+%%DATADIR%%/styles/im.css
+%%DATADIR%%/styles/image.css
 %%DATADIR%%/styles/images/bar.png
-%%DATADIR%%/styles/images/smartGroup.png
 %%DATADIR%%/styles/images/center.png
-%%DATADIR%%/styles/images/top.png
-%%DATADIR%%/styles/images/section.png
 %%DATADIR%%/styles/images/customize.gif
+%%DATADIR%%/styles/images/darkBox.png
+%%DATADIR%%/styles/images/defaultFavicon.png
+%%DATADIR%%/styles/images/flag.png
+%%DATADIR%%/styles/images/folder.png
 %%DATADIR%%/styles/images/opera.png
 %%DATADIR%%/styles/images/red_center.png
-%%DATADIR%%/styles/config.css
-%%DATADIR%%/styles/search.css
-%%DATADIR%%/styles/message.css
-%%DATADIR%%/styles/dir.css
+%%DATADIR%%/styles/images/red_left.png
+%%DATADIR%%/styles/images/red_right.png
+%%DATADIR%%/styles/images/root.png
+%%DATADIR%%/styles/images/section.png
+%%DATADIR%%/styles/images/smartGroup.png
+%%DATADIR%%/styles/images/top.png
 %%DATADIR%%/styles/info.css
 %%DATADIR%%/styles/mathml.css
-%%DATADIR%%/styles/contentblock.css
-%%DATADIR%%/styles/about.css
-%%DATADIR%%/styles/image.css
-%%DATADIR%%/encoding.bin
-%%DATADIR%%/lngcode.txt
-%%DATADIR%%/ini/xmlentities.ini
-%%DATADIR%%/ini/unix_keyboard.ini
-%%DATADIR%%/ini/font.ini
-%%DATADIR%%/ini/filehandler.ini
-%%DATADIR%%/ini/standard_keyboard_compat.ini
-%%DATADIR%%/ini/mailproviders.xml
-%%DATADIR%%/ini/pluginpath.ini
-%%DATADIR%%/ini/dialog.ini
-%%DATADIR%%/ini/standard_mouse.ini
-%%DATADIR%%/ini/fastforward.ini
-%%DATADIR%%/ini/speeddial_default.ini
-%%DATADIR%%/ini/standard_menu.ini
-%%DATADIR%%/ini/standard_toolbar.ini
-%%DATADIR%%/ini/standard_keyboard.ini
-%%DATADIR%%/svg-sa.dat
-%%DATADIR%%/search.ini
-%%DATADIR%%/locale/en/en_US.dic
-%%DATADIR%%/locale/en/en_US.aff
-%%DATADIR%%/locale/en/license.txt
-%%DATADIR%%/locale/en/opera6.adr
-%%DATADIR%%/locale/en/search.ini
-%%DATADIR%%/locale/english.lng
-%%DATADIR%%/svg-mobd.dat
-%%DATADIR%%/svg-sabd.dat
+%%DATADIR%%/styles/message.css
+%%DATADIR%%/styles/mime.css
+%%DATADIR%%/styles/plugins.css
+%%DATADIR%%/styles/search.css
+%%DATADIR%%/styles/unstyledxml.css
+%%DATADIR%%/styles/user/accessibility.css
+%%DATADIR%%/styles/user/altdebugger.css
+%%DATADIR%%/styles/user/classid.css
+%%DATADIR%%/styles/user/contrastbw.css
+%%DATADIR%%/styles/user/contrastwb.css
+%%DATADIR%%/styles/user/disablebreaks.css
+%%DATADIR%%/styles/user/disablefloats.css
+%%DATADIR%%/styles/user/disableforms.css
+%%DATADIR%%/styles/user/disablepositioning.css
+%%DATADIR%%/styles/user/disabletables.css
+%%DATADIR%%/styles/user/outline.css
+%%DATADIR%%/styles/user/structureblock.css
+%%DATADIR%%/styles/user/structureinline.css
+%%DATADIR%%/styles/user/structuretables.css
+%%DATADIR%%/styles/user/tablelayout.css
+%%DATADIR%%/styles/user/toc.css
+%%DATADIR%%/styles/warning.css
+%%DATADIR%%/styles/webfeeds.html
+%%DATADIR%%/styles/wml.css
+%%DATADIR%%/ui/dialog.ini
+%%DATADIR%%/ui/fastforward.ini
+%%DATADIR%%/ui/standard_keyboard.ini
+%%DATADIR%%/ui/standard_keyboard_compat.ini
+%%DATADIR%%/ui/standard_menu.ini
+%%DATADIR%%/ui/standard_mouse.ini
+%%DATADIR%%/ui/standard_toolbar.ini
+%%DATADIR%%/ui/standard_trusted_repositories.ini
+%%DATADIR%%/ui/unix_keyboard.ini
 %%DOCSDIR%%/LGPL
 %%DOCSDIR%%/LICENSE
-
-@dirrm %%DATADIR%%/styles/user
-@dirrm %%DATADIR%%/styles/images
-@dirrm %%DATADIR%%/styles
-@dirrm %%DATADIR%%/skin
-@dirrm %%DATADIR%%/plugins
+@dirrm %%DATADIR%%/bin
+@dirrm %%DATADIR%%/defaults
+@dirrm %%DATADIR%%/extra
+@dirrm %%DATADIR%%/java
 @dirrm %%DATADIR%%/locale/en
+@dirrm %%DATADIR%%/locale/en-GB
 @dirrm %%DATADIR%%/locale
-@dirrm %%DATADIR%%/java
-@dirrm %%DATADIR%%/ini
-@dirrm %%DATADIR%%/bin
+@dirrm %%DATADIR%%/plugins
+@dirrm %%DATADIR%%/scripts
+@dirrm %%DATADIR%%/skin
+@dirrm %%DATADIR%%/styles/images
+@dirrm %%DATADIR%%/styles/user
+@dirrm %%DATADIR%%/styles
+@dirrm %%DATADIR%%/ui
 @dirrm %%DATADIR%%
 @dirrm %%DOCSDIR%%