Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/citrix_ica/Makefile,v
retrieving revision 1.52
diff -u -r1.52 Makefile
--- Makefile	19 Mar 2009 17:28:47 -0000	1.52
+++ Makefile	23 Jan 2010 03:55:23 -0000
@@ -35,6 +35,9 @@
 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)
@@ -76,13 +79,9 @@
 		${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
 # XXX: This is missing a "${BRANDELF} -t Linux <executables>".
 
 .if defined(ICA_CERTS)
Index: pkg-descr
===================================================================
RCS file: /home/ncvs/ports/net/citrix_ica/pkg-descr,v
retrieving revision 1.6
diff -u -r1.6 pkg-descr
--- pkg-descr	3 Jan 2008 20:22:58 -0000	1.6
+++ pkg-descr	23 Jan 2010 03:55:23 -0000
@@ -16,7 +16,6 @@
 If your Citrix server does not have one of the supplied root-certificates,
 you can copy the certificate to /usr/ports/distfiles and add the
 following line to your /etc/make.conf:
-
 	ICA_CERTS=mycert.crt
 
 It will then automatically be installed and removed with the normal
Index: files/wfcmgr
===================================================================
RCS file: files/wfcmgr
diff -N files/wfcmgr
--- files/wfcmgr	21 Sep 1998 21:30:24 -0000	1.1.1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,3 +0,0 @@
-#!/bin/sh
-export ICAROOT=DESTINATION
-exec $ICAROOT/wfcmgr
Index: files/wfcmgr.in
===================================================================
RCS file: files/wfcmgr.in
diff -N files/wfcmgr.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/wfcmgr.in	23 Jan 2010 03:55:23 -0000
@@ -0,0 +1,3 @@
+#!/bin/sh
+export ICAROOT=%%CDIR%%
+exec $ICAROOT/wfcmgr
Index: files/wfica
===================================================================
RCS file: files/wfica
diff -N files/wfica
--- files/wfica	9 Sep 2002 18:25:01 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,3 +0,0 @@
-#!/bin/sh
-export ICAROOT=DESTINATION
-exec $ICAROOT/wfica "$@"
Index: files/wfica.in
===================================================================
RCS file: files/wfica.in
diff -N files/wfica.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/wfica.in	23 Jan 2010 03:55:23 -0000
@@ -0,0 +1,3 @@
+#!/bin/sh
+export ICAROOT=%%CDIR%%
+exec $ICAROOT/wfica "$@"