ports/58024: Update www/opera to 7.21 final

[avleeuwen at piwebs.com]

>Number:         58024
>Category:       ports
>Synopsis:       Update www/opera to 7.21 final
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Oct 14 11:20:18 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Arjan van Leeuwen
>Release:        FreeBSD 4.8-RELEASE-p3 i386
>Organization:
>Environment:
System: FreeBSD thuis.piwebs.com 4.8-RELEASE-p3 FreeBSD 4.8-RELEASE-p3 #0: Thu Aug 21 11:55:07 CEST 2003 avleeuwen at thuis.piwebs.com:/usr/obj/usr/src/sys/THUIS i386


	
>Description:
This patch updates www/opera to 7.21 Final, and adds a CONFLICTS entry for linux-opera.
>How-To-Repeat:
	
>Fix:

diff -urN /usr/ports/www/opera/Makefile opera/Makefile
--- /usr/ports/www/opera/Makefile	Sat Oct 11 15:56:20 2003
+++ opera/Makefile	Tue Oct 14 20:09:34 2003
@@ -6,15 +6,25 @@
 #
 
 PORTNAME=	opera
-PORTVERSION=	7.21.20031009
+PORTVERSION=	7.21.20031013
 CATEGORIES=	www
-MASTER_SITES=	http://snapshot.opera.com/unix/7.21-Preview-3/intel-freebsd/
+MASTER_SITES=	ftp://ftp.sunet.se/pub/www/clients/Opera/unix/freebsd/721/final/en/static/ \
+		ftp://sunsite.cnlab-switch.ch/mirror/opera/unix/freebsd/721/final/en/static/ \
+		ftp://ftp.tiscali.nl/pub/mirrors/opera/unix/freebsd/721/final/en/static/ \
+		ftp://ftp.ntua.gr/pub/www/Opera/unix/freebsd/721/final/en/static/ \
+		http://mirrors.pmmf.hu/mirror/opera/unix/freebsd/721/final/en/static/ \
+		ftp://ftp.task.gda.pl/pub/opera/unix/freebsd/721/final/en/static/ \
+		ftp://ftp.planetmirror.com/pub/opera/unix/freebsd/721/final/en/static/ \
+		http://gd.tuwien.ac.at/infosys/browsers/opera/unix/freebsd/721/final/en/static/ \
+		ftp://ftp.opera.com/pub/opera/unix/freebsd/721/final/en/static/
+
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/1./1-/}.1-static-qt.i386.freebsd
 
 MAINTAINER=	avleeuwen at piwebs.com
 COMMENT=	A blazingly fast, full-featured, standards-compliant browser
 
 RESTRICTED=	"not redistributable; commercial software"
+CONFLICTS=	linux-opera-*
 
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
 
@@ -61,14 +71,6 @@
 .else
 PLIST_SUB+=	GNOMELNK:="@comment "
 .endif
-
-pre-everything:
-	@${ECHO_MSG} '===> **************************************************'
-	@${ECHO_MSG} '===> NOTE: The native version of Opera can not be'
-	@${ECHO_MSG} '===> installed at the same time as linux-opera. If you'
-	@${ECHO_MSG} '===> already have www/linux-opera installed, we'
-	@${ECHO_MSG} '===> recommend you press Ctrl-C now and deinstall it.'
-	@${ECHO_MSG} '===> **************************************************'
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%X11PREFIX%%|${X11BASE}|g ; \
diff -urN /usr/ports/www/opera/distinfo opera/distinfo
--- /usr/ports/www/opera/distinfo	Sat Oct 11 15:56:20 2003
+++ opera/distinfo	Tue Oct 14 20:02:46 2003
@@ -1 +1 @@
-MD5 (opera-7.21-20031009.1-static-qt.i386.freebsd.tar.bz2) = 344eef0084b211caf70fba28e22ba6b6
+MD5 (opera-7.21-20031013.1-static-qt.i386.freebsd.tar.bz2) = 19719ad86272e0d3493ccc12df055f7b
>Release-Note:
>Audit-Trail:
>Unformatted: