diff options
| author | mbr <mbr@FreeBSD.org> | 2004-09-07 05:22:21 +0800 |
|---|---|---|
| committer | mbr <mbr@FreeBSD.org> | 2004-09-07 05:22:21 +0800 |
| commit | 7e0dec65869403e414e7b55331edbc3e2bd1c531 (patch) | |
| tree | 6fa6d9f0de7470f2ac1b553c4ec1ee84d872588f /net | |
| parent | 16edde930674bb74ea4cd0c8d5c320dd7ceeeb5a (diff) | |
| download | freebsd-ports-gnome-7e0dec65869403e414e7b55331edbc3e2bd1c531.tar.gz freebsd-ports-gnome-7e0dec65869403e414e7b55331edbc3e2bd1c531.tar.zst freebsd-ports-gnome-7e0dec65869403e414e7b55331edbc3e2bd1c531.zip | |
Make this port interactive again to unbreak different
installation settings.
Approved by: portmgr (linimon)
Diffstat (limited to 'net')
| -rw-r--r-- | net/citrix_ica/Makefile | 14 | ||||
| -rw-r--r-- | net/citrix_ica/files/patch-linuxx86::hinst | 18 | ||||
| -rw-r--r-- | net/citrix_xenapp/Makefile | 14 | ||||
| -rw-r--r-- | net/citrix_xenapp/files/patch-linuxx86::hinst | 18 |
4 files changed, 38 insertions, 26 deletions
diff --git a/net/citrix_ica/Makefile b/net/citrix_ica/Makefile index 7adb17daff0b..17bbacfe3f92 100644 --- a/net/citrix_ica/Makefile +++ b/net/citrix_ica/Makefile @@ -72,23 +72,11 @@ do-install: ${ECHO} "-----------------------------------------------------------" ; \ ${FALSE} ; \ fi - - @${ECHO_CMD} -e "1\n${CDIR}\ny\n1\ny${HAVE_KDE}\n3" > ${WRKSRC}/response ; - @for dir in ${NSCP}; do \ - if [ -e $${dir}/plugins/libnullplugin.so ]; then \ - BIN=`${FILE} ${dir}/plugins/libnullplugin.so | ${AWK} '{print $11}'` ; \ - case $${BIN} in \ - \(SYSV\),) \ - ${ECHO_CMD} -e "1\n${CDIR}\ny\n1\ny${HAVE_KDE}\n3" > ${WRKSRC}/response ; \ - esac \ - fi \ - done - ${SED} s%DESTINATION%${CDIR}% < ${FILESDIR}/wfcmgr \ > ${WRKSRC}/wfcmgr.x ${SED} s%DESTINATION%${CDIR}% < ${FILESDIR}/wfica \ > ${WRKSRC}/wfica.x - cd ${WRKSRC} && ${LINUXBASE}/bin/sh -c './setupwfc < response' + cd ${WRKSRC} && /bin/sh -c './setupwfc' ${INSTALL_SCRIPT} ${WRKSRC}/wfcmgr.x ${PREFIX}/bin/wfcmgr ${INSTALL_SCRIPT} ${WRKSRC}/wfica.x ${PREFIX}/bin/wfica diff --git a/net/citrix_ica/files/patch-linuxx86::hinst b/net/citrix_ica/files/patch-linuxx86::hinst index 39b305eede3f..0fb29d945518 100644 --- a/net/citrix_ica/files/patch-linuxx86::hinst +++ b/net/citrix_ica/files/patch-linuxx86::hinst @@ -1,5 +1,23 @@ --- linuxx86/hinst.orig Fri May 7 14:44:44 2004 +++ linuxx86/hinst Fri Jun 4 17:44:53 2004 +@@ -75,7 +75,7 @@ + fi + + # Install in here by default. +-DefaultInstallDir=/usr/lib/ICAClient ++DefaultInstallDir=/usr/local/ICAClient + + # Default CDROM mount point + DefaultCDSourceDir=/cdrom +@@ -2091,7 +2091,7 @@ + + # rm -f $m_filename $mf_filename $o_filename $of_filename + +- /bin/true ++ /usr/bin/true + } + + ############################################################################### @@ -2142,10 +2142,34 @@ # ############################################################################### diff --git a/net/citrix_xenapp/Makefile b/net/citrix_xenapp/Makefile index 7adb17daff0b..17bbacfe3f92 100644 --- a/net/citrix_xenapp/Makefile +++ b/net/citrix_xenapp/Makefile @@ -72,23 +72,11 @@ do-install: ${ECHO} "-----------------------------------------------------------" ; \ ${FALSE} ; \ fi - - @${ECHO_CMD} -e "1\n${CDIR}\ny\n1\ny${HAVE_KDE}\n3" > ${WRKSRC}/response ; - @for dir in ${NSCP}; do \ - if [ -e $${dir}/plugins/libnullplugin.so ]; then \ - BIN=`${FILE} ${dir}/plugins/libnullplugin.so | ${AWK} '{print $11}'` ; \ - case $${BIN} in \ - \(SYSV\),) \ - ${ECHO_CMD} -e "1\n${CDIR}\ny\n1\ny${HAVE_KDE}\n3" > ${WRKSRC}/response ; \ - esac \ - fi \ - done - ${SED} s%DESTINATION%${CDIR}% < ${FILESDIR}/wfcmgr \ > ${WRKSRC}/wfcmgr.x ${SED} s%DESTINATION%${CDIR}% < ${FILESDIR}/wfica \ > ${WRKSRC}/wfica.x - cd ${WRKSRC} && ${LINUXBASE}/bin/sh -c './setupwfc < response' + cd ${WRKSRC} && /bin/sh -c './setupwfc' ${INSTALL_SCRIPT} ${WRKSRC}/wfcmgr.x ${PREFIX}/bin/wfcmgr ${INSTALL_SCRIPT} ${WRKSRC}/wfica.x ${PREFIX}/bin/wfica diff --git a/net/citrix_xenapp/files/patch-linuxx86::hinst b/net/citrix_xenapp/files/patch-linuxx86::hinst index 39b305eede3f..0fb29d945518 100644 --- a/net/citrix_xenapp/files/patch-linuxx86::hinst +++ b/net/citrix_xenapp/files/patch-linuxx86::hinst @@ -1,5 +1,23 @@ --- linuxx86/hinst.orig Fri May 7 14:44:44 2004 +++ linuxx86/hinst Fri Jun 4 17:44:53 2004 +@@ -75,7 +75,7 @@ + fi + + # Install in here by default. +-DefaultInstallDir=/usr/lib/ICAClient ++DefaultInstallDir=/usr/local/ICAClient + + # Default CDROM mount point + DefaultCDSourceDir=/cdrom +@@ -2091,7 +2091,7 @@ + + # rm -f $m_filename $mf_filename $o_filename $of_filename + +- /bin/true ++ /usr/bin/true + } + + ############################################################################### @@ -2142,10 +2142,34 @@ # ############################################################################### |