get this to go on sparc as well as i386. The distfiles are different

and hence patches can't be shared.  Also, there are some minor PLIST
differences.

11 files changed, 86 insertions, 21 deletions

diff --git a/net/citrix_ica/Makefile b/net/citrix_ica/Makefile
index f7197930b36..552d6b3eef5 100644
--- a/net/citrix_ica/Makefile
+++ b/net/citrix_ica/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/03/23 14:53:43 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/05/05 17:24:10 dmcmahill Exp $
 #
 
 DISTNAME=	citrix_ica-client
@@ -32,6 +32,12 @@ NO_BIN_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
+DISTINFO_FILE=${.CURDIR}/distinfo.${MACHINE_ARCH}
+PATCHDIR=${.CURDIR}/patches.${MACHINE_ARCH}
+PLIST_SRC=	${PKGDIR}/PLIST.pre \
+		${PKGDIR}/PLIST.${MACHINE_ARCH} \
+		${PKGDIR}/PLIST.post
+
 DIST_SUBDIR=	citrix
 WRKSRC=		${WRKDIR}
 NO_BUILD=	Yes
@@ -40,9 +46,9 @@ CDIR=		${PREFIX}/lib/ICAClient
 BINDIR=		${PREFIX}/bin
 
 .if (${MACHINE_ARCH} == "sparc")
-.if !exists(/emul/sunos/usr/lib/ld.so)
-IGNORE=		"${PKGNAME} requires SunOS compability - see compat_sunos(8)"
-.endif
+#.if !exists(/emul/svr4/usr/lib/ld.so)
+#IGNORE=		"${PKGNAME} requires SVR4 compability - see compat_svr4(8)"
+#.endif
 .endif
 
 do-install:
diff --git a/net/citrix_ica/distinfo b/net/citrix_ica/distinfo.i386
index 8313b1d966d..a1f484395d1 100644
--- a/net/citrix_ica/distinfo
+++ b/net/citrix_ica/distinfo.i386
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 11:23:11 wiz Exp $
+SHA1 (patch-aa) = db6ec387f49feffdc02d6a495c14c8bef4433d16
 
 SHA1 (citrix/linuxx86.tar.gz) = d30a8b151c7503a61005b00c5d2a0e77301df259
 Size (citrix/linuxx86.tar.gz) = 1507974 bytes
-SHA1 (citrix/solaris.tar.Z) = 453eaf6cdbafd57485e71d497e634b616f747ace
-Size (citrix/solaris.tar.Z) = 1728307 bytes
 SHA1 (patch-aa) = db6ec387f49feffdc02d6a495c14c8bef4433d16
 SHA1 (patch-ab) = a688fa885d0a93ee7a8a02935de5024fa6fecc6c
diff --git a/net/citrix_ica/distinfo.sparc b/net/citrix_ica/distinfo.sparc
new file mode 100644
index 00000000000..152af087ec9
--- /dev/null
+++ b/net/citrix_ica/distinfo.sparc
@@ -0,0 +1,6 @@
+$NetBSD: distinfo.sparc,v 1.1 2001/05/05 17:24:11 dmcmahill Exp $
+
+SHA1 (citrix/solaris.tar.Z) = 453eaf6cdbafd57485e71d497e634b616f747ace
+Size (citrix/solaris.tar.Z) = 1728307 bytes
+SHA1 (patch-aa) = 646df6b2908fc007d53be22176f2eff05041f6f8
+SHA1 (patch-ab) = 9f4f6939434156acedd18947155721237091db03
diff --git a/net/citrix_ica/patches/patch-aa b/net/citrix_ica/patches.i386/patch-aa
index 46f23248598..fc726a49fc6 100644
--- a/net/citrix_ica/patches/patch-aa
+++ b/net/citrix_ica/patches.i386/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/03/20 19:06:12 wiz Exp $
+$NetBSD: patch-aa,v 1.1 2001/05/05 17:24:12 dmcmahill Exp $
 
 --- linuxx86/hinst.orig	Tue Aug  8 20:24:55 2000
 +++ linuxx86/hinst
diff --git a/net/citrix_ica/patches/patch-ab b/net/citrix_ica/patches.i386/patch-ab
index 509c0f320e6..54feb8760f2 100644
--- a/net/citrix_ica/patches/patch-ab
+++ b/net/citrix_ica/patches.i386/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/03/20 19:06:12 wiz Exp $
+$NetBSD: patch-ab,v 1.1 2001/05/05 17:24:12 dmcmahill Exp $
 
 --- setupwfc.orig	Tue Aug  8 20:24:35 2000
 +++ setupwfc
diff --git a/net/citrix_ica/patches.sparc/patch-aa b/net/citrix_ica/patches.sparc/patch-aa
new file mode 100644
index 00000000000..5e9031b1381
--- /dev/null
+++ b/net/citrix_ica/patches.sparc/patch-aa
@@ -0,0 +1,39 @@
+$NetBSD: patch-aa,v 1.1 2001/05/05 17:24:13 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 @@
+ 
+ #  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 @@
+ # The hosts file name
+ CAT_CMD=cat
+-MORE_CMD=more
++MORE_CMD="echo please read"
+ CAT_HOST_ARG=/etc/hosts
+ 
+@@ -887,5 +887,5 @@
+ 		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 @@
+ 		:
+ 	else
+-		/bin/false
++		/usr/bin/false
+ 		return 
+ 	fi
diff --git a/net/citrix_ica/patches.sparc/patch-ab b/net/citrix_ica/patches.sparc/patch-ab
new file mode 100644
index 00000000000..57f63dda275
--- /dev/null
+++ b/net/citrix_ica/patches.sparc/patch-ab
@@ -0,0 +1,11 @@
+$NetBSD: patch-ab,v 1.1 2001/05/05 17:24:13 dmcmahill Exp $
+
+--- setupwfc.orig	Fri Dec 15 12:05:20 2000
++++ setupwfc	Fri May  4 21:46:40 2001
+@@ -402,5 +402,5 @@
+                ;;
+         NetBSD)
+-                PLATFORM=netbsd
++                PLATFORM=solaris
+                 DISP_PLATFORM="NetBSD"
+                 ;;
diff --git a/net/citrix_ica/pkg/PLIST.i386 b/net/citrix_ica/pkg/PLIST.i386
new file mode 100644
index 00000000000..0d45ad7f49c
--- /dev/null
+++ b/net/citrix_ica/pkg/PLIST.i386
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST.i386,v 1.1 2001/05/05 17:24:13 dmcmahill Exp $
+lib/ICAClient/pkginf/F.core.linuxx86
+lib/ICAClient/pkginf/Ver.core.linuxx86
diff --git a/net/citrix_ica/pkg/PLIST b/net/citrix_ica/pkg/PLIST.post
index 6dca18cda8e..ca86d5451f4 100644
--- a/net/citrix_ica/pkg/PLIST
+++ b/net/citrix_ica/pkg/PLIST.post
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/03/20 19:06:12 wiz Exp $
+@comment $NetBSD: PLIST.post,v 1.1 2001/05/05 17:24:14 dmcmahill Exp $
 bin/wfcmgr
 bin/wfica
 lib/ICAClient/Npica
@@ -208,20 +208,9 @@ lib/ICAClient/keyboard/sparcus3.kbd
 lib/ICAClient/keyboard/sparcus4.kbd
 lib/ICAClient/keyboard/sparcus5.kbd
 lib/ICAClient/keyboard/trimodal.kbd
-lib/ICAClient/pkginf/Ver.core.linuxx86
-lib/ICAClient/pkginf/F.core.linuxx86
 lib/ICAClient/util/XCapture
 lib/ICAClient/util/XCapture.ad
 lib/ICAClient/util/echo_cmd
 lib/ICAClient/util/hinst
 lib/ICAClient/util/icalicense.sh
 lib/ICAClient/util/xcapture
-@dirrm lib/ICAClient/.config
-@dirrm lib/ICAClient/config
-@dirrm lib/ICAClient/cache
-@dirrm lib/ICAClient/help
-@dirrm lib/ICAClient/icons
-@dirrm lib/ICAClient/keyboard
-@dirrm lib/ICAClient/pkginf
-@dirrm lib/ICAClient/util
-@dirrm lib/ICAClient
diff --git a/net/citrix_ica/pkg/PLIST.pre b/net/citrix_ica/pkg/PLIST.pre
new file mode 100644
index 00000000000..fb9a35f8dc9
--- /dev/null
+++ b/net/citrix_ica/pkg/PLIST.pre
@@ -0,0 +1,10 @@
+@comment $NetBSD: PLIST.pre,v 1.1 2001/05/05 17:24:14 dmcmahill Exp $
+@dirrm lib/ICAClient/.config
+@dirrm lib/ICAClient/config
+@dirrm lib/ICAClient/cache
+@dirrm lib/ICAClient/help
+@dirrm lib/ICAClient/icons
+@dirrm lib/ICAClient/keyboard
+@dirrm lib/ICAClient/pkginf
+@dirrm lib/ICAClient/util
+@dirrm lib/ICAClient
diff --git a/net/citrix_ica/pkg/PLIST.sparc b/net/citrix_ica/pkg/PLIST.sparc
new file mode 100644
index 00000000000..f84e786e293
--- /dev/null
+++ b/net/citrix_ica/pkg/PLIST.sparc
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST.sparc,v 1.1 2001/05/05 17:24:14 dmcmahill Exp $
+lib/ICAClient/pkginf/F.core.solaris
+lib/ICAClient/pkginf/Ver.core.solaris