update to the latest citrix_ica client. The current versions are:

i386:  citrix_ica-6.30.1050
sparc: citrix_ica-6.20.985

Update provided in PR pkg/17192 by Murray Armfield.

Submitter could not find an update list to the client program but
noticed the following changes:
  - Auto reconnect option
  - Smart card logons
  - proxy/firewall configuration changes, now takes https and netscape settings for firewall.

9 files changed, 88 insertions, 70 deletions

diff --git a/net/citrix_ica/Makefile b/net/citrix_ica/Makefile
index 80e3b487f03..bc2da4a2708 100644
--- a/net/citrix_ica/Makefile
+++ b/net/citrix_ica/Makefile
@@ -1,76 +1,78 @@
-# $NetBSD: Makefile,v 1.10 2002/06/24 22:44:10 grant Exp $
+#$NetBSD: Makefile,v 1.11 2002/08/05 00:34:56 dmcmahill Exp $
+#
 
 # A default so lintpkgsrc is happy
-PKGNAME=	citrix_ica-6.20
-DISTNAME=	citrix
+PKGNAME=	citrix_ica-6.30
+DISTNAME=       citrix
 .if (${MACHINE_ARCH} == "i386")
 DISTNAME=	linuxx86
-PKGNAME=	citrix_ica-6.20.973
+PKGNAME=	citrix_ica-6.30.1050
 .endif
 .if (${MACHINE_ARCH} == "sparc")
-DISTNAME=	solaris
-PKGNAME=	citrix_ica-6.20.976
-EXTRACT_SUFX=	.tar.Z
+DISTNAME=       solaris
+PKGNAME=        citrix_ica-6.20.985
+EXTRACT_SUFX=   .tar.Z
 .endif
 CATEGORIES=	net
-MASTER_SITES=	http://download2.citrix.com/files/en/products/nfr/ica/ \
-		http://download2.citrix.com/FILES/en/products/client/ica/current/
+MASTER_SITES=	http://download2.citrix.com/files/en/products/client/ica/current/
 
-MAINTAINER=	packages@netbsd.org
+MAINTAINER=	murray@river-styx.org
 HOMEPAGE=	http://www.citrix.com/products/clients/ica/technology.asp
 COMMENT=	Citrix(R) client for the Microsoft Windows Terminal Server
 
 .if (${MACHINE_ARCH} == "i386")
-DEPENDS=	suse_x11>=6.0:../../emulators/${SUSE_DIR_PREFIX}_x11
+DEPENDS=        suse_x11>=6.4:../../emulators/${SUSE_DIR_PREFIX}_x11
 .endif
 
-ONLY_FOR_PLATFORM=	NetBSD-*-i386 NetBSD-*-sparc
+ONLY_FOR_PLATFORM=      NetBSD-*-i386 NetBSD-*-sparc
 
 # see http://www.citrix.com/download/unix-downloads.htm
-LICENSE=		citrix_ica-license
-RESTRICTED=		License prohibits redistribution
-NO_SRC_ON_FTP=		${RESTRICTED}
-NO_BIN_ON_FTP=		${RESTRICTED}
-NO_SRC_ON_CDROM=	${RESTRICTED}
-NO_BIN_ON_CDROM=	${RESTRICTED}
+LICENSE=                citrix_ica-license
+RESTRICTED=             License prohibits redistribution
+NO_SRC_ON_FTP=          ${RESTRICTED}
+NO_BIN_ON_FTP=          ${RESTRICTED}
+NO_SRC_ON_CDROM=        ${RESTRICTED}
+NO_BIN_ON_CDROM=        ${RESTRICTED}
 
 PLIST_SRC=	${PKGDIR}/PLIST.pre \
 		${PKGDIR}/PLIST.${MACHINE_ARCH} \
 		${PKGDIR}/PLIST.post
 
-DIST_SUBDIR=	citrix
-WRKSRC=		${WRKDIR}
-NO_BUILD=	Yes
+DIST_SUBDIR=    ${PKGNAME}
+WRKSRC=         ${WRKDIR}
 
-CDIR=		${PREFIX}/lib/ICAClient
-BINDIR=		${PREFIX}/bin
+CDIR=           ${PREFIX}/lib/ICAClient
+BINDIR=         ${PREFIX}/bin
 
 .if (${MACHINE_ARCH} == "sparc")
 .if !exists(/emul/svr4/usr/lib/ld.so)
-IGNORE=		"${PKGNAME} requires SVR4 compability - see compat_svr4(8)"
+IGNORE=         "${PKGNAME} requires SVR4 compability - see compat_svr4(8)"
 .endif
 .endif
 
 PATCHDIR=${WRKDIR}/.patches
 pre-patch:
 	${MKDIR} ${PATCHDIR}
-	${CP} ${.CURDIR}/patches/patch-${MACHINE_ARCH}-* ${PATCHDIR}
+	${CP} ${PKGDIR}/patches/patch-${MACHINE_ARCH}-* ${PATCHDIR}
 
-pre-install:
-	@if [ -d "${CDIR}" ]; then					\
-		${ECHO} "";						\
-		${ECHO} "*** Please remove ${CDIR} and try again ***";	\
-		${ECHO} "";						\
-		${FALSE};						\
-	fi
 
-do-install:
+do-build:
 	${SED} s%DESTINATION%${CDIR}% ${FILESDIR}/response \
 		> ${WRKSRC}/response
 	${SED} s%DESTINATION%${CDIR}% ${FILESDIR}/wfcmgr \
 		> ${WRKSRC}/wfcmgr.x
 	${SED} s%DESTINATION%${CDIR}% ${FILESDIR}/wfica \
 		> ${WRKSRC}/wfica.x
+
+pre-install:
+	@if [ -d "${CDIR}" ]; then                                      \
+		${ECHO} "";                                             \
+		${ECHO} "*** Please remove ${CDIR} and try again ***";  \
+		${ECHO} "";                                             \
+		${FALSE};                                               \
+	fi
+
+do-install:
 	cd ${WRKSRC} && ./setupwfc < response
 	${INSTALL_SCRIPT} ${WRKSRC}/wfcmgr.x ${PREFIX}/bin/wfcmgr
 	${INSTALL_SCRIPT} ${WRKSRC}/wfica.x ${PREFIX}/bin/wfica
@@ -78,4 +80,8 @@ do-install:
 		< ${CDIR}/util/icalicense.sh > ${CDIR}/util/icalicense.sh.fixed
 	${MV} ${CDIR}/util/icalicense.sh.fixed ${CDIR}/util/icalicense.sh
 
+.if (${MACHINE_ARCH} == "i386")
 .include "../../emulators/suse_linux/Makefile.application"
+.else
+.include "../../mk/bsd.pkg.mk"
+.endif
diff --git a/net/citrix_ica/PLIST.i386 b/net/citrix_ica/PLIST.i386
index 8fa98fdafa5..fa62f9ebfb2 100644
--- a/net/citrix_ica/PLIST.i386
+++ b/net/citrix_ica/PLIST.i386
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST.i386,v 1.1 2001/10/31 23:10:38 zuntum Exp $
+@comment $NetBSD: PLIST.i386,v 1.2 2002/08/05 00:34:56 dmcmahill Exp $
+lib/ICAClient/VDSCARD.DLL
 lib/ICAClient/pkginf/F.core.linuxx86
 lib/ICAClient/pkginf/Ver.core.linuxx86
diff --git a/net/citrix_ica/PLIST.pre b/net/citrix_ica/PLIST.pre
index f666f0b8552..5bab86a3c9b 100644
--- a/net/citrix_ica/PLIST.pre
+++ b/net/citrix_ica/PLIST.pre
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.pre,v 1.2 2002/01/18 11:50:40 martti Exp $
+@comment $NetBSD: PLIST.pre,v 1.3 2002/08/05 00:34:56 dmcmahill Exp $
 bin/wfcmgr
 bin/wfica
 lib/ICAClient/.config/appsrv.ini
@@ -73,6 +73,7 @@ lib/ICAClient/keyboard/sngr.kbd
 lib/ICAClient/keyboard/sparc3.kbd
 lib/ICAClient/keyboard/sparc4.kbd
 lib/ICAClient/keyboard/sparc5.kbd
+lib/ICAClient/keyboard/sparc6usb.kbd
 lib/ICAClient/keyboard/sparcfr4.kbd
 lib/ICAClient/keyboard/sparcfr5.kbd
 lib/ICAClient/keyboard/sparcgr4.kbd
diff --git a/net/citrix_ica/distinfo b/net/citrix_ica/distinfo
index 3e293b6edb4..0a8b0bec8ba 100644
--- a/net/citrix_ica/distinfo
+++ b/net/citrix_ica/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.5 2002/01/18 11:50:40 martti Exp $
+$NetBSD: distinfo,v 1.6 2002/08/05 00:34:56 dmcmahill Exp $
 
-SHA1 (citrix/linuxx86.tar.gz) = f5563563194e07a96be395fe9abdd858c7196d9a
-Size (citrix/linuxx86.tar.gz) = 1397830 bytes
-SHA1 (patch-i386-aa) = db6ec387f49feffdc02d6a495c14c8bef4433d16
-SHA1 (patch-i386-ab) = a688fa885d0a93ee7a8a02935de5024fa6fecc6c
-SHA1 (citrix/solaris.tar.Z) = 7475fd1d25490a2ee51e0ee182dd9af846585e3d
-Size (citrix/solaris.tar.Z) = 1572262 bytes
-SHA1 (patch-sparc-aa) = 646df6b2908fc007d53be22176f2eff05041f6f8
-SHA1 (patch-sparc-ab) = 9f4f6939434156acedd18947155721237091db03
+SHA1 (citrix_ica-6.30.1050/linuxx86.tar.gz) = bd932ad50726d5908dcf99c662a2ed08e146768b
+Size (citrix_ica-6.30.1050/linuxx86.tar.gz) = 1485835 bytes
+SHA1 (citrix_ica-6.20.985/solaris.tar.Z) = 793a9b5afc7da939d1dbb45e1bafb6f946531b1e
+Size (citrix_ica-6.20.985/solaris.tar.Z) = 1521133 bytes
+SHA1 (patch-i386-aa) = 46e23a2c41910520f476de851a99b55b52a65478
+SHA1 (patch-i386-ab) = 7113a62d8ea8902aea257c2304c53f30d49b385d
+SHA1 (patch-sparc-aa) = 4bdc52ba9aa2f059047dc67e6b7750392245b5b8
+SHA1 (patch-sparc-ab) = 0ab192cb660260f950ad9ab4df5d278c54459f7f
diff --git a/net/citrix_ica/files/response b/net/citrix_ica/files/response
index 8cdad35f2e4..3987054910e 100644
--- a/net/citrix_ica/files/response
+++ b/net/citrix_ica/files/response
@@ -2,5 +2,5 @@
 DESTINATION
 y
 y
-y
+n
 3
diff --git a/net/citrix_ica/patches/patch-i386-aa b/net/citrix_ica/patches/patch-i386-aa
index b262e0198ad..a4516c17407 100644
--- a/net/citrix_ica/patches/patch-i386-aa
+++ b/net/citrix_ica/patches/patch-i386-aa
@@ -1,16 +1,7 @@
-$NetBSD: patch-i386-aa,v 1.1 2001/05/08 23:58:45 dmcmahill Exp $
+$NetBSD: patch-i386-aa,v 1.2 2002/08/05 00:34:57 dmcmahill Exp $
 
---- linuxx86/hinst.orig	Tue Aug  8 20:24:55 2000
+--- linuxx86/hinst.orig	Thu Apr 18 02:32:58 2002
 +++ linuxx86/hinst
-@@ -112,7 +112,7 @@
- 
- # The hosts file name
- CAT_CMD=cat
--MORE_CMD=more
-+MORE_CMD="echo Please read "
- CAT_HOST_ARG=/etc/hosts
- 
- # The command to read host information from NIS
 @@ -835,13 +835,13 @@
  		echo_no_nl $calcspace3
  		read dummy
@@ -27,3 +18,12 @@ $NetBSD: patch-i386-aa,v 1.1 2001/05/08 23:58:45 dmcmahill Exp $
  	return
  }
  
+@@ -1862,7 +1862,7 @@
+ 	then
+ 		:
+ 	else
+-		/bin/false
++		/usr/bin/false
+ 		return 
+ 	fi
+ 
diff --git a/net/citrix_ica/patches/patch-i386-ab b/net/citrix_ica/patches/patch-i386-ab
index 91e02aacc63..82f3ea71e06 100644
--- a/net/citrix_ica/patches/patch-i386-ab
+++ b/net/citrix_ica/patches/patch-i386-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-i386-ab,v 1.1 2001/05/08 23:58:45 dmcmahill Exp $
+$NetBSD: patch-i386-ab,v 1.2 2002/08/05 00:34:57 dmcmahill Exp $
 
---- setupwfc.orig	Tue Aug  8 20:24:35 2000
+--- setupwfc.orig	Thu Apr 18 02:32:45 2002
 +++ setupwfc
 @@ -378,7 +378,7 @@
  		PLATFORM=hp
diff --git a/net/citrix_ica/patches/patch-sparc-aa b/net/citrix_ica/patches/patch-sparc-aa
index 6a8c16a0730..78fe643540e 100644
--- a/net/citrix_ica/patches/patch-sparc-aa
+++ b/net/citrix_ica/patches/patch-sparc-aa
@@ -1,39 +1,47 @@
-$NetBSD: patch-sparc-aa,v 1.1 2001/05/08 23:58:46 dmcmahill Exp $
+$NetBSD: patch-sparc-aa,v 1.2 2002/08/05 00:34:57 dmcmahill Exp $
 
---- solaris/hinst.orig	Fri Dec 15 12:06:19 2000
-+++ solaris/hinst	Sat May  5 12:55:03 2001
-@@ -95,5 +95,5 @@
+--- solaris/hinst.orig	Wed Mar  6 08:29:33 2002
++++ solaris/hinst
+@@ -91,7 +91,7 @@
+ PORT=solaris
  
  #  The command to undo the archive on this platform.
 -EXTRACT_ARCHIVE="cpio -icmud"
 +EXTRACT_ARCHIVE="cpio -imud"
  
  # The thing that goes between the owner and group to set both by chown.
-@@ -115,5 +115,5 @@
+ CHOWNGRP_TOKEN=":"
+@@ -111,7 +111,7 @@
+ 
  # The hosts file name
  CAT_CMD=cat
 -MORE_CMD=more
 +MORE_CMD="echo please read"
  CAT_HOST_ARG=/etc/hosts
  
-@@ -887,5 +887,5 @@
+ # The command to read host information from NIS
+@@ -883,13 +883,13 @@
+ 		echo_no_nl $calcspace3
  		read dummy
  
 -		/bin/false
 +		/usr/bin/false
  		return 
  	fi
-@@ -893,5 +893,5 @@
+ 
  	$ECHO_CMD $calcspace4
  
 -	/bin/true
 +	/usr/bin/true
  	return
  }
-@@ -1928,5 +1928,5 @@
+ 
+@@ -1916,7 +1916,7 @@
+ 	then
  		:
  	else
 -		/bin/false
 +		/usr/bin/false
  		return 
  	fi
+ 
diff --git a/net/citrix_ica/patches/patch-sparc-ab b/net/citrix_ica/patches/patch-sparc-ab
index 4a8c1c4d6a0..2b419fced9a 100644
--- a/net/citrix_ica/patches/patch-sparc-ab
+++ b/net/citrix_ica/patches/patch-sparc-ab
@@ -1,11 +1,13 @@
-$NetBSD: patch-sparc-ab,v 1.1 2001/05/08 23:58:46 dmcmahill Exp $
+$NetBSD: patch-sparc-ab,v 1.2 2002/08/05 00:34:57 dmcmahill Exp $
 
---- setupwfc.orig	Fri Dec 15 12:05:20 2000
-+++ setupwfc	Fri May  4 21:46:40 2001
-@@ -402,5 +402,5 @@
+--- setupwfc.orig	Thu Mar  7 03:29:06 2002
++++ setupwfc
+@@ -401,7 +401,7 @@
+                fi
                 ;;
          NetBSD)
 -                PLATFORM=netbsd
 +                PLATFORM=solaris
                  DISP_PLATFORM="NetBSD"
                  ;;
+         UnixWare)