Update to 9.60 and unbreak it

Changelog: http://www.opera.com/docs/changelogs/freebsd/960/
Security: http://www.opera.com/docs/changelogs/freebsd/960/#sec

PR:		ports/127941
Submitted by:	Arjan van Leeuwen
Security:	http://www.vuxml.org/freebsd/fb84d5dd-9528-11dd-9a00-001999392805.html

2 files changed, 27 insertions, 31 deletions

diff --git a/www/opera-linuxplugins/Makefile b/www/opera-linuxplugins/Makefile
index e9a65d9802b5..af76e94a8cb7 100644
--- a/www/opera-linuxplugins/Makefile
+++ b/www/opera-linuxplugins/Makefile
@@ -7,51 +7,47 @@
 
 PORTNAME=	opera
 PORTVERSION=	${OPERA_VER}.${OPERA_DATE}
-PORTREVISION=	2
 CATEGORIES=	www linux
-MASTER_SITES=	ftp://opera.inode.at/linux/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/i386/static/ \
-		http://gd.tuwien.ac.at/infosys/browsers/opera/linux/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/i386/static/ \
-		http://ftp.ucr.ac.cr/WWW/opera/linux/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/i386/static/ \
-		http://www.microrpm.ca/pub/opera/linux/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/i386/static/ \
-		http://www.opera.mirroarrr.de/linux/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/i386/static/ \
-		http://opera.eurenet.net/linux/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/i386/static/ \
-		ftp://opera.ftp.fu-berlin.de/linux/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/i386/static/ \
-		http://ftp.ntua.gr/pub/www/Opera/linux/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/i386/static/ \
-		ftp://ftp.wayne.edu/opera/linux/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/i386/static/ \
-		http://mirrors.dedipower.com/opera/linux/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/i386/static/ \
-		ftp://ftp.mirror.ac.uk/sites/ftp.opera.com/linux/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/i386/static/ \
-		http://opera.nedmirror.nl/linux/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/i386/static/ \
-		ftp://ftp.tiscali.nl/pub/mirrors/opera/linux/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/i386/static/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/opera/linux/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/i386/static/&,} \
-		ftp://ftp.opera.com/pub/opera/linux/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/i386/static/
+MASTER_SITES=	ftp://opera.inode.at/linux/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/i386/shared/ \
+		http://gd.tuwien.ac.at/infosys/browsers/opera/linux/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/i386/shared/ \
+		http://ftp.ucr.ac.cr/WWW/opera/linux/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/i386/shared/ \
+		http://www.microrpm.ca/pub/opera/linux/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/i386/shared/ \
+		http://www.opera.mirroarrr.de/linux/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/i386/shared/ \
+		http://opera.eurenet.net/linux/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/i386/shared/ \
+		ftp://opera.ftp.fu-berlin.de/linux/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/i386/shared/ \
+		http://ftp.ntua.gr/pub/www/Opera/linux/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/i386/shared/ \
+		ftp://ftp.wayne.edu/opera/linux/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/i386/shared/ \
+		http://mirrors.dedipower.com/opera/linux/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/i386/shared/ \
+		ftp://ftp.mirror.ac.uk/sites/ftp.opera.com/linux/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/i386/shared/ \
+		http://opera.nedmirror.nl/linux/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/i386/shared/ \
+		ftp://ftp.tiscali.nl/pub/mirrors/opera/linux/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/i386/shared/ \
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/opera/linux/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/i386/shared/&,} \
+		ftp://ftp.opera.com/pub/opera/linux/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/i386/shared/
 PKGNAMESUFFIX=	-linuxplugins
-DISTNAME=	${PORTNAME}-${OPERA_VER}-${OPERA_DATE}.1-static-qt.i386-en
+DISTNAME=	${PORTNAME}-${OPERA_VER}.gcc3-shared-qt3.i386
 
 MAINTAINER=	freebsd-maintainer@opera.com
 COMMENT=	Linux plugin support for the native Opera browser
 
-RUN_DEPENDS=	${LOCALBASE}/share/opera/plugins/libnpp.so:${PORTSDIR}/www/opera
+RUN_DEPENDS=	${LOCALBASE}/share/opera/bin/operapluginwrapper:${PORTSDIR}/www/opera
 
-BROKEN=		does not build
-
-OPERA_VER=	9.21
+OPERA_VER=	9.60
 OPERA_MINVER=
 OPERA_REL=	final
-OPERA_DATE=	20070510
-OPERA_BUILD=	641
+OPERA_DATE=	20081004
+OPERA_BUILD=	2444
 
 USE_BZIP2=	yes
 USE_LINUX=	yes
 USE_XLIB=	yes
-ONLY_FOR_ARCHS=	i386
-WRKSRC=		${WRKDIR}/${DISTNAME}-${OPERA_BUILD}
+ONLY_FOR_ARCHS=	i386 amd64
+WRKSRC=		${WRKDIR}/${PORTNAME}-${OPERA_VER}-${OPERA_BUILD}.gcc3-shared-qt3.i386
 
 NO_BUILD=	yes
 
-PLIST_FILES=	share/opera/bin/operapluginwrapper share/opera/bin/libnpp.so
+PLIST_FILES=	share/opera/bin/operapluginwrapper.linux
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/plugins/operapluginwrapper ${PREFIX}/share/opera/bin
-	${CP} ${LOCALBASE}/share/opera/plugins/libnpp.so ${PREFIX}/share/opera/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/usr/lib/opera/${OPERA_VER}/operapluginwrapper ${PREFIX}/share/opera/bin/operapluginwrapper.linux
 
 .include <bsd.port.mk>
diff --git a/www/opera-linuxplugins/distinfo b/www/opera-linuxplugins/distinfo
index 5b4cffaac443..75c20996ed0a 100644
--- a/www/opera-linuxplugins/distinfo
+++ b/www/opera-linuxplugins/distinfo
@@ -1,3 +1,3 @@
-MD5 (opera-9.21-20070510.1-static-qt.i386-en.tar.bz2) = 42e3039163f7bbfd49119860cfac60d0
-SHA256 (opera-9.21-20070510.1-static-qt.i386-en.tar.bz2) = fdf6766a0408d7030f7a930576fd70aff78e2b66fe2bbe8ca1af8da4bace95cd
-SIZE (opera-9.21-20070510.1-static-qt.i386-en.tar.bz2) = 6785626
+MD5 (opera-9.60.gcc3-shared-qt3.i386.tar.bz2) = 2020395b8422e881e77928b586519bf8
+SHA256 (opera-9.60.gcc3-shared-qt3.i386.tar.bz2) = c45586665b317bb1dcc590b891df371d602db2d044da55f2f623388a35bbd2b5
+SIZE (opera-9.60.gcc3-shared-qt3.i386.tar.bz2) = 7165845