Date: Mon, 29 May 2006 14:01:22 GMT From: Thomas Abthorpe <thomas@goodking.ca> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/98089: prepared to assume maintainership of german/citrix_ica and upgrade to 9.15 Message-ID: <200605291401.k4TE1M9x038681@www.freebsd.org> Resent-Message-ID: <200605291410.k4TEAH9S038889@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon May 29 14:10:17 GMT 2006
>Closed-Date:
>Last-Modified:
>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:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200605291401.k4TE1M9x038681>