aboutsummaryrefslogtreecommitdiff
path: root/x11-toolkits/gtk12/files/patch-ab
diff options
context:
space:
mode:
authorVanilla I. Shu <vanilla@FreeBSD.org>1998-08-12 10:38:28 +0000
committerVanilla I. Shu <vanilla@FreeBSD.org>1998-08-12 10:38:28 +0000
commit3ef955049d002b33ce8c53bee352bba84aa9ac01 (patch)
tree2775880e545d1f923f5efc965bcf6a3d57295468 /x11-toolkits/gtk12/files/patch-ab
parent88f83d45d8c81a59ecaeffa54fcdf46dd391e189 (diff)
downloadports-3ef955049d002b33ce8c53bee352bba84aa9ac01.tar.gz
ports-3ef955049d002b33ce8c53bee352bba84aa9ac01.zip
Notes
Diffstat (limited to 'x11-toolkits/gtk12/files/patch-ab')
-rw-r--r--x11-toolkits/gtk12/files/patch-ab108
1 files changed, 108 insertions, 0 deletions
diff --git a/x11-toolkits/gtk12/files/patch-ab b/x11-toolkits/gtk12/files/patch-ab
new file mode 100644
index 000000000000..2f9f3dea3336
--- /dev/null
+++ b/x11-toolkits/gtk12/files/patch-ab
@@ -0,0 +1,108 @@
+--- gtk-config.in.orig Wed Aug 12 18:24:01 1998
++++ gtk-config.in Wed Aug 12 18:24:15 1998
+@@ -8,7 +8,7 @@
+ exec_prefix_set=no
+
+ usage="\
+-Usage: gtk-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags]"
++Usage: gtk11-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags]"
+
+ if test $# -eq 0; then
+ echo "${usage}" 1>&2
+--- gtk.m4.orig Wed Aug 12 18:24:19 1998
++++ gtk.m4 Wed Aug 12 18:24:59 1998
+@@ -6,7 +6,7 @@
+ dnl
+ AC_DEFUN(AM_PATH_GTK,
+ [dnl
+-dnl Get the cflags and libraries from the gtk-config script
++dnl Get the cflags and libraries from the gtk11-config script
+ dnl
+ AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)],
+ gtk_config_prefix="$withval", gtk_config_prefix="")
+@@ -18,17 +18,17 @@
+ 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
+
+- AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
++ AC_PATH_PROG(GTK_CONFIG, gtk11-config, no)
+ min_gtk_version=ifelse([$1], ,0.99.7,$1)
+ AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
+ no_gtk=""
+@@ -50,7 +50,7 @@
+ LIBS="$LIBS $GTK_LIBS"
+ dnl
+ dnl Now check if the installed GTK is sufficiently new. (Also sanity
+-dnl checks the results of gtk-config to some extent
++dnl checks the results of gtk11-config to some extent
+ dnl
+ rm -f conf.gtktest
+ AC_TRY_RUN([
+@@ -77,16 +77,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) ||
+@@ -115,10 +115,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");
+ }
+@@ -136,10 +136,10 @@
+ else
+ AC_MSG_RESULT(no)
+ 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
+ :
+@@ -168,7 +168,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" ])
+ CFLAGS="$ac_save_CFLAGS"
+ LIBS="$ac_save_LIBS"
+ fi