5 files changed, 135 insertions, 78 deletions

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
- }
-