summaryrefslogtreecommitdiff
path: root/editors/vim
diff options
context:
space:
mode:
authorSteve Price <steve@FreeBSD.org>2000-07-07 19:59:26 +0000
committerSteve Price <steve@FreeBSD.org>2000-07-07 19:59:26 +0000
commit89b7d2a4465628b128b8f5f7fde5f2a3e2b2a8df (patch)
treedab293772a4c12d5e7f6c0f30c1e8ae09e1cfe4d /editors/vim
parentLocation on MASTER_SITE has changed. (diff)
- Use GTK_CONFIG/GLIB_CONFIG instead of hardcoded gtk12-config/glib12-config
- Support CC/CFLAGS/PREIFX/LOCALBASE/X11BASE/MAKE/etc. properly PR: 19623 Submitted by: KATO Tsuguru <tkato@prontomail.ne.jp>
Diffstat (limited to 'editors/vim')
-rw-r--r--editors/vim/Makefile2
-rw-r--r--editors/vim/files/patch-0214
2 files changed, 2 insertions, 14 deletions
diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index 54657283759e..35daa942b62a 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -53,6 +53,8 @@ MAKE_FLAGS:= X_LIBS=-lxpg4 CONF_OPT_MAX="--enable-max-features" ${MAKE_FLAGS}
.if defined(HAVE_GTK)
LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
+CONFIGURE= GTK_CONFIG="${GTK_CONFIG}"
MAKE_FLAGS:= CONF_OPT_GUI="--enable-gui=gtk --with-gtk-prefix=${X11BASE} --enable-multibyte --enable-fontset --enable-multibyte --enable-xim" ${MAKE_FLAGS}
.elif defined(HAVE_MOTIF)
REQUIRES_MOTIF= yes
diff --git a/editors/vim/files/patch-02 b/editors/vim/files/patch-02
index 0b0b26335fdc..f74cb6530149 100644
--- a/editors/vim/files/patch-02
+++ b/editors/vim/files/patch-02
@@ -1,19 +1,5 @@
--- configure.orig Sun Sep 19 03:59:45 1999
+++ configure Sun Oct 24 21:47:29 1999
-@@ -2906,11 +2906,11 @@
-
- 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
- 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
- fi
- if test "X$GTK_CONFIG" = "X"; then
- # Extract the first word of "gtk-config", so it can be a program name with args.
@@ -3098,7 +3098,7 @@
gui_libs="`echo $x_libraries|sed 's%/^/^/*$%%'` `echo "$gui_XXX" | sed s/XXX/lib/g` `echo "$GUI_INC_LOC" | sed s/include/lib/` $GUI_LIB_LOC"
GUI_LIB_LOC=