From owner-freebsd-bugs@FreeBSD.ORG Mon Mar 12 02:40:04 2007 Return-Path: X-Original-To: freebsd-bugs@hub.freebsd.org Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 96CBC16A401 for ; Mon, 12 Mar 2007 02:40:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id 781FB13C469 for ; Mon, 12 Mar 2007 02:40:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l2C2e4D4026257 for ; Mon, 12 Mar 2007 02:40:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l2C2e4Cd026256; Mon, 12 Mar 2007 02:40:04 GMT (envelope-from gnats) Resent-Date: Mon, 12 Mar 2007 02:40:04 GMT Resent-Message-Id: <200703120240.l2C2e4Cd026256@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, William Baxter Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 25A2116A409 for ; Mon, 12 Mar 2007 02:31:21 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [69.147.83.33]) by mx1.freebsd.org (Postfix) with ESMTP id 0A1C213C489 for ; Mon, 12 Mar 2007 02:31:21 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.13.1/8.13.1) with ESMTP id l2C2VKcZ071350 for ; Mon, 12 Mar 2007 02:31:20 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.13.1/8.13.1/Submit) id l2C2VK5l071349; Mon, 12 Mar 2007 02:31:20 GMT (envelope-from nobody) Message-Id: <200703120231.l2C2VK5l071349@www.freebsd.org> Date: Mon, 12 Mar 2007 02:31:20 GMT From: William Baxter To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.0 Cc: Subject: misc/110204: Upgrade to version 10 of the Citrix client X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Mar 2007 02:40:04 -0000 >Number: 110204 >Category: misc >Synopsis: Upgrade to version 10 of the Citrix client >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Mar 12 02:40:03 GMT 2007 >Closed-Date: >Last-Modified: >Originator: William Baxter >Release: 6.2 >Organization: >Environment: FreeBSD aristotle.superscript.com 6.2-RELEASE FreeBSD 6.2-RELEASE #0: Fri Jan 12 11:05:30 UTC 2007 root@dessler.cse.buffalo.edu:/usr/obj/usr/src/sys/SMP i386 >Description: Update of net/citrix_ica to latest version of client from Citrix. >How-To-Repeat: >Fix: Patch attached with submission follows: ===> Generating patch ===> Viewing diff with more diff -ruN --exclude=CVS /usr/ports/net/citrix_ica/Makefile /usr/ports/net/citrix_ica.v10/Makefile --- /usr/ports/net/citrix_ica/Makefile Sun Mar 4 08:52:28 2007 +++ /usr/ports/net/citrix_ica.v10/Makefile Sun Mar 4 08:54:47 2007 @@ -6,8 +6,8 @@ # PORTNAME= citrix_ica -PORTVERSION= 9.00 -PORTREVISION= 2 +PORTVERSION= 10.00 +PORTREVISION= 1 CATEGORIES= net comms linux MASTER_SITES= DISTNAME= ${PORTNAME}-linuxx86-${PORTVERSION} diff -ruN --exclude=CVS /usr/ports/net/citrix_ica/distinfo /usr/ports/net/citrix_ica.v10/distinfo --- /usr/ports/net/citrix_ica/distinfo Sun Mar 4 08:54:59 2007 +++ /usr/ports/net/citrix_ica.v10/distinfo Sun Mar 4 08:59:22 2007 @@ -1,3 +1,6 @@ +MD5 (citrix_ica-linuxx86-10.00.tar.gz) = 7d5286e919297823b572a80ed417af71 +SHA256 (citrix_ica-linuxx86-10.00.tar.gz) = 2777b4b3b4d7371399cd45bde16d1943df86222882d032e4fcef661089795078 +SIZE (citrix_ica-linuxx86-10.00.tar.gz) = 1795232 MD5 (citrix_ica-linuxx86-9.00.tar.gz) = df3194f942e03b8c700907a3406aef76 SHA256 (citrix_ica-linuxx86-9.00.tar.gz) = 7a8f66d12b9b715910e8760cd30d921c182d9789a03b0b6e243a3062a9afa9f9 SIZE (citrix_ica-linuxx86-9.00.tar.gz) = 1356273 diff -ruN --exclude=CVS /usr/ports/net/citrix_ica/files/patch-linuxx86::hinst /usr/ports/net/citrix_ica.v10/files/patch-linuxx86::hinst --- /usr/ports/net/citrix_ica/files/patch-linuxx86::hinst Sun Mar 4 09:36:06 2007 +++ /usr/ports/net/citrix_ica.v10/files/patch-linuxx86::hinst Sun Mar 4 10:23:55 2007 @@ -1,6 +1,6 @@ ---- linuxx86/hinst.orig Fri Apr 8 19:52:59 2005 -+++ linuxx86/hinst Wed May 18 14:07:10 2005 -@@ -75,7 +75,7 @@ +--- hinst.orig Tue Oct 31 07:07:08 2006 ++++ hinst Sun Mar 4 10:23:42 2007 +@@ -86,7 +86,7 @@ fi # Install in here by default. @@ -9,16 +9,16 @@ # Default CDROM mount point DefaultCDSourceDir=/cdrom -@@ -2166,7 +2166,7 @@ - - # rm -f $m_filename $mf_filename $o_filename $of_filename +@@ -2263,7 +2263,7 @@ + fi + fi - /bin/true + /usr/bin/true } ############################################################################### -@@ -2217,10 +2217,34 @@ +@@ -2311,10 +2311,34 @@ # ############################################################################### @@ -48,14 +48,14 @@ + fi +done + - INST_DIR=$ICAInstDir + INST_DIR="$ICAInstDir" TMP_NAME=/tmp/ICAnetscape.$$ -NETSCAPE_DIR="/usr/local/lib/netscape" -PLUGIN_PATH="/usr/local/netscape/plugins" PLUGIN_NAME=npica.so PLUGIN_CLASS=ICAClObj.class MAILCAP_FILE=mailcap -@@ -2293,26 +2317,19 @@ +@@ -2387,26 +2411,19 @@ netscape_integrate() { @@ -87,7 +87,7 @@ user_prompt $integrate_netscape2 getyesno $INSTALLER_NO if [ "$ANSWER" = "$INSTALLER_YES" ] -@@ -2321,9 +2338,9 @@ +@@ -2415,9 +2432,9 @@ else user_echo $integrate_netscape6 fi @@ -99,7 +99,7 @@ # Create utility script files in install root. create_wfica_script create_wfica_assoc_script -@@ -2953,55 +2970,6 @@ +@@ -3053,55 +3070,6 @@ echo "$BINDIR" } @@ -115,7 +115,7 @@ -{ - PROGS="netscape mozilla firefox" - DIST_BIN_DIR="" -- STANDARD_DIRS="/usr/local/netscape /usr/local/mozilla" +- STANDARD_DIRS="/usr/local/netscape /usr/local/mozilla /usr/local/firefox /usr/lib/mozilla" - - case $op_system in - SunOS) if @@ -155,12 +155,14 @@ BROWSER_LIST_KEY="BROWSER_DIR" ################################################################################ # -@@ -3226,6 +3194,8 @@ - wfcmgr_ja_NAME='MetaFrame UNIX クライアント' - - DEFAULT_GNOME_TARGET_DIRS="/usr/share/applications \ +@@ -3327,7 +3295,9 @@ + XDG_TARGET_DIR="/usr/share/applications" + TL_MENU_DIR="Vendor_menus/Applications" # TurboLinux + TL_TOP_DIR="/usr/share/applnk/"$TL_MENU_DIR +-DEFAULT_GNOME_TARGET_DIRS="/etc/opt/gnome/SuSE/Internet" ++DEFAULT_GNOME_TARGET_DIRS="/usr/share/applications \ + /usr/local/share/applnk/Internet \ -+ /usr/local/share/applnk/Networking \ - /etc/opt/gnome/SuSE/Internet" - DEFAULT_KDE_TARGET_DIRS="/usr/share/applnk/Applications \ - /usr/share/applnk-redhat/Internet \ ++ /etc/opt/gnome/SuSE/Internet" + DEFAULT_KDE_TARGET_DIRS="/usr/share/applnk-redhat/Internet \ + /usr/share/applnk-mdk/Networking \ + $TL_TOP_DIR/Internet \ diff -ruN --exclude=CVS /usr/ports/net/citrix_ica/files/patch-setupwfc /usr/ports/net/citrix_ica.v10/files/patch-setupwfc --- /usr/ports/net/citrix_ica/files/patch-setupwfc Sun Mar 4 09:37:05 2007 +++ /usr/ports/net/citrix_ica.v10/files/patch-setupwfc Sun Mar 4 09:39:38 2007 @@ -1,11 +1,11 @@ ---- setupwfc.orig Wed Apr 17 18:32:45 2002 -+++ setupwfc Mon Jul 8 18:28:31 2002 -@@ -382,7 +382,7 @@ - # 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. -- if uname -m | grep 86 2>&1 >/dev/null ;then -+ if uname -m | grep i[3456]86 2>&1 >/dev/null ;then +--- setupwfc.orig Tue Oct 31 07:06:54 2006 ++++ setupwfc Sun Mar 4 09:39:13 2007 +@@ -441,7 +441,7 @@ + *BSD) + # Assume Free/Net/Open BSD on an X86 with Linux emulation. + +- if uname -m | grep 86 2>&1 >/dev/null ; then ++ if uname -m | grep i[3456]86 2>&1 >/dev/null ; then PLATFORM=linuxx86 DISP_PLATFORM="Linux (x86)" - elif uname -m | grep -i arm 2>&1 >/dev/null ;then + echo ===> Done >Release-Note: >Audit-Trail: >Unformatted: