sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 09:49:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change the Vim-specific "NO_GUI" to the correct "WITHOUT_X11".

Browse source
This commit is contained in:
David E. O'Brien 2001-04-30 22:39:13 +00:00
parent c6dc644d9a
commit b34da5a3f5
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=42102
3 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
editors/vim/Makefile
View file

@ -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" MAKE_ARGS+= CONF_OPT_MAX="--enable-max-features"
I18N= CONF_OPT_MULTIBYTE="--enable-multibyte --enable-fontset --enable-xim" 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 # for now default the GUI to the GTK+ one
# will be reviewed when the GTK+ 1.{3,4} behemoth is released # will be reviewed when the GTK+ 1.{3,4} behemoth is released
.if !defined(WITH_ATHENA) && !defined(WITH_GTK) && !defined(WITH_MOTIF) .if !defined(WITH_ATHENA) && !defined(WITH_GTK) && !defined(WITH_MOTIF)
@ -68,9 +72,9 @@ MAKE_ARGS+= X_LIBS="$(X_LIBS) -lXt"
USE_MOTIF= yes USE_MOTIF= yes
MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=motif --with-motif-lib=\"${MOTIFLIB}\"" MOTIFHOME=${X11BASE} ${I18N} MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=motif --with-motif-lib=\"${MOTIFLIB}\"" MOTIFHOME=${X11BASE} ${I18N}
.endif .endif
.else # NO_GUI .else # WITHOUT_X11
MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=no --without-x ${I18N}" MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=no --without-x ${I18N}"
.endif # NO_GUI .endif # WITHOUT_X11
.if defined(PACKAGE_BUILDING) .if defined(PACKAGE_BUILDING)
MAKE_ARGS+= CONF_OPT_PERL="--enable-perlinterp --enable-pythoninterp --enable-tclinterp --enable-cscope" MAKE_ARGS+= CONF_OPT_PERL="--enable-perlinterp --enable-pythoninterp --enable-tclinterp --enable-cscope"

10
editors/vim5/Makefile
View file

@ -57,7 +57,11 @@ MAKE_ARGS+= LIBS=-lxpg4
MAKE_ARGS+= CONF_OPT_MAX="--enable-max-features" MAKE_ARGS+= CONF_OPT_MAX="--enable-max-features"
I18N= CONF_OPT_MULTIBYTE="--enable-multibyte --enable-fontset --enable-xim" 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) .if defined(WITH_ATHENA)
MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=athena" ${I18N} MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=athena" ${I18N}
#MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=yes" ${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 USE_MOTIF= yes
MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=motif --with-motif-lib=\"${MOTIFLIB}\"" MOTIFHOME=${X11BASE} ${I18N} MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=motif --with-motif-lib=\"${MOTIFLIB}\"" MOTIFHOME=${X11BASE} ${I18N}
.endif .endif
.else # NO_GUI .else # WITHOUT_X11
MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=no --without-x --enable-multibyte" MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=no --without-x --enable-multibyte"
.endif # NO_GUI .endif # WITHOUT_X11
.if defined(PACKAGE_BUILDING) .if defined(PACKAGE_BUILDING)
MAKE_ARGS+= CONF_OPT_PERL="--enable-perlinterp --enable-pythoninterp --enable-tclinterp --enable-cscope" MAKE_ARGS+= CONF_OPT_PERL="--enable-perlinterp --enable-pythoninterp --enable-tclinterp --enable-cscope"

10
editors/vim6/Makefile
View file

@ -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" MAKE_ARGS+= CONF_OPT_MAX="--enable-max-features"
I18N= CONF_OPT_MULTIBYTE="--enable-multibyte --enable-fontset --enable-xim" 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 # for now default the GUI to the GTK+ one
# will be reviewed when the GTK+ 1.{3,4} behemoth is released # will be reviewed when the GTK+ 1.{3,4} behemoth is released
.if !defined(WITH_ATHENA) && !defined(WITH_GTK) && !defined(WITH_MOTIF) .if !defined(WITH_ATHENA) && !defined(WITH_GTK) && !defined(WITH_MOTIF)
@ -68,9 +72,9 @@ MAKE_ARGS+= X_LIBS="$(X_LIBS) -lXt"
USE_MOTIF= yes USE_MOTIF= yes
MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=motif --with-motif-lib=\"${MOTIFLIB}\"" MOTIFHOME=${X11BASE} ${I18N} MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=motif --with-motif-lib=\"${MOTIFLIB}\"" MOTIFHOME=${X11BASE} ${I18N}
.endif .endif
.else # NO_GUI .else # WITHOUT_X11
MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=no --without-x ${I18N}" MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=no --without-x ${I18N}"
.endif # NO_GUI .endif # WITHOUT_X11
.if defined(PACKAGE_BUILDING) .if defined(PACKAGE_BUILDING)
MAKE_ARGS+= CONF_OPT_PERL="--enable-perlinterp --enable-pythoninterp --enable-tclinterp --enable-cscope" MAKE_ARGS+= CONF_OPT_PERL="--enable-perlinterp --enable-pythoninterp --enable-tclinterp --enable-cscope"