diff options
author | Thomas Gellekum <tg@FreeBSD.org> | 1996-12-30 07:13:51 +0000 |
---|---|---|
committer | Thomas Gellekum <tg@FreeBSD.org> | 1996-12-30 07:13:51 +0000 |
commit | 344fe79c64dd7fb648272b313f76ef9d24a8fc29 (patch) | |
tree | 933e52b134e525c8ec67f55750789a479843ee73 /x11-toolkits/tix/files | |
parent | 96df1464f9ee8298a584dcd61334b46351f164a2 (diff) |
Notes
Diffstat (limited to 'x11-toolkits/tix/files')
-rw-r--r-- | x11-toolkits/tix/files/patch-aa | 20 | ||||
-rw-r--r-- | x11-toolkits/tix/files/patch-ab | 20 | ||||
-rw-r--r-- | x11-toolkits/tix/files/patch-ac | 67 |
3 files changed, 107 insertions, 0 deletions
diff --git a/x11-toolkits/tix/files/patch-aa b/x11-toolkits/tix/files/patch-aa new file mode 100644 index 000000000000..39aea03809b0 --- /dev/null +++ b/x11-toolkits/tix/files/patch-aa @@ -0,0 +1,20 @@ +--- configure.orig Wed Oct 2 03:46:38 1996 ++++ configure Sun Dec 22 13:47:10 1996 +@@ -2946,7 +2946,7 @@ + + # 1. Load the compilation flags for TCL 7.5 + # +- file="$TCL75_SRC_DIR/unix/$TCL_CONFIG_INFO" ++ file=/usr/libdata/tcl/tclConfig.sh + . $file + + +@@ -2965,7 +2965,7 @@ + + # 2. Load the compilation flags for TK 4.1 + # +- file="$TK41_SRC_DIR/unix/tkConfig.sh" ++ file=${PREFIX}/lib/tkConfig.sh + . $file + + diff --git a/x11-toolkits/tix/files/patch-ab b/x11-toolkits/tix/files/patch-ab new file mode 100644 index 000000000000..6f004fc9add3 --- /dev/null +++ b/x11-toolkits/tix/files/patch-ab @@ -0,0 +1,20 @@ +--- Makefile.in.orig Wed Oct 2 03:46:30 1996 ++++ Makefile.in Sun Dec 22 15:04:57 1996 +@@ -27,7 +27,7 @@ + # Directory in which to install the library of Tix scripts and demos + # (note: you can set the TIX_LIBRARY environment variable at run-time to + # override the compiled-in location): +-TIX_LIBRARY = $(prefix)/lib/tix ++TIX_LIBRARY = $(prefix)/share/tix + + # Directory in which to install the archive libtix.a: + LIB_DIR = $(exec_prefix)/lib +@@ -202,7 +202,7 @@ + fi; \ + done; + @echo "installing the tixindex program for builing tclIndex for Tix scripts" +- @cd tools; $(INSTALL_PROGRAM) tixindex $(BIN_DIR)/tixindex ++ -@cd tools; $(INSTALL_PROGRAM) tixindex $(BIN_DIR)/tixindex + + install-headers: + @for i in $(INCLUDE_DIR); \ diff --git a/x11-toolkits/tix/files/patch-ac b/x11-toolkits/tix/files/patch-ac new file mode 100644 index 000000000000..763396938e01 --- /dev/null +++ b/x11-toolkits/tix/files/patch-ac @@ -0,0 +1,67 @@ +--- unix-tk4.1/Makefile.in.orig Wed Oct 2 03:47:57 1996 ++++ unix-tk4.1/Makefile.in Sun Dec 22 16:19:46 1996 +@@ -28,7 +28,7 @@ + # Directory in which to install the library of Tix scripts and demos + # (note: you can set the TIX_LIBRARY environment variable at run-time to + # override the compiled-in location): +-TIX_LIBRARY = $(prefix)/lib/tix ++TIX_LIBRARY = $(prefix)/share/tix + + # Directory in which to install the archive libtix.a: + LIB_DIR = $(exec_prefix)/lib +@@ -105,9 +105,9 @@ + $(X11_LIB_SWITCHES) $(DL_LIBS) \ + @LIBS@ @MATH_LIBS@ + +-TIX_SHLIB = libtix${SHLIB_SUFFIX} ++TIX_SHLIB = libtix$(SHLIB_SUFFIX).$(TIX_VERSION) + +-LIBS_S = $(TIX_SHLIB) @TK_BUILD_LIB_SPEC@ @TCL_BUILD_LIB_SPEC@ \ ++LIBS_S = -ltix @TK_BUILD_LIB_SPEC@ @TCL_BUILD_LIB_SPEC@ \ + $(X11_LIB_SWITCHES) $(DL_LIBS) \ + @LIBS@ @MATH_LIBS@ + +@@ -426,8 +426,8 @@ + rm -f $(TIX_SHLIB) + ${SHLIB_LD} $(SO_OBJS) @TIX_EXTRA_LDFLAGS@ -o $(TIX_SHLIB) + +-tixwish_s: tixAppInit.o libtix${SHLIB_SUFFIX} +- $(CC) $(SO_CC_SWITCHES) tixAppInit.o @TIX_EXTRA_LDFLAGS@ $(LIBS_S) \ ++tixwish_s: tixAppInit.o ${TIX_SHLIB} ++ $(CC) $(SO_CC_SWITCHES) tixAppInit.o @TIX_EXTRA_LDFLAGS@ -L. $(LIBS_S) \ + -o tixwish_s + + +@@ -580,15 +580,15 @@ + else true; \ + fi; \ + done; +- @echo "Installing libtix.a as $(LIB_DIR)/libtix-tk4.1.a" +- @$(INSTALL_DATA) libtix.a $(LIB_DIR)/libtix-tk4.1.a +- @$(RANLIB) $(LIB_DIR)/libtix-tk4.1.a +- @echo "Installing tixwish as $(BIN_DIR)/tixwish-tk4.1" +- @$(INSTALL_PROGRAM) tixwish $(BIN_DIR)/tixwish-tk4.1 ++ @echo "Installing libtix.a as $(LIB_DIR)/libtix.a" ++ @$(INSTALL_DATA) libtix.a $(LIB_DIR)/libtix.a ++ @$(RANLIB) $(LIB_DIR)/libtix.a ++# @echo "Installing tixwish as $(BIN_DIR)/tixwish-tk4.1" ++# @$(INSTALL_PROGRAM) tixwish $(BIN_DIR)/tixwish-tk4.1 + + TIX_VERSION = @TIX_VERSION@ + +-INSTALL_SHLIB_NAME = $(LIB_DIR)/libtix$(TIX_VERSION)$(SHLIB_SUFFIX) ++INSTALL_SHLIB_NAME = $(LIB_DIR)/${TIX_SHLIB} + + install-shared: shared_lib + @for i in $(LIB_DIR) ; \ +@@ -602,8 +602,8 @@ + done; + @echo "Installing $(TIX_SHLIB) as $(INSTALL_SHLIB_NAME)" + @$(INSTALL_DATA) $(TIX_SHLIB) $(INSTALL_SHLIB_NAME) +- @echo "Installing tixwish_s as $(BIN_DIR)/tixwish_s-tk4.1" +- @$(INSTALL_PROGRAM) tixwish $(BIN_DIR)/tixwish_s-tk4.1 ++ @echo "Installing tixwish_s as $(BIN_DIR)/tixwish" ++ @$(INSTALL_PROGRAM) tixwish_s $(BIN_DIR)/tixwish + + #---------------------------------------------------------------------- + # |