aboutsummaryrefslogtreecommitdiffstats
path: root/editors/vim/Makefile
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2010-10-06 02:13:39 +0800
committerobrien <obrien@FreeBSD.org>2010-10-06 02:13:39 +0800
commit9c2cd9ff3ad2f60c7f38b1e50acca5a145b19668 (patch)
treeb0026b04d36aa99497336281a7680bd6a3b7bd3f /editors/vim/Makefile
parentba44e26e535644391ed42be31613ebe10d9f233e (diff)
downloadfreebsd-ports-gnome-9c2cd9ff3ad2f60c7f38b1e50acca5a145b19668.tar.gz
freebsd-ports-gnome-9c2cd9ff3ad2f60c7f38b1e50acca5a145b19668.tar.zst
freebsd-ports-gnome-9c2cd9ff3ad2f60c7f38b1e50acca5a145b19668.zip
Change the default GUI from gtk1 to gtk2.
Diffstat (limited to 'editors/vim/Makefile')
-rw-r--r--editors/vim/Makefile19
1 files changed, 14 insertions, 5 deletions
diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index 465debf91825..78c9ba67e4a0 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -7,6 +7,9 @@
#
PORTNAME?= vim
+# ! _NEVER_ reduce or lower PATCHLEVEL, even if the PATCHLEVEL
+# ! value # is added to BADPATCHES. Doing otherwise will cause
+# ! PORTEPOCH to be needed, which we do NOT want.
PATCHLEVEL= 446
PORTVERSION= 7.2.${PATCHLEVEL}
RELEASE= vim-${PORTVERSION:C/\.[0-9a-z]*$//}
@@ -38,7 +41,7 @@ SLAVEDIRS= editors/vim-lite
.include "${.CURDIR}/../vim/options"
.endif
-CONFLICTS= vim6* vim*-lite
+CONFLICTS= vim6* vim*-lite vim*-gtk1 vim*-gnome
MAKE_JOBS_SAFE= yes
USE_BZIP2= yes
DIST_SUBDIR= vim
@@ -124,20 +127,20 @@ 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_GTK) && !defined(WITH_GTK2)
-WITH_GTK= yes
+. if !defined(WITH_X11_ONLY) && !defined(WITH_ATHENA) && !defined(WITH_MOTIF) && !defined(WITH_GNOME) && !defined(WITH_GTK1) && !defined(WITH_GTK2)
+WITH_GTK2= yes
. endif
. if defined(WITH_ATHENA)
MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=athena" ${I18N}
-. elif defined(WITH_GTK)
+. 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
-PKGNAMESUFFIX= -gtk2
MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gtk2 --with-gtk-prefix=${LOCALBASE}" ${I18N}
MAKE_ARGS+= X_LIBS="$(X_LIBS) -lXt"
USE_XORG+= xt
@@ -255,6 +258,12 @@ 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:
-ncftpls \
ftp://ftp.vim.org/pub/vim/patches/${PORTVERSION:C/\.[0-9a-z]*$//}/ \