diff options
| author | dsainty <dsainty@pkgsrc.org> | 2012-08-29 11:55:06 +0000 |
|---|---|---|
| committer | dsainty <dsainty@pkgsrc.org> | 2012-08-29 11:55:06 +0000 |
| commit | 433b6276be2e4a0c1fb3e08889cda795795fcb56 (patch) | |
| tree | 8647f835dc929aea0ea3759b83c71cb948b15589 | |
| parent | 633708150d20d53c389ca82985e00711b5d6856c (diff) | |
| download | pkgsrc-433b6276be2e4a0c1fb3e08889cda795795fcb56.tar.gz | |
For all but the default case the library file names use TCL_TRIM_DOTS
and end up with libtk85.so. The default case would end up with libtk8.5.so
instead, which at least conflicts with what the PLIST says, but also
eventually failed to build on platforms ending up with the default behaviour.
Fixes the build on Linux platforms, should be no change elsewhere.
| -rw-r--r-- | x11/tk/distinfo | 4 | ||||
| -rw-r--r-- | x11/tk/patches/patch-unix_configure | 17 |
2 files changed, 18 insertions, 3 deletions
diff --git a/x11/tk/distinfo b/x11/tk/distinfo index 2f3759586c4..c5eec8ff942 100644 --- a/x11/tk/distinfo +++ b/x11/tk/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.37 2012/08/25 11:51:24 bsiegert Exp $ +$NetBSD: distinfo,v 1.38 2012/08/29 11:55:06 dsainty Exp $ SHA1 (tk8.5.12-src.tar.gz) = 292a01a39e9378d2455e4492f39500baeb6b63db RMD160 (tk8.5.12-src.tar.gz) = fc864df9f1e1ebd4b4375cc46572834095e77372 Size (tk8.5.12-src.tar.gz) = 3826062 bytes SHA1 (patch-unix_Makefile.in) = 0e1f8a8c20c426a042ab1c061cc6031283abe1d5 -SHA1 (patch-unix_configure) = ae2889cd4f783c13317786edd3c5ba3dd8b2882f +SHA1 (patch-unix_configure) = fe8cbd693bbbd891e82e27f80d2f180a6af71629 diff --git a/x11/tk/patches/patch-unix_configure b/x11/tk/patches/patch-unix_configure index 890901bece5..b0bb04926b5 100644 --- a/x11/tk/patches/patch-unix_configure +++ b/x11/tk/patches/patch-unix_configure @@ -1,4 +1,4 @@ -$NetBSD: patch-unix_configure,v 1.3 2012/08/25 11:51:24 bsiegert Exp $ +$NetBSD: patch-unix_configure,v 1.4 2012/08/29 11:55:06 dsainty Exp $ --- unix/configure.orig 2012-07-25 16:45:53.000000000 +0000 +++ unix/configure @@ -87,6 +87,21 @@ $NetBSD: patch-unix_configure,v 1.3 2012/08/25 11:51:24 bsiegert Exp $ Darwin-*) ;; SCO_SV-3.2*) ;; *) SHLIB_CFLAGS="-fPIC" ;; +@@ -7169,12 +7163,12 @@ + + if test "$SHARED_LIB_SUFFIX" = ""; then + +- SHARED_LIB_SUFFIX='${VERSION}${SHLIB_SUFFIX}' ++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}${SHLIB_SUFFIX}' + fi + + if test "$UNSHARED_LIB_SUFFIX" = ""; then + +- UNSHARED_LIB_SUFFIX='${VERSION}.a' ++ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' + fi + + DLL_INSTALL_DIR="\$(LIB_INSTALL_DIR)" @@ -7190,7 +7184,7 @@ fi else |