4 files changed, 47 insertions, 55 deletions

diff --git a/www/opera-devel/Makefile b/www/opera-devel/Makefile
index 7b219ab8c41b..5b6b9c0f9fc6 100644
--- a/www/opera-devel/Makefile
+++ b/www/opera-devel/Makefile
@@ -16,8 +16,8 @@ MAINTAINER=	avleeuwen@piwebs.com
 COMMENT=	A blazingly fast, full-featured, standards-compliant browser
 
 OPERA_VER=	7.60
-OPERA_REL=	Preview-3
-OPERA_DATE=	20041115
+OPERA_REL=	Preview-4
+OPERA_DATE=	20041203
 
 DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
diff --git a/www/opera-devel/distinfo b/www/opera-devel/distinfo
index bc9f13837b40..0c3c2de9b101 100644
--- a/www/opera-devel/distinfo
+++ b/www/opera-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (opera-7.60-20041115.1-static-qt.i386.freebsd-en.tar.bz2) = 71d1fcc6653e8a34245a68898ec441ef
-SIZE (opera-7.60-20041115.1-static-qt.i386.freebsd-en.tar.bz2) = 4826611
+MD5 (opera-7.60-20041203.1-static-qt.i386.freebsd-en.tar.bz2) = 75b452a0417d14c56098799b878911d1
+SIZE (opera-7.60-20041203.1-static-qt.i386.freebsd-en.tar.bz2) = 4854660
diff --git a/www/opera-devel/files/patch-ini::pluginpath.ini b/www/opera-devel/files/patch-ini::pluginpath.ini
index 43602382d5a3..5e5a871f544a 100644
--- a/www/opera-devel/files/patch-ini::pluginpath.ini
+++ b/www/opera-devel/files/patch-ini::pluginpath.ini
@@ -1,57 +1,50 @@
---- ini/pluginpath.ini.orig	Tue Nov 16 21:21:24 2004
-+++ ini/pluginpath.ini	Wed Nov 17 00:21:34 2004
-@@ -1,38 +1,16 @@
--Opera Preferences version 2.0

--; Do not edit this file while Opera is running

--; This file is stored in UTF-8 encoding

--

--[Paths]

--$PWD/plugins=1

--$HOME/.opera/plugins=1

--/usr/lib/opera/plugins=1

--/usr/lib/opera/plugins=1

--/usr/local/lib/opera/plugins=1

--/opt/lib/opera/plugins=1

--

--; Adobe Acrobat

--/usr/local/Acrobat5/Browsers/intellinux=1

--/usr/local/Acrobat4/Browsers/intellinux=1

--/usr/lib/Acrobat5/Browsers/intellinux=1

--/usr/lib/Acrobat4/Browsers/intellinux=1

--/usr/X11R6/lib/Acrobat5/Browsers/intellinux=1

--/usr/X11R6/lib/Acrobat4/Browsers/intellinux=1

--/opt/Acrobat5/Browsers/intellinux=1

--/opt/Acrobat4/Browsers/intellinux=1

--/usr/Acrobat5/Browsers/intellinux=1

--/usr/Acrobat4/Browsers/intellinux=1

--

--; Realplayer

--/usr/lib/RealPlayer8/Plugins=1

--/usr/lib/realplay/plugins=1

--/usr/lib/RealPlayer8=1

--/usr/lib/realplay=1

--

--; Netscape Plug-in Paths

--$HOME/.netscape6/plugins=1

--$HOME/.netscape/plugins=1

--/opt/netscape/plugins=1

--/usr/lib/netscape/plugins=1

--/usr/local/netscape/plugins=1

--/usr/local/lib/netscape/plugins=1

--$HOME/.kde/.konqueror/nsplugins=1

-+Opera Preferences version 2.0
-+; Do not edit this file while Opera is running
-+; This file is stored in UTF-8 encoding
-+
-+[Paths]
-+$HOME/.opera/plugins=1
+--- ini/pluginpath.ini.orig	Fri Dec  3 11:21:10 2004
++++ ini/pluginpath.ini	Fri Dec  3 22:55:00 2004
+@@ -3,40 +3,15 @@
+ ; This file is stored in UTF-8 encoding
+ 
+ [Paths]
+-$PWD/plugins=1
+ $HOME/.opera/plugins=1
+-/usr/lib/opera/plugins=1
+-/usr/lib/opera/plugins=1
+-/usr/local/lib/opera/plugins=1
+-/opt/lib/opera/plugins=1
 +%%PREFIX%%/share/opera/plugins=1
 +%%LOCALBASE%%/share/opera/plugins=1
-+
+ 
+-; Adobe Acrobat
+-/usr/local/Acrobat5/Browsers/intellinux=1
+-/usr/local/Acrobat4/Browsers/intellinux=1
+-/usr/lib/Acrobat5/Browsers/intellinux=1
+-/usr/lib/Acrobat4/Browsers/intellinux=1
+-/usr/X11R6/lib/Acrobat5/Browsers/intellinux=1
+-/usr/X11R6/lib/Acrobat4/Browsers/intellinux=1
+-/opt/Acrobat5/Browsers/intellinux=1
+-/opt/Acrobat4/Browsers/intellinux=1
+-/usr/Acrobat5/Browsers/intellinux=1
+-/usr/Acrobat4/Browsers/intellinux=1
 +%%LOCALBASE%%/Acrobat5/Browsers/intellinux=1
 +%%LOCALBASE%%/Acrobat4/Browsers/intellinux=1
-+
+ 
+-; Realplayer
+-/usr/lib/RealPlayer8/Plugins=1
+-/usr/lib/realplay/plugins=1
+-/usr/lib/RealPlayer8=1
+-/usr/lib/realplay=1
+-
+-; Netscape Plug-in Paths
+-$HOME/.netscape6/plugins=1
 +%%LOCALBASE%%/lib/RealPlayer8/Plugins=1
 +%%X11BASE%%/lib/browser_plugins=1
-+$HOME/.netscape/plugins=1
+ $HOME/.netscape/plugins=1
+-/opt/netscape/plugins=1
+-/usr/lib/netscape/plugins=1
+-/usr/local/netscape/plugins=1
+-/usr/local/lib/netscape/plugins=1
+-$HOME/.kde/.konqueror/nsplugins=1
+-
+-[KDE]
+-plugins=$HOME/.kde/share/config/kcmnspluginrc
 +%%LOCALBASE%%/lib/netscape-linux/plugins=1
+ 
diff --git a/www/opera-devel/pkg-plist b/www/opera-devel/pkg-plist
index 9482e9f0bfe7..43933468e474 100644
--- a/www/opera-devel/pkg-plist
+++ b/www/opera-devel/pkg-plist
@@ -74,7 +74,6 @@ bin/opera-devel
 %%DATADIR%%/ini/unix_keyboard.ini
 %%DATADIR%%/java/opera.jar
 %%DATADIR%%/java/opera.policy
-%%DATADIR%%/jsconsole.html
 %%DATADIR%%/lngcode.txt
 %%DATADIR%%/locale/en/default.adr
 %%DATADIR%%/locale/en/lngcode.txt