Update to latest versions (7.00.77757 for i386, 7.02.78662 for sparc).

Changes unknown.
While here make package work for Linux (untested) and Solaris.
Incorporates PR pkg/22209 from Stephen Borrill.

11 files changed, 138 insertions, 82 deletions

diff --git a/net/citrix_ica/Makefile b/net/citrix_ica/Makefile
index 0bcca825448..5a68ff89990 100644
--- a/net/citrix_ica/Makefile
+++ b/net/citrix_ica/Makefile
@@ -1,18 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2003/03/29 12:41:55 jmmv Exp $
+# $NetBSD: Makefile,v 1.17 2003/08/11 10:39:39 markd Exp $
 #
 
-# A default so lintpkgsrc is happy
-PKGNAME=	citrix_ica-6.30
+# A default so lintpkgsrc is happy, overridden below
 DISTNAME=       citrix
-.if (${MACHINE_ARCH} == "i386")
-DISTNAME=	linuxx86
-PKGNAME=	citrix_ica-6.30.1052
-.endif
-.if (${MACHINE_ARCH} == "sparc")
-DISTNAME=       solaris
-PKGNAME=        citrix_ica-6.30.1061
-EXTRACT_SUFX=   .tar.Z
-.endif
+PKGNAME=	citrix_ica-7.00
 WRKSRC=         ${WRKDIR}
 CATEGORIES=	net
 MASTER_SITES=	http://download2.citrix.com/files/en/products/client/ica/current/
@@ -21,13 +12,33 @@ 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
 
+.include "../../mk/bsd.prefs.mk"
+
+ONLY_FOR_PLATFORM=      Linux-*-i[3-6]86 NetBSD-*-i386 NetBSD-*-sparc SunOS-*-sparc
+
+.if ${OPSYS} == "NetBSD"
 .if (${MACHINE_ARCH} == "i386")
-DEPENDS=        suse_x11>=6.4:../../emulators/${SUSE_DIR_PREFIX}_x11
+DISTNAME=	linuxx86
+PKGNAME=	citrix_ica-7.00.77757
+.elif (${MACHINE_ARCH} == "sparc")
+DISTNAME=       solaris
+PKGNAME=        citrix_ica-7.02.78662
+EXTRACT_SUFX=   .tar.Z
+.endif
+.elif ${OPSYS} == "SunOS"
+DISTNAME=	solaris
+PKGNAME=	citrix_ica-7.02.78662
+EXTRACT_SUFX=	.tar.Z
+.elif ${OPSYS} == "Linux"
+DISTNAME=	linuxx86
+PKGNAME=	citrix_ica-7.00.77757
 .endif
-
-ONLY_FOR_PLATFORM=      NetBSD-*-i386 NetBSD-*-sparc
 
 # see http://www.citrix.com/download/unix-downloads.htm
+.if (${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "i386")
+DEPENDS=        suse_x11>=6.4:../../emulators/${SUSE_DIR_PREFIX}_x11
+.endif
+
 LICENSE=                citrix_ica-license
 RESTRICTED=             License prohibits redistribution
 NO_SRC_ON_FTP=          ${RESTRICTED}
@@ -44,7 +55,7 @@ DIST_SUBDIR=    ${PKGNAME}
 CDIR=           ${PREFIX}/lib/ICAClient
 BINDIR=         ${PREFIX}/bin
 
-.if (${MACHINE_ARCH} == "sparc")
+.if (${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "sparc")
 .if !exists(/emul/svr4/usr/lib/ld.so)
 PKG_FAIL_REASON= "${PKGNAME} requires SVR4 compability - see compat_svr4(8)"
 .endif
@@ -57,7 +68,7 @@ pre-patch:
 	${CHMOD} -R u+w ${WRKSRC}
 
 do-build:
-	${SED} s%DESTINATION%${CDIR}% ${FILESDIR}/response \
+	${SED} s%DESTINATION%${CDIR}% ${FILESDIR}/response.${MACHINE_ARCH} \
 		> ${WRKSRC}/response
 	${SED} s%DESTINATION%${CDIR}% ${FILESDIR}/wfcmgr \
 		> ${WRKSRC}/wfcmgr.x
@@ -80,7 +91,7 @@ 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")
+.if (${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "i386")
 .  include "../../emulators/suse_linux/Makefile.application"
 .endif
 
diff --git a/net/citrix_ica/PLIST.i386 b/net/citrix_ica/PLIST.i386
index fa62f9ebfb2..5d743b8c636 100644
--- a/net/citrix_ica/PLIST.i386
+++ b/net/citrix_ica/PLIST.i386
@@ -1,4 +1,3 @@
-@comment $NetBSD: PLIST.i386,v 1.2 2002/08/05 00:34:56 dmcmahill Exp $
-lib/ICAClient/VDSCARD.DLL
+@comment $NetBSD: PLIST.i386,v 1.3 2003/08/11 10:39:40 markd Exp $
 lib/ICAClient/pkginf/F.core.linuxx86
 lib/ICAClient/pkginf/Ver.core.linuxx86
diff --git a/net/citrix_ica/PLIST.post b/net/citrix_ica/PLIST.post
index b6c4e3f294c..c4e849a7c87 100644
--- a/net/citrix_ica/PLIST.post
+++ b/net/citrix_ica/PLIST.post
@@ -1,13 +1,16 @@
-@comment $NetBSD: PLIST.post,v 1.2 2002/01/18 11:50:40 martti Exp $
+@comment $NetBSD: PLIST.post,v 1.3 2003/08/11 10:39:41 markd Exp $
 @dirrm lib/ICAClient/.config
 @dirrm lib/ICAClient/config
 @dirrm lib/ICAClient/cache/zlcache
 @dirrm lib/ICAClient/cache
+@dirrm lib/ICAClient/desktop
 @dirrm lib/ICAClient/help
 @dirrm lib/ICAClient/icons
 @dirrm lib/ICAClient/keyboard
 @dirrm lib/ICAClient/keystore/cacerts
 @dirrm lib/ICAClient/keystore
+@dirrm lib/ICAClient/nls/en
+@dirrm lib/ICAClient/nls
 @dirrm lib/ICAClient/pkginf
 @dirrm lib/ICAClient/util
 @dirrm lib/ICAClient
diff --git a/net/citrix_ica/PLIST.pre b/net/citrix_ica/PLIST.pre
index 5bab86a3c9b..13b27feaecf 100644
--- a/net/citrix_ica/PLIST.pre
+++ b/net/citrix_ica/PLIST.pre
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.pre,v 1.3 2002/08/05 00:34:56 dmcmahill Exp $
+@comment $NetBSD: PLIST.pre,v 1.4 2003/08/11 10:39:41 markd Exp $
 bin/wfcmgr
 bin/wfica
 lib/ICAClient/.config/appsrv.ini
@@ -10,6 +10,7 @@ lib/ICAClient/Npica.ad
 lib/ICAClient/PDCRYPT1.DLL
 lib/ICAClient/PDCRYPT2.DLL
 lib/ICAClient/SSL.DLL
+lib/ICAClient/VDSCARD.DLL
 lib/ICAClient/Wfcmgr
 lib/ICAClient/Wfcmgr.ad
 lib/ICAClient/Wfica
@@ -18,12 +19,15 @@ lib/ICAClient/config/.server
 lib/ICAClient/config/appsrv.ini
 lib/ICAClient/config/module.ini
 lib/ICAClient/config/wfclient.ini
+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/install.txt
 lib/ICAClient/keyboard/age2.kbd
 lib/ICAClient/keyboard/agex2.kbd
@@ -91,6 +95,8 @@ 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/nls/C
+lib/ICAClient/nls/en/pna.nls
 lib/ICAClient/npica.so
 lib/ICAClient/pkginf/changeno.dat
 lib/ICAClient/readme.txt
@@ -100,6 +106,9 @@ lib/ICAClient/util/XCapture.ad
 lib/ICAClient/util/echo_cmd
 lib/ICAClient/util/hinst
 lib/ICAClient/util/icalicense.sh
+lib/ICAClient/util/nslaunch
 lib/ICAClient/util/xcapture
 lib/ICAClient/wfcmgr
 lib/ICAClient/wfica
+lib/ICAClient/wfica.sh
+lib/ICAClient/wfica_assoc.sh
diff --git a/net/citrix_ica/PLIST.sparc b/net/citrix_ica/PLIST.sparc
index 2ae93461c18..2f6662793a5 100644
--- a/net/citrix_ica/PLIST.sparc
+++ b/net/citrix_ica/PLIST.sparc
@@ -1,3 +1,53 @@
-@comment $NetBSD: PLIST.sparc,v 1.1 2001/10/31 23:10:39 zuntum Exp $
+@comment $NetBSD: PLIST.sparc,v 1.2 2003/08/11 10:39:42 markd Exp $
+lib/ICAClient/dt/appconfig/appmanager/C/Citrix/Citrix_ica_client
+lib/ICAClient/dt/appconfig/appmanager/C/Citrix/Citrix_ica_editor
+lib/ICAClient/dt/appconfig/appmanager/C/Citrix/Citrix_ica_excel
+lib/ICAClient/dt/appconfig/appmanager/C/Citrix/Citrix_ica_msaccess
+lib/ICAClient/dt/appconfig/appmanager/C/Citrix/Citrix_ica_outlook
+lib/ICAClient/dt/appconfig/appmanager/C/Citrix/Citrix_ica_powerpnt
+lib/ICAClient/dt/appconfig/appmanager/C/Citrix/Citrix_ica_visio32
+lib/ICAClient/dt/appconfig/appmanager/C/Citrix/Citrix_ica_winproj
+lib/ICAClient/dt/appconfig/appmanager/C/Citrix/Citrix_ica_winword
+lib/ICAClient/dt/appconfig/appmanager/C/Citrix/Citrix_ica_winzip32
+lib/ICAClient/dt/appconfig/appmanager/C/Citrix/Citrix_xcapture
+lib/ICAClient/dt/appconfig/icons/C/Citrix.l.pm
+lib/ICAClient/dt/appconfig/icons/C/Citrix.m.pm
+lib/ICAClient/dt/appconfig/icons/C/Citrix.s.pm
+lib/ICAClient/dt/appconfig/icons/C/Citrix.t.pm
+lib/ICAClient/dt/appconfig/icons/C/Citrix_ica_excel.m.pm
+lib/ICAClient/dt/appconfig/icons/C/Citrix_ica_iexplore.m.pm
+lib/ICAClient/dt/appconfig/icons/C/Citrix_ica_msaccess.m.pm
+lib/ICAClient/dt/appconfig/icons/C/Citrix_ica_outlook.m.pm
+lib/ICAClient/dt/appconfig/icons/C/Citrix_ica_powerpnt.m.pm
+lib/ICAClient/dt/appconfig/icons/C/Citrix_ica_visio32.m.pm
+lib/ICAClient/dt/appconfig/icons/C/Citrix_ica_winproj.m.pm
+lib/ICAClient/dt/appconfig/icons/C/Citrix_ica_winword.m.pm
+lib/ICAClient/dt/appconfig/icons/C/Citrix_ica_winzip32.m.pm
+lib/ICAClient/dt/appconfig/icons/C/Editor.m.pm
+lib/ICAClient/dt/appconfig/icons/C/ICA.l.pm
+lib/ICAClient/dt/appconfig/icons/C/ICA.m.pm
+lib/ICAClient/dt/appconfig/icons/C/ICA.s.pm
+lib/ICAClient/dt/appconfig/icons/C/ICA.t.pm
+lib/ICAClient/dt/appconfig/types/C/Citrix.dt
+lib/ICAClient/dt/appconfig/types/C/Citrix.fp
+lib/ICAClient/dt/appconfig/types/C/Citrix_ica_excel.dt
+lib/ICAClient/dt/appconfig/types/C/Citrix_ica_msaccess.dt
+lib/ICAClient/dt/appconfig/types/C/Citrix_ica_outlook.dt
+lib/ICAClient/dt/appconfig/types/C/Citrix_ica_powerpnt.dt
+lib/ICAClient/dt/appconfig/types/C/Citrix_ica_visio32.dt
+lib/ICAClient/dt/appconfig/types/C/Citrix_ica_winproj.dt
+lib/ICAClient/dt/appconfig/types/C/Citrix_ica_winword.dt
+lib/ICAClient/dt/appconfig/types/C/Citrix_ica_winzip32.dt
 lib/ICAClient/pkginf/F.core.solaris
 lib/ICAClient/pkginf/Ver.core.solaris
+@dirrm lib/ICAClient/dt/appconfig/help/C
+@dirrm lib/ICAClient/dt/appconfig/help
+@dirrm lib/ICAClient/dt/appconfig/icons/C
+@dirrm lib/ICAClient/dt/appconfig/icons
+@dirrm lib/ICAClient/dt/appconfig/types/C
+@dirrm lib/ICAClient/dt/appconfig/types
+@dirrm lib/ICAClient/dt/appconfig/appmanager/C/Citrix
+@dirrm lib/ICAClient/dt/appconfig/appmanager/C
+@dirrm lib/ICAClient/dt/appconfig/appmanager
+@dirrm lib/ICAClient/dt/appconfig
+@dirrm lib/ICAClient/dt
diff --git a/net/citrix_ica/distinfo b/net/citrix_ica/distinfo
index e2bb4e4f1cb..82a16c9fdd6 100644
--- a/net/citrix_ica/distinfo
+++ b/net/citrix_ica/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.8 2003/03/14 10:15:55 wiz Exp $
+$NetBSD: distinfo,v 1.9 2003/08/11 10:39:38 markd Exp $
 
-SHA1 (citrix_ica-6.30.1052/linuxx86.tar.gz) = bd932ad50726d5908dcf99c662a2ed08e146768b
-Size (citrix_ica-6.30.1052/linuxx86.tar.gz) = 1485835 bytes
-SHA1 (citrix_ica-6.30.1061/solaris.tar.Z) = a22f80b314b34cb857b946d78bc62aef826744ca
-Size (citrix_ica-6.30.1061/solaris.tar.Z) = 1666651 bytes
-SHA1 (patch-i386-aa) = cef16a252b1154399803c9dab6b01eb795efa701
-SHA1 (patch-i386-ab) = 8b363730b2010767d2584cbd28a5b0c0030a60dd
-SHA1 (patch-sparc-aa) = fa3be28a83125c3d9aa632f779ac4428c2b22e12
-SHA1 (patch-sparc-ab) = 0ab192cb660260f950ad9ab4df5d278c54459f7f
+SHA1 (citrix_ica-7.00.77757/linuxx86.tar.gz) = 98fc24375bbbf45dad33480b159f71d60af0e69d
+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 (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
new file mode 100644
index 00000000000..3987054910e
--- /dev/null
+++ b/net/citrix_ica/files/response.i386
@@ -0,0 +1,6 @@
+1
+DESTINATION
+y
+y
+n
+3
diff --git a/net/citrix_ica/files/response.sparc b/net/citrix_ica/files/response.sparc
new file mode 100644
index 00000000000..0b6b0528ec4
--- /dev/null
+++ b/net/citrix_ica/files/response.sparc
@@ -0,0 +1,7 @@
+1
+DESTINATION
+y
+y
+n
+n
+3
diff --git a/net/citrix_ica/patches/patch-i386-aa b/net/citrix_ica/patches/patch-i386-aa
index dc18222bba4..0841355497a 100644
--- a/net/citrix_ica/patches/patch-i386-aa
+++ b/net/citrix_ica/patches/patch-i386-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-i386-aa,v 1.4 2003/03/14 10:15:56 wiz Exp $
+$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
@@ -11,23 +11,7 @@ $NetBSD: patch-i386-aa,v 1.4 2003/03/14 10:15:56 wiz Exp $
  
  # The thing that goes between the owner and group to set both by chown.
  CHOWNGRP_TOKEN=":"
-@@ -835,13 +835,13 @@
- 		echo_no_nl $calcspace3
- 		read dummy
- 
--		/bin/false
-+		! :
- 		return 
- 	fi
- 
- 	$ECHO_CMD $calcspace4
- 
--	/bin/true
-+	:
- 	return
- }
- 
-@@ -1862,7 +1862,7 @@
+@@ -2028,7 +2028,7 @@
  	then
  		:
  	else
diff --git a/net/citrix_ica/patches/patch-sparc-aa b/net/citrix_ica/patches/patch-sparc-aa
index 4f1c7b2afdd..7a421eb5af1 100644
--- a/net/citrix_ica/patches/patch-sparc-aa
+++ b/net/citrix_ica/patches/patch-sparc-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-sparc-aa,v 1.3 2003/03/14 10:15:56 wiz Exp $
+$NetBSD: patch-sparc-aa,v 1.4 2003/08/11 10:39:37 markd Exp $
 
---- solaris/hinst.orig	Wed Mar  6 08:29:33 2002
+--- solaris/hinst.orig	Mon Aug 11 17:16:19 2003
 +++ solaris/hinst
-@@ -91,7 +91,7 @@
+@@ -91,7 +91,7 @@ DefaultCDSourceDir=/cdrom
  PORT=solaris
  
  #  The command to undo the archive on this platform.
@@ -11,7 +11,7 @@ $NetBSD: patch-sparc-aa,v 1.3 2003/03/14 10:15:56 wiz Exp $
  
  # The thing that goes between the owner and group to set both by chown.
  CHOWNGRP_TOKEN=":"
-@@ -111,7 +111,7 @@
+@@ -111,7 +111,7 @@ LMHOSTID_ARGS=
  
  # The hosts file name
  CAT_CMD=cat
@@ -20,23 +20,7 @@ $NetBSD: patch-sparc-aa,v 1.3 2003/03/14 10:15:56 wiz Exp $
  CAT_HOST_ARG=/etc/hosts
  
  # The command to read host information from NIS
-@@ -883,13 +883,13 @@
- 		echo_no_nl $calcspace3
- 		read dummy
- 
--		/bin/false
-+		! :
- 		return 
- 	fi
- 
- 	$ECHO_CMD $calcspace4
- 
--	/bin/true
-+	:
- 	return
- }
- 
-@@ -1916,7 +1916,7 @@
+@@ -2083,7 +2083,7 @@ install_packages(){
  	then
  		:
  	else
diff --git a/net/citrix_ica/patches/patch-sparc-ab b/net/citrix_ica/patches/patch-sparc-ab
index 2b419fced9a..6087f89de00 100644
--- a/net/citrix_ica/patches/patch-sparc-ab
+++ b/net/citrix_ica/patches/patch-sparc-ab
@@ -1,13 +1,17 @@
-$NetBSD: patch-sparc-ab,v 1.2 2002/08/05 00:34:57 dmcmahill Exp $
+$NetBSD: patch-sparc-ab,v 1.3 2003/08/11 10:39:37 markd Exp $
 
---- setupwfc.orig	Thu Mar  7 03:29:06 2002
+--- setupwfc.orig	Fri Jul 11 05:21:48 2003
 +++ setupwfc
-@@ -401,7 +401,7 @@
-                fi
-                ;;
-         NetBSD)
--                PLATFORM=netbsd
-+                PLATFORM=solaris
-                 DISP_PLATFORM="NetBSD"
-                 ;;
-         UnixWare)
+@@ -405,6 +405,12 @@ get_OS(){
+ 		   echo
+ 		   echo $setup4a $opsys $setup4b
+ 		   echo
++               elif uname -m | grep sparc 2>&1 >/dev/null  ;then
++                   PLATFORM=solaris
++                   DISP_PLATFORM="Solaris 2 (SunOS 5, sparc)"
++		   echo
++		   echo $setup4a $opsys $setup4b
++		   echo
+                else
+                    echo
+                    echo $setup1