* Matthieu Herrb wrote:
> the attached patch, shuts up many automake warnings on tcl.m4 (warning:
> underquoted definition of SC_BLAH).
>
> It helps shortening my xenocara build logs.
>
> (There are a few more ports that need the same kind of patches, but Tcl
> is by far the most annoying one).
bump the pkgname and then it's ok mbalmer.
> --
> Matthieu Herrb
> Index: patches/patch-tcl_m4
> ===================================================================
> RCS file: /cvs/ports/lang/tcl/8.4/patches/patch-tcl_m4,v
> retrieving revision 1.7
> diff -u -r1.7 patch-tcl_m4
> --- patches/patch-tcl_m4 18 Oct 2006 13:10:37 -0000 1.7
> +++ patches/patch-tcl_m4 26 Nov 2006 13:25:53 -0000
> @@ -1,5 +1,104 @@
> ---- tcl.m4.orig Mon Jul 26 23:40:46 2004
> -+++ tcl.m4 Wed Oct 18 13:39:29 2006
> +--- tcl.m4.orig Mon Jul 26 22:40:46 2004
> ++++ tcl.m4 Sun Nov 26 13:21:42 2006
> +@@ -17,7 +17,7 @@
> + # the tclConfig.sh file
> + #------------------------------------------------------------------------
> +
> +-AC_DEFUN(SC_PATH_TCLCONFIG, [
> ++AC_DEFUN([SC_PATH_TCLCONFIG], [
> + #
> + # Ok, lets find the tcl configuration
> + # First, look for one uninstalled.
> +@@ -121,7 +121,7 @@ AC_DEFUN(SC_PATH_TCLCONFIG, [
> + # the tkConfig.sh file
> + #------------------------------------------------------------------------
> +
> +-AC_DEFUN(SC_PATH_TKCONFIG, [
> ++AC_DEFUN([SC_PATH_TKCONFIG], [
> + #
> + # Ok, lets find the tk configuration
> + # First, look for one uninstalled.
> +@@ -224,7 +224,7 @@ AC_DEFUN(SC_PATH_TKCONFIG, [
> + #
> + #------------------------------------------------------------------------
> +
> +-AC_DEFUN(SC_LOAD_TCLCONFIG, [
> ++AC_DEFUN([SC_LOAD_TCLCONFIG], [
> + AC_MSG_CHECKING([for existence of $TCL_BIN_DIR/tclConfig.sh])
> +
> + if test -f "$TCL_BIN_DIR/tclConfig.sh" ; then
> +@@ -290,7 +290,7 @@ AC_DEFUN(SC_LOAD_TCLCONFIG, [
> + # TK_BIN_DIR
> + #------------------------------------------------------------------------
> +
> +-AC_DEFUN(SC_LOAD_TKCONFIG, [
> ++AC_DEFUN([SC_LOAD_TKCONFIG], [
> + AC_MSG_CHECKING([for existence of $TK_BIN_DIR/tkConfig.sh])
> +
> + if test -f "$TK_BIN_DIR/tkConfig.sh" ; then
> +@@ -327,7 +327,7 @@ AC_DEFUN(SC_LOAD_TKCONFIG, [
> + # SHARED_BUILD Value of 1 or 0
> + #------------------------------------------------------------------------
> +
> +-AC_DEFUN(SC_ENABLE_SHARED, [
> ++AC_DEFUN([SC_ENABLE_SHARED], [
> + AC_MSG_CHECKING([how to build libraries])
> + AC_ARG_ENABLE(shared,
> + [ --enable-shared build and link with shared libraries
> [--enable-shared]],
> +@@ -367,7 +367,7 @@ AC_DEFUN(SC_ENABLE_SHARED, [
> + # FRAMEWORK_BUILD Value of 1 or 0
> + #------------------------------------------------------------------------
> +
> +-AC_DEFUN(SC_ENABLE_FRAMEWORK, [
> ++AC_DEFUN([SC_ENABLE_FRAMEWORK], [
> + AC_MSG_CHECKING([how to package libraries])
> + AC_ARG_ENABLE(framework,
> + [ --enable-framework package shared libraries in MacOSX
> frameworks [--disable-framework]],
> +@@ -418,7 +418,7 @@ AC_DEFUN(SC_ENABLE_FRAMEWORK, [
> + #
> + #------------------------------------------------------------------------
> +
> +-AC_DEFUN(SC_ENABLE_THREADS, [
> ++AC_DEFUN([SC_ENABLE_THREADS], [
> + AC_MSG_CHECKING(for building with threads)
> + AC_ARG_ENABLE(threads, [ --enable-threads build with threads],
> + [tcl_ok=$enableval], [tcl_ok=no])
> +@@ -515,7 +515,7 @@ AC_DEFUN(SC_ENABLE_THREADS, [
> + #
> + #------------------------------------------------------------------------
> +
> +-AC_DEFUN(SC_ENABLE_SYMBOLS, [
> ++AC_DEFUN([SC_ENABLE_SYMBOLS], [
> + AC_MSG_CHECKING([for build with symbols])
> + AC_ARG_ENABLE(symbols, [ --enable-symbols build with debugging
> symbols [--disable-symbols]], [tcl_ok=$enableval], [tcl_ok=no])
> + # FIXME: Currently, LDFLAGS_DEFAULT is not used, it should work like
> CFLAGS_DEFAULT.
> +@@ -572,7 +572,7 @@ AC_DEFUN(SC_ENABLE_SYMBOLS, [
> + #
> + #------------------------------------------------------------------------
> +
> +-AC_DEFUN(SC_ENABLE_LANGINFO, [
> ++AC_DEFUN([SC_ENABLE_LANGINFO], [
> + AC_ARG_ENABLE(langinfo,
> + [ --enable-langinfo use nl_langinfo if possible to determine
> + encoding at startup, otherwise use old heuristic],
> +@@ -619,7 +619,7 @@ AC_DEFUN(SC_ENABLE_LANGINFO, [
> + # according to the user's selection.
> + #
> + #--------------------------------------------------------------------
> +-AC_DEFUN(SC_CONFIG_MANPAGES, [
> ++AC_DEFUN([SC_CONFIG_MANPAGES], [
> +
> + AC_MSG_CHECKING([whether to use symlinks for manpages])
> + AC_ARG_ENABLE(man-symlinks,
> +@@ -736,7 +736,7 @@ AC_DEFUN(SC_CONFIG_MANPAGES, [
> + #
> + #--------------------------------------------------------------------
> +
> +-AC_DEFUN(SC_CONFIG_CFLAGS, [
> ++AC_DEFUN([SC_CONFIG_CFLAGS], [
> +
> + # Step 0.a: Enable 64 bit support?
> +
> @@ -1256,24 +1256,42 @@ dnl AC_CHECK_TOOL(AR, ar)
> TCL_LIB_VERSIONS_OK=nodots
> ;;
> @@ -58,3 +157,93 @@
>
> # OpenBSD doesn't do version numbers with dots.
> UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
> +@@ -1817,7 +1835,7 @@ dnl esac
> + #
> + #--------------------------------------------------------------------
> +
> +-AC_DEFUN(SC_SERIAL_PORT, [
> ++AC_DEFUN([SC_SERIAL_PORT], [
> + AC_CHECK_HEADERS(sys/modem.h)
> + AC_MSG_CHECKING([termios vs. termio vs. sgtty])
> + AC_CACHE_VAL(tcl_cv_api_serial, [
> +@@ -1946,7 +1964,7 @@ int main() {
> + #
> + #--------------------------------------------------------------------
> +
> +-AC_DEFUN(SC_MISSING_POSIX_HEADERS, [
> ++AC_DEFUN([SC_MISSING_POSIX_HEADERS], [
> + AC_MSG_CHECKING(dirent.h)
> + AC_TRY_LINK([#include <sys/types.h>
> + #include <dirent.h>], [
> +@@ -2027,7 +2045,7 @@ closedir(d);
> + #
> + #--------------------------------------------------------------------
> +
> +-AC_DEFUN(SC_PATH_X, [
> ++AC_DEFUN([SC_PATH_X], [
> + AC_PATH_X
> + not_really_there=""
> + if test "$no_x" = ""; then
> +@@ -2112,7 +2130,7 @@ AC_DEFUN(SC_PATH_X, [
> + #
> + #--------------------------------------------------------------------
> +
> +-AC_DEFUN(SC_BLOCKING_STYLE, [
> ++AC_DEFUN([SC_BLOCKING_STYLE], [
> + AC_CHECK_HEADERS(sys/ioctl.h)
> + AC_CHECK_HEADERS(sys/filio.h)
> + AC_MSG_CHECKING([FIONBIO vs. O_NONBLOCK for nonblocking I/O])
> +@@ -2177,7 +2195,7 @@ AC_DEFUN(SC_BLOCKING_STYLE, [
> + #
> + #--------------------------------------------------------------------
> +
> +-AC_DEFUN(SC_TIME_HANDLER, [
> ++AC_DEFUN([SC_TIME_HANDLER], [
> + AC_CHECK_HEADERS(sys/time.h)
> + AC_HEADER_TIME
> + AC_STRUCT_TIMEZONE
> +@@ -2254,7 +2272,7 @@ AC_DEFUN(SC_TIME_HANDLER, [
> + #
> + #--------------------------------------------------------------------
> +
> +-AC_DEFUN(SC_BUGGY_STRTOD, [
> ++AC_DEFUN([SC_BUGGY_STRTOD], [
> + AC_CHECK_FUNC(strtod, tcl_strtod=1, tcl_strtod=0)
> + if test "$tcl_strtod" = 1; then
> + AC_MSG_CHECKING([for Solaris2.4/Tru64 strtod bugs])
> +@@ -2316,7 +2334,7 @@ AC_DEFUN(SC_BUGGY_STRTOD, [
> + #
> + #--------------------------------------------------------------------
> +
> +-AC_DEFUN(SC_TCL_LINK_LIBS, [
> ++AC_DEFUN([SC_TCL_LINK_LIBS], [
> + #--------------------------------------------------------------------
> + # On a few very rare systems, all of the libm.a stuff is
> + # already in libc.a. Set compiler flags accordingly.
> +@@ -2392,7 +2410,7 @@ AC_DEFUN(SC_TCL_LINK_LIBS, [
> + #
> + #--------------------------------------------------------------------
> +
> +-AC_DEFUN(SC_TCL_EARLY_FLAG,[
> ++AC_DEFUN([SC_TCL_EARLY_FLAG],[
> + AC_CACHE_VAL([tcl_cv_flag_]translit($1,[A-Z],[a-z]),
> + AC_TRY_COMPILE([$2], $3, [tcl_cv_flag_]translit($1,[A-Z],[a-z])=no,
> + AC_TRY_COMPILE([[#define ]$1[ 1
> +@@ -2404,7 +2422,7 @@ AC_DEFUN(SC_TCL_EARLY_FLAG,[
> + tcl_flags="$tcl_flags $1"
> + fi])
> +
> +-AC_DEFUN(SC_TCL_EARLY_FLAGS,[
> ++AC_DEFUN([SC_TCL_EARLY_FLAGS],[
> + AC_MSG_CHECKING([for required early compiler flags])
> + tcl_flags=""
> + SC_TCL_EARLY_FLAG(_ISOC99_SOURCE,[#include <stdlib.h>],
> +@@ -2436,7 +2454,7 @@ AC_DEFUN(SC_TCL_EARLY_FLAGS,[
> + #
> + #--------------------------------------------------------------------
> +
> +-AC_DEFUN(SC_TCL_64BIT_FLAGS, [
> ++AC_DEFUN([SC_TCL_64BIT_FLAGS], [
> + AC_MSG_CHECKING([for 64-bit integer type])
> + AC_CACHE_VAL(tcl_cv_type_64bit,[
> + tcl_cv_type_64bit=none
