Fix the package list and remove netscape plugin if installed

2 files changed, 95 insertions, 173 deletions

diff --git a/net/citrix_ica/files/patch-linuxx86::hinst b/net/citrix_ica/files/patch-linuxx86::hinst
index 4c57dafd8c24..bcade7d3a980 100644
--- a/net/citrix_ica/files/patch-linuxx86::hinst
+++ b/net/citrix_ica/files/patch-linuxx86::hinst
@@ -1,6 +1,6 @@
---- linuxx86/hinst.orig	Wed Sep  5 16:47:26 2001
-+++ linuxx86/hinst	Tue Jan 22 00:15:59 2002
-@@ -1965,10 +1965,31 @@
+--- linuxx86/hinst.orig	Wed Aug 22 14:52:20 2001
++++ linuxx86/hinst	Tue Jan 22 11:15:58 2002
+@@ -1961,10 +1961,32 @@
  #
  ###############################################################################
  
@@ -10,6 +10,7 @@
 +	\(SYSV\),)
 +		NETSCAPE_DIR="$1"
 +		PLUGIN_PATH="$s/plugins"
++		FOUND_NS="TRUE"
 +	esac
 +}
 +
@@ -34,3 +35,32 @@
  PLUGIN_NAME=npica.so
  PLUGIN_CLASS=ICAClObj.class
  
+@@ -2004,14 +2026,12 @@
+   $ECHO_CMD $integrate_netscape1
+   search_ok=0
+   
+-  if (test -d "/usr/lib/netscape"\
+-   || test -d "/usr/local/netscape"\
+-   || test -d "/opt/netscape"\
+-   || test -d "/usr/local/lib/netscape")
+-  then
++  case ${FOUND_NS} in
++  TRUE)
+   	$ECHO_CMD $integrate_netscape3
+   	found_netscape 
+-  else
++	;;
++  *) 
+ 	echo_no_nl $integrate_netscape2
+  	getyesno $INSTALLER_NO
+ 	if [ "$ANSWER" = "$INSTALLER_YES" ]
+@@ -2020,7 +2040,8 @@
+ 	else
+   		$ECHO_CMD $integrate_netscape6
+ 	fi
+-  fi;
++	;;
++  esac;
+ }
+ 
+ ################################################################################
diff --git a/net/citrix_ica/pkg-plist b/net/citrix_ica/pkg-plist
index 49cb4fc4e6ee..8d28731b2c57 100644
--- a/net/citrix_ica/pkg-plist
+++ b/net/citrix_ica/pkg-plist
@@ -1,32 +1,33 @@
-@unexec if [ -f %D/lib/netscape/mime.types ]; then (cat %D/lib/netscape/mime.types | grep -v "application/x-ica" > %D/lib/netscape/mime.types.tmp; mv %D/lib/netscape/mime.types.tmp %D/lib/netscape/mime.types); fi
-@unexec if [ -f %D/lib/netscape/mailcap ]; then (cat %D/lib/netscape/mailcap | grep -v "application/x-ica" > %D/lib/netscape/mailcap.tmp; mv %D/lib/netscape/mailcap.tmp %D/lib/netscape/mailcap); fi
-bin/wfcmgr
-bin/wfica
-ICAClient/wfica
-ICAClient/wfcmgr
-ICAClient/npica.so
-ICAClient/Wfica.ad
-ICAClient/Wfcmgr.ad
+@unexec if [ -f %D/lib/netscape-linux/mime.types ]; then (/bin/cat %D/lib/netscape-linux/mime.types | /usr/bin/grep -v "application/x-ica" > %D/lib/netscape-linux/mime.types.tmp; mv %D/lib/netscape-linux/mime.types.tmp %D/lib/netscape-linux/mime.types); fi
+@unexec if [ -f %D/lib/netscape-linux/mailcap ]; then (/bin/cat %D/lib/netscape-linux/mailcap | /usr/bin/grep -v "application/x-ica" > %D/lib/netscape-linux/mailcap.tmp; /bin/mv %D/lib/netscape-linux/mailcap.tmp %D/lib/netscape-linux/mailcap); fi
+@unexec if [ -e %D/lib/netscape-linux/plugins/npica.so ]; then (/bin/rm %D/lib/netscape-linux/plugins/npica.so); fi
+ICAClient/.config/appsrv.ini
+ICAClient/.config/keyboard.ini
+ICAClient/.config/module.ini
+ICAClient/.config/wfclient.ini
+ICAClient/Npica
 ICAClient/Npica.ad
-ICAClient/readme.txt
-ICAClient/eula.txt
-ICAClient/install.txt
-ICAClient/util/hinst
-ICAClient/util/echo_cmd
-ICAClient/util/icalicense.sh
-ICAClient/util/xcapture
-ICAClient/util/XCapture.ad
-ICAClient/setupwfc
+ICAClient/PDCRYPT1.DLL
+ICAClient/PDCRYPT2.DLL
+ICAClient/SSL.DLL
+ICAClient/Wfcmgr
+ICAClient/Wfcmgr.ad
+ICAClient/Wfica
+ICAClient/Wfica.ad
+ICAClient/config/.server
 ICAClient/config/appsrv.ini
 ICAClient/config/module.ini
 ICAClient/config/wfclient.ini
-ICAClient/config/.server
-ICAClient/.config/appsrv.ini
-ICAClient/.config/module.ini
-ICAClient/.config/wfclient.ini
-ICAClient/.config/keyboard.ini
+ICAClient/eula.txt
+ICAClient/help/index.htm
+ICAClient/icons/ica16.xpm
+ICAClient/icons/ica32.xpm
+ICAClient/icons/ica48.xpm
+ICAClient/icons/ica64.xpm
+ICAClient/install.txt
 ICAClient/keyboard/age2.kbd
 ICAClient/keyboard/agex2.kbd
+ICAClient/keyboard/automatic.kbd
 ICAClient/keyboard/dcint401.kbd
 ICAClient/keyboard/dcintpcx.kbd
 ICAClient/keyboard/dcus401.kbd
@@ -35,40 +36,43 @@ ICAClient/keyboard/dec401.kbd
 ICAClient/keyboard/dec401uk.kbd
 ICAClient/keyboard/decpcx.kbd
 ICAClient/keyboard/decpcxuk.kbd
+ICAClient/keyboard/dg.kbd
 ICAClient/keyboard/dgfr.kbd
 ICAClient/keyboard/dggr.kbd
 ICAClient/keyboard/dguk.kbd
 ICAClient/keyboard/dgus.kbd
-ICAClient/keyboard/dg.kbd
+ICAClient/keyboard/hp101.kbd
 ICAClient/keyboard/hpfritf.kbd
 ICAClient/keyboard/hpgritf.kbd
 ICAClient/keyboard/hpint101.kbd
 ICAClient/keyboard/hpintps2.kbd
-ICAClient/keyboard/hpukitf.kbd
-ICAClient/keyboard/hpus101.kbd
-ICAClient/keyboard/hpusitf.kbd
-ICAClient/keyboard/hpusps2.kbd
-ICAClient/keyboard/hp101.kbd
 ICAClient/keyboard/hpitf.kbd
 ICAClient/keyboard/hpps2.kbd
 ICAClient/keyboard/hpuk101.kbd
+ICAClient/keyboard/hpukitf.kbd
 ICAClient/keyboard/hpukps2.kbd
+ICAClient/keyboard/hpus101.kbd
+ICAClient/keyboard/hpusitf.kbd
+ICAClient/keyboard/hpusps2.kbd
 ICAClient/keyboard/ibm.kbd
 ICAClient/keyboard/keyboard.ini
 ICAClient/keyboard/linux.kbd
-ICAClient/keyboard/netbsd.kbd
 ICAClient/keyboard/mac101.kbd
 ICAClient/keyboard/ncdn-101.kbd
 ICAClient/keyboard/ncdn-102.kbd
+ICAClient/keyboard/netbsd.kbd
 ICAClient/keyboard/scoos5.kbd
 ICAClient/keyboard/scouw2.kbd
 ICAClient/keyboard/sg.kbd
+ICAClient/keyboard/sgindy.kbd
 ICAClient/keyboard/sgindyfr.kbd
 ICAClient/keyboard/sgindygr.kbd
 ICAClient/keyboard/sgindyuk.kbd
 ICAClient/keyboard/sgindyus.kbd
-ICAClient/keyboard/sgindy.kbd
 ICAClient/keyboard/sngr.kbd
+ICAClient/keyboard/sparc3.kbd
+ICAClient/keyboard/sparc4.kbd
+ICAClient/keyboard/sparc5.kbd
 ICAClient/keyboard/sparcfr4.kbd
 ICAClient/keyboard/sparcfr5.kbd
 ICAClient/keyboard/sparcgr4.kbd
@@ -78,151 +82,39 @@ ICAClient/keyboard/sparcuk5.kbd
 ICAClient/keyboard/sparcus3.kbd
 ICAClient/keyboard/sparcus4.kbd
 ICAClient/keyboard/sparcus5.kbd
-ICAClient/keyboard/sparc3.kbd
-ICAClient/keyboard/sparc4.kbd
-ICAClient/keyboard/sparc5.kbd
 ICAClient/keyboard/trimodal.kbd
-ICAClient/keyboard/automatic.kbd
-ICAClient/help/contents.htm
-ICAClient/help/ctx00013.htm
-ICAClient/help/ctx00014.htm
-ICAClient/help/ctx00015.htm
-ICAClient/help/ctx00016.htm
-ICAClient/help/ctx00017.htm
-ICAClient/help/ctx00018.htm
-ICAClient/help/ctx00019.htm
-ICAClient/help/ctx00020.htm
-ICAClient/help/ctx00021.htm
-ICAClient/help/ctx00022.htm
-ICAClient/help/ctx00023.htm
-ICAClient/help/ctx00025.htm
-ICAClient/help/ctx00026.htm
-ICAClient/help/ctx00027.htm
-ICAClient/help/ctx00028.htm
-ICAClient/help/ctx00029.htm
-ICAClient/help/ctx00030.htm
-ICAClient/help/ctx00031.htm
-ICAClient/help/ctx00032.htm
-ICAClient/help/ctx00033.htm
-ICAClient/help/ctx00034.htm
-ICAClient/help/ctx00035.htm
-ICAClient/help/ctx00195.htm
-ICAClient/help/ctx00196.htm
-ICAClient/help/ctx00197.htm
-ICAClient/help/ctx00198.htm
-ICAClient/help/ctx00199.htm
-ICAClient/help/ctx00200.htm
-ICAClient/help/ctx00201.htm
-ICAClient/help/ctx00202.htm
-ICAClient/help/ctx00203.htm
-ICAClient/help/ctx00204.htm
-ICAClient/help/ctx00205.htm
-ICAClient/help/ctx00206.htm
-ICAClient/help/ctx00207.htm
-ICAClient/help/ctx00208.htm
-ICAClient/help/ctx00209.htm
-ICAClient/help/ctx00210.htm
-ICAClient/help/ctx00211.htm
-ICAClient/help/index.htm
-ICAClient/help/1a.gif
-ICAClient/help/3a.gif
-ICAClient/help/3b.gif
-ICAClient/help/3c.gif
-ICAClient/help/3d.gif
-ICAClient/help/3f.gif
-ICAClient/help/3g.gif
-ICAClient/help/3h.gif
-ICAClient/help/3i.gif
-ICAClient/help/3l.gif
-ICAClient/help/3m.gif
-ICAClient/help/3n.gif
-ICAClient/help/3o.gif
-ICAClient/help/3p.gif
-ICAClient/help/3q.gif
-ICAClient/help/3r.gif
-ICAClient/help/3s.gif
-ICAClient/help/3t.gif
-ICAClient/help/3u.gif
-ICAClient/help/3v.gif
-ICAClient/help/3w.gif
-ICAClient/help/3x.gif
-ICAClient/help/3y.gif
-ICAClient/help/4a.gif
-ICAClient/help/4b.gif
-ICAClient/help/4c.gif
-ICAClient/help/4d.gif
-ICAClient/help/4e.gif
-ICAClient/help/4f.gif
-ICAClient/help/4g.gif
-ICAClient/help/4h.gif
-ICAClient/help/4i.gif
-ICAClient/help/4k.gif
-ICAClient/help/DIGITAL.gif
-ICAClient/help/HP.gif
-ICAClient/help/IBM.gif
-ICAClient/help/SG.gif
-ICAClient/help/SCO.gif
-ICAClient/help/SPARC.gif
-ICAClient/help/LINUX.gif
-ICAClient/help/contents.gif
-ICAClient/help/index.gif
-ICAClient/help/index_a.gif
-ICAClient/help/index_b.gif
-ICAClient/help/index_c.gif
-ICAClient/help/index_d.gif
-ICAClient/help/index_e.gif
-ICAClient/help/index_f.gif
-ICAClient/help/index_g.gif
-ICAClient/help/index_h.gif
-ICAClient/help/index_i.gif
-ICAClient/help/index_j.gif
-ICAClient/help/index_k.gif
-ICAClient/help/index_l.gif
-ICAClient/help/index_m.gif
-ICAClient/help/index_n.gif
-ICAClient/help/index_o.gif
-ICAClient/help/index_p.gif
-ICAClient/help/index_q.gif
-ICAClient/help/index_r.gif
-ICAClient/help/index_s.gif
-ICAClient/help/index_t.gif
-ICAClient/help/index_u.gif
-ICAClient/help/index_v.gif
-ICAClient/help/index_w.gif
-ICAClient/help/index_x.gif
-ICAClient/help/index_y.gif
-ICAClient/help/index_z.gif
-ICAClient/help/next0.gif
-ICAClient/help/next1.gif
-ICAClient/help/prev0.gif
-ICAClient/help/prev1.gif
-ICAClient/help/sett_cdm.gif
-ICAClient/help/sett_cache.gif
-ICAClient/help/prop_conn.gif
-ICAClient/help/comport.gif
-ICAClient/help/firewall.gif
-ICAClient/help/hotkeys.gif
-ICAClient/help/login.gif
-ICAClient/help/settings_diskc.gif
-ICAClient/help/properties_network.gif
-ICAClient/icons/ica16.xpm
-ICAClient/icons/ica32.xpm
-ICAClient/icons/ica48.xpm
-ICAClient/icons/ica64.xpm
-ICAClient/PDCRYPT1.DLL
-ICAClient/PDCRYPT2.DLL
-ICAClient/pkginf/Ver.core.linuxx86
+ICAClient/keystore/cacerts/BTCTRoot.crt
+ICAClient/keystore/cacerts/Class3PCA_G2_v2.crt
+ICAClient/keystore/cacerts/Class4PCA_G2_v2.crt
+ICAClient/keystore/cacerts/GTECTGlobalRoot.crt
+ICAClient/keystore/cacerts/GTECTRoot.crt
+ICAClient/keystore/cacerts/Pcs3ss_v4.crt
+ICAClient/keystore/cacerts/SecureServer.crt
+ICAClient/npica.so
 ICAClient/pkginf/F.core.linuxx86
+ICAClient/pkginf/Ver.core.linuxx86
+ICAClient/pkginf/changeno.dat
+ICAClient/readme.txt
+ICAClient/setupwfc
 ICAClient/util/XCapture
-ICAClient/Wfica
-ICAClient/Wfcmgr
-ICAClient/Npica
-@dirrm ICAClient/util
-@dirrm ICAClient/config
+ICAClient/util/XCapture.ad
+ICAClient/util/echo_cmd
+ICAClient/util/hinst
+ICAClient/util/icalicense.sh
+ICAClient/util/xcapture
+ICAClient/wfcmgr
+ICAClient/wfica
+bin/wfcmgr
+bin/wfica
 @dirrm ICAClient/.config
+@dirrm ICAClient/cache/zlcache
 @dirrm ICAClient/cache
-@dirrm ICAClient/keyboard
+@dirrm ICAClient/config
 @dirrm ICAClient/help
 @dirrm ICAClient/icons
+@dirrm ICAClient/keyboard
+@dirrm ICAClient/keystore/cacerts
+@dirrm ICAClient/keystore
 @dirrm ICAClient/pkginf
+@dirrm ICAClient/util
 @dirrm ICAClient