Unbreak and upgrade this port to version 8.0. The previous

distfile was not available anymore.

PR:		ports/67576
Submitted by:	Joerg Pulz <Joerg.Pulz@frm2.tum.de>
Approved by:	portmgr (linimon)

8 files changed, 102 insertions, 54 deletions

diff --git a/net/citrix_ica/Makefile b/net/citrix_ica/Makefile
index c1f72a059c7b..7adb17daff0b 100644
--- a/net/citrix_ica/Makefile
+++ b/net/citrix_ica/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	citrix_ica
-PORTVERSION=	7.00
+PORTVERSION=	8.00
 PORTREVISION=	1
 CATEGORIES=	net comms linux
 MASTER_SITES=
@@ -35,6 +35,8 @@ NSCP=	/usr/local/libexec/netscape \
 	/usr/local/lib/netscape-linux \
 	${MOZILLA_HOME}
 
+PLIST_SUB=	MOZILLA_HOME=${MOZILLA_HOME}
+
 .include <bsd.port.pre.mk>
 
 .if exists(${PREFIX}/bin/kde-config)
@@ -71,13 +73,13 @@ do-install:
 		${FALSE} ; \
 	fi
 
-	@${ECHO_CMD} -e "1\n${CDIR}\ny\ny\ny\ny${HAVE_KDE}\n3" > ${WRKSRC}/response ;
+	@${ECHO_CMD} -e "1\n${CDIR}\ny\n1\ny${HAVE_KDE}\n3" > ${WRKSRC}/response ;
 	@for dir in ${NSCP}; do \
 		if [ -e $${dir}/plugins/libnullplugin.so ]; then \
-			BIN=`${FILE} $${dir}/plugins/libnullplugin.so | ${AWK} '{print $$11}'` ; \
+			BIN=`${FILE} ${dir}/plugins/libnullplugin.so | ${AWK} '{print $11}'` ; \
 			case $${BIN} in \
 			\(SYSV\),) \
-				${ECHO_CMD} -e "1\n${CDIR}\ny\ny\ny${HAVE_KDE}\n3" > ${WRKSRC}/response ; \
+				${ECHO_CMD} -e "1\n${CDIR}\ny\n1\ny${HAVE_KDE}\n3" > ${WRKSRC}/response ; \
 			esac \
 		fi \
 	done
diff --git a/net/citrix_ica/distinfo b/net/citrix_ica/distinfo
index 763c96f5868e..a32a0bf3a8ce 100644
--- a/net/citrix_ica/distinfo
+++ b/net/citrix_ica/distinfo
@@ -1 +1,2 @@
-MD5 (citrix_ica-linuxx86-7.00.tar.gz) = d4efd8075afc1e96646cad4acb740033
+MD5 (citrix_ica-linuxx86-8.00.tar.gz) = c6622eed6ac9666bac578dccfcb81cee
+SIZE (citrix_ica-linuxx86-8.00.tar.gz) = 1564536
diff --git a/net/citrix_ica/files/patch-linuxx86::hinst b/net/citrix_ica/files/patch-linuxx86::hinst
index 750ceb4f2af3..39b305eede3f 100644
--- a/net/citrix_ica/files/patch-linuxx86::hinst
+++ b/net/citrix_ica/files/patch-linuxx86::hinst
@@ -1,6 +1,6 @@
---- linuxx86/hinst.orig	Thu May 22 12:30:28 2003
-+++ linuxx86/hinst	Mon Aug 11 16:52:05 2003
-@@ -2132,10 +2132,34 @@
+--- linuxx86/hinst.orig	Fri May  7 14:44:44 2004
++++ linuxx86/hinst	Fri Jun  4 17:44:53 2004
+@@ -2142,10 +2142,34 @@
  #
  ###############################################################################
  
@@ -37,7 +37,7 @@
  PLUGIN_NAME=npica.so
  PLUGIN_CLASS=ICAClObj.class
  MAILCAP_FILE=mailcap
-@@ -2206,36 +2230,29 @@
+@@ -2218,36 +2242,29 @@
  
  netscape_integrate()
  {
@@ -83,7 +83,7 @@
  
      # Create utility script files in install root.
      create_wfica_script
-@@ -2866,37 +2883,6 @@
+@@ -2878,55 +2895,6 @@
      echo "$BINDIR"
  }
  
@@ -100,6 +100,24 @@
 -    PROGS="netscape mozilla"
 -    DIST_BIN_DIR=""
 -    STANDARD_DIRS="/usr/local/netscape /usr/local/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
@@ -121,12 +139,12 @@
  BROWSER_LIST_KEY="BROWSER_DIR"
  ################################################################################
  #
-@@ -3119,6 +3105,8 @@
- wfcmgr_NAME='Citrix ICA Client'
- DEFAULT_DT_TARGET_DIRS="/usr/share/applications \
-                         /usr/share/applnk/Applications \
-+			/usr/local/share/applnk/Internet \
-+			/usr/local/share/applnk/Networking \
+@@ -3151,6 +3119,8 @@
+ wfcmgr_ja_NAME='Citrix ICA クライアント'
+ 
+ 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"
- DEFAULT_DT_FOLDER="Applications"
diff --git a/net/citrix_ica/pkg-plist b/net/citrix_ica/pkg-plist
index ef0b484f8912..8b4d8a4ecdb4 100644
--- a/net/citrix_ica/pkg-plist
+++ b/net/citrix_ica/pkg-plist
@@ -1,15 +1,18 @@
-@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/PDCRYPT1.DLL
 ICAClient/PDCRYPT2.DLL
-ICAClient/SSL.DLL
+ICAClient/TW1.DLL
+ICAClient/VDCM.DLL
 ICAClient/VDSCARD.DLL
 ICAClient/Wfcmgr
 ICAClient/Wfcmgr.ad
@@ -23,11 +26,9 @@ 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/pn32.xpm
+ICAClient/icons/citrix16.xpm
+ICAClient/icons/citrix32.xpm
+ICAClient/icons/citrix48.xpm
 ICAClient/install.txt
 ICAClient/keyboard/age2.kbd
 ICAClient/keyboard/agex2.kbd
@@ -61,6 +62,7 @@ ICAClient/keyboard/hpusps2.kbd
 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
@@ -118,6 +120,7 @@ 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
diff --git a/net/citrix_xenapp/Makefile b/net/citrix_xenapp/Makefile
index c1f72a059c7b..7adb17daff0b 100644
--- a/net/citrix_xenapp/Makefile
+++ b/net/citrix_xenapp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	citrix_ica
-PORTVERSION=	7.00
+PORTVERSION=	8.00
 PORTREVISION=	1
 CATEGORIES=	net comms linux
 MASTER_SITES=
@@ -35,6 +35,8 @@ NSCP=	/usr/local/libexec/netscape \
 	/usr/local/lib/netscape-linux \
 	${MOZILLA_HOME}
 
+PLIST_SUB=	MOZILLA_HOME=${MOZILLA_HOME}
+
 .include <bsd.port.pre.mk>
 
 .if exists(${PREFIX}/bin/kde-config)
@@ -71,13 +73,13 @@ do-install:
 		${FALSE} ; \
 	fi
 
-	@${ECHO_CMD} -e "1\n${CDIR}\ny\ny\ny\ny${HAVE_KDE}\n3" > ${WRKSRC}/response ;
+	@${ECHO_CMD} -e "1\n${CDIR}\ny\n1\ny${HAVE_KDE}\n3" > ${WRKSRC}/response ;
 	@for dir in ${NSCP}; do \
 		if [ -e $${dir}/plugins/libnullplugin.so ]; then \
-			BIN=`${FILE} $${dir}/plugins/libnullplugin.so | ${AWK} '{print $$11}'` ; \
+			BIN=`${FILE} ${dir}/plugins/libnullplugin.so | ${AWK} '{print $11}'` ; \
 			case $${BIN} in \
 			\(SYSV\),) \
-				${ECHO_CMD} -e "1\n${CDIR}\ny\ny\ny${HAVE_KDE}\n3" > ${WRKSRC}/response ; \
+				${ECHO_CMD} -e "1\n${CDIR}\ny\n1\ny${HAVE_KDE}\n3" > ${WRKSRC}/response ; \
 			esac \
 		fi \
 	done
diff --git a/net/citrix_xenapp/distinfo b/net/citrix_xenapp/distinfo
index 763c96f5868e..a32a0bf3a8ce 100644
--- a/net/citrix_xenapp/distinfo
+++ b/net/citrix_xenapp/distinfo
@@ -1 +1,2 @@
-MD5 (citrix_ica-linuxx86-7.00.tar.gz) = d4efd8075afc1e96646cad4acb740033
+MD5 (citrix_ica-linuxx86-8.00.tar.gz) = c6622eed6ac9666bac578dccfcb81cee
+SIZE (citrix_ica-linuxx86-8.00.tar.gz) = 1564536
diff --git a/net/citrix_xenapp/files/patch-linuxx86::hinst b/net/citrix_xenapp/files/patch-linuxx86::hinst
index 750ceb4f2af3..39b305eede3f 100644
--- a/net/citrix_xenapp/files/patch-linuxx86::hinst
+++ b/net/citrix_xenapp/files/patch-linuxx86::hinst
@@ -1,6 +1,6 @@
---- linuxx86/hinst.orig	Thu May 22 12:30:28 2003
-+++ linuxx86/hinst	Mon Aug 11 16:52:05 2003
-@@ -2132,10 +2132,34 @@
+--- linuxx86/hinst.orig	Fri May  7 14:44:44 2004
++++ linuxx86/hinst	Fri Jun  4 17:44:53 2004
+@@ -2142,10 +2142,34 @@
  #
  ###############################################################################
  
@@ -37,7 +37,7 @@
  PLUGIN_NAME=npica.so
  PLUGIN_CLASS=ICAClObj.class
  MAILCAP_FILE=mailcap
-@@ -2206,36 +2230,29 @@
+@@ -2218,36 +2242,29 @@
  
  netscape_integrate()
  {
@@ -83,7 +83,7 @@
  
      # Create utility script files in install root.
      create_wfica_script
-@@ -2866,37 +2883,6 @@
+@@ -2878,55 +2895,6 @@
      echo "$BINDIR"
  }
  
@@ -100,6 +100,24 @@
 -    PROGS="netscape mozilla"
 -    DIST_BIN_DIR=""
 -    STANDARD_DIRS="/usr/local/netscape /usr/local/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
@@ -121,12 +139,12 @@
  BROWSER_LIST_KEY="BROWSER_DIR"
  ################################################################################
  #
-@@ -3119,6 +3105,8 @@
- wfcmgr_NAME='Citrix ICA Client'
- DEFAULT_DT_TARGET_DIRS="/usr/share/applications \
-                         /usr/share/applnk/Applications \
-+			/usr/local/share/applnk/Internet \
-+			/usr/local/share/applnk/Networking \
+@@ -3151,6 +3119,8 @@
+ wfcmgr_ja_NAME='Citrix ICA クライアント'
+ 
+ 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"
- DEFAULT_DT_FOLDER="Applications"
diff --git a/net/citrix_xenapp/pkg-plist b/net/citrix_xenapp/pkg-plist
index ef0b484f8912..8b4d8a4ecdb4 100644
--- a/net/citrix_xenapp/pkg-plist
+++ b/net/citrix_xenapp/pkg-plist
@@ -1,15 +1,18 @@
-@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/PDCRYPT1.DLL
 ICAClient/PDCRYPT2.DLL
-ICAClient/SSL.DLL
+ICAClient/TW1.DLL
+ICAClient/VDCM.DLL
 ICAClient/VDSCARD.DLL
 ICAClient/Wfcmgr
 ICAClient/Wfcmgr.ad
@@ -23,11 +26,9 @@ 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/pn32.xpm
+ICAClient/icons/citrix16.xpm
+ICAClient/icons/citrix32.xpm
+ICAClient/icons/citrix48.xpm
 ICAClient/install.txt
 ICAClient/keyboard/age2.kbd
 ICAClient/keyboard/agex2.kbd
@@ -61,6 +62,7 @@ ICAClient/keyboard/hpusps2.kbd
 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
@@ -118,6 +120,7 @@ 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