- Update to 9.15.

- Portlint(1).
- Assign maintainership to submitter.

PR:		98089
Submitted by:	Thomas Abthorpe <thomas@goodking.ca>
Approved by:	arved (mentor)

5 files changed, 220 insertions, 89 deletions

diff --git a/german/citrix_ica/Makefile b/german/citrix_ica/Makefile
index 71e0880a1f03..81184167fa7f 100644
--- a/german/citrix_ica/Makefile
+++ b/german/citrix_ica/Makefile
@@ -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 @@ do-install:
 		${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>".
diff --git a/german/citrix_ica/distinfo b/german/citrix_ica/distinfo
index a49691dfe53c..e7685605838e 100644
--- a/german/citrix_ica/distinfo
+++ b/german/citrix_ica/distinfo
@@ -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
diff --git a/german/citrix_ica/files/patch-linuxx86::hinst b/german/citrix_ica/files/patch-linuxx86::hinst
index 99963035e66c..d8f7056bc9b5 100644
--- a/german/citrix_ica/files/patch-linuxx86::hinst
+++ b/german/citrix_ica/files/patch-linuxx86::hinst
@@ -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"
+ 
diff --git a/german/citrix_ica/pkg-descr b/german/citrix_ica/pkg-descr
index 35b3b42ba57d..69deced9f262 100644
--- a/german/citrix_ica/pkg-descr
+++ b/german/citrix_ica/pkg-descr
@@ -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
diff --git a/german/citrix_ica/pkg-plist b/german/citrix_ica/pkg-plist
index 8cb11d924943..9b1e7e4e33f8 100644
--- a/german/citrix_ica/pkg-plist
+++ b/german/citrix_ica/pkg-plist
@@ -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/.server
 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/hpusitf.kbd
 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/GTECTGlobalRoot.crt
 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/XCapture.ad
 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