diff options
| author | Steve Price <steve@FreeBSD.org> | 1999-01-26 01:42:10 +0000 |
|---|---|---|
| committer | Steve Price <steve@FreeBSD.org> | 1999-01-26 01:42:10 +0000 |
| commit | 9e031867e20cf1b2aa0f1d58bb6c7e83c23f1469 (patch) | |
| tree | bd87dc0469626d7eaa86cdde69bd153d48af54c1 /x11-toolkits/tk82/files | |
| parent | 9b6d672d475ebc8cc78206dfc3f14b420dd86e2b (diff) | |
| download | ports-9e031867e20cf1b2aa0f1d58bb6c7e83c23f1469.tar.gz ports-9e031867e20cf1b2aa0f1d58bb6c7e83c23f1469.zip | |
Set TK_LIB_FILE so ports that depend on libtk81.so.1 can find it. Also
a minor cleanup to PLIST while I'm here.
Notes
Notes:
svn path=/head/; revision=16303
Diffstat (limited to 'x11-toolkits/tk82/files')
| -rw-r--r-- | x11-toolkits/tk82/files/patch-aa | 13 | ||||
| -rw-r--r-- | x11-toolkits/tk82/files/patch-ab | 18 |
2 files changed, 18 insertions, 13 deletions
diff --git a/x11-toolkits/tk82/files/patch-aa b/x11-toolkits/tk82/files/patch-aa index 236821a86312..f858d13c6249 100644 --- a/x11-toolkits/tk82/files/patch-aa +++ b/x11-toolkits/tk82/files/patch-aa @@ -1,5 +1,5 @@ ---- configure.orig Fri Dec 11 18:38:40 1998 -+++ configure Sat Jan 2 16:03:14 1999 +--- configure.orig Fri Dec 11 17:38:40 1998 ++++ configure Sun Jan 24 16:12:10 1999 @@ -854,14 +854,14 @@ withval="$with_tcl" TCL_BIN_DIR=$withval @@ -27,6 +27,15 @@ LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}' # If Tcl and Tk are installed in different places, adjust the library +@@ -2302,7 +2304,7 @@ + if test "$ok" = "yes" -a "${SHLIB_SUFFIX}" != ""; then + TK_SHARED_BUILD=1 + TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}" +- TK_LIB_FILE=libtk${TCL_SHARED_LIB_SUFFIX} ++ TK_LIB_FILE=${TK_LIB_FILE} + MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${SHLIB_LD_LIBS}" + RANLIB=":" + else @@ -2513,6 +2515,7 @@ s%@SHLIB_VERSION@%$SHLIB_VERSION%g s%@TCL_BIN_DIR@%$TCL_BIN_DIR%g diff --git a/x11-toolkits/tk82/files/patch-ab b/x11-toolkits/tk82/files/patch-ab index b519ef375232..50203b395ffe 100644 --- a/x11-toolkits/tk82/files/patch-ab +++ b/x11-toolkits/tk82/files/patch-ab @@ -1,5 +1,5 @@ ---- Makefile.in.orig Fri Dec 11 18:38:40 1998 -+++ Makefile.in Thu Jan 21 12:24:03 1999 +--- 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 @@ -62,17 +62,13 @@ @for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \ do \ if [ ! -d $$i ] ; then \ -@@ -387,16 +395,23 @@ - fi; \ +@@ -388,15 +396,22 @@ done; @echo "Installing $(TK_LIB_FILE)" -- @$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) -- @(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_LIB_FILE)) -- @chmod 555 $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) -+ @$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/libtk81.so.1 -+ @ln -sf libtk81.so.1 $(LIB_INSTALL_DIR)/libtk81.so -+ @(cd $(LIB_INSTALL_DIR); $(RANLIB) libtk81.so.1) -+ @chmod 555 $(LIB_INSTALL_DIR)/libtk81.so.1 + @$(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) |