--- a/components/tcl/tcl/patches/2.makefile.patch Tue May 10 23:37:02 2011 +0100
+++ b/components/tcl/tcl/patches/2.makefile.patch Tue May 10 17:39:30 2011 -0700
@@ -1,92 +1,60 @@
-*** tcl8.4.18/unix/Makefile.in.orig Thu Jun 14 04:46:38 2007
---- tcl8.4.18/unix/Makefile.in Thu Jun 14 04:46:49 2007
-***************
-*** 72,82 ****
-
- # Directory in which to install manual entries for Tcl's C library
- # procedures:
-! MAN3_INSTALL_DIR = $(MAN_INSTALL_DIR)/man3
-
- # Directory in which to install manual entries for the built-in
- # Tcl commands:
-! MANN_INSTALL_DIR = $(MAN_INSTALL_DIR)/mann
-
- # Path to the html documentation dir:
- HTML_DIR = @HTML_DIR@
---- 72,82 ----
-
- # Directory in which to install manual entries for Tcl's C library
- # procedures:
-! MAN3TCL_INSTALL_DIR = $(MAN_INSTALL_DIR)/man3tcl
-
- # Directory in which to install manual entries for the built-in
- # Tcl commands:
-! MAN1T_INSTALL_DIR = $(MAN_INSTALL_DIR)/man1t
-
- # Path to the html documentation dir:
- HTML_DIR = @HTML_DIR@
-***************
-*** 298,304 ****
-
- APP_CC_SWITCHES = $(CC_SWITCHES) @EXTRA_APP_CC_SWITCHES@
-
-! LIBS = @DL_LIBS@ @LIBS@ $(MATH_LIBS)
-
- DEPEND_SWITCHES = ${CFLAGS} -I${GENERIC_DIR} -I${SRC_DIR} \
- ${AC_FLAGS} ${MATH_FLAGS} \
---- 298,304 ----
-
- APP_CC_SWITCHES = $(CC_SWITCHES) @EXTRA_APP_CC_SWITCHES@
-
-! LIBS = @DL_LIBS@ @LIBS@ $(MATH_LIBS) -lc
-
- DEPEND_SWITCHES = ${CFLAGS} -I${GENERIC_DIR} -I${SRC_DIR} \
- ${AC_FLAGS} ${MATH_FLAGS} \
-***************
-*** 711,717 ****
- @if test ! -x $(UNIX_DIR)/installManPage; then \
- chmod +x $(UNIX_DIR)/installManPage; \
- fi
-! @for i in $(MAN_INSTALL_DIR) $(MAN1_INSTALL_DIR) $(MAN3_INSTALL_DIR) $(MANN_INSTALL_DIR) ; \
- do \
- if [ ! -d $$i ] ; then \
- echo "Making directory $$i"; \
---- 711,717 ----
- @if test ! -x $(UNIX_DIR)/installManPage; then \
- chmod +x $(UNIX_DIR)/installManPage; \
- fi
-! @for i in $(MAN_INSTALL_DIR) $(MAN1_INSTALL_DIR) $(MAN3TCL_INSTALL_DIR) $(MAN1T_INSTALL_DIR) ; \
- do \
- if [ ! -d $$i ] ; then \
- echo "Making directory $$i"; \
-***************
-*** 725,738 ****
- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN1_INSTALL_DIR); \
- done
-
-! @echo "Installing and cross-linking C API (.3) docs";
-! @for i in $(TOP_DIR)/doc/*.3; do \
-! $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN3_INSTALL_DIR); \
- done
-
-! @echo "Installing and cross-linking command (.n) docs";
-! @for i in $(TOP_DIR)/doc/*.n; do \
-! $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MANN_INSTALL_DIR); \
- done
-
- # Optional target to install private headers
---- 725,738 ----
- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN1_INSTALL_DIR); \
- done
-
-! @echo "Installing and cross-linking C API (.3tcl) docs";
-! @for i in $(TOP_DIR)/doc/*.3tcl; do \
-! $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN3TCL_INSTALL_DIR); \
- done
-
-! @echo "Installing and cross-linking command (.1t) docs";
-! @for i in $(TOP_DIR)/doc/*.1t; do \
-! $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN1T_INSTALL_DIR); \
- done
-
- # Optional target to install private headers
+--- tcl8.5.9/unix/Makefile.in.~1~ Wed Sep 8 10:40:48 2010
++++ tcl8.5.9/unix/Makefile.in Wed Apr 13 20:53:04 2011
+@@ -69,10 +69,10 @@
+ MAN1_INSTALL_DIR = $(MAN_INSTALL_DIR)/man1
+
+ # Directory in which to install manual entries for Tcl's C library procedures:
+-MAN3_INSTALL_DIR = $(MAN_INSTALL_DIR)/man3
++MAN3TCL_INSTALL_DIR = $(MAN_INSTALL_DIR)/man3tcl
+
+ # Directory in which to install manual entries for the built-in Tcl commands:
+-MANN_INSTALL_DIR = $(MAN_INSTALL_DIR)/mann
++MAN1T_INSTALL_DIR = $(MAN_INSTALL_DIR)/man1t
+
+ # Path to the html documentation dir:
+ HTML_DIR = @HTML_DIR@
+@@ -264,7 +264,7 @@
+
+ APP_CC_SWITCHES = $(CC_SWITCHES) @EXTRA_APP_CC_SWITCHES@
+
+-LIBS = @TCL_LIBS@
++LIBS = @TCL_LIBS@ -lc
+
+ DEPEND_SWITCHES = ${CFLAGS} -I${UNIX_DIR} -I${GENERIC_DIR} \
+ ${AC_FLAGS} ${PROTO_FLAGS} ${EXTRA_CFLAGS} @EXTRA_CC_SWITCHES@
+@@ -820,7 +820,7 @@
+ $(TOP_DIR)/library/msgs "$(SCRIPT_INSTALL_DIR)"/msgs
+
+ install-doc: doc
+- @for i in "$(MAN_INSTALL_DIR)" "$(MAN1_INSTALL_DIR)" "$(MAN3_INSTALL_DIR)" "$(MANN_INSTALL_DIR)" ; \
++ @for i in "$(MAN_INSTALL_DIR)" "$(MAN1_INSTALL_DIR)" "$(MAN3TCL_INSTALL_DIR)" "$(MAN1T_INSTALL_DIR)" ; \
+ do \
+ if [ ! -d "$$i" ] ; then \
+ echo "Making directory $$i"; \
+@@ -833,17 +833,18 @@
+ @for i in $(TOP_DIR)/doc/*.1; do \
+ $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN1_INSTALL_DIR)"; \
+ done
+-
+- @echo "Installing and cross-linking C API (.3) docs";
+- @for i in $(TOP_DIR)/doc/*.3; do \
+- $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN3_INSTALL_DIR)"; \
++
++ @echo "Installing and cross-linking C API (.3tcl) docs";
++ @for i in $(TOP_DIR)/doc/*.3tcl; do \
++ $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN3TCL_INSTALL_DIR)"; \
+ done
+-
+- @echo "Installing and cross-linking command (.n) docs";
+- @for i in $(TOP_DIR)/doc/*.n; do \
+- $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MANN_INSTALL_DIR)"; \
++
++ @echo "Installing and cross-linking command (.1t) docs";
++ @for i in $(TOP_DIR)/doc/*.1t; do \
++ $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN1T_INSTALL_DIR)"; \
+ done
+
++
+ # Optional target to install private headers
+ install-private-headers: libraries
+ @for i in "$(PRIVATE_INCLUDE_INSTALL_DIR)"; \