summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--x11/tk/files/patch-sum6
-rw-r--r--x11/tk/patches/patch-aa4
-rw-r--r--x11/tk/patches/patch-ab4
3 files changed, 7 insertions, 7 deletions
diff --git a/x11/tk/files/patch-sum b/x11/tk/files/patch-sum
index fee6f334dcb..595b2d6eed8 100644
--- a/x11/tk/files/patch-sum
+++ b/x11/tk/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.3 2000/08/31 21:41:11 jwise Exp $
+$NetBSD: patch-sum,v 1.4 2000/09/01 16:22:00 jwise Exp $
-MD5 (patch-aa) = b7ff8344fb872ba447344e582790dae5
-MD5 (patch-ab) = c7415c74853d9e990672e7267b446cca
+MD5 (patch-aa) = 690f5a3a425aac23641fed8932249f76
+MD5 (patch-ab) = f84101d9150c16b95154485e6335372f
diff --git a/x11/tk/patches/patch-aa b/x11/tk/patches/patch-aa
index eba016b234c..5df58195a48 100644
--- a/x11/tk/patches/patch-aa
+++ b/x11/tk/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/08/29 16:16:07 jwise Exp $
+$NetBSD: patch-aa,v 1.2 2000/09/01 16:22:00 jwise Exp $
--- Makefile.in.orig Mon Aug 28 23:29:09 2000
+++ Makefile.in Mon Aug 28 23:34:09 2000
@@ -76,7 +76,7 @@
@@ -74,7 +74,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/08/29 16:16:07 jwise Exp $
fi
@echo "Installing $(TK_LIB_FILE) to $(LIB_INSTALL_DIR)/"
- @$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
-+ @$(INSTALL_DATA) $(TK_LIB_FILE:.so=.la) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
++ @$(INSTALL_DATA) $(TK_LIB_FILE:C/\.so.*/.la/) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_LIB_FILE))
@chmod 555 $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
@echo "Installing wish as $(BIN_INSTALL_DIR)/wish$(VERSION)"
diff --git a/x11/tk/patches/patch-ab b/x11/tk/patches/patch-ab
index d1b42278a6d..e00d753aabe 100644
--- a/x11/tk/patches/patch-ab
+++ b/x11/tk/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.3 2000/08/31 16:48:11 jwise Exp $
+$NetBSD: patch-ab,v 1.4 2000/09/01 16:22:00 jwise Exp $
--- configure.orig Tue Aug 8 15:19:32 2000
+++ configure Thu Aug 31 12:35:15 2000
@@ -1873,6 +1873,7 @@
@@ -32,7 +32,7 @@ $NetBSD: patch-ab,v 1.3 2000/08/31 16:48:11 jwise Exp $
TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
TK_LIB_FILE=libtk${TK_SHARED_LIB_SUFFIX}
- MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${TCL_STUB_LIB_SPEC} \${LIBS}"
-+ MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE:.so=.la} \${OBJS:.o=.lo} \$(TK_LD_SEARCH_FLAGS) ${TCL_STUB_LIB_SPEC} \${LIBS} -version-info 1:0"
++ MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE:C/\.so.*/.la/} \${OBJS:.o=.lo} \$(TK_LD_SEARCH_FLAGS) ${TCL_STUB_LIB_SPEC} \${LIBS} -version-info 1:0"
RANLIB=":"
# TCL_STUB_FLAGS="-DUSE_TCL_STUBS"