diff options
| author | Daniel Eischen <deischen@FreeBSD.org> | 2004-08-15 22:08:35 +0000 |
|---|---|---|
| committer | Daniel Eischen <deischen@FreeBSD.org> | 2004-08-15 22:08:35 +0000 |
| commit | d0bfdb90d86f225849c9b5f171929afe64d6f2d7 (patch) | |
| tree | 2e5b79c60102e9c4737a5e3a98d1f25d61091345 /editors/nedit | |
| parent | - Update to 0.8 (diff) | |
Remove extra CFLAGS define to force building with buggy open-motif.
Add a check to the program that checks for buggy open-motif so that
version 2.2.3 is seen as non-buggy. This last check is already in
nedit sources in similar form.
Notes
Notes:
svn path=/head/; revision=116317
Diffstat (limited to 'editors/nedit')
| -rw-r--r-- | editors/nedit/Makefile | 1 | ||||
| -rw-r--r-- | editors/nedit/files/patch-ae | 35 |
2 files changed, 21 insertions, 15 deletions
diff --git a/editors/nedit/Makefile b/editors/nedit/Makefile index e989df17f299..f087b0c91c42 100644 --- a/editors/nedit/Makefile +++ b/editors/nedit/Makefile @@ -25,7 +25,6 @@ USE_XPM= yes MAN1= nclient.1 nedit.1 ALL_TARGET= freebsd MAKE_ENV+= BINOWN=${BINOWN} BINGRP=${BINGRP} BINMODE=${BINMODE} -CFLAGS+= -DBUILD_BROKEN_NEDIT post-extract: ${CP} ${DISTDIR}/nedit.app-defaults ${WRKSRC}/NEdit.ad diff --git a/editors/nedit/files/patch-ae b/editors/nedit/files/patch-ae index 3b2f8a2e4c37..85c9a5d5222d 100644 --- a/editors/nedit/files/patch-ae +++ b/editors/nedit/files/patch-ae @@ -1,14 +1,21 @@ ---- util/check_lin_tif.c.orig Thu Nov 13 07:09:50 2003 -+++ util/check_lin_tif.c Sat Feb 7 14:57:33 2004 -@@ -164,9 +164,8 @@ - "risking instability and probable data loss. You are very brave!\n" - "Please do not report bugs to the NEdit developers unless you can\n" - "reproduce them with a known-good NEdit binary downloaded from:\n" -- "\thttp://www.nedit.org\n" -- "\nHIT ENTER TO CONTINUE\n", tif); -- fgets(buf, 2, stdin); -+ "\thttp://www.nedit.org\n", tif); -+ sleep(5); - exit(0); - #else - fprintf(stderr, +--- util/check_lin_tif.c.orig Thu Nov 13 02:09:50 2003 ++++ util/check_lin_tif.c Sun Aug 15 17:43:47 2004 +@@ -252,7 +252,7 @@ + + /* Check for the dreaded Open Motif 2.2.2 */ + if (force_bad || +- (XmVERSION == 2 && XmREVISION == 2 && XmUPDATE_LEVEL <= 3)) { ++ (XmVERSION == 2 && XmREVISION == 2 && XmUPDATE_LEVEL < 3)) { + fprintf(stderr, "ERROR: Bad Open Motif Version:\n\t%s\n", vs); + fprintf(stderr, + "\nThis version of Open Motif is known to be broken and is\n" +@@ -262,7 +262,8 @@ + "\thttp://www.motifdeveloper.com/tips/tip22.html\n" + "\thttp://www.motifdeveloper.com/tips/Motif22Review.pdf\n"); + finish(1, tif); +- } ++ } ++ exit(0); + } + #endif + |