diff options
| author | agc <agc@pkgsrc.org> | 1998-05-15 14:44:07 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 1998-05-15 14:44:07 +0000 |
| commit | 3588ef839693bf8498fc4053bfbc90445189dc61 (patch) | |
| tree | d458bb2bd1461cb41699618bbc18e8aa121f8917 /x11/lesstif | |
| parent | eb2503b2f9b9ca499f178f0ed4ff1b7ee7d207c4 (diff) | |
| download | pkgsrc-3588ef839693bf8498fc4053bfbc90445189dc61.tar.gz | |
Re-think - don't ask the user whether they really want to overwrite
their expensive Motif installation with lesstif - print a message
saying that they should remove Motif first, then fail. Upgrading from
previous versions of lesstif works as previously. Remove IS_INTERACTIVE.
Diffstat (limited to 'x11/lesstif')
| -rw-r--r-- | x11/lesstif/Makefile | 32 |
1 files changed, 8 insertions, 24 deletions
diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile index 29539ae6a61..58085c80efb 100644 --- a/x11/lesstif/Makefile +++ b/x11/lesstif/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 1998/04/15 10:38:54 agc Exp $ +# $NetBSD: Makefile,v 1.17 1998/05/15 14:44:07 agc Exp $ # FreeBSD Id: Makefile,v 1.13 1997/09/08 08:34:13 tg Exp # @@ -15,34 +15,18 @@ USE_X11= yes # change this for debugging CONFIGURE_ENV= CCFLAGS="-O -pipe" INSTALL_SCRIPT="${INSTALL_SCRIPT}" -# this is worst case, when you're about to overwrite real Motif with Lesstif -IS_INTERACTIVE= yes - MAN1= mwm.1 MAN5= mwmrc.5 pre-fetch: - @if [ -d ${X11BASE}/include/Xm ]; then \ - if [ -d ${X11BASE}/lib/X11/lesstif ]; then \ + @if [ -d ${X11BASE}/include/Xm ]; then \ + if [ -d ${X11BASE}/lib/X11/lesstif ]; then \ ${ECHO} "Upgrading a previous Lesstif installation"; \ - return 0; \ - fi; \ - ${ECHO} "***********************************************************"; \ - ${ECHO} "* W a r n i n g *"; \ - ${ECHO} "* This port will overwrite your Motif installation. *"; \ - ${ECHO} "***********************************************************"; \ - ${ECHO} -n "Is this ok? (y/n) ==> "; \ - (read ans; \ - case x"$$ans" in \ - xy*|xY*) \ - return 0; \ - ;; \ - *) \ - ${ECHO} "Okay, I won't install it then...."; \ - ${ECHO} "(Don't worry about the following \"*** Error code 1\"s)"; \ - return 1; \ - ;; \ - esac) \ + return 0; \ + fi; \ + ${ECHO} "Motif is already installed in ${X11BASE}"; \ + ${ECHO} "To install lesstif, first delete Motif from ${X11BASE}"; \ + return 1; \ fi post-install: |