cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert parts of the previous commit, spell CONFIGURE_ENV correctly, and

Browse Source 
get this port to build correctly again with HAVE_GTK=t.

PR:		19893
This commit is contained in:
Steve Price 2000-07-16 19:40:21 +00:00
parent 6fbc4e7fab
commit 483ee3f635
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=30708
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editors/vim5/Makefile
View File

@ -54,7 +54,7 @@ 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}"
CONFIGURE_ENV= 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

14
editors/vim5/files/patch-02
View File

@ -1,5 +1,19 @@
--- 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=