From owner-svn-ports-all@FreeBSD.ORG Sat Mar 29 16:36:53 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 552EDFBC; Sat, 29 Mar 2014 16:36:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 417F728D; Sat, 29 Mar 2014 16:36:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2TGarGI070130; Sat, 29 Mar 2014 16:36:53 GMT (envelope-from swills@svn.freebsd.org) Received: (from swills@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2TGaqX7070128; Sat, 29 Mar 2014 16:36:52 GMT (envelope-from swills@svn.freebsd.org) Message-Id: <201403291636.s2TGaqX7070128@svn.freebsd.org> From: Steve Wills Date: Sat, 29 Mar 2014 16:36:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r349559 - head/net/citrix_ica X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Mar 2014 16:36:53 -0000 Author: swills Date: Sat Mar 29 16:36:52 2014 New Revision: 349559 URL: http://svnweb.freebsd.org/changeset/ports/349559 QAT: https://qat.redports.org/buildarchive/r349559/ Log: - Stage PR: ports/187888 Submitted by: Johannes Jost Meixner Modified: head/net/citrix_ica/Makefile head/net/citrix_ica/pkg-plist Modified: head/net/citrix_ica/Makefile ============================================================================== --- head/net/citrix_ica/Makefile Sat Mar 29 16:23:31 2014 (r349558) +++ head/net/citrix_ica/Makefile Sat Mar 29 16:36:52 2014 (r349559) @@ -3,6 +3,7 @@ PORTNAME= citrix_ica PORTVERSION= 12.1 +PORTREVISION= 1 CATEGORIES= net comms linux MASTER_SITES= # DISTNAME= linuxx86_12.1.0.203066 @@ -31,7 +32,6 @@ PLIST_SUB+= HAVE_ICA_CERTS="@comment " SUB_FILES= wfcmgr wfica SUB_LIST= CDIR=${CDIR} -NO_STAGE= yes .include .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) @@ -50,7 +50,7 @@ pre-fetch: .endif do-install: - @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKDIR}/linuxx86/hinst + @${REINPLACE_CMD} -e 's|%%PREFIX%%|${STAGEDIR}${PREFIX}|g' ${WRKDIR}/linuxx86/hinst @if (test -d "${CDIR}") ; \ then \ ${ECHO} "-----------------------------------------------------------" ; \ @@ -62,13 +62,18 @@ do-install: ${FALSE} ; \ fi cd ${WRKSRC} && ${SH} -c './setupwfc' - ${INSTALL_SCRIPT} ${WRKDIR}/wfcmgr ${PREFIX}/bin/wfcmgr - ${INSTALL_SCRIPT} ${WRKDIR}/wfica ${PREFIX}/bin/wfica + ${INSTALL_SCRIPT} ${WRKDIR}/wfcmgr ${STAGEDIR}${PREFIX}/bin/wfcmgr + ${INSTALL_SCRIPT} ${WRKDIR}/wfica ${STAGEDIR}${PREFIX}/bin/wfica # XXX: This is missing a "${BRANDELF} -t Linux ". + ${MKDIR} ${STAGEDIR}${CDIR} + ${MKDIR} ${STAGEDIR}${CDIR}/config + cd ${WRKDIR}/linuxx86/linuxx86.cor/ && ${COPYTREE_SHARE} . ${STAGEDIR}${CDIR} + cp ${WRKDIR}/setupwfc ${STAGEDIR}${CDIR} .if defined(ICA_CERTS) + ${MKDIR} ${STAGEDIR}${CERTDIR} .for f in ${ICA_CERTS} - ${INSTALL_DATA} ${DISTDIR}/${f} ${CERTDIR} + ${INSTALL_DATA} ${DISTDIR}/${f} ${STAGEDIR}${CERTDIR} .endfor .endif Modified: head/net/citrix_ica/pkg-plist ============================================================================== --- head/net/citrix_ica/pkg-plist Sat Mar 29 16:23:31 2014 (r349558) +++ head/net/citrix_ica/pkg-plist Sat Mar 29 16:36:52 2014 (r349559) @@ -1,7 +1,3 @@ -@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 -%%HAVE_ICA_CERTS%%@unexec for f in %%ICA_CERTS%%; do rm %%CERTDIR%%/${f}; done ICAClient/ADPCM.DLL ICAClient/CHARICONV.DLL ICAClient/FlashContainer.bin @@ -17,6 +13,13 @@ ICAClient/VDMM.DLL ICAClient/VDMSSPI.DLL ICAClient/VDSCARD.DLL ICAClient/VORBIS.DLL +ICAClient/eula.txt +ICAClient/libctxssl.so +ICAClient/libproxy.so +ICAClient/npica.so +ICAClient/setupwfc +ICAClient/wfcmgr +ICAClient/wfica ICAClient/config/.server ICAClient/config/All_Regions.ini ICAClient/config/MediaStreamingConfig.tbl @@ -28,12 +31,12 @@ ICAClient/config/canonicalization.ini ICAClient/config/module.ini ICAClient/config/plugin.ini ICAClient/config/regions.ini +ICAClient/config/wfclient.ini ICAClient/config/usertemplate/All_Regions.ini ICAClient/config/usertemplate/Trusted_Region.ini ICAClient/config/usertemplate/Unknown_Region.ini ICAClient/config/usertemplate/Untrusted_Region.ini -ICAClient/config/wfclient.ini -ICAClient/eula.txt +ICAClient/gtk/resource.gtkrc ICAClient/gtk/glade/authdialogbox.glade ICAClient/gtk/glade/connect.glade ICAClient/gtk/glade/dialog.glade @@ -42,7 +45,6 @@ ICAClient/gtk/glade/flashdialogbox1.glad ICAClient/gtk/glade/main.glade ICAClient/gtk/glade/proxy.glade ICAClient/gtk/glade/zlc.glade -ICAClient/gtk/resource.gtkrc ICAClient/help/index.htm ICAClient/icons/alert.png ICAClient/icons/background.png @@ -126,19 +128,9 @@ ICAClient/lib/libavutil.so ICAClient/lib/libkcph.so ICAClient/lib/libkcpm.so ICAClient/lib/libswscale.so -ICAClient/libctxssl.so -ICAClient/libproxy.so ICAClient/nls/C -ICAClient/nls/de/LC_MESSAGES/flash.mo -ICAClient/nls/de/LC_MESSAGES/icaclient.mo ICAClient/nls/de/Npica ICAClient/nls/de/Npica.ad -ICAClient/nls/de/UTF-8/Wfcmgr -ICAClient/nls/de/UTF-8/XCapture -ICAClient/nls/de/UTF-8/XCapture.ad -ICAClient/nls/de/UTF-8/eula.txt -ICAClient/nls/de/UTF-8/pna.nls -ICAClient/nls/de/UTF-8/setupwfc.msg ICAClient/nls/de/Wfcmgr ICAClient/nls/de/XCapture ICAClient/nls/de/XCapture.ad @@ -151,15 +143,16 @@ ICAClient/nls/de/pna.nls ICAClient/nls/de/setupwfc.msg ICAClient/nls/de/utf8 ICAClient/nls/de/wfclient.ini -ICAClient/nls/en/LC_MESSAGES/icaclient.mo +ICAClient/nls/de/LC_MESSAGES/flash.mo +ICAClient/nls/de/LC_MESSAGES/icaclient.mo +ICAClient/nls/de/UTF-8/Wfcmgr +ICAClient/nls/de/UTF-8/XCapture +ICAClient/nls/de/UTF-8/XCapture.ad +ICAClient/nls/de/UTF-8/eula.txt +ICAClient/nls/de/UTF-8/pna.nls +ICAClient/nls/de/UTF-8/setupwfc.msg ICAClient/nls/en/Npica ICAClient/nls/en/Npica.ad -ICAClient/nls/en/UTF-8/Wfcmgr -ICAClient/nls/en/UTF-8/XCapture -ICAClient/nls/en/UTF-8/XCapture.ad -ICAClient/nls/en/UTF-8/eula.txt -ICAClient/nls/en/UTF-8/pna.nls -ICAClient/nls/en/UTF-8/setupwfc.msg ICAClient/nls/en/Wfcmgr ICAClient/nls/en/XCapture ICAClient/nls/en/XCapture.ad @@ -172,16 +165,15 @@ ICAClient/nls/en/pna.nls ICAClient/nls/en/setupwfc.msg ICAClient/nls/en/utf8 ICAClient/nls/en/wfclient.ini -ICAClient/nls/ja/LC_MESSAGES/flash.mo -ICAClient/nls/ja/LC_MESSAGES/icaclient.mo +ICAClient/nls/en/LC_MESSAGES/icaclient.mo +ICAClient/nls/en/UTF-8/Wfcmgr +ICAClient/nls/en/UTF-8/XCapture +ICAClient/nls/en/UTF-8/XCapture.ad +ICAClient/nls/en/UTF-8/eula.txt +ICAClient/nls/en/UTF-8/pna.nls +ICAClient/nls/en/UTF-8/setupwfc.msg ICAClient/nls/ja/Npica ICAClient/nls/ja/Npica.ad -ICAClient/nls/ja/UTF-8/Wfcmgr -ICAClient/nls/ja/UTF-8/XCapture -ICAClient/nls/ja/UTF-8/XCapture.ad -ICAClient/nls/ja/UTF-8/eula.txt -ICAClient/nls/ja/UTF-8/pna.nls -ICAClient/nls/ja/UTF-8/setupwfc.msg ICAClient/nls/ja/Wfcmgr ICAClient/nls/ja/XCapture ICAClient/nls/ja/XCapture.ad @@ -194,11 +186,24 @@ ICAClient/nls/ja/pna.nls ICAClient/nls/ja/setupwfc.msg ICAClient/nls/ja/utf8 ICAClient/nls/ja/wfclient.ini -ICAClient/npica.so +ICAClient/nls/ja/LC_MESSAGES/flash.mo +ICAClient/nls/ja/LC_MESSAGES/icaclient.mo +ICAClient/nls/ja/UTF-8/Wfcmgr +ICAClient/nls/ja/UTF-8/XCapture +ICAClient/nls/ja/UTF-8/XCapture.ad +ICAClient/nls/ja/UTF-8/eula.txt +ICAClient/nls/ja/UTF-8/pna.nls +ICAClient/nls/ja/UTF-8/setupwfc.msg ICAClient/pkginf/F.core.linuxx86 ICAClient/pkginf/Ver.core.linuxx86 ICAClient/pkginf/changeno.dat -ICAClient/setupwfc +ICAClient/usb/VDGUSB.DLL +ICAClient/usb/ctx_usb_isactive +ICAClient/usb/ctxusb +ICAClient/usb/ctxusbd +ICAClient/usb/ctxusbd.rc +ICAClient/usb/ica-usb.rules +ICAClient/usb/usb.conf ICAClient/util/DeleteCompleteFlashCache.sh ICAClient/util/echo_cmd ICAClient/util/gst_play.32 @@ -217,32 +222,31 @@ ICAClient/util/pnabrowse ICAClient/util/sunraymac.sh ICAClient/util/what ICAClient/util/xcapture -ICAClient/wfcmgr -ICAClient/wfica bin/wfcmgr bin/wfica etc/icalicense/clientlicense -@dirrm ICAClient/config/usertemplate -@dirrm ICAClient/config -@dirrm ICAClient/gtk/glade -@dirrm ICAClient/gtk -@dirrm ICAClient/help -@dirrm ICAClient/icons -@dirrm ICAClient/keyboard -@dirrm ICAClient/keystore/cacerts -@dirrm ICAClient/keystore -@dirrm ICAClient/lib -@dirrm ICAClient/nls/de/LC_MESSAGES -@dirrm ICAClient/nls/de/UTF-8 -@dirrm ICAClient/nls/de -@dirrm ICAClient/nls/en/LC_MESSAGES -@dirrm ICAClient/nls/en/UTF-8 -@dirrm ICAClient/nls/en -@dirrm ICAClient/nls/ja/LC_MESSAGES +@dirrm etc/icalicense +@dirrm ICAClient/util +@dirrm ICAClient/usb +@dirrm ICAClient/pkginf @dirrm ICAClient/nls/ja/UTF-8 +@dirrm ICAClient/nls/ja/LC_MESSAGES @dirrm ICAClient/nls/ja +@dirrm ICAClient/nls/en/UTF-8 +@dirrm ICAClient/nls/en/LC_MESSAGES +@dirrm ICAClient/nls/en +@dirrm ICAClient/nls/de/UTF-8 +@dirrm ICAClient/nls/de/LC_MESSAGES +@dirrm ICAClient/nls/de @dirrm ICAClient/nls -@dirrm ICAClient/pkginf -@dirrm ICAClient/util +@dirrm ICAClient/lib +@dirrm ICAClient/keystore/cacerts +@dirrm ICAClient/keystore +@dirrm ICAClient/keyboard +@dirrm ICAClient/icons +@dirrm ICAClient/help +@dirrm ICAClient/gtk/glade +@dirrm ICAClient/gtk +@dirrm ICAClient/config/usertemplate +@dirrm ICAClient/config @dirrm ICAClient -@dirrm etc/icalicense