Update to version 9. The old distfile was removed.

Approved by:	maintainer (mbr)

8 files changed, 58 insertions, 58 deletions

diff --git a/net/citrix_ica/Makefile b/net/citrix_ica/Makefile
index 1703390c944a..2d0f6d9b5678 100644
--- a/net/citrix_ica/Makefile
+++ b/net/citrix_ica/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	citrix_ica
-PORTVERSION=	8.00
-PORTREVISION=	3
+PORTVERSION=	9.00
 CATEGORIES=	net comms linux
 MASTER_SITES=
 DISTNAME=	${PORTNAME}-linuxx86-${PORTVERSION}
diff --git a/net/citrix_ica/distinfo b/net/citrix_ica/distinfo
index a32a0bf3a8ce..7de73c010cfe 100644
--- a/net/citrix_ica/distinfo
+++ b/net/citrix_ica/distinfo
@@ -1,2 +1,2 @@
-MD5 (citrix_ica-linuxx86-8.00.tar.gz) = c6622eed6ac9666bac578dccfcb81cee
-SIZE (citrix_ica-linuxx86-8.00.tar.gz) = 1564536
+MD5 (citrix_ica-linuxx86-9.00.tar.gz) = df3194f942e03b8c700907a3406aef76
+SIZE (citrix_ica-linuxx86-9.00.tar.gz) = 1356273
diff --git a/net/citrix_ica/files/patch-linuxx86::hinst b/net/citrix_ica/files/patch-linuxx86::hinst
index 0fb29d945518..9df7a9bd661b 100644
--- a/net/citrix_ica/files/patch-linuxx86::hinst
+++ b/net/citrix_ica/files/patch-linuxx86::hinst
@@ -1,5 +1,5 @@
---- linuxx86/hinst.orig	Fri May  7 14:44:44 2004
-+++ linuxx86/hinst	Fri Jun  4 17:44:53 2004
+--- linuxx86/hinst.orig	Fri Apr  8 19:52:59 2005
++++ linuxx86/hinst	Wed May 18 14:07:10 2005
 @@ -75,7 +75,7 @@
  fi
  
@@ -9,7 +9,7 @@
  
  #  Default CDROM mount point
  DefaultCDSourceDir=/cdrom
-@@ -2091,7 +2091,7 @@
+@@ -2166,7 +2166,7 @@
  
  	# rm -f $m_filename $mf_filename $o_filename $of_filename
  
@@ -18,7 +18,7 @@
  }
  
  ###############################################################################
-@@ -2142,10 +2142,34 @@
+@@ -2217,10 +2217,34 @@
  #
  ###############################################################################
  
@@ -55,11 +55,11 @@
  PLUGIN_NAME=npica.so
  PLUGIN_CLASS=ICAClObj.class
  MAILCAP_FILE=mailcap
-@@ -2218,36 +2242,29 @@
+@@ -2293,26 +2317,19 @@
  
  netscape_integrate()
  {
--  $ECHO_CMD $integrate_netscape1
+-  user_echo $integrate_netscape1
    if test -z "$SU_INSTALL"
    then
      set_npui_variables
@@ -77,31 +77,29 @@
 -	|| test "$EXTRA_BROWSERS" != ""
 -    then
 +
-+   case ${FOUND_NS} in
-+   TRUE)
-   	$ECHO_CMD $integrate_netscape3
++    case ${FOUND_NS} in
++    TRUE)
+   	user_echo $integrate_netscape3
    	found_netscape 
 -    else
 +	;;
-+   *)
- 	echo_no_nl $integrate_netscape2
++    *)
+ 	user_prompt $integrate_netscape2
   	getyesno $INSTALLER_NO
--	if [ "$ANSWER" = "$INSTALLER_YES" ]
--	then
-+	if [ "$ANSWER" = "$INSTALLER_YES" ]; then
- 		found_netscape
+ 	if [ "$ANSWER" = "$INSTALLER_YES" ]
+@@ -2321,9 +2338,9 @@
  	else
-   		$ECHO_CMD $integrate_netscape6
+   		user_echo $integrate_netscape6
  	fi
--    fi
++	;;
++    esac
+     fi
 -  fi
-+   	;;
-+   esac
-+   fi
- 
+-
      # Create utility script files in install root.
      create_wfica_script
-@@ -2878,55 +2895,6 @@
+     create_wfica_assoc_script
+@@ -2953,55 +2970,6 @@
      echo "$BINDIR"
  }
  
@@ -115,7 +113,7 @@
 -################################################################################
 -find_browsers()
 -{
--    PROGS="netscape mozilla"
+-    PROGS="netscape mozilla firefox"
 -    DIST_BIN_DIR=""
 -    STANDARD_DIRS="/usr/local/netscape /usr/local/mozilla"
 -
@@ -157,8 +155,8 @@
  BROWSER_LIST_KEY="BROWSER_DIR"
  ################################################################################
  #
-@@ -3151,6 +3119,8 @@
- wfcmgr_ja_NAME='Citrix ICA クライアント'
+@@ -3226,6 +3194,8 @@
+ wfcmgr_ja_NAME='MetaFrame UNIX クライアント'
  
  DEFAULT_GNOME_TARGET_DIRS="/usr/share/applications \
 +                           /usr/local/share/applnk/Internet \
diff --git a/net/citrix_ica/pkg-plist b/net/citrix_ica/pkg-plist
index 8b4d8a4ecdb4..9ad900bd5c55 100644
--- a/net/citrix_ica/pkg-plist
+++ b/net/citrix_ica/pkg-plist
@@ -9,6 +9,7 @@ ICAClient/libctxssl.so
 ICAClient/Npica
 ICAClient/Npica.ad
 ICAClient/CHARICONV.DLL
+ICAClient/NDS.DLL
 ICAClient/PDCRYPT1.DLL
 ICAClient/PDCRYPT2.DLL
 ICAClient/TW1.DLL
@@ -111,6 +112,8 @@ ICAClient/util/echo_cmd
 ICAClient/util/hinst
 ICAClient/util/icalicense.sh
 ICAClient/util/nslaunch
+ICAClient/util/pacexec
+ICAClient/util/pac.js
 ICAClient/util/xcapture
 ICAClient/wfcmgr
 ICAClient/wfica
diff --git a/net/citrix_xenapp/Makefile b/net/citrix_xenapp/Makefile
index 1703390c944a..2d0f6d9b5678 100644
--- a/net/citrix_xenapp/Makefile
+++ b/net/citrix_xenapp/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	citrix_ica
-PORTVERSION=	8.00
-PORTREVISION=	3
+PORTVERSION=	9.00
 CATEGORIES=	net comms linux
 MASTER_SITES=
 DISTNAME=	${PORTNAME}-linuxx86-${PORTVERSION}
diff --git a/net/citrix_xenapp/distinfo b/net/citrix_xenapp/distinfo
index a32a0bf3a8ce..7de73c010cfe 100644
--- a/net/citrix_xenapp/distinfo
+++ b/net/citrix_xenapp/distinfo
@@ -1,2 +1,2 @@
-MD5 (citrix_ica-linuxx86-8.00.tar.gz) = c6622eed6ac9666bac578dccfcb81cee
-SIZE (citrix_ica-linuxx86-8.00.tar.gz) = 1564536
+MD5 (citrix_ica-linuxx86-9.00.tar.gz) = df3194f942e03b8c700907a3406aef76
+SIZE (citrix_ica-linuxx86-9.00.tar.gz) = 1356273
diff --git a/net/citrix_xenapp/files/patch-linuxx86::hinst b/net/citrix_xenapp/files/patch-linuxx86::hinst
index 0fb29d945518..9df7a9bd661b 100644
--- a/net/citrix_xenapp/files/patch-linuxx86::hinst
+++ b/net/citrix_xenapp/files/patch-linuxx86::hinst
@@ -1,5 +1,5 @@
---- linuxx86/hinst.orig	Fri May  7 14:44:44 2004
-+++ linuxx86/hinst	Fri Jun  4 17:44:53 2004
+--- linuxx86/hinst.orig	Fri Apr  8 19:52:59 2005
++++ linuxx86/hinst	Wed May 18 14:07:10 2005
 @@ -75,7 +75,7 @@
  fi
  
@@ -9,7 +9,7 @@
  
  #  Default CDROM mount point
  DefaultCDSourceDir=/cdrom
-@@ -2091,7 +2091,7 @@
+@@ -2166,7 +2166,7 @@
  
  	# rm -f $m_filename $mf_filename $o_filename $of_filename
  
@@ -18,7 +18,7 @@
  }
  
  ###############################################################################
-@@ -2142,10 +2142,34 @@
+@@ -2217,10 +2217,34 @@
  #
  ###############################################################################
  
@@ -55,11 +55,11 @@
  PLUGIN_NAME=npica.so
  PLUGIN_CLASS=ICAClObj.class
  MAILCAP_FILE=mailcap
-@@ -2218,36 +2242,29 @@
+@@ -2293,26 +2317,19 @@
  
  netscape_integrate()
  {
--  $ECHO_CMD $integrate_netscape1
+-  user_echo $integrate_netscape1
    if test -z "$SU_INSTALL"
    then
      set_npui_variables
@@ -77,31 +77,29 @@
 -	|| test "$EXTRA_BROWSERS" != ""
 -    then
 +
-+   case ${FOUND_NS} in
-+   TRUE)
-   	$ECHO_CMD $integrate_netscape3
++    case ${FOUND_NS} in
++    TRUE)
+   	user_echo $integrate_netscape3
    	found_netscape 
 -    else
 +	;;
-+   *)
- 	echo_no_nl $integrate_netscape2
++    *)
+ 	user_prompt $integrate_netscape2
   	getyesno $INSTALLER_NO
--	if [ "$ANSWER" = "$INSTALLER_YES" ]
--	then
-+	if [ "$ANSWER" = "$INSTALLER_YES" ]; then
- 		found_netscape
+ 	if [ "$ANSWER" = "$INSTALLER_YES" ]
+@@ -2321,9 +2338,9 @@
  	else
-   		$ECHO_CMD $integrate_netscape6
+   		user_echo $integrate_netscape6
  	fi
--    fi
++	;;
++    esac
+     fi
 -  fi
-+   	;;
-+   esac
-+   fi
- 
+-
      # Create utility script files in install root.
      create_wfica_script
-@@ -2878,55 +2895,6 @@
+     create_wfica_assoc_script
+@@ -2953,55 +2970,6 @@
      echo "$BINDIR"
  }
  
@@ -115,7 +113,7 @@
 -################################################################################
 -find_browsers()
 -{
--    PROGS="netscape mozilla"
+-    PROGS="netscape mozilla firefox"
 -    DIST_BIN_DIR=""
 -    STANDARD_DIRS="/usr/local/netscape /usr/local/mozilla"
 -
@@ -157,8 +155,8 @@
  BROWSER_LIST_KEY="BROWSER_DIR"
  ################################################################################
  #
-@@ -3151,6 +3119,8 @@
- wfcmgr_ja_NAME='Citrix ICA クライアント'
+@@ -3226,6 +3194,8 @@
+ wfcmgr_ja_NAME='MetaFrame UNIX クライアント'
  
  DEFAULT_GNOME_TARGET_DIRS="/usr/share/applications \
 +                           /usr/local/share/applnk/Internet \
diff --git a/net/citrix_xenapp/pkg-plist b/net/citrix_xenapp/pkg-plist
index 8b4d8a4ecdb4..9ad900bd5c55 100644
--- a/net/citrix_xenapp/pkg-plist
+++ b/net/citrix_xenapp/pkg-plist
@@ -9,6 +9,7 @@ ICAClient/libctxssl.so
 ICAClient/Npica
 ICAClient/Npica.ad
 ICAClient/CHARICONV.DLL
+ICAClient/NDS.DLL
 ICAClient/PDCRYPT1.DLL
 ICAClient/PDCRYPT2.DLL
 ICAClient/TW1.DLL
@@ -111,6 +112,8 @@ ICAClient/util/echo_cmd
 ICAClient/util/hinst
 ICAClient/util/icalicense.sh
 ICAClient/util/nslaunch
+ICAClient/util/pacexec
+ICAClient/util/pac.js
 ICAClient/util/xcapture
 ICAClient/wfcmgr
 ICAClient/wfica