GNOME support libraries.

PR:		ports/7656
Submitted by:	Yukihiro Nakai <Nakai@technologist.com>

3 files changed, 143 insertions, 0 deletions

diff --git a/x11/libgnome/files/patch-aa b/x11/libgnome/files/patch-aa
new file mode 100644
index 0000000..df73c8c
--- /dev/null
+++ b/x11/libgnome/files/patch-aa
@@ -0,0 +1,108 @@
+--- configure.orig	Fri Aug 14 07:36:30 1998
++++ configure	Wed Aug 26 20:19:08 1998
+@@ -78,6 +78,8 @@
+ # Initialize some other variables.
+ subdirs=
+ MFLAGS= MAKEFLAGS=
++CFLAGS='-I../intl -I/usr/X11R6/include -I/usr/local/include'
++LDFLAGS='-L/usr/X11R6/lib -L/usr/local/lib'
+ # Maximum number of lines to put in a shell here document.
+ ac_max_here_lines=12
+ 
+@@ -1837,18 +1839,18 @@
+   if test x$gtk_config_exec_prefix != x ; then
+      gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
+      if test x${GTK_CONFIG+set} != xset ; then
+-        GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
++        GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk11-config
+      fi
+   fi
+   if test x$gtk_config_prefix != x ; then
+      gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
+      if test x${GTK_CONFIG+set} != xset ; then
+-        GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
++        GTK_CONFIG=$gtk_config_prefix/bin/gtk11-config
+      fi
+   fi
+ 
+-  # Extract the first word of "gtk-config", so it can be a program name with args.
+-set dummy gtk-config; ac_word=$2
++  # Extract the first word of "gtk11-config", so it can be a program name with args.
++set dummy gtk11-config; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+ echo "configure:1854: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
+@@ -1930,16 +1932,16 @@
+       (gtk_minor_version != $gtk_config_minor_version) ||
+       (gtk_micro_version != $gtk_config_micro_version))
+     {
+-      printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
++      printf("\n*** 'gtk11-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
+              $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
+              gtk_major_version, gtk_minor_version, gtk_micro_version);
+-      printf ("*** was found! If gtk-config was correct, then it is best\n");
++      printf ("*** was found! If gtk11-config was correct, then it is best\n");
+       printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
+       printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+       printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
+       printf("*** required on your system.\n");
+-      printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
+-      printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
++      printf("*** If gtk11-config was wrong, set the environment variable GTK_CONFIG\n");
++      printf("*** to point to the correct copy of gtk11-config, and remove the file config.cache\n");
+       printf("*** before re-running configure\n");
+     } 
+   else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
+@@ -1968,10 +1970,10 @@
+         printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
+         printf("***\n");
+         printf("*** If you have already installed a sufficiently new version, this error\n");
+-        printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
++        printf("*** probably means that the wrong copy of the gtk11-config shell script is\n");
+         printf("*** being found. The easiest way to fix this is to remove the old version\n");
+         printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
+-        printf("*** correct copy of gtk-config. (In this case, you will have to\n");
++        printf("*** correct copy of gtk11-config. (In this case, you will have to\n");
+         printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+         printf("*** so that the correct libraries are found at run-time))\n");
+       }
+@@ -2002,10 +2004,10 @@
+   else
+      echo "$ac_t""no" 1>&6
+      if test "$GTK_CONFIG" = "no" ; then
+-       echo "*** The gtk-config script installed by GTK could not be found"
++       echo "*** The gtk11-config script installed by GTK could not be found"
+        echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
+        echo "*** your path, or set the GTK_CONFIG environment variable to the"
+-       echo "*** full path to gtk-config."
++       echo "*** full path to gtk11-config."
+      else
+        if test -f conf.gtktest ; then
+         :
+@@ -2047,7 +2049,7 @@
+    echo "*** The test program failed to compile or link. See the file config.log for the"
+           echo "*** exact error that occured. This usually means GTK was incorrectly installed"
+           echo "*** or that you have moved GTK since it was installed. In the latter case, you"
+-          echo "*** may want to edit the gtk-config script: $GTK_CONFIG" 
++          echo "*** may want to edit the gtk11-config script: $GTK_CONFIG" 
+ fi
+ rm -f conftest*
+           CFLAGS="$ac_save_CFLAGS"
+@@ -6158,7 +6160,7 @@
+   cat > conftest.$ac_ext <<EOF
+ #line 6160 "configure"
+ #include "confdefs.h"
+-#include <gif_lib.h>
++#include <giflib/gif_lib.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+ { (eval echo configure:6165: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+@@ -6362,7 +6364,7 @@
+ GNOME_LIBDIR='-L${libdir}'
+ GNOME_INCLUDEDIR='-I${includedir}'
+ if test "$need_gnome_support" = yes; then
+-   GNOME_INCLUDEDIR="$GNOME_INCLUDEDIR -DNEED_GNOMESUPPORT_H -I\${pkglibdir}/include"
++   GNOME_INCLUDEDIR="$GNOME_INCLUDEDIR -DNEED_GNOMESUPPORT_H"
+ fi
+ 
+ 
diff --git a/x11/libgnome/files/patch-ac b/x11/libgnome/files/patch-ac
new file mode 100644
index 0000000..88f5d38
--- /dev/null
+++ b/x11/libgnome/files/patch-ac
@@ -0,0 +1,24 @@
+--- gnome-config.in.orig	Wed Aug 26 19:16:24 1998
++++ gnome-config.in	Wed Aug 26 19:16:57 1998
+@@ -36,7 +36,7 @@
+     glib	(calls glib-config)
+     gnome
+     gnomeui
+-    gtk		(calls gtk-config)
++    gtk11	(calls gtk11-config)
+     gtkxmhtml	(only --libs)
+     zvt		(only --libs)
+ 
+@@ -92,9 +92,9 @@
+ 	the_libs="$the_libs `glib-config --libs`"
+ 	the_flags="$the_flags `glib-config --cflags`"
+ 	;;
+-    gtk)
+-	the_libs="$the_libs `gtk-config --libs`"
+-	the_flags="$the_flags `gtk-config --cflags`"
++    gtk11)
++	the_libs="$the_libs `gtk11-config --libs`"
++	the_flags="$the_flags `gtk11-config --cflags`"
+ 	;;
+     gnome)
+        	the_libs="$the_libs @GNOME_LIBDIR@ @GNOME_LIBS@"
diff --git a/x11/libgnome/files/patch-ad b/x11/libgnome/files/patch-ad
new file mode 100644
index 0000000..7cc2032
--- /dev/null
+++ b/x11/libgnome/files/patch-ad
@@ -0,0 +1,11 @@
+--- libgnome/gnome-help.c.orig	Tue Sep  1 13:30:25 1998
++++ libgnome/gnome-help.c	Tue Sep  1 13:30:44 1998
+@@ -35,7 +35,7 @@
+       lang= language_list->data;
+ 
+       buf= g_string_new (NULL);
+-      g_string_sprintf (buf, "gnome/help/%s/%s/%s", app, lang, path);
++      g_string_sprintf (buf, "help/%s/%s/%s", app, lang, path);
+       res= (gchar *)gnome_unconditional_datadir_file (buf->str);
+       p = strrchr(res, '#');
+       if (p)