--2oS5YaxWCcQjTEyO
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Hi folks, 

Opera has removed the banners from its browser in the new Opera 8.50, but
pkgsrc still has an older version (8.02), with ads.  In attachment are two
diffs to upgrade the www/opera package to 8.50.  They fix two minor pkglint
nits, too.  

Also, the Opera license has changed (there is no license fee anymore), so
I've included a new opera-license file in attachment as well.  

Can this still go in pkgsrc-2005Q3?  

	Geert

--2oS5YaxWCcQjTEyO
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="Makefile.diff"

--- www/opera/Makefile	2005-08-07 11:20:01.000000000 +0200
+++ www/opera/Makefile	2005-09-20 11:34:35.000000000 +0200
@@ -29,9 +29,9 @@
 .include "../../mk/bsd.prefs.mk"
 
 OPERA_LANG=		en
-OPERA_VER_DATE=		20050727
-OPERA_PKG_VERSION=	8.02
-OPERA_PKG_VERSION_DIR=	802
+OPERA_VER_DATE=		20050916
+OPERA_PKG_VERSION=	8.50
+OPERA_PKG_VERSION_DIR=	850
 
 _OPERA_OPSYS?=		${OPSYS}
 _OPERA_MACHINE_ARCH?=	${MACHINE_ARCH}
@@ -137,7 +137,7 @@
 
 # regenerate distinfo for all ports supported by this package
 opera-distinfo:
-	( echo '$$NetBSD: Makefile,v 1.40 2005/08/05 22:04:04 jdolecek Exp $$'; echo ''; \
+	( ${ECHO} '$$NetBSD: Makefile,v 1.40 2005/08/05 22:04:04 jdolecek Exp $$'; ${ECHO} ''; \
 	_OPERA_OPSYS=NetBSD ${MAKE} distinfo 1>&2; \
 		${GREP} opera distinfo; \
 	_OPERA_OPSYS=FreeBSD ${MAKE} distinfo 1>&2; \
@@ -146,5 +146,5 @@
 		${GREP} opera distinfo; \
 	) > distinfo.new
 	${MV} -f distinfo.new distinfo
-	
+
 .include "../../mk/bsd.pkg.mk"

--2oS5YaxWCcQjTEyO
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="distinfo.diff"

--- www/opera/distinfo	2005-08-07 11:20:01.000000000 +0200
+++ www/opera/distinfo	2005-09-20 11:31:26.000000000 +0200
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.10 2005/08/05 22:04:04 jdolecek Exp $
+$NetBSD$
 
-SHA1 (./opera-8.02-20050727.1-static-qt.i386-en.rpm) = 0eee4da3d585019341a93aab7ddbe7a6ff71af33
-RMD160 (./opera-8.02-20050727.1-static-qt.i386-en.rpm) = ce9b14d5470fe3228ba8c8c25ea3eb8a7cd33df5
-Size (./opera-8.02-20050727.1-static-qt.i386-en.rpm) = 6299286 bytes
-SHA1 (opera-8.02-20050727.1-static-qt.i386.freebsd-en.tar.bz2) = e9f2c188e660a12117342aa45e8399b82a301435
-RMD160 (opera-8.02-20050727.1-static-qt.i386.freebsd-en.tar.bz2) = 6375368dea9b8ec9198c8d8aa62807470966423f
-Size (opera-8.02-20050727.1-static-qt.i386.freebsd-en.tar.bz2) = 5607429 bytes
-SHA1 (opera-8.02-20050727.1-static-qt-sol8-sparc-local-en.tar.bz2) = f4ef404012b10aa1acf3e9284388e00fe3985c56
-RMD160 (opera-8.02-20050727.1-static-qt-sol8-sparc-local-en.tar.bz2) = c700f60e4a41de88596cb29471647cca5902fd6e
-Size (opera-8.02-20050727.1-static-qt-sol8-sparc-local-en.tar.bz2) = 7059896 bytes
+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.bz2) = dd04b68a71f59e5c1333d15713bfa1a570c3de87
+RMD160 (opera-8.50-20050916.1-static-qt.i386.freebsd-en.tar.bz2) = 31555e15294511757c7f730e3cee069e49e3bb53
+Size (opera-8.50-20050916.1-static-qt.i386.freebsd-en.tar.bz2) = 5567344 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

--2oS5YaxWCcQjTEyO
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: attachment; filename=opera-license
Content-Transfer-Encoding: 8bit

Opera Browser Information: LICENSE.TXT
===========================================
Copyright (C) Opera Software 1995-2005

IMPORTANT NOTE

The Software, as defined below, is protected by copyright, which is vested in Opera Software ASA/its suppliers.

The Software may only be used in accordance with the terms and conditions set out in this document.

If you do not read and agree to be bound by the terms and conditions defined in this document, you are not permitted to keep or use the Software or in any way whatsoever and must destroy or return all copies of these items which are in your possession.



END USER LICENSE AGREEMENT

DEFINITIONS

The following definitions apply to the terms and conditions included in this Agreement.

Opera
means a Browser, developed by Opera Software ASA, for reading and writing files to and from a network and/or file system.

Software
means Opera, all program and information files and other documentation which are part of the Opera Software package.

Individual
means a particular person.


TERMS OF AGREEMENT

This is a legal agreement between you, the users, and Opera Software ASA. By installing or using this Software, you agree to be bound by the terms of this agreement. If you do not agree to those terms, you may not use or install the Software.

You are entitled to use the Software on all personal computers (laptops/desktops). "Use" means loaded in temporary memory or permanent storage on the computer.

You may not use the Software on non-PC products, devices, or embedded in any other product, including, but not limited to, mobile devices, internet appliances, set top boxes (STB), handhelds, PDAs, phones, web pads, tablets, game consoles, TVs, gaming machines, home automation systems, or any other consumer electronics devices or mobile/cable/satellite/television or closed system based service.


You may not sell, rent, lease or sublicense the Software, without the explicit 
written consent of Opera Software ASA.

The Software is protected by copyright laws and international treaties. 

All intellectual property rights such as but not limited to patents, trademarks, copyrights or trade secret rights related to the Software are the property of and remains vested in Opera Software ASA/its suppliers.

You shall not modify, translate, reverse engineer, decompile or disassemble the Software or any part thereof or otherwise attempt to derive source code or create derivative works therefrom.

You are not allowed to remove, alter or destroy any proprietary, trademark or copyright markings or notices placed upon or contained with the Software.


YOU EXPRESSLY ACKNOWLEDGE AND AGREE THAT USE OF THE SOFTWARE IS AT YOUR OWN RISK AND THAT THE SOFTWARE IS PROVIDED "AS IS" WITHOUT ANY WARRANTIES OR CONDITIONS WHATSOEVER. OPERA SOFTWARE ASA OR ITS SUPPLIERS DO NOT WARRANT THAT THE FUNCTIONS OF THE SOFTWARE WILL MEET YOUR REQUIREMENTS OR THAT THE OPERATION OF THE SOFTWARE WILL BE UNINTERRUPTED OR ERROR FREE. YOU ASSUME RESPONSIBILITY FOR SELECTING THE SOFTWARE TO ACHIEVE YOUR INTENDED RESULTS, AND FOR THE USE AND THE RESULTS OBTAINED FROM THE SOFTWARE.

YOU ACKNOWLEDGE THAT THE SOFTWARE IS NOT INTENDED FOR USE IN (I) ON-LINE CONTROL OF AIRCRAFT, AIR TRAFFIC, AIRCRAFT NAVIGATION OR AIRCRAFT COMMUNICATIONS; OR (II) IN THE DESIGN, CONSTRUCTION, OPERATION OR MAINTENANCE OF ANY NUCLEAR FACILITY.

OPERA SOFTWARE ASA AND ITS SUPPLIERS DISCLAIM ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO WARRANTIES RELATED TO: NON-INFRINGEMENT, LACK OF VIRUSES, ACCURACY OR COMPLETENESS OF RESPONSES OR RESULTS, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE .

IN NO EVENT SHALL OPERA SOFTWARE ASA OR ITS SUPPLIERS BE LIABLE FOR ANY INDIRECT, INCIDENTAL, SPECIAL OR CONSEQUENTIAL DAMAGES OR FOR ANY DAMAGES WHATSOEVER (INCLUDING BUT NOT LIMITED TO DAMAGES FOR LOSS OF BUSINESS PROFITS, BUSINESS INTERRUPTION, LOSS OF BUSINESS INFORMATION, PERSONAL INJURY, LOSS OF PRIVACY OR OTHER PECUNIARY OR OTHER LOSS WHATSOEVER) ARISING OUT OF USE OR INABILITY TO USE THE SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. 

REGARDLESS OF THE FORM OF ACTION, OPERA SOFTWARE ASA AND ITS SUPPLIERS AGGREGATE LIABILITY ARISING OUT OF OR RELATED TO THIS AGREEMENT SHALL NOT EXCEED THE TOTAL AMOUNT PAYABLE BY YOU UNDER THIS AGREEMENT.  THE FOREGOING LIMITATIONS, EXCLUSIONS AND DISCLAIMERS SHALL APPLY TO THE MAXIMUM EXTENT ALLOWED BY APPLICABLE LAW.

The Software may be subject to export or import regulations, and the user agrees to comply strictly with all such laws and regulations. The user agrees not to export or re-export the Software or any part thereof or information pertaining thereto to any country for which a U.S. government agency requires an export license or other governmental approval without first obtaining such license or approval.

Notice to U.S. Government Users: The Software and any associated documentation are "Commercial Items," as that term is defined at 48 C.F.R. 2.101, consisting of "Commercial Computer Software" and "Commercial Computer Software Documentation," as such terms are used in 48 C.F.R. 12.212 or 48 C.F.R. 227.7202, as applicable. Consistent with 48 C.F.R. 12.212 or 48 C.F.R. 227.7202-1 through 227.7202-4, as applicable, the Commercial Computer Software and Commercial Computer Software Documentation are licensed to U.S. Government end users (a) only as Commercial Items and (b) with only those rights as are granted to all other end users pursuant to the terms and conditions herein.

Privacy statement: Opera Software ASA strives to protect the security and privacy of the users of its products, and will strictly protect the security of the users’ personal information, within the confines of the Opera domain. The Opera Software ASA privacy statement found at <http://www.opera.com/privacy/>, is incorporated in this Agreement by reference.

Any variation to the terms of this Agreement shall only be valid if made in writing by Opera Software ASA.

Any and all disputes arising out of the rights and obligations in this Agreement shall be submitted to ordinary court proceedings. You accept the Oslo City Court as legal venue under this Agreement.
This Agreement shall be governed by Norwegian law.

   ---   ---   ---   ---   ---

Postal enquiries:

Opera Software ASA
Postboks 2648 St. Hanshaugen
NO-0131  OSLO
NORWAY


Office Hours: 9:00am - 4:00pm (+1 GMT) Monday - Friday
Phone:	+47 24 16 40 00
Fax:	+47 24 16 40 01

Please visit our Web site before you send us e-mail. We provide many services to our users that will help us respond to you faster than if we receive e-mail.

Web site:
<http://www.opera.com/>

Contact us:
<http://www.opera.com/contact/>

--2oS5YaxWCcQjTEyO--