From owner-freebsd-ports Tue Feb 6 10:10:24 2001 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 01BF037B4EC for ; Tue, 6 Feb 2001 10:10:03 -0800 (PST) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.1/8.11.1) id f16IA2667532; Tue, 6 Feb 2001 10:10:02 -0800 (PST) (envelope-from gnats) Received: from e-devil.org (port42.msx12-sta.ppp.cybercity.no [62.66.242.43]) by hub.freebsd.org (Postfix) with ESMTP id 6769437B4EC for ; Tue, 6 Feb 2001 10:04:07 -0800 (PST) Received: (from e-devil@localhost) by e-devil.org (8.11.2/8.11.2) id f16I4Uf00825; Tue, 6 Feb 2001 19:04:30 +0100 (CET) (envelope-from e-devil) Message-Id: <200102061804.f16I4Uf00825@e-devil.org> Date: Tue, 6 Feb 2001 19:04:30 +0100 (CET) From: e-devil@e-devil.org Reply-To: e-devil@e-devil.org To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: ports/24908: using m4 instead of gnu m4, and did not find gtk Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 24908 >Category: ports >Synopsis: using m4 instead of gnu m4, and did not find gtk >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Feb 06 10:10:01 PST 2001 >Closed-Date: >Last-Modified: >Originator: Oyvind Albrigtsen >Release: FreeBSD 4.2-STABLE i386 >Organization: >Environment: FreeBSD 4.2-STABLE >Description: the FvwmM4 module is using m4 instead of gnu m4, which makes the module unusuable, and the configure script doesn't detect gtk. >How-To-Repeat: >Fix: diff -uNr fvwm2-beta.orig/files/patch-configure fvwm2-beta/files/patch-configure --- fvwm2-beta.orig/files/patch-configure Thu Jan 1 01:00:00 1970 +++ fvwm2-beta/files/patch-configure Sun Feb 4 16:19:14 2001 @@ -0,0 +1,81 @@ +--- configure.orig Fri Feb 2 15:59:31 2001 ++++ configure Fri Feb 2 16:01:15 2001 +@@ -5458,18 +5458,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/gtk12-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/gtk12-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 "gtk12-config", so it can be a program name with args. ++set dummy gtk12-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 + echo "configure:5475: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then +@@ -5555,16 +5555,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*** 'gtk12-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 gtk12-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 gtk12-config was wrong, set the environment variable GTK_CONFIG\n"); ++ printf("*** to point to the correct copy of gtk12-config, and remove the file config.cache\n"); + printf("*** before re-running configure\n"); + } + #if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION) +@@ -5595,10 +5595,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 gtk12-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 gtk12-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"); + } +@@ -5629,10 +5629,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 gtk12-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 gtk12-config." + else + if test -f conf.gtktest ; then + : +@@ -5674,7 +5674,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 gtk12-config script: $GTK_CONFIG" + fi + rm -f conftest* + CFLAGS="$ac_save_CFLAGS" diff -uNr fvwm2-beta.orig/files/patch-fvwmm4.c fvwm2-beta/files/patch-fvwmm4.c --- fvwm2-beta.orig/files/patch-fvwmm4.c Thu Jan 1 01:00:00 1970 +++ fvwm2-beta/files/patch-fvwmm4.c Sun Feb 4 16:19:14 2001 @@ -0,0 +1,11 @@ +--- modules/FvwmM4/FvwmM4.c.orig Fri Feb 2 16:04:52 2001 ++++ modules/FvwmM4/FvwmM4.c Fri Feb 2 16:05:02 2001 +@@ -69,7 +69,7 @@ + int m4_prefix; /* Do GNU m4 prefixing (-P) */ + char m4_options[BUFSIZ]; /* Command line options to m4 */ + char m4_outfile[BUFSIZ] = ""; /* The output filename for m4 */ +-char *m4_prog = "m4"; /* Name of the m4 program */ ++char *m4_prog = "gm4"; /* Name of the m4 program */ + int m4_default_quotes; /* Use default m4 quotes */ + char *m4_startquote = "`"; /* Left quote characters for m4 */ + char *m4_endquote = "'"; /* Right quote characters for m4 */ >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message