- Update to 10.0

PR:		112120
Submitted by:	Thomas Abthorpe <thomas@goodking.ca> (maintainer)

5 files changed, 67 insertions, 73 deletions

diff --git a/german/citrix_ica/Makefile b/german/citrix_ica/Makefile
index 81184167fa7f..541116ca7d95 100644
--- a/german/citrix_ica/Makefile
+++ b/german/citrix_ica/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	citrix_ica
-PORTVERSION=	9.15
+PORTVERSION=	10.0
 CATEGORIES=	german net comms linux
 MASTER_SITES=
 DISTNAME=	${PORTNAME}-linuxx86-de-${PORTVERSION}
@@ -16,7 +16,7 @@ COMMENT=	Citrix(R) Presentation Server(TM) client
 
 RUN_DEPENDS=	${LINUXBASE}${X11BASE}/lib/libXm.so.3:${PORTSDIR}/x11-toolkits/linux-openmotif
 
-ONLY_FOR_ARCHS=	i386
+ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX=	yes
 RESTRICTED=	License prohibits redistribution
 IS_INTERACTIVE=	"Noisy license agreement ignores stdin"
@@ -46,12 +46,11 @@ IGNORE='The distribution file for this port may not be automatically fetched due
 do-fetch:
 .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
 	@${ECHO} ""
-	@${ECHO} "You have to fetch the file manually after reading and"
-	@${ECHO} "agreeing to the license at:"
+	@${ECHO} "You have to fetch the file manually from"
 	@${ECHO} ""
-	@${ECHO} "http://www.citrix.com/download/bin/license.asp?client=linux"
+	@${ECHO} "http://www.citrix.com/site/SS/downloads/details.asp?dID=2755&downloadID=3323"
 	@${ECHO} ""
-	@${ECHO} "Once linuxx86.tar.gz has been downloaded move it to"
+	@${ECHO} "Once de.linuxx86.tar.gz has been downloaded move it to"
 	@${ECHO} "${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} and restart the build."
 	@${ECHO} ""
 	@${FALSE}
diff --git a/german/citrix_ica/distinfo b/german/citrix_ica/distinfo
index e7685605838e..a640c4acdc0f 100644
--- a/german/citrix_ica/distinfo
+++ b/german/citrix_ica/distinfo
@@ -1,3 +1,3 @@
-MD5 (citrix_ica-linuxx86-de-9.15.tar.gz) = b007447a56e20141fdbbc0ba0e7a0587
-SHA256 (citrix_ica-linuxx86-de-9.15.tar.gz) = 9d68c7a777de39389c4c93a7c1ab72326e1ad600b6f0203e5e73c1f9fd980923
-SIZE (citrix_ica-linuxx86-de-9.15.tar.gz) = 1391101
+MD5 (citrix_ica-linuxx86-de-10.0.tar.gz) = 26acccd17f039ef6153d835c5dd5ac29
+SHA256 (citrix_ica-linuxx86-de-10.0.tar.gz) = 7678d726d257ea2e0b44e2fbc81c8db5432fbb814cfbcdd18f268e3d297bfe96
+SIZE (citrix_ica-linuxx86-de-10.0.tar.gz) = 1884378
diff --git a/german/citrix_ica/files/patch-linuxx86::hinst b/german/citrix_ica/files/patch-linuxx86::hinst
index d8f7056bc9b5..0a5144c2b5a1 100644
--- a/german/citrix_ica/files/patch-linuxx86::hinst
+++ b/german/citrix_ica/files/patch-linuxx86::hinst
@@ -1,14 +1,14 @@
---- linuxx86/hinst.orig	Tue Dec  6 11:25:53 2005
-+++ linuxx86/hinst	Mon Jul 17 09:12:18 2006
-@@ -11,7 +11,6 @@
- #	Copyright 1998-2000 Citrix Systems, Inc. All rights reserved.
+--- linuxx86/hinst.orig	Tue Oct 31 08:31:50 2006
++++ linuxx86/hinst	Wed Apr 25 08:50:20 2007
+@@ -24,7 +24,6 @@
+ #	Copyright 1996-2000, 2006 Citrix Systems, Inc. All rights reserved.
  #
  ###############################################################################
 -
  # note: the INSTALLER_... strings should be in lowercase. The installer will then
  # accept lowercase or uppercase versions of them as input.
  INSTALLER_YES=ja
-@@ -73,7 +72,13 @@
+@@ -86,7 +85,13 @@
  fi
  
  #  Install in here by default.
@@ -23,53 +23,25 @@
  
  #  Default CDROM mount point
  DefaultCDSourceDir=/cdrom
-@@ -2175,7 +2180,7 @@
- 	tr_file $TR_FILE_KEY $PORT/$PORT.psf
- 	preen_files
+@@ -2226,7 +2231,7 @@
+ 	then
+ 		:
+ 	else
+-		/bin/false
++		/usr/bin/false
+ 		return 
+ 	fi
+ 
+@@ -2272,7 +2277,7 @@
+ 		fi
+ 	fi
  
 -	/bin/true
 +	/usr/bin/true
  }
  
  ###############################################################################
-@@ -2227,10 +2232,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
-@@ -2303,26 +2332,19 @@
+@@ -2397,26 +2402,19 @@
  
  netscape_integrate()
  {
@@ -100,7 +72,7 @@
  	user_prompt $integrate_netscape2
   	getyesno $INSTALLER_NO
  	if [ "$ANSWER" = "$INSTALLER_YES" ]
-@@ -2331,9 +2353,9 @@
+@@ -2425,9 +2423,9 @@
  	else
    		user_echo $integrate_netscape6
  	fi
@@ -112,7 +84,7 @@
      # Create utility script files in install root.
      create_wfica_script
      create_wfica_assoc_script
-@@ -2969,55 +2991,6 @@
+@@ -3063,55 +3061,6 @@
      echo "$BINDIR"
  }
  
@@ -168,7 +140,7 @@
  BROWSER_LIST_KEY="BROWSER_DIR"
  ################################################################################
  #
-@@ -3244,13 +3217,16 @@
+@@ -3337,13 +3286,16 @@
  XDG_TARGET_DIR="/usr/share/applications"
  TL_MENU_DIR="Vendor_menus/Applications"                    # TurboLinux
  TL_TOP_DIR="/usr/share/applnk/"$TL_MENU_DIR
diff --git a/german/citrix_ica/files/patch-setupwfc b/german/citrix_ica/files/patch-setupwfc
new file mode 100644
index 000000000000..c15001fababf
--- /dev/null
+++ b/german/citrix_ica/files/patch-setupwfc
@@ -0,0 +1,11 @@
+--- setupwfc.orig	Tue Oct 31 08:31:35 2006
++++ setupwfc	Wed Apr 25 09:02:13 2007
+@@ -441,7 +441,7 @@
+ 	*BSD)
+                # Assume Free/Net/Open BSD on an X86 with Linux emulation.
+ 
+-               if uname -m | grep 86 2>&1 >/dev/null ; then
++               if uname -m | grep "i[3456]86\|amd64" 2>&1 >/dev/null ; then
+                    PLATFORM=linuxx86
+                    DISP_PLATFORM="Linux (x86)"
+ 		   echo
diff --git a/german/citrix_ica/pkg-plist b/german/citrix_ica/pkg-plist
index 9b1e7e4e33f8..aa4bb4e6f388 100644
--- a/german/citrix_ica/pkg-plist
+++ b/german/citrix_ica/pkg-plist
@@ -1,7 +1,3 @@
-ICAClient/.config/appsrv.ini
-ICAClient/.config/keyboard.ini
-ICAClient/.config/module.ini
-ICAClient/.config/wfclient.ini
 ICAClient/CHARICONV.DLL
 ICAClient/NDS.DLL
 ICAClient/Npica
@@ -9,24 +5,29 @@ ICAClient/Npica.ad
 ICAClient/PDCRYPT1.DLL
 ICAClient/PDCRYPT2.DLL
 ICAClient/TW1.DLL
-ICAClient/VDCM.DLL
+ICAClient/VDEUEM.DLL
 ICAClient/VDSCARD.DLL
 ICAClient/VDSPMIKE.DLL
-ICAClient/Wfcmgr
-ICAClient/Wfcmgr.ad
-ICAClient/Wfica
-ICAClient/Wfica.ad
 ICAClient/config/.server
+ICAClient/config/All_Regions.ini
+ICAClient/config/Trusted_Region.ini
+ICAClient/config/Unknown_Region.ini
+ICAClient/config/Untrusted_Region.ini
 ICAClient/config/appsrv.ini
+ICAClient/config/canonicalization.ini
 ICAClient/config/module.ini
+ICAClient/config/regions.ini
+ICAClient/config/usertemplate/All_Regions.ini
+ICAClient/config/usertemplate/Trusted_Region.ini
+ICAClient/config/usertemplate/Unknown_Region.ini
+ICAClient/config/usertemplate/Untrusted_Region.ini
 ICAClient/config/wfclient.ini
 ICAClient/desktop/Citrix_PNA.desktop
 ICAClient/desktop/wfcmgr.desktop
 ICAClient/eula.txt
 ICAClient/help/index.htm
-ICAClient/icons/citrix16.xpm
-ICAClient/icons/citrix32.xpm
-ICAClient/icons/citrix48.xpm
+ICAClient/icons/manager.xpm
+ICAClient/icons/session.xpm
 ICAClient/install.txt
 ICAClient/keyboard/age2.kbd
 ICAClient/keyboard/agex2.kbd
@@ -92,13 +93,22 @@ 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/libctxssl.so
+ICAClient/nls/C
+ICAClient/nls/de/UTF-8/Wfcmgr
+ICAClient/nls/de/UTF-8/Wfica
+ICAClient/nls/de/UTF-8/pna.nls
+ICAClient/nls/de/Wfcmgr
+ICAClient/nls/de/Wfica
 ICAClient/nls/de/pna.nls
+ICAClient/nls/en/UTF-8/Wfcmgr
+ICAClient/nls/en/UTF-8/Wfica
+ICAClient/nls/en/UTF-8/pna.nls
+ICAClient/nls/en/Wfcmgr
+ICAClient/nls/en/Wfica
 ICAClient/nls/en/pna.nls
-ICAClient/nls/C
 ICAClient/npica.so
 ICAClient/pkginf/F.core.linuxx86
 ICAClient/pkginf/Ver.core.linuxx86
@@ -122,7 +132,9 @@ bin/wfcmgr
 bin/wfica
 @dirrm ICAClient/util
 @dirrm ICAClient/pkginf
+@dirrm ICAClient/nls/en/UTF-8
 @dirrm ICAClient/nls/en
+@dirrm ICAClient/nls/de/UTF-8
 @dirrm ICAClient/nls/de
 @dirrm ICAClient/nls
 @dirrm ICAClient/keystore/cacerts
@@ -131,6 +143,6 @@ bin/wfica
 @dirrm ICAClient/icons
 @dirrm ICAClient/help
 @dirrm ICAClient/desktop
+@dirrm ICAClient/config/usertemplate
 @dirrm ICAClient/config
-@dirrm ICAClient/.config
 @dirrm ICAClient