- Update to 10.00 Apha-1. Changes: http://www.opera.com/browser/next/

-bring it more close to www/opera

Approved by:	maintainer (implicit)

4 files changed, 72 insertions, 57 deletions

diff --git a/www/opera-devel/Makefile b/www/opera-devel/Makefile
index 7d253abeaab1..7f767b3d501a 100644
--- a/www/opera-devel/Makefile
+++ b/www/opera-devel/Makefile
@@ -6,44 +6,29 @@
 #
 
 PORTNAME=	opera
-PORTVERSION=	${OPERA_VER}.${OPERA_DATE}
-PORTREVISION=	1
+PORTVERSION=	${OPERA_VER}
 CATEGORIES=	www ipv6
-MASTER_SITES=	ftp://opera.inode.at/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
-		http://gd.tuwien.ac.at/infosys/browsers/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
-		http://ftp.ucr.ac.cr/WWW/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
-		http://www.microrpm.ca/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
-		http://www.opera.mirroarrr.de/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
-		http://opera.eurenet.net/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
-		ftp://opera.ftp.fu-berlin.de/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
-		http://ftp.ntua.gr/pub/www/Opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
-		ftp://ftp.wayne.edu/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
-		http://mirrors.dedipower.com/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
-		ftp://ftp.mirror.ac.uk/sites/ftp.opera.com/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
-		http://opera.nedmirror.nl/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
-		ftp://ftp.tiscali.nl/pub/mirrors/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/&,} \
-		ftp://ftp.opera.com/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
+MASTER_SITES=	http://snapshot.opera.com/${MASTER_SITES_VER_PATH} \
 		http://T32.TecNik93.com/FreeBSD/others_ports/${PORTNAME}${PKGNAMESUFFIX}/sources/
 PKGNAMESUFFIX=	-devel
-DISTNAME=	${PORTNAME}-${OPERA_VER}${OPERA_MINVER}-${OPERA_DATE}.${OPERA_TYPE}-shared-qt.${ARCH}.freebsd
+DISTNAME=	${PORTNAME}-${OPERA_VER}0-${OPERA_BUILD}.freebsd${OPERA_TYPE}-shared-qt3.${ARCH}
 
 MAINTAINER=	freebsd-maintainer@opera.com
 COMMENT=	Blazingly fast, full-featured, standards-compliant browser, devel version
 
-IGNORE=		- please use www/opera, it's newer for now
-
-OPERA_VER=	9.50
-OPERA_MINVER=	b2
+OPERA_VER=	10.0
+OPERA_MINVER=	Alpha-1
 OPERA_REL=	final
-OPERA_DATE=	20080422
-OPERA_BUILD=	1933
+#OPERA_DATE=	20080422
+OPERA_BUILD=	4102
+MASTER_SITES_VER_PATH=	unix/${OPERA_VER}-${OPERA_MINVER}/${OPERA_ARCH}-freebsd/
+WRKSRC=		${WRKDIR}/${DISTNAME}
+#${OPERA_REL}/en/${OPERA_LIB}/
 
 DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
 
 USE_BZIP2=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-${OPERA_VER}-${OPERA_DATE}.${OPERA_TYPE}-shared-qt.${ARCH}.freebsd-${OPERA_BUILD}
 USE_QT_VER=	3
 
 NO_BUILD=	yes
@@ -52,38 +37,43 @@ OPTIONS=	ASPELL	"Use the aspell library for spell checking"	on
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 600000
+OPERA_ARCH=	${ARCH:S,i386,intel,}
 ONLY_FOR_ARCHS=	i386 amd64
-.else
-ONLY_FOR_ARCHS=	i386
-.endif
-
-.if ${ARCH} == amd64
-OPERA_LIB=	amd64
-.else
-OPERA_LIB=	shared
-.endif
-
 .if ${OSVERSION} >= 700000
 OPERA_TYPE=	7
 .elif ${OSVERSION} >= 600000
-.if ${ARCH} == amd64
-OPERA_TYPE=	1
-.else
-OPERA_TYPE=	4
-.endif
+OPERA_TYPE=	6
 .else
-OPERA_TYPE=	3
+IGNORE= is only supported on FreeBSD 6.x and higher
 .endif
 
+#MASTER_SITES_VER_PATH=  unix/${OPERA_VER}-${OPERA_MINVER}/${OPERA_ARCH}-freebsd/
+#WRKSRC=         ${WRKDIR}/${DISTNAME}
+#DISTNAME=       ${PORTNAME}-${OPERA_VER}0-${OPERA_BUILD}.freebsd${OPERA_TYPE}-shared-qt3.${ARCH}
+
 .if !defined(WITHOUT_ASPELL)
 LIB_DEPENDS+=	aspell.16:${PORTSDIR}/textproc/aspell
 .endif
 
 do-install:
 	@(cd ${WRKSRC} && ./install.sh --prefix=${PREFIX} --docdir=${DOCSDIR} --sharedir=${DATADIR} --exec_prefix=${DATADIR}/bin --plugindir=${DATADIR}/plugins)
+	@${CP} ${DATADIR}/bin/operapluginwrapper ${DATADIR}/bin/operapluginwrapper.freebsd
+	@${INSTALL_SCRIPT} ${PATCHDIR}/operapluginwrapper ${DATADIR}/bin
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
+# maintainer
+make-distinfo:
+	@(for _arch in ${ONLY_FOR_ARCHS}; do \
+	  for _osver in 600000 700000; do \
+	    echo "generating distinfo for $${_arch} $${_osver}"; \
+	      cd ${.CURDIR} && \
+	        make ARCH=$${_arch} OSVERSION=$${_osver} makesum && \
+	        mv distinfo distinfo.$${_arch}.$${_osver}; \
+	  done \
+	done && \
+	cat distinfo.* > distinfo && rm distinfo.*)
+
+
 .include <bsd.port.post.mk>
diff --git a/www/opera-devel/distinfo b/www/opera-devel/distinfo
index ba38a7fe34d7..8aa885f25087 100644
--- a/www/opera-devel/distinfo
+++ b/www/opera-devel/distinfo
@@ -1,15 +1,12 @@
-MD5 (opera-9.50b2-20080422.3-shared-qt.i386.freebsd.tar.bz2) = bb0c80d0a0a7ebfa75edc0c3a6bc8088
-SHA256 (opera-9.50b2-20080422.3-shared-qt.i386.freebsd.tar.bz2) = a13ad2bddb5bde702d7d964791c345c08b6c46bc8a9d5406830e1f665ec5420d
-SIZE (opera-9.50b2-20080422.3-shared-qt.i386.freebsd.tar.bz2) = 5796100
-MD5 (opera-9.50b2-20080422.4-shared-qt.i386.freebsd.tar.bz2) = 4416c3e77a4f8f052f987c8f221c52f0
-SHA256 (opera-9.50b2-20080422.4-shared-qt.i386.freebsd.tar.bz2) = d309d0c0bb0289232e41c6e82c26bfe7ce7ae4036869812826a35f57f5ea3391
-SIZE (opera-9.50b2-20080422.4-shared-qt.i386.freebsd.tar.bz2) = 5797946
-MD5 (opera-9.50b2-20080422.7-shared-qt.i386.freebsd.tar.bz2) = e901027bd053d6ce935ee90b08c961a6
-SHA256 (opera-9.50b2-20080422.7-shared-qt.i386.freebsd.tar.bz2) = 88d3a368d585e986e04931a5843e861214fdb91538177d657e16130b98271bb0
-SIZE (opera-9.50b2-20080422.7-shared-qt.i386.freebsd.tar.bz2) = 5673371
-MD5 (opera-9.50b2-20080422.1-shared-qt.amd64.freebsd.tar.bz2) = b20a87dbf6ca63226c28b9206f288765
-SHA256 (opera-9.50b2-20080422.1-shared-qt.amd64.freebsd.tar.bz2) = 763612270901a410db5085e1dd225aa23aea7bec8177813e3f468c820dc2cdb7
-SIZE (opera-9.50b2-20080422.1-shared-qt.amd64.freebsd.tar.bz2) = 6274070
-MD5 (opera-9.50b2-20080422.7-shared-qt.amd64.freebsd.tar.bz2) = adb4e8675bd5ea8a11b3679665f6c103
-SHA256 (opera-9.50b2-20080422.7-shared-qt.amd64.freebsd.tar.bz2) = 5d97f5445152c978cb134da1a801ebdcc2fa56037034718e87aca01aa04f8080
-SIZE (opera-9.50b2-20080422.7-shared-qt.amd64.freebsd.tar.bz2) = 6198726
+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
+MD5 (opera-10.00-4102.freebsd7-shared-qt3.amd64.tar.bz2) = 5eb659a6bab84d9f0d740df1c00cf1d0
+SHA256 (opera-10.00-4102.freebsd7-shared-qt3.amd64.tar.bz2) = 89e6b9dcdea893afb59d9574fd0c73f4cb637bacf01c98a99a8b6be06bef3c83
+SIZE (opera-10.00-4102.freebsd7-shared-qt3.amd64.tar.bz2) = 6824596
+MD5 (opera-10.00-4102.freebsd6-shared-qt3.i386.tar.bz2) = 67f7fae2fc7ed7ffb3627e4533535b7e
+SHA256 (opera-10.00-4102.freebsd6-shared-qt3.i386.tar.bz2) = a26d5912947409a00440722ee764879966e28729ae1d7cb5be39d45196215027
+SIZE (opera-10.00-4102.freebsd6-shared-qt3.i386.tar.bz2) = 6426496
+MD5 (opera-10.00-4102.freebsd7-shared-qt3.i386.tar.bz2) = 85f236285948d7cf7c7c4f130d093435
+SHA256 (opera-10.00-4102.freebsd7-shared-qt3.i386.tar.bz2) = 34950ad3299149c6023bf6d6d4f8d68f0ba03315f9d1d2c82fb265864d88fc43
+SIZE (opera-10.00-4102.freebsd7-shared-qt3.i386.tar.bz2) = 6265192
diff --git a/www/opera-devel/files/operapluginwrapper b/www/opera-devel/files/operapluginwrapper
new file mode 100644
index 000000000000..fcec17e85d80
--- /dev/null
+++ b/www/opera-devel/files/operapluginwrapper
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+if [ -n "$5" ]; then
+	ELFTYPE=`brandelf $5`
+elif [ -n "$4" ]; then
+	ELFTYPE=`brandelf $4`
+elif [ -n "$3" ]; then
+	ELFTYPE=`brandelf $3`
+fi
+
+WRAPPER="freebsd"
+
+case "${ELFTYPE}" in
+	*SVR4*|*Linux*)
+		if [ -x "$0.linux" ]; then
+			WRAPPER="linux"
+		fi
+	;;
+esac
+
+exec $0.$WRAPPER $@
+
diff --git a/www/opera-devel/pkg-plist b/www/opera-devel/pkg-plist
index 66de67148064..fee9437843b4 100644
--- a/www/opera-devel/pkg-plist
+++ b/www/opera-devel/pkg-plist
@@ -10,6 +10,7 @@ bin/opera-devel
 %%DATADIR%%/java/opera.jar
 %%DATADIR%%/bin/works
 %%DATADIR%%/bin/operapluginwrapper
+%%DATADIR%%/bin/operapluginwrapper.freebsd
 %%DATADIR%%/bin/missingsyms.so
 %%DATADIR%%/bin/spellcheck.so
 %%DATADIR%%/bin/operaplugincleaner
@@ -21,6 +22,8 @@ bin/opera-devel
 %%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
@@ -75,11 +78,14 @@ bin/opera-devel
 %%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