From oyvind@kebab.gaffel.nu  Wed Dec  4 11:45:10 2002
Return-Path: <oyvind@kebab.gaffel.nu>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 46EF237B401
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  4 Dec 2002 11:45:10 -0800 (PST)
Received: from kebab.gaffel.nu (kebab.gaffel.nu [217.8.138.140])
	by mx1.FreeBSD.org (Postfix) with SMTP id A856B43E9C
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  4 Dec 2002 11:45:08 -0800 (PST)
	(envelope-from oyvind@kebab.gaffel.nu)
Received: (qmail 99012 invoked by uid 1000); 4 Dec 2002 19:44:57 -0000
Message-Id: <20021204194457.99011.qmail@kebab.gaffel.nu>
Date: 4 Dec 2002 19:44:57 -0000
From: "yvind" Kolbu <oyvind@kebab.gaffel.nu>
Reply-To: "yvind" Kolbu <oyvind@kebab.gaffel.nu>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Update www/opera to 6.11 and add shared qt support.
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         45993
>Category:       ports
>Synopsis:       Update www/opera to 6.11 and add shared qt support.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    des
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Dec 04 11:50:01 PST 2002
>Closed-Date:    Tue Mar 11 11:42:02 PST 2003
>Last-Modified:  Tue Mar 11 11:42:02 PST 2003
>Originator:     yvind Kolbu
>Release:        FreeBSD 4.7-RC i386
>Organization:
>Environment:
System: FreeBSD kebab.gaffel.nu 4.7-RC FreeBSD 4.7-RC #0: Sat Sep 21 18:13:10 CEST 2002 oyvind@kebab.gaffel.nu:/usr/obj/usr/src/sys/kebab i386


>Description:
        Update www/opera to 6.11 and add shared qt support.
        This PR superseeds: ports/45986 and ports/44804.
>How-To-Repeat:
        Use the attached patch.
>Fix:

--- opera-diff begins here ---
diff -ruN /usr/ports/www/opera/Makefile opera/Makefile
--- /usr/ports/www/opera/Makefile	Mon Dec  2 18:10:41 2002
+++ opera/Makefile	Wed Dec  4 20:18:54 2002
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	opera
-PORTVERSION=	6.10.20021029
+PORTVERSION=	6.11.20021129
 CATEGORIES=	www
-MASTER_SITES=	http://opera.online.no/unix/freebsd/610/final/en/static/ \
-		ftp://ftp.opera.com/pub/opera/unix/freebsd/610/final/en/static/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/10./10-/}.1-static-qt.i386.freebsd
+MASTER_SITES=	http://opera.online.no/unix/freebsd/611/final/en/${QT_TYPE}/ \
+		ftp://ftp.opera.com/pub/opera/unix/freebsd/611/final/en/${QT_TYPE}/
+DISTNAME?=	${PORTNAME}-${PORTVERSION:S/11./11-/}.1-static-qt.i386.freebsd
 
 MAINTAINER=	des@FreeBSD.org
 
@@ -23,13 +23,29 @@
 NO_BUILD=	yes
 NO_FILTER_SHLIBS=yes
 
-do-install:
-	(cd ${WRKSRC} && ${SH} install.sh --prefix="${PREFIX}")
+.ifdef(WITH_SHARED_QT)
+USE_QT_VER=	3
+.endif
 
 .include <bsd.port.pre.mk>
 
+pre-everything::
+.ifndef(WITH_SHARED_QT)
+	@${ECHO_CMD} '===> To install opera with shared QT, instead'
+	@${ECHO_CMD} '===> of the default static QT, hit CTRL+C now'
+	@${ECHO_CMD} '===> and define WITH_SHARED_QT'
+DISTNAME=       ${PORTNAME}-${PORTVERSION:S/11./11-/}.1-static-qt.i386.freebsd
+QT_TYPE=        static
+.else
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/11./11-/}.2-shared-qt.i386.freebsd
+QT_TYPE=	shared/gcc-2.95
+.endif
+
 .if ${OSVERSION} >= 500000
 LIB_DEPENDS+=	c_r.4:${PORTSDIR}/misc/compat4x
 .endif
+
+do-install:
+	(cd ${WRKSRC} && ${SH} install.sh --prefix="${PREFIX}")
 
 .include <bsd.port.post.mk>
diff -ruN /usr/ports/www/opera/distinfo opera/distinfo
--- /usr/ports/www/opera/distinfo	Tue Nov 12 22:19:09 2002
+++ opera/distinfo	Wed Dec  4 20:10:19 2002
@@ -1 +1,2 @@
-MD5 (opera-6.10-20021029.1-static-qt.i386.freebsd.tar.bz2) = ebe4f8439b504dad07d48093ebbe297e
+MD5 (opera-6.11-20021129.1-static-qt.i386.freebsd.tar.bz2) = 22ae9d276d28fa7d6b435d061c79f287
+MD5 (opera-6.11-20021129.2-shared-qt.i386.freebsd.tar.bz2) = 6c674b4fda8c53e0d2d80fa2b7329804
--- opera-diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports->des 
Responsible-Changed-By: lioux 
Responsible-Changed-When: Wed Dec 4 11:54:12 PST 2002 
Responsible-Changed-Why:  
Over to maintainer(s) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=45993 
State-Changed-From-To: open->suspended 
State-Changed-By: des 
State-Changed-When: Tue Dec 10 23:18:14 PST 2002 
State-Changed-Why:  
Shared version will not be supported at this time. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=45993 
State-Changed-From-To: suspended->closed 
State-Changed-By: des 
State-Changed-When: Tue Mar 11 11:42:01 PST 2003 
State-Changed-Why:  
The shared version cannot be used because of C++ ABI issues. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=45993 
>Unformatted:
