summaryrefslogtreecommitdiff
path: root/editors/vim/patches/patch-af
diff options
context:
space:
mode:
Diffstat (limited to 'editors/vim/patches/patch-af')
-rw-r--r--editors/vim/patches/patch-af42
1 files changed, 38 insertions, 4 deletions
diff --git a/editors/vim/patches/patch-af b/editors/vim/patches/patch-af
index 73384a7ff4e..ae83bd6a790 100644
--- a/editors/vim/patches/patch-af
+++ b/editors/vim/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.5 1999/11/22 08:49:15 tron Exp $
+$NetBSD: patch-af,v 1.6 1999/11/25 20:20:33 tron Exp $
---- Makefile.orig Sun Sep 19 14:27:33 1999
-+++ Makefile Sat Nov 20 11:48:07 1999
+--- Makefile.orig Sun Sep 19 13:27:33 1999
++++ Makefile Thu Nov 25 21:03:25 1999
@@ -721,7 +721,7 @@
### might not work when they are changed!)
VIMDIR = /vim
@@ -11,7 +11,41 @@ $NetBSD: patch-af,v 1.5 1999/11/22 08:49:15 tron Exp $
SYNSUBDIR = /syntax
MACROSUBDIR = /macros
TOOLSSUBDIR = /tools
-@@ -1330,6 +1330,7 @@
+@@ -902,23 +902,26 @@
+ ### Athena Widget GUI interface.
+ ### Use Xaw3d to make the menus look a little bit nicer
+ #XAW_LIB = -lXaw3d
+-XAW_LIB = -lXaw
++#XAW_LIB = -lXaw
+
+ ### When using Xaw3d, uncomment/comment the following lines to also get the
+ ### scrollbars from Xaw3d.
+-#ATHENA_SRC = gui.c gui_athena.c gui_x11.c pty.c gui_at_fs.c
+-#ATHENA_OBJ = gui.o gui_athena.o gui_x11.o pty.o gui_at_fs.o
+-#ATHENA_DEFS = -DUSE_GUI_ATHENA $(NARROW_PROTO) \
+-# -Dvim_scrollbarWidgetClass=scrollbarWidgetClass \
+-# -Dvim_XawScrollbarSetThumb=XawScrollbarSetThumb
++.if ($(XAW_LIB) != "Xaw")
++ATHENA_SRC = gui.c gui_athena.c gui_x11.c pty.c gui_at_fs.c
++ATHENA_OBJ = gui.o gui_athena.o gui_x11.o pty.o gui_at_fs.o
++ATHENA_DEFS = -DUSE_GUI_ATHENA $(NARROW_PROTO) \
++ -Dvim_scrollbarWidgetClass=scrollbarWidgetClass \
++ -Dvim_XawScrollbarSetThumb=XawScrollbarSetThumb
++.else
+ ATHENA_SRC = gui.c gui_athena.c gui_x11.c pty.c gui_at_sb.c gui_at_fs.c
+ ATHENA_OBJ = gui.o gui_athena.o gui_x11.o pty.o gui_at_sb.o gui_at_fs.o
+ ATHENA_DEFS = -DUSE_GUI_ATHENA $(NARROW_PROTO)
++.endif
+
+ ATHENA_INCL = gui.h
+ ATHENA_IPATH = -I$(GUI_INC_LOC)
+ ATHENA_LIBS_DIR = -L$(GUI_LIB_LOC)
+-ATHENA_LIBS1 = $(XAW_LIB)
++ATHENA_LIBS1 = -l$(XAW_LIB)
+ ATHENA_LIBS2 = -lXt
+ ATHENA_TARGETS = $(BINDIR)/$(GVIMTARGET) \
+ $(BINDIR)/$(GVIEWTARGET) \
+@@ -1330,6 +1333,7 @@
# install the help files; first adjust the contents for the location
installvimhelp: $(HELPSOURCE)/vim.1 $(MANSUBDIR) $(VIMLOC) $(VIMRTLOC) $(HELPSUBLOC) $(SYNSUBLOC) $(TUTORSUBLOC)