summaryrefslogtreecommitdiff
path: root/x11-toolkits/tk83/files/patch-ab
diff options
context:
space:
mode:
Diffstat (limited to 'x11-toolkits/tk83/files/patch-ab')
-rw-r--r--x11-toolkits/tk83/files/patch-ab106
1 files changed, 41 insertions, 65 deletions
diff --git a/x11-toolkits/tk83/files/patch-ab b/x11-toolkits/tk83/files/patch-ab
index d907e5809b46..3c9fb1cf6c6c 100644
--- a/x11-toolkits/tk83/files/patch-ab
+++ b/x11-toolkits/tk83/files/patch-ab
@@ -1,5 +1,5 @@
---- Makefile.in.orig Fri Apr 30 08:27:45 1999
-+++ Makefile.in Mon May 10 01:18:32 1999
+--- Makefile.in.orig Fri Aug 13 18:06:14 1999
++++ Makefile.in Sat Sep 4 19:47:43 1999
@@ -56,7 +56,9 @@
BIN_DIR = $(exec_prefix)/bin
@@ -11,16 +11,7 @@
# 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
-@@ -152,7 +154,7 @@
+@@ -153,7 +155,7 @@
# "install" around; better to use the install-sh script that comes
# with the distribution, which is slower but guaranteed to work.
@@ -29,51 +20,50 @@
INSTALL_PROGRAM = ${INSTALL}
INSTALL_DATA = ${INSTALL} -m 644
-@@ -188,7 +190,7 @@
+@@ -190,7 +192,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 -ltcl81 @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
++WISH_LIBS = -L${PREFIX}/lib -ltcl82 @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.
-@@ -348,8 +350,14 @@
+@@ -356,8 +358,14 @@
${TK_LIB_FILE}: ${OBJS}
rm -f ${TK_LIB_FILE}
@MAKE_LIB@
-+ ln -sf @TK_LIB_FILE@ libtk81.so
++ ln -sf @TK_LIB_FILE@ libtk82.so
$(RANLIB) ${TK_LIB_FILE}
-+libtk81.a: ${OBJS}
-+ rm -f libtk81.a
-+ ar cr libtk81.a ${OBJS}
-+ $(RANLIB) libtk81.a
++libtk82.a: ${OBJS}
++ rm -f libtk82.a
++ ar cr libtk82.a ${OBJS}
++ $(RANLIB) libtk82.a
+
${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
rm -f ${STUB_LIB_FILE}
@MAKE_STUB_LIB@
-@@ -410,7 +418,8 @@
+@@ -418,7 +426,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) \
-+ libtk81.a wish
++install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) libtk82.a wish
@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
do \
if [ ! -d $$i ] ; then \
-@@ -422,12 +431,18 @@
- done;
- @echo "Installing $(TK_LIB_FILE)"
+@@ -432,12 +440,18 @@
+ chmod +x $(UNIX_DIR)/install-sh
+ chmod +x $(UNIX_DIR)/mkLinks
@$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
-+ @ln -sf $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/libtk81.so
++ @ln -sf $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) $(LIB_INSTALL_DIR)/libtk82.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 libtk82.a"
++ @$(INSTALL_DATA) libtk82.a $(LIB_INSTALL_DIR)/libtk82.a
++ @(cd $(LIB_INSTALL_DIR); $(RANLIB) libtk82.a)
++ @chmod 555 $(LIB_INSTALL_DIR)/libtk82.a
@echo "Installing wish"
@$(INSTALL_PROGRAM) wish $(BIN_INSTALL_DIR)/wish$(VERSION)
@echo "Installing tkConfig.sh"
@@ -83,7 +73,7 @@
@if test "$(TK_BUILD_EXP_FILE)" != ""; then \
echo "Installing $(TK_EXP_FILE)"; \
$(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \
-@@ -441,6 +456,7 @@
+@@ -451,6 +465,7 @@
install-libraries:
@for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \
@@ -91,63 +81,49 @@
$(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \
do \
if [ ! -d $$i ] ; then \
-@@ -450,11 +466,19 @@
- else true; \
+@@ -461,11 +476,19 @@
fi; \
done;
+ chmod +x $(UNIX_DIR)/install-sh
- @for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.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 $(INCLUDE_INSTALL_DIR); \
-+ $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \
++ $(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
+ @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tkDecls.h $(INCLUDE_INSTALL_DIR)/tkDecls.h
- for i in $(SRC_DIR)/library/*.tcl $(SRC_DIR)/library/tclIndex $(UNIX_DIR)/tkAppInit.c; \
+ for i in $(SRC_DIR)/library/*.tcl $(GENERIC_DIR)/prolog.ps \
+ $(SRC_DIR)/library/tclIndex $(UNIX_DIR)/tkAppInit.c; \
do \
- echo "Installing $$i"; \
-@@ -513,30 +537,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; \
+@@ -530,16 +553,14 @@
+ $$i > $(MAN1_INSTALL_DIR)/$$i; \
+ chmod 444 $(MAN1_INSTALL_DIR)/$$i; \
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; \
++ rm -f $(MAN3_INSTALL_DIR)/$$i ; \
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; \
+ $$i > $(MAN3_INSTALL_DIR)/$$i; \
+ chmod 444 $(MAN3_INSTALL_DIR)/$$i; \
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; \
+@@ -548,7 +569,6 @@
+ $$i > $(MANN_INSTALL_DIR)/$$i; \
+ chmod 444 $(MANN_INSTALL_DIR)/$$i; \
done;
- $(UNIX_DIR)/mkLinks $(MANN_INSTALL_DIR)
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-10 04:56:46 +0000