diff options
| author | steve <steve@FreeBSD.org> | 2000-07-07 19:59:26 +0000 |
|---|---|---|
| committer | steve <steve@FreeBSD.org> | 2000-07-07 19:59:26 +0000 |
| commit | 7879264d29ab2a706345ab21de9f9cd3139efc7a (patch) | |
| tree | 0fb8a7b052271f54c6bdf617de3027472d998225 /editors/vim5 | |
| parent | c691dd330a3da8e70bfc74508b9fb3b585604a4d (diff) | |
| download | FreeBSD-ports-7879264d29ab2a706345ab21de9f9cd3139efc7a.zip FreeBSD-ports-7879264d29ab2a706345ab21de9f9cd3139efc7a.tar.gz | |
- 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/vim5')
| -rw-r--r-- | editors/vim5/Makefile | 2 | ||||
| -rw-r--r-- | editors/vim5/files/patch-02 | 14 |
2 files changed, 2 insertions, 14 deletions
diff --git a/editors/vim5/Makefile b/editors/vim5/Makefile index 5465728..35daa94 100644 --- a/editors/vim5/Makefile +++ b/editors/vim5/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/vim5/files/patch-02 b/editors/vim5/files/patch-02 index 0b0b263..f74cb65 100644 --- a/editors/vim5/files/patch-02 +++ b/editors/vim5/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= |
