From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Apr 25 15:00:12 2007 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EB65716A404 for ; Wed, 25 Apr 2007 15:00:12 +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 B868713C458 for ; Wed, 25 Apr 2007 15:00:12 +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 l3PF0Bhf033806 for ; Wed, 25 Apr 2007 15:00:11 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l3PF0BPd033805; Wed, 25 Apr 2007 15:00:11 GMT (envelope-from gnats) Resent-Date: Wed, 25 Apr 2007 15:00:11 GMT Resent-Message-Id: <200704251500.l3PF0BPd033805@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Thomas Abthorpe Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0137C16A402 for ; Wed, 25 Apr 2007 14:54:34 +0000 (UTC) (envelope-from tabthorpe@goodking.ca) Received: from tbaytel.net (front2-hosting.tbaytel.net [216.211.26.161]) by mx1.freebsd.org (Postfix) with ESMTP id 9752013C455 for ; Wed, 25 Apr 2007 14:54:33 +0000 (UTC) (envelope-from tabthorpe@goodking.ca) Received: from stjames.stthomasanglican.org ([216.211.1.161] verified) by front2.tbaytel.net (CommuniGate Pro SMTP 5.0.8) with ESMTPS id 77271414 for FreeBSD-gnats-submit@freebsd.org; Wed, 25 Apr 2007 10:54:31 -0400 Received: from goodking.goodking.ca (goodking-stjames-tun.goodking.ca [172.31.17.10]) by stjames.stthomasanglican.org (8.14.1/8.14.1) with ESMTP id l3PEsGAR054384 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL) for ; Wed, 25 Apr 2007 10:54:17 -0400 (EDT) (envelope-from tabthorpe@goodking.ca) Received: from goodking.goodking.ca (localhost [127.0.0.1]) by goodking.goodking.ca (8.14.1/8.14.1) with ESMTP id l3PErlVH070899 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 25 Apr 2007 10:53:47 -0400 (EDT) (envelope-from tabthorpe@goodking.goodking.ca) Received: (from root@localhost) by goodking.goodking.ca (8.14.1/8.14.1/Submit) id l3PErlF2070898; Wed, 25 Apr 2007 10:53:47 -0400 (EDT) (envelope-from tabthorpe) Message-Id: <200704251453.l3PErlF2070898@goodking.goodking.ca> Date: Wed, 25 Apr 2007 10:53:47 -0400 (EDT) From: Thomas Abthorpe To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: thomas@goodking.ca Subject: ports/112125: [MAINTAINER] japanese/citrix_ica: update to 10.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Apr 2007 15:00:13 -0000 >Number: 112125 >Category: ports >Synopsis: [MAINTAINER] japanese/citrix_ica: update to 10.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Apr 25 15:00:10 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Thomas Abthorpe >Release: FreeBSD 6.2-RELEASE-p3 i386 >Organization: GoodKing.Ca >Environment: System: FreeBSD goodking.goodking.ca 6.2-RELEASE-p3 FreeBSD 6.2-RELEASE-p3 #2: Fri Mar 16 16:20:06 EDT 2007 >Description: - Update to 10.0 Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- citrix_ica-10.0.patch begins here --- diff -ruN --exclude=CVS /usr/ports//japanese/citrix_ica/Makefile /home/ports/japanese/citrix_ica/Makefile --- /usr/ports//japanese/citrix_ica/Makefile Tue Oct 3 14:49:55 2006 +++ /home/ports/japanese/citrix_ica/Makefile Wed Apr 25 10:28:11 2007 @@ -6,7 +6,7 @@ # PORTNAME= citrix_ica -PORTVERSION= 9.15 +PORTVERSION= 10.0 CATEGORIES= japanese net comms linux MASTER_SITES= DISTNAME= ${PORTNAME}-linuxx86-ja-${PORTVERSION} @@ -16,9 +16,8 @@ RUN_DEPENDS= ${LINUXBASE}${X11BASE}/lib/libXm.so.3:${PORTSDIR}/x11-toolkits/linux-openmotif -ONLY_FOR_ARCHS= i386 +ONLY_FOR_ARCHS= i386 amd64 USE_LINUX= yes -#USE_X_PREFIX= Yes RESTRICTED= License prohibits redistribution IS_INTERACTIVE= "Noisy license agreement ignores stdin" @@ -51,12 +50,11 @@ do-fetch: .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) @${ECHO} "" - @${ECHO} "You have to fetch the file manually after reading and" - @${ECHO} "agreeing to the license at:" + @${ECHO} "You have to fetch the file manually from" @${ECHO} "" - @${ECHO} "http://www.citrix.com/download/bin/license.asp?client=linux" + @${ECHO} "http://www.citrix.com/site/SS/downloads/details.asp?dID=2755&downloadID=3323" @${ECHO} "" - @${ECHO} "Once linuxx86.tar.gz has been downloaded move it to" + @${ECHO} "Once ja.linuxx86.tar.gz has been downloaded move it to" @${ECHO} "${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} and restart the build." @${ECHO} "" @${FALSE} diff -ruN --exclude=CVS /usr/ports//japanese/citrix_ica/distinfo /home/ports/japanese/citrix_ica/distinfo --- /usr/ports//japanese/citrix_ica/distinfo Tue Oct 3 14:49:55 2006 +++ /home/ports/japanese/citrix_ica/distinfo Wed Apr 25 10:17:25 2007 @@ -1,3 +1,3 @@ -MD5 (citrix_ica-linuxx86-ja-9.15.tar.gz) = aa9043263f29d450edda08fd0d4bbe1e -SHA256 (citrix_ica-linuxx86-ja-9.15.tar.gz) = 892526bc03dc05c6558e4b5f6ea4e6165cc2624a374185c59aa28fb33f2ed451 -SIZE (citrix_ica-linuxx86-ja-9.15.tar.gz) = 1385839 +MD5 (citrix_ica-linuxx86-ja-10.0.tar.gz) = 3fa703ce341c1ee71e6b5488f4abd7e9 +SHA256 (citrix_ica-linuxx86-ja-10.0.tar.gz) = 86a7678a0d422aa95ce96a468d3a4bef55d6a20b8da819daf830d67bd36bbe76 +SIZE (citrix_ica-linuxx86-ja-10.0.tar.gz) = 1884206 diff -ruN --exclude=CVS /usr/ports//japanese/citrix_ica/files/patch-linuxx86__hinst /home/ports/japanese/citrix_ica/files/patch-linuxx86__hinst --- /usr/ports//japanese/citrix_ica/files/patch-linuxx86__hinst Tue Oct 3 14:49:55 2006 +++ /home/ports/japanese/citrix_ica/files/patch-linuxx86__hinst Wed Apr 25 10:31:55 2007 @@ -1,6 +1,6 @@ ---- linuxx86/hinst.orig Tue Dec 6 10:50:57 2005 -+++ linuxx86/hinst Thu Jun 1 08:58:24 2006 -@@ -74,7 +74,7 @@ +--- linuxx86/hinst.orig Thu Nov 2 08:55:48 2006 ++++ linuxx86/hinst Wed Apr 25 10:25:45 2007 +@@ -86,7 +86,7 @@ fi # Install in here by default. @@ -9,53 +9,25 @@ # Default CDROM mount point DefaultCDSourceDir=/cdrom -@@ -2172,7 +2172,7 @@ - tr_file $TR_FILE_KEY $PORT/$PORT.psf - preen_files +@@ -2221,7 +2221,7 @@ + then + : + else +- /bin/false ++ /usr/bin/false + return + fi + +@@ -2267,7 +2267,7 @@ + fi + fi - /bin/true + /usr/bin/true } ############################################################################### -@@ -2222,10 +2222,34 @@ - # - ############################################################################### - -+check_for_ns() { -+ BIN=`/usr/bin/file $1/plugins/libnullplugin.so | /usr/bin/awk '{print $11}'` -+ case ${BIN} in -+ \(SYSV\),) -+ NETSCAPE_DIR="$1" -+ PLUGIN_PATH="$s/plugins" -+ FOUND_NS="TRUE" -+ esac -+} -+ -+NSCP="/usr/local/libexec/netscape \ -+ /usr/local/libexec/netscape-linux \ -+ /usr/local/netscape \ -+ /usr/local/netscape-linux \ -+ /usr/local/lib/netscape \ -+ /usr/local/lib/netscape-linux \ -+ /usr/local/lib/linux-mozilla \ -+ /usr/local/lib/mozilla \ -+ $MOZILLA_HOME" -+ -+for dir in ${NSCP}; do -+ if [ -e $dir/plugins/libnullplugin.so ]; then -+ check_for_ns $dir; -+ fi -+done -+ - 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 -@@ -2298,26 +2322,18 @@ +@@ -2390,26 +2390,18 @@ netscape_integrate() { @@ -86,7 +58,7 @@ user_prompt $integrate_netscape2 getyesno $INSTALLER_NO if [ "$ANSWER" = "$INSTALLER_YES" ] -@@ -2326,7 +2342,8 @@ +@@ -2418,7 +2410,8 @@ else user_echo $integrate_netscape6 fi @@ -96,7 +68,7 @@ fi # Create utility script files in install root. -@@ -2964,55 +2981,6 @@ +@@ -3056,55 +3049,6 @@ echo "$BINDIR" } @@ -152,7 +124,7 @@ BROWSER_LIST_KEY="BROWSER_DIR" ################################################################################ # -@@ -3238,7 +3206,10 @@ +@@ -3330,7 +3274,10 @@ XDG_TARGET_DIR="/usr/share/applications" TL_MENU_DIR="Vendor_menus/Applications" # TurboLinux TL_TOP_DIR="/usr/share/applnk/"$TL_MENU_DIR diff -ruN --exclude=CVS /usr/ports//japanese/citrix_ica/files/patch-setupwfc /home/ports/japanese/citrix_ica/files/patch-setupwfc --- /usr/ports//japanese/citrix_ica/files/patch-setupwfc Tue Oct 3 14:49:55 2006 +++ /home/ports/japanese/citrix_ica/files/patch-setupwfc Wed Apr 25 10:34:29 2007 @@ -1,11 +1,11 @@ ---- setupwfc.orig Tue Dec 6 11:25:39 2005 -+++ setupwfc Fri May 26 10:15:09 2006 -@@ -420,7 +420,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 - if grep uClibc /etc/issue 2>&1 > /dev/null ;then - PLATFORM=uclibc - DISP_PLATFORM="Linux (uClibc)" +--- setupwfc.orig Tue Oct 31 07:48:46 2006 ++++ setupwfc Wed Apr 25 10:33:49 2007 +@@ -442,7 +442,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\|amd64" 2>&1 >/dev/null ; then + PLATFORM=linuxx86 + DISP_PLATFORM="Linux (x86)" + echo diff -ruN --exclude=CVS /usr/ports//japanese/citrix_ica/pkg-plist /home/ports/japanese/citrix_ica/pkg-plist --- /usr/ports//japanese/citrix_ica/pkg-plist Tue Oct 3 14:49:55 2006 +++ /home/ports/japanese/citrix_ica/pkg-plist Wed Apr 25 10:38:03 2007 @@ -1,36 +1,33 @@ -@unexec for dir in /usr/local/libexec/netscape /usr/local/libexec/netscape-linux /usr/local/netscape /usr/local/netscape-linux /usr/local/lib/netscape /usr/local/lib/netscape-linux %%MOZILLA_HOME%% %D/lib/netscape-linux; do if [ -f ${dir}/mime.types ]; then (/bin/cat ${dir}/mime.types | /usr/bin/grep -v "application/x-ica" > ${dir}/mime.types.tmp; mv ${dir}/mime.types.tmp ${dir}/mime.types); fi ; done -@unexec for dir in /usr/local/libexec/netscape /usr/local/libexec/netscape-linux /usr/local/netscape /usr/local/netscape-linux /usr/local/lib/netscape /usr/local/lib/netscape-linux %%MOZILLA_HOME%% %D/lib/netscape-linux; do if [ -f ${dir}/mailcap ]; then (/bin/cat ${dir}/mailcap | /usr/bin/grep -v "application/x-ica" > ${dir}/mailcap.tmp; /bin/mv ${dir}/mailcap.tmp ${dir}/mailcap); fi ; done -@unexec for dir in /usr/local/libexec/netscape /usr/local/libexec/netscape-linux /usr/local/netscape /usr/local/netscape-linux /usr/local/lib/netscape /usr/local/lib/netscape-linux %%MOZILLA_HOME%% %D/lib/netscape-linux; do if [ -e ${dir}/plugins/npica.so ]; then (/bin/rm ${dir}/plugins/npica.so); fi ; done -ICAClient/.config/appsrv.ini -ICAClient/.config/keyboard.ini -ICAClient/.config/module.ini -ICAClient/.config/wfclient.ini -ICAClient/libctxssl.so -ICAClient/Npica -ICAClient/Npica.ad ICAClient/CHARICONV.DLL ICAClient/NDS.DLL +ICAClient/Npica +ICAClient/Npica.ad ICAClient/PDCRYPT1.DLL ICAClient/PDCRYPT2.DLL ICAClient/TW1.DLL -ICAClient/VDCM.DLL +ICAClient/VDEUEM.DLL ICAClient/VDSCARD.DLL ICAClient/VDSPMIKE.DLL -ICAClient/Wfcmgr -ICAClient/Wfcmgr.ad -ICAClient/Wfica -ICAClient/Wfica.ad ICAClient/config/.server +ICAClient/config/All_Regions.ini +ICAClient/config/Trusted_Region.ini +ICAClient/config/Unknown_Region.ini +ICAClient/config/Untrusted_Region.ini ICAClient/config/appsrv.ini +ICAClient/config/canonicalization.ini ICAClient/config/module.ini +ICAClient/config/regions.ini +ICAClient/config/usertemplate/All_Regions.ini +ICAClient/config/usertemplate/Trusted_Region.ini +ICAClient/config/usertemplate/Unknown_Region.ini +ICAClient/config/usertemplate/Untrusted_Region.ini ICAClient/config/wfclient.ini -ICAClient/desktop/wfcmgr.desktop ICAClient/desktop/Citrix_PNA.desktop +ICAClient/desktop/wfcmgr.desktop ICAClient/eula.txt ICAClient/help/index.htm -ICAClient/icons/citrix16.xpm -ICAClient/icons/citrix32.xpm -ICAClient/icons/citrix48.xpm +ICAClient/icons/manager.xpm +ICAClient/icons/session.xpm ICAClient/install.txt ICAClient/keyboard/age2.kbd ICAClient/keyboard/agex2.kbd @@ -63,8 +60,8 @@ ICAClient/keyboard/hpusps2.kbd ICAClient/keyboard/ibm.kbd ICAClient/keyboard/keyboard.ini -ICAClient/keyboard/linux.kbd ICAClient/keyboard/linux-ja.kbd +ICAClient/keyboard/linux.kbd ICAClient/keyboard/mac101.kbd ICAClient/keyboard/ncdn-101.kbd ICAClient/keyboard/ncdn-102.kbd @@ -96,12 +93,22 @@ ICAClient/keystore/cacerts/Class3PCA_G2_v2.crt ICAClient/keystore/cacerts/Class4PCA_G2_v2.crt ICAClient/keystore/cacerts/GTECTGlobalRoot.crt -ICAClient/keystore/cacerts/GTECTRoot.crt ICAClient/keystore/cacerts/Pcs3ss_v4.crt ICAClient/keystore/cacerts/SecureServer.crt +ICAClient/libctxssl.so ICAClient/nls/C -ICAClient/nls/ja/pna.nls +ICAClient/nls/en/UTF-8/Wfcmgr +ICAClient/nls/en/UTF-8/Wfica +ICAClient/nls/en/UTF-8/pna.nls +ICAClient/nls/en/Wfcmgr +ICAClient/nls/en/Wfica ICAClient/nls/en/pna.nls +ICAClient/nls/ja/UTF-8/Wfcmgr +ICAClient/nls/ja/UTF-8/Wfica +ICAClient/nls/ja/UTF-8/pna.nls +ICAClient/nls/ja/Wfcmgr +ICAClient/nls/ja/Wfica +ICAClient/nls/ja/pna.nls ICAClient/npica.so ICAClient/pkginf/F.core.linuxx86 ICAClient/pkginf/Ver.core.linuxx86 @@ -114,8 +121,8 @@ ICAClient/util/hinst ICAClient/util/icalicense.sh ICAClient/util/nslaunch -ICAClient/util/pacexec ICAClient/util/pac.js +ICAClient/util/pacexec ICAClient/util/xcapture ICAClient/wfcmgr ICAClient/wfica @@ -123,20 +130,19 @@ ICAClient/wfica_assoc.sh bin/wfcmgr bin/wfica -@dirrm ICAClient/.config -@dirrm ICAClient/cache/zlcache -@unexec find %D/ICAClient/cache/ -type f -exec rm {} \; 2>&1 >/dev/null || true -@dirrm ICAClient/cache -@dirrm ICAClient/config -@dirrm ICAClient/desktop -@dirrm ICAClient/help -@dirrm ICAClient/icons -@dirrm ICAClient/keyboard -@dirrm ICAClient/keystore/cacerts -@dirrm ICAClient/keystore +@dirrm ICAClient/util +@dirrm ICAClient/pkginf +@dirrm ICAClient/nls/ja/UTF-8 @dirrm ICAClient/nls/ja +@dirrm ICAClient/nls/en/UTF-8 @dirrm ICAClient/nls/en @dirrm ICAClient/nls -@dirrm ICAClient/pkginf -@dirrm ICAClient/util +@dirrm ICAClient/keystore/cacerts +@dirrm ICAClient/keystore +@dirrm ICAClient/keyboard +@dirrm ICAClient/icons +@dirrm ICAClient/help +@dirrm ICAClient/desktop +@dirrm ICAClient/config/usertemplate +@dirrm ICAClient/config @dirrm ICAClient --- citrix_ica-10.0.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: