aboutsummaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorDavid E. O'Brien <obrien@FreeBSD.org>2010-11-24 22:02:00 +0000
committerDavid E. O'Brien <obrien@FreeBSD.org>2010-11-24 22:02:00 +0000
commitfe17f600246b3f7dc367caded4e588ffa478ba35 (patch)
tree92737b9b5e6284b6a5a28865447e5dd4067d49ac /editors
parent7a9a65392e5eeb69d59196c4680b3d1df69354e0 (diff)
downloadports-fe17f600246b3f7dc367caded4e588ffa478ba35.tar.gz
ports-fe17f600246b3f7dc367caded4e588ffa478ba35.zip
Notes
Diffstat (limited to 'editors')
-rw-r--r--editors/vim/Makefile28
-rw-r--r--editors/vim/options3
2 files changed, 9 insertions, 22 deletions
diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index f3ca4e9e92de..ce802af9c75a 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -37,7 +37,7 @@ SLAVEDIRS= editors/vim-lite
.include "${.CURDIR}/../vim/options"
.endif
-CONFLICTS= vim6* vim*-lite vim*-gtk1 vim*-gnome
+CONFLICTS= vim6* vim*-lite vim*-gnome
MAKE_JOBS_SAFE= yes
USE_BZIP2= yes
DIST_SUBDIR= vim
@@ -134,29 +134,23 @@ MAKE_ARGS+= CONF_OPT_TCL="--enable-tclinterp --with-tclsh="${TCLSH:S/${LOCALBASE
. if !defined(WITHOUT_X11)
# for now default the GUI to the GTK+ one
-. if !defined(WITH_X11_ONLY) && !defined(WITH_ATHENA) && !defined(WITH_MOTIF) && !defined(WITH_GNOME) && !defined(WITH_GTK1) && !defined(WITH_GTK2)
+. if !defined(WITH_X11_ONLY) && !defined(WITH_ATHENA) && !defined(WITH_MOTIF) && !defined(WITH_GNOME) && !defined(WITH_GTK2)
WITH_GTK2= yes
. endif
. if defined(WITH_ATHENA)
MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=athena" ${I18N}
-. elif defined(WITH_GTK1)
-USE_GNOME= gtk12
-MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gtk --with-gtk-prefix=${LOCALBASE}" ${I18N}
-MAKE_ARGS+= X_LIBS="$(X_LIBS) -lXt"
-USE_XORG+= xt
-PKGNAMESUFFIX= -gtk1
. elif defined(WITH_GTK2)
USE_GNOME= gtk20
MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gtk2 --with-gtk-prefix=${LOCALBASE}" ${I18N}
MAKE_ARGS+= X_LIBS="$(X_LIBS) -lXt"
USE_XORG+= xt
-. elif defined(WITH_GNOME)
-. if ${WITH_GNOME:Mgnomelibs}!="" || ${WITH_GNOME}=="yes" || \
- ${WITH_GNOME}=="1"
-USE_GNOME= gnomelibs gnomeprefix
-PKGNAMESUFFIX= -gnome
-MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gnome --with-gtk-prefix=${LOCALBASE}" ${I18N}
+. elif defined(WITH_GNOME2)
+. if ${WITH_GNOME2:Mlibgnomeui}!="" || ${WITH_GNOME2}=="yes" || \
+ ${WITH_GNOME2}=="1"
+USE_GNOME= libgnomeui
+PKGNAMESUFFIX= -gnome2
+MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gnome2" ${I18N}
MAKE_ARGS+= X_LIBS="$(X_LIBS) -lXt"
USE_XORG+= xt
. endif
@@ -246,12 +240,6 @@ post-install:
show-options:
@${MAKE} -DWITH_OPTIONS showconfig
-.if defined(WITH_GTK)
-.BEGIN:
- @${ECHO_CMD} "WITH_GTK has been renamed WITH_GTK1."
- @exit 1
-.endif
-
cklatest: .PHONY
@${ECHO} -n "Currently at: "
@${MAKE} -V PATCHLEVEL
diff --git a/editors/vim/options b/editors/vim/options
index 61d50d761431..6614e132dc9d 100644
--- a/editors/vim/options
+++ b/editors/vim/options
@@ -10,7 +10,6 @@ OPTIONS= PERL "Enable Perl interpreter" off \
X11_ONLY "CLI-only Vim, but with basic X11 support" off \
XTERM_SAVE "Restore xterm screen after exit" off \
ATHENA "Athena GUI" off \
- GTK1 "GTK+ 1.2 GUI" off \
GTK2 "GTK2 GUI" off \
- GNOME "Gnome1 GUI" off \
+ GNOME2 "Gnome2 GUI" off \
MOTIF "Motif GUI" off \