From nobody@FreeBSD.org  Mon May 29 14:01:33 2006
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A923F16ACB9
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 29 May 2006 14:01:33 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [216.136.204.117])
	by mx1.FreeBSD.org (Postfix) with ESMTP id F18AD43D66
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 29 May 2006 14:01:22 +0000 (GMT)
	(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 k4TE1MXq038682
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 29 May 2006 14:01:22 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.13.1/8.13.1/Submit) id k4TE1M9x038681;
	Mon, 29 May 2006 14:01:22 GMT
	(envelope-from nobody)
Message-Id: <200605291401.k4TE1M9x038681@www.freebsd.org>
Date: Mon, 29 May 2006 14:01:22 GMT
From: Thomas Abthorpe <thomas@goodking.ca>
To: freebsd-gnats-submit@FreeBSD.org
Subject: prepared to assume maintainership of german/citrix_ica and upgrade to 9.15
X-Send-Pr-Version: www-2.3

>Number:         98089
>Category:       ports
>Synopsis:       prepared to assume maintainership of german/citrix_ica and upgrade to 9.15
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    stefan
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon May 29 14:10:17 GMT 2006
>Closed-Date:    Mon Jul 24 06:17:10 GMT 2006
>Last-Modified:  Mon Jul 24 06:17:10 GMT 2006
>Originator:     Thomas Abthorpe
>Release:        Freebsd 6.1
>Organization:
GoodKing.Ca
>Environment:
FreeBSD goodking.goodking.ca 6.1-RELEASE FreeBSD 6.1-RELEASE #17: Tue May  9 19:33:06 EDT 2006     root@goodking.goodking.ca:/usr/obj/usr/src/sys/GKSMP  i386

>Description:
Upgrade german/ica_client to 9.15. Also addresses some portlint issues, and add sha256 checksum. I am prepared to defer to or work with anybody else who has a better grasp of German than I do!
>How-To-Repeat:
portlint -C /usr/ports/german/citrix_ica
>Fix:
cvs diff -uN Makefile
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/german/citrix_ica/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- Makefile    15 Apr 2006 06:26:47 -0000      1.13
+++ Makefile    29 May 2006 13:48:04 -0000
@@ -6,37 +6,44 @@
 #

 PORTNAME=      citrix_ica
-PORTVERSION=   6.30.1054
-PORTREVISION=  3
+PORTVERSION=   9.15
 CATEGORIES=    german net comms linux
 MASTER_SITES=
-DISTNAME=      ${PORTNAME}-linuxx86-de
+DISTNAME=      ${PORTNAME}-linuxx86-de-${PORTVERSION}

-MAINTAINER=    ports@FreeBSD.org
+MAINTAINER=    thomas@goodking.ca
 COMMENT=       Citrix(R) client for the Microsoft Windows Terminal Server

+RUN_DEPENDS=   ${LINUXBASE}${X11BASE}/lib/libXm.so.3:${PORTSDIR}/x11-toolkits/linux-openmotif
+
 ONLY_FOR_ARCHS=        i386
-RESTRICTED=    "License prohibits redistribution"
+USE_LINUX=     yes
+#USE_X_PREFIX= Yes
+RESTRICTED=    License prohibits redistribution
 IS_INTERACTIVE=        "Noisy license agreement ignores stdin"

 NO_WRKSUBDIR=  Yes
 NO_BUILD=      Yes
-USE_LINUX=     Yes
-USE_X_PREFIX=  Yes

-CDIR=  ${PREFIX}/ICAClient
+CDIR=          ${PREFIX}/ICAClient
 BINDIR=                ${PREFIX}/bin

-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 \
+NSCP=  ${LOCALBASE}/libexec/netscape \
+       ${LOCALBASE}/libexec/netscape-linux \
+       ${LOCALBASE}/netscape \
+       ${LOCALBASE}/netscape-linux \
+       ${LOCALBASE}/lib/netscape \
+       ${LOCALBASE}/lib/netscape-linux \
        ${MOZILLA_HOME}

+PLIST_SUB=     MOZILLA_HOME=${MOZILLA_HOME}
+
 .include <bsd.port.pre.mk>

+.if exists(${PREFIX}/bin/kde-config)
+HAVE_KDE=      "\\ny"
+.endif
+
 .if defined(BATCH) || defined(PACKAGE_BUILDING)
 IGNORE='The distribution file for this port may not be automatically fetched due to licensing restrictions.'
 .endif
@@ -66,23 +73,11 @@
                ${ECHO} "-----------------------------------------------------------" ; \
                ${FALSE} ; \
        fi
-
-       @${ECHO_CMD} -e "1\n${CDIR}\nj\nj\nj\nj\n3" > ${WRKSRC}/response ;
-       @for dir in ${NSCP}; do \
-                if [ -e $${dir}/plugins/libnullplugin.so ]; then \
-                        BIN=`${FILE} $${dir}/plugins/libnullplugin.so | ${AWK} '{print $$11}'` ; \
-                        case $${BIN} in \
-                        \(SYSV\),) \
-                               ${ECHO_CMD} -e "1\n${CDIR}\nj\nj\nj\n3" > ${WRKSRC}/response ; \
-                        esac \
-                fi \
-        done
-
        ${SED} s%DESTINATION%${CDIR}% < ${FILESDIR}/wfcmgr \
                > ${WRKSRC}/wfcmgr.x
        ${SED} s%DESTINATION%${CDIR}% < ${FILESDIR}/wfica \
                > ${WRKSRC}/wfica.x
-       cd ${WRKSRC} && ${LINUXBASE}/bin/sh -c './setupwfc < response'
+       cd ${WRKSRC} && ${SH} -c './setupwfc'
        ${INSTALL_SCRIPT} ${WRKSRC}/wfcmgr.x ${PREFIX}/bin/wfcmgr
        ${INSTALL_SCRIPT} ${WRKSRC}/wfica.x ${PREFIX}/bin/wfica
 # XXX: This is missing a "${BRANDELF} -t Linux <executables>".

cvs diff -uN distinfo
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/german/citrix_ica/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo    14 Sep 2002 08:09:34 -0000      1.4
+++ distinfo    29 May 2006 13:49:19 -0000
@@ -1 +1,3 @@
-MD5 (citrix_ica-linuxx86-de.tar.gz) = 98b904ce4681f7749e1cb7ad9d86b54f
+MD5 (citrix_ica-linuxx86-de-9.15.tar.gz) = b007447a56e20141fdbbc0ba0e7a0587
+SHA256 (citrix_ica-linuxx86-de-9.15.tar.gz) = 9d68c7a777de39389c4c93a7c1ab72326e1ad600b6f0203e5e73c1f9fd980923
+SIZE (citrix_ica-linuxx86-de-9.15.tar.gz) = 1391101


cvs diff -uN pkg-plist
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/german/citrix_ica/pkg-plist,v
retrieving revision 1.4
diff -u -r1.4 pkg-plist
--- pkg-plist   14 Sep 2002 08:09:34 -0000      1.4
+++ pkg-plist   29 May 2006 13:50:00 -0000
@@ -1,16 +1,21 @@
-@unexec if [ -f %D/lib/netscape-linux/mime.types ]; then (/bin/cat %D/lib/netscape-linux/mime.types | /usr/bin/grep -v "application/x-ica" > %D/lib/netscape-linux/mime.types.tmp; mv %D/lib/netscape-linux/mime.types.tmp %D/lib/netscape-linux/mime.types); fi
-@unexec if [ -f %D/lib/netscape-linux/mailcap ]; then (/bin/cat %D/lib/netscape-linux/mailcap | /usr/bin/grep -v "application/x-ica" > %D/lib/netscape-linux/mailcap.tmp; /bin/mv %D/lib/netscape-linux/mailcap.tmp %D/lib/netscape-linux/mailcap); fi
-@unexec if [ -e %D/lib/netscape-linux/plugins/npica.so ]; then (/bin/rm %D/lib/netscape-linux/plugins/npica.so); fi
+@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/PDCRYPT1.DLL
 ICAClient/PDCRYPT2.DLL
-ICAClient/SSL.DLL
+ICAClient/TW1.DLL
+ICAClient/VDCM.DLL
 ICAClient/VDSCARD.DLL
+ICAClient/VDSPMIKE.DLL
 ICAClient/Wfcmgr
 ICAClient/Wfcmgr.ad
 ICAClient/Wfica
@@ -19,12 +24,13 @@
 ICAClient/config/appsrv.ini
 ICAClient/config/module.ini
 ICAClient/config/wfclient.ini
+ICAClient/desktop/wfcmgr.desktop
+ICAClient/desktop/Citrix_PNA.desktop
 ICAClient/eula.txt
 ICAClient/help/index.htm
-ICAClient/icons/ica16.xpm
-ICAClient/icons/ica32.xpm
-ICAClient/icons/ica48.xpm
-ICAClient/icons/ica64.xpm
+ICAClient/icons/citrix16.xpm
+ICAClient/icons/citrix32.xpm
+ICAClient/icons/citrix48.xpm
 ICAClient/install.txt
 ICAClient/keyboard/age2.kbd
 ICAClient/keyboard/agex2.kbd
@@ -58,6 +64,7 @@
 ICAClient/keyboard/ibm.kbd
 ICAClient/keyboard/keyboard.ini
 ICAClient/keyboard/linux.kbd
+ICAClient/keyboard/linux-ja.kbd
 ICAClient/keyboard/mac101.kbd
 ICAClient/keyboard/ncdn-101.kbd
 ICAClient/keyboard/ncdn-102.kbd
@@ -92,6 +99,9 @@
 ICAClient/keystore/cacerts/GTECTRoot.crt
 ICAClient/keystore/cacerts/Pcs3ss_v4.crt
 ICAClient/keystore/cacerts/SecureServer.crt
+ICAClient/nls/C
+ICAClient/nls/de/pna.nls
+ICAClient/nls/en/pna.nls
 ICAClient/npica.so
 ICAClient/pkginf/F.core.linuxx86
 ICAClient/pkginf/Ver.core.linuxx86
@@ -103,20 +113,30 @@
 ICAClient/util/echo_cmd
 ICAClient/util/hinst
 ICAClient/util/icalicense.sh
+ICAClient/util/nslaunch
+ICAClient/util/pacexec
+ICAClient/util/pac.js
 ICAClient/util/xcapture
 ICAClient/wfcmgr
 ICAClient/wfica
+ICAClient/wfica.sh
+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/nls/de
+@dirrm ICAClient/nls/en
+@dirrm ICAClient/nls
 @dirrm ICAClient/pkginf
 @dirrm ICAClient/util
 @dirrm ICAClient


cvs diff files/patch-linuxx86::hinst
Index: files/patch-linuxx86::hinst
===================================================================
RCS file: /home/ncvs/ports/german/citrix_ica/files/patch-linuxx86::hinst,v
retrieving revision 1.3
diff -r1.3 patch-linuxx86::hinst
1,3c1,29
< --- linuxx86/hinst.orig       Tue Mar 19 17:18:14 2002
< +++ linuxx86/hinst    Sat Apr 27 11:33:28 2002
< @@ -1965,10 +1965,32 @@
---
> --- linuxx86/hinst.orig       Tue Dec  6 11:25:53 2005
> +++ linuxx86/hinst    Fri May 26 14:22:36 2006
> @@ -11,7 +11,6 @@
>  #    Copyright 1998-2000 Citrix Systems, Inc. All rights reserved.
>  #
>  ###############################################################################
> -
>  # note: the INSTALLER_... strings should be in lowercase. The installer will then
>  # accept lowercase or uppercase versions of them as input.
>  INSTALLER_YES=ja
> @@ -73,7 +72,7 @@
>  fi
>
>  #  Install in here by default.
> -DefaultInstallDir=/usr/lib/ICAClient
> +DefaultInstallDir=/usr/local/ICAClient
>
>  #  Default CDROM mount point
>  DefaultCDSourceDir=/cdrom
> @@ -2175,7 +2174,7 @@
>       tr_file $TR_FILE_KEY $PORT/$PORT.psf
>       preen_files
>
> -     /bin/true
> +     /usr/bin/true
>  }
>
>  ###############################################################################
> @@ -2227,10 +2226,34 @@
8,14c34,40
< +     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
---
> +        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
22a49,50
> +        /usr/local/lib/linux-mozilla \
> +        /usr/local/lib/mozilla \
36a65,66
>  MAILCAP_FILE=mailcap
> @@ -2303,26 +2326,19 @@
38,40c68,77
< @@ -2017,15 +2039,12 @@
<    $ECHO_CMD $integrate_netscape1
<    search_ok=0
---
>  netscape_integrate()
>  {
> -  user_echo $integrate_netscape1
>    if test -z "$SU_INSTALL"
>    then
>      set_npui_variables
>      found_netscape
>    else
>      search_ok=0
> -    EXTRA_BROWSERS=`find_browsers`
42,50c79,89
< -  if  test -d "/usr/lib/netscape"\
< -   || test -d "/usr/local/netscape"\
< -   || test -d "/opt/netscape"\
< -   || test -d "/usr/local/lib/netscape"\
< -   || test "$MOZILLA_HOME" != "" -a -d "$MOZILLA_HOME"
< -  then
< +  case ${FOUND_NS} in
< +  TRUE)
<       $ECHO_CMD $integrate_netscape3
---
> -    if  test -d "/usr/lib/netscape"\
> -     || test -d "/usr/local/netscape"\
> -     || test -d "/opt/netscape"\
> -     || test -d "/usr/local/lib/netscape"\
> -     || test -d "/usr/dt/appconfig/netscape"\
> -     || test "$MOZILLA_HOME" != "" -a -d "$MOZILLA_HOME"\
> -     || test "$EXTRA_BROWSERS" != ""
> -    then
> +    case ${FOUND_NS} in
> +    TRUE)
>       user_echo $integrate_netscape3
52c91
< -  else
---
> -    else
54,55c93,94
< +  *)
<       echo_no_nl $integrate_netscape2
---
> +    *)
>       user_prompt $integrate_netscape2
58c97
< @@ -2034,7 +2053,8 @@
---
> @@ -2331,9 +2347,9 @@
60c99
<               $ECHO_CMD $integrate_netscape6
---
>               user_echo $integrate_netscape6
62d100
< -  fi;
64c102,110
< +  esac;
---
> +    esac
>      fi
> -  fi
> -
>      # Create utility script files in install root.
>      create_wfica_script
>      create_wfica_assoc_script
> @@ -2969,55 +2985,6 @@
>      echo "$BINDIR"
66a113,162
> -################################################################################
> -#
> -# find_browsers
> -#
> -# Returns a list of directories containing new-style mozilla-based browsers
> -# that may be launched by files on the $PATH.
> -#
> -################################################################################
> -find_browsers()
> -{
> -    PROGS="netscape mozilla firefox"
> -    DIST_BIN_DIR=""
> -    STANDARD_DIRS="/usr/local/netscape /usr/local/mozilla /usr/local/firefox /usr/lib/mozilla"
> -
> -    case $op_system in
> -       SunOS) if
> -                 /usr/bin/pkginfo -q $SOLARIS_PACKAGE_NAME
> -              then
> -                 relocation_base=`/usr/bin/pkginfo -r $SOLARIS_PACKAGE_NAME`
> -                 STANDARD_DIRS="$STANDARD_DIRS $relocation_base/$SOLARIS_PACKAGE_DIRECTORY"
> -
> -                 # N.B. the Netscape 7 packages for SOLARIS 9 have an extended installation path built-in!
> -                 case `uname -r` in
> -                    5.9) STANDARD_DIRS="$STANDARD_DIRS $relocation_base/dt/appconfig/$SOLARIS_PACKAGE_DIRECTORY"
> -                         ;;
> -                    *)   ;;
> -                 esac
> -              fi;;
> -       *) ;;
> -    esac
> -
> -    for d in `echo $PATH | sed "s/:/ /g"` $STANDARD_DIRS
> -    do
> -     echo $d
> -    done | sort -u | while read d
> -    do
> -     for p in $PROGS
> -     do
> -         # Find the each instance of each named browser
> -         PROG=$d/$p
> -         if test -f $PROG
> -         then
> -             # Where is the installation and what version is it?
> -             find_extra_bin_dirs $PROG
> -         fi
> -     done
> -    done | sort -u
> -}
> -
>  BROWSER_LIST_KEY="BROWSER_DIR"
67a164,186
>  #
> @@ -3244,13 +3211,14 @@
>  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_KDE_TARGET_DIRS="/usr/share/applnk-redhat/Internet \
> -                         /usr/share/applnk-mdk/Networking \
> -                         $TL_TOP_DIR/Internet \
> -                      /etc/opt/kde3/share/applnk/SuSE/Internet \
> -                         /usr/share/applnk/Applications"
> -
> +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 \
> +                        /usr/share/applnk-mdk/Networking \
> +                        /etc/opt/kde3/share/applnk/SuSE/Internet"
>  DEFAULT_DT_TARGET_DIRS="$XDG_TARGET_DIR $DEFAULT_GNOME_TARGET_DIRS $DEFAULT_KDE_TARGET_DIRS"
>  DEFAULT_DT_FOLDER="Applications"
>


create new patchfile, files/patch-setupwfc
--- 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)"

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: stefan 
State-Changed-When: Sun Jul 9 11:40:20 UTC 2006 
State-Changed-Why:  
It seems this patch is outdated by now, since you're already the maintainer and 
the port is at version 9.00. Can you send an updated patch against the latest 
version of the port? 

http://www.freebsd.org/cgi/query-pr.cgi?pr=98089 
Class-Changed-From-To: change-request->maintainer-update 
Class-Changed-By: stefan 
Class-Changed-When: Sun Jul 9 11:43:17 UTC 2006 
Class-Changed-Why:  
Fix class: submitter is already maintainer of the port. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=98089 
Responsible-Changed-From-To: freebsd-ports-bugs->stefan 
Responsible-Changed-By: stefan 
Responsible-Changed-When: Sun Jul 9 15:31:24 UTC 2006 
Responsible-Changed-Why:  
Take. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=98089 

From: Stefan Walter <stefan@FreeBSD.org>
To: Thomas Abthorpe <thomas@goodking.ca>
Cc: GNATS <FreeBSD-gnats-submit@FreeBSD.org>
Subject: Re: ports/98089: prepared to assume maintainership of german/citrix_ica and upgrade to 9.15
Date: Mon, 10 Jul 2006 18:50:05 +0200

 Hi,
 
 updates of ports are expected to be sent as diff(1) output, as described
 in the Porter's Handbook [1], since that makes it easier to see what
 changed, what was added and removed etc.. Could you please resend the
 update as a diff?
 
 Regards,
 Stefan
 
 [1]: http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/port-upgrading.html

From: "Thomas Abthorpe" <thomas@goodking.ca>
To: "Stefan Walter" <stefan@FreeBSD.org>
Cc: "GNATS" <FreeBSD-gnats-submit@FreeBSD.org>
Subject: Re: ports/98089: prepared to assume maintainership of german/citrix_ica and upgrade to 9.15
Date: Mon, 10 Jul 2006 13:34:27 -0400

 Index: Makefile
 ===================================================================
 RCS file: /home/ncvs/ports/german/citrix_ica/Makefile,v
 retrieving revision 1.13
 diff -u -r1.13 Makefile
 --- Makefile 15 Apr 2006 06:26:47 -0000 1.13
 +++ Makefile 10 Jul 2006 17:29:32 -0000
 @@ -6,37 +6,44 @@
  #
 
  PORTNAME= citrix_ica
 -PORTVERSION= 6.30.1054
 -PORTREVISION= 3
 +PORTVERSION= 9.15
  CATEGORIES= german net comms linux
  MASTER_SITES=
 -DISTNAME= ${PORTNAME}-linuxx86-de
 +DISTNAME= ${PORTNAME}-linuxx86-de-${PORTVERSION}
 
 -MAINTAINER= ports@FreeBSD.org
 -COMMENT= Citrix(R) client for the Microsoft Windows Terminal Server
 +MAINTAINER= thomas@goodking.ca
 +COMMENT= Citrix(R) Presentation Server(TM) client
 +
 +RUN_DEPENDS= 
 ${LINUXBASE}${X11BASE}/lib/libXm.so.3:${PORTSDIR}/x11-toolkits/linux-openmotif
 
  ONLY_FOR_ARCHS= i386
 -RESTRICTED= "License prohibits redistribution"
 +USE_LINUX= yes
 +#USE_X_PREFIX= Yes
 +RESTRICTED= License prohibits redistribution
  IS_INTERACTIVE= "Noisy license agreement ignores stdin"
 
  NO_WRKSUBDIR= Yes
  NO_BUILD= Yes
 -USE_LINUX= Yes
 -USE_X_PREFIX= Yes
 
 -CDIR= ${PREFIX}/ICAClient
 +CDIR= ${PREFIX}/ICAClient
  BINDIR= ${PREFIX}/bin
 
 -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 \
 +NSCP= ${LOCALBASE}/libexec/netscape \
 + ${LOCALBASE}/libexec/netscape-linux \
 + ${LOCALBASE}/netscape \
 + ${LOCALBASE}/netscape-linux \
 + ${LOCALBASE}/lib/netscape \
 + ${LOCALBASE}/lib/netscape-linux \
   ${MOZILLA_HOME}
 
 +PLIST_SUB= MOZILLA_HOME=${MOZILLA_HOME}
 +
  .include <bsd.port.pre.mk>
 
 +.if exists(${PREFIX}/bin/kde-config)
 +HAVE_KDE= "\\ny"
 +.endif
 +
  .if defined(BATCH) || defined(PACKAGE_BUILDING)
  IGNORE='The distribution file for this port may not be automatically 
 fetched due to licensing restrictions.'
  .endif
 @@ -66,23 +73,11 @@
   ${ECHO} "-----------------------------------------------------------" ; \
   ${FALSE} ; \
   fi
 -
 - @${ECHO_CMD} -e "1\n${CDIR}\nj\nj\nj\nj\n3" > ${WRKSRC}/response ;
 - @for dir in ${NSCP}; do \
 -                if [ -e $${dir}/plugins/libnullplugin.so ]; then \
 -                        BIN=`${FILE} $${dir}/plugins/libnullplugin.so | 
 ${AWK} '{print $$11}'` ; \
 -                        case $${BIN} in \
 -                        \(SYSV\),) \
 - ${ECHO_CMD} -e "1\n${CDIR}\nj\nj\nj\n3" > ${WRKSRC}/response ; \
 -                        esac \
 -                fi \
 -        done
 -
   ${SED} s%DESTINATION%${CDIR}% < ${FILESDIR}/wfcmgr \
   > ${WRKSRC}/wfcmgr.x
   ${SED} s%DESTINATION%${CDIR}% < ${FILESDIR}/wfica \
   > ${WRKSRC}/wfica.x
 - cd ${WRKSRC} && ${LINUXBASE}/bin/sh -c './setupwfc < response'
 + cd ${WRKSRC} && ${SH} -c './setupwfc'
   ${INSTALL_SCRIPT} ${WRKSRC}/wfcmgr.x ${PREFIX}/bin/wfcmgr
   ${INSTALL_SCRIPT} ${WRKSRC}/wfica.x ${PREFIX}/bin/wfica
  # XXX: This is missing a "${BRANDELF} -t Linux <executables>".
 Index: distinfo
 ===================================================================
 RCS file: /home/ncvs/ports/german/citrix_ica/distinfo,v
 retrieving revision 1.4
 diff -u -r1.4 distinfo
 --- distinfo 14 Sep 2002 08:09:34 -0000 1.4
 +++ distinfo 10 Jul 2006 17:29:32 -0000
 @@ -1 +1,3 @@
 -MD5 (citrix_ica-linuxx86-de.tar.gz) = 98b904ce4681f7749e1cb7ad9d86b54f
 +MD5 (citrix_ica-linuxx86-de-9.15.tar.gz) = b007447a56e20141fdbbc0ba0e7a0587
 +SHA256 (citrix_ica-linuxx86-de-9.15.tar.gz) = 
 9d68c7a777de39389c4c93a7c1ab72326e1ad600b6f0203e5e73c1f9fd980923
 +SIZE (citrix_ica-linuxx86-de-9.15.tar.gz) = 1391101
 Index: pkg-descr
 ===================================================================
 RCS file: /home/ncvs/ports/german/citrix_ica/pkg-descr,v
 retrieving revision 1.1
 diff -u -r1.1 pkg-descr
 --- pkg-descr 12 Dec 2000 16:01:21 -0000 1.1
 +++ pkg-descr 10 Jul 2006 17:29:32 -0000
 @@ -1,15 +1,13 @@
 -Citrix(R) MetaFrame(TM) is thin-client/server system software for
 -Microsoft's Windows NT Server 4.0, Terminal Server Edition.
 -MetaFrame(TM) delivers a comprehensive thin-client/server solution to
 -the enterprise by extending Windows Terminal Server with additional
 -client and server functionality - including support for heterogeneous
 -computing environments, enterprise-scale management and seamless
 -desktop integration. MetaFrame(TM) transforms the way organizations
 -deploy, manage and access business applications by providing improved
 -application manageability, access, performance and security. Citrix(R)
 -MetaFrame(TM) system software, which incorporates Citrix's Independent
 -Computing Architecture (ICA)(R), provides a complete
 -thin-client/server computing solution for multi-user NT 4.0
 -environments.
 +Citrix(R) Presentation Server(TM) runs on Microsoft(R) Windows
 +Server(TM) and UNIX(R) operating systems, and extends the base
 +Windows Terminal Services platform by enhancing the end-user
 +experience as well as increasing manageability, compatibility,
 +security and scalability to address business-critical environments.
 +Presentation Server expands the range of supported applications to
 +include legacy software and Web-based, UNIX and Java solutions. It
 +also enables any device or operating system including Macintosh and
 +Linux to access virtualized applications. Other important capabilities
 +are powerful management and configuration tools and faster, more
 +flexible printing.
 
 -WWW: http://www.citrix.com/products/metaframe.asp
 +WWW: http://www.citrix.com/English/ps2/products/product.asp?contentID=186
 Index: pkg-plist
 ===================================================================
 RCS file: /home/ncvs/ports/german/citrix_ica/pkg-plist,v
 retrieving revision 1.4
 diff -u -r1.4 pkg-plist
 --- pkg-plist 14 Sep 2002 08:09:34 -0000 1.4
 +++ pkg-plist 10 Jul 2006 17:29:32 -0000
 @@ -1,16 +1,21 @@
 -@unexec if [ -f %D/lib/netscape-linux/mime.types ]; then (/bin/cat 
 %D/lib/netscape-linux/mime.types | /usr/bin/grep -v "application/x-ica" > 
 %D/lib/netscape-linux/mime.types.tmp; mv 
 %D/lib/netscape-linux/mime.types.tmp %D/lib/netscape-linux/mime.types); fi
 -@unexec if [ -f %D/lib/netscape-linux/mailcap ]; then (/bin/cat 
 %D/lib/netscape-linux/mailcap | /usr/bin/grep -v "application/x-ica" > 
 %D/lib/netscape-linux/mailcap.tmp; /bin/mv %D/lib/netscape-linux/mailcap.tmp 
 %D/lib/netscape-linux/mailcap); fi
 -@unexec if [ -e %D/lib/netscape-linux/plugins/npica.so ]; then (/bin/rm 
 %D/lib/netscape-linux/plugins/npica.so); fi
 +@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/PDCRYPT1.DLL
  ICAClient/PDCRYPT2.DLL
 -ICAClient/SSL.DLL
 +ICAClient/TW1.DLL
 +ICAClient/VDCM.DLL
  ICAClient/VDSCARD.DLL
 +ICAClient/VDSPMIKE.DLL
  ICAClient/Wfcmgr
  ICAClient/Wfcmgr.ad
  ICAClient/Wfica
 @@ -19,12 +24,13 @@
  ICAClient/config/appsrv.ini
  ICAClient/config/module.ini
  ICAClient/config/wfclient.ini
 +ICAClient/desktop/wfcmgr.desktop
 +ICAClient/desktop/Citrix_PNA.desktop
  ICAClient/eula.txt
  ICAClient/help/index.htm
 -ICAClient/icons/ica16.xpm
 -ICAClient/icons/ica32.xpm
 -ICAClient/icons/ica48.xpm
 -ICAClient/icons/ica64.xpm
 +ICAClient/icons/citrix16.xpm
 +ICAClient/icons/citrix32.xpm
 +ICAClient/icons/citrix48.xpm
  ICAClient/install.txt
  ICAClient/keyboard/age2.kbd
  ICAClient/keyboard/agex2.kbd
 @@ -58,6 +64,7 @@
  ICAClient/keyboard/ibm.kbd
  ICAClient/keyboard/keyboard.ini
  ICAClient/keyboard/linux.kbd
 +ICAClient/keyboard/linux-ja.kbd
  ICAClient/keyboard/mac101.kbd
  ICAClient/keyboard/ncdn-101.kbd
  ICAClient/keyboard/ncdn-102.kbd
 @@ -92,6 +99,9 @@
  ICAClient/keystore/cacerts/GTECTRoot.crt
  ICAClient/keystore/cacerts/Pcs3ss_v4.crt
  ICAClient/keystore/cacerts/SecureServer.crt
 +ICAClient/nls/C
 +ICAClient/nls/de/pna.nls
 +ICAClient/nls/en/pna.nls
  ICAClient/npica.so
  ICAClient/pkginf/F.core.linuxx86
  ICAClient/pkginf/Ver.core.linuxx86
 @@ -103,20 +113,30 @@
  ICAClient/util/echo_cmd
  ICAClient/util/hinst
  ICAClient/util/icalicense.sh
 +ICAClient/util/nslaunch
 +ICAClient/util/pacexec
 +ICAClient/util/pac.js
  ICAClient/util/xcapture
  ICAClient/wfcmgr
  ICAClient/wfica
 +ICAClient/wfica.sh
 +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/nls/de
 +@dirrm ICAClient/nls/en
 +@dirrm ICAClient/nls
  @dirrm ICAClient/pkginf
  @dirrm ICAClient/util
  @dirrm ICAClient
 
 --- /usr/ports/german/citrix_ica/files/patch-setupwfc   Mon Jul 10 13:30:27 
 2006
 +++ /home/ports/german/citrix_ica/files/patch-setupwfc  Fri May 26 10:15:20 
 2006
 @@ -0,0 +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)"
 

From: Stefan Walter <stefan@FreeBSD.org>
To: Thomas Abthorpe <thomas@goodking.ca>
Cc: GNATS <FreeBSD-gnats-submit@FreeBSD.org>
Subject: Re: ports/98089: prepared to assume maintainership of german/citrix_ica and upgrade to 9.15
Date: Sat, 15 Jul 2006 15:02:16 +0200

 --H1spWtNR+x+ondvy
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 Content-Transfer-Encoding: quoted-printable
 
 Hi,
 
 Thomas Abthorpe, 11.07.06, 20:56h CEST:
 
 > Perhaps a little unorthodox, but at least it will give you a more direct=
 =20
 > view in lieu of unified diffs.
 >=20
 > http://www.goodking.ca/pub/citrix/
 >=20
 > Here you will find a bundled copy of my german/citrix_ica directory tree.=
 =20
 > Scoop it up, and use it if you find it helpful.
 
 I had a look at it now. A couple of thoughts:
 
 - The installer should respect $PREFIX. If I do a
   'make PREFIX=3D/tmp/portprefix install', the installer still proposes to
   install to /usr/local/ICAClient by default. Changing the variable
   DefaultInstallDir in ${WRKSRC}/linuxx86 should do that (untested).
   Maybe it would be better not to use the provided installer at all and
   let the port install the files itself - assuming that there aren't any
   legal problems with this.
 - If the check for kde-config in the Makefile isn't used, please remove or
   at least uncomment it so that someone reading the Makefile knows it's
   not relevant at the moment. (Same for the commented-out USE_X_PREFIX -
   if it's not needed at all, which I think is the case, please remove it.)
 - Upon deinstallation (without actually using the software), the cache
   directory doesn't seem to exist:
 
 =3D=3D=3D>  Deinstalling for german/de-citrix_ica
 =3D=3D=3D>   Deinstalling citrix_ica-9.15
 pkg_delete: file '/usr/local/ICAClient/cache/zlcache' doesn't exist
 pkg_delete: unable to completely remove directory '/usr/local/ICAClient/cac=
 he/zlcache'
 find: /usr/local/ICAClient/cache/: No such file or directory
 pkg_delete: file '/usr/local/ICAClient/cache' doesn't exist
 pkg_delete: unable to completely remove directory '/usr/local/ICAClient/cac=
 he'
 pkg_delete: couldn't entirely delete package (perhaps the packing list is
 incorrectly specified?)
 
 Please note that I cannot really test the software thoroughly. I can only
 verify proper installation and deinstallation.
 
 I can fetch the changes from your web server, but unified diffs are still
 preferred instead of archives of the whole port.
 
 Regards,
 Stefan
 
 --H1spWtNR+x+ondvy
 Content-Type: application/pgp-signature
 Content-Disposition: inline
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (FreeBSD)
 
 iQGVAwUBRLjnV1aRERsSueCzAQKrFQv/a7QFKCIWzriPUEU4vXCI7Ov3537c8Ym3
 TL8jfKXKiS/wV4lgFPauKYPstsByz9lTumUr2aYMywHjer725ltH1bFqZMnqv6JY
 uvFLlQ4rgyt80KJGgOd8bgRJF4wgf1l41i8ucIVTn+0xN6E5bYpkskNXA29coQ95
 /nABgGQtI9Bf3kyIjxorYPtQutZP5j5M+PBDnzkEiH7mE5bhKkG8JLanneE2TzHW
 5zgd9SXTYTZKrQ3QEONo5/T4KKIMgImxZ/qRFHf1eZqL0HzzG7sVRhoYAkN6yYic
 76qdz9C1vLbnzzuNEFgm7e2XlYkh44oEgn30VP1C0NuP36pQGR9wCDglQrJYo/SF
 deFxX4tSbeaS9TFLK7oRYzKqJ1DYKBMBLLPGIoO7gfsEnsPfBqcijyZFZGw5ACAg
 fAgdTeQ2K4Ai2MG6rc5JjtnruU34WEdaz3HfAu2K4bcL6yu95z8UnmRKUT6zpdLA
 o6Wr+nRxB49oFCBkGb1d9PM3/5yB43q3
 =h/j7
 -----END PGP SIGNATURE-----
 
 --H1spWtNR+x+ondvy--

From: "Thomas Abthorpe" <thomas@goodking.ca>
To: "Stefan Walter" <stefan@FreeBSD.org>
Cc: "GNATS" <FreeBSD-gnats-submit@FreeBSD.org>
Subject: Re: ports/98089: prepared to assume maintainership of german/citrix_ica and upgrade to 9.15
Date: Mon, 17 Jul 2006 10:32:28 -0400

 These are the files that have changed since I posted the first PR.
 
 The diffs provided can also be found at 
 http://www.goodking.ca/pub/citrix/de-citrix-uni-diff-2006_07_17.txt
 
 Index: Makefile
 ===================================================================
 RCS file: /home/ncvs/ports/german/citrix_ica/Makefile,v
 retrieving revision 1.13
 diff -u -r1.13 Makefile
 --- Makefile 15 Apr 2006 06:26:47 -0000 1.13
 +++ Makefile 17 Jul 2006 13:49:53 -0000
 @@ -6,35 +6,37 @@
 #
 PORTNAME= citrix_ica
 -PORTVERSION= 6.30.1054
 -PORTREVISION= 3
 +PORTVERSION= 9.15
 CATEGORIES= german net comms linux
 MASTER_SITES=
 -DISTNAME= ${PORTNAME}-linuxx86-de
 +DISTNAME= ${PORTNAME}-linuxx86-de-${PORTVERSION}
 -MAINTAINER= ports@FreeBSD.org
 -COMMENT= Citrix(R) client for the Microsoft Windows Terminal Server
 +MAINTAINER= thomas@goodking.ca
 +COMMENT= Citrix(R) Presentation Server(TM) client
 +
 +RUN_DEPENDS= 
 ${LINUXBASE}${X11BASE}/lib/libXm.so.3:${PORTSDIR}/x11-toolkits/linux-openmotif
 ONLY_FOR_ARCHS= i386
 -RESTRICTED= "License prohibits redistribution"
 +USE_LINUX= yes
 +RESTRICTED= License prohibits redistribution
 IS_INTERACTIVE= "Noisy license agreement ignores stdin"
 NO_WRKSUBDIR= Yes
 NO_BUILD= Yes
 -USE_LINUX= Yes
 -USE_X_PREFIX= Yes
 -CDIR= ${PREFIX}/ICAClient
 +CDIR= ${PREFIX}/ICAClient
 BINDIR= ${PREFIX}/bin
 -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 \
 +NSCP= ${LOCALBASE}/libexec/netscape \
 + ${LOCALBASE}/libexec/netscape-linux \
 + ${LOCALBASE}/netscape \
 + ${LOCALBASE}/netscape-linux \
 + ${LOCALBASE}/lib/netscape \
 + ${LOCALBASE}/lib/netscape-linux \
 ${MOZILLA_HOME}
 +PLIST_SUB= MOZILLA_HOME=${MOZILLA_HOME}
 +
 .include <bsd.port.pre.mk>
 .if defined(BATCH) || defined(PACKAGE_BUILDING)
 @@ -66,23 +68,11 @@
 ${ECHO} "-----------------------------------------------------------" ; \
 ${FALSE} ; \
 fi
 -
 - @${ECHO_CMD} -e "1\n${CDIR}\nj\nj\nj\nj\n3" > ${WRKSRC}/response ;
 - @for dir in ${NSCP}; do \
 - if [ -e $${dir}/plugins/libnullplugin.so ]; then \
 - BIN=`${FILE} $${dir}/plugins/libnullplugin.so | ${AWK} '{print $$11}'` ; \
 - case $${BIN} in \
 - \(SYSV\),) \
 - ${ECHO_CMD} -e "1\n${CDIR}\nj\nj\nj\n3" > ${WRKSRC}/response ; \
 - esac \
 - fi \
 - done
 -
 ${SED} s%DESTINATION%${CDIR}% < ${FILESDIR}/wfcmgr \
 > ${WRKSRC}/wfcmgr.x
 ${SED} s%DESTINATION%${CDIR}% < ${FILESDIR}/wfica \
 > ${WRKSRC}/wfica.x
 - cd ${WRKSRC} && ${LINUXBASE}/bin/sh -c './setupwfc < response'
 + cd ${WRKSRC} && ${SH} -c './setupwfc'
 ${INSTALL_SCRIPT} ${WRKSRC}/wfcmgr.x ${PREFIX}/bin/wfcmgr
 ${INSTALL_SCRIPT} ${WRKSRC}/wfica.x ${PREFIX}/bin/wfica
 # XXX: This is missing a "${BRANDELF} -t Linux <executables>".
 Index: pkg-plist
 ===================================================================
 RCS file: /home/ncvs/ports/german/citrix_ica/pkg-plist,v
 retrieving revision 1.4
 diff -u -r1.4 pkg-plist
 --- pkg-plist 14 Sep 2002 08:09:34 -0000 1.4
 +++ pkg-plist 17 Jul 2006 13:50:57 -0000
 @@ -1,16 +1,17 @@
 -@unexec if [ -f %D/lib/netscape-linux/mime.types ]; then (/bin/cat 
 %D/lib/netscape-linux/mime.types | /usr/bin/grep -v "application/x-ica" > 
 %D/lib/netscape-linux/mime.types.tmp; mv 
 %D/lib/netscape-linux/mime.types.tmp %D/lib/netscape-linux/mime.types); fi
 -@unexec if [ -f %D/lib/netscape-linux/mailcap ]; then (/bin/cat 
 %D/lib/netscape-linux/mailcap | /usr/bin/grep -v "application/x-ica" > 
 %D/lib/netscape-linux/mailcap.tmp; /bin/mv %D/lib/netscape-linux/mailcap.tmp 
 %D/lib/netscape-linux/mailcap); fi
 -@unexec if [ -e %D/lib/netscape-linux/plugins/npica.so ]; then (/bin/rm 
 %D/lib/netscape-linux/plugins/npica.so); fi
 ICAClient/.config/appsrv.ini
 ICAClient/.config/keyboard.ini
 ICAClient/.config/module.ini
 ICAClient/.config/wfclient.ini
 +ICAClient/CHARICONV.DLL
 +ICAClient/NDS.DLL
 ICAClient/Npica
 ICAClient/Npica.ad
 ICAClient/PDCRYPT1.DLL
 ICAClient/PDCRYPT2.DLL
 -ICAClient/SSL.DLL
 +ICAClient/TW1.DLL
 +ICAClient/VDCM.DLL
 ICAClient/VDSCARD.DLL
 +ICAClient/VDSPMIKE.DLL
 ICAClient/Wfcmgr
 ICAClient/Wfcmgr.ad
 ICAClient/Wfica
 @@ -19,12 +20,13 @@
 ICAClient/config/appsrv.ini
 ICAClient/config/module.ini
 ICAClient/config/wfclient.ini
 +ICAClient/desktop/Citrix_PNA.desktop
 +ICAClient/desktop/wfcmgr.desktop
 ICAClient/eula.txt
 ICAClient/help/index.htm
 -ICAClient/icons/ica16.xpm
 -ICAClient/icons/ica32.xpm
 -ICAClient/icons/ica48.xpm
 -ICAClient/icons/ica64.xpm
 +ICAClient/icons/citrix16.xpm
 +ICAClient/icons/citrix32.xpm
 +ICAClient/icons/citrix48.xpm
 ICAClient/install.txt
 ICAClient/keyboard/age2.kbd
 ICAClient/keyboard/agex2.kbd
 @@ -57,6 +59,7 @@
 ICAClient/keyboard/hpusps2.kbd
 ICAClient/keyboard/ibm.kbd
 ICAClient/keyboard/keyboard.ini
 +ICAClient/keyboard/linux-ja.kbd
 ICAClient/keyboard/linux.kbd
 ICAClient/keyboard/mac101.kbd
 ICAClient/keyboard/ncdn-101.kbd
 @@ -92,6 +95,10 @@
 ICAClient/keystore/cacerts/GTECTRoot.crt
 ICAClient/keystore/cacerts/Pcs3ss_v4.crt
 ICAClient/keystore/cacerts/SecureServer.crt
 +ICAClient/libctxssl.so
 +ICAClient/nls/de/pna.nls
 +ICAClient/nls/en/pna.nls
 +ICAClient/nls/C
 ICAClient/npica.so
 ICAClient/pkginf/F.core.linuxx86
 ICAClient/pkginf/Ver.core.linuxx86
 @@ -103,20 +110,27 @@
 ICAClient/util/echo_cmd
 ICAClient/util/hinst
 ICAClient/util/icalicense.sh
 +ICAClient/util/nslaunch
 +ICAClient/util/pac.js
 +ICAClient/util/pacexec
 ICAClient/util/xcapture
 ICAClient/wfcmgr
 ICAClient/wfica
 +ICAClient/wfica.sh
 +ICAClient/wfica_assoc.sh
 bin/wfcmgr
 bin/wfica
 -@dirrm ICAClient/.config
 -@dirrm ICAClient/cache/zlcache
 -@dirrm ICAClient/cache
 -@dirrm ICAClient/config
 -@dirrm ICAClient/help
 -@dirrm ICAClient/icons
 -@dirrm ICAClient/keyboard
 +@dirrm ICAClient/util
 +@dirrm ICAClient/pkginf
 +@dirrm ICAClient/nls/en
 +@dirrm ICAClient/nls/de
 +@dirrm ICAClient/nls
 @dirrm ICAClient/keystore/cacerts
 @dirrm ICAClient/keystore
 -@dirrm ICAClient/pkginf
 -@dirrm ICAClient/util
 +@dirrm ICAClient/keyboard
 +@dirrm ICAClient/icons
 +@dirrm ICAClient/help
 +@dirrm ICAClient/desktop
 +@dirrm ICAClient/config
 +@dirrm ICAClient/.config
 @dirrm ICAClient
 Index: pkg-descr
 ===================================================================
 RCS file: /home/ncvs/ports/german/citrix_ica/pkg-descr,v
 retrieving revision 1.1
 diff -u -r1.1 pkg-descr
 --- pkg-descr 12 Dec 2000 16:01:21 -0000 1.1
 +++ pkg-descr 17 Jul 2006 13:52:10 -0000
 @@ -1,15 +1,13 @@
 -Citrix(R) MetaFrame(TM) is thin-client/server system software for
 -Microsoft's Windows NT Server 4.0, Terminal Server Edition.
 -MetaFrame(TM) delivers a comprehensive thin-client/server solution to
 -the enterprise by extending Windows Terminal Server with additional
 -client and server functionality - including support for heterogeneous
 -computing environments, enterprise-scale management and seamless
 -desktop integration. MetaFrame(TM) transforms the way organizations
 -deploy, manage and access business applications by providing improved
 -application manageability, access, performance and security. Citrix(R)
 -MetaFrame(TM) system software, which incorporates Citrix's Independent
 -Computing Architecture (ICA)(R), provides a complete
 -thin-client/server computing solution for multi-user NT 4.0
 -environments.
 +Citrix(R) Presentation Server(TM) runs on Microsoft(R) Windows
 +Server(TM) and UNIX(R) operating systems, and extends the base
 +Windows Terminal Services platform by enhancing the end-user
 +experience as well as increasing manageability, compatibility,
 +security and scalability to address business-critical environments.
 +Presentation Server expands the range of supported applications to
 +include legacy software and Web-based, UNIX and Java solutions. It
 +also enables any device or operating system including Macintosh and
 +Linux to access virtualized applications. Other important capabilities
 +are powerful management and configuration tools and faster, more
 +flexible printing.
 -WWW: http://www.citrix.com/products/metaframe.asp
 +WWW: http://www.citrix.com/English/ps2/products/product.asp?contentID=186
 Index: patch-linuxx86::hinst
 ===================================================================
 RCS file: /home/ncvs/ports/german/citrix_ica/files/patch-linuxx86::hinst,v
 retrieving revision 1.3
 diff -u -r1.3 patch-linuxx86::hinst
 --- patch-linuxx86::hinst 27 Apr 2002 10:11:11 -0000 1.3
 +++ patch-linuxx86::hinst 17 Jul 2006 13:52:55 -0000
 @@ -1,17 +1,49 @@
 ---- linuxx86/hinst.orig Tue Mar 19 17:18:14 2002
 -+++ linuxx86/hinst Sat Apr 27 11:33:28 2002
 -@@ -1965,10 +1965,32 @@
 +--- linuxx86/hinst.orig Tue Dec 6 11:25:53 2005
 ++++ linuxx86/hinst Mon Jul 17 09:12:18 2006
 +@@ -11,7 +11,6 @@
 + # Copyright 1998-2000 Citrix Systems, Inc. All rights reserved.
 + #
 + 
 ###############################################################################
 +-
 + # note: the INSTALLER_... strings should be in lowercase. The installer 
 will then
 + # accept lowercase or uppercase versions of them as input.
 + INSTALLER_YES=ja
 +@@ -73,7 +72,13 @@
 + fi
 +
 + # Install in here by default.
 +-DefaultInstallDir=/usr/lib/ICAClient
 ++
 ++DefaultInstallDir=$PREFIX/ICAClient
 ++
 ++if [ "$PREFIX/ICAClient" = "/ICAClient" ]
 ++then
 ++ DefaultInstallDir=/usr/local/ICAClient
 ++fi
 +
 + # Default CDROM mount point
 + DefaultCDSourceDir=/cdrom
 +@@ -2175,7 +2180,7 @@
 + tr_file $TR_FILE_KEY $PORT/$PORT.psf
 + preen_files
 +
 +- /bin/true
 ++ /usr/bin/true
 + }
 +
 + 
 ###############################################################################
 +@@ -2227,10 +2232,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
 ++ 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 \
 @@ -20,6 +52,8 @@
 + /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
 @@ -34,34 +68,127 @@
 -PLUGIN_PATH="/usr/local/netscape/plugins"
 PLUGIN_NAME=npica.so
 PLUGIN_CLASS=ICAClObj.class
 + MAILCAP_FILE=mailcap
 +@@ -2303,26 +2332,19 @@
 -@@ -2017,15 +2039,12 @@
 - $ECHO_CMD $integrate_netscape1
 - search_ok=0
 + netscape_integrate()
 + {
 +- user_echo $integrate_netscape1
 + if test -z "$SU_INSTALL"
 + then
 + set_npui_variables
 + found_netscape
 + else
 + search_ok=0
 +- EXTRA_BROWSERS=`find_browsers`
 -- if test -d "/usr/lib/netscape"\
 -- || test -d "/usr/local/netscape"\
 -- || test -d "/opt/netscape"\
 -- || test -d "/usr/local/lib/netscape"\
 -- || test "$MOZILLA_HOME" != "" -a -d "$MOZILLA_HOME"
 -- then
 -+ case ${FOUND_NS} in
 -+ TRUE)
 - $ECHO_CMD $integrate_netscape3
 +- if test -d "/usr/lib/netscape"\
 +- || test -d "/usr/local/netscape"\
 +- || test -d "/opt/netscape"\
 +- || test -d "/usr/local/lib/netscape"\
 +- || test -d "/usr/dt/appconfig/netscape"\
 +- || test "$MOZILLA_HOME" != "" -a -d "$MOZILLA_HOME"\
 +- || test "$EXTRA_BROWSERS" != ""
 +- then
 ++ case ${FOUND_NS} in
 ++ TRUE)
 + user_echo $integrate_netscape3
 found_netscape
 -- else
 +- else
 + ;;
 -+ *)
 - echo_no_nl $integrate_netscape2
 ++ *)
 + user_prompt $integrate_netscape2
 getyesno $INSTALLER_NO
 if [ "$ANSWER" = "$INSTALLER_YES" ]
 -@@ -2034,7 +2053,8 @@
 +@@ -2331,9 +2353,9 @@
 else
 - $ECHO_CMD $integrate_netscape6
 + user_echo $integrate_netscape6
 fi
 -- fi;
 + ;;
 -+ esac;
 ++ esac
 + fi
 +- fi
 +-
 + # Create utility script files in install root.
 + create_wfica_script
 + create_wfica_assoc_script
 +@@ -2969,55 +2991,6 @@
 + echo "$BINDIR"
 }
 +-################################################################################
 +-#
 +-# find_browsers
 +-#
 +-# Returns a list of directories containing new-style mozilla-based 
 browsers
 +-# that may be launched by files on the $PATH.
 +-#
 +-################################################################################
 +-find_browsers()
 +-{
 +- PROGS="netscape mozilla firefox"
 +- DIST_BIN_DIR=""
 +- STANDARD_DIRS="/usr/local/netscape /usr/local/mozilla /usr/local/firefox 
 /usr/lib/mozilla"
 +-
 +- case $op_system in
 +- SunOS) if
 +- /usr/bin/pkginfo -q $SOLARIS_PACKAGE_NAME
 +- then
 +- relocation_base=`/usr/bin/pkginfo -r $SOLARIS_PACKAGE_NAME`
 +- STANDARD_DIRS="$STANDARD_DIRS 
 $relocation_base/$SOLARIS_PACKAGE_DIRECTORY"
 +-
 +- # N.B. the Netscape 7 packages for SOLARIS 9 have an extended 
 installation path built-in!
 +- case `uname -r` in
 +- 5.9) STANDARD_DIRS="$STANDARD_DIRS 
 $relocation_base/dt/appconfig/$SOLARIS_PACKAGE_DIRECTORY"
 +- ;;
 +- *) ;;
 +- esac
 +- fi;;
 +- *) ;;
 +- esac
 +-
 +- for d in `echo $PATH | sed "s/:/ /g"` $STANDARD_DIRS
 +- do
 +- echo $d
 +- done | sort -u | while read d
 +- do
 +- for p in $PROGS
 +- do
 +- # Find the each instance of each named browser
 +- PROG=$d/$p
 +- if test -f $PROG
 +- then
 +- # Where is the installation and what version is it?
 +- find_extra_bin_dirs $PROG
 +- fi
 +- done
 +- done | sort -u
 +-}
 +-
 + BROWSER_LIST_KEY="BROWSER_DIR"
 ################################################################################
 + #
 +@@ -3244,13 +3217,16 @@
 + 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_KDE_TARGET_DIRS="/usr/share/applnk-redhat/Internet \
 +- /usr/share/applnk-mdk/Networking \
 +- $TL_TOP_DIR/Internet \
 +- /etc/opt/kde3/share/applnk/SuSE/Internet \
 +- /usr/share/applnk/Applications"
 +-
 ++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/local/share/applnk/Applications \
 ++ /usr/local/share/applnk/Internet \
 ++ /usr/share/applnk-redhat/Internet \
 ++ /usr/share/applnk-mdk/Networking \
 ++ /etc/opt/kde3/share/applnk/SuSE/Internet"
 + DEFAULT_DT_TARGET_DIRS="$XDG_TARGET_DIR $DEFAULT_GNOME_TARGET_DIRS 
 $DEFAULT_KDE_TARGET_DIRS"
 + DEFAULT_DT_FOLDER="Applications"
 + 
 
State-Changed-From-To: feedback->closed 
State-Changed-By: stefan 
State-Changed-When: Mon Jul 24 06:16:37 UTC 2006 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=98089 
>Unformatted:
