aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authortabthorpe <tabthorpe@FreeBSD.org>2010-01-25 23:11:20 +0800
committertabthorpe <tabthorpe@FreeBSD.org>2010-01-25 23:11:20 +0800
commit3357204e474852a4d1f402eec0aa61d725b29182 (patch)
tree4f3dee9304e48304158d8f1eb5425dd90716da0c /net
parentd8d06f62e55d5b8e2ea41304c9f81102ab444076 (diff)
downloadfreebsd-ports-gnome-3357204e474852a4d1f402eec0aa61d725b29182.tar.gz
freebsd-ports-gnome-3357204e474852a4d1f402eec0aa61d725b29182.tar.zst
freebsd-ports-gnome-3357204e474852a4d1f402eec0aa61d725b29182.zip
- Use SUB_FILES/LIST in lieu of sed
- No PORTREVISION bump needed PR: ports/143103 Submitted by: Sevan Janiyan <venture37 geeklan.co.uk>
Diffstat (limited to 'net')
-rw-r--r--net/citrix_ica/Makefile11
-rw-r--r--net/citrix_ica/files/wfcmgr.in (renamed from net/citrix_ica/files/wfcmgr)2
-rw-r--r--net/citrix_ica/files/wfica.in (renamed from net/citrix_ica/files/wfica)2
3 files changed, 7 insertions, 8 deletions
diff --git a/net/citrix_ica/Makefile b/net/citrix_ica/Makefile
index 77a2d5fb3bae..68a4f15b4068 100644
--- a/net/citrix_ica/Makefile
+++ b/net/citrix_ica/Makefile
@@ -35,6 +35,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)
@@ -76,13 +79,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
# XXX: This is missing a "${BRANDELF} -t Linux <executables>".
.if defined(ICA_CERTS)
diff --git a/net/citrix_ica/files/wfcmgr b/net/citrix_ica/files/wfcmgr.in
index 70248171d687..6c28ad601484 100644
--- a/net/citrix_ica/files/wfcmgr
+++ b/net/citrix_ica/files/wfcmgr.in
@@ -1,3 +1,3 @@
#!/bin/sh
-export ICAROOT=DESTINATION
+export ICAROOT=%%CDIR%%
exec $ICAROOT/wfcmgr
diff --git a/net/citrix_ica/files/wfica b/net/citrix_ica/files/wfica.in
index e0279ba0d816..d120da57817a 100644
--- a/net/citrix_ica/files/wfica
+++ b/net/citrix_ica/files/wfica.in
@@ -1,3 +1,3 @@
#!/bin/sh
-export ICAROOT=DESTINATION
+export ICAROOT=%%CDIR%%
exec $ICAROOT/wfica "$@"