From 1a56eeadb81226571a9b9e99fa4a6a98fa6978e1 Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Mon, 25 Oct 1999 06:02:02 +0000
Subject: Add GTK support. Set "HAVE_GTK" to invoke it.
Submitted by: Yuan-Chen Cheng <ycheng@ycheng.wsl.sinica.edu.tw>
---
editors/vim/Makefile | 5 ++++-
editors/vim/files/patch-02 | 22 ++++++++++++++++++----
editors/vim5/Makefile | 5 ++++-
editors/vim5/files/patch-02 | 22 ++++++++++++++++++----
editors/vim6/Makefile | 5 ++++-
editors/vim6/files/patch-02 | 22 ++++++++++++++++++----
6 files changed, 66 insertions(+), 15 deletions(-)
diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index 79d98a02131c..79d43393b88a 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -45,7 +45,10 @@ MLINKS+= vim.1 gvim.1 vim.1 gview.1 vim.1 rgvim.1 vim.1 rgview.1
MAKE_FLAGS:= CONF_OPT_MAX="--enable-max-features" ${MAKE_FLAGS}
-.if defined(HAVE_MOTIF)
+.if defined(HAVE_GTK)
+LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+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
MAKE_FLAGS:= CONF_OPT_GUI="--enable-gui=motif --with-motif-lib=\"${MOTIFLIB}\"" MOTIFHOME=${X11BASE} ${MAKE_FLAGS}
.else
diff --git a/editors/vim/files/patch-02 b/editors/vim/files/patch-02
index 61cc5494e207..0b0b26335fdc 100644
--- a/editors/vim/files/patch-02
+++ b/editors/vim/files/patch-02
@@ -1,7 +1,21 @@
---- configure.orig Thu Mar 11 07:11:42 1999
-+++ configure Mon Mar 22 10:45:57 1999
-@@ -3100,7 +3100,7 @@
- gui_libs="`echo $x_libraries|sed 's%/^/^/*$%%'` /local/Motif*/lib /local/lib/Motif* /usr/local/Motif*/lib /usr/local/lib/Motif* /usr/Motif*/lib /usr/lib/Motif* /usr/local/lib /usr/local/X11*/lib /usr/lib /usr/X11*/lib /usr/lib/X11* /usr/dt/lib $MOTIFHOME/lib `echo "$GUI_INC_LOC" | sed s/include/lib/` $GUI_LIB_LOC"
+--- 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=
for try in $gui_libs; do
- for libtry in "$try"/libXm.a "$try"/libXm.so* "$try"/libXm.sl; do
diff --git a/editors/vim5/Makefile b/editors/vim5/Makefile
index 79d98a02131c..79d43393b88a 100644
--- a/editors/vim5/Makefile
+++ b/editors/vim5/Makefile
@@ -45,7 +45,10 @@ MLINKS+= vim.1 gvim.1 vim.1 gview.1 vim.1 rgvim.1 vim.1 rgview.1
MAKE_FLAGS:= CONF_OPT_MAX="--enable-max-features" ${MAKE_FLAGS}
-.if defined(HAVE_MOTIF)
+.if defined(HAVE_GTK)
+LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+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
MAKE_FLAGS:= CONF_OPT_GUI="--enable-gui=motif --with-motif-lib=\"${MOTIFLIB}\"" MOTIFHOME=${X11BASE} ${MAKE_FLAGS}
.else
diff --git a/editors/vim5/files/patch-02 b/editors/vim5/files/patch-02
index 61cc5494e207..0b0b26335fdc 100644
--- a/editors/vim5/files/patch-02
+++ b/editors/vim5/files/patch-02
@@ -1,7 +1,21 @@
---- configure.orig Thu Mar 11 07:11:42 1999
-+++ configure Mon Mar 22 10:45:57 1999
-@@ -3100,7 +3100,7 @@
- gui_libs="`echo $x_libraries|sed 's%/^/^/*$%%'` /local/Motif*/lib /local/lib/Motif* /usr/local/Motif*/lib /usr/local/lib/Motif* /usr/Motif*/lib /usr/lib/Motif* /usr/local/lib /usr/local/X11*/lib /usr/lib /usr/X11*/lib /usr/lib/X11* /usr/dt/lib $MOTIFHOME/lib `echo "$GUI_INC_LOC" | sed s/include/lib/` $GUI_LIB_LOC"
+--- 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=
for try in $gui_libs; do
- for libtry in "$try"/libXm.a "$try"/libXm.so* "$try"/libXm.sl; do
diff --git a/editors/vim6/Makefile b/editors/vim6/Makefile
index 79d98a02131c..79d43393b88a 100644
--- a/editors/vim6/Makefile
+++ b/editors/vim6/Makefile
@@ -45,7 +45,10 @@ MLINKS+= vim.1 gvim.1 vim.1 gview.1 vim.1 rgvim.1 vim.1 rgview.1
MAKE_FLAGS:= CONF_OPT_MAX="--enable-max-features" ${MAKE_FLAGS}
-.if defined(HAVE_MOTIF)
+.if defined(HAVE_GTK)
+LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+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
MAKE_FLAGS:= CONF_OPT_GUI="--enable-gui=motif --with-motif-lib=\"${MOTIFLIB}\"" MOTIFHOME=${X11BASE} ${MAKE_FLAGS}
.else
diff --git a/editors/vim6/files/patch-02 b/editors/vim6/files/patch-02
index 61cc5494e207..0b0b26335fdc 100644
--- a/editors/vim6/files/patch-02
+++ b/editors/vim6/files/patch-02
@@ -1,7 +1,21 @@
---- configure.orig Thu Mar 11 07:11:42 1999
-+++ configure Mon Mar 22 10:45:57 1999
-@@ -3100,7 +3100,7 @@
- gui_libs="`echo $x_libraries|sed 's%/^/^/*$%%'` /local/Motif*/lib /local/lib/Motif* /usr/local/Motif*/lib /usr/local/lib/Motif* /usr/Motif*/lib /usr/lib/Motif* /usr/local/lib /usr/local/X11*/lib /usr/lib /usr/X11*/lib /usr/lib/X11* /usr/dt/lib $MOTIFHOME/lib `echo "$GUI_INC_LOC" | sed s/include/lib/` $GUI_LIB_LOC"
+--- 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=
for try in $gui_libs; do
- for libtry in "$try"/libXm.a "$try"/libXm.so* "$try"/libXm.sl; do
--
cgit debian/1.2.3+git2.25.1-1-2-gaceb0