summaryrefslogtreecommitdiff
path: root/x11/tk
diff options
context:
space:
mode:
authorjwise <jwise>2001-04-18 18:15:41 +0000
committerjwise <jwise>2001-04-18 18:15:41 +0000
commitced8f791b51a98eeed070a312e11d0df9de373a7 (patch)
treef857588dbfed5439d7b5dd4063b1cc3992ec3bf9 /x11/tk
parentb3a7865308845f340e454cd7a883340e1e8133e7 (diff)
downloadpkgsrc-ced8f791b51a98eeed070a312e11d0df9de373a7.tar.gz
Fix problem with libtk .la file generated by new libtool.
Pointed out (and patch provided by) Jason Beegan (jtb@netbsd.org)
Diffstat (limited to 'x11/tk')
-rw-r--r--x11/tk/distinfo7
-rw-r--r--x11/tk/patches/patch-ab18
2 files changed, 19 insertions, 6 deletions
diff --git a/x11/tk/distinfo b/x11/tk/distinfo
index aec1de06205..f78574d77be 100644
--- a/x11/tk/distinfo
+++ b/x11/tk/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1 2001/04/17 12:15:30 agc Exp $
+$NetBSD: distinfo,v 1.2 2001/04/18 18:15:41 jwise Exp $
-MD5 (tk8.3.2.tar.gz) = 9ea129345575b9a2763c8554f33b20e7
+SHA1 (tk8.3.2.tar.gz) = a573d33fa76ca64a7148d3cc6b7b18906c311dab
+Size (tk8.3.2.tar.gz) = 2529172 bytes
SHA1 (patch-aa) = 647f6253cc821b0bbf69c4cc69e53dc4cbce1ec3
-SHA1 (patch-ab) = 7062541f36d20fe555ab66e636a2dcef2170a958
+SHA1 (patch-ab) = 79aa30a26172953653d651aa2b7fb31fca32bc79
diff --git a/x11/tk/patches/patch-ab b/x11/tk/patches/patch-ab
index e00d753aabe..f1f73e7abad 100644
--- a/x11/tk/patches/patch-ab
+++ b/x11/tk/patches/patch-ab
@@ -1,6 +1,7 @@
-$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
+$NetBSD: patch-ab,v 1.5 2001/04/18 18:15:41 jwise Exp $
+
+--- configure.orig Tue Aug 8 19:19:32 2000
++++ configure
@@ -1873,6 +1873,7 @@
SHLIB_LD="ld -Bshareable -x"
SHLIB_LD_LIBS=""
@@ -27,6 +28,17 @@ $NetBSD: patch-ab,v 1.4 2000/09/01 16:22:00 jwise Exp $
fi
fi
if test "$XLIBSW" = nope ; then
+@@ -3415,8 +3416,8 @@
+ if test "x${x_libraries}" != "x"; then
+ LIB_RUNTIME_DIR="${LIB_RUNTIME_DIR}:${x_libraries}"
+ fi
+-if test "${TCL_LD_SEARCH_FLAGS}" = '-L${LIB_RUNTIME_DIR}'; then
+- LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -L/g'`
++if test "${TCL_LD_SEARCH_FLAGS}" = '-Wl,-rpath,${LIB_RUNTIME_DIR}'; then
++ LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -Wl,-rpath,/g'`
+ fi
+
+ # The statement below is very tricky! It actually *evaluates* the
@@ -4088,7 +4089,7 @@
if test "${SHARED_BUILD}" = "1" -a "${SHLIB_SUFFIX}" != ""; then
TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}"