Update to 7.21 final (aka 20031013).

Add more mirrors and CONFLICTS.

PR:		ports/58024
Submitted by:	Arjan van Leeuwen <avleeuwen@piwebs.com> (maintainer)

4 files changed, 26 insertions, 22 deletions

diff --git a/www/opera-devel/Makefile b/www/opera-devel/Makefile
index fbd445189f15..a271e54c3dd0 100644
--- a/www/opera-devel/Makefile
+++ b/www/opera-devel/Makefile
@@ -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@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
 
@@ -62,14 +72,6 @@ PLIST_SUB+=	GNOMELNK:=""
 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 ; \
 		s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/install.sh
diff --git a/www/opera-devel/distinfo b/www/opera-devel/distinfo
index a1175d91a794..69a96c2ba757 100644
--- a/www/opera-devel/distinfo
+++ b/www/opera-devel/distinfo
@@ -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
diff --git a/www/opera/Makefile b/www/opera/Makefile
index fbd445189f15..a271e54c3dd0 100644
--- a/www/opera/Makefile
+++ b/www/opera/Makefile
@@ -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@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
 
@@ -62,14 +72,6 @@ PLIST_SUB+=	GNOMELNK:=""
 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 ; \
 		s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/install.sh
diff --git a/www/opera/distinfo b/www/opera/distinfo
index a1175d91a794..69a96c2ba757 100644
--- a/www/opera/distinfo
+++ b/www/opera/distinfo
@@ -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