Add support for using "Xaw3d" or "Xaw-Xpm" inspired by Antti Kantee.

3 files changed, 51 insertions, 9 deletions

diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index 267bc0ae3a1..ecae9f868e6 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.22 1999/11/22 08:49:12 tron Exp $
+# $NetBSD: Makefile,v 1.23 1999/11/25 20:20:32 tron Exp $
 
 DISTNAME=		vim-5.5
-WRKSRC=			${WRKDIR}/${DISTNAME}/src
 CATEGORIES=		editors
 MASTER_SITES=		ftp://ftp.vim.org/pub/editors/vim/unix/ \
 			ftp://ftp.nuxi.com/pub/vim/unix/ \
@@ -18,15 +17,24 @@ CONFLICTS=		vim-gtk-*
 
 GNU_CONFIGURE=		yes
 USE_X11=		yes
+USE_XAW=		yes
 CONFIGURE_ARGS+=	--enable-gui=athena --with-tlib=ncurses
 CPPFLAGS+=		-I${LOCALBASE}/include	# for ncurses' termcap.h
 LDFLAGS+=		-L${LOCALBASE}/lib	# for -lncurses
 CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
 
+WRKSRC=			${WRKDIR}/${DISTNAME}/src
+
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "NetBSD"
+.if (${OPSYS} == "NetBSD")
 DEPENDS=		ncurses-4.2:../../devel/ncurses
 .endif
 
+.if (${XAW_TYPE} == "standard")
+MAKE_ENV+=		XAW_LIB=Xaw
+.else
+MAKE_ENV+=		XAW_LIB=Xaw3d
+.endif
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/vim/files/patch-sum b/editors/vim/files/patch-sum
index c3845ae3f4b..678ad070632 100644
--- a/editors/vim/files/patch-sum
+++ b/editors/vim/files/patch-sum
@@ -1,8 +1,8 @@
-$NetBSD: patch-sum,v 1.6 1999/11/22 08:49:14 tron Exp $
+$NetBSD: patch-sum,v 1.7 1999/11/25 20:20:33 tron Exp $
 
 MD5 (patch-aa) = caa181ba83b02f273da5df192f32b7b8
 MD5 (patch-ab) = 951d4e8cdc4a7405601c21515c013af8
 MD5 (patch-ac) = e53e72a98abbb723d60c03b8bf1fc55d
 MD5 (patch-ad) = 978580aca00cf8c29148c2fcaa754c64
 MD5 (patch-ae) = 825ca437b006374928bda2501ea3ca1f
-MD5 (patch-af) = 464c45a57d8fbc1bdc73bc21c1285fbf
+MD5 (patch-af) = d718b63274bac0ff1d02036678cf876c
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)