This commit was manufactured by cvs2svn to create tag 'RELEASE_7_0_0'.release/7.0.0

1 files changed, 0 insertions, 153 deletions

diff --git a/x11-toolkits/tk86/files/patch-unix::Makefile.in b/x11-toolkits/tk86/files/patch-unix::Makefile.in
deleted file mode 100644
index 41cb203401c0..000000000000
--- a/x11-toolkits/tk86/files/patch-unix::Makefile.in
+++ /dev/null
@@ -1,153 +0,0 @@
---- Makefile.in.orig	2007-09-24 18:09:13.000000000 +0200
-+++ Makefile.in	2007-09-27 20:55:50.000000000 +0200
-@@ -65,6 +65,8 @@
- 
- # Directory in which to install the include file tk.h:
- INCLUDE_INSTALL_DIR	= $(INSTALL_ROOT)$(includedir)
-+GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic
-+UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix
- 
- # Path to the private tk header dir:
- PRIVATE_INCLUDE_DIR	= @PRIVATE_INCLUDE_DIR@
-@@ -95,7 +97,7 @@
- # The directory containing the Tcl sources and headers appropriate
- # for this version of Tk ("srcdir" will be replaced or has already
- # been replaced by the configure script):
--TCL_GENERIC_DIR		= @TCL_SRC_DIR@/generic
-+TCL_GENERIC_DIR		= @prefix@/include/tcl@TCL_VERSION@/generic
- 
- # The directory containing the platform specific Tcl sources and headers
- # appropriate for this version of Tk:
-@@ -109,7 +111,7 @@
- TCL_LIB_FLAG		= @TCL_LIB_FLAG@
- 
- # Flag, 1: we're building a shared lib, 0 we're not
--TK_SHARED_BUILD		= @TK_SHARED_BUILD@
-+TK_SHARED_BUILD		= #@TK_SHARED_BUILD@
- 
- # Subdirectory of $(libdir) containing the pkgIndex.tcl file for loadable Tk
- TK_PKG_DIR		= @TK_PKG_DIR@
-@@ -132,7 +134,7 @@
- #CFLAGS			= $(CFLAGS_DEBUG)
- #CFLAGS			= $(CFLAGS_OPTIMIZE)
- #CFLAGS			= $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
--CFLAGS			= @CFLAGS_DEFAULT@ @CFLAGS@
-+CFLAGS			+= @CFLAGS_DEFAULT@ @CFLAGS@
- 
- # Flags to pass to the linker
- LDFLAGS_DEBUG		= @LDFLAGS_DEBUG@
-@@ -267,7 +269,7 @@
- STLIB_LD		= @STLIB_LD@
- SHLIB_LD		= @SHLIB_LD@
- SHLIB_LD_LIBS		= @SHLIB_LD_LIBS@
--TK_SHLIB_LD_EXTRAS	= @TK_SHLIB_LD_EXTRAS@
-+TK_SHLIB_LD_EXTRAS	= @TCL_SHLIB_LD_EXTRAS@
- 
- # Additional search flags needed to find the various shared libraries
- # at run-time.  The first symbol is for use when creating a binary
-@@ -552,6 +554,8 @@
- 	$(GENERIC_DIR)/tkIntPlatDecls.h $(GENERIC_DIR)/tkPort.h \
- 	$(TTK_HDRS) $(@TK_WINDOWINGSYSTEM@_PRIVATE_HDRS)
- 
-+INSTALL_HDRS = tk.h tkDecls.h tkInt.h tkIntXlibDecls.h
-+
- DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget
- 
- SHELL_ENV = \
-@@ -577,6 +581,12 @@
- ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} @LIB_RSRC_FILE@
- 	rm -f $@
- 	@MAKE_LIB@
-+	ln -sf @TK_LIB_FILE@ libtk${SHORT_TK_VER}.so
-+
-+libtk${SHORT_TK_VER}.a: ${OBJS}
-+	rm -f libtk${SHORT_TK_VER}.a
-+	ar cr libtk${SHORT_TK_VER}.a ${OBJS}
-+	$(RANLIB) libtk${SHORT_TK_VER}.a
- 
- ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
- 	rm -f $@
-@@ -676,7 +686,7 @@
- 	gdb ./wish --command=gdb.run
- 	rm gdb.run
- 
--INSTALL_TARGETS = install-binaries install-libraries install-demos install-doc @EXTRA_INSTALL@
-+INSTALL_TARGETS = install-binaries install-libraries install-demos @EXTRA_INSTALL@
- 
- install: $(INSTALL_TARGETS)
- 
-@@ -689,7 +699,8 @@
- # some ranlibs write to current directory, and this might not always be
- # possible (e.g. if installing as root).
- 
--install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) wish
-+install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) \
-+	libtk${SHORT_TK_VER}.a wish
- 	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) $(PKG_INSTALL_DIR); \
- 	    do \
- 	    if [ ! -d $$i ] ; then \
-@@ -721,10 +732,15 @@
- 	    $(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \
- 			$(LIB_INSTALL_DIR)/$(TK_EXP_FILE); \
- 	    fi
-+	@ln -sf $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) $(LIB_INSTALL_DIR)/libtk${SHORT_TK_VER}.so
-+	@echo "Installing libtk${SHORT_TK_VER}.a"
-+	@$(INSTALL_DATA) libtk${SHORT_TK_VER}.a $(LIB_INSTALL_DIR)/libtk${SHORT_TK_VER}.a
-+	@chmod 555 $(LIB_INSTALL_DIR)/libtk${SHORT_TK_VER}.a
- 	@echo "Installing wish as $(BIN_INSTALL_DIR)/wish$(VERSION)"
- 	@$(INSTALL_PROGRAM) wish $(BIN_INSTALL_DIR)/wish$(VERSION)
--	@echo "Installing tkConfig.sh to $(LIB_INSTALL_DIR)/"
--	@$(INSTALL_DATA) tkConfig.sh $(LIB_INSTALL_DIR)/tkConfig.sh
-+	@echo "Installing tkConfig.sh to $(LIB_INSTALL_DIR)/tk$(VERSION)"
-+	@mkdir -p $(LIB_INSTALL_DIR)/tk$(VERSION)
-+	@$(INSTALL_DATA) tkConfig.sh $(LIB_INSTALL_DIR)/tk$(VERSION)/tkConfig.sh
- 	@if test "$(STUB_LIB_FILE)" != "" ; then \
- 	    echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
- 	    @INSTALL_STUB_LIB@ ; \
-@@ -735,6 +751,7 @@
- 	@if test "$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)" != ""; then \
- 	    XLIB_INCLUDE_INSTALL_DIR=$(INCLUDE_INSTALL_DIR)/X11; fi; \
- 	for i in $(INCLUDE_INSTALL_DIR) $${XLIB_INCLUDE_INSTALL_DIR} \
-+		$(GENERIC_INCLUDE_INSTALL_DIR) $(UNIX_INCLUDE_INSTALL_DIR) \
- 		$(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images \
- 		$(SCRIPT_INSTALL_DIR)/msgs $(SCRIPT_INSTALL_DIR)/ttk; \
- 	    do \
-@@ -749,10 +766,14 @@
- 	    chmod +x $(SRC_DIR)/install-sh; \
- 	    fi
- 	@echo "Installing header files";
--	@for i in $(PUBLIC_HDRS); \
-+	${BSD_INSTALL_DATA} $(GENERIC_DIR)/*.h $(GENERIC_INCLUDE_INSTALL_DIR)/
-+	${BSD_INSTALL_DATA} $(UNIX_DIR)/*.h $(UNIX_INCLUDE_INSTALL_DIR)/
-+	@for i in $(INSTALL_HDRS) ; \
- 	    do \
--	    $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
--	    done;
-+	    j=`basename $$i` ; \
-+	    ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/$$j $(INCLUDE_INSTALL_DIR)/$$j ; \
-+	done
-+
- 	@list='$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)'; for i in $$list ; \
- 	    do \
- 	    $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR)/X11; \
-@@ -832,17 +853,17 @@
- 	    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); \
-+	    ${BSD_INSTALL_MAN} $$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); \
-+	    ${BSD_INSTALL_MAN} $$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); \
-+	    ${BSD_INSTALL_MAN} $$i $(MANN_INSTALL_DIR); \
- 	done
- 
- # Optional target to install private headers