Pullup ticket 921 - requested by Lubomir Sedlacik

security update for opera

Revisions pulled up:
- pkgsrc/www/opera/Makefile	1.43-1.47
- pkgsrc/www/opera/distinfo	1.12

   Module Name:    pkgsrc
   Committed By:   rillig
   Date:           Wed Sep 28 12:33:10 UTC 2005

   Modified Files:
           pkgsrc/www/opera: Makefile

   Log Message:
   Fixed pkglint warnings.
---
   Module Name:    pkgsrc
   Committed By:   rillig
   Date:           Wed Sep 28 14:00:51 UTC 2005

   Modified Files:
           pkgsrc/www/opera: Makefile

   Log Message:
   Removed trailing white-space. Don't use the expanded RCS Id when
   regenerating the distinfo file.
---
   Module Name:    pkgsrc
   Committed By:   jdolecek
   Date:           Sun Oct 30 20:30:34 UTC 2005

   Modified Files:
           pkgsrc/www/opera: Makefile

   Log Message:
   claim MAINTAINER
---
   Module Name:    pkgsrc
   Committed By:   jdolecek
   Date:           Tue Nov 22 20:07:13 UTC 2005

   Modified Files:
           pkgsrc/www/opera: Makefile distinfo

   Log Message:
   Update opera to latest 8.51. Updates are security fixes for:

           http://secunia.com/advisories/16907/
           http://secunia.com/advisories/17437/

   as well as multiple stability fixes.
---
   Module Name:    pkgsrc
   Committed By:   jdolecek
   Date:           Tue Nov 22 22:14:51 UTC 2005

   Modified Files:
           pkgsrc/www/opera: Makefile

   Log Message:
   panix.com doesn't seem to mirror opera anymore, remove from the list

   pointed out by Zafer Aydogan in private e-mail

2 files changed, 22 insertions, 23 deletions

diff --git a/www/opera/Makefile b/www/opera/Makefile
index 5ea0e64bae5..1afcf772543 100644
--- a/www/opera/Makefile
+++ b/www/opera/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.42 2005/09/22 21:50:03 jdolecek Exp $
+# $NetBSD: Makefile,v 1.42.2.1 2005/11/25 20:59:30 snj Exp $
 
 DISTNAME=	opera-${OPERA_PKG_VERSION:S/u/pl/}
-PKGREVISION=	# empty
 CATEGORIES=	www
-MASTER_SITES=	http://www.panix.com/opera/files/${OPERA_DIR}/ \
-		ftp://ftp.hu-berlin.de/pub/www/opera/${OPERA_DIR}/ \
+MASTER_SITES=	ftp://ftp.hu-berlin.de/pub/www/opera/${OPERA_DIR}/ \
 		http://ftp.sunet.se/pub/www/clients/Opera/${OPERA_DIR}/ \
 		ftp://ftp.task.gda.pl/pub/opera/${OPERA_DIR}/ \
 		ftp://ftp.tuwien.ac.at/infosys/browsers/opera/${OPERA_DIR}/ \
@@ -12,7 +10,7 @@ MASTER_SITES=	http://www.panix.com/opera/files/${OPERA_DIR}/ \
 		ftp://ftp.opera.com/pub/opera/${OPERA_DIR}/
 DISTFILES=	opera-${OPERA_DIST_VERSION}${OPERA_ARCH}-${OPERA_LANG}${EXTRACT_SUFX}
 
-MAINTAINER=	tech-pkg@NetBSD.org
+MAINTAINER=	jdolecek@NetBSD.org
 HOMEPAGE=	http://www.opera.com/
 COMMENT=	Small, fast and customizable WWW client
 
@@ -29,9 +27,9 @@ USE_LANGUAGES=          # empty
 .include "../../mk/bsd.prefs.mk"
 
 OPERA_LANG=		en
-OPERA_VER_DATE=		20050916
-OPERA_PKG_VERSION=	8.50
-OPERA_PKG_VERSION_DIR=	850
+OPERA_VER_DATE=		20051114
+OPERA_PKG_VERSION=	8.51
+OPERA_PKG_VERSION_DIR=	851
 
 _OPERA_OPSYS?=		${OPSYS}
 _OPERA_MACHINE_ARCH?=	${MACHINE_ARCH}
@@ -46,7 +44,7 @@ PLIST_SRC=	${WRKDIR}/PLIST_DYNAMIC
 
 EXTRACT_SUFX=		.rpm
 OPERA_ARCH=		.i386
-OPERA_DIR=		linux/${OPERA_PKG_VERSION_DIR}/final/${OPERA_LANG}/${OPERA_ARCH:S/.//}/static
+OPERA_DIR=		linux/${OPERA_PKG_VERSION_DIR}/final/${OPERA_LANG}/${OPERA_ARCH:S/.//}
 OPERA_DIST_VERSION=	${OPERA_PKG_VERSION:C/beta.*//:C/u.*//}-${OPERA_VER_DATE}.1-static-qt
 
 RPMFILES=	${DISTFILES}
@@ -54,7 +52,7 @@ RPM2PKGSTRIP=	0
 
 .elif (${_OPERA_OPSYS} == FreeBSD)
 OPERA_ARCH=		.i386.freebsd
-OPERA_DIR=		unix/freebsd/${OPERA_PKG_VERSION_DIR}/final/${OPERA_LANG}/shared/gcc-2.95
+OPERA_DIR=		unix/freebsd/${OPERA_PKG_VERSION_DIR}/final/${OPERA_LANG}
 OPERA_DIST_VERSION=	${OPERA_PKG_VERSION:C/u.*//}-${OPERA_VER_DATE}.1-static-qt
 
 WRKSRC=			${WRKDIR}/opera-${OPERA_DIST_VERSION}${OPERA_ARCH}-${OPERA_LANG}
@@ -64,7 +62,7 @@ OWN_DIRS=		${PREFIX}/share/opera/plugins
 .elif (${_OPERA_OPSYS} == SunOS) && (${_OPERA_MACHINE_ARCH} == sparc)
 EXTRACT_SUFX=		.tar.bz2
 OPERA_ARCH=		-sol8-sparc-local
-OPERA_DIR=		unix/solaris/${OPERA_PKG_VERSION_DIR}/final/${OPERA_LANG}/static
+OPERA_DIR=		unix/solaris/${OPERA_PKG_VERSION_DIR}/final/${OPERA_LANG}
 OPERA_DIST_VERSION=	${OPERA_PKG_VERSION:C/u.*//}-${OPERA_VER_DATE}.1-static-qt
 
 WRKSRC=			${WRKDIR}/opera-${OPERA_DIST_VERSION}${OPERA_ARCH}-${OPERA_LANG}
@@ -136,7 +134,8 @@ post-install:
 
 # regenerate distinfo for all ports supported by this package
 opera-distinfo:
-	( ${ECHO} '$$NetBSD: Makefile,v 1.42 2005/09/22 21:50:03 jdolecek Exp $$'; ${ECHO} ''; \
+	( ${ECHO} '$$'NetBSD'$$'; \
+	  ${ECHO} ''; \
 	_OPERA_OPSYS=NetBSD ${MAKE} distinfo 1>&2; \
 		${GREP} opera distinfo; \
 	_OPERA_OPSYS=FreeBSD ${MAKE} distinfo 1>&2; \
@@ -145,5 +144,5 @@ opera-distinfo:
 		${GREP} opera distinfo; \
 	) > distinfo.new
 	${MV} -f distinfo.new distinfo
-	
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/opera/distinfo b/www/opera/distinfo
index f0d3c58bd94..5bfb009ba3d 100644
--- a/www/opera/distinfo
+++ b/www/opera/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.11 2005/09/20 19:36:13 jdolecek Exp $
+$NetBSD: distinfo,v 1.11.2.1 2005/11/25 20:59:30 snj Exp $
 
-SHA1 (./opera-8.50-20050916.1-static-qt.i386-en.rpm) = c92b1321b609721e236f612e25c800f64d0e226a
-RMD160 (./opera-8.50-20050916.1-static-qt.i386-en.rpm) = 398a2735478d80c852fa608683863ea26bfa68e7
-Size (./opera-8.50-20050916.1-static-qt.i386-en.rpm) = 6254807 bytes
-SHA1 (opera-8.50-20050916.1-static-qt.i386.freebsd-en.tar.gz) = cff2893edb8c0cd1f8a0dfda63b6f29b8adc9fed
-RMD160 (opera-8.50-20050916.1-static-qt.i386.freebsd-en.tar.gz) = cbc4a62546ebf85dbb8c326ead2f969a6ea9b069
-Size (opera-8.50-20050916.1-static-qt.i386.freebsd-en.tar.gz) = 6173657 bytes
-SHA1 (opera-8.50-20050916.1-static-qt-sol8-sparc-local-en.tar.bz2) = 60808f66a9d16f6dc96307a302c13402da998b6f
-RMD160 (opera-8.50-20050916.1-static-qt-sol8-sparc-local-en.tar.bz2) = fba4fadf549f8d2c0ccb04726a12490e3b202117
-Size (opera-8.50-20050916.1-static-qt-sol8-sparc-local-en.tar.bz2) = 6999850 bytes
+SHA1 (./opera-8.51-20051114.1-static-qt.i386-en.rpm) = 01859308f6f0f13a4783ed7da3cde79c8d694ee9
+RMD160 (./opera-8.51-20051114.1-static-qt.i386-en.rpm) = b6359c6f11f21e7aad52c3073d3785b6751f34fe
+Size (./opera-8.51-20051114.1-static-qt.i386-en.rpm) = 6263309 bytes
+SHA1 (opera-8.51-20051114.1-static-qt.i386.freebsd-en.tar.gz) = 43584769651e61f336a754ca1eaf78df088a41c6
+RMD160 (opera-8.51-20051114.1-static-qt.i386.freebsd-en.tar.gz) = 91126108387b42f0337a1f2ebcb8034e67210c2c
+Size (opera-8.51-20051114.1-static-qt.i386.freebsd-en.tar.gz) = 6181029 bytes
+SHA1 (opera-8.51-20051114.1-static-qt-sol8-sparc-local-en.tar.bz2) = f4ac2072caeb9cc5df5416f7842a90ed7214f6f6
+RMD160 (opera-8.51-20051114.1-static-qt-sol8-sparc-local-en.tar.bz2) = b6e2c15a72f9d6b99930bba1438f86658133e5e0
+Size (opera-8.51-20051114.1-static-qt-sol8-sparc-local-en.tar.bz2) = 6999893 bytes