diff options
Diffstat (limited to 'japanese/citrix_xenapp/files/patch-linuxx86__hinst')
| -rw-r--r-- | japanese/citrix_xenapp/files/patch-linuxx86__hinst | 166 |
1 files changed, 0 insertions, 166 deletions
diff --git a/japanese/citrix_xenapp/files/patch-linuxx86__hinst b/japanese/citrix_xenapp/files/patch-linuxx86__hinst deleted file mode 100644 index d4bb89ccae8b..000000000000 --- a/japanese/citrix_xenapp/files/patch-linuxx86__hinst +++ /dev/null @@ -1,166 +0,0 @@ ---- linuxx86/hinst.orig Tue Dec 6 10:50:57 2005 -+++ linuxx86/hinst Thu Jun 1 08:58:24 2006 -@@ -74,7 +74,7 @@ - fi - - # Install in here by default. --DefaultInstallDir=/usr/lib/ICAClient -+DefaultInstallDir=/usr/local/ICAClient - - # Default CDROM mount point - DefaultCDSourceDir=/cdrom -@@ -2172,7 +2172,7 @@ - tr_file $TR_FILE_KEY $PORT/$PORT.psf - preen_files - -- /bin/true -+ /usr/bin/true - } - - ############################################################################### -@@ -2222,10 +2222,34 @@ - # - ############################################################################### - -+check_for_ns() { -+ BIN=`/usr/bin/file $1/plugins/libnullplugin.so | /usr/bin/awk '{print $11}'` -+ case ${BIN} in -+ \(SYSV\),) -+ NETSCAPE_DIR="$1" -+ PLUGIN_PATH="$s/plugins" -+ FOUND_NS="TRUE" -+ esac -+} -+ -+NSCP="/usr/local/libexec/netscape \ -+ /usr/local/libexec/netscape-linux \ -+ /usr/local/netscape \ -+ /usr/local/netscape-linux \ -+ /usr/local/lib/netscape \ -+ /usr/local/lib/netscape-linux \ -+ /usr/local/lib/linux-mozilla \ -+ /usr/local/lib/mozilla \ -+ $MOZILLA_HOME" -+ -+for dir in ${NSCP}; do -+ if [ -e $dir/plugins/libnullplugin.so ]; then -+ check_for_ns $dir; -+ fi -+done -+ - INST_DIR=$ICAInstDir - TMP_NAME=/tmp/ICAnetscape.$$ --NETSCAPE_DIR="/usr/local/lib/netscape" --PLUGIN_PATH="/usr/local/netscape/plugins" - PLUGIN_NAME=npica.so - PLUGIN_CLASS=ICAClObj.class - MAILCAP_FILE=mailcap -@@ -2298,26 +2322,18 @@ - - netscape_integrate() - { -- user_echo $integrate_netscape1 - if test -z "$SU_INSTALL" - then - set_npui_variables - found_netscape - else - search_ok=0 -- EXTRA_BROWSERS=`find_browsers` -- -- if test -d "/usr/lib/netscape"\ -- || test -d "/usr/local/netscape"\ -- || test -d "/opt/netscape"\ -- || test -d "/usr/local/lib/netscape"\ -- || test -d "/usr/dt/appconfig/netscape"\ -- || test "$MOZILLA_HOME" != "" -a -d "$MOZILLA_HOME"\ -- || test "$EXTRA_BROWSERS" != "" -- then -+ case ${FOUND_NS} in -+ TRUE) - user_echo $integrate_netscape3 - found_netscape -- else -+ ;; -+ *) - user_prompt $integrate_netscape2 - getyesno $INSTALLER_NO - if [ "$ANSWER" = "$INSTALLER_YES" ] -@@ -2326,7 +2342,8 @@ - else - user_echo $integrate_netscape6 - fi -- fi -+ ;; -+ esac - fi - - # Create utility script files in install root. -@@ -2964,55 +2981,6 @@ - echo "$BINDIR" - } - --################################################################################ --# --# find_browsers --# --# Returns a list of directories containing new-style mozilla-based browsers --# that may be launched by files on the $PATH. --# --################################################################################ --find_browsers() --{ -- PROGS="netscape mozilla firefox" -- DIST_BIN_DIR="" -- STANDARD_DIRS="/usr/local/netscape /usr/local/mozilla /usr/local/firefox /usr/lib/mozilla" -- -- case $op_system in -- SunOS) if -- /usr/bin/pkginfo -q $SOLARIS_PACKAGE_NAME -- then -- relocation_base=`/usr/bin/pkginfo -r $SOLARIS_PACKAGE_NAME` -- STANDARD_DIRS="$STANDARD_DIRS $relocation_base/$SOLARIS_PACKAGE_DIRECTORY" -- -- # N.B. the Netscape 7 packages for SOLARIS 9 have an extended installation path built-in! -- case `uname -r` in -- 5.9) STANDARD_DIRS="$STANDARD_DIRS $relocation_base/dt/appconfig/$SOLARIS_PACKAGE_DIRECTORY" -- ;; -- *) ;; -- esac -- fi;; -- *) ;; -- esac -- -- for d in `echo $PATH | sed "s/:/ /g"` $STANDARD_DIRS -- do -- echo $d -- done | sort -u | while read d -- do -- for p in $PROGS -- do -- # Find the each instance of each named browser -- PROG=$d/$p -- if test -f $PROG -- then -- # Where is the installation and what version is it? -- find_extra_bin_dirs $PROG -- fi -- done -- done | sort -u --} -- - BROWSER_LIST_KEY="BROWSER_DIR" - ################################################################################ - # -@@ -3238,7 +3206,10 @@ - XDG_TARGET_DIR="/usr/share/applications" - TL_MENU_DIR="Vendor_menus/Applications" # TurboLinux - TL_TOP_DIR="/usr/share/applnk/"$TL_MENU_DIR --DEFAULT_GNOME_TARGET_DIRS="/etc/opt/gnome/SuSE/Internet" -+EFAULT_GNOME_TARGET_DIRS="/usr/share/applications \ -+ /usr/local/share/applnk/Internet \ -+ /usr/local/share/applnk/Networking \ -+ /etc/opt/gnome/SuSE/Internet" - DEFAULT_KDE_TARGET_DIRS="/usr/share/applnk-redhat/Internet \ - /usr/share/applnk-mdk/Networking \ - $TL_TOP_DIR/Internet \ |