summaryrefslogtreecommitdiff
path: root/editors/vim5
diff options
context:
space:
mode:
authorJeremy Lea <reg@FreeBSD.org>2000-10-05 06:47:41 +0000
committerJeremy Lea <reg@FreeBSD.org>2000-10-05 06:47:41 +0000
commit3707e5b7408ecadb0bda141dd82ec9bbca5d0267 (patch)
treef1d64a9e396a97d08c7dc5b7eed24efc11a3fa10 /editors/vim5
parentImplement USE_GTK, part 2. (diff)
Implment WANT_GTK.
Notes
Notes: svn path=/head/; revision=33426
Diffstat (limited to 'editors/vim5')
-rw-r--r--editors/vim5/Makefile10
-rw-r--r--editors/vim5/files/patch-024
2 files changed, 7 insertions, 7 deletions
diff --git a/editors/vim5/Makefile b/editors/vim5/Makefile
index 308f7cf70175..251ce75996ab 100644
--- a/editors/vim5/Makefile
+++ b/editors/vim5/Makefile
@@ -44,15 +44,15 @@ PLIST_SUB= VIM_VER=${DISTNAME:S/-//:S/.//}
MAN1= vim.1 vimtutor.1 xxd.1 ectags.1
MLINKS= vim.1 rvim.1 vim.1 rview.1 ectags.1 etags.1
+.include <bsd.port.pre.mk>
+
.if !defined(LITE)
MLINKS+= vim.1 gvim.1 vim.1 gview.1 vim.1 rgvim.1 vim.1 rgview.1
MAKE_ARGS+= X_LIBS=-lxpg4 CONF_OPT_MAX="--enable-max-features"
-.if defined(HAVE_GTK)
-LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}"
+.if defined(WITH_GTK)
+USE_GTK= yes
MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gtk --with-gtk-prefix=${X11BASE} --enable-multibyte --enable-fontset --enable-multibyte --enable-xim"
.elif defined(HAVE_MOTIF)
REQUIRES_MOTIF= yes
@@ -82,4 +82,4 @@ post-install:
@${RM} -f ${PREFIX}/man/man1/etags.1
@${MV} ${PREFIX}/man/man1/ctags.1 ${PREFIX}/man/man1/ectags.1
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/editors/vim5/files/patch-02 b/editors/vim5/files/patch-02
index 0b0b26335fdc..b13d649e80b7 100644
--- a/editors/vim5/files/patch-02
+++ b/editors/vim5/files/patch-02
@@ -5,12 +5,12 @@
if test "x$gtk_config_prefix" != "x" ; then
gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
- GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
-+ GTK_CONFIG=$gtk_config_prefix/bin/gtk12-config
++ GTK_CONFIG=${GTK_CONFIG}
fi
if test "x$gtk_config_exec_prefix" != "x" ; then
gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
- GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
-+ GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk12-config
++ GTK_CONFIG=${GTK_CONFIG}
fi
if test "X$GTK_CONFIG" = "X"; then
# Extract the first word of "gtk-config", so it can be a program name with args.