diff options
Diffstat (limited to 'x11-toolkits/tk84/files/patch-ab')
| -rw-r--r-- | x11-toolkits/tk84/files/patch-ab | 118 |
1 files changed, 0 insertions, 118 deletions
diff --git a/x11-toolkits/tk84/files/patch-ab b/x11-toolkits/tk84/files/patch-ab deleted file mode 100644 index d8114a482761..000000000000 --- a/x11-toolkits/tk84/files/patch-ab +++ /dev/null @@ -1,118 +0,0 @@ ---- Makefile.in.orig Sat May 6 06:40:23 2000 -+++ Makefile.in Wed May 10 17:32:06 2000 -@@ -58,6 +58,8 @@ - - # Directory in which to install the include file tk.h: --INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) -+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)/tk$(VERSION) -+GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic -+UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix - - # Top-level directory for manual entries: - MAN_INSTALL_DIR = $(INSTALL_ROOT)$(mandir) -@@ -205,7 +207,7 @@ - # Libraries to use when linking. This definition is determined by the - # configure script. - LIBS = @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc --WISH_LIBS = $(TCL_LIB_SPEC) @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc -+WISH_LIBS = -L${PREFIX}/lib -ltcl${SHORT_TK_VER} @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc - - # The symbol below provides support for dynamic loading and shared - # libraries. See configure.in for a description of what it means. -@@ -378,8 +380,14 @@ - ${TK_LIB_FILE}: ${OBJS} - rm -f ${TK_LIB_FILE} - @MAKE_LIB@ -+ ln -sf @TK_LIB_FILE@ libtk${SHORT_TK_VER}.so - $(RANLIB) ${TK_LIB_FILE} - -+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 ${STUB_LIB_FILE} - @MAKE_STUB_LIB@ -@@ -455,7 +463,7 @@ - # 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) $(SCRIPT_INSTALL_DIR); \ - do \ - if [ ! -d $$i ] ; then \ -@@ -473,14 +481,20 @@ - fi - @echo "Installing $(TK_LIB_FILE) to $(LIB_INSTALL_DIR)/" - @$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) -+ @ln -sf $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) $(LIB_INSTALL_DIR)/libtk${SHORT_TK_VER}.so - @(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_LIB_FILE)) - @chmod 555 $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) -+ @echo "Installing libtk${SHORT_TK_VER}.a" -+ @$(INSTALL_DATA) libtk${SHORT_TK_VER}.a $(LIB_INSTALL_DIR)/libtk${SHORT_TK_VER}.a -+ @(cd $(LIB_INSTALL_DIR); $(RANLIB) libtk${SHORT_TK_VER}.a) -+ @chmod 555 $(LIB_INSTALL_DIR)/libtk${SHORT_TK_VER}.a - @echo "Installing pkgIndex.tcl" - @$(INSTALL_DATA) pkgIndex.tk $(SCRIPT_INSTALL_DIR)/pkgIndex.tcl - @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 -+ @mkdir -p $(LIB_INSTALL_DIR)/tk$(VERSION) -+ @$(INSTALL_DATA) tkConfig.sh $(LIB_INSTALL_DIR)/tk$(VERSION)/tkConfig.sh - @if test "$(TK_BUILD_EXP_FILE)" != ""; then \ - echo "Installing $(TK_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \ - $(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \ -@@ -494,6 +508,7 @@ - - install-libraries: - @for i in $(INCLUDE_INSTALL_DIR) \ -+ $(GENERIC_INCLUDE_INSTALL_DIR) $(UNIX_INCLUDE_INSTALL_DIR) \ - $(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \ - do \ - if [ ! -d $$i ] ; then \ -@@ -507,10 +522,16 @@ - chmod +x $(UNIX_DIR)/install-sh; \ - fi - @echo "Installing header files"; -- @for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h ; \ -+ @for i in $(GENERIC_DIR)/*.h ; \ -+ do \ -+ $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \ -+ done; -+ @for i in $(UNIX_DIR)/*.h ; \ - do \ -- $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \ -+ $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \ - done; -+ @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tk.h $(INCLUDE_INSTALL_DIR)/tk.h -+ @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tkDecls.h $(INCLUDE_INSTALL_DIR)/tkDecls.h - @echo "Installing library files to $(SCRIPT_INSTALL_DIR)"; - @for i in $(SRC_DIR)/library/*.tcl $(GENERIC_DIR)/prolog.ps \ - $(SRC_DIR)/library/tclIndex $(UNIX_DIR)/tkAppInit.c; \ -@@ -576,7 +597,6 @@ - chmod 444 $(MAN1_INSTALL_DIR)/$$i; \ - done; - @echo "Cross-linking top-level (.1) docs"; -- @$(UNIX_DIR)/mkLinks $(MAN1_INSTALL_DIR) - @echo "Installing C API (.3) docs"; - @cd $(SRC_DIR)/doc; for i in *.3; \ - do \ -@@ -586,7 +606,6 @@ - chmod 444 $(MAN3_INSTALL_DIR)/$$i; \ - done; - @echo "Cross-linking C API (.3) docs"; -- @$(UNIX_DIR)/mkLinks $(MAN3_INSTALL_DIR) - @echo "Installing command (.n) docs"; - @cd $(SRC_DIR)/doc; for i in *.n; \ - do \ -@@ -596,7 +615,6 @@ - chmod 444 $(MANN_INSTALL_DIR)/$$i; \ - done; - @echo "Cross-linking command (.n) docs"; -- @$(UNIX_DIR)/mkLinks $(MANN_INSTALL_DIR) - - Makefile: $(UNIX_DIR)/Makefile.in - $(SHELL) config.status |