diff options
| -rw-r--r-- | x11-toolkits/tix/files/patch-aa | 41 | ||||
| -rw-r--r-- | x11-toolkits/tix/files/patch-ac | 52 |
2 files changed, 38 insertions, 55 deletions
diff --git a/x11-toolkits/tix/files/patch-aa b/x11-toolkits/tix/files/patch-aa index 5c378ca5a859..3957fdd8b318 100644 --- a/x11-toolkits/tix/files/patch-aa +++ b/x11-toolkits/tix/files/patch-aa @@ -1,5 +1,5 @@ ---- configure.orig Thu Sep 25 20:32:47 1997 -+++ configure Sun Oct 4 20:21:17 1998 +--- configure.orig Tue Sep 23 16:57:21 1997 ++++ configure Wed Apr 7 03:53:11 1999 @@ -1060,6 +1060,7 @@ if test "$val" != ""; then @@ -34,7 +34,40 @@ #-------------------------------------------------------------------- # Find out the top level source directory of the Tix package. -@@ -1707,15 +1709,15 @@ +@@ -1200,12 +1202,14 @@ + TCL_BUILD_SAM_SPEC="-L`pwd` -ltclsam${TCL_VERSION}" + TK_BUILD_SAM_SPEC="-L`pwd` -ltksam${TK_VERSION}" + TIX_LIB_SPEC="-L${exec_prefix}/lib -ltix${VERSION}" ++ LIB_VERSION="${VERSION}" + else + TIX_BUILD_LIB_SPEC="-L`pwd` -ltix`echo ${VERSION} | tr -d .`" + TIX_BUILD_SAM_SPEC="-L`pwd` -ltixsam`echo ${VERSION} | tr -d .`" + TCL_BUILD_SAM_SPEC="-L`pwd` -ltclsam`echo ${TCL_VERSION} | tr -d .`" + TK_BUILD_SAM_SPEC="-L`pwd` -ltksam`echo ${TK_VERSION} | tr -d .`" + TIX_LIB_SPEC="-L${exec_prefix}/lib -ltix`echo ${VERSION} | tr -d .`" ++ LIB_VERSION="`echo ${VERSION} | tr -d .`" + fi + + #-------------------------------------------------------------------- +@@ -1227,7 +1231,7 @@ + + # The main Tix library + # +- eval "TIX_LIB_FILE=libtix${TCL_SHARED_LIB_SUFFIX}" ++ eval "TIX_LIB_FILE=libtix${LIB_VERSION}" + TIX_MAKE_LIB="\${SHLIB_LD} -o ${TIX_LIB_FILE} \${OBJS} ${SHLIB_LD_LIBS}" + + # The Tcl SAM library +@@ -1245,7 +1249,7 @@ + # The Tix SAM library + # + VERSION=${BIN_VERSION} +- eval "TIX_SAM_FILE=libtixsam${TCL_SHARED_LIB_SUFFIX}" ++ eval "TIX_SAM_FILE=libtixsam${LIB_VERSION}" + TIX_MAKE_SAM="\${SHLIB_LD} -o ${TIX_SAM_FILE} \${TIX_SAM_OBJS} ${SHLIB_LD_LIBS}" + + else +@@ -1707,15 +1711,15 @@ s%@SHLIB_VERSION@%$SHLIB_VERSION%g s%@DL_LIBS@%$DL_LIBS%g s%@LD_FLAGS@%$LD_FLAGS%g @@ -54,7 +87,7 @@ s%@TK_BIN_DIR@%$TK_BIN_DIR%g s%@TK_XINCLUDES@%$TK_XINCLUDES%g s%@TIX_LD_SEARCH_FLAGS@%$TIX_LD_SEARCH_FLAGS%g -@@ -1738,8 +1740,8 @@ +@@ -1738,8 +1742,8 @@ s%@TIX_SAM_FILE@%$TIX_SAM_FILE%g s%@TIX_MAKE_SAM@%$TIX_MAKE_SAM%g s%@TIX_DEFS@%$TIX_DEFS%g diff --git a/x11-toolkits/tix/files/patch-ac b/x11-toolkits/tix/files/patch-ac index fbfaffccf657..2ff8b1059a6b 100644 --- a/x11-toolkits/tix/files/patch-ac +++ b/x11-toolkits/tix/files/patch-ac @@ -1,5 +1,5 @@ --- Makefile.in.orig Tue Sep 23 16:57:18 1997 -+++ Makefile.in Wed Apr 7 03:04:59 1999 ++++ Makefile.in Wed Apr 7 03:20:49 1999 @@ -29,7 +29,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 @@ -32,16 +32,6 @@ #---------------------------------------------------------------- -@@ -117,6 +117,9 @@ - TK_SAMEXE_FILE = @TK_SAMEXE_FILE@ - TIX_SAMEXE_FILE = @TIX_SAMEXE_FILE@ - -+FBSD_TIX_LIB_PREFIX!= echo $(TIX_LIB_FILE) | sed -e 's/\.//g' -e 's/[so]*[0-9]*$$//' -+FBSD_TIX_SAM_PREFIX!= echo $(TIX_SAM_FILE) | sed -e 's/\.//g' -e 's/[so]*[0-9]*$$//' -+ - INST_EXE = $(TIX_EXE_FILE)$(TIX_VERSION).8.0$(ITCL_EXT) - INST_TIX_SAMEXE = $(TIX_SAMEXE_FILE)$(TIX_VERSION).8.0$(ITCL_EXT) - INST_TK_SAMEXE = $(TK_SAMEXE_FILE)8.0 @@ -210,29 +213,29 @@ # scripts of TK must be included in the fixed order. #---------------------------------------------------------------------- @@ -93,43 +83,3 @@ $(SRC_DIR)/generic/tk8.0/console.tcl TIX_SCRIPTS = \ -@@ -246,6 +249,9 @@ - rm -f $(TIX_LIB_FILE) - @TIX_MAKE_LIB@ - $(RANLIB) $(TIX_LIB_FILE) -+ ln -fs $(TIX_LIB_FILE) `echo $(TIX_LIB_FILE) | sed -e 's/[\.0-9]*$$//'` -+ ln $(TIX_LIB_FILE) $(FBSD_TIX_LIB_PREFIX)$(SHLIB_SUFFIX).1 -+ ln `echo $(TIX_LIB_FILE) | sed -e 's/[\.0-9]*$$//'` $(FBSD_TIX_LIB_PREFIX)$(SHLIB_SUFFIX) - - $(TCL_SAM_FILE): $(TCL_SAM_OBJS) - rm -f $(TCL_SAM_FILE) -@@ -261,6 +267,7 @@ - rm -f $(TIX_SAM_FILE) - @TIX_MAKE_SAM@ - $(RANLIB) $(TIX_SAM_FILE) -+ ln $(TIX_SAM_FILE) $(FBSD_TIX_SAM_PREFIX)$(SHLIB_SUFFIX).1 - - $(TIX_EXE_FILE): tixAppInit.o $(TIX_LIB_FILE) - $(CC) @LD_FLAGS@ tixAppInit.o @TIX_BUILD_LIB_SPEC@ $(LIBS) \ -@@ -471,8 +478,8 @@ - else true; \ - fi; \ - done; -- @echo "Installing $(TIX_LIB_FILE) as $(LIB_DIR)/$(TIX_LIB_FILE)" -- @$(INSTALL_PROGRAM) $(TIX_LIB_FILE) $(LIB_DIR)/$(TIX_LIB_FILE) -+ @echo "Installing $(TIX_LIB_FILE) as $(LIB_DIR)/$(FBSD_TIX_LIB_PREFIX)$(SHLIB_SUFFIX).1" -+ @$(INSTALL_PROGRAM) $(TIX_LIB_FILE) $(LIB_DIR)/$(FBSD_TIX_LIB_PREFIX)$(SHLIB_SUFFIX).1 - @echo "Installing $(TIX_EXE_FILE) as $(BIN_DIR)/$(INST_EXE)" - @$(INSTALL_PROGRAM) $(TIX_EXE_FILE) $(BIN_DIR)/$(INST_EXE) - -@@ -508,8 +515,8 @@ - else true; \ - fi; \ - done; -- @echo "Installing $(TIX_SAM_FILE) as $(LIB_DIR)/$(TIX_SAM_FILE)" -- @$(INSTALL_PROGRAM) $(TIX_SAM_FILE) $(LIB_DIR)/$(TIX_SAM_FILE) -+ @echo "Installing $(TIX_SAM_FILE) as $(LIB_DIR)/$(FBSD_TIX_SAM_PREFIX)$(SHLIB_SUFFIX).1" -+ @$(INSTALL_PROGRAM) $(TIX_SAM_FILE) $(LIB_DIR)/$(FBSD_TIX_SAM_PREFIX)$(SHLIB_SUFFIX).1 - - - install: _install_ |