diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2003-02-10 11:25:49 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2003-02-10 11:25:49 +0000 |
| commit | f5649ecb011ec22d5614f591bb3db34658be3e5e (patch) | |
| tree | 00b4612ee2ddd55013f07f482fc45ff9e1265dc8 /www/linux-opera7/files/patch-aa | |
| parent | Take care not to dereference the return value from getenv(3) without first (diff) | |
Belatedly upgrade to 6.11.
PR: ports/46335
Submitted by: AMAKAWA Shuhei <sa264@cam.ac.uk>
Diffstat (limited to 'www/linux-opera7/files/patch-aa')
| -rw-r--r-- | www/linux-opera7/files/patch-aa | 86 |
1 files changed, 33 insertions, 53 deletions
diff --git a/www/linux-opera7/files/patch-aa b/www/linux-opera7/files/patch-aa index 69c8a0fd8db2..8e4845dfb289 100644 --- a/www/linux-opera7/files/patch-aa +++ b/www/linux-opera7/files/patch-aa @@ -1,82 +1,62 @@ ---- install.sh.orig Mon Jul 1 14:06:31 2002 -+++ install.sh Sun Jul 14 21:10:25 2002 -@@ -751,6 +751,16 @@ - /usr/lib/j2re1.3/plugin/i386/netscape4 \\" +--- install.sh.orig Fri Nov 29 12:19:46 2002 ++++ install.sh Sun Dec 15 09:33:47 2002 +@@ -762,6 +762,16 @@ + wrapper_sunjava_machine="sparc" ;; + i386:FreeBSD) + wrapper_plugin_paths=" -+ %%PREFIX%%/Acrobat[45]/bin \\ -+ %%PREFIX%%/lib/RealPlayer8/Plugins \\ -+ %%PREFIX%%/lib/netscape-linux/plugins \\ -+ %%PREFIX%%/linux-jdk1.3.1/jre/plugin/i386/ns4 \\ -+ %%PREFIX%%/linux-ibm-jdk1.3.0/jre/bin \\ -+ %%PREFIX%%/linux-jdk1.4.0b3/jre/plugin/i386/ns4 \\" ++ $prefix/Acrobat[45]/bin \\ ++ $prefix/lib/RealPlayer8/Plugins \\ ++ $prefix/lib/netscape-linux/plugins \\ ++ $prefix/linux-jdk1.3.1/jre/plugin/i386/ns4 \\ ++ $prefix/linux-ibm-jdk1.3.0/jre/bin \\ ++ $prefix/linux-jdk1.4.0b3/jre/plugin/i386/ns4 \\" + ;; + mips*:Linux) wrapper_plugin_paths='' ;; -@@ -813,7 +823,7 @@ +@@ -887,7 +897,7 @@ # Acrobat Reader for BINDIR in \\ - /usr/local/Acrobat[45]/bin \\ -+ %%PREFIX%%/Acrobat[45]/bin \\ ++ $prefix/Acrobat[45]/bin \\ /usr/lib/Acrobat[45]/bin \\ /usr/X11R6/lib/Acrobat[45]/bin \\ /opt/Acrobat[45]/bin \\ -@@ -938,47 +948,17 @@ +@@ -1081,8 +1091,9 @@ ln $lns $lnf libnpp.so.$plugin_version_major.$plugin_version_minor.$plugin_version_release $plugin_dir/libnpp.so # System wide configuration files -- if can_write_to "/etc"; then -- echo -- echo "System wide configuration files:" -- echo " /etc/opera6rc" -- echo " /etc/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 /etc/opera6rc opera6rc config -- backup /etc/opera6rc.fixed opera6rc.fixed config -- cp $cpv $cpf $cpp config/opera6rc /etc -- cp $cpv $cpf $cpp config/opera6rc.fixed /etc -- break -- ;; -- -- n|N|no|NO) -- break -- ;; -- *) -- echo 'Invalid answer, try again:' -- ;; -- esac -- done -+ if can_write_to "%%PREFIX%%/etc"; then -+ cp $cpv $cpf $cpp config/opera6rc %%PREFIX%%/etc -+ cp $cpv $cpf $cpp config/opera6rc.fixed %%PREFIX%%/etc +- config_dir="/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" +@@ -1109,6 +1120,7 @@ + ;; + esac + done ++fi # XXX else echo -- echo "User \"${USERNAME}\" does not have write access to /etc" -+ echo "User \"${USERNAME}\" does not have write access to %%PREFIX%%/etc" - echo " System wide configuration files:" -- echo " /etc/opera6rc" -- echo " /etc/opera6rc.fixed" -+ echo " %%PREFIX%%/etc/opera6rc" -+ echo " %%PREFIX%%/etc/opera6rc.fixed" - echo " were not installed" + echo "User \"${USERNAME}\" does not have write access to $config_dir" +@@ -1119,10 +1131,10 @@ fi -- -- # Shorcuts and Icons + + # Shorcuts and Icons - icons - gnome - kde2 - kde ++# icons ++# gnome ++# kde2 ++# kde # Add uninstallation here |