5 files changed, 95 insertions, 58 deletions

diff --git a/net/citrix_ica/Makefile b/net/citrix_ica/Makefile
index 3a339341b145..e8504963d8c1 100644
--- a/net/citrix_ica/Makefile
+++ b/net/citrix_ica/Makefile
@@ -2,18 +2,17 @@
 # $FreeBSD$
 
 PORTNAME=	citrix_ica
-PORTVERSION=	13.3.0
-PORTREVISION=	2
+PORTVERSION=	13.4.0
 CATEGORIES=	net comms linux
 MASTER_SITES=	#
-DISTNAME=	linuxx86-${PORTVERSION}.344519
+DISTNAME=	linuxx86-${PORTVERSION}.10109380
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Citrix(R) Presentation Server(TM) client
 
 ONLY_FOR_ARCHS=	i386 amd64
-USES=		linux webplugin:linux
-USE_LINUX=	alsalib gtk2 openmotif
+USES=		fakeroot linux webplugin:linux
+USE_LINUX=	alsalib gtk2 libxml2 openmotif
 WEBPLUGIN_DIR=	${PREFIX}/ICAClient
 WEBPLUGIN_FILES=	npica.so
 RESTRICTED=	License prohibits redistribution
@@ -67,9 +66,9 @@ post-patch:
 		-e 's|^ClientAudio=On|ClientAudio=Off|' \
 		-e 's|^FlashV2=On|FlashV2=Off|' \
 			${WRKSRC}/linuxx86/linuxx86.cor/nls/*/module.ini
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${STAGEDIR}${PREFIX}|g' ${WRKSRC}/linuxx86/hinst
 
 do-install:
-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${STAGEDIR}${PREFIX}|g' ${WRKSRC}/linuxx86/hinst
 	@if (test -d "${CDIR}") ; \
 	then \
 		${ECHO} "-----------------------------------------------------------" ; \
@@ -80,7 +79,7 @@ do-install:
 		${ECHO} "-----------------------------------------------------------" ; \
 		${FALSE} ; \
 	fi
-	cd ${WRKSRC} && ${SH} -c './setupwfc'
+	cd ${WRKSRC} && ${FAKEROOT} ${SH} -c './setupwfc'
 	${INSTALL_SCRIPT} ${WRKDIR}/wfcmgr ${STAGEDIR}${PREFIX}/bin/wfcmgr
 	${INSTALL_SCRIPT} ${WRKDIR}/wfica ${STAGEDIR}${PREFIX}/bin/wfica
 # XXX: This is missing a "${BRANDELF} -t Linux <executables>".
diff --git a/net/citrix_ica/distinfo b/net/citrix_ica/distinfo
index d46b5cfb1cbe..23e010edd510 100644
--- a/net/citrix_ica/distinfo
+++ b/net/citrix_ica/distinfo
@@ -1,2 +1,3 @@
-SHA256 (linuxx86-13.3.0.344519.tar.gz) = df8d3c97344ac9d64a4af44879eadc0bfb5e2f9af8504511b042eba1d29a6f69
-SIZE (linuxx86-13.3.0.344519.tar.gz) = 18576528
+TIMESTAMP = 1484825458
+SHA256 (linuxx86-13.4.0.10109380.tar.gz) = f4405da2bdc577c4e6bd2201a5b27102adf580d52f51e4af153a6cec0b75f264
+SIZE (linuxx86-13.4.0.10109380.tar.gz) = 19270016
diff --git a/net/citrix_ica/files/patch-linuxx86_hinst b/net/citrix_ica/files/patch-linuxx86_hinst
index 03a93893d6cb..0cf74f3398e3 100644
--- a/net/citrix_ica/files/patch-linuxx86_hinst
+++ b/net/citrix_ica/files/patch-linuxx86_hinst
@@ -1,4 +1,4 @@
---- linuxx86/hinst.orig	2015-06-26 11:30:10 UTC
+--- linuxx86/hinst.orig	2016-08-19 13:26:47 UTC
 +++ linuxx86/hinst
 @@ -1,4 +1,7 @@
  #!/bin/sh
@@ -17,7 +17,7 @@
  
  #  Default CDROM mount point
  DefaultCDSourceDir=/cdrom
-@@ -1460,7 +1463,7 @@ REQUIRE_LICENSE=
+@@ -1481,7 +1478,7 @@ REQUIRE_LICENSE=
  set_require_ICA_license()
  {
      REQUIRE_LICENSE=
@@ -26,27 +26,27 @@
      then
  	TRY1=`"$ECHO_CMD" -l`
  	sleep 1
-@@ -1483,14 +1486,14 @@ set_license()
+@@ -1504,14 +1501,14 @@ set_license()
  	# a license file.
  
  	if [ -n "$SU_INSTALL" ] ; then
 -	    create_dir /etc/icalicense
-+            create_dir %%PREFIX%%/etc/icalicense
++	    create_dir %%PREFIX%%/etc/icalicense
  
 -	    if [ ! -f /etc/icalicense/clientlicense ]
-+            if [ ! -f %%PREFIX%%/etc/icalicense/clientlicense ]
++	    if [ ! -f %%PREFIX%%/etc/icalicense/clientlicense ]
  	    then
 -		    "$ECHO_CMD" -l >/etc/icalicense/clientlicense
 +		    "$ECHO_CMD" -l > %%PREFIX%%/etc/icalicense/clientlicense
  	    fi
 -	    chmod 444 /etc/icalicense/clientlicense
 -	    chmod 555 /etc/icalicense
-+            chmod 444 %%PREFIX%%/etc/icalicense/clientlicense
-+            chmod 555 %%PREFIX%%/etc/icalicense
++	    chmod 444 %%PREFIX%%/etc/icalicense/clientlicense
++	    chmod 555 %%PREFIX%%/etc/icalicense
  	fi
  }
  ###############################################################################
-@@ -1533,7 +1536,7 @@ install_ICA_client()
+@@ -1554,7 +1551,7 @@ install_ICA_client()
  
  	echo_no_nl "$instica4"
  
@@ -55,7 +55,7 @@
  	if [ "$ANSWER" != "$INSTALLER_YES" ]
  	then
  		"$ECHO_CMD" $instica5
-@@ -1557,9 +1560,8 @@ install_ICA_client()
+@@ -1578,9 +1575,8 @@ install_ICA_client()
  
  		if [ "$PORT" != "uclibc" ]
  		then 
@@ -66,7 +66,7 @@
  	else
  	   COR_SELECTED=false
  	fi
-@@ -1774,7 +1776,7 @@ setCDSourceDir()
+@@ -1795,7 +1791,7 @@ setCDSourceDir()
  	while [ "$got_directory" = "false" ]
  	do
  		echo_no_nl "$dirutil1a $ICAInstDir] $dirutil1b"
@@ -75,7 +75,7 @@
  		if [ "x$newCDSourceDir" != "x" ]
  		then
  			CDSourceDir="$newCDSourceDir"
-@@ -1846,7 +1848,7 @@ setICAInstDir()
+@@ -1867,7 +1863,7 @@ setICAInstDir()
  	while [ "$got_directory" = "false" ]
  	do
  		echo_no_nl "$dirutil4a $ICAInstDir] $dirutil4b"
@@ -84,7 +84,7 @@
  		if [ "`echo x$newICAInstDir | tolower`" = "x$INSTALLER_QUIT" ]
  		then
  			FAIL_MSG=$dirutil13
-@@ -2436,7 +2438,7 @@ install_packages(){
+@@ -2457,7 +2453,7 @@ install_packages(){
  	then
  		:
  	else
@@ -93,7 +93,7 @@
  		return 
  	fi
  
-@@ -2510,7 +2512,7 @@ install_packages(){
+@@ -2531,7 +2527,7 @@ install_packages(){
  		fi
  	fi
  
@@ -102,7 +102,7 @@
  }
  
  #!/bin/sh
-@@ -2651,26 +2653,18 @@ esac
+@@ -2672,26 +2668,18 @@ esac
  
  netscape_integrate()
  {
@@ -133,7 +133,7 @@
  	user_prompt "$integrate_netscape2"
   	getyesno $INSTALLER_NO
  	if [ "$ANSWER" = "$INSTALLER_YES" ]
-@@ -2679,7 +2673,8 @@ netscape_integrate()
+@@ -2700,7 +2688,8 @@ netscape_integrate()
  	else
    		user_echo $integrate_netscape6
  	fi
@@ -143,7 +143,7 @@
    fi
  
    # Create utility script files in install root.
-@@ -4403,8 +4398,8 @@ main_install_menu(){
+@@ -4424,8 +4413,8 @@ main_install_menu(){
  		    "$ECHO_CMD" $menus5
  		    return 0
  		fi
@@ -154,7 +154,7 @@
  			#
  			# Get the Function the user wants to perform
  			#
-@@ -4418,7 +4413,7 @@ main_install_menu(){
+@@ -4439,7 +4428,7 @@ main_install_menu(){
  			fi
  			echo_no_nl "$menus2 1-$menuItems [$keyDefault]: "
  			
@@ -163,7 +163,7 @@
  
  			if test "x$keynum" = "x"
  			then 
-@@ -4483,7 +4478,7 @@ main_install_menu(){
+@@ -4504,7 +4493,7 @@ main_install_menu(){
  				# After any action make exit the default
  				keyDefault=3
  			fi
diff --git a/net/citrix_ica/files/patch-setupwfc b/net/citrix_ica/files/patch-setupwfc
index ae489131a8b8..903220b51011 100644
--- a/net/citrix_ica/files/patch-setupwfc
+++ b/net/citrix_ica/files/patch-setupwfc
@@ -1,6 +1,6 @@
---- setupwfc.orig	2015-06-26 11:30:02 UTC
+--- setupwfc.orig	2016-08-19 13:26:37 UTC
 +++ setupwfc
-@@ -526,6 +526,12 @@ get_OS(){
+@@ -547,6 +547,12 @@ get_OS(){
  		PLATFORM=hp
  		DISP_PLATFORM="Hewlett-Packard (HP-UX)"
  		;;
diff --git a/net/citrix_ica/pkg-plist b/net/citrix_ica/pkg-plist
index 1a9a9a00ebd6..b8c36eec5a45 100644
--- a/net/citrix_ica/pkg-plist
+++ b/net/citrix_ica/pkg-plist
@@ -1,14 +1,14 @@
 %%WEBPLUGIN_DIR%%/ADPCM.DLL
 %%WEBPLUGIN_DIR%%/AUDALSA.DLL
 %%WEBPLUGIN_DIR%%/AUDOSS.DLL
-%%WEBPLUGIN_DIR%%/AuthManagerDaemon
+@(,,00555) %%WEBPLUGIN_DIR%%/AuthManagerDaemon
 %%WEBPLUGIN_DIR%%/CHARICONV.DLL
-%%WEBPLUGIN_DIR%%/FlashContainer.bin
+@(,,00555) %%WEBPLUGIN_DIR%%/FlashContainer.bin
 %%WEBPLUGIN_DIR%%/PDCRYPT1.DLL
 %%WEBPLUGIN_DIR%%/PDCRYPT2.DLL
-%%WEBPLUGIN_DIR%%/PrimaryAuthManager
+@(,,00555) %%WEBPLUGIN_DIR%%/PrimaryAuthManager
 %%WEBPLUGIN_DIR%%/SPEEX.DLL
-%%WEBPLUGIN_DIR%%/ServiceRecord
+@(,,00555) %%WEBPLUGIN_DIR%%/ServiceRecord
 %%WEBPLUGIN_DIR%%/VDCAM.DLL
 %%WEBPLUGIN_DIR%%/VDFLASH2.DLL
 %%WEBPLUGIN_DIR%%/VDGSTCAM.DLL
@@ -25,7 +25,7 @@
 %%WEBPLUGIN_DIR%%/config/Trusted_Region.ini
 %%WEBPLUGIN_DIR%%/config/Unknown_Region.ini
 %%WEBPLUGIN_DIR%%/config/Untrusted_Region.ini
-%%WEBPLUGIN_DIR%%/config/appsrv.ini
+%%WEBPLUGIN_DIR%%/config/appsrv.template
 %%WEBPLUGIN_DIR%%/config/canonicalization.ini
 %%WEBPLUGIN_DIR%%/config/gstpresets/GstX264Enc.prs
 %%WEBPLUGIN_DIR%%/config/module.ini
@@ -35,8 +35,9 @@
 %%WEBPLUGIN_DIR%%/config/usertemplate/Trusted_Region.ini
 %%WEBPLUGIN_DIR%%/config/usertemplate/Unknown_Region.ini
 %%WEBPLUGIN_DIR%%/config/usertemplate/Untrusted_Region.ini
-%%WEBPLUGIN_DIR%%/config/wfclient.ini
+%%WEBPLUGIN_DIR%%/config/wfclient.template
 %%WEBPLUGIN_DIR%%/desktop/Citrix-mime_types.xml
+%%WEBPLUGIN_DIR%%/eula.txt
 %%WEBPLUGIN_DIR%%/gtk/glade/about.glade
 %%WEBPLUGIN_DIR%%/gtk/glade/aboutAdditional.glade
 %%WEBPLUGIN_DIR%%/gtk/glade/authdialogbox.glade
@@ -52,18 +53,41 @@
 %%WEBPLUGIN_DIR%%/gtk/glade/zlc.glade
 %%WEBPLUGIN_DIR%%/gtk/resource.gtkrc
 %%WEBPLUGIN_DIR%%/help/index.htm
+%%WEBPLUGIN_DIR%%/icons/000_CtrlAltDelHover_h32bit_49x45.png
+%%WEBPLUGIN_DIR%%/icons/000_CtrlAltDel_h32bit_49x45.png
+%%WEBPLUGIN_DIR%%/icons/000_DisconnectHover_h32bit_49x45.png
+%%WEBPLUGIN_DIR%%/icons/000_Disconnect_h32bit_49x45.png
+%%WEBPLUGIN_DIR%%/icons/000_FullScreenHover_h32bit_49x45.png
+%%WEBPLUGIN_DIR%%/icons/000_FullScreen_h32bit_49x45.png
 %%WEBPLUGIN_DIR%%/icons/000_ReceiverWordmark_h32bit_158x19.png
 %%WEBPLUGIN_DIR%%/icons/000_Receiver_64.png
+%%WEBPLUGIN_DIR%%/icons/000_RestoreHover_h32bit_49x45.png
+%%WEBPLUGIN_DIR%%/icons/000_Restore_h32bit_49x45.png
 %%WEBPLUGIN_DIR%%/icons/000_Security_16.png
 %%WEBPLUGIN_DIR%%/icons/000_Security_32.png
 %%WEBPLUGIN_DIR%%/icons/000_info_h32bit_16.png
 %%WEBPLUGIN_DIR%%/icons/000_info_h32bit_32.png
 %%WEBPLUGIN_DIR%%/icons/001_Alert_h32bit_16.png
 %%WEBPLUGIN_DIR%%/icons/001_Alert_h32bit_32.png
+%%WEBPLUGIN_DIR%%/icons/025_GrabBarDown90%_h32bit_188x16whiteblocks.png
+%%WEBPLUGIN_DIR%%/icons/025_GrabBarUp90%_h32bit_188x16whiteblocks.png
 %%WEBPLUGIN_DIR%%/icons/ActivityIndicatorOnWht_16x16.gif
+%%WEBPLUGIN_DIR%%/icons/DV_BottomEdge_90x65.png
+%%WEBPLUGIN_DIR%%/icons/DV_ButtonBackground_89x58.png
+%%WEBPLUGIN_DIR%%/icons/DV_LeftCorner_7x7.png
+%%WEBPLUGIN_DIR%%/icons/DV_LeftEdge_3x58.png
+%%WEBPLUGIN_DIR%%/icons/DV_RightCorner_7x7.png
+%%WEBPLUGIN_DIR%%/icons/DV_RightEdge_3x58.png
+%%WEBPLUGIN_DIR%%/icons/DV_Spacer_1x58.png
 %%WEBPLUGIN_DIR%%/icons/ReceiverNativeInstallBackground_h32bit_497x314.png
 %%WEBPLUGIN_DIR%%/icons/Tick_h32bit_16.png
 %%WEBPLUGIN_DIR%%/icons/Tick_h32bit_32.png
+%%WEBPLUGIN_DIR%%/icons/Windows_Receiver_Home-Icon-Hover_49x45.png
+%%WEBPLUGIN_DIR%%/icons/Windows_Receiver_Home-Icon_49x45.png
+%%WEBPLUGIN_DIR%%/icons/Windows_Receiver_LogOff-Icon-Hover_49x45.png
+%%WEBPLUGIN_DIR%%/icons/Windows_Receiver_LogOff-Icon_49x45.png
+%%WEBPLUGIN_DIR%%/icons/Windows_Receiver_Switch-Icon-Hover_49x45.png
+%%WEBPLUGIN_DIR%%/icons/Windows_Receiver_Switch-Icon_49x45.png
 %%WEBPLUGIN_DIR%%/icons/alert.png
 %%WEBPLUGIN_DIR%%/icons/background.png
 %%WEBPLUGIN_DIR%%/icons/disconnect.png
@@ -138,22 +162,29 @@
 %%WEBPLUGIN_DIR%%/keyboard/trimodal.kbd
 %%WEBPLUGIN_DIR%%/keystore/cacerts/1ec4d31a.0
 %%WEBPLUGIN_DIR%%/keystore/cacerts/2c543cd1.0
+%%WEBPLUGIN_DIR%%/keystore/cacerts/3513523f.0
+%%WEBPLUGIN_DIR%%/keystore/cacerts/399e7759.0
 %%WEBPLUGIN_DIR%%/keystore/cacerts/3ad48a91.0
 %%WEBPLUGIN_DIR%%/keystore/cacerts/415660c1.0
+%%WEBPLUGIN_DIR%%/keystore/cacerts/4bcd7fc4.0
 %%WEBPLUGIN_DIR%%/keystore/cacerts/4d654d1d.0
 %%WEBPLUGIN_DIR%%/keystore/cacerts/653b494a.0
 %%WEBPLUGIN_DIR%%/keystore/cacerts/6faac4e3.0
 %%WEBPLUGIN_DIR%%/keystore/cacerts/72fa7371.0
 %%WEBPLUGIN_DIR%%/keystore/cacerts/7651b327.0
 %%WEBPLUGIN_DIR%%/keystore/cacerts/7999be0d.0
+%%WEBPLUGIN_DIR%%/keystore/cacerts/85cf5865.0
 %%WEBPLUGIN_DIR%%/keystore/cacerts/BTCTRoot.pem
 %%WEBPLUGIN_DIR%%/keystore/cacerts/Class3PCA_G2_v2.pem
 %%WEBPLUGIN_DIR%%/keystore/cacerts/Class4PCA_G2_v2.pem
+%%WEBPLUGIN_DIR%%/keystore/cacerts/DigiCertGlobalRootCA.pem
+%%WEBPLUGIN_DIR%%/keystore/cacerts/DigiCertSHA2SecureServerCA.pem
 %%WEBPLUGIN_DIR%%/keystore/cacerts/GTECTGlobalRoot.pem
 %%WEBPLUGIN_DIR%%/keystore/cacerts/GeoTrust_Global_CA.pem
 %%WEBPLUGIN_DIR%%/keystore/cacerts/Pcs3ss_v4.pem
 %%WEBPLUGIN_DIR%%/keystore/cacerts/c692a373.0
 %%WEBPLUGIN_DIR%%/keystore/cacerts/ed049835.0
+%%WEBPLUGIN_DIR%%/keystore/intcerts/DigiCertSHA2SecureServerCA.pem
 %%WEBPLUGIN_DIR%%/lib/UIDialogLib.so
 %%WEBPLUGIN_DIR%%/lib/ctxh264_fb.so
 %%WEBPLUGIN_DIR%%/lib/libAMSDK.so
@@ -165,6 +196,7 @@
 %%WEBPLUGIN_DIR%%/nls/C
 %%WEBPLUGIN_DIR%%/nls/de.UTF-8/XCapture
 %%WEBPLUGIN_DIR%%/nls/de.UTF-8/XCapture.ad
+%%WEBPLUGIN_DIR%%/nls/de.UTF-8/eula.txt
 %%WEBPLUGIN_DIR%%/nls/de.UTF-8/pna.nls
 %%WEBPLUGIN_DIR%%/nls/de.UTF-8/setupwfc.msg
 %%WEBPLUGIN_DIR%%/nls/de.UTF8
@@ -176,15 +208,17 @@
 %%WEBPLUGIN_DIR%%/nls/de/LC_MESSAGES/servicerecord.mo
 %%WEBPLUGIN_DIR%%/nls/de/XCapture
 %%WEBPLUGIN_DIR%%/nls/de/XCapture.ad
-%%WEBPLUGIN_DIR%%/nls/de/appsrv.ini
+%%WEBPLUGIN_DIR%%/nls/de/appsrv.template
 %%WEBPLUGIN_DIR%%/nls/de/hinst.msg
 %%WEBPLUGIN_DIR%%/nls/de/index.htm
 %%WEBPLUGIN_DIR%%/nls/de/module.ini
+%%WEBPLUGIN_DIR%%/nls/de/module.ini.bak
 %%WEBPLUGIN_DIR%%/nls/de/pna.nls
 %%WEBPLUGIN_DIR%%/nls/de/setupwfc.msg
-%%WEBPLUGIN_DIR%%/nls/de/wfclient.ini
+%%WEBPLUGIN_DIR%%/nls/de/wfclient.template
 %%WEBPLUGIN_DIR%%/nls/en.UTF-8/XCapture
 %%WEBPLUGIN_DIR%%/nls/en.UTF-8/XCapture.ad
+%%WEBPLUGIN_DIR%%/nls/en.UTF-8/eula.txt
 %%WEBPLUGIN_DIR%%/nls/en.UTF-8/pna.nls
 %%WEBPLUGIN_DIR%%/nls/en.UTF-8/setupwfc.msg
 %%WEBPLUGIN_DIR%%/nls/en.UTF8
@@ -195,15 +229,17 @@
 %%WEBPLUGIN_DIR%%/nls/en/LC_MESSAGES/servicerecord.mo
 %%WEBPLUGIN_DIR%%/nls/en/XCapture
 %%WEBPLUGIN_DIR%%/nls/en/XCapture.ad
-%%WEBPLUGIN_DIR%%/nls/en/appsrv.ini
+%%WEBPLUGIN_DIR%%/nls/en/appsrv.template
 %%WEBPLUGIN_DIR%%/nls/en/hinst.msg
 %%WEBPLUGIN_DIR%%/nls/en/index.htm
 %%WEBPLUGIN_DIR%%/nls/en/module.ini
+%%WEBPLUGIN_DIR%%/nls/en/module.ini.bak
 %%WEBPLUGIN_DIR%%/nls/en/pna.nls
 %%WEBPLUGIN_DIR%%/nls/en/setupwfc.msg
-%%WEBPLUGIN_DIR%%/nls/en/wfclient.ini
+%%WEBPLUGIN_DIR%%/nls/en/wfclient.template
 %%WEBPLUGIN_DIR%%/nls/es.UTF-8/XCapture
 %%WEBPLUGIN_DIR%%/nls/es.UTF-8/XCapture.ad
+%%WEBPLUGIN_DIR%%/nls/es.UTF-8/eula.txt
 %%WEBPLUGIN_DIR%%/nls/es.UTF-8/pna.nls
 %%WEBPLUGIN_DIR%%/nls/es.UTF-8/setupwfc.msg
 %%WEBPLUGIN_DIR%%/nls/es.UTF8
@@ -214,15 +250,17 @@
 %%WEBPLUGIN_DIR%%/nls/es/LC_MESSAGES/servicerecord.mo
 %%WEBPLUGIN_DIR%%/nls/es/XCapture
 %%WEBPLUGIN_DIR%%/nls/es/XCapture.ad
-%%WEBPLUGIN_DIR%%/nls/es/appsrv.ini
+%%WEBPLUGIN_DIR%%/nls/es/appsrv.template
 %%WEBPLUGIN_DIR%%/nls/es/hinst.msg
 %%WEBPLUGIN_DIR%%/nls/es/index.htm
 %%WEBPLUGIN_DIR%%/nls/es/module.ini
+%%WEBPLUGIN_DIR%%/nls/es/module.ini.bak
 %%WEBPLUGIN_DIR%%/nls/es/pna.nls
 %%WEBPLUGIN_DIR%%/nls/es/setupwfc.msg
-%%WEBPLUGIN_DIR%%/nls/es/wfclient.ini
+%%WEBPLUGIN_DIR%%/nls/es/wfclient.template
 %%WEBPLUGIN_DIR%%/nls/fr.UTF-8/XCapture
 %%WEBPLUGIN_DIR%%/nls/fr.UTF-8/XCapture.ad
+%%WEBPLUGIN_DIR%%/nls/fr.UTF-8/eula.txt
 %%WEBPLUGIN_DIR%%/nls/fr.UTF-8/pna.nls
 %%WEBPLUGIN_DIR%%/nls/fr.UTF-8/setupwfc.msg
 %%WEBPLUGIN_DIR%%/nls/fr.UTF8
@@ -233,15 +271,17 @@
 %%WEBPLUGIN_DIR%%/nls/fr/LC_MESSAGES/servicerecord.mo
 %%WEBPLUGIN_DIR%%/nls/fr/XCapture
 %%WEBPLUGIN_DIR%%/nls/fr/XCapture.ad
-%%WEBPLUGIN_DIR%%/nls/fr/appsrv.ini
+%%WEBPLUGIN_DIR%%/nls/fr/appsrv.template
 %%WEBPLUGIN_DIR%%/nls/fr/hinst.msg
 %%WEBPLUGIN_DIR%%/nls/fr/index.htm
 %%WEBPLUGIN_DIR%%/nls/fr/module.ini
+%%WEBPLUGIN_DIR%%/nls/fr/module.ini.bak
 %%WEBPLUGIN_DIR%%/nls/fr/pna.nls
 %%WEBPLUGIN_DIR%%/nls/fr/setupwfc.msg
-%%WEBPLUGIN_DIR%%/nls/fr/wfclient.ini
+%%WEBPLUGIN_DIR%%/nls/fr/wfclient.template
 %%WEBPLUGIN_DIR%%/nls/ja.UTF-8/XCapture
 %%WEBPLUGIN_DIR%%/nls/ja.UTF-8/XCapture.ad
+%%WEBPLUGIN_DIR%%/nls/ja.UTF-8/eula.txt
 %%WEBPLUGIN_DIR%%/nls/ja.UTF-8/pna.nls
 %%WEBPLUGIN_DIR%%/nls/ja.UTF-8/setupwfc.msg
 %%WEBPLUGIN_DIR%%/nls/ja.UTF8
@@ -253,15 +293,17 @@
 %%WEBPLUGIN_DIR%%/nls/ja/LC_MESSAGES/servicerecord.mo
 %%WEBPLUGIN_DIR%%/nls/ja/XCapture
 %%WEBPLUGIN_DIR%%/nls/ja/XCapture.ad
-%%WEBPLUGIN_DIR%%/nls/ja/appsrv.ini
+%%WEBPLUGIN_DIR%%/nls/ja/appsrv.template
 %%WEBPLUGIN_DIR%%/nls/ja/hinst.msg
 %%WEBPLUGIN_DIR%%/nls/ja/index.htm
 %%WEBPLUGIN_DIR%%/nls/ja/module.ini
+%%WEBPLUGIN_DIR%%/nls/ja/module.ini.bak
 %%WEBPLUGIN_DIR%%/nls/ja/pna.nls
 %%WEBPLUGIN_DIR%%/nls/ja/setupwfc.msg
-%%WEBPLUGIN_DIR%%/nls/ja/wfclient.ini
+%%WEBPLUGIN_DIR%%/nls/ja/wfclient.template
 %%WEBPLUGIN_DIR%%/nls/ru.UTF-8/XCapture
 %%WEBPLUGIN_DIR%%/nls/ru.UTF-8/XCapture.ad
+%%WEBPLUGIN_DIR%%/nls/ru.UTF-8/eula.txt
 %%WEBPLUGIN_DIR%%/nls/ru.UTF-8/pna.nls
 %%WEBPLUGIN_DIR%%/nls/ru.UTF-8/setupwfc.msg
 %%WEBPLUGIN_DIR%%/nls/ru/LC_MESSAGES/AuthManager.mo
@@ -270,19 +312,21 @@
 %%WEBPLUGIN_DIR%%/nls/ru/LC_MESSAGES/servicerecord.mo
 %%WEBPLUGIN_DIR%%/nls/ru/XCapture
 %%WEBPLUGIN_DIR%%/nls/ru/XCapture.ad
-%%WEBPLUGIN_DIR%%/nls/ru/appsrv.ini
+%%WEBPLUGIN_DIR%%/nls/ru/appsrv.template
 %%WEBPLUGIN_DIR%%/nls/ru/hinst.msg
 %%WEBPLUGIN_DIR%%/nls/ru/index.htm
 %%WEBPLUGIN_DIR%%/nls/ru/module.ini
+%%WEBPLUGIN_DIR%%/nls/ru/module.ini.bak
 %%WEBPLUGIN_DIR%%/nls/ru/pna.nls
 %%WEBPLUGIN_DIR%%/nls/ru/setupwfc.msg
-%%WEBPLUGIN_DIR%%/nls/ru/wfclient.ini
+%%WEBPLUGIN_DIR%%/nls/ru/wfclient.template
 %%WEBPLUGIN_DIR%%/nls/zh_CN
 %%WEBPLUGIN_DIR%%/nls/zh_CN.UTF-8
 %%WEBPLUGIN_DIR%%/nls/zh_CN.UTF8
 %%WEBPLUGIN_DIR%%/nls/zh_CN.utf8
 %%WEBPLUGIN_DIR%%/nls/zh_HANS.UTF-8/XCapture
 %%WEBPLUGIN_DIR%%/nls/zh_HANS.UTF-8/XCapture.ad
+%%WEBPLUGIN_DIR%%/nls/zh_HANS.UTF-8/eula.txt
 %%WEBPLUGIN_DIR%%/nls/zh_HANS.UTF-8/pna.nls
 %%WEBPLUGIN_DIR%%/nls/zh_HANS.UTF-8/setupwfc.msg
 %%WEBPLUGIN_DIR%%/nls/zh_HANS/LC_MESSAGES/AuthManager.mo
@@ -291,13 +335,14 @@
 %%WEBPLUGIN_DIR%%/nls/zh_HANS/LC_MESSAGES/servicerecord.mo
 %%WEBPLUGIN_DIR%%/nls/zh_HANS/XCapture
 %%WEBPLUGIN_DIR%%/nls/zh_HANS/XCapture.ad
-%%WEBPLUGIN_DIR%%/nls/zh_HANS/appsrv.ini
+%%WEBPLUGIN_DIR%%/nls/zh_HANS/appsrv.template
 %%WEBPLUGIN_DIR%%/nls/zh_HANS/hinst.msg
 %%WEBPLUGIN_DIR%%/nls/zh_HANS/index.htm
 %%WEBPLUGIN_DIR%%/nls/zh_HANS/module.ini
+%%WEBPLUGIN_DIR%%/nls/zh_HANS/module.ini.bak
 %%WEBPLUGIN_DIR%%/nls/zh_HANS/pna.nls
 %%WEBPLUGIN_DIR%%/nls/zh_HANS/setupwfc.msg
-%%WEBPLUGIN_DIR%%/nls/zh_HANS/wfclient.ini
+%%WEBPLUGIN_DIR%%/nls/zh_HANS/wfclient.template
 %%WEBPLUGIN_DIR%%/nls/zh_SN
 %%WEBPLUGIN_DIR%%/nls/zh_SN.UTF-8
 %%WEBPLUGIN_DIR%%/nls/zh_SN.UTF8
@@ -306,7 +351,7 @@
 %%WEBPLUGIN_DIR%%/pkginf/F.core.linuxx86
 %%WEBPLUGIN_DIR%%/pkginf/Ver.core.linuxx86
 %%WEBPLUGIN_DIR%%/pkginf/changeno.dat
-%%WEBPLUGIN_DIR%%/selfservice
+@(,,00555) %%WEBPLUGIN_DIR%%/selfservice
 %%WEBPLUGIN_DIR%%/setupwfc
 %%WEBPLUGIN_DIR%%/site/contrib/custom.script.js
 %%WEBPLUGIN_DIR%%/site/contrib/custom.style.css
@@ -457,14 +502,6 @@
 %%WEBPLUGIN_DIR%%/usb/ctxusbd.rc
 %%WEBPLUGIN_DIR%%/usb/ica-usb.rules
 %%WEBPLUGIN_DIR%%/usb/usb.conf
-%%WEBPLUGIN_DIR%%/eula.txt
-%%WEBPLUGIN_DIR%%/nls/de.UTF-8/eula.txt
-%%WEBPLUGIN_DIR%%/nls/en.UTF-8/eula.txt
-%%WEBPLUGIN_DIR%%/nls/es.UTF-8/eula.txt
-%%WEBPLUGIN_DIR%%/nls/fr.UTF-8/eula.txt
-%%WEBPLUGIN_DIR%%/nls/ja.UTF-8/eula.txt
-%%WEBPLUGIN_DIR%%/nls/ru.UTF-8/eula.txt
-%%WEBPLUGIN_DIR%%/nls/zh_HANS.UTF-8/eula.txt
 @(,,00555) %%WEBPLUGIN_DIR%%/util/DeleteCompleteFlashCache.sh
 @(,,00555) %%WEBPLUGIN_DIR%%/util/configmgr
 @(,,00555) %%WEBPLUGIN_DIR%%/util/conncenter