Update to latest available versions (6.30.1052 for i386, 6.30.1061

for sparc). From Murray Armfield in PR 19210.
Changes are unknown.

5 files changed, 27 insertions, 33 deletions

diff --git a/net/citrix_ica/Makefile b/net/citrix_ica/Makefile
index a041c13baf6..978da2b8ca7 100644
--- a/net/citrix_ica/Makefile
+++ b/net/citrix_ica/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2002/12/07 02:39:00 schmonz Exp $
+# $NetBSD: Makefile,v 1.14 2003/03/14 10:15:55 wiz Exp $
 #
 
 # A default so lintpkgsrc is happy
@@ -6,11 +6,11 @@ PKGNAME=	citrix_ica-6.30
 DISTNAME=       citrix
 .if (${MACHINE_ARCH} == "i386")
 DISTNAME=	linuxx86
-PKGNAME=	citrix_ica-6.30.1050
+PKGNAME=	citrix_ica-6.30.1052
 .endif
 .if (${MACHINE_ARCH} == "sparc")
 DISTNAME=       solaris
-PKGNAME=        citrix_ica-6.20.985
+PKGNAME=        citrix_ica-6.30.1061
 EXTRACT_SUFX=   .tar.Z
 .endif
 CATEGORIES=	net
@@ -54,6 +54,7 @@ PATCHDIR=${WRKDIR}/.patches
 pre-patch:
 	${MKDIR} ${PATCHDIR}
 	${CP} ${PKGDIR}/patches/patch-${MACHINE_ARCH}-* ${PATCHDIR}
+	${CHMOD} -R u+w ${WRKSRC}
 
 do-build:
 	${SED} s%DESTINATION%${CDIR}% ${FILESDIR}/response \
diff --git a/net/citrix_ica/distinfo b/net/citrix_ica/distinfo
index 7e8d8a29dc2..e2bb4e4f1cb 100644
--- a/net/citrix_ica/distinfo
+++ b/net/citrix_ica/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.7 2003/01/15 22:41:32 kristerw Exp $
+$NetBSD: distinfo,v 1.8 2003/03/14 10:15:55 wiz Exp $
 
-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-sparc-aa) = 4bdc52ba9aa2f059047dc67e6b7750392245b5b8
+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 (patch-i386-aa) = 52fc882d81be0621b8cee5fe5bdcb807b9e624f2
-SHA1 (patch-i386-ab) = 7113a62d8ea8902aea257c2304c53f30d49b385d
diff --git a/net/citrix_ica/patches/patch-i386-aa b/net/citrix_ica/patches/patch-i386-aa
index ed15b56f3ef..dc18222bba4 100644
--- a/net/citrix_ica/patches/patch-i386-aa
+++ b/net/citrix_ica/patches/patch-i386-aa
@@ -1,3 +1,5 @@
+$NetBSD: patch-i386-aa,v 1.4 2003/03/14 10:15:56 wiz Exp $
+
 --- linuxx86/hinst.orig	Wed Apr 17 18:32:58 2002
 +++ linuxx86/hinst	Wed Jan 15 23:32:15 2003
 @@ -84,7 +84,7 @@
@@ -14,14 +16,14 @@
  		read dummy
  
 -		/bin/false
-+		false
++		! :
  		return 
  	fi
  
  	$ECHO_CMD $calcspace4
  
 -	/bin/true
-+	true
++	:
  	return
  }
  
@@ -30,7 +32,7 @@
  		:
  	else
 -		/bin/false
-+		false
++		! :
  		return 
  	fi
  
diff --git a/net/citrix_ica/patches/patch-i386-ab b/net/citrix_ica/patches/patch-i386-ab
index 82f3ea71e06..c529618b711 100644
--- a/net/citrix_ica/patches/patch-i386-ab
+++ b/net/citrix_ica/patches/patch-i386-ab
@@ -1,24 +1,15 @@
-$NetBSD: patch-i386-ab,v 1.2 2002/08/05 00:34:57 dmcmahill Exp $
+$NetBSD: patch-i386-ab,v 1.3 2003/03/14 10:15:56 wiz Exp $
 
 --- setupwfc.orig	Thu Apr 18 02:32:45 2002
 +++ setupwfc
-@@ -378,7 +378,7 @@
- 		PLATFORM=hp
- 		DISP_PLATFORM="Hewlett-Packard (HP-UX)"
- 		;;
--	Linux)
-+	Linux|FreeBSD|NetBSD)
-                # We assume that an Intel-based linux system will have an x86
-                # processor. We also assume that this is reported by uname -m
-                # "ix86" where x is some number.
-@@ -395,10 +395,6 @@
-                    exit 1
+@@ -396,8 +396,8 @@ get_OS(){
                 fi
                 ;;
--        NetBSD)
+         NetBSD)
 -                PLATFORM=netbsd
 -                DISP_PLATFORM="NetBSD"
--                ;;
++                PLATFORM=linuxx86
++                DISP_PLATFORM="NetBSD emulating Linux x86"
+                 ;;
          UnixWare)
                  # SCO UnixWare 7
-                 PLATFORM=sco
diff --git a/net/citrix_ica/patches/patch-sparc-aa b/net/citrix_ica/patches/patch-sparc-aa
index 78fe643540e..4f1c7b2afdd 100644
--- a/net/citrix_ica/patches/patch-sparc-aa
+++ b/net/citrix_ica/patches/patch-sparc-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-sparc-aa,v 1.2 2002/08/05 00:34:57 dmcmahill Exp $
+$NetBSD: patch-sparc-aa,v 1.3 2003/03/14 10:15:56 wiz Exp $
 
 --- solaris/hinst.orig	Wed Mar  6 08:29:33 2002
 +++ solaris/hinst
@@ -25,14 +25,14 @@ $NetBSD: patch-sparc-aa,v 1.2 2002/08/05 00:34:57 dmcmahill Exp $
  		read dummy
  
 -		/bin/false
-+		/usr/bin/false
++		! :
  		return 
  	fi
  
  	$ECHO_CMD $calcspace4
  
 -	/bin/true
-+	/usr/bin/true
++	:
  	return
  }
  
@@ -41,7 +41,7 @@ $NetBSD: patch-sparc-aa,v 1.2 2002/08/05 00:34:57 dmcmahill Exp $
  		:
  	else
 -		/bin/false
-+		/usr/bin/false
++		! :
  		return 
  	fi