head	1.18;
access;
symbols
	old_RELEASE_4_8_0:1.17
	old_RELEASE_5_0_0:1.15
	old_RELEASE_4_7_0:1.15
	old_RELEASE_4_6_2:1.12
	old_RELEASE_4_6_1:1.12
	old_RELEASE_4_6_0:1.12
	old_RELEASE_5_0_DP1:1.10
	old_RELEASE_4_5_0:1.10
	old_RELEASE_4_4_0:1.5
	old_RELEASE_4_3_0:1.2;
locks; strict;
comment	@# @;


1.18
date	2003.04.20.05.20.45;	author nork;	state dead;
branches;
next	1.17;

1.17
date	2003.03.11.19.25.14;	author des;	state Exp;
branches;
next	1.16;

1.16
date	2003.02.10.11.25.49;	author des;	state Exp;
branches;
next	1.15;

1.15
date	2002.07.14.19.12.40;	author des;	state Exp;
branches;
next	1.14;

1.14
date	2002.07.04.00.22.42;	author des;	state Exp;
branches;
next	1.13;

1.13
date	2002.05.28.04.20.04;	author des;	state Exp;
branches;
next	1.12;

1.12
date	2002.04.26.20.26.42;	author des;	state Exp;
branches;
next	1.11;

1.11
date	2002.04.20.15.03.26;	author des;	state Exp;
branches;
next	1.10;

1.10
date	2002.01.18.18.50.12;	author des;	state Exp;
branches;
next	1.9;

1.9
date	2002.01.09.12.35.40;	author des;	state Exp;
branches;
next	1.8;

1.8
date	2001.12.06.13.02.30;	author des;	state Exp;
branches;
next	1.7;

1.7
date	2001.11.27.01.10.46;	author des;	state Exp;
branches;
next	1.6;

1.6
date	2001.11.27.00.29.59;	author des;	state Exp;
branches;
next	1.5;

1.5
date	2001.08.14.14.14.28;	author des;	state Exp;
branches;
next	1.4;

1.4
date	2001.05.16.12.20.28;	author des;	state Exp;
branches;
next	1.3;

1.3
date	2001.04.27.13.07.41;	author des;	state Exp;
branches;
next	1.2;

1.2
date	2001.03.22.12.19.20;	author des;	state Exp;
branches;
next	1.1;

1.1
date	2001.03.05.16.49.53;	author des;	state Exp;
branches;
next	;


desc
@@


1.18
log
@Remove obsolated files/patch-aa.

PR:		ports/51163 [1]
Submitted by:	Stacey Roberts <stacey@@vickiandstacey.com> [1]
		Ollivier Robert <roberto@@keltia.freenix.fr>
		Mezz <reigncracks@@hotmail.com> (maintainer)
		bento via kris
Pointy hat to:	myself (I forgot cvs remove)
@
text
@--- install.sh.orig	Wed Mar  5 19:07:59 2003
+++ install.sh	Tue Mar 11 18:37:28 2003
@@@@ -765,6 +765,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 \\"
+	    ;;
+
 	mips*:Linux)
 	    wrapper_plugin_paths=''
 	;;
@@@@ -890,7 +900,7 @@@@
 
 # Acrobat Reader
 for BINDIR in \\
-    /usr/local/Acrobat[45]/bin \\
+    $prefix/Acrobat[45]/bin \\
     /usr/lib/Acrobat[45]/bin \\
     /usr/X11R6/lib/Acrobat[45]/bin \\
     /opt/Acrobat[45]/bin \\
@@@@ -1100,8 +1110,9 @@@@
 	ln $lns $lnf libnpp.so.$plugin_version_major.$plugin_version_minor.$plugin_version_release $plugin_dir/libnpp.so
 
      # System wide configuration files
-	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"
@@@@ -1128,6 +1139,7 @@@@
 			;;
 		esac
 	    done
+fi # XXX
 	else
 	    echo
 	    echo "User \"${USERNAME}\" does not have write access to $config_dir"
@@@@ -1138,10 +1150,10 @@@@
 	fi
 
      # Shorcuts and Icons
-	icons
-	gnome
-	kde2
-	kde
+#	icons
+#	gnome
+#	kde2
+#	kde
 
 # Add uninstallation here
 
@


1.17
log
@Upgrade to 6.12.
@
text
@@


1.16
log
@Belatedly upgrade to 6.11.

PR:		ports/46335
Submitted by:	AMAKAWA Shuhei <sa264@@cam.ac.uk>
@
text
@d1 3
a3 3
--- install.sh.orig	Fri Nov 29 12:19:46 2002
+++ install.sh	Sun Dec 15 09:33:47 2002
@@@@ -762,6 +762,16 @@@@
d20 1
a20 1
@@@@ -887,7 +897,7 @@@@
d29 1
a29 1
@@@@ -1081,8 +1091,9 @@@@
d40 1
a40 1
@@@@ -1109,6 +1120,7 @@@@
d48 1
a48 1
@@@@ -1119,10 +1131,10 @@@@
@


1.15
log
@Don't install files outside of ${PREFIX}.
@
text
@d1 4
a4 4
--- 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 \\"
d9 6
a14 6
+    %%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 \\"
d20 1
a20 1
@@@@ -813,7 +823,7 @@@@
d25 1
a25 1
+    %%PREFIX%%/Acrobat[45]/bin \\
d29 1
a29 1
@@@@ -938,47 +948,17 @@@@
d33 12
a44 30
-	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
d47 2
a48 8
-	    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"
d50 2
a51 2
-
-     # Shorcuts and Icons
d56 4
@


1.14
log
@Upgrade to 6.02.

PR:		ports/40152
Submitted by:	yvind Kolbu <oyvind@@kebab.gaffel.nu>
@
text
@d1 2
a2 2
--- install.sh.orig	Wed Jul  3 18:05:43 2002
+++ install.sh	Wed Jul  3 18:06:06 2002
d29 1
a29 1
@@@@ -938,39 +948,15 @@@@
d74 8
@


1.13
log
@Upgrade to 6.01.

PR:		ports/38611
Submitted by:	yvind Kolbu <oyvind@@kebab.gaffel.nu>
@
text
@d1 3
a3 3
--- install.sh.orig	Thu May 23 13:34:04 2002
+++ install.sh	Mon May 27 14:25:51 2002
@@@@ -737,6 +737,16 @@@@
d20 1
a20 1
@@@@ -799,7 +809,7 @@@@
d29 46
@


1.12
log
@Re-add lib/netscape-linux/plugins to the plugin path so Flash works again.

PR:		37484
Submitted by:	yvind Kolbu <oyvind@@kebab.gaffel.nu>
@
text
@d1 3
a3 3
--- install.sh.orig	Fri Apr 12 14:01:42 2002
+++ install.sh	Fri Apr 26 13:41:08 2002
@@@@ -727,6 +727,15 @@@@
d10 1
d20 1
a20 1
@@@@ -783,7 +792,7 @@@@
@


1.11
log
@Upgrade to 6.0 Beta 2.  I've only tested it cursorily, but it seems about
an order of magnitude faster than Beta 1, and doesn't crash in situations
where Beta 1 used to.
@
text
@d2 2
a3 2
+++ install.sh	Sat Apr 20 16:50:05 2002
@@@@ -727,6 +727,14 @@@@
d10 1
d19 1
a19 1
@@@@ -783,7 +791,7 @@@@
@


1.10
log
@Upgrade to 20020110.1 (TP3).
@
text
@d1 26
a26 25
--- install.sh.orig	Thu Dec  6 12:19:52 2001
+++ install.sh	Wed Jan  9 13:33:42 2002
@@@@ -683,18 +692,11 @@@@
 for DIR in \\
     \"\${HOME}/.opera/plugins\" \\
     ${plugin_dir} \\
-    /usr/lib/opera/plugins \\
-    /usr/local/Acrobat4/Browsers/intellinux \\
-    /usr/java/jre1.3.1/plugin/i386/ns4 \\
-    /usr/lib/RealPlayer8/Plugins \\
-    /usr/lib/realplay/plugins \\
-    /usr/lib/RealPlayer8 \\
-    /usr/lib/realplay \\
+    %%PREFIX%%/lib/opera/plugins \\
+    %%PREFIX%%/Acrobat4/Browsers/intellinux \\
+    %%PREFIX%%/linux-*jdk*/jre/plugin/i386/ns4 \\
     \"\${HOME}/.netscape/plugins\" \\
-    /opt/netscape/plugins \\
-    /usr/lib/netscape/plugins \\
-    /usr/local/netscape/plugins \\
-    /usr/local/lib/netscape/plugins \\
+    %%PREFIX%%/lib/netscape-linux/plugins \\
     ; do
     if test -d \${DIR} ; then 
 	OPERA_PLUGIN_PATH=\"\${OPERA_PLUGIN_PATH}\":\"\${DIR}\"
@


1.9
log
@Fix the JDK path, and bump PORTREVISION.
@
text
@a2 18
@@@@ -310,7 +310,16 @@@@
 	    mvv=''    # SunOS mv (no -v verbose option)
 	;;
 
-	i[3456]86:NetBSD)
+	i[3456]86:FreeBSD|i[3456]86:NetBSD)
+	    cpf='-f'
+	    if test "$verbose" -gt '1'; then
+		chmodv='-v'
+		mkdirv='-v'
+	    fi
+	    if test "$verbose" -gt '0'; then
+		mvv='-v'
+		cpv='-v'
+	    fi
 	;;
 
 	i[3456]86:Linux)
@


1.8
log
@Upgrade to 6.0 TP2, which seems much stabler (if not faster) than TP1, no
longer has problems displaying JPG and PNG images, and is distributable.
@
text
@d2 1
a2 1
+++ install.sh	Thu Dec  6 13:49:56 2001
d34 1
a34 1
+    %%PREFIX%%/java/linux-*jdk*/jre/plugin/i386/ns4 \\
@


1.7
log
@Oops, previous revision didn't set OPERA_DIR correctly.
@
text
@d1 3
a3 3
--- install.sh.orig	Thu Nov 22 12:38:09 2001
+++ install.sh	Tue Nov 27 02:05:55 2001
@@@@ -228,7 +228,16 @@@@
d21 1
a21 15
@@@@ -477,10 +486,10 @@@@
 
 # Opera enviroment
 if test \"\${OPERA_DIR}\" = '' ; then 
-  if test -d /usr/share/opera ; then 
-    OPERA_DIR=/usr/share/opera
+  if test -d %%DATADIR%% ; then 
+    OPERA_DIR=%%DATADIR%%
   else
-    echo \"OPERA_DIR unset and not in default location (/usr/share/opera)\"
+    echo \"OPERA_DIR unset and not in default location (%%DATADIR%%)\"
     exit 1
   fi
 fi
@@@@ -491,18 +500,11 @@@@
@


1.6
log
@Upgrade to 6.0-20011122.1.

PR:		ports/32300
@
text
@d1 2
a2 2
--- install.sh.orig	Tue Nov 27 00:56:59 2001
+++ install.sh	Tue Nov 27 01:01:20 2001
d21 14
a40 2
+    %%PREFIX%%/lib/opera/plugins \\
+    %%PREFIX%%/Acrobat4/Browsers/intellinux \\
d46 2
@


1.5
log
@Upgrade to 5.05 TP1.

Note that plugins won't work unless you happen to have a Linux version of
Motif (or OpenMotif) installed; there is no linux-openmotif port (yet) so
you'll have to figure this one out on your own.  Once you do, though, both
www/linux-flashplugin and java/linux-jdk13 should work with no further
tweaks (as should any other Netscape-compatible plugin that installs into
${PREFIX}/lib/netscape-linux/plugins).  Happy browsing!
@
text
@d1 5
a5 5
--- install.sh.orig	Fri Aug 10 14:29:05 2001
+++ install.sh	Tue Aug 14 13:14:35 2001
@@@@ -186,14 +186,9 @@@@
 	mkdir $v -p $plugin_dir/
 	chmod $vv 755 $plugin_dir
d7 12
a18 12
-	cp $v -fdp plugins/* $plugin_dir
+	(cd plugins && tar -cf - . | tar $v -xf - -C $plugin_dir)
         chmod $vv 755 $plugin_dir/operamotifwrapper
-        chmod $vv 755 $plugin_dir/libnpp.so.0.1.0
-
-	icons
-	gnome
-	kde2
-	kde
+        chmod $vv 755 $plugin_dir/libnpp.so.0.1.1
 
 # Add uninstallation here
d20 24
@


1.4
log
@Opera 5.0 for Linux has now been released.
@
text
@d1 16
a16 10
--- install.sh.orig	Thu May 10 16:10:28 2001
+++ install.sh	Wed May 16 13:32:59 2001
@@@@ -125,8 +125,8 @@@@
 runinstall()
 {
     # Executable
-	cp $v -fp opera $exec_dir/
-        chmod $vv 755 $exec_dir/opera
+	cp $v -fp opera $exec_dir/opera-bin
+        chmod $vv 755 $exec_dir/opera-bin
d18 1
a18 127
     # Documentation
 	mkdir $v -p $doc_dir/
@@@@ -175,52 +175,46 @@@@
 
 	echo
 	echo 'Installation successful. Enjoy !'
-	if test "$flag_mode" = "--prefix="; then
-	  echo "You've completed a forced installation, please"
-	  echo "remember to set the enviroment variable OPERADIR"
-	  echo "export OPERADIR=$share_dir"
-	fi
-	echo "Start with \$PATH/opera, $exec_dir/opera or ./opera"
 }
 
 icons()
 {
-    if test ! -d /usr/share/icons; then install $v -m 755 -o 0 -g 0 -d /usr/share/icons/; fi
-    install $v -m 644 -o 0 -g 0 $share_dir/opera.xpm /usr/share/icons/opera.xpm
+    if test ! -d $share_dir/icons; then install $v -m 755 -o 0 -g 0 -d $share_dir/icons/; fi
+    install $v -m 644 -o 0 -g 0 -c $share_dir/opera.xpm $share_dir/icons/opera.xpm
   
-    if test ! -d /usr/share/pixmaps; then install $v -m 755 -o 0 -g 0 -d /usr/share/pixmaps/; fi   
-    install $v -m 644 -o 0 -g 0 $share_dir/opera.xpm /usr/share/pixmaps/opera.xpm
+    if test ! -d $share_dir/pixmaps; then install $v -m 755 -o 0 -g 0 -d $share_dir/pixmaps/; fi   
+    install $v -m 644 -o 0 -g 0 -c $share_dir/opera.xpm $share_dir/pixmaps/opera.xpm
   
-    if test -d /etc/X11/wmconfig/; then install $v -m 644 -o 0 -g 0 $share_dir/opera.wmconfig /etc/X11/wmconfig/opera; fi
+    if test -d /etc/X11/wmconfig/; then install $v -m 644 -o 0 -g 0 -c $share_dir/opera.wmconfig /etc/X11/wmconfig/opera; fi
     
     if test -d /etc/X11/applnk/; then
       if test ! -d /etc/X11/applnk/Internet/; then install $v -m 755 -o 0 -g 0 -d /etc/X11/applnk/Internet/; fi
-      install $v -m 644 -o 0 -g 0 $share_dir/opera.desktop /etc/X11/applnk/Internet/opera.desktop 
+      install $v -m 644 -o 0 -g 0 -c $share_dir/opera.desktop /etc/X11/applnk/Internet/opera.desktop 
     fi
 }
 
 gnome()
 {
-    if test -d /opt/gnome/; then
+    if test -d just_dont/opt/gnome/; then
       if test ! -d /opt/gnome/share/pixmaps/; then install $v -m 755 -o 0 -g 0 -d /opt/gnome/share/pixmaps/; fi
-      install $v -m 644 -o 0 -g 0 $share_dir/opera.xpm /opt/gnome/share/pixmaps/opera.xpm
+      install $v -m 644 -o 0 -g 0 -c $share_dir/opera.xpm /opt/gnome/share/pixmaps/opera.xpm
       if test -d /opt/gnome/share/gnome/apps/Internet/; then
-        install $v -m 644 -o 0 -g 0 $share_dir/opera.desktop /opt/gnome/share/gnome/apps/Internet/opera.desktop
+        install $v -m 644 -o 0 -g 0 -c $share_dir/opera.desktop /opt/gnome/share/gnome/apps/Internet/opera.desktop
       elif test -d /opt/gnome/share/gnome/apps/Networking/WWW/; then
-        install $v -m 644 -o 0 -g 0 $share_dir/opera.desktop /opt/gnome/share/gnome/apps/Networking/WWW/opera.desktop
+        install $v -m 644 -o 0 -g 0 -c $share_dir/opera.desktop /opt/gnome/share/gnome/apps/Networking/WWW/opera.desktop
       else
         install $v -m 755 -o 0 -g 0 /opt/gnome/share/gnome/apps/Internet/
-        install $v -m 644 -o 0 -g 0 $share_dir/opera.desktop /opt/gnome/share/gnome/apps/Internet/opera.desktop
+        install $v -m 644 -o 0 -g 0 -c $share_dir/opera.desktop /opt/gnome/share/gnome/apps/Internet/opera.desktop
       fi
     else
-      if test -d /usr/share/gnome/apps/; then
-        if test -d /usr/share/gnome/apps/Internet/; then
-          install $v -m 644 -o 0 -g 0 $share_dir/opera.desktop /usr/share/gnome/apps/Internet/opera.desktop
-        elif test -d /usr/share/gnome/apps/Networking/WWW; then
-          install $v -m 644 -o 0 -g 0 $share_dir/opera.desktop /usr/share/gnome/apps/Networking/WWW/opera.desktop
+      if test -d $share_dir/gnome/apps/; then
+        if test -d $share_dir/gnome/apps/Internet/; then
+          install $v -m 644 -o 0 -g 0 -c $share_dir/opera.desktop $share_dir/gnome/apps/Internet/opera.desktop
+        elif test -d $share_dir/gnome/apps/Networking/WWW; then
+          install $v -m 644 -o 0 -g 0 -c $share_dir/opera.desktop $share_dir/gnome/apps/Networking/WWW/opera.desktop
         else
-          install $v -m 755 -o 0 -g 0 -d /usr/share/gnome/apps/Internet/
-          install $v -m 644 -o 0 -g 0 $share_dir/opera.desktop /usr/share/gnome/apps/Internet/opera.desktop
+          install $v -m 755 -o 0 -g 0 -d $share_dir/gnome/apps/Internet/
+          install $v -m 644 -o 0 -g 0 -c $share_dir/opera.desktop $share_dir/gnome/apps/Internet/opera.desktop
         fi
       fi   
     fi
@@@@ -228,7 +222,7 @@@@
 
 kde2()
 {
-    if test -d /opt/kde2/; then
+    if test -d just_dont/opt/kde2/; then
       DIR_HI=/opt/kde2/share/icons/hicolor
       DIR_LO=/opt/kde2/share/icons/locolor
       if test ! -d $DIR_HI/48x48/apps/; then install $v -m 755 -o 0 -g 0 -d $DIR_HI/48x48/apps/; fi
@@@@ -237,31 +231,31 @@@@
       if test ! -d $DIR_LO/32x32/apps/; then install $v -m 755 -o 0 -g 0 -d $DIR_LO/32x32/apps/; fi
       if test ! -d $DIR_LO/22x22/apps/; then install $v -m 755 -o 0 -g 0 -d $DIR_LO/22x22/apps/; fi
       if test ! -d $DIR_LO/16x16/apps/; then install $v -m 755 -o 0 -g 0 -d $DIR_LO/16x16/apps/; fi
-      install $v -m 644 -o 0 -g 0 $share_dir/opera_48x48.png $DIR_HI/48x48/apps/opera.png
-      install $v -m 644 -o 0 -g 0 $share_dir/opera_32x32.png $DIR_HI/32x32/apps/opera.png
-      install $v -m 644 -o 0 -g 0 $share_dir/opera_22x22.png $DIR_HI/22x22/apps/opera.png
-      install $v -m 644 -o 0 -g 0 $share_dir/opera_32x32.png $DIR_LO/32x32/apps/opera.png
-      install $v -m 644 -o 0 -g 0 $share_dir/opera_22x22.png $DIR_LO/22x22/apps/opera.png
-      install $v -m 644 -o 0 -g 0 $share_dir/opera_16x16.png $DIR_LO/16x16/apps/opera.png
+      install $v -m 644 -o 0 -g 0 -c $share_dir/opera_48x48.png $DIR_HI/48x48/apps/opera.png
+      install $v -m 644 -o 0 -g 0 -c $share_dir/opera_32x32.png $DIR_HI/32x32/apps/opera.png
+      install $v -m 644 -o 0 -g 0 -c $share_dir/opera_22x22.png $DIR_HI/22x22/apps/opera.png
+      install $v -m 644 -o 0 -g 0 -c $share_dir/opera_32x32.png $DIR_LO/32x32/apps/opera.png
+      install $v -m 644 -o 0 -g 0 -c $share_dir/opera_22x22.png $DIR_LO/22x22/apps/opera.png
+      install $v -m 644 -o 0 -g 0 -c $share_dir/opera_16x16.png $DIR_LO/16x16/apps/opera.png
       if test ! -d /opt/kde2/share/applnk/Internet/; then install $v -m 755 -o 0 -g 0 -d /opt/kde2/share/applnk/Internet/; fi
-      install $v -m 644 -o 0 -g 0 $share_dir/opera.desktop /opt/kde2/share/applnk/Internet/opera.desktop
+      install $v -m 644 -o 0 -g 0 -c $share_dir/opera.desktop /opt/kde2/share/applnk/Internet/opera.desktop
     else
-      if test -d /usr/share/applnk/Networking; then
-        if test ! -d /usr/share/applnk/Networking/WWW/; then install $v -m 755 -o 0 -g 0 -d /usr/share/applnk/Networking/WWW/; fi
-        install $v -m 644 -o 0 -g 0 $share_dir/opera.desktop /usr/share/applnk/Networking/WWW/opera.desktop
+      if test -d $share_dir/applnk/Networking; then
+        if test ! -d $share_dir/applnk/Networking/WWW/; then install $v -m 755 -o 0 -g 0 -d $share_dir/applnk/Networking/WWW/; fi
+        install $v -m 644 -o 0 -g 0 -c $share_dir/opera.desktop $share_dir/applnk/Networking/WWW/opera.desktop
       fi
     fi
 }
 
 kde()
 {
-    if test -d /opt/kde/; then
+    if test -d just_dont/opt/kde/; then
       if test ! -d /opt/kde/share/icons/; then install $v -m 755 -o 0 -g 0 -d /opt/kde/share/icons/; fi
       if test ! -d /opt/kde/share/applnk/Internet/; then install $v -m 755 -o 0 -g 0 -d /opt/kde/share/applnk/Internet/; fi
-      install $v -m 644 -o 0 -g 0 $share_dir/opera.xpm /opt/kde/share/icons/opera.xpm
-      install $v -m 644 -o 0 -g 0 $share_dir/opera.desktop /opt/kde/share/applnk/Internet/opera.desktop
+      install $v -m 644 -o 0 -g 0 -c $share_dir/opera.xpm /opt/kde/share/icons/opera.xpm
+      install $v -m 644 -o 0 -g 0 -c $share_dir/opera.desktop /opt/kde/share/applnk/Internet/opera.desktop
     else
-      if test -d /usr/share/applnk/Internet/; then install $v -m 644 -o 0 -g 0 $share_dir/opera.desktop /usr/share/applnk/Internet/opera.desktop; fi
+      if test -d $share_dir/applnk/Internet/; then install $v -m 644 -o 0 -g 0 -c $share_dir/opera.desktop $share_dir/applnk/Internet/opera.desktop; fi
     fi
 }
@


1.3
log
@Upgrade to 5.0 beta 8.

Submitted by:	Jose Marques <jose.marques@@nottingham.ac.uk>
@
text
@d1 11
a11 3
--- install.sh.orig	Mon Apr  2 12:08:14 2001
+++ install.sh	Fri Apr 27 15:02:13 2001
@@@@ -143,12 +143,12 @@@@
d14 1
a14 33
 	chmod $vv 755 $doc_dir
-	cp $v -fup LICENSE $doc_dir
+	cp $v -fp LICENSE $doc_dir
 
     # Shared files
 	mkdir $v -p $share_dir/buttons/
 	chmod $vv 755 $share_dir/buttons
-	cp $v -Rfup buttons/* $share_dir/buttons/
+	cp $v -Rfp buttons/* $share_dir/buttons/
 
 	# fix for windows button sets
         cd $share_dir/buttons
@@@@ -158,18 +158,18 @@@@
 
 	mkdir $v -p $share_dir/help/
 	chmod $vv 755 $share_dir/help
-	cp $v -Rfup help/* $share_dir/help/
+	cp $v -Rfp help/* $share_dir/help/
 	    
 	mkdir $v -p $share_dir/images/
 	chmod $vv 755 $share_dir/images
-	cp $v -Rfup images/* $share_dir/images/
+	cp $v -Rfp images/* $share_dir/images/
 	
 	mkdir $v -p  $share_dir/styles/
 	chmod $vv 755 $share_dir/styles
-	cp $v -Rfup styles/* $share_dir/styles/
+	cp $v -Rfp styles/* $share_dir/styles/
 
-	cp $v -fup opera.xpm opera.wmconfig opera.desktop opera_*.png $share_dir/
-	cp $v -fup opera.adr $share_dir/
+	cp $v -fp opera.xpm opera.wmconfig opera.desktop opera_*.png $share_dir/
+	cp $v -fp opera.adr $share_dir/
d16 9
a24 3
 
 	icons
@@@@ -193,42 +193,42 @@@@
d31 1
a31 1
+    install $v -c -m 644 -o 0 -g 0 $share_dir/opera.xpm $share_dir/icons/opera.xpm
d36 1
a36 1
+    install $v -c -m 644 -o 0 -g 0 $share_dir/opera.xpm $share_dir/pixmaps/opera.xpm
d39 1
a39 1
+    if test -d /etc/X11/wmconfig/; then install $v -c -m 644 -o 0 -g 0 $share_dir/opera.wmconfig /etc/X11/wmconfig/opera; fi
d42 1
a42 1
-      if test ! -d /etc/X11/applnk/Internet/; then install $v -m 755 -o 0 -g 0 -d /etc/X11/applnk/Internet/; fi
d44 1
a44 2
+      if test ! -d /etc/X11/applnk/Internet/; then install $v -c -m 755 -o 0 -g 0 -d /etc/X11/applnk/Internet/; fi
+      install $v -c -m 644 -o 0 -g 0 $share_dir/opera.desktop /etc/X11/applnk/Internet/opera.desktop 
d50 3
a52 2
     if test -d /opt/gnome/; then
-      if test ! /opt/gnome/share/pixmaps/; then install $v -m 755 -o 0 -g 0 /opt/gnome/share/pixmaps/; fi
d54 1
a54 2
+      if test ! /opt/gnome/share/pixmaps/; then install $v -c -m 755 -o 0 -g 0 /opt/gnome/share/pixmaps/; fi
+      install $v -c -m 644 -o 0 -g 0 $share_dir/opera.xpm /opt/gnome/share/pixmaps/opera.xpm
d57 1
a57 1
+        install $v -c -m 644 -o 0 -g 0 $share_dir/opera.desktop /opt/gnome/share/gnome/apps/Internet/opera.desktop
d60 1
a60 1
+        install $v -c -m 644 -o 0 -g 0 $share_dir/opera.desktop /opt/gnome/share/gnome/apps/Networking/WWW/opera.desktop
d62 1
a62 1
-        install $v -m 755 -o 0 -g 0 /opt/gnome/share/gnome/apps/Internet/
d64 1
a64 2
+        install $v -c -m 755 -o 0 -g 0 /opt/gnome/share/gnome/apps/Internet/
+        install $v -c -m 644 -o 0 -g 0 $share_dir/opera.desktop /opt/gnome/share/gnome/apps/Internet/opera.desktop
d67 2
a68 2
       if test -d /usr/share/gnome/apps/; then
         if test -d /usr/share/gnome/apps/Internet/; then
d70 1
a70 2
+          install $v -c -m 644 -o 0 -g 0 $share_dir/opera.desktop /usr/share/gnome/apps/Internet/opera.desktop
         elif test -d /usr/share/gnome/apps/Networking/WWW; then
d72 5
a76 1
+          install $v -c -m 644 -o 0 -g 0 $share_dir/opera.desktop /usr/share/gnome/apps/Networking/WWW/opera.desktop
d78 1
a78 1
-          install $v -m 755 -o 0 -g 0 /usr/share/gnome/apps/Internet/
d80 2
a81 2
+          install $v -c -m 755 -o 0 -g 0 /usr/share/gnome/apps/Internet/
+          install $v -c -m 644 -o 0 -g 0 $share_dir/opera.desktop /usr/share/gnome/apps/Internet/opera.desktop
d85 10
a94 1
@@@@ -245,18 +245,18 @@@@
d104 6
a109 6
+      install $v -c -m 644 -o 0 -g 0 $share_dir/opera_48x48.png $DIR_HI/48x48/apps/opera.png
+      install $v -c -m 644 -o 0 -g 0 $share_dir/opera_32x32.png $DIR_HI/32x32/apps/opera.png
+      install $v -c -m 644 -o 0 -g 0 $share_dir/opera_22x22.png $DIR_HI/22x22/apps/opera.png
+      install $v -c -m 644 -o 0 -g 0 $share_dir/opera_32x32.png $DIR_LO/32x32/apps/opera.png
+      install $v -c -m 644 -o 0 -g 0 $share_dir/opera_22x22.png $DIR_LO/22x22/apps/opera.png
+      install $v -c -m 644 -o 0 -g 0 $share_dir/opera_16x16.png $DIR_LO/16x16/apps/opera.png
d112 1
a112 1
+      install $v -c -m 644 -o 0 -g 0 $share_dir/opera.desktop /opt/kde2/share/applnk/Internet/opera.desktop
d114 2
a115 2
       if test -d /usr/share/applnk/Networking; then
         if test ! -d /usr/share/applnk/Networking/WWW/; then install $v -m 755 -o 0 -g 0 -d /usr/share/applnk/Networking/WWW/; fi
d117 3
a119 1
+        install $v -c -m 644 -o 0 -g 0 $share_dir/opera.desktop /usr/share/applnk/Networking/WWW/opera.desktop
d123 5
a127 2
@@@@ -266,10 +266,10 @@@@
     if test -d /opt/kde/; then
d132 2
a133 2
+      install $v -c -m 644 -o 0 -g 0 $share_dir/opera.xpm /opt/kde/share/icons/opera.xpm
+      install $v -c -m 644 -o 0 -g 0 $share_dir/opera.desktop /opt/kde/share/applnk/Internet/opera.desktop
d136 1
a136 1
+      if test -d /usr/share/applnk/Internet/; then install $v -c -m 644 -o 0 -g 0 $share_dir/opera.desktop /usr/share/applnk/Internet/opera.desktop; fi
@


1.2
log
@5.0b7 is here.
@
text
@d1 3
a3 9
--- install.sh.orig	Thu Feb  8 14:43:35 2001
+++ install.sh	Mon Mar  5 17:37:06 2001
@@@@ -138,17 +138,17 @@@@
 {
     # Executable
         chmod $vv 755 opera
-	cp $v -fup opera $exec_dir/
+	cp $v -fp opera $exec_dir/
 
d36 1
a36 1
-	cp $v -iup opera.adr $share_dir/
d38 1
a38 1
+	cp $v -ip opera.adr $share_dir/
d42 1
a42 1
@@@@ -193,11 +193,11 @@@@
d49 1
a49 1
+    install $v -C -m 644 -o 0 -g 0 $share_dir/opera.xpm $share_dir/icons/opera.xpm
d54 1
a54 1
+    install $v -C -m 644 -o 0 -g 0 $share_dir/opera.xpm $share_dir/pixmaps/opera.xpm
d56 2
a57 1
     if test -d /etc/X11/wmconfig/; then install $v -m 644 -o 0 -g 0 $share_dir/opera.wmconfig /etc/X11/wmconfig/opera; fi
d59 84
@


1.1
log
@Upgrade to 5.0b6. This one was a real bitch.
@
text
@d45 1
a45 1
 	
@

