diff options
| -rw-r--r-- | net/citrix_ica/Makefile | 6 | ||||
| -rw-r--r-- | net/citrix_ica/PLIST.common | 8 | ||||
| -rw-r--r-- | net/citrix_ica/PLIST.i386 | 8 | ||||
| -rw-r--r-- | net/citrix_ica/PLIST.sparc | 9 | ||||
| -rw-r--r-- | net/citrix_ica/distinfo | 4 | ||||
| -rw-r--r-- | net/citrix_ica/files/response.sparc | 3 | ||||
| -rw-r--r-- | net/citrix_ica/patches/patch-sparc-aa | 33 |
7 files changed, 44 insertions, 27 deletions
diff --git a/net/citrix_ica/Makefile b/net/citrix_ica/Makefile index 6e4f82d56da..1f350cabef6 100644 --- a/net/citrix_ica/Makefile +++ b/net/citrix_ica/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2007/01/19 08:56:45 sborrill Exp $ +# $NetBSD: Makefile,v 1.31 2007/01/19 23:37:43 dmcmahill Exp $ # # A default so lintpkgsrc is happy, overridden below @@ -23,11 +23,13 @@ PKGNAME= citrix_ica-9.0.0 . elif ${MACHINE_ARCH} == "sparc" DISTNAME= en.solaris PKGNAME= citrix_ica-8.46 +MASTER_SITES= http://www.citrix.com/site/resources/dynamic/software/ EXTRACT_SUFX= .tar.Z . endif .elif ${OPSYS} == "SunOS" DISTNAME= en.solaris PKGNAME= citrix_ica-8.46 +MASTER_SITES= http://www.citrix.com/site/resources/dynamic/software/ EXTRACT_SUFX= .tar.Z .elif ${OPSYS} == "Linux" || ${OPSYS} == "DragonFly" DISTNAME= linuxx86 @@ -64,7 +66,7 @@ INSTALLATION_DIRS= bin do-patch: (cd ${WRKSRC}; \ for f in ${PATCHDIR}/patch-${MACHINE_ARCH}-*;do \ - ${PATCH} <$$f >/dev/null 2>&1 || ${TRUE}; \ + ${PATCH} ${PATCH_ARGS} <$$f >/dev/null 2>&1 || ${TRUE}; \ done) do-build: diff --git a/net/citrix_ica/PLIST.common b/net/citrix_ica/PLIST.common index cafcb3923b5..13c294da2b9 100644 --- a/net/citrix_ica/PLIST.common +++ b/net/citrix_ica/PLIST.common @@ -1,18 +1,14 @@ -@comment $NetBSD: PLIST.common,v 1.2 2007/01/18 22:34:05 sborrill Exp $ +@comment $NetBSD: PLIST.common,v 1.3 2007/01/19 23:37:43 dmcmahill 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/TW1.DLL -lib/ICAClient/VDCM.DLL lib/ICAClient/VDSCARD.DLL lib/ICAClient/Wfcmgr lib/ICAClient/Wfcmgr.ad @@ -110,8 +106,6 @@ 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/PLIST.i386 b/net/citrix_ica/PLIST.i386 index 5d743b8c636..7c226f3cd3f 100644 --- a/net/citrix_ica/PLIST.i386 +++ b/net/citrix_ica/PLIST.i386 @@ -1,3 +1,9 @@ -@comment $NetBSD: PLIST.i386,v 1.3 2003/08/11 10:39:40 markd Exp $ +@comment $NetBSD: PLIST.i386,v 1.4 2007/01/19 23:37:43 dmcmahill Exp $ +lib/ICAClient/CHARICONV.DLL lib/ICAClient/pkginf/F.core.linuxx86 lib/ICAClient/pkginf/Ver.core.linuxx86 +lib/ICAClient/NDS.DLL +lib/ICAClient/TW1.DLL +lib/ICAClient/util/pacexec +lib/ICAClient/util/pac.js +lib/ICAClient/VDCM.DLL diff --git a/net/citrix_ica/PLIST.sparc b/net/citrix_ica/PLIST.sparc index 2f6662793a5..1bbf5492110 100644 --- a/net/citrix_ica/PLIST.sparc +++ b/net/citrix_ica/PLIST.sparc @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.sparc,v 1.2 2003/08/11 10:39:42 markd Exp $ +@comment $NetBSD: PLIST.sparc,v 1.3 2007/01/19 23:37:43 dmcmahill 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 @@ -23,7 +23,14 @@ 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.b.pm +lib/ICAClient/dt/appconfig/icons/C/Editor.l.pm +lib/ICAClient/dt/appconfig/icons/C/Editor.m.bm lib/ICAClient/dt/appconfig/icons/C/Editor.m.pm +lib/ICAClient/dt/appconfig/icons/C/Editor.s.bm +lib/ICAClient/dt/appconfig/icons/C/Editor.s.pm +lib/ICAClient/dt/appconfig/icons/C/Editor.t.bm +lib/ICAClient/dt/appconfig/icons/C/Editor.t.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 diff --git a/net/citrix_ica/distinfo b/net/citrix_ica/distinfo index 7b118bfb970..769ea46b48c 100644 --- a/net/citrix_ica/distinfo +++ b/net/citrix_ica/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.11 2007/01/18 22:34:05 sborrill Exp $ +$NetBSD: distinfo,v 1.12 2007/01/19 23:37:43 dmcmahill Exp $ SHA1 (citrix_ica-9.0.0/linuxx86.tar.gz) = 8847f7b20d7effc71062ca3b3a07a3db1cbd93f3 RMD160 (citrix_ica-9.0.0/linuxx86.tar.gz) = dfb037fa10c25b52bfe4b10961de18cd1fedb08b @@ -7,5 +7,5 @@ SHA1 (citrix_ica-8.46/en.solaris.tar.Z) = b2edbe959a57af43a6dfd7e2ba297f411caf35 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-aa) = 011e58cea29277abc7fd1d10c1d423406c46ae8d SHA1 (patch-sparc-ab) = 7a203edc890e80dd26ea94d9882d81ab6d816bbe diff --git a/net/citrix_ica/files/response.sparc b/net/citrix_ica/files/response.sparc index 0b6b0528ec4..0e0c1866307 100644 --- a/net/citrix_ica/files/response.sparc +++ b/net/citrix_ica/files/response.sparc @@ -1,7 +1,8 @@ 1 DESTINATION y -y +1 +n n n 3 diff --git a/net/citrix_ica/patches/patch-sparc-aa b/net/citrix_ica/patches/patch-sparc-aa index 7a421eb5af1..2ac56c97f32 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.4 2003/08/11 10:39:37 markd Exp $ +$NetBSD: patch-sparc-aa,v 1.5 2007/01/19 23:37:43 dmcmahill Exp $ ---- solaris/hinst.orig Mon Aug 11 17:16:19 2003 -+++ solaris/hinst -@@ -91,7 +91,7 @@ DefaultCDSourceDir=/cdrom +--- solaris/hinst.orig 2006-11-17 13:10:38.000000000 +0000 ++++ solaris/hinst 2007-01-19 18:59:43.000000000 +0000 +@@ -91,7 +91,7 @@ PORT=solaris # The command to undo the archive on this platform. @@ -11,7 +11,7 @@ $NetBSD: patch-sparc-aa,v 1.4 2003/08/11 10:39:37 markd Exp $ # The thing that goes between the owner and group to set both by chown. CHOWNGRP_TOKEN=":" -@@ -111,7 +111,7 @@ LMHOSTID_ARGS= +@@ -111,7 +111,7 @@ # The hosts file name CAT_CMD=cat @@ -20,12 +20,19 @@ $NetBSD: patch-sparc-aa,v 1.4 2003/08/11 10:39:37 markd Exp $ CAT_HOST_ARG=/etc/hosts # The command to read host information from NIS -@@ -2083,7 +2083,7 @@ install_packages(){ - then - : - else -- /bin/false -+ ! : - return - fi +@@ -2072,15 +2072,6 @@ + TOPDIR=$1 + INST_DIR=$2 +- # Check that there is enough space ... +- if check_pkg_fits +- then +- : +- else +- /bin/false +- return +- fi +- + if [ ! -d "$INST_DIR" ] + then + eval $ECHO_CMD $instpkgs2c |