From 47bd0b100e170503badaeb214ab08718d823303b Mon Sep 17 00:00:00 2001
From: obrien <obrien@FreeBSD.org>
Date: Mon, 30 Apr 2001 22:39:13 +0000
Subject: Change the Vim-specific "NO_GUI" to the correct "WITHOUT_X11".

---
 editors/vim/Makefile  | 10 +++++++---
 editors/vim5/Makefile | 10 +++++++---
 editors/vim6/Makefile | 10 +++++++---
 3 files changed, 21 insertions(+), 9 deletions(-)

(limited to 'editors')

diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index 16340a3..c32e455 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -51,7 +51,11 @@ MLINKS+=	vim.1 gvim.1  vim.1 gview.1  vim.1 rgvim.1  vim.1 rgview.1
 MAKE_ARGS+=	CONF_OPT_MAX="--enable-max-features"
 I18N=		CONF_OPT_MULTIBYTE="--enable-multibyte --enable-fontset --enable-xim"
 
-.if !defined(NO_GUI)
+.if defined(NO_GUI)
+WITHOUT_X11=	yes
+.endif
+
+.if !defined(WITHOUT_X11)
 #	for now default the GUI to the GTK+ one
 #	will be reviewed when the GTK+ 1.{3,4} behemoth is released
 .if !defined(WITH_ATHENA) && !defined(WITH_GTK) && !defined(WITH_MOTIF)
@@ -68,9 +72,9 @@ MAKE_ARGS+=	X_LIBS="$(X_LIBS) -lXt"
 USE_MOTIF=	yes
 MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=motif --with-motif-lib=\"${MOTIFLIB}\"" MOTIFHOME=${X11BASE} ${I18N}
 .endif
-.else	# NO_GUI
+.else	# WITHOUT_X11
 MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=no --without-x ${I18N}"
-.endif	# NO_GUI
+.endif	# WITHOUT_X11
 
 .if defined(PACKAGE_BUILDING)
 MAKE_ARGS+=	CONF_OPT_PERL="--enable-perlinterp --enable-pythoninterp --enable-tclinterp --enable-cscope"
diff --git a/editors/vim5/Makefile b/editors/vim5/Makefile
index ca4462d..561c185 100644
--- a/editors/vim5/Makefile
+++ b/editors/vim5/Makefile
@@ -57,7 +57,11 @@ MAKE_ARGS+=	LIBS=-lxpg4
 MAKE_ARGS+=	CONF_OPT_MAX="--enable-max-features"
 I18N=		CONF_OPT_MULTIBYTE="--enable-multibyte --enable-fontset --enable-xim"
 
-.if !defined(NO_GUI)
+.if defined(NO_GUI)
+WITHOUT_X11=	yes
+.endif
+
+.if !defined(WITHOUT_X11)
 .if defined(WITH_ATHENA)
 MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=athena" ${I18N}
 #MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=yes" ${I18N}
@@ -68,9 +72,9 @@ MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=gtk --with-gtk-prefix=${X11BASE}" ${I18N}
 USE_MOTIF=	yes
 MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=motif --with-motif-lib=\"${MOTIFLIB}\"" MOTIFHOME=${X11BASE} ${I18N}
 .endif
-.else  # NO_GUI
+.else  # WITHOUT_X11
 MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=no --without-x --enable-multibyte"
-.endif # NO_GUI
+.endif # WITHOUT_X11
 
 .if defined(PACKAGE_BUILDING)
 MAKE_ARGS+=	CONF_OPT_PERL="--enable-perlinterp --enable-pythoninterp --enable-tclinterp --enable-cscope"
diff --git a/editors/vim6/Makefile b/editors/vim6/Makefile
index 16340a3..c32e455 100644
--- a/editors/vim6/Makefile
+++ b/editors/vim6/Makefile
@@ -51,7 +51,11 @@ MLINKS+=	vim.1 gvim.1  vim.1 gview.1  vim.1 rgvim.1  vim.1 rgview.1
 MAKE_ARGS+=	CONF_OPT_MAX="--enable-max-features"
 I18N=		CONF_OPT_MULTIBYTE="--enable-multibyte --enable-fontset --enable-xim"
 
-.if !defined(NO_GUI)
+.if defined(NO_GUI)
+WITHOUT_X11=	yes
+.endif
+
+.if !defined(WITHOUT_X11)
 #	for now default the GUI to the GTK+ one
 #	will be reviewed when the GTK+ 1.{3,4} behemoth is released
 .if !defined(WITH_ATHENA) && !defined(WITH_GTK) && !defined(WITH_MOTIF)
@@ -68,9 +72,9 @@ MAKE_ARGS+=	X_LIBS="$(X_LIBS) -lXt"
 USE_MOTIF=	yes
 MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=motif --with-motif-lib=\"${MOTIFLIB}\"" MOTIFHOME=${X11BASE} ${I18N}
 .endif
-.else	# NO_GUI
+.else	# WITHOUT_X11
 MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=no --without-x ${I18N}"
-.endif	# NO_GUI
+.endif	# WITHOUT_X11
 
 .if defined(PACKAGE_BUILDING)
 MAKE_ARGS+=	CONF_OPT_PERL="--enable-perlinterp --enable-pythoninterp --enable-tclinterp --enable-cscope"
-- 
cgit v1.1