-Update both www/opera and www/linux-opera to 7.53.

www/opera:
	- The maintainer has asked me to babysitting this while he's away for
	  vacation. He is gone for about five weeks started last Thursday.
	- Some tweak with the plugins, I have added jdk13 and jdk14 support
	  but I have no idea if they will work since I don't have any FreeBSD
	  4.x to test. Please let me know if there has any issue.
	- Does the spellcheck feature works in FreeBSD 4.x? Please, contract
	  me on this one too. If it works, then I will need to add a dependency
	  of aspell with a new WITHOUT_ASPELL knob.
	- See the changelog for detail:

	  http://www.opera.com/freebsd/changelogs/753/

www/linux-opera:
	- I didn't update it to 7.52, because it still doesn't fix the security
	  and the plugins was broke. The 7.53 has solved all of this to allow
	  me to update it.
	- Please read in pkg-message about the changes of search.ini if you
	  have a custom of it. You will have to edit it or it will not work.
	- See the changelog for detail:

	  7.52 = http://www.opera.com/linux/changelogs/752/
	  7.53 = http://www.opera.com/linux/changelogs/753/

15 files changed, 253 insertions, 164 deletions

diff --git a/www/linux-opera-devel/Makefile b/www/linux-opera-devel/Makefile
index e544c0d9162a..e4c8012d6754 100644
--- a/www/linux-opera-devel/Makefile
+++ b/www/linux-opera-devel/Makefile
@@ -6,21 +6,20 @@
 #
 
 PORTNAME=	opera
-PORTVERSION=	7.51.20040602
-PORTREVISION=	1
+PORTVERSION=	${OPERA_VER}.${OPERA_DATE}
 CATEGORIES=	www linux
-MASTER_SITES=	ftp://ftp.opera.com/pub/opera/linux/751/final/en/i386/static/ \
-		ftp://ftp.sunet.se/pub/www/clients/Opera/linux/751/final/en/i386/static/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/opera/linux/751/final/en/i386/static/ \
-		ftp://ftp.tiscali.nl/pub/mirrors/opera/linux/751/final/en/i386/static/ \
-		ftp://ftp.ntua.gr/pub/www/Opera/linux/751/final/en/i386/static/ \
-		http://mirrors.pmmf.hu/mirror/opera/linux/751/final/en/i386/static/ \
-		ftp://ftp.task.gda.pl/pub/opera/linux/751/final/en/i386/static/ \
-		ftp://ftp.planetmirror.com/pub/opera/linux/751/final/en/i386/static/ \
-		http://gd.tuwien.ac.at/infosys/browsers/opera/linux/751/final/en/i386/static/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/opera/linux/751/final/en/i386/static/&,}
+MASTER_SITES=	ftp://ftp.opera.com/pub/opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \
+		ftp://ftp.sunet.se/pub/www/clients/Opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \
+		ftp://sunsite.cnlab-switch.ch/mirror/opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \
+		ftp://ftp.tiscali.nl/pub/mirrors/opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \
+		ftp://ftp.ntua.gr/pub/www/Opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \
+		http://mirrors.pmmf.hu/mirror/opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \
+		ftp://ftp.task.gda.pl/pub/opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \
+		ftp://ftp.planetmirror.com/pub/opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \
+		http://gd.tuwien.ac.at/infosys/browsers/opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/&,}
 PKGNAMEPREFIX=	linux-
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.2004/-2004/}.1-static-qt.i386-en
+DISTNAME=	${PORTNAME}-${OPERA_VER}-${OPERA_DATE}.1-static-qt.i386-en
 
 MAINTAINER=	mezz@FreeBSD.org
 COMMENT=	A blazingly fast, full-featured, standards-compliant browser
@@ -36,6 +35,8 @@ ONLY_FOR_ARCHS=	i386
 NO_BUILD=	yes
 NO_FILTER_SHLIBS=yes
 
+OPERA_VER=	7.53
+OPERA_DATE=	20040716
 DATADIR=	${PREFIX}/share/${UNIQUENAME}
 DOCSDIR=	${PREFIX}/share/doc/${UNIQUENAME}
 
@@ -77,6 +78,8 @@ post-patch:
 		s|%%LOCALBASE%%|${LOCALBASE}|g ; s|%%X11BASE%%|${X11BASE}|g' \
 			${WRKSRC}/install.sh ${WRKSRC}/ini/pluginpath.ini \
 			${WRKSRC}/ini/spellcheck.ini ${WRKSRC}/config/opera6rc
+	@${FIND} ${WRKSRC} -name '*.orig' -delete
+	@${FIND} ${WRKSRC} -name '*.bak' -delete
 
 do-install:
 	@(cd ${WRKSRC} && ./install.sh \
diff --git a/www/linux-opera-devel/distinfo b/www/linux-opera-devel/distinfo
index a32c6a54fd18..a47366f79101 100644
--- a/www/linux-opera-devel/distinfo
+++ b/www/linux-opera-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (opera-7.51-20040602.1-static-qt.i386-en.tar.bz2) = c3266835c2b8e3b54598775802b4e7eb
-SIZE (opera-7.51-20040602.1-static-qt.i386-en.tar.bz2) = 4852011
+MD5 (opera-7.53-20040716.1-static-qt.i386-en.tar.bz2) = 293ae0b0fb87a5b5fac7ef5572795dc8
+SIZE (opera-7.53-20040716.1-static-qt.i386-en.tar.bz2) = 4870722
diff --git a/www/linux-opera-devel/files/patch-install.sh b/www/linux-opera-devel/files/patch-install.sh
index 97ec647ab316..e3fc1c4b1169 100644
--- a/www/linux-opera-devel/files/patch-install.sh
+++ b/www/linux-opera-devel/files/patch-install.sh
@@ -1,5 +1,5 @@
---- install.sh.orig	Wed Jun  2 05:13:50 2004
-+++ install.sh	Sun Jun  6 01:48:11 2004
+--- install.sh.orig	Fri Jul 16 07:39:52 2004
++++ install.sh	Tue Jul 20 00:34:42 2004
 @@ -758,25 +758,21 @@
  
      debug_msg 0 "in generate_wrapper()"
@@ -134,7 +134,7 @@
      ; do
      if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi
  done
-@@ -1086,7 +1054,7 @@
+@@ -1089,7 +1057,7 @@
      chop "${OPERADESTDIR}" "str_localdirshare"
      chop "${OPERADESTDIR}" "str_localdirplugin"
  
@@ -143,7 +143,7 @@
  
      # Executable
  	debug_msg 1 "Executable"
-@@ -1121,7 +1089,7 @@
+@@ -1124,7 +1092,7 @@
  
  	#cp $cpv $cpf wrapper.sh $wrapper_dir/opera
  	generate_wrapper
@@ -152,16 +152,21 @@
  
      # Documentation
  	debug_msg 1 "Documentation"
-@@ -1155,7 +1123,7 @@
- 	if test -d ini; then
- 	    mkdir $mkdirv $mkdirp $share_dir/ini/
- 	    chmod $chmodv 755 $share_dir/ini
--	    cp $cpv $cpf $cpR ini/* $share_dir/ini/
-+	    cp $cpv $cpf $cpR ini/*.ini $share_dir/ini/
- 	    if test -f $share_dir/ini/pluginpath.ini; then
- 		echo ${str_localdirplugin} >> $share_dir/ini/pluginpath.ini
- 	    fi
-@@ -1255,8 +1223,9 @@
+@@ -1223,13 +1191,6 @@
+ 		plugin_support='yes'
+ 	fi
+ 
+-	if test -f plugins/operamotifwrapper-1
+-	    then
+-		cp $cpv $cpf plugins/operamotifwrapper-1 $plugin_dir/
+-		chmod $chmodv 755 $plugin_dir/operamotifwrapper-1
+-		plugin_support='yes'
+-	fi
+-
+ 	if test -f plugins/operamotifwrapper-2
+ 	    then
+ 		cp $cpv $cpf plugins/operamotifwrapper-2 $plugin_dir/
+@@ -1279,8 +1240,9 @@
  	if test -z "${OPERADESTDIR}"; then
  
  	# System wide configuration files
@@ -172,7 +177,7 @@
  	    echo
  	    echo "System wide configuration files:"
  	    echo "  $config_dir/opera6rc"
-@@ -1268,6 +1237,7 @@
+@@ -1292,6 +1254,7 @@
  		cp $cpv $cpf config/opera6rc $config_dir
  		cp $cpv $cpf config/opera6rc.fixed $config_dir
  	    fi
@@ -180,7 +185,7 @@
  	else
  	    echo
  	    echo "User \"${USERNAME}\" does not have write access to $config_dir"
-@@ -1281,9 +1251,9 @@
+@@ -1305,9 +1268,9 @@
  	icons
  	gnome
  	kde 3
@@ -193,7 +198,7 @@
  
  	fi # OPERADESTDIR
  
-@@ -1328,13 +1298,13 @@
+@@ -1352,13 +1315,13 @@
  {
      # arg1 = location
  
@@ -211,7 +216,7 @@
  Terminal=0
  Type=Application'
  
-@@ -1367,42 +1337,13 @@
+@@ -1391,42 +1354,13 @@
  
      debug_msg 0 "in icons()"
  
@@ -260,16 +265,16 @@
      fi
  }
  
-@@ -1412,72 +1353,36 @@
+@@ -1436,72 +1370,36 @@
  
      debug_msg 1 "in gnome()"
  
 -    if test -d /opt/gnome/; then
-+    if test -d %%X11BASE%%/share/gnome/; then
- 
+-
 -      # /opt/gnome share
 -      if test -d /opt/gnome/share; then
--
++    if test -d %%X11BASE%%/share/gnome/; then
+ 
 -        # /opt/gnome icon
 -        if test ! -d /opt/gnome/share/pixmaps/; then
 -	  if test -w /opt/gnome/share; then
@@ -305,7 +310,7 @@
 -	      generate_desktop /opt/gnome/share/gnome/apps/Networking/WWW
 +          elif test -d %%X11BASE%%/share/gnome/apps/Networking/WWW/; then
 +            if test -w %%X11BASE%%/share/gnome/apps/Networking/WWW; then
-+	     generate_desktop %%X11BASE%%/share/gnome/apps/Networking/WWW
++	      generate_desktop %%X11BASE%%/share/gnome/apps/Networking/WWW
  	    fi
 -	  elif test -w /opt/gnome/share/gnome/apps; then
 -	    mkdir $mkdirv $mkdirp /opt/gnome/share/gnome/apps/Internet/
@@ -355,7 +360,7 @@
     fi
     # Add ximian here
  }
-@@ -1488,39 +1393,31 @@
+@@ -1512,39 +1410,31 @@
  
      debug_msg 1 "in kde()"
  
diff --git a/www/linux-opera-devel/pkg-message b/www/linux-opera-devel/pkg-message
index 1704fa3015f2..ad2d2e6dac4c 100644
--- a/www/linux-opera-devel/pkg-message
+++ b/www/linux-opera-devel/pkg-message
@@ -1,5 +1,5 @@
 ##
-Changelog for 7.51 Final: http://www.opera.com/linux/changelogs/751/
+Changelog for 7.53 Final: http://www.opera.com/linux/changelogs/753/
 
 The name of the the binary, data directory, personal "~/.opera" directory,
 etc., have been renamed from "opera" to "linux-opera." This means that
@@ -10,4 +10,14 @@ toolbars, options, etc., have changed from previous versions, and are not
 recommend to transferred from the old configuration. The mail format will be
 converted to the new format automatically when the new linux-opera is run for
 the first time.
+
+*** IMPORTANT: users with custom search.ini ***
+
+If you have a custom search.ini and you've used opera 7.51 or an earlier
+version before this upgrade, edit ~/.opera/search.ini _before_ running the 
+upgraded Opera for the first time, and change the file version to 4. It should
+look like this:
+
+[Version]
+File Version=4
 ##
diff --git a/www/linux-opera-devel/pkg-plist b/www/linux-opera-devel/pkg-plist
index 420b4c48cdbc..6a34e007f9ae 100644
--- a/www/linux-opera-devel/pkg-plist
+++ b/www/linux-opera-devel/pkg-plist
@@ -9,9 +9,7 @@ share/linux-opera/bin/spellcheck.so
 share/linux-opera/bin/works
 share/linux-opera/chartables.bin
 share/linux-opera/config/opera6rc
-share/linux-opera/config/opera6rc.bak
 share/linux-opera/config/opera6rc.fixed
-share/linux-opera/config/opera6rc.orig
 share/linux-opera/help/advertising.html
 share/linux-opera/help/background.png
 share/linux-opera/help/chat.html
@@ -85,7 +83,7 @@ share/linux-opera/locale/en/search.ini
 share/linux-opera/locale/english.lng
 share/linux-opera/opera6.adr
 share/linux-opera/plugins/libnpp.so
-share/linux-opera/plugins/operamotifwrapper
+share/linux-opera/plugins/operamotifwrapper-2
 share/linux-opera/plugins/operamotifwrapper-3
 share/linux-opera/plugins/operaplugincleaner
 share/linux-opera/search.ini
diff --git a/www/linux-opera/Makefile b/www/linux-opera/Makefile
index e544c0d9162a..e4c8012d6754 100644
--- a/www/linux-opera/Makefile
+++ b/www/linux-opera/Makefile
@@ -6,21 +6,20 @@
 #
 
 PORTNAME=	opera
-PORTVERSION=	7.51.20040602
-PORTREVISION=	1
+PORTVERSION=	${OPERA_VER}.${OPERA_DATE}
 CATEGORIES=	www linux
-MASTER_SITES=	ftp://ftp.opera.com/pub/opera/linux/751/final/en/i386/static/ \
-		ftp://ftp.sunet.se/pub/www/clients/Opera/linux/751/final/en/i386/static/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/opera/linux/751/final/en/i386/static/ \
-		ftp://ftp.tiscali.nl/pub/mirrors/opera/linux/751/final/en/i386/static/ \
-		ftp://ftp.ntua.gr/pub/www/Opera/linux/751/final/en/i386/static/ \
-		http://mirrors.pmmf.hu/mirror/opera/linux/751/final/en/i386/static/ \
-		ftp://ftp.task.gda.pl/pub/opera/linux/751/final/en/i386/static/ \
-		ftp://ftp.planetmirror.com/pub/opera/linux/751/final/en/i386/static/ \
-		http://gd.tuwien.ac.at/infosys/browsers/opera/linux/751/final/en/i386/static/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/opera/linux/751/final/en/i386/static/&,}
+MASTER_SITES=	ftp://ftp.opera.com/pub/opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \
+		ftp://ftp.sunet.se/pub/www/clients/Opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \
+		ftp://sunsite.cnlab-switch.ch/mirror/opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \
+		ftp://ftp.tiscali.nl/pub/mirrors/opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \
+		ftp://ftp.ntua.gr/pub/www/Opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \
+		http://mirrors.pmmf.hu/mirror/opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \
+		ftp://ftp.task.gda.pl/pub/opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \
+		ftp://ftp.planetmirror.com/pub/opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \
+		http://gd.tuwien.ac.at/infosys/browsers/opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/&,}
 PKGNAMEPREFIX=	linux-
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.2004/-2004/}.1-static-qt.i386-en
+DISTNAME=	${PORTNAME}-${OPERA_VER}-${OPERA_DATE}.1-static-qt.i386-en
 
 MAINTAINER=	mezz@FreeBSD.org
 COMMENT=	A blazingly fast, full-featured, standards-compliant browser
@@ -36,6 +35,8 @@ ONLY_FOR_ARCHS=	i386
 NO_BUILD=	yes
 NO_FILTER_SHLIBS=yes
 
+OPERA_VER=	7.53
+OPERA_DATE=	20040716
 DATADIR=	${PREFIX}/share/${UNIQUENAME}
 DOCSDIR=	${PREFIX}/share/doc/${UNIQUENAME}
 
@@ -77,6 +78,8 @@ post-patch:
 		s|%%LOCALBASE%%|${LOCALBASE}|g ; s|%%X11BASE%%|${X11BASE}|g' \
 			${WRKSRC}/install.sh ${WRKSRC}/ini/pluginpath.ini \
 			${WRKSRC}/ini/spellcheck.ini ${WRKSRC}/config/opera6rc
+	@${FIND} ${WRKSRC} -name '*.orig' -delete
+	@${FIND} ${WRKSRC} -name '*.bak' -delete
 
 do-install:
 	@(cd ${WRKSRC} && ./install.sh \
diff --git a/www/linux-opera/distinfo b/www/linux-opera/distinfo
index a32c6a54fd18..a47366f79101 100644
--- a/www/linux-opera/distinfo
+++ b/www/linux-opera/distinfo
@@ -1,2 +1,2 @@
-MD5 (opera-7.51-20040602.1-static-qt.i386-en.tar.bz2) = c3266835c2b8e3b54598775802b4e7eb
-SIZE (opera-7.51-20040602.1-static-qt.i386-en.tar.bz2) = 4852011
+MD5 (opera-7.53-20040716.1-static-qt.i386-en.tar.bz2) = 293ae0b0fb87a5b5fac7ef5572795dc8
+SIZE (opera-7.53-20040716.1-static-qt.i386-en.tar.bz2) = 4870722
diff --git a/www/linux-opera/files/patch-install.sh b/www/linux-opera/files/patch-install.sh
index 97ec647ab316..e3fc1c4b1169 100644
--- a/www/linux-opera/files/patch-install.sh
+++ b/www/linux-opera/files/patch-install.sh
@@ -1,5 +1,5 @@
---- install.sh.orig	Wed Jun  2 05:13:50 2004
-+++ install.sh	Sun Jun  6 01:48:11 2004
+--- install.sh.orig	Fri Jul 16 07:39:52 2004
++++ install.sh	Tue Jul 20 00:34:42 2004
 @@ -758,25 +758,21 @@
  
      debug_msg 0 "in generate_wrapper()"
@@ -134,7 +134,7 @@
      ; do
      if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi
  done
-@@ -1086,7 +1054,7 @@
+@@ -1089,7 +1057,7 @@
      chop "${OPERADESTDIR}" "str_localdirshare"
      chop "${OPERADESTDIR}" "str_localdirplugin"
  
@@ -143,7 +143,7 @@
  
      # Executable
  	debug_msg 1 "Executable"
-@@ -1121,7 +1089,7 @@
+@@ -1124,7 +1092,7 @@
  
  	#cp $cpv $cpf wrapper.sh $wrapper_dir/opera
  	generate_wrapper
@@ -152,16 +152,21 @@
  
      # Documentation
  	debug_msg 1 "Documentation"
-@@ -1155,7 +1123,7 @@
- 	if test -d ini; then
- 	    mkdir $mkdirv $mkdirp $share_dir/ini/
- 	    chmod $chmodv 755 $share_dir/ini
--	    cp $cpv $cpf $cpR ini/* $share_dir/ini/
-+	    cp $cpv $cpf $cpR ini/*.ini $share_dir/ini/
- 	    if test -f $share_dir/ini/pluginpath.ini; then
- 		echo ${str_localdirplugin} >> $share_dir/ini/pluginpath.ini
- 	    fi
-@@ -1255,8 +1223,9 @@
+@@ -1223,13 +1191,6 @@
+ 		plugin_support='yes'
+ 	fi
+ 
+-	if test -f plugins/operamotifwrapper-1
+-	    then
+-		cp $cpv $cpf plugins/operamotifwrapper-1 $plugin_dir/
+-		chmod $chmodv 755 $plugin_dir/operamotifwrapper-1
+-		plugin_support='yes'
+-	fi
+-
+ 	if test -f plugins/operamotifwrapper-2
+ 	    then
+ 		cp $cpv $cpf plugins/operamotifwrapper-2 $plugin_dir/
+@@ -1279,8 +1240,9 @@
  	if test -z "${OPERADESTDIR}"; then
  
  	# System wide configuration files
@@ -172,7 +177,7 @@
  	    echo
  	    echo "System wide configuration files:"
  	    echo "  $config_dir/opera6rc"
-@@ -1268,6 +1237,7 @@
+@@ -1292,6 +1254,7 @@
  		cp $cpv $cpf config/opera6rc $config_dir
  		cp $cpv $cpf config/opera6rc.fixed $config_dir
  	    fi
@@ -180,7 +185,7 @@
  	else
  	    echo
  	    echo "User \"${USERNAME}\" does not have write access to $config_dir"
-@@ -1281,9 +1251,9 @@
+@@ -1305,9 +1268,9 @@
  	icons
  	gnome
  	kde 3
@@ -193,7 +198,7 @@
  
  	fi # OPERADESTDIR
  
-@@ -1328,13 +1298,13 @@
+@@ -1352,13 +1315,13 @@
  {
      # arg1 = location
  
@@ -211,7 +216,7 @@
  Terminal=0
  Type=Application'
  
-@@ -1367,42 +1337,13 @@
+@@ -1391,42 +1354,13 @@
  
      debug_msg 0 "in icons()"
  
@@ -260,16 +265,16 @@
      fi
  }
  
-@@ -1412,72 +1353,36 @@
+@@ -1436,72 +1370,36 @@
  
      debug_msg 1 "in gnome()"
  
 -    if test -d /opt/gnome/; then
-+    if test -d %%X11BASE%%/share/gnome/; then
- 
+-
 -      # /opt/gnome share
 -      if test -d /opt/gnome/share; then
--
++    if test -d %%X11BASE%%/share/gnome/; then
+ 
 -        # /opt/gnome icon
 -        if test ! -d /opt/gnome/share/pixmaps/; then
 -	  if test -w /opt/gnome/share; then
@@ -305,7 +310,7 @@
 -	      generate_desktop /opt/gnome/share/gnome/apps/Networking/WWW
 +          elif test -d %%X11BASE%%/share/gnome/apps/Networking/WWW/; then
 +            if test -w %%X11BASE%%/share/gnome/apps/Networking/WWW; then
-+	     generate_desktop %%X11BASE%%/share/gnome/apps/Networking/WWW
++	      generate_desktop %%X11BASE%%/share/gnome/apps/Networking/WWW
  	    fi
 -	  elif test -w /opt/gnome/share/gnome/apps; then
 -	    mkdir $mkdirv $mkdirp /opt/gnome/share/gnome/apps/Internet/
@@ -355,7 +360,7 @@
     fi
     # Add ximian here
  }
-@@ -1488,39 +1393,31 @@
+@@ -1512,39 +1410,31 @@
  
      debug_msg 1 "in kde()"
  
diff --git a/www/linux-opera/pkg-message b/www/linux-opera/pkg-message
index 1704fa3015f2..ad2d2e6dac4c 100644
--- a/www/linux-opera/pkg-message
+++ b/www/linux-opera/pkg-message
@@ -1,5 +1,5 @@
 ##
-Changelog for 7.51 Final: http://www.opera.com/linux/changelogs/751/
+Changelog for 7.53 Final: http://www.opera.com/linux/changelogs/753/
 
 The name of the the binary, data directory, personal "~/.opera" directory,
 etc., have been renamed from "opera" to "linux-opera." This means that
@@ -10,4 +10,14 @@ toolbars, options, etc., have changed from previous versions, and are not
 recommend to transferred from the old configuration. The mail format will be
 converted to the new format automatically when the new linux-opera is run for
 the first time.
+
+*** IMPORTANT: users with custom search.ini ***
+
+If you have a custom search.ini and you've used opera 7.51 or an earlier
+version before this upgrade, edit ~/.opera/search.ini _before_ running the 
+upgraded Opera for the first time, and change the file version to 4. It should
+look like this:
+
+[Version]
+File Version=4
 ##
diff --git a/www/linux-opera/pkg-plist b/www/linux-opera/pkg-plist
index 420b4c48cdbc..6a34e007f9ae 100644
--- a/www/linux-opera/pkg-plist
+++ b/www/linux-opera/pkg-plist
@@ -9,9 +9,7 @@ share/linux-opera/bin/spellcheck.so
 share/linux-opera/bin/works
 share/linux-opera/chartables.bin
 share/linux-opera/config/opera6rc
-share/linux-opera/config/opera6rc.bak
 share/linux-opera/config/opera6rc.fixed
-share/linux-opera/config/opera6rc.orig
 share/linux-opera/help/advertising.html
 share/linux-opera/help/background.png
 share/linux-opera/help/chat.html
@@ -85,7 +83,7 @@ share/linux-opera/locale/en/search.ini
 share/linux-opera/locale/english.lng
 share/linux-opera/opera6.adr
 share/linux-opera/plugins/libnpp.so
-share/linux-opera/plugins/operamotifwrapper
+share/linux-opera/plugins/operamotifwrapper-2
 share/linux-opera/plugins/operamotifwrapper-3
 share/linux-opera/plugins/operaplugincleaner
 share/linux-opera/search.ini
diff --git a/www/opera/Makefile b/www/opera/Makefile
index 1b9de6dd29d6..37d37fd9cf5c 100644
--- a/www/opera/Makefile
+++ b/www/opera/Makefile
@@ -28,12 +28,12 @@ DISTNAME=	${PORTNAME}-${OPERA_VER}-${OPERA_DATE}.1-static-qt.i386.freebsd-en
 MAINTAINER=	avleeuwen@piwebs.com
 COMMENT=	A blazingly fast, full-featured, standards-compliant browser
 
-OPERA_VER=	7.52
+OPERA_VER=	7.53
 OPERA_REL=	final
-OPERA_DATE=	20040706
+OPERA_DATE=	20040716
 
-DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
-DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
+DATADIR=	${PREFIX}/share/${PORTNAME}
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}
 
 USE_BZIP2=	yes
 WANT_GNOME=	yes
@@ -65,12 +65,13 @@ PLIST_SUB+=	KDE="@comment "
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
 		s|%%LOCALBASE%%|${LOCALBASE}|g ; s|%%X11BASE%%|${X11BASE}|g' \
-			${WRKSRC}/install.sh \
-			${WRKSRC}/ini/spellcheck.ini
-	@${RM} ${WRKSRC}/ini/spellcheck.ini.*
+			${WRKSRC}/install.sh ${WRKSRC}/ini/pluginpath.ini \
+			${WRKSRC}/ini/spellcheck.ini ${WRKSRC}/config/opera6rc
+	@${FIND} ${WRKSRC} -name '*.orig' -delete
+	@${FIND} ${WRKSRC} -name '*.bak' -delete
 
 do-install:
-	(cd ${WRKSRC} && ./install.sh --prefix=${PREFIX})
+	@(cd ${WRKSRC} && ./install.sh --prefix=${PREFIX})
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/www/opera/distinfo b/www/opera/distinfo
index 7f8428792007..c760bd99706a 100644
--- a/www/opera/distinfo
+++ b/www/opera/distinfo
@@ -1,2 +1,2 @@
-MD5 (opera-7.52-20040706.1-static-qt.i386.freebsd-en.tar.bz2) = 972867d1a7ddc2b22167ec81bc32f335
-SIZE (opera-7.52-20040706.1-static-qt.i386.freebsd-en.tar.bz2) = 4771392
+MD5 (opera-7.53-20040716.1-static-qt.i386.freebsd-en.tar.bz2) = 6f5c6c3ff7ad33d088bcdc45d6177d7e
+SIZE (opera-7.53-20040716.1-static-qt.i386.freebsd-en.tar.bz2) = 4771308
diff --git a/www/opera/files/patch-config::opera6rc b/www/opera/files/patch-config::opera6rc
new file mode 100644
index 000000000000..420f1fa0bbfa
--- /dev/null
+++ b/www/opera/files/patch-config::opera6rc
@@ -0,0 +1,9 @@
+--- config/opera6rc.orig	Mon Jul 19 23:00:06 2004
++++ config/opera6rc	Mon Jul 19 23:00:16 2004
+@@ -1,5 +1,5 @@
+ ; Put any default settings here that are overridable by users
+ 
+ [User Prefs]
+-Language Files Directory=/usr/share/opera/locale/
++Language Files Directory=%%PREFIX%%/share/opera/locale/
+ 
diff --git a/www/opera/files/patch-ini::pluginpath.ini b/www/opera/files/patch-ini::pluginpath.ini
new file mode 100644
index 000000000000..f2e5dc7277be
--- /dev/null
+++ b/www/opera/files/patch-ini::pluginpath.ini
@@ -0,0 +1,50 @@
+--- ini/pluginpath.ini.orig	Mon Jul 19 22:54:02 2004
++++ ini/pluginpath.ini	Mon Jul 19 22:57:21 2004
+@@ -1,31 +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]

+-$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

+-

+-/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

+-

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

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

+-/usr/lib/RealPlayer8=1

+-/usr/lib/realplay=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

++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
++%%PREFIX%%/share/opera/plugins=1
++%%LOCALBASE%%/share/opera/plugins=1
++
++%%LOCALBASE%%/Acrobat5/Browsers/intellinux=1
++%%LOCALBASE%%/Acrobat4/Browsers/intellinux=1
++
++%%LOCALBASE%%/lib/RealPlayer8/Plugins=1
++%%X11BASE%%/lib/browser_plugins=1
++$HOME/.netscape/plugins=1
++%%LOCALBASE%%/lib/netscape-linux/plugins=1
diff --git a/www/opera/files/patch-install.sh b/www/opera/files/patch-install.sh
index 286edf0ea806..fc897818caa1 100644
--- a/www/opera/files/patch-install.sh
+++ b/www/opera/files/patch-install.sh
@@ -1,5 +1,5 @@
---- install.sh.orig	Tue Jun  1 12:35:02 2004
-+++ install.sh	Tue Jun  1 19:40:04 2004
+--- install.sh.orig	Mon Jul 19 22:19:01 2004
++++ install.sh	Mon Jul 19 22:52:26 2004
 @@ -373,7 +373,7 @@
  	    mvv=''    # SunOS mv (no -v verbose option)
  	;;
@@ -16,7 +16,7 @@
 -    /usr/lib/opera/plugins \\
 -    /usr/local/lib/opera/plugins \\
 -    /opt/lib/opera/plugins \\"
-+    /usr/local/share/opera/plugins \\"
++    %%LOCALBASE%%/share/opera/plugins \\"
  
      case "${machine}:${os}" in
 -	i[3456]86:Linux|x86_64:Linux|i[3456]86:FreeBSD|i[3456]86:NetBSD|i[3456]86:OpenBSD)
@@ -32,18 +32,61 @@
 -    /usr/lib/realplay/plugins \\
 -    /usr/lib/RealPlayer8 \\
 -    /usr/lib/realplay \\
-+    /usr/local/lib/RealPlayer8/Plugins \\
-+    /usr/X11R6/lib/browser_plugins \\
++    %%LOCALBASE%%/lib/RealPlayer8/Plugins \\
++    %%X11BASE%%/lib/browser_plugins \\
      \"\${HOME}/.netscape/plugins\" \\
 -    /opt/netscape/plugins \\
 -    /usr/lib/netscape/plugins \\
 -    /usr/local/netscape/plugins \\
 -    /usr/local/lib/netscape/plugins \\"
-+    /usr/local/lib/netscape-linux/plugins \\"
++    %%LOCALBASE%%/lib/netscape-linux/plugins \\"
  
      wrapper_file="${wrapper_dir}/opera"
      
-@@ -983,11 +976,8 @@
+@@ -887,39 +880,12 @@
+ 
+ if test ! \"\${OPERA_JAVA_DIR}\"; then
+ 
+-    PREFIXES=\"
+-	/usr
+-	/usr/java
+-	/usr/lib
+-	/usr/local
+-	/opt\"
++    PREFIXES=\"%%LOCALBASE%%\"
+ 
+     for SUNJAVA in \\
+-	j2re1.4.2_01 \\
+-	j2sdk1.4.2_01/jre \\
+-	j2re1.4.2 \\
+-	j2sdk1.4.2/jre \\
+-	j2re1.4.1_01 \\
+-	j2re1.4.1 \\
+-	SUNJava2-1.4.1 \\
+-	BlackdownJava2-1.4.1/jre \\
+-	j2re1.4.0_01 \\
+-	j2sdk1.4.0_01/jre \\
+-	j2re1.4.0 \\
+-	jre1.4.0 \\
+-	j2se/1.4/jre \\
+-	j2se/1.3/jre \\
+-	j2se/jre \\
+-	jre1.3.1_02 \\
+-	jre1.3.1_01 \\
+-	j2re1.3.1 \\
+-	jre1.3.1 \\
+-	j2re1.3 \\
+-	j2se/1.3/jre \\
+-	java2re \\
+ 	jdk1.2.2/jre \\
+-	jdk1.2/jre \\
+-	jre \\
++	jdk1.3.1/jre \\
++	jdk1.4.2/jre \\
+ 	; do
+ 	for PREFIX in \${PREFIXES}; do
+ 	    if test -f \"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}/libjava.so\"; then OPERA_JAVA_DIR=\"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}\" && break; fi
+@@ -983,11 +949,8 @@
  
  # Acrobat Reader
  for BINDIR in \\
@@ -52,12 +95,12 @@
 -    /usr/X11R6/lib/Acrobat[45]/bin \\
 -    /opt/Acrobat[45]/bin \\
 -    /usr/Acrobat[45]/bin \\
-+    /usr/local/Acrobat4/bin \\
-+    /usr/local/Acrobat5/bin \\
++    %%LOCALBASE%%/Acrobat4/bin \\
++    %%LOCALBASE%%/Acrobat5/bin \\
      ; do
      if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi
  done
-@@ -1254,36 +1244,13 @@
+@@ -1278,36 +1241,13 @@
  
  	if test -z "${OPERADESTDIR}"; then
  
@@ -98,42 +141,7 @@
  
  	fi # OPERADESTDIR
  
-@@ -1367,22 +1334,22 @@
- 
-     debug_msg 0 "in icons()"
- 
--    if test ! -d /usr/share/icons; then
--      if test -w /usr/share; then
--        mkdir $mkdirv $mkdirp /usr/share/icons/
--	chmod $chmodv 755 /usr/share/icons
--	cp $cpv $share_dir/images/opera.xpm /usr/share/icons/opera.xpm
-+    if test ! -d /usr/X11R6/share/icons; then
-+      if test -w /usr/X11R6/share; then
-+        mkdir $mkdirv $mkdirp /usr/X11R6/share/icons/
-+	chmod $chmodv 755 /usr/X11R6/share/icons
-+	cp $cpv $share_dir/images/opera.xpm /usr/X11R6/share/icons/opera.xpm
-       fi
--    elif test -w /usr/share/icons; then cp $cpv $share_dir/images/opera.xpm /usr/share/icons/opera.xpm
-+    elif test -w /usr/X11R6/share/icons; then cp $cpv $share_dir/images/opera.xpm /usr/X11R6/share/icons/opera.xpm
-     fi
-   
--    if test ! -d /usr/share/pixmaps; then
--      if test -w /usr/share; then
--	mkdir $mkdirv $mkdirp /usr/share/pixmaps/
--	chmod $chmodv 755 /usr/share/pixmaps
--	cp $cpv $share_dir/images/opera.xpm /usr/share/pixmaps/opera.xpm
-+    if test ! -d /usr/X11R6/share/pixmaps; then
-+      if test -w /usr/X11R6/share; then
-+	mkdir $mkdirv $mkdirp /usr/X11R6/share/pixmaps/
-+	chmod $chmodv 755 /usr/X11R6/share/pixmaps
-+	cp $cpv $share_dir/images/opera.xpm /usr/X11R6/share/pixmaps/opera.xpm
-       fi
--    elif test -w /usr/share/pixmaps/; then cp $cpv $share_dir/images/opera.xpm /usr/share/pixmaps/opera.xpm
-+    elif test -w /usr/X11R6/share/pixmaps/; then cp $cpv $share_dir/images/opera.xpm /usr/X11R6/share/pixmaps/opera.xpm
-     fi
-   
-     if test ! -d /etc/X11/wmconfig/; then
-@@ -1412,72 +1379,36 @@
+@@ -1436,72 +1376,36 @@
  
      debug_msg 1 "in gnome()"
  
@@ -202,25 +210,25 @@
 -              generate_desktop /usr/share/gnome/apps/Internet
 +	# %%X11BASE%%/share/gnome link
 +	if test -d %%X11BASE%%/share/gnome/apps/; then
-+	   if test -d %%X11BASE%%/share/gnome/apps/Internet/; then
-+	     if test -w %%X11BASE%%/share/gnome/apps/Internet; then
-+	       generate_desktop %%X11BASE%%/share/gnome/apps/Internet
++          if test -d %%X11BASE%%/share/gnome/apps/Internet/; then
++            if test -w %%X11BASE%%/share/gnome/apps/Internet; then
++              generate_desktop %%X11BASE%%/share/gnome/apps/Internet
  	    fi
 -          elif test -d /usr/share/gnome/apps/Networking/WWW/; then
 -            if test -w /usr/share/gnome/apps/Networking/WWW; then
 -	     generate_desktop /usr/share/gnome/apps/Networking/WWW
-+           elif test -d %%X11BASE%%/share/gnome/apps/Networking/WWW/; then
-+             if test -w %%X11BASE%%/share/gnome/apps/Networking/WWW; then
-+             generate_desktop %%X11BASE%%/share/gnome/apps/Networking/WWW
++          elif test -d %%X11BASE%%/share/gnome/apps/Networking/WWW/; then
++            if test -w %%X11BASE%%/share/gnome/apps/Networking/WWW; then
++	     generate_desktop %%X11BASE%%/share/gnome/apps/Networking/WWW
  	    fi
 -	  elif test -w /usr/share/gnome/apps; then
 -	    mkdir $mkdirv $mkdirp /usr/share/gnome/apps/Internet/
 -	    chmod $chmodv 755 /usr/share/gnome/apps/Internet
 -            generate_desktop /usr/share/gnome/apps/Internet
-+          elif test -w %%X11BASE%%/share/gnome/apps; then
-+            mkdir $mkdirv $mkdirp %%X11BASE%%/share/gnome/apps/Internet/
-+            chmod $chmodv 755 %%X11BASE%%/share/gnome/apps/Internet
-+             generate_desktop %%X11BASE%%/share/gnome/apps/Internet
++	  elif test -w %%X11BASE%%/share/gnome/apps; then
++	    mkdir $mkdirv $mkdirp %%X11BASE%%/share/gnome/apps/Internet/
++	    chmod $chmodv 755 %%X11BASE%%/share/gnome/apps/Internet
++            generate_desktop %%X11BASE%%/share/gnome/apps/Internet
            fi
  	fi
 -	# end /usr/share/gnome link
@@ -228,7 +236,7 @@
     fi
     # Add ximian here
  }
-@@ -1488,39 +1419,31 @@
+@@ -1512,39 +1416,31 @@
  
      debug_msg 1 "in kde()"
  
@@ -276,14 +284,3 @@
  }
  
  kde1()
-@@ -1543,8 +1466,8 @@
-       fi
-       if test -w /opt/kde/share/applnk/Internet; then generate_desktop /opt/kde/share/applnk/Internet; fi
- 
--    elif test -d /usr/share/applnk/Internet/ -a -w /usr/share/applnk/Internet; then
--      generate_desktop /usr/share/applnk/Internet
-+    elif test -d /usr/X11R6/share/applnk/Internet/ -a -w /usr/X11R6/share/applnk/Internet; then
-+      generate_desktop /usr/X11R6/share/applnk/Internet
-     fi
- }
-