ports/74001: Update www/opera-devel to 7.60 TP3

Arjan van Leeuwen avleeuwen at piwebs.com
Tue Nov 16 14:40:15 UTC 2004 

>Number:         74001
>Category:       ports
>Synopsis:       Update www/opera-devel to 7.60 TP3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Nov 16 14:40:14 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Arjan van Leeuwen
>Release:        FreeBSD 6.0-CURRENT amd64
>Organization:
>Environment:


System: FreeBSD 6.0-CURRENT #6: Fri Nov 12 23:59:20 CET 2004
    root at vincent.piwebs.com:/usr/obj/usr/src/sys/VINCENT



>Description:


This patch updates the www/opera-devel port to 7.60 Preview 3 (20041115).


>How-To-Repeat:





>Fix:


--- opera-devel.diff begins here ---
diff -urN /usr/ports/www/opera-devel/Makefile opera-devel/Makefile
--- /usr/ports/www/opera-devel/Makefile	Wed Nov  3 22:40:48 2004
+++ opera-devel/Makefile	Tue Nov 16 15:30:24 2004
@@ -16,8 +16,8 @@
 COMMENT=	A blazingly fast, full-featured, standards-compliant browser
 
 OPERA_VER=	7.60
-OPERA_REL=	Preview-2
-OPERA_DATE=	20041026
+OPERA_REL=	Preview-3
+OPERA_DATE=	20041115
 
 DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
diff -urN /usr/ports/www/opera-devel/distinfo opera-devel/distinfo
--- /usr/ports/www/opera-devel/distinfo	Wed Nov  3 21:39:18 2004
+++ opera-devel/distinfo	Tue Nov 16 15:04:31 2004
@@ -1,2 +1,2 @@
-MD5 (opera-7.60-20041026.1-static-qt.i386.freebsd-en.tar.bz2) = 21df9e5ae5f607aa35abd83b6b88d3bc
-SIZE (opera-7.60-20041026.1-static-qt.i386.freebsd-en.tar.bz2) = 5602381
+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
diff -urN /usr/ports/www/opera-devel/files/patch-ini::pluginpath.ini opera-devel/files/patch-ini::pluginpath.ini
--- /usr/ports/www/opera-devel/files/patch-ini::pluginpath.ini	Wed Nov  3 21:39:18 2004
+++ opera-devel/files/patch-ini::pluginpath.ini	Tue Nov 16 15:08:34 2004
@@ -1,17 +1,19 @@
---- 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 @@
+--- ini/pluginpath.ini.orig	Tue Nov 16 15:05:38 2004
++++ ini/pluginpath.ini	Tue Nov 16 15:07:58 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
@@ -23,28 +25,33 @@
 -/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
-+%%PREFIX%%/share/opera/plugins=1
-+%%LOCALBASE%%/share/opera/plugins=1
++/usr/X11R6/share/opera/plugins=1
++/usr/local/share/opera/plugins=1
 +
-+%%LOCALBASE%%/Acrobat5/Browsers/intellinux=1
-+%%LOCALBASE%%/Acrobat4/Browsers/intellinux=1
++/usr/local/Acrobat5/Browsers/intellinux=1
++/usr/local/Acrobat4/Browsers/intellinux=1
 +
-+%%LOCALBASE%%/lib/RealPlayer8/Plugins=1
-+%%X11BASE%%/lib/browser_plugins=1
++/usr/local/lib/RealPlayer8/Plugins=1
++/usr/X11R6/lib/browser_plugins=1
 +$HOME/.netscape/plugins=1
-+%%LOCALBASE%%/lib/netscape-linux/plugins=1
++/usr/local/lib/netscape-linux/plugins=1
diff -urN /usr/ports/www/opera-devel/files/patch-install.sh opera-devel/files/patch-install.sh
--- /usr/ports/www/opera-devel/files/patch-install.sh	Wed Nov  3 21:39:18 2004
+++ opera-devel/files/patch-install.sh	Tue Nov 16 15:26:26 2004
@@ -1,5 +1,5 @@
---- install.sh.orig	Tue Oct 26 20:02:37 2004
-+++ install.sh	Wed Oct 27 21:37:16 2004
+--- install.sh.orig	Tue Nov 16 15:11:43 2004
++++ install.sh	Tue Nov 16 15:26:04 2004
 @@ -108,8 +108,8 @@
  
      if test ${os} = 'FreeBSD' -o ${os} = 'OpenBSD'; then
@@ -20,53 +20,25 @@
  		cpf='-f'
  		if test "$verbose" -gt '1'; then
  		    chmodv='-v'
-@@ -758,15 +758,14 @@
- 
+@@ -759,7 +759,7 @@
      debug_msg 0 "in generate_wrapper()"
  
--    wrapper_opera_plugin_paths="    \"\${HOME}/.opera/plugins\" \\
-+    wrapper_opera_plugin_paths="    \"\${HOME}/.opera-devel/plugins\" \\
-     ${str_localdirplugin} \\
--    /usr/lib/opera/plugins \\
--    /usr/local/lib/opera/plugins \\
--    /opt/lib/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)
 +	i[3456]86:Linux|x86_64:Linux|i[3456]86:FreeBSD|amd64:FreeBSD|i[3456]86:NetBSD|i[3456]86:OpenBSD)
- 	    wrapper_plugin_paths="
-+    %%LOCALBASE%%/Acrobat[45]/Browsers/intellinux \\
-     /usr/local/Acrobat[45]/Browsers/intellinux \\
-     /usr/lib/Acrobat[45]/Browsers/intellinux \\
-     /usr/X11R6/lib/Acrobat[45]/Browsers/intellinux \\
-@@ -818,21 +817,13 @@
+ 	    wrapper_ibmjava="
+ 	    IBMJava2-142/jre \\
+ 	    IBMJava2-141/jre \\
+@@ -794,7 +794,7 @@
+ 		error 'os'
  	;;
      esac
-     wrapper_netscape_plugin_paths="
--    /usr/lib/RealPlayer8/Plugins \\
--    /usr/lib/realplay/plugins \\
--    /usr/lib/RealPlayer8 \\
--    /usr/lib/realplay \\
-+    %%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/lib/mozilla/plugins \\
--    /usr/lib/mozilla-1.3.1/plugins \\
--    /usr/X11R6/lib/mozilla/plugins \\
-+    %%LOCALBASE%%/lib/netscape-linux/plugins \\
-     \"${HOME}/.kde/.konqueror/nsplugins\" \\"
- 
 -    wrapper_file="${wrapper_dir}/opera"
 +    wrapper_file="${wrapper_dir}/opera-devel"
      
      wrapper_contain="#!/bin/sh
  
-@@ -876,6 +867,9 @@
+@@ -838,6 +838,9 @@
  OPERA_LD_PRELOAD=\"\${LD_PRELOAD}\"
  export OPERA_LD_PRELOAD
  
@@ -76,7 +48,7 @@
  # Native Java enviroment
  if test -f \"\${OPERA_PERSONALDIR}/javapath.txt\"; then
      INIJAVA=\`cat \${OPERA_PERSONALDIR}/javapath.txt\`
-@@ -899,47 +893,12 @@
+@@ -861,47 +864,12 @@
  
  if test ! \"\${OPERA_JAVA_DIR}\"; then
  
@@ -127,7 +99,7 @@
  	; 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
-@@ -1004,11 +963,8 @@
+@@ -950,11 +918,8 @@
  
  # Acrobat Reader
  for BINDIR in \\
@@ -141,7 +113,7 @@
      ; do
      if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi
  done
-@@ -1021,12 +977,13 @@
+@@ -965,12 +930,13 @@
  LD_LIBRARY_PATH=\"\${OPERA_BINARYDIR}:\${LD_LIBRARY_PATH}\"
  export LD_LIBRARY_PATH
  
@@ -157,7 +129,7 @@
          LD_LIBRARY_PATH=\"\${LD_LIBRARY_PATH}:\${LIBASPELL_DIR}\"
      fi
  done
-@@ -1120,7 +1077,7 @@
+@@ -1064,7 +1030,7 @@
      chop "${OPERADESTDIR}" "str_localdirshare"
      chop "${OPERADESTDIR}" "str_localdirplugin"
  
@@ -166,7 +138,7 @@
  
      # Executable
  	debug_msg 1 "Executable"
-@@ -1155,7 +1112,7 @@
+@@ -1099,7 +1065,7 @@
  
  	#cp $cpv $cpf wrapper.sh $wrapper_dir/opera
  	generate_wrapper
@@ -175,7 +147,7 @@
  
      # Documentation
  	debug_msg 1 "Documentation"
-@@ -1309,36 +1266,13 @@
+@@ -1264,36 +1230,13 @@
  
  	if test -z "${OPERADESTDIR}"; then
  
@@ -216,7 +188,7 @@
  
  	fi # OPERADESTDIR
  
-@@ -1366,13 +1300,13 @@
+@@ -1321,13 +1264,13 @@
  {
      # arg1 = location
  
@@ -233,7 +205,7 @@
  opera group "Internet"'
  
      echo "${wmconfig_contain}" > ${wmconfig_file}
-@@ -1383,12 +1317,12 @@
+@@ -1338,12 +1281,12 @@
  {
      # arg1 = location
  
@@ -249,7 +221,7 @@
  Icon=opera.xpm
  Terminal=0
  Type=Application'
-@@ -1467,72 +1401,36 @@
+@@ -1422,72 +1365,36 @@
  
      debug_msg 1 "in gnome()"
  
@@ -344,7 +316,7 @@
     fi
     # Add ximian here
  }
-@@ -1543,39 +1441,31 @@
+@@ -1498,39 +1405,31 @@
  
      debug_msg 1 "in kde()"
  
diff -urN /usr/ports/www/opera-devel/pkg-plist opera-devel/pkg-plist
--- /usr/ports/www/opera-devel/pkg-plist	Wed Nov  3 21:39:18 2004
+++ opera-devel/pkg-plist	Tue Nov 16 15:29:48 2004
@@ -11,6 +11,7 @@
 %%DATADIR%%/config/opera6rc.fixed
 %%DATADIR%%/help/advertising.html
 %%DATADIR%%/help/background.png
+%%DATADIR%%/help/chat.html
 %%DATADIR%%/help/dialogs.html
 %%DATADIR%%/help/filetypes.html
 %%DATADIR%%/help/fonts.html
@@ -30,6 +31,7 @@
 %%DATADIR%%/help/multimedia.html
 %%DATADIR%%/help/network.html
 %%DATADIR%%/help/page.html
+%%DATADIR%%/help/panels.html
 %%DATADIR%%/help/paths.html
 %%DATADIR%%/help/personal.html
 %%DATADIR%%/help/preferences.html
@@ -43,6 +45,7 @@
 %%DATADIR%%/help/toolbars.html
 %%DATADIR%%/help/windows.html
 %%DATADIR%%/hhd.ssr
+%%DATADIR%%/html40_entities.dtd
 %%DATADIR%%/images/background.gif
 %%DATADIR%%/images/blank.gif
 %%DATADIR%%/images/drive.gif
@@ -131,7 +134,7 @@
 @dirrm %%DOCSDIR%%
 
 %%KDE%%@cwd %%LOCALBASE%%
-%%KDE%%share/applnk/Internet/opera.desktop
+%%KDE%%share/applnk/Internet/opera-devel.desktop
 %%KDE%%share/icons/hicolor/22x22/apps/opera.png
 %%KDE%%share/icons/hicolor/32x32/apps/opera.png
 %%KDE%%share/icons/hicolor/48x48/apps/opera.png
--- opera-devel.diff ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list