From 12c473a3b838308696dab3f8b689284b1144d82d Mon Sep 17 00:00:00 2001
From: Daichi GOTO <daichi@FreeBSD.org>
Date: Wed, 20 Aug 2003 06:44:24 +0000
Subject: update www/opera: 6.12.20030305 -> 7.20.20030811 and take
maintainership
PR: 55509
Submitted by: Arjan van Leeuwen <avleeuwen@piwebs.com>
---
www/opera/files/patch-aa | 29 -----
www/opera/files/patch-install.sh | 269 +++++++++++++++++++++++++++++++++++++++
2 files changed, 269 insertions(+), 29 deletions(-)
delete mode 100644 www/opera/files/patch-aa
create mode 100644 www/opera/files/patch-install.sh
(limited to 'www/opera/files')
diff --git a/www/opera/files/patch-aa b/www/opera/files/patch-aa
deleted file mode 100644
index f96c76adbe95..000000000000
--- a/www/opera/files/patch-aa
+++ /dev/null
@@ -1,29 +0,0 @@
---- install.sh.orig Tue Mar 11 15:29:39 2003
-+++ install.sh Tue Mar 11 15:30:46 2003
-@@ -1092,16 +1092,10 @@
- mkdir $mkdirv $mkdirp $plugin_dir/
- chmod $chmodv 755 $plugin_dir
-
-- cp $cpv $cpf $cpp plugins/operamotifwrapper plugins/operaplugincleaner plugins/libnpp.so.$plugin_version_major.$plugin_version_minor.$plugin_version_release $plugin_dir/
-- chmod $chmodv 755 $plugin_dir/operamotifwrapper $plugin_dir/operaplugincleaner $plugin_dir/libnpp.so.$plugin_version_major.$plugin_version_minor.$plugin_version_release
--
-- ln $lns $lnf libnpp.so.$plugin_version_major.$plugin_version_minor.$plugin_version_release $plugin_dir/libnpp.so.$plugin_version_major.$plugin_version_minor
-- ln $lns $lnf libnpp.so.$plugin_version_major.$plugin_version_minor.$plugin_version_release $plugin_dir/libnpp.so.$plugin_version_major
-- ln $lns $lnf libnpp.so.$plugin_version_major.$plugin_version_minor.$plugin_version_release $plugin_dir/libnpp.so
--
- # System wide configuration files
-- config_dir='/usr/local/etc'
-+ config_dir="$prefix/etc"
- if can_write_to "$config_dir"; then
-+if false; then # XXX
- echo
- echo "System wide configuration files:"
- echo " $config_dir/opera6rc"
-@@ -1128,6 +1122,7 @@
- ;;
- esac
- done
-+fi # XXX
- else
- echo
- echo "User \"${USERNAME}\" does not have write access to $config_dir"
diff --git a/www/opera/files/patch-install.sh b/www/opera/files/patch-install.sh
new file mode 100644
index 000000000000..224d708a29df
--- /dev/null
+++ b/www/opera/files/patch-install.sh
@@ -0,0 +1,269 @@
+--- install.sh.orig Mon Aug 11 16:27:15 2003
++++ install.sh Tue Aug 12 22:44:18 2003
+@@ -712,27 +712,17 @@
+
+ wrapper_opera_plugin_paths=" \"\${HOME}/.opera/plugins\" \\
+ ${plugin_dir} \\
+- /usr/lib/opera/plugins \\
+- /usr/local/lib/opera/plugins \\
+- /opt/lib/opera/plugins \\"
++ /usr/local/share/opera/plugins \\"
+
+ case "${machine}:${os}" in
+ i[3456]86:Linux|i[3456]86:FreeBSD|i[3456]86:NetBSD|i[3456]86:OpenBSD)
+ wrapper_plugin_paths="
+ /usr/local/Acrobat[45]/Browsers/intellinux \\
+- /usr/lib/Acrobat[45]/Browsers/intellinux \\
+- /usr/X11R6/lib/Acrobat[45]/Browsers/intellinux \\
+- /opt/Acrobat[45]/Browsers/intellinux \\
+- /usr/Acrobat[45]/Browsers/intellinux \\
+- /usr/j2se/jre/plugin/i386/ns4 \\
+- /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 \\"
++ /usr/local/linux-sun-jdk1.[34].1/jre/plugin/i386/ns4 \\
++ /usr/local/linux-blackdown-jdk1.[34].1/jre/plugin/i386/netscape4 \\"
+ wrapper_ibmjava="
+- IBMJava2-14/jre \\
+- IBMJava2-131/jre \\"
++ linux-ibm-jdk1.3.1/jre \\
++ linux-ibm-jdk1.4.0/jre \\"
+ wrapper_sunjava_machine="i386"
+ ;;
+
+@@ -779,15 +769,9 @@
+ ;;
+ esac
+ wrapper_netscape_plugin_paths="
+- /usr/lib/RealPlayer8/Plugins \\
+- /usr/lib/realplay/plugins \\
+- /usr/lib/RealPlayer8 \\
+- /usr/lib/realplay \\
++ /usr/local/lib/RealPlayer8/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 \\"
+
+ wrapper_file="${wrapper_dir}/opera"
+
+@@ -846,28 +830,13 @@
+
+ if test ! \"\${OPERA_JAVA_DIR}\"; then
+
+- PREFIXES=\"
+- /usr
+- /usr/java
+- /usr/lib
+- /usr/local
+- /opt\"
++ PREFIXES=\"/usr/local\"
+
+ for SUNJAVA in \\
+- j2re1.4.1_01 \\
+- j2re1.4.1 \\
+- 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 \\
++ linux-blackdown-jdk1.3.1/jre \\
++ linux-blackdown-jdk1.4.1/jre \\
++ linux-sun-jdk1.3.1/jre \\
++ linux-sun-jdk1.4.1/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
+@@ -912,11 +881,8 @@
+
+ # Acrobat Reader
+ for BINDIR in \\
+- /usr/local/Acrobat[45]/bin \\
+- /usr/lib/Acrobat[45]/bin \\
+- /usr/X11R6/lib/Acrobat[45]/bin \\
+- /opt/Acrobat[45]/bin \\
+- /usr/Acrobat[45]/bin \\
++ /usr/local/Acrobat4/bin \\
++ /usr/local/Acrobat5/bin \\
+ ; do
+ if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi
+ done
+@@ -1116,44 +1082,6 @@
+ cp $cpv $cpf plugins/operamotifwrapper plugins/operaplugincleaner plugins/libnpp.so $plugin_dir/
+ chmod $chmodv 755 $plugin_dir/operamotifwrapper $plugin_dir/operaplugincleaner $plugin_dir/libnpp.so
+
+- # System wide configuration files
+- config_dir='/usr/local/etc'
+- if can_write_to "$config_dir"; then
+- echo
+- echo "System wide configuration files:"
+- 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
+-
+- ''|y|Y|yes|YES)
+- 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
+- ;;
+-
+- n|N|no|NO)
+- break
+- ;;
+- *)
+- echo 'Invalid answer, try again:'
+- ;;
+- esac
+- done
+- else
+- echo
+- echo "User \"${USERNAME}\" does not have write access to $config_dir"
+- echo " System wide configuration files:"
+- echo " $config_dir/opera6rc"
+- echo " $config_dir/opera6rc.fixed"
+- echo " were not installed"
+- fi
+-
+ # Shorcuts and Icons
+ icons
+ gnome
+@@ -1249,22 +1177,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
+@@ -1330,36 +1258,36 @@
+ fi
+ # end /opt/gnome share
+
+- elif test -d /usr/share/gnome/; then
++ elif test -d /usr/X11R6/share/gnome/; then
+
+- # /usr/share/gnome icon
+- if test ! -d /usr/share/gnome/pixmaps/; then
+- if test -w /usr/share/gnome; then
+- mkdir $mkdirv $mkdirp /usr/share/gnome/pixmaps/
+- chmod $chmodv 755 /usr/share/gnome/pixmaps
+- cp $cpv $share_dir/images/opera.xpm /usr/share/gnome/pixmaps/opera.xpm
++ # /usr/X11R6/share/gnome icon
++ if test ! -d /usr/X11R6/share/gnome/pixmaps/; then
++ if test -w /usr/X11R6/share/gnome; then
++ mkdir $mkdirv $mkdirp /usr/X11R6/share/gnome/pixmaps/
++ chmod $chmodv 755 /usr/X11R6/share/gnome/pixmaps
++ cp $cpv $share_dir/images/opera.xpm /usr/X11R6/share/gnome/pixmaps/opera.xpm
+ fi
+- elif test -w /usr/share/gnome/pixmaps; then cp $cpv $share_dir/images/opera.xpm /usr/share/gnome/pixmaps/opera.xpm
++ elif test -w /usr/X11R6/share/gnome/pixmaps; then cp $cpv $share_dir/images/opera.xpm /usr/X11R6/share/gnome/pixmaps/opera.xpm
+ fi
+- # end /usr/share/gnome icon
++ # end /usr/X11R6/share/gnome icon
+
+- # /usr/share/gnome link
+- if test -d /usr/share/gnome/apps/; then
+- if test -d /usr/share/gnome/apps/Internet/; then
+- if test -w /usr/share/gnome/apps/Internet; then
+- generate_desktop /usr/share/gnome/apps/Internet
++ # /usr/X11R6/share/gnome link
++ if test -d /usr/X11R6/share/gnome/apps/; then
++ if test -d /usr/X11R6/share/gnome/apps/Internet/; then
++ if test -w /usr/X11R6/share/gnome/apps/Internet; then
++ generate_desktop /usr/X11R6/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 /usr/X11R6/share/gnome/apps/Networking/WWW/; then
++ if test -w /usr/X11R6/share/gnome/apps/Networking/WWW; then
++ generate_desktop /usr/X11R6/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 /usr/X11R6/share/gnome/apps; then
++ mkdir $mkdirv $mkdirp /usr/X11R6/share/gnome/apps/Internet/
++ chmod $chmodv 755 /usr/X11R6/share/gnome/apps/Internet
++ generate_desktop /usr/X11R6/share/gnome/apps/Internet
+ fi
+ fi
+- # end /usr/share/gnome link
++ # end /usr/X11R6/share/gnome link
+ fi
+ # Add ximian here
+ }
+@@ -1396,12 +1324,12 @@
+
+ fi
+
+- if test -d /usr/share/applnk/Networking; then
+- if test ! -d /usr/share/applnk/Networking/WWW/ -a -w /usr/share/applnk/Networking; then
+- mkdir $mkdirv $mkdirp /usr/share/applnk/Networking/WWW/
+- chmod $chmodv 755 /usr/share/applnk/Networking/WWW
++ if test -d /usr/X11R6/share/applnk/Networking; then
++ if test ! -d /usr/X11R6/share/applnk/Networking/WWW/ -a -w /usr/X11R6/share/applnk/Networking; then
++ mkdir $mkdirv $mkdirp /usr/X11R6/share/applnk/Networking/WWW/
++ chmod $chmodv 755 /usr/X11R6/share/applnk/Networking/WWW
+ fi
+- if test -w /usr/share/applnk/Networking/WWW; then generate_desktop /usr/share/applnk/Networking/WWW ${1}; fi
++ if test -w /usr/X11R6/share/applnk/Networking/WWW; then generate_desktop /usr/X11R6/share/applnk/Networking/WWW ${1}; fi
+ fi
+ }
+
+@@ -1425,8 +1353,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
+ }
+
--
cgit v1.2.3