aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/citrix_ica/Makefile12
-rw-r--r--net/citrix_ica/distinfo2
-rw-r--r--net/citrix_ica/files/patch-linuxx86::hinst125
-rw-r--r--net/citrix_ica/pkg-plist11
-rw-r--r--net/citrix_xenapp/Makefile12
-rw-r--r--net/citrix_xenapp/distinfo2
-rw-r--r--net/citrix_xenapp/files/patch-linuxx86::hinst125
-rw-r--r--net/citrix_xenapp/pkg-plist11
8 files changed, 228 insertions, 72 deletions
diff --git a/net/citrix_ica/Makefile b/net/citrix_ica/Makefile
index 386471899170..07a3266f0a67 100644
--- a/net/citrix_ica/Makefile
+++ b/net/citrix_ica/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= citrix_ica
-PORTVERSION= 6.30.1052
+PORTVERSION= 7.00
CATEGORIES= net comms linux
MASTER_SITES=
-DISTNAME= ${PORTNAME}-linuxx86
+DISTNAME= ${PORTNAME}-linuxx86-${PORTVERSION}
MAINTAINER= mbr@FreeBSD.org
COMMENT= Citrix(R) client for the Microsoft Windows Terminal Server
@@ -36,6 +36,10 @@ NSCP= /usr/local/libexec/netscape \
.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,13 +70,13 @@ do-install:
${FALSE} ; \
fi
- @${ECHO_CMD} -e "1\n${CDIR}\ny\ny\ny\ny\n3" > ${WRKSRC}/response ;
+ @${ECHO_CMD} -e "1\n${CDIR}\ny\ny\ny\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}'` ; \
case $${BIN} in \
\(SYSV\),) \
- ${ECHO_CMD} -e "1\n${CDIR}\ny\ny\ny\n3" > ${WRKSRC}/response ; \
+ ${ECHO_CMD} -e "1\n${CDIR}\ny\ny\ny${HAVE_KDE}\n3" > ${WRKSRC}/response ; \
esac \
fi \
done
diff --git a/net/citrix_ica/distinfo b/net/citrix_ica/distinfo
index d1ac98e87fbd..763c96f5868e 100644
--- a/net/citrix_ica/distinfo
+++ b/net/citrix_ica/distinfo
@@ -1 +1 @@
-MD5 (citrix_ica-linuxx86.tar.gz) = be308027ab909478788997f7de2a8321
+MD5 (citrix_ica-linuxx86-7.00.tar.gz) = d4efd8075afc1e96646cad4acb740033
diff --git a/net/citrix_ica/files/patch-linuxx86::hinst b/net/citrix_ica/files/patch-linuxx86::hinst
index 99963035e66c..de042206045f 100644
--- a/net/citrix_ica/files/patch-linuxx86::hinst
+++ b/net/citrix_ica/files/patch-linuxx86::hinst
@@ -1,6 +1,6 @@
---- 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 Thu May 22 12:30:28 2003
++++ linuxx86/hinst Mon Aug 11 15:06:44 2003
+@@ -2132,10 +2132,32 @@
#
###############################################################################
@@ -15,17 +15,17 @@
+}
+
+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 \
-+ $MOZILLA_HOME"
++ /usr/local/libexec/netscape-linux \
++ /usr/local/netscape \
++ /usr/local/netscape-linux \
++ /usr/local/lib/netscape \
++ /usr/local/lib/netscape-linux \
++ $MOZILLA_HOME"
+
+for dir in ${NSCP}; do
-+ if [ -e $dir/plugins/libnullplugin.so ]; then
-+ check_for_ns $dir;
-+ fi
++ if [ -e $dir/plugins/libnullplugin.so ]; then
++ check_for_ns $dir;
++ fi
+done
+
INST_DIR=$ICAInstDir
@@ -34,34 +34,97 @@
-PLUGIN_PATH="/usr/local/netscape/plugins"
PLUGIN_NAME=npica.so
PLUGIN_CLASS=ICAClObj.class
-
-@@ -2017,15 +2039,12 @@
+ MAILCAP_FILE=mailcap
+@@ -2207,35 +2229,29 @@
+ netscape_integrate()
+ {
$ECHO_CMD $integrate_netscape1
- search_ok=0
-
-- 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)
+- if test -z "$SU_INSTALL"
++ 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 -d "/usr/dt/appconfig/netscape"\
+- || test "$MOZILLA_HOME" != "" -a -d "$MOZILLA_HOME"\
+- || test "$EXTRA_BROWSERS" != ""
+- then
++
++ case ${FOUND_NS} in
++ TRUE)
$ECHO_CMD $integrate_netscape3
found_netscape
-- else
+- else
+ ;;
-+ *)
++ *)
echo_no_nl $integrate_netscape2
getyesno $INSTALLER_NO
- if [ "$ANSWER" = "$INSTALLER_YES" ]
-@@ -2034,7 +2053,8 @@
+- if [ "$ANSWER" = "$INSTALLER_YES" ]
+- then
++ if [ "$ANSWER" = "$INSTALLER_YES" ]; then
+ found_netscape
else
$ECHO_CMD $integrate_netscape6
fi
-- fi;
-+ ;;
-+ esac;
+- fi
+- fi
++ ;;
++ esac
++ fi
+
+ # Create utility script files in install root.
+ create_wfica_script
+@@ -2866,37 +2882,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"
+- DIST_BIN_DIR=""
+- STANDARD_DIRS="/usr/local/netscape /usr/local/mozilla"
+- 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"
################################################################################
+ #
+@@ -3119,6 +3104,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 \
+ /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 8cb11d924943..ef0b484f8912 100644
--- a/net/citrix_ica/pkg-plist
+++ b/net/citrix_ica/pkg-plist
@@ -19,12 +19,15 @@ ICAClient/config/.server
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/pn32.xpm
ICAClient/install.txt
ICAClient/keyboard/age2.kbd
ICAClient/keyboard/agex2.kbd
@@ -92,6 +95,8 @@ ICAClient/keystore/cacerts/GTECTGlobalRoot.crt
ICAClient/keystore/cacerts/GTECTRoot.crt
ICAClient/keystore/cacerts/Pcs3ss_v4.crt
ICAClient/keystore/cacerts/SecureServer.crt
+ICAClient/nls/C
+ICAClient/nls/en/pna.nls
ICAClient/npica.so
ICAClient/pkginf/F.core.linuxx86
ICAClient/pkginf/Ver.core.linuxx86
@@ -103,20 +108,26 @@ ICAClient/util/XCapture.ad
ICAClient/util/echo_cmd
ICAClient/util/hinst
ICAClient/util/icalicense.sh
+ICAClient/util/nslaunch
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/desktop
@dirrm ICAClient/help
@dirrm ICAClient/icons
@dirrm ICAClient/keyboard
@dirrm ICAClient/keystore/cacerts
@dirrm ICAClient/keystore
+@dirrm ICAClient/nls/en
+@dirrm ICAClient/nls
@dirrm ICAClient/pkginf
@dirrm ICAClient/util
@dirrm ICAClient
diff --git a/net/citrix_xenapp/Makefile b/net/citrix_xenapp/Makefile
index 386471899170..07a3266f0a67 100644
--- a/net/citrix_xenapp/Makefile
+++ b/net/citrix_xenapp/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= citrix_ica
-PORTVERSION= 6.30.1052
+PORTVERSION= 7.00
CATEGORIES= net comms linux
MASTER_SITES=
-DISTNAME= ${PORTNAME}-linuxx86
+DISTNAME= ${PORTNAME}-linuxx86-${PORTVERSION}
MAINTAINER= mbr@FreeBSD.org
COMMENT= Citrix(R) client for the Microsoft Windows Terminal Server
@@ -36,6 +36,10 @@ NSCP= /usr/local/libexec/netscape \
.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,13 +70,13 @@ do-install:
${FALSE} ; \
fi
- @${ECHO_CMD} -e "1\n${CDIR}\ny\ny\ny\ny\n3" > ${WRKSRC}/response ;
+ @${ECHO_CMD} -e "1\n${CDIR}\ny\ny\ny\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}'` ; \
case $${BIN} in \
\(SYSV\),) \
- ${ECHO_CMD} -e "1\n${CDIR}\ny\ny\ny\n3" > ${WRKSRC}/response ; \
+ ${ECHO_CMD} -e "1\n${CDIR}\ny\ny\ny${HAVE_KDE}\n3" > ${WRKSRC}/response ; \
esac \
fi \
done
diff --git a/net/citrix_xenapp/distinfo b/net/citrix_xenapp/distinfo
index d1ac98e87fbd..763c96f5868e 100644
--- a/net/citrix_xenapp/distinfo
+++ b/net/citrix_xenapp/distinfo
@@ -1 +1 @@
-MD5 (citrix_ica-linuxx86.tar.gz) = be308027ab909478788997f7de2a8321
+MD5 (citrix_ica-linuxx86-7.00.tar.gz) = d4efd8075afc1e96646cad4acb740033
diff --git a/net/citrix_xenapp/files/patch-linuxx86::hinst b/net/citrix_xenapp/files/patch-linuxx86::hinst
index 99963035e66c..de042206045f 100644
--- a/net/citrix_xenapp/files/patch-linuxx86::hinst
+++ b/net/citrix_xenapp/files/patch-linuxx86::hinst
@@ -1,6 +1,6 @@
---- 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 Thu May 22 12:30:28 2003
++++ linuxx86/hinst Mon Aug 11 15:06:44 2003
+@@ -2132,10 +2132,32 @@
#
###############################################################################
@@ -15,17 +15,17 @@
+}
+
+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 \
-+ $MOZILLA_HOME"
++ /usr/local/libexec/netscape-linux \
++ /usr/local/netscape \
++ /usr/local/netscape-linux \
++ /usr/local/lib/netscape \
++ /usr/local/lib/netscape-linux \
++ $MOZILLA_HOME"
+
+for dir in ${NSCP}; do
-+ if [ -e $dir/plugins/libnullplugin.so ]; then
-+ check_for_ns $dir;
-+ fi
++ if [ -e $dir/plugins/libnullplugin.so ]; then
++ check_for_ns $dir;
++ fi
+done
+
INST_DIR=$ICAInstDir
@@ -34,34 +34,97 @@
-PLUGIN_PATH="/usr/local/netscape/plugins"
PLUGIN_NAME=npica.so
PLUGIN_CLASS=ICAClObj.class
-
-@@ -2017,15 +2039,12 @@
+ MAILCAP_FILE=mailcap
+@@ -2207,35 +2229,29 @@
+ netscape_integrate()
+ {
$ECHO_CMD $integrate_netscape1
- search_ok=0
-
-- 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)
+- if test -z "$SU_INSTALL"
++ 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 -d "/usr/dt/appconfig/netscape"\
+- || test "$MOZILLA_HOME" != "" -a -d "$MOZILLA_HOME"\
+- || test "$EXTRA_BROWSERS" != ""
+- then
++
++ case ${FOUND_NS} in
++ TRUE)
$ECHO_CMD $integrate_netscape3
found_netscape
-- else
+- else
+ ;;
-+ *)
++ *)
echo_no_nl $integrate_netscape2
getyesno $INSTALLER_NO
- if [ "$ANSWER" = "$INSTALLER_YES" ]
-@@ -2034,7 +2053,8 @@
+- if [ "$ANSWER" = "$INSTALLER_YES" ]
+- then
++ if [ "$ANSWER" = "$INSTALLER_YES" ]; then
+ found_netscape
else
$ECHO_CMD $integrate_netscape6
fi
-- fi;
-+ ;;
-+ esac;
+- fi
+- fi
++ ;;
++ esac
++ fi
+
+ # Create utility script files in install root.
+ create_wfica_script
+@@ -2866,37 +2882,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"
+- DIST_BIN_DIR=""
+- STANDARD_DIRS="/usr/local/netscape /usr/local/mozilla"
+- 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"
################################################################################
+ #
+@@ -3119,6 +3104,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 \
+ /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 8cb11d924943..ef0b484f8912 100644
--- a/net/citrix_xenapp/pkg-plist
+++ b/net/citrix_xenapp/pkg-plist
@@ -19,12 +19,15 @@ ICAClient/config/.server
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/pn32.xpm
ICAClient/install.txt
ICAClient/keyboard/age2.kbd
ICAClient/keyboard/agex2.kbd
@@ -92,6 +95,8 @@ ICAClient/keystore/cacerts/GTECTGlobalRoot.crt
ICAClient/keystore/cacerts/GTECTRoot.crt
ICAClient/keystore/cacerts/Pcs3ss_v4.crt
ICAClient/keystore/cacerts/SecureServer.crt
+ICAClient/nls/C
+ICAClient/nls/en/pna.nls
ICAClient/npica.so
ICAClient/pkginf/F.core.linuxx86
ICAClient/pkginf/Ver.core.linuxx86
@@ -103,20 +108,26 @@ ICAClient/util/XCapture.ad
ICAClient/util/echo_cmd
ICAClient/util/hinst
ICAClient/util/icalicense.sh
+ICAClient/util/nslaunch
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/desktop
@dirrm ICAClient/help
@dirrm ICAClient/icons
@dirrm ICAClient/keyboard
@dirrm ICAClient/keystore/cacerts
@dirrm ICAClient/keystore
+@dirrm ICAClient/nls/en
+@dirrm ICAClient/nls
@dirrm ICAClient/pkginf
@dirrm ICAClient/util
@dirrm ICAClient