From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Oct 8 13:50:22 2003 Return-Path: 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 8F4B216A4B3 for ; Wed, 8 Oct 2003 13:50:22 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B3B3A43FDF for ; Wed, 8 Oct 2003 13:50:20 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h98KoKFY094537 for ; Wed, 8 Oct 2003 13:50:20 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h98KoKS1094536; Wed, 8 Oct 2003 13:50:20 -0700 (PDT) (envelope-from gnats) Resent-Date: Wed, 8 Oct 2003 13:50:20 -0700 (PDT) Resent-Message-Id: <200310082050.h98KoKS1094536@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, avleeuwen@piwebs.com Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 57BD916A4B3 for ; Wed, 8 Oct 2003 13:41:20 -0700 (PDT) Received: from thuis.piwebs.com (217-19-20-186.dsl.cambrium.nl [217.19.20.186]) by mx1.FreeBSD.org (Postfix) with SMTP id F1BDB43FAF for ; Wed, 8 Oct 2003 13:41:18 -0700 (PDT) (envelope-from avleeuwen@thuis.piwebs.com) Received: (qmail 8615 invoked by uid 1001); 8 Oct 2003 20:41:50 -0000 Message-Id: <20031008204150.8614.qmail@thuis.piwebs.com> Date: 8 Oct 2003 20:41:50 -0000 From: avleeuwen@piwebs.com To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/57766: Maintainer update: Unbreak www/opera by updating to 7.21 Preview 2 (aka 20031003) X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: avleeuwen@piwebs.com List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Oct 2003 20:50:22 -0000 >Number: 57766 >Category: ports >Synopsis: Maintainer update: Unbreak www/opera by updating to 7.21 Preview 2 (aka 20031003) >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Oct 08 13:50:19 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Arjan van Leeuwen >Release: FreeBSD 4.8-RELEASE-p3 i386 >Organization: >Environment: System: FreeBSD thuis.piwebs.com 4.8-RELEASE-p3 FreeBSD 4.8-RELEASE-p3 #0: Thu Aug 21 11:55:07 CEST 2003 avleeuwen@thuis.piwebs.com:/usr/obj/usr/src/sys/THUIS i386 >Description: The www/opera port does not fetch at this moment, because the port version (7.21 Preview 1) has been deleted from the Opera servers. This updates the port to 7.21 Preview 2, aka 20031003. This fixes the fetch. >How-To-Repeat: >Fix: diff -urN /usr/ports/www/opera/Makefile opera/Makefile --- /usr/ports/www/opera/Makefile Fri Oct 3 20:08:37 2003 +++ opera/Makefile Wed Oct 8 22:33:32 2003 @@ -6,9 +6,9 @@ # PORTNAME= opera -PORTVERSION= 7.21.20031002 +PORTVERSION= 7.21.20031003 CATEGORIES= www -MASTER_SITES= http://snapshot.opera.com/unix/7.21-Preview-1/intel-freebsd/ +MASTER_SITES= http://snapshot.opera.com/unix/7.21-Preview-2/intel-freebsd/ DISTNAME= ${PORTNAME}-${PORTVERSION:S/1./1-/}.1-static-qt.i386.freebsd MAINTAINER= avleeuwen@piwebs.com diff -urN /usr/ports/www/opera/distinfo opera/distinfo --- /usr/ports/www/opera/distinfo Fri Oct 3 20:08:37 2003 +++ opera/distinfo Wed Oct 8 22:35:11 2003 @@ -1 +1 @@ -MD5 (opera-7.21-20031002.1-static-qt.i386.freebsd.tar.bz2) = a35c6d636dbbdf7ba80cc121d7c333b5 +MD5 (opera-7.21-20031003.1-static-qt.i386.freebsd.tar.bz2) = aba6a8434aa42b726c22cc748b4b9259 diff -urN /usr/ports/www/opera/files/patch-install.sh opera/files/patch-install.sh --- /usr/ports/www/opera/files/patch-install.sh Fri Oct 3 20:08:37 2003 +++ opera/files/patch-install.sh Wed Oct 8 22:36:56 2003 @@ -1,6 +1,6 @@ ---- install.sh.orig Thu Oct 2 14:24:57 2003 -+++ install.sh Thu Oct 2 18:11:45 2003 -@@ -728,9 +728,7 @@ +--- install.sh.orig Mon Oct 6 15:01:39 2003 ++++ install.sh Wed Oct 8 22:36:31 2003 +@@ -760,9 +760,7 @@ wrapper_opera_plugin_paths=" \"\${HOME}/.opera/plugins\" \\ ${str_localdirplugin} \\ @@ -11,15 +11,7 @@ case "${machine}:${os}" in i[3456]86:Linux|i[3456]86:FreeBSD|i[3456]86:NetBSD|i[3456]86:OpenBSD) -@@ -744,7 +742,6 @@ - /usr/java/jre1.4.0/plugin/i386/ns4 \\ - /usr/java/jre1.3.1/plugin/i386/ns4 \\ - /usr/lib/j2re1.3/plugin/i386/netscape4 \\ -- /usr/local/jdk1.3.1/jre/plugin/i386/ns4 \\ - /usr/local/linux-jdk1.3.1/jre/plugin/i386/ns4 \\" - wrapper_ibmjava=" - IBMJava2-141/jre \\ -@@ -796,15 +793,10 @@ +@@ -817,15 +815,10 @@ ;; esac wrapper_netscape_plugin_paths=" @@ -38,7 +30,7 @@ wrapper_file="${wrapper_dir}/opera" -@@ -960,11 +952,8 @@ +@@ -981,11 +974,8 @@ # Acrobat Reader for BINDIR in \\ @@ -52,9 +44,9 @@ ; do if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi done -@@ -1222,44 +1211,6 @@ +@@ -1243,29 +1233,6 @@ - if test "${bool_destdir}" = "no"; then + if test -z "${OPERADESTDIR}"; then - # System wide configuration files - config_dir='/usr/local/etc' @@ -64,27 +56,12 @@ - echo " $config_dir/opera6rc" - echo " $config_dir/opera6rc.fixed" - echo " cannot be prefixed" -- echo "Do you want to install them [y,n | yes,no]?" -- while true; do -- read install_config -- case "${install_config}" in -- -- ''|[yY]|[yY][eE][sS]) -- backup $config_dir/opera6rc opera6rc config -- backup $config_dir/opera6rc.fixed opera6rc.fixed config -- cp $cpv $cpf config/opera6rc $config_dir -- cp $cpv $cpf config/opera6rc.fixed $config_dir -- break -- ;; -- -- [nN]|[nN][oO]) -- break -- ;; -- *) -- echo 'Invalid answer, try again:' -- ;; -- esac -- done +- if con_firm "Do you want to install them"; then +- backup $config_dir/opera6rc opera6rc config +- backup $config_dir/opera6rc.fixed opera6rc.fixed config +- cp $cpv $cpf config/opera6rc $config_dir +- cp $cpv $cpf config/opera6rc.fixed $config_dir +- fi - else - echo - echo "User \"${USERNAME}\" does not have write access to $config_dir" @@ -97,7 +74,7 @@ # Shorcuts and Icons icons gnome -@@ -1350,22 +1301,22 @@ +@@ -1356,22 +1323,22 @@ debug_msg 0 "in icons()" @@ -132,7 +109,7 @@ fi if test ! -d /etc/X11/wmconfig/; then -@@ -1431,33 +1382,33 @@ +@@ -1437,33 +1404,33 @@ fi # end /opt/gnome share @@ -187,7 +164,7 @@ fi fi # end /usr/share/gnome link -@@ -1497,12 +1448,12 @@ +@@ -1503,12 +1470,12 @@ fi @@ -205,7 +182,7 @@ fi } -@@ -1526,8 +1477,8 @@ +@@ -1532,8 +1499,8 @@ fi if test -w /opt/kde/share/applnk/Internet; then generate_desktop /opt/kde/share/applnk/Internet; fi >Release-Note: >Audit-Trail: >Unformatted: