From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Jun 18 18:00:39 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 82B0616A41C for ; Sat, 18 Jun 2005 18:00:39 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5582A43D4C for ; Sat, 18 Jun 2005 18:00:39 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j5II0dAQ046243 for ; Sat, 18 Jun 2005 18:00:39 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j5II0dVp046236; Sat, 18 Jun 2005 18:00:39 GMT (envelope-from gnats) Resent-Date: Sat, 18 Jun 2005 18:00:39 GMT Resent-Message-Id: <200506181800.j5II0dVp046236@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Arjan van Leeuwen" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B526E16A41F for ; Sat, 18 Jun 2005 17:56:14 +0000 (GMT) (envelope-from avleeuwen@piwebs.com) Received: from gimp.piwebs.com (82-197-201-59.dsl.cambrium.nl [82.197.201.59]) by mx1.FreeBSD.org (Postfix) with ESMTP id BEE9243D1D for ; Sat, 18 Jun 2005 17:56:13 +0000 (GMT) (envelope-from avleeuwen@piwebs.com) Received: (qmail 15654 invoked from network); 18 Jun 2005 17:55:06 -0000 Received: from vincent.piwebs.com (192.168.0.73) by gimp.piwebs.com with SMTP; 18 Jun 2005 17:55:06 -0000 Message-Id: <1119117383.0@vincent.piwebs.com> Date: Sat, 18 Jun 2005 19:56:23 +0200 From: "Arjan van Leeuwen" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.6 Cc: sf@FreeBSD.org Subject: ports/82395: Update www/opera to 8.01 (20050615) X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Jun 2005 18:00:39 -0000 >Number: 82395 >Category: ports >Synopsis: Update www/opera to 8.01 (20050615) >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: Sat Jun 18 18:00:38 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Arjan van Leeuwen >Release: FreeBSD 6.0-CURRENT i386 >Organization: >Environment: System: FreeBSD 6.0-CURRENT #3: Mon Jun 13 20:54:47 CEST 2005 root@vincent.piwebs.com:/usr/obj/usr/src/sys/VINCENT >Description: This patch updates Opera (www/opera) to version 8.01, and fixes locale compatibility problems in -CURRENT [1]. [1] Reported & patched by Fujishima Satsuki (sf@freebsd.org) >How-To-Repeat: >Fix: --- opera.diff begins here --- diff -urN /usr/ports/www/opera/Makefile opera/Makefile --- /usr/ports/www/opera/Makefile Thu Apr 21 13:45:52 2005 +++ opera/Makefile Sat Jun 18 19:45:20 2005 @@ -28,10 +28,10 @@ MAINTAINER= avleeuwen@piwebs.com COMMENT= A blazingly fast, full-featured, standards-compliant browser -OPERA_VER= 8.0 -OPERA_MINVER= 0 +OPERA_VER= 8.01 +OPERA_MINVER= OPERA_REL= final -OPERA_DATE= 20050415 +OPERA_DATE= 20050615 DATADIR= ${PREFIX}/share/${PORTNAME} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME} diff -urN /usr/ports/www/opera/distinfo opera/distinfo --- /usr/ports/www/opera/distinfo Thu Apr 21 13:45:52 2005 +++ opera/distinfo Sat Jun 18 19:45:47 2005 @@ -1,2 +1,2 @@ -MD5 (opera-8.0-20050415.1-static-qt.i386.freebsd-en.tar.bz2) = 1b4a940f03bad7af148a0418c8087b62 -SIZE (opera-8.0-20050415.1-static-qt.i386.freebsd-en.tar.bz2) = 5099452 +MD5 (opera-8.01-20050615.1-static-qt.i386.freebsd-en.tar.bz2) = e4f5f41596396b45a4bd50b33479e987 +SIZE (opera-8.01-20050615.1-static-qt.i386.freebsd-en.tar.bz2) = 5593705 diff -urN /usr/ports/www/opera/files/patch-install.sh opera/files/patch-install.sh --- /usr/ports/www/opera/files/patch-install.sh Thu Apr 21 13:45:52 2005 +++ opera/files/patch-install.sh Sat Jun 18 19:40:46 2005 @@ -1,16 +1,5 @@ ---- install.sh.orig Fri Feb 25 14:36:52 2005 -+++ install.sh Wed Mar 2 12:43:44 2005 -@@ -108,8 +108,8 @@ - - if test ${os} = 'FreeBSD' -o ${os} = 'OpenBSD'; then - wrapper_dir="${prefix}/bin" -- doc_dir="${prefix}/share/doc/opera" -- share_dir="${prefix}/share/opera" -+ doc_dir="${prefix}/share/doc/opera" -+ share_dir="${prefix}/share/opera" - exec_dir="${share_dir}/bin" - plugin_dir="${share_dir}/plugins" - else +--- install.sh.orig Fri Apr 15 21:21:52 2005 ++++ install.sh Sat Jun 18 01:45:48 2005 @@ -373,7 +373,7 @@ mvv='' # SunOS mv (no -v verbose option) ;; @@ -29,16 +18,20 @@ wrapper_ibmjava=" IBMJava2-142/jre \\ IBMJava2-141/jre \\ -@@ -794,7 +794,7 @@ - error 'os' - ;; - esac -- wrapper_file="${wrapper_dir}/opera" -+ wrapper_file="${wrapper_dir}/opera" +@@ -798,6 +798,12 @@ wrapper_contain="#!/bin/sh -@@ -850,6 +850,9 @@ ++# Location of locale data ++if [ -f %%LOCALBASE%%/share/compat/locale/UTF-8/LC_CTYPE ]; then ++ PATH_LOCALE=%%LOCALBASE%%/share/compat/locale ++ export PATH_LOCALE ++fi ++ + # Location of the Opera binaries + OPERA_BINARYDIR=${str_localdirexec} + export OPERA_BINARYDIR +@@ -850,6 +856,9 @@ OPERA_LD_PRELOAD=\"\${LD_PRELOAD}\" export OPERA_LD_PRELOAD @@ -48,7 +41,7 @@ # Native Java enviroment if test -f \"\${OPERA_PERSONALDIR}/javapath.txt\"; then INIJAVA=\`cat \${OPERA_PERSONALDIR}/javapath.txt\` -@@ -873,53 +876,12 @@ +@@ -873,53 +882,12 @@ if test ! \"\${OPERA_JAVA_DIR}\"; then @@ -105,7 +98,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 -@@ -970,11 +932,8 @@ +@@ -970,11 +938,8 @@ # Acrobat Reader for BINDIR in \\ @@ -119,7 +112,7 @@ ; do if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi done -@@ -985,12 +944,13 @@ +@@ -985,12 +950,13 @@ LD_LIBRARY_PATH=\"\${OPERA_BINARYDIR}:\${LD_LIBRARY_PATH}\" export LD_LIBRARY_PATH @@ -135,7 +128,7 @@ LD_LIBRARY_PATH=\"\${LD_LIBRARY_PATH}:\${LIBASPELL_DIR}\" fi done -@@ -1080,7 +1040,7 @@ +@@ -1080,7 +1046,7 @@ chop "${OPERADESTDIR}" "str_localdirshare" chop "${OPERADESTDIR}" "str_localdirplugin" @@ -144,7 +137,7 @@ # Executable debug_msg 1 "Executable" -@@ -1115,7 +1075,7 @@ +@@ -1115,7 +1081,7 @@ #cp $cpv $cpf wrapper.sh $wrapper_dir/opera generate_wrapper @@ -153,7 +146,7 @@ # Documentation debug_msg 1 "Documentation" -@@ -1288,36 +1248,13 @@ +@@ -1293,36 +1259,13 @@ if test -z "${OPERADESTDIR}"; then @@ -194,49 +187,16 @@ fi # OPERADESTDIR -@@ -1345,13 +1282,13 @@ - { - # arg1 = location - -- wmconfig_file="${1}/opera" -+ wmconfig_file="${1}/opera" - -- wmconfig_contain='opera name "Opera" -+ wmconfig_contain='opera name "Opera" - opera description "Opera Web Browser" - opera icon "opera.xpm" - opera mini-icon "opera.xpm" --opera exec "opera &" -+opera exec "opera &" - opera group "Internet"' - - echo "${wmconfig_contain}" > ${wmconfig_file} -@@ -1362,12 +1299,12 @@ - { - # arg1 = location - -- desktop_file="${1}/opera.desktop" -+ desktop_file="${1}/opera.desktop" - - desktop_contain='[Desktop Entry] --Name=Opera -+Name=Opera - Comment=Web Browser --Exec=opera -+Exec=opera - Icon=opera.xpm - Terminal=0 - Type=Application' -@@ -1446,72 +1383,36 @@ +@@ -1451,72 +1394,36 @@ debug_msg 1 "in gnome()" - if test -d /opt/gnome/; then -- -- # /opt/gnome share -- if test -d /opt/gnome/share; then + if test -d %%X11BASE%%/share/gnome/; then +- # /opt/gnome share +- if test -d /opt/gnome/share; then +- - # /opt/gnome icon - if test ! -d /opt/gnome/share/pixmaps/; then - if test -w /opt/gnome/share; then @@ -322,7 +282,7 @@ fi # Add ximian here } -@@ -1522,39 +1423,31 @@ +@@ -1527,39 +1434,31 @@ debug_msg 1 "in kde()" diff -urN /usr/ports/www/opera/pkg-plist opera/pkg-plist --- /usr/ports/www/opera/pkg-plist Thu Apr 21 13:45:52 2005 +++ opera/pkg-plist Sat Jun 18 19:49:13 2005 @@ -8,7 +8,6 @@ %%DATADIR%%/chartables.bin %%DATADIR%%/config/opera6rc %%DATADIR%%/config/opera6rc.fixed -%%DATADIR%%/hhd.ssr %%DATADIR%%/html40_entities.dtd %%DATADIR%%/images/blank.gif %%DATADIR%%/images/drive.gif --- opera.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: