Attachment 76495 Details for Bug 110255 – file.diff

[patch] file.diff

file.diff (text/plain), 6.98 KB, created by Martin Matuska on 2007-03-13 09:40:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Matuska

Created: 2007-03-13 09:40:04 UTC

Size: 6.98 KB

patch

obsolete

>diff -Nbur lang/tcl84.orig/Makefile lang/tcl84/Makefile
>--- lang/tcl84.orig/Makefile	Thu Mar  8 15:00:58 2007
>+++ lang/tcl84/Makefile	Mon Mar 12 18:15:47 2007
>@@ -631,14 +631,6 @@
> 	${REINPLACE_CMD} \
> 		-e 's,-DNO_MEMMOVE=1,,' -e 's,-DNO_STRING_H=1,,' \
> 		-e 's,^COMPAT_OBJS.*,,' ${WRKSRC}/Makefile
>-.if defined(NO_INSTALL_MANPAGES) || defined(WITHOUT_TCL84_MAN)
>-	${REINPLACE_CMD} -e 's|^MAN_INSTALL_DIR.*$$|MAN_INSTALL_DIR = ${WRKDIR}|' \
>-		${WRKSRC}/Makefile
>-. for mp in ${MAN1} ${MAN3} ${MANN}
>-	@${REINPLACE_CMD} -e 's|^.so man.macros|.so ${DATADIR}/man.macros|'	\
>-		${WRKSRC}/../doc/${mp}
>-. endfor
>-.endif
> .if ${BLACKHOLE} != '' && ${BLACKHOLE} != 0
> 	# ====================================================
> 	# net.inet.tcp.blackhole is non-zero. Some http-tests
>@@ -649,9 +641,14 @@
> .endif
> 
> post-install:
>-.if !defined(WITHOUT_TCL84_MAN) && !defined(NO_INSTALL_MANPAGES)
>+.if !defined(NO_INSTALL_MANPAGES) && defined(WITH_TCL84_MAN)
> 	${MKDIR} ${DATADIR}
> 	${INSTALL_DATA} ${WRKSRC}/../doc/man.macros ${DATADIR}
>+. for mp in ${MAN1} ${MAN3} ${MANN}
>+	@${REINPLACE_CMD} -e 's|^.so man.macros|.so ${DATADIR}/man.macros|'	\
>+		${WRKSRC}/../doc/${mp}
>+. endfor
>+	@cd ${WRKSRC} && ${MAKE} -f Makefile install-doc ${MAKE_ENV}
> .endif
> 
> regression-test:	build
>diff -Nbur lang/tcl84.orig/files/patch-aa lang/tcl84/files/patch-aa
>--- lang/tcl84.orig/files/patch-aa	Wed Jun 29 15:44:01 2005
>+++ lang/tcl84/files/patch-aa	Mon Mar 12 18:09:37 2007
>@@ -1,22 +1,36 @@
>---- Makefile.in	Sat Jun  4 16:39:25 2005
>-+++ Makefile.in	Thu Jun  9 07:12:23 2005
>-@@ -59,2 +59,4 @@
>+--- Makefile.in.orig	Thu Oct 19 19:26:15 2006
>++++ Makefile.in	Mon Mar 12 18:09:29 2007
>+@@ -57,6 +57,8 @@
>+ 
>+ # Directory in which to install the include file tcl.h:
>  INCLUDE_INSTALL_DIR	= $(INSTALL_ROOT)$(includedir)
> +GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic
> +UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix
>  
>-@@ -92,3 +94,3 @@
>+ # Path to the private tcl header dir:
>+ PRIVATE_INCLUDE_DIR	= @PRIVATE_INCLUDE_DIR@
>+@@ -102,7 +104,7 @@
>+ #CFLAGS			= $(CFLAGS_DEBUG)
>+ #CFLAGS			= $(CFLAGS_OPTIMIZE)
>  #CFLAGS			= $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
> -CFLAGS			= @CFLAGS_DEFAULT@ @CFLAGS@ -DTCL_DBGX=$(TCL_DBGX)
> +CFLAGS			+= @CFLAGS_DEFAULT@ @CFLAGS@ -DTCL_DBGX=$(TCL_DBGX)
>  
>-@@ -447,3 +449,4 @@
>+ # Flags to pass to the linker
>+ LDFLAGS_DEBUG		= @LDFLAGS_DEBUG@
>+@@ -463,7 +465,8 @@
>+ 
>+ all: binaries libraries doc
>  
> -binaries: ${LIB_FILE} $(STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) tclsh
> +binaries: ${LIB_FILE} $(STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) \
> +	libtcl${SHORT_TCL_VER}.a tclsh
>  
>-@@ -458,2 +461,11 @@
>+ libraries:
>+ 
>+@@ -474,6 +477,15 @@
>+ ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE}
>+ 	rm -f $@
>  	@MAKE_LIB@
> +	@ln -sf $(LIB_FILE) ./libtcl${SHORT_TCL_VER}.so
> +	if test "x@DL_OBJS@" = "xtclLoadAout.o"; then \
>@@ -28,7 +42,20 @@
> +	ar cr libtcl${SHORT_TCL_VER}.a ${OBJS}
> +	$(RANLIB) libtcl${SHORT_TCL_VER}.a
>  
>-@@ -604,2 +616,8 @@
>+ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
>+ 	rm -f $@
>+@@ -600,7 +612,7 @@
>+ dltest.marker:
>+ 	cd dltest ; $(MAKE)
>+ 
>+-INSTALL_TARGETS = install-binaries install-libraries install-doc @EXTRA_INSTALL@
>++INSTALL_TARGETS = install-binaries install-libraries @EXTRA_INSTALL@
>+ 
>+ install: $(INSTALL_TARGETS)
>+ 
>+@@ -629,6 +641,12 @@
>+ 	@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
>+ 	@@INSTALL_LIB@
>  	@chmod 555 $(LIB_INSTALL_DIR)/$(LIB_FILE)
> +	@ln -sf $(LIB_FILE) $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.so
> +	@echo "Installing libtcl${SHORT_TCL_VER}.a"
>@@ -37,7 +64,11 @@
> +	@(cd $(LIB_INSTALL_DIR); $(RANLIB) libtcl${SHORT_TCL_VER}.a)
> +	@chmod 555 $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.a
>  	@if test "$(TCL_BUILD_EXP_FILE)" != ""; then \
>-@@ -611,4 +629,5 @@
>+ 	    echo "Installing $(TCL_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
>+ 	    $(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \
>+@@ -636,8 +654,9 @@
>+ 	    fi
>+ 	@echo "Installing tclsh as $(BIN_INSTALL_DIR)/tclsh$(VERSION)"
>  	@$(INSTALL_PROGRAM) tclsh $(BIN_INSTALL_DIR)/tclsh$(VERSION)
> -	@echo "Installing tclConfig.sh to $(LIB_INSTALL_DIR)/"
> -	@$(INSTALL_DATA) tclConfig.sh $(LIB_INSTALL_DIR)/tclConfig.sh
>@@ -45,50 +76,63 @@
> +	@mkdir -p $(SCRIPT_INSTALL_DIR)
> +	@$(INSTALL_DATA) tclConfig.sh $(SCRIPT_INSTALL_DIR)/tclConfig.sh
>  	@if test "$(STUB_LIB_FILE)" != "" ; then \
>-@@ -619,3 +638,4 @@
>+ 	    echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
>+ 	    @INSTALL_STUB_LIB@ ; \
>+@@ -645,7 +664,8 @@
>+ 	@EXTRA_INSTALL_BINARIES@
>+ 
>  install-libraries: libraries
> -	@for i in $(INCLUDE_INSTALL_DIR) $(SCRIPT_INSTALL_DIR); \
> +	@for i in $(GENERIC_INCLUDE_INSTALL_DIR) $(UNIX_INCLUDE_INSTALL_DIR) \
> +		  $(SCRIPT_INSTALL_DIR); \
>  	    do \
>-@@ -641,7 +661,13 @@
>+ 	    if [ ! -d $$i ] ; then \
>+ 		echo "Making directory $$i"; \
>+@@ -667,11 +687,17 @@
>+ 	    chmod +x $(SRC_DIR)/install-sh; \
>+ 	    fi
>  	@echo "Installing header files";
> -	@for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h \
> -		$(GENERIC_DIR)/tclPlatDecls.h; \
> +	@for i in $(GENERIC_DIR)/*.h ; \
>- 	    do \
>--	    $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
>++	    do \
> +	    $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \
>- 	    done;
>++	    done;
> +	@for i in $(UNIX_DIR)/*.h ; \
>-+  	    do \
>+ 	    do \
>+-	    $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
> +	    $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \
>-+ 	    done;
>+ 	    done;
> +	@ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tcl.h $(INCLUDE_INSTALL_DIR)/tcl.h
> +	@ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tclDecls.h $(INCLUDE_INSTALL_DIR)/tclDecls.h
> +	@ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tclPlatDecls.h $(INCLUDE_INSTALL_DIR)/tclPlatDecls.h
>  	@echo "Installing library files to $(SCRIPT_INSTALL_DIR)";
>-@@ -712,18 +738,20 @@
>+ 	@for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex $(UNIX_DIR)/tclAppInit.c $(UNIX_DIR)/ldAix; \
>+ 	    do \
>+@@ -720,20 +746,22 @@
>+ 		else true; \
>  		fi; \
>  	    done;
> -	@echo "Installing and cross-linking top-level (.1) docs";
> -	@for i in $(TOP_DIR)/doc/*.1; do \
> -	    $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN1_INSTALL_DIR); \
> -	done
>-+	@echo "Installing top-level (.1) docs";
>-+	${BSD_INSTALL_MAN} $(TOP_DIR)/doc/*.1 $(MAN1_INSTALL_DIR)/
>- 
>+-
> -	@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 C API (.3) docs";
>-+	${BSD_INSTALL_MAN} $(TOP_DIR)/doc/*.3 $(MAN3_INSTALL_DIR)/
>- 
>+-
> -	@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
>++	@echo "Installing top-level (.1) docs";
>++	${BSD_INSTALL_MAN} $(TOP_DIR)/doc/*.1 $(MAN1_INSTALL_DIR)/
>++
>++	@echo "Installing C API (.3) docs";
>++	${BSD_INSTALL_MAN} $(TOP_DIR)/doc/*.3 $(MAN3_INSTALL_DIR)/
>++
> +	@echo "Installing command (.n) docs";
> +	${BSD_INSTALL_MAN} $(TOP_DIR)/doc/*.n $(MANN_INSTALL_DIR)/
> +	@echo "**********"
>@@ -101,3 +145,4 @@
> +	@echo "conflicting with another version of Tcl/Tks."
>  
>  # Optional target to install private headers
>+ install-private-headers: libraries

Actions: View | Diff

Attachments on bug 110255: 76495