update to 7.50.

PR:		66628
Submitted by:	maintainer

4 files changed, 56 insertions, 36 deletions

diff --git a/www/opera/Makefile b/www/opera/Makefile
index bce392c220bd..5a91d94cd60d 100644
--- a/www/opera/Makefile
+++ b/www/opera/Makefile
@@ -6,26 +6,36 @@
 #
 
 PORTNAME=	opera
-PORTVERSION=	7.23.20031119
-PORTREVISION=	1
+PORTVERSION=	${OPERA_VER}.${OPERA_DATE}
 CATEGORIES=	www
-MASTER_SITES=	ftp://ftp.sunet.se/pub/www/clients/Opera/unix/freebsd/723/final/en/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/opera/unix/freebsd/723/final/en/ \
-		ftp://ftp.tiscali.nl/pub/mirrors/opera/unix/freebsd/723/final/en/ \
-		ftp://ftp.ntua.gr/pub/www/Opera/unix/freebsd/723/final/en/ \
-		http://mirrors.pmmf.hu/mirror/opera/unix/freebsd/723/final/en/ \
-		ftp://ftp.task.gda.pl/pub/opera/unix/freebsd/723/final/en/ \
-		ftp://ftp.planetmirror.com/pub/opera/unix/freebsd/723/final/en/ \
-		http://gd.tuwien.ac.at/infosys/browsers/opera/unix/freebsd/723/final/en/ \
-		ftp://ftp.opera.com/pub/opera/unix/freebsd/723/final/en/
-
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/3./3-/}.1-static-qt.i386.freebsd-en
+MASTER_SITES=	http://ftp.scarlet.be/pub/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/ \
+		ftp://ftp.planetmirror.com/pub/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/ \
+		http://www.mehok.uni-miskolc.hu/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/ \
+		ftp://ftp.heanet.ie/pub/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/ \
+		ftp://opera.nsc.no/pub/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/ \
+		http://ftp.task.gda.pl/pub/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/ \
+		ftp://ftp.idilis.ro/mirrors/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/ \
+		http://www.fastmirrors.org/pub/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/ \
+		http://ftp.sunet.se/pub/www/clients/Opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/ \
+		ftp://mirror.switch.ch/mirror/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/ \
+		ftp://ftp.tiscali.nl/pub/mirrors/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/ \
+		http://ftp.ankara.edu.tr/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/ \
+		ftp://files.downloadthat.com/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/ \
+		ftp://ftp.opera.com/pub/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/
+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.50
+OPERA_REL=	final
+OPERA_DATE=	20040511
+
 CONFLICTS=	linux-opera-*
 
+DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
+
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
@@ -41,33 +51,33 @@ LIB_DEPENDS+=	c_r.4:${PORTSDIR}/misc/compat4x
 .endif
 
 .if exists(/etc/X11/applnk)
-PLIST_SUB+=	APPLNK:=""
+PLIST_SUB+=	APPLNK=""
 .else
-PLIST_SUB+=	APPLNK:="@comment "
+PLIST_SUB+=	APPLNK="@comment "
 .endif
 
 .if exists(${X11BASE}/share/gnome)
-PLIST_SUB+=	GNOME:=""
+PLIST_SUB+=	GNOME=""
 .else
-PLIST_SUB+=	GNOME:="@comment "
+PLIST_SUB+=	GNOME="@comment "
 .endif
 
 .if exists(${X11BASE}/share/applnk/Internet)
-PLIST_SUB+=	KDE:=""
+PLIST_SUB+=	KDE=""
 .else
-PLIST_SUB+=	KDE:="@comment "
+PLIST_SUB+=	KDE="@comment "
 .endif
 
 .if exists(${X11BASE}/share/applnk/Networking)
-PLIST_SUB+=	KDE2:=""
+PLIST_SUB+=	KDE2=""
 .else
-PLIST_SUB+=	KDE2:="@comment "
+PLIST_SUB+=	KDE2="@comment "
 .endif
 
 .if exists(${X11BASE}/share/gnome/apps)
-PLIST_SUB+=	GNOMELNK:=""
+PLIST_SUB+=	GNOMELNK=""
 .else
-PLIST_SUB+=	GNOMELNK:="@comment "
+PLIST_SUB+=	GNOMELNK="@comment "
 .endif
 
 post-patch:
diff --git a/www/opera/distinfo b/www/opera/distinfo
index 1da94083424d..a4202c263adf 100644
--- a/www/opera/distinfo
+++ b/www/opera/distinfo
@@ -1,2 +1,2 @@
-MD5 (opera-7.23-20031119.1-static-qt.i386.freebsd-en.tar.bz2) = cb838b40b70e42481ee0c159539d10c7
-SIZE (opera-7.23-20031119.1-static-qt.i386.freebsd-en.tar.bz2) = 4732147
+MD5 (opera-7.50-20040511.1-static-qt.i386.freebsd-en.tar.bz2) = 1438a8708cfc8cda9ae9e14c1fc72dd9
+SIZE (opera-7.50-20040511.1-static-qt.i386.freebsd-en.tar.bz2) = 4754897
diff --git a/www/opera/pkg-message b/www/opera/pkg-message
index e7596af789c9..c0fcaa719210 100644
--- a/www/opera/pkg-message
+++ b/www/opera/pkg-message
@@ -4,5 +4,10 @@ If you are upgrading from version 6, it is recommended to backup your personal
 first time. This can be done from the command line using 
 "mv ~/.opera ~/.opera-mybackup".
 
+If you have installed the www/opera-devel port before, and you'd like to keep
+the settings and bookmarks you used in opera-devel, move the opera-devel 
+personal directory like this:
+"mv ~/.opera-devel ~/.opera"
+
 If you are running FreeBSD 5.x and are experiencing a core dump when starting
 Opera, try updating the compat4x port.
diff --git a/www/opera/pkg-plist b/www/opera/pkg-plist
index db3ec42e3184..cba785a7bda1 100644
--- a/www/opera/pkg-plist
+++ b/www/opera/pkg-plist
@@ -1,15 +1,17 @@
+@comment $FreeBSD$
 bin/opera
 %%DOCSDIR%%/LICENSE
 %%DOCSDIR%%/help
-%%DATADIR%%/bin/m2.so
 %%DATADIR%%/bin/missingsyms.so
 %%DATADIR%%/bin/opera
+%%DATADIR%%/bin/spellcheck.so
 %%DATADIR%%/bin/works
 %%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
@@ -30,6 +32,7 @@ bin/opera
 %%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
@@ -42,6 +45,7 @@ bin/opera
 %%DATADIR%%/help/toc.html
 %%DATADIR%%/help/toolbars.html
 %%DATADIR%%/help/windows.html
+%%DATADIR%%/hhd.ssr
 %%DATADIR%%/images/background.gif
 %%DATADIR%%/images/blank.gif
 %%DATADIR%%/images/drive.gif
@@ -60,7 +64,9 @@ bin/opera
 %%DATADIR%%/images/startup2.png
 %%DATADIR%%/ini/dialog.ini
 %%DATADIR%%/ini/fastforward.ini
-%%DATADIR%%/ini/minimal_toolbar.ini
+%%DATADIR%%/ini/filehandler.ini
+%%DATADIR%%/ini/pluginpath.ini
+%%DATADIR%%/ini/spellcheck.ini
 %%DATADIR%%/ini/standard_keyboard.ini
 %%DATADIR%%/ini/standard_menu.ini
 %%DATADIR%%/ini/standard_mouse.ini
@@ -70,9 +76,10 @@ bin/opera
 %%DATADIR%%/java/opera.policy
 %%DATADIR%%/jsconsole.html
 %%DATADIR%%/lngcode.txt
-%%DATADIR%%/locale/english.lng
 %%DATADIR%%/locale/en/default.adr
+%%DATADIR%%/locale/en/lngcode.txt
 %%DATADIR%%/locale/en/search.ini
+%%DATADIR%%/locale/english.lng
 %%DATADIR%%/opera6.adr
 %%DATADIR%%/plugins/libnpp.so
 %%DATADIR%%/plugins/operamotifwrapper
@@ -107,7 +114,6 @@ bin/opera
 %%DATADIR%%/styles/user/textonly.css
 %%DATADIR%%/styles/user/userstyle.ini
 %%DATADIR%%/styles/wml.css
-%%DATADIR%%/hhd.ssr
 @dirrm %%DATADIR%%/styles/user
 @dirrm %%DATADIR%%/styles
 @dirrm %%DATADIR%%/skin
@@ -122,10 +128,9 @@ bin/opera
 @dirrm %%DATADIR%%/bin
 @dirrm %%DATADIR%%
 @dirrm %%DOCSDIR%%
-
-%%KDE:%%share/applnk/Internet/opera.desktop
-%%KDE2:%%share/applnk/Networking/WWW/opera.desktop
-%%GNOMELNK:%%share/gnome/apps/Internet/opera.desktop
-%%GNOME:%%share/gnome/pixmaps/opera.xpm
-%%KDE2:%%@dirrm share/applnk/Networking/WWW
-%%APPLNK:%%applnk/Internet/opera.desktop
+%%KDE%%share/applnk/Internet/opera.desktop
+%%KDE2%%share/applnk/Networking/WWW/opera.desktop
+%%GNOMELNK%%share/gnome/apps/Internet/opera.desktop
+%%GNOME%%share/gnome/pixmaps/opera.xpm
+%%KDE2%%@dirrm share/applnk/Networking/WWW
+%%APPLNK%%applnk/Internet/opera.desktop