diff options
Diffstat (limited to 'x11-toolkits/tk84/files/patch-ab')
-rw-r--r-- | x11-toolkits/tk84/files/patch-ab | 149 |
1 files changed, 0 insertions, 149 deletions
diff --git a/x11-toolkits/tk84/files/patch-ab b/x11-toolkits/tk84/files/patch-ab deleted file mode 100644 index 51b05794bf3a..000000000000 --- a/x11-toolkits/tk84/files/patch-ab +++ /dev/null @@ -1,149 +0,0 @@ ---- Makefile.in.orig Fri Dec 11 17:38:40 1998 -+++ Makefile.in Sun Jan 24 16:16:06 1999 -@@ -56,7 +56,9 @@ - BIN_DIR = $(exec_prefix)/bin - - # Directory in which to install the include file tk.h: --INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include -+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include/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)$(prefix)/man -@@ -98,7 +100,7 @@ - #CFLAGS = $(CFLAGS_DEBUG) - #CFLAGS = $(CFLAGS_OPTIMIZE) - #CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE) --CFLAGS = $(@CFLAGS_DEFAULT@) -+CFLAGS = @CFLAGS@ - - # A "-I" switch that can be used when compiling to make all of the - # X11 include files accessible (the configure script will try to -@@ -113,7 +115,7 @@ - - # Libraries to use when linking. This definition is determined by the - # configure script. --LIBS = @TCL_BUILD_LIB_SPEC@ @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc -+LIBS = -L${PREFIX}/lib -ltcl81 @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc - - # To turn off the security checks that disallow incoming sends when - # the X server appears to be insecure, reverse the comments on the -@@ -155,7 +157,7 @@ - # "install" around; better to use the install-sh script that comes - # with the distribution, which is slower but guaranteed to work. - --INSTALL = @srcdir@/install-sh -c -+INSTALL = install -c - INSTALL_PROGRAM = ${INSTALL} - INSTALL_DATA = ${INSTALL} -m 644 - -@@ -320,8 +322,14 @@ - ${TK_LIB_FILE}: ${OBJS} - rm -f ${TK_LIB_FILE} - @MAKE_LIB@ -+ ln -sf @TK_LIB_FILE@ libtk81.so - $(RANLIB) ${TK_LIB_FILE} - -+libtk81.a: ${OBJS} -+ rm -f libtk81.a -+ ar cr libtk81.a ${OBJS} -+ $(RANLIB) libtk81.a -+ - # Make target which outputs the list of the .o contained in the Tk lib - # usefull to build a single big shared library containing Tcl/Tk and other - # extensions. used for the Tcl Plugin. -- dl -@@ -376,7 +384,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) wish -+install-binaries: $(TK_LIB_FILE) libtk81.a wish - @for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \ - do \ - if [ ! -d $$i ] ; then \ -@@ -388,15 +396,22 @@ - done; - @echo "Installing $(TK_LIB_FILE)" - @$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) -+ @ln -sf $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/libtk81.so - @(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_LIB_FILE)) - @chmod 555 $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) -+ @echo "Installing libtk81.a" -+ @$(INSTALL_DATA) libtk81.a $(LIB_INSTALL_DIR)/libtk81.a -+ @(cd $(LIB_INSTALL_DIR); $(RANLIB) libtk81.a) -+ @chmod 555 $(LIB_INSTALL_DIR)/libtk81.a - @echo "Installing wish" - @$(INSTALL_PROGRAM) wish $(BIN_INSTALL_DIR)/wish$(VERSION) - @echo "Installing tkConfig.sh" -- @$(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 - - install-libraries: - @for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \ -+ $(GENERIC_INCLUDE_INSTALL_DIR) $(UNIX_INCLUDE_INSTALL_DIR) \ - $(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \ - do \ - if [ ! -d $$i ] ; then \ -@@ -406,8 +421,18 @@ - else true; \ - fi; \ - done; -- @echo "Installing tk.h" -- @$(INSTALL_DATA) $(GENERIC_DIR)/tk.h $(INCLUDE_INSTALL_DIR)/tk.h -+ @echo "Installing headers" -+ @for i in $(GENERIC_DIR)/*.h ; \ -+ do \ -+ echo "Installing $$i"; \ -+ $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \ -+ done; -+ @for i in $(UNIX_DIR)/*.h ; \ -+ do \ -+ echo "Installing $$i"; \ -+ $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \ -+ done; -+ @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tk.h $(INCLUDE_INSTALL_DIR)/tk.h - for i in $(SRC_DIR)/library/*.tcl $(SRC_DIR)/library/tclIndex $(UNIX_DIR)/tkAppInit.c; \ - do \ - echo "Installing $$i"; \ -@@ -466,30 +491,27 @@ - @cd $(SRC_DIR)/doc; for i in *.1; \ - do \ - echo "Installing doc/$$i"; \ -- rm -f $(MAN1_INSTALL_DIR)/$$i; \ -+ rm -f $(MAN1_INSTALL_DIR)/$$i $(MAN1_INSTALL_DIR)/$$i.gz; \ - sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \ -- $$i > $(MAN1_INSTALL_DIR)/$$i; \ -- chmod 444 $(MAN1_INSTALL_DIR)/$$i; \ -+ $$i | gzip -c > $(MAN1_INSTALL_DIR)/$$i.gz; \ -+ chmod 444 $(MAN1_INSTALL_DIR)/$$i.gz; \ - done; -- $(UNIX_DIR)/mkLinks $(MAN1_INSTALL_DIR) - @cd $(SRC_DIR)/doc; for i in *.3; \ - do \ - echo "Installing doc/$$i"; \ -- rm -f $(MAN3_INSTALL_DIR)/$$i; \ -+ rm -f $(MAN3_INSTALL_DIR)/$$i $(MAN3_INSTALL_DIR)/$$i.gz; \ - sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \ -- $$i > $(MAN3_INSTALL_DIR)/$$i; \ -- chmod 444 $(MAN3_INSTALL_DIR)/$$i; \ -+ $$i | gzip -c > $(MAN3_INSTALL_DIR)/$$i.gz; \ -+ chmod 444 $(MAN3_INSTALL_DIR)/$$i.gz; \ - done; -- $(UNIX_DIR)/mkLinks $(MAN3_INSTALL_DIR) - @cd $(SRC_DIR)/doc; for i in *.n; \ - do \ - echo "Installing doc/$$i"; \ -- rm -f $(MANN_INSTALL_DIR)/$$i; \ -+ rm -f $(MANN_INSTALL_DIR)/$$i $(MANN_INSTALL_DIR)/$$i.gz; \ - sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \ -- $$i > $(MANN_INSTALL_DIR)/$$i; \ -- chmod 444 $(MANN_INSTALL_DIR)/$$i; \ -+ $$i | gzip -c > $(MANN_INSTALL_DIR)/$$i.gz; \ -+ chmod 444 $(MANN_INSTALL_DIR)/$$i.gz; \ - done; -- $(UNIX_DIR)/mkLinks $(MANN_INSTALL_DIR) - - Makefile: $(UNIX_DIR)/Makefile.in - $(SHELL) config.status |