3 files changed, 7 insertions, 8 deletions
diff --git a/japanese/citrix_xenapp/Makefile b/japanese/citrix_xenapp/Makefile
index ee7970309456..d98547db3f14 100644
--- a/japanese/citrix_xenapp/Makefile
+++ b/japanese/citrix_xenapp/Makefile
@@ -34,6 +34,9 @@ PLIST_SUB+=	HAVE_ICA_CERTS="" ICA_CERTS="${ICA_CERTS}" CERTDIR="${CERTDIR}"
 PLIST_SUB+=	HAVE_ICA_CERTS="@comment "
 .endif
 
+SUB_FILES=	wfcmgr wfica
+SUB_LIST=	CDIR=${CDIR}
+
 .include <bsd.port.pre.mk>
 
 .if defined(BATCH) || defined(PACKAGE_BUILDING)
@@ -78,13 +81,9 @@ do-install:
 		${ECHO} "-----------------------------------------------------------" ; \
 		${FALSE} ; \
 	fi
-	${SED} s%DESTINATION%${CDIR}% < ${FILESDIR}/wfcmgr \
-		> ${WRKSRC}/wfcmgr.x
-	${SED} s%DESTINATION%${CDIR}% < ${FILESDIR}/wfica \
-		> ${WRKSRC}/wfica.x
 	cd ${WRKSRC} && ${SH} -c './setupwfc'
-	${INSTALL_SCRIPT} ${WRKSRC}/wfcmgr.x ${PREFIX}/bin/wfcmgr
-	${INSTALL_SCRIPT} ${WRKSRC}/wfica.x ${PREFIX}/bin/wfica
+	${INSTALL_SCRIPT} ${WRKDIR}/wfcmgr ${PREFIX}/bin/wfcmgr
+	${INSTALL_SCRIPT} ${WRKDIR}/wfica ${PREFIX}/bin/wfica
 	${MKDIR} ${LINUXBASE}/dev
 # XXX: This is missing a "${BRANDELF} -t Linux <executables>".
 
diff --git a/japanese/citrix_xenapp/files/wfcmgr b/japanese/citrix_xenapp/files/wfcmgr.in
index 70248171d687..6c28ad601484 100644
--- a/japanese/citrix_xenapp/files/wfcmgr
+++ b/japanese/citrix_xenapp/files/wfcmgr.in
@@ -1,3 +1,3 @@
 #!/bin/sh
-export ICAROOT=DESTINATION
+export ICAROOT=%%CDIR%%
 exec $ICAROOT/wfcmgr
diff --git a/japanese/citrix_xenapp/files/wfica b/japanese/citrix_xenapp/files/wfica.in
index e0279ba0d816..d120da57817a 100644
--- a/japanese/citrix_xenapp/files/wfica
+++ b/japanese/citrix_xenapp/files/wfica.in
@@ -1,3 +1,3 @@
 #!/bin/sh
-export ICAROOT=DESTINATION
+export ICAROOT=%%CDIR%%
 exec $ICAROOT/wfica "$@"