Update to versions 9.0.0 (i386) and 8.46 (sparc) which are the latest

released versions. Version 9 is the Presentation Server 4.0 release of
clients.
N.B. sparc code currently untested.
Take over as maintainer.
Fix a few pkglint warnings.
Update description to be more accurate and up-to-date.
We need suse_openmotif to run wfcmgr under Linux emulation.

6 files changed, 59 insertions, 49 deletions

diff --git a/net/citrix_ica/DESCR b/net/citrix_ica/DESCR
index 6b93c58eaa1..8157c5f1128 100644
--- a/net/citrix_ica/DESCR
+++ b/net/citrix_ica/DESCR
@@ -1,15 +1,12 @@
-Client for the Citrix(R) / Microsoft Windows Terminal Server.
+ICA Client for Citrix(R) Presentation Server(TM) and Metaframe(TM)
 
-Citrix(R) MetaFrame(TM) is thin-client/server system software for
-Microsoft's Windows NT Server 4.0, Terminal Server Edition.
-MetaFrame(TM) delivers a comprehensive thin-client/server solution to
-the enterprise by extending Windows Terminal Server with additional
-client and server functionality - including support for heterogeneous
-computing environments, enterprise-scale management and seamless
-desktop integration. MetaFrame(TM) transforms the way organizations
-deploy, manage and access business applications by providing improved
-application manageability, access, performance and security. Citrix(R)
-MetaFrame(TM) system software, which incorporates Citrix's Independent
-Computing Architecture (ICA)(R), provides a complete
-thin-client/server computing solution for multi-user NT 4.0
-environments.
+Citrix Presentation Server runs on Microsoft(R) Windows Server(TM) and
+UNIX(R) operating systems, and extends the base Windows Terminal Services
+platform by enhancing the end-user experience as well as increasing
+manageability, compatibility, security and scalability to address
+business-critical environments. Presentation Server expands the range of
+supported applications to include legacy software and Web-based, UNIX(R) and
+Java(TM) solutions. It also enables any device or operating system -
+including Macintosh(R) and Linux(R) - to access virtualized applications.
+Other important capabilities are powerful management and configuration tools
+and faster, more flexible printing.
diff --git a/net/citrix_ica/Makefile b/net/citrix_ica/Makefile
index 6bf7c3d5ee6..2a44d76c1ff 100644
--- a/net/citrix_ica/Makefile
+++ b/net/citrix_ica/Makefile
@@ -1,43 +1,43 @@
-# $NetBSD: Makefile,v 1.28 2006/03/04 21:30:17 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2007/01/18 22:34:05 sborrill Exp $
 #
 
 # A default so lintpkgsrc is happy, overridden below
 DISTNAME=       citrix
-PKGNAME=	citrix_ica-7.00
-PKGREVISION=	1
+PKGNAME=	citrix_ica-9.0.0
 CATEGORIES=	net
 MASTER_SITES=	http://download2.citrix.com/files/en/products/client/ica/current/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.citrix.com/products/clients/ica/technology.asp
-COMMENT=	Citrix(R) client for the Microsoft Windows Terminal Server
+COMMENT=	Citrix(R) ICA client for the Citrix(R) Presentation Server(TM)
 
 .include "../../mk/bsd.prefs.mk"
 
-ONLY_FOR_PLATFORM=      Linux-*-i[3-6]86 NetBSD-*-i386 NetBSD-*-sparc SunOS-*-sparc 
+ONLY_FOR_PLATFORM=      Linux-*-i[3-6]86 NetBSD-*-i386 NetBSD-*-sparc SunOS-*-sparc
 ONLY_FOR_PLATFORM+=	DragonFly-*-i386
 
 .if ${OPSYS} == "NetBSD"
 .  if ${MACHINE_ARCH} == "i386"
 DISTNAME=	linuxx86
-PKGNAME=	citrix_ica-7.00.77757
+PKGNAME=	citrix_ica-9.0.0
 .  elif ${MACHINE_ARCH} == "sparc"
-DISTNAME=       solaris
-PKGNAME=        citrix_ica-7.02.78662
+DISTNAME=       en.solaris
+PKGNAME=        citrix_ica-8.46
 EXTRACT_SUFX=   .tar.Z
 .  endif
 .elif ${OPSYS} == "SunOS"
-DISTNAME=	solaris
-PKGNAME=	citrix_ica-7.02.78662
+DISTNAME=	en.solaris
+PKGNAME=	citrix_ica-8.46
 EXTRACT_SUFX=	.tar.Z
 .elif ${OPSYS} == "Linux" || ${OPSYS} == "DragonFly"
 DISTNAME=	linuxx86
-PKGNAME=	citrix_ica-7.00.77757
+PKGNAME=	citrix_ica-9.0.0
 .endif
 
 # see http://www.citrix.com/download/unix-downloads.htm
 .if (${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly") && ${MACHINE_ARCH} == "i386"
 DEPENDS+=        suse_x11>=6.4:../../emulators/${SUSE_DIR_PREFIX}_x11
+DEPENDS+=        suse_openmotif>=6.4:../../emulators/${SUSE_DIR_PREFIX}_openmotif
 .endif
 
 LICENSE=                citrix_ica-license
@@ -51,7 +51,7 @@ WRKSRC=         ${WRKDIR}
 DIST_SUBDIR=    ${PKGNAME_NOREV}
 
 CDIR=           ${PREFIX}/lib/ICAClient
-BINDIR=         ${PREFIX}/bin
+USE_TOOLS+=	patch
 
 .if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "sparc"
 .  if !exists(/emul/svr4/usr/lib/ld.so)
@@ -62,9 +62,9 @@ PKG_FAIL_REASON+=	"${PKGNAME} requires SVR4 compability - see compat_svr4(8)"
 INSTALLATION_DIRS=	bin
 
 do-patch:
-	@(cd ${WRKSRC}; \
+	(cd ${WRKSRC}; \
 	for f in ${PATCHDIR}/patch-${MACHINE_ARCH}-*;do \
-	${PATCH} <$$f >/dev/null 2>&1 || true; \
+	${PATCH} <$$f >/dev/null 2>&1 || ${TRUE}; \
 	done)
 
 do-build:
@@ -76,7 +76,7 @@ do-build:
 		> ${WRKSRC}/wfica.x
 
 pre-install:
-	@if [ -d "${CDIR}" ]; then                                      \
+	if [ -d "${CDIR}" ]; then                                      \
 		${ECHO} "";                                             \
 		${ECHO} "*** Please remove ${CDIR} and try again ***";  \
 		${ECHO} "";                                             \
diff --git a/net/citrix_ica/PLIST.common b/net/citrix_ica/PLIST.common
index 768bb90830b..cafcb3923b5 100644
--- a/net/citrix_ica/PLIST.common
+++ b/net/citrix_ica/PLIST.common
@@ -1,15 +1,18 @@
-@comment $NetBSD: PLIST.common,v 1.1 2005/02/21 21:24:06 veego Exp $
+@comment $NetBSD: PLIST.common,v 1.2 2007/01/18 22:34:05 sborrill Exp $
 bin/wfcmgr
 bin/wfica
 lib/ICAClient/.config/appsrv.ini
 lib/ICAClient/.config/keyboard.ini
 lib/ICAClient/.config/module.ini
 lib/ICAClient/.config/wfclient.ini
+lib/ICAClient/CHARICONV.DLL
+lib/ICAClient/NDS.DLL
 lib/ICAClient/Npica
 lib/ICAClient/Npica.ad
 lib/ICAClient/PDCRYPT1.DLL
 lib/ICAClient/PDCRYPT2.DLL
-lib/ICAClient/SSL.DLL
+lib/ICAClient/TW1.DLL
+lib/ICAClient/VDCM.DLL
 lib/ICAClient/VDSCARD.DLL
 lib/ICAClient/Wfcmgr
 lib/ICAClient/Wfcmgr.ad
@@ -23,11 +26,9 @@ lib/ICAClient/desktop/Citrix_PNA.desktop
 lib/ICAClient/desktop/wfcmgr.desktop
 lib/ICAClient/eula.txt
 lib/ICAClient/help/index.htm
-lib/ICAClient/icons/ica16.xpm
-lib/ICAClient/icons/ica32.xpm
-lib/ICAClient/icons/ica48.xpm
-lib/ICAClient/icons/ica64.xpm
-lib/ICAClient/icons/pn32.xpm
+lib/ICAClient/icons/citrix16.xpm
+lib/ICAClient/icons/citrix32.xpm
+lib/ICAClient/icons/citrix48.xpm
 lib/ICAClient/install.txt
 lib/ICAClient/keyboard/age2.kbd
 lib/ICAClient/keyboard/agex2.kbd
@@ -60,6 +61,7 @@ lib/ICAClient/keyboard/hpusitf.kbd
 lib/ICAClient/keyboard/hpusps2.kbd
 lib/ICAClient/keyboard/ibm.kbd
 lib/ICAClient/keyboard/keyboard.ini
+lib/ICAClient/keyboard/linux-ja.kbd
 lib/ICAClient/keyboard/linux.kbd
 lib/ICAClient/keyboard/mac101.kbd
 lib/ICAClient/keyboard/ncdn-101.kbd
@@ -95,6 +97,7 @@ lib/ICAClient/keystore/cacerts/GTECTGlobalRoot.crt
 lib/ICAClient/keystore/cacerts/GTECTRoot.crt
 lib/ICAClient/keystore/cacerts/Pcs3ss_v4.crt
 lib/ICAClient/keystore/cacerts/SecureServer.crt
+lib/ICAClient/libctxssl.so
 lib/ICAClient/nls/C
 lib/ICAClient/nls/en/pna.nls
 lib/ICAClient/npica.so
@@ -107,6 +110,8 @@ lib/ICAClient/util/echo_cmd
 lib/ICAClient/util/hinst
 lib/ICAClient/util/icalicense.sh
 lib/ICAClient/util/nslaunch
+lib/ICAClient/util/pac.js
+lib/ICAClient/util/pacexec
 lib/ICAClient/util/xcapture
 lib/ICAClient/wfcmgr
 lib/ICAClient/wfica
diff --git a/net/citrix_ica/distinfo b/net/citrix_ica/distinfo
index 04d4a76532b..7b118bfb970 100644
--- a/net/citrix_ica/distinfo
+++ b/net/citrix_ica/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.10 2005/02/24 12:13:44 agc Exp $
+$NetBSD: distinfo,v 1.11 2007/01/18 22:34:05 sborrill Exp $
 
-SHA1 (citrix_ica-7.00.77757/linuxx86.tar.gz) = 98fc24375bbbf45dad33480b159f71d60af0e69d
-RMD160 (citrix_ica-7.00.77757/linuxx86.tar.gz) = f33fc120203be8a3e22036031d4231bebddb8f9b
-Size (citrix_ica-7.00.77757/linuxx86.tar.gz) = 1916967 bytes
-SHA1 (citrix_ica-7.02.78662/solaris.tar.Z) = d072fef54e2a632cc5818ed9a158c9b396ae94ee
-Size (citrix_ica-7.02.78662/solaris.tar.Z) = 3406401 bytes
-SHA1 (patch-i386-aa) = f2e91e04845e67bf8e380f81245fd43074e38514
+SHA1 (citrix_ica-9.0.0/linuxx86.tar.gz) = 8847f7b20d7effc71062ca3b3a07a3db1cbd93f3
+RMD160 (citrix_ica-9.0.0/linuxx86.tar.gz) = dfb037fa10c25b52bfe4b10961de18cd1fedb08b
+Size (citrix_ica-9.0.0/linuxx86.tar.gz) = 1356273 bytes
+SHA1 (citrix_ica-8.46/en.solaris.tar.Z) = b2edbe959a57af43a6dfd7e2ba297f411caf358c
+RMD160 (citrix_ica-8.46/en.solaris.tar.Z) = f32ee5c8bd36dbafd0b824d091231bfe030d9f2b
+Size (citrix_ica-8.46/en.solaris.tar.Z) = 2039289 bytes
+SHA1 (patch-i386-aa) = 18c4a63f9a4cfd040bcf1548dcd9587161ad84cb
 SHA1 (patch-sparc-aa) = 6673f02b8b89ce2bbb1f73f4179d14b1fea505a3
 SHA1 (patch-sparc-ab) = 7a203edc890e80dd26ea94d9882d81ab6d816bbe
diff --git a/net/citrix_ica/files/response.i386 b/net/citrix_ica/files/response.i386
index 3987054910e..5e4c7028aac 100644
--- a/net/citrix_ica/files/response.i386
+++ b/net/citrix_ica/files/response.i386
@@ -1,6 +1,6 @@
 1
 DESTINATION
 y
-y
+1
 n
 3
diff --git a/net/citrix_ica/patches/patch-i386-aa b/net/citrix_ica/patches/patch-i386-aa
index 0841355497a..e7d28642634 100644
--- a/net/citrix_ica/patches/patch-i386-aa
+++ b/net/citrix_ica/patches/patch-i386-aa
@@ -1,7 +1,5 @@
-$NetBSD: patch-i386-aa,v 1.5 2003/08/11 10:39:36 markd Exp $
-
---- linuxx86/hinst.orig	Wed Apr 17 18:32:58 2002
-+++ linuxx86/hinst	Wed Jan 15 23:32:15 2003
+--- linuxx86/hinst.orig	2005-08-18 13:45:19.000000000 +0100
++++ linuxx86/hinst	2005-08-18 13:46:10.000000000 +0100
 @@ -84,7 +84,7 @@
  PORT=linuxx86
  
@@ -11,7 +9,7 @@ $NetBSD: patch-i386-aa,v 1.5 2003/08/11 10:39:36 markd Exp $
  
  # The thing that goes between the owner and group to set both by chown.
  CHOWNGRP_TOKEN=":"
-@@ -2028,7 +2028,7 @@
+@@ -2111,7 +2111,7 @@
  	then
  		:
  	else
@@ -20,3 +18,12 @@ $NetBSD: patch-i386-aa,v 1.5 2003/08/11 10:39:36 markd Exp $
  		return 
  	fi
  
+@@ -2166,7 +2166,7 @@
+ 
+ 	# rm -f $m_filename $mf_filename $o_filename $of_filename
+ 
+-	/bin/true
++	return 0
+ }
+ 
+ ###############################################################################