[pkgsrc/trunk]: pkgsrc/x11/tk RPATH_FLAG needs to be defined for FreeBSD 3+ a...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5d0e8f5f6029
branches:  trunk
changeset: 502133:5d0e8f5f6029
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Nov 02 15:41:25 2005 +0000

description:
RPATH_FLAG needs to be defined for FreeBSD 3+ and DragonFly as well,
since otherwise libtk84.so depends on libX11.so without knowing where to
find it.

approved-by: jwise@

diffstat:

 x11/tk/distinfo         |   4 ++--
 x11/tk/patches/patch-ab |  22 ++++++++++++++--------
 2 files changed, 16 insertions(+), 10 deletions(-)

diffs (94 lines):

diff -r c559d4dcf247 -r 5d0e8f5f6029 x11/tk/distinfo
--- a/x11/tk/distinfo   Wed Nov 02 15:34:31 2005 +0000
+++ b/x11/tk/distinfo   Wed Nov 02 15:41:25 2005 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.23 2005/09/21 14:49:08 joerg Exp $
+$NetBSD: distinfo,v 1.24 2005/11/02 15:41:25 joerg Exp $
 
 SHA1 (tk8.4.11-src.tar.gz) = c05dec9163e6f75787aa2825122d424fc1a1edb6
 RMD160 (tk8.4.11-src.tar.gz) = 71b42c0f0ae5067c23d61a2d852a53fb3c546e2f
 Size (tk8.4.11-src.tar.gz) = 3236334 bytes
 SHA1 (patch-aa) = 5ddd25d23d4749acd251f7e06dde18bdf207da8f
-SHA1 (patch-ab) = 3f1cc305a65fb111e6dfe4df1290afb964026c67
+SHA1 (patch-ab) = 0f3e1b7c325882df42b88e8c56b5101a12e79553
 SHA1 (patch-ac) = 5dc59a8e26c114a847c511defc7a3d7cc77655e8
 SHA1 (patch-ad) = 51ba301ed6786791f0ef9ece73c4496231f1c031
 SHA1 (patch-ae) = 7946f60ee6ff944dfc89e1bc0dbe7be202bc46c7
diff -r c559d4dcf247 -r 5d0e8f5f6029 x11/tk/patches/patch-ab
--- a/x11/tk/patches/patch-ab   Wed Nov 02 15:34:31 2005 +0000
+++ b/x11/tk/patches/patch-ab   Wed Nov 02 15:41:25 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.20 2005/09/21 14:49:08 joerg Exp $
+$NetBSD: patch-ab,v 1.21 2005/11/02 15:41:25 joerg Exp $
 
 --- configure.orig     2005-06-29 16:43:10.000000000 +0000
 +++ configure
@@ -51,7 +51,7 @@
  fi
  rm -f conftest*
  
-@@ -2699,7 +2709,7 @@ rm -f conftest*
+@@ -2699,12 +2709,13 @@ rm -f conftest*
            UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
            TCL_LIB_VERSIONS_OK=nodots
            ;;
@@ -60,7 +60,13 @@
            # FreeBSD 3.* and greater have ELF.
            SHLIB_CFLAGS="-fPIC"
            SHLIB_LD="ld -Bshareable -x"
-@@ -3521,7 +3531,7 @@ fi
+           SHLIB_LD_LIBS='${LIBS}'
+           SHLIB_SUFFIX=".so"
++          RPATH_FLAG='-Wl,-R'
+           DL_OBJS="tclLoadDl.o"
+           DL_LIBS=""
+           LDFLAGS="$LDFLAGS -export-dynamic"
+@@ -3521,7 +3532,7 @@ fi
                    ;;
                IRIX*)
                    ;;
@@ -69,7 +75,7 @@
                    ;;
                Darwin-*)
                    ;;
-@@ -3539,16 +3549,16 @@ fi
+@@ -3539,16 +3550,16 @@ fi
      fi
  
      if test "$SHARED_LIB_SUFFIX" = "" ; then
@@ -90,7 +96,7 @@
      else
          LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
  
-@@ -5091,7 +5101,11 @@ echo "configure:5089: checking for X11 l
+@@ -5091,7 +5102,11 @@ echo "configure:5089: checking for X11 l
        for i in $dirs ; do
            if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl; then
                echo "$ac_t""$i" 1>&6
@@ -103,7 +109,7 @@
                x_libraries="$i"
                break
            fi
-@@ -5100,7 +5114,11 @@ echo "configure:5089: checking for X11 l
+@@ -5100,7 +5115,11 @@ echo "configure:5089: checking for X11 l
        if test "$x_libraries" = ""; then
            XLIBSW=-lX11
        else
@@ -116,7 +122,7 @@
        fi
      fi
      if test "$XLIBSW" = nope ; then
-@@ -5172,6 +5190,10 @@ if test "x${x_libraries}" != "x"; then
+@@ -5172,6 +5191,10 @@ if test "x${x_libraries}" != "x"; then
  fi
  if test "${TCL_LD_SEARCH_FLAGS}" = '-L${LIB_RUNTIME_DIR}'; then
      LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -L/g'`
@@ -127,7 +133,7 @@
  fi
  
  # The statement below is very tricky!  It actually *evaluates* the
-@@ -5823,11 +5845,18 @@ else
+@@ -5823,11 +5846,18 @@ else
      if test "$SHARED_BUILD" = "0" || test "$TCL_NEEDS_EXP_FILE" = "0"; then
          if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
              eval TK_LIB_FLAG="-ltk${VERSION}\${TK_DBGX}"