diff options
| author | agc <agc> | 1998-05-15 14:52:13 +0000 |
|---|---|---|
| committer | agc <agc> | 1998-05-15 14:52:13 +0000 |
| commit | c1ff029117cab30e781691ae0750f99bc8e0b974 (patch) | |
| tree | 234409094b04495ae2c34509a3058413993eeafe /x11 | |
| parent | 77b92e9c76fd8c051d18babf4fb661448ba2290e (diff) | |
| download | pkgsrc-c1ff029117cab30e781691ae0750f99bc8e0b974.tar.gz | |
Mirror the change made to the lesstif package - don't bother asking
the user whether they really want to overwrite their expensive Motif
installation with lesstif - print an error message, and fail.
Upgrading a lesstif version works as previously. Remove IS_INTERACTIVE.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/lesstif-current/Makefile | 32 |
1 files changed, 8 insertions, 24 deletions
diff --git a/x11/lesstif-current/Makefile b/x11/lesstif-current/Makefile index 0d797472ea1..fd904933c52 100644 --- a/x11/lesstif-current/Makefile +++ b/x11/lesstif-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 1998/05/11 10:43:31 frueauf Exp $ +# $NetBSD: Makefile,v 1.3 1998/05/15 14:52:13 agc Exp $ # FreeBSD Id: Makefile,v 1.13 1997/09/08 08:34:13 tg Exp # @@ -14,9 +14,6 @@ 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= lesstif.1 mwm.1 xmbind.1 MAN3= LessTifInternals.3 XmArrowButton.3 XmArrowButtonGadget.3 \ XmBulletinBoard.3 XmCascadeButton.3 XmCascadeButtonGCacheObj.3 \ @@ -39,27 +36,14 @@ MAN3= LessTifInternals.3 XmArrowButton.3 XmArrowButtonGadget.3 \ 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: |