diff options
author | minskim <minskim> | 2004-03-11 01:27:05 +0000 |
---|---|---|
committer | minskim <minskim> | 2004-03-11 01:27:05 +0000 |
commit | 6945f31021c9e922bb93d2850284d8a318a09412 (patch) | |
tree | e272a21d32ac1b5125ca9d6ded5f520fab83d9ee /x11/tk | |
parent | 510a13b25efaa2b985055c64cca3da319cd4f6fd (diff) | |
download | pkgsrc-6945f31021c9e922bb93d2850284d8a318a09412.tar.gz |
Keep library names on IRIX and Linux to be same as on other platforms.
Diffstat (limited to 'x11/tk')
-rw-r--r-- | x11/tk/distinfo | 6 | ||||
-rw-r--r-- | x11/tk/patches/patch-ab | 58 | ||||
-rw-r--r-- | x11/tk/patches/patch-ac | 54 |
3 files changed, 99 insertions, 19 deletions
diff --git a/x11/tk/distinfo b/x11/tk/distinfo index bfdf2fea390..7a2804418a4 100644 --- a/x11/tk/distinfo +++ b/x11/tk/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.13 2004/03/08 22:14:19 minskim Exp $ +$NetBSD: distinfo,v 1.14 2004/03/11 01:27:05 minskim Exp $ SHA1 (tk8.4.6-src.tar.gz) = a0b2f364be20c3e312d1ba582d3a1b4b4b1d4d88 Size (tk8.4.6-src.tar.gz) = 3230760 bytes SHA1 (patch-aa) = 77344c94315f7b1cc24f2f31413e8d75973e0cda -SHA1 (patch-ab) = c0d4d2cb135f605757bea55aad90d8151f6f8dc7 -SHA1 (patch-ac) = 6a5b303de8a0f2c2f1345f7c13b62a62d1c3c60c +SHA1 (patch-ab) = 7a6340a190a800abb09461dd36fc24846ab2b2d3 +SHA1 (patch-ac) = 9ecaba5cf937832b428fb17e88f874f3fe465bca SHA1 (patch-ad) = 2f65cb36160794991d940bb3ffc9a754dcd9febc diff --git a/x11/tk/patches/patch-ab b/x11/tk/patches/patch-ab index 98016bd6044..5c5a5f7821f 100644 --- a/x11/tk/patches/patch-ab +++ b/x11/tk/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.13 2004/03/08 22:14:19 minskim Exp $ +$NetBSD: patch-ab,v 1.14 2004/03/11 01:27:05 minskim Exp $ --- configure.orig 2004-03-01 18:04:48.000000000 -0600 +++ configure @@ -10,7 +10,47 @@ $NetBSD: patch-ab,v 1.13 2004/03/08 22:14:19 minskim Exp $ EXTRA_CFLAGS="" TCL_EXPORT_FILE_SUFFIX="" UNSHARED_LIB_SUFFIX="" -@@ -2739,7 +2740,6 @@ if eval "test \"`echo '$ac_cv_header_'$a +@@ -2496,6 +2497,9 @@ fi + LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' + EXTRA_CFLAGS="" + LDFLAGS="" ++ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' ++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' ++ TCL_LIB_VERSIONS_OK=nodots + ;; + IRIX-6.*) + SHLIB_CFLAGS="" +@@ -2521,6 +2525,9 @@ fi + esac + LDFLAGS="-n32" + fi ++ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' ++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' ++ TCL_LIB_VERSIONS_OK=nodots + ;; + IRIX64-6.*) + SHLIB_CFLAGS="" +@@ -2545,6 +2552,9 @@ fi + LDFLAGS="-64" + fi + fi ++ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' ++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' ++ TCL_LIB_VERSIONS_OK=nodots + ;; + Linux*) + SHLIB_CFLAGS="-fPIC" +@@ -2626,6 +2636,9 @@ fi + EOF + + ++ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' ++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' ++ TCL_LIB_VERSIONS_OK=nodots + ;; + GNU*) + SHLIB_CFLAGS="-fPIC" +@@ -2739,7 +2752,6 @@ if eval "test \"`echo '$ac_cv_header_'$a # NetBSD/SPARC needs -fPIC, -fpic will not do. SHLIB_CFLAGS="-fPIC" @@ -18,7 +58,7 @@ $NetBSD: patch-ab,v 1.13 2004/03/08 22:14:19 minskim Exp $ SHLIB_LD_LIBS="" SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" -@@ -2761,13 +2761,23 @@ EOF +@@ -2761,13 +2773,23 @@ EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "yes" >/dev/null 2>&1; then rm -rf conftest* @@ -44,7 +84,7 @@ $NetBSD: patch-ab,v 1.13 2004/03/08 22:14:19 minskim Exp $ fi rm -f conftest* -@@ -3084,6 +3094,9 @@ EOF +@@ -3084,6 +3106,9 @@ EOF CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}' fi @@ -54,7 +94,7 @@ $NetBSD: patch-ab,v 1.13 2004/03/08 22:14:19 minskim Exp $ ;; ULTRIX-4.*) SHLIB_CFLAGS="-G 0" -@@ -3355,8 +3368,8 @@ fi +@@ -3355,8 +3380,8 @@ fi if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then LIB_SUFFIX=${SHARED_LIB_SUFFIX} @@ -65,7 +105,7 @@ $NetBSD: patch-ab,v 1.13 2004/03/08 22:14:19 minskim Exp $ else LIB_SUFFIX=${UNSHARED_LIB_SUFFIX} -@@ -4428,7 +4441,11 @@ echo "configure:4426: checking for X11 l +@@ -4428,7 +4453,11 @@ echo "configure:4426: 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 @@ -78,7 +118,7 @@ $NetBSD: patch-ab,v 1.13 2004/03/08 22:14:19 minskim Exp $ x_libraries="$i" break fi -@@ -4437,7 +4454,11 @@ echo "configure:4426: checking for X11 l +@@ -4437,7 +4466,11 @@ echo "configure:4426: checking for X11 l if test "$x_libraries" = ""; then XLIBSW=-lX11 else @@ -91,7 +131,7 @@ $NetBSD: patch-ab,v 1.13 2004/03/08 22:14:19 minskim Exp $ fi fi if test "$XLIBSW" = nope ; then -@@ -4507,6 +4528,10 @@ if test "x${x_libraries}" != "x"; then +@@ -4507,6 +4540,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'` @@ -102,7 +142,7 @@ $NetBSD: patch-ab,v 1.13 2004/03/08 22:14:19 minskim Exp $ fi # The statement below is very tricky! It actually *evaluates* the -@@ -5156,11 +5181,18 @@ eval "TK_LIB_FILE=${TK_LIB_FILE}" +@@ -5156,11 +5193,18 @@ eval "TK_LIB_FILE=${TK_LIB_FILE}" if test "$SHARED_BUILD" = 0 -o $TCL_NEEDS_EXP_FILE = 0; then if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then eval TK_LIB_FLAG="-ltk${VERSION}\${TK_DBGX}" diff --git a/x11/tk/patches/patch-ac b/x11/tk/patches/patch-ac index a6f4c3703c0..f85134b3b5b 100644 --- a/x11/tk/patches/patch-ac +++ b/x11/tk/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.6 2004/03/08 22:14:19 minskim Exp $ +$NetBSD: patch-ac,v 1.7 2004/03/11 01:27:05 minskim Exp $ --- tcl.m4.orig 2004-03-01 18:04:48.000000000 -0600 +++ tcl.m4 @@ -10,7 +10,47 @@ $NetBSD: patch-ac,v 1.6 2004/03/08 22:14:19 minskim Exp $ EXTRA_CFLAGS="" TCL_EXPORT_FILE_SUFFIX="" UNSHARED_LIB_SUFFIX="" -@@ -1214,7 +1215,6 @@ dnl AC_CHECK_TOOL(AR, ar) +@@ -1066,6 +1067,9 @@ dnl AC_CHECK_TOOL(AR, ar) + LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' + EXTRA_CFLAGS="" + LDFLAGS="" ++ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' ++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' ++ TCL_LIB_VERSIONS_OK=nodots + ;; + IRIX-6.*) + SHLIB_CFLAGS="" +@@ -1091,6 +1095,9 @@ dnl AC_CHECK_TOOL(AR, ar) + esac + LDFLAGS="-n32" + fi ++ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' ++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' ++ TCL_LIB_VERSIONS_OK=nodots + ;; + IRIX64-6.*) + SHLIB_CFLAGS="" +@@ -1115,6 +1122,9 @@ dnl AC_CHECK_TOOL(AR, ar) + LDFLAGS="-64" + fi + fi ++ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' ++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' ++ TCL_LIB_VERSIONS_OK=nodots + ;; + Linux*) + SHLIB_CFLAGS="-fPIC" +@@ -1161,6 +1171,9 @@ dnl AC_CHECK_TOOL(AR, ar) + # XIM peeking works under XFree86. + AC_DEFINE(PEEK_XCLOSEIM) + ++ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' ++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' ++ TCL_LIB_VERSIONS_OK=nodots + ;; + GNU*) + SHLIB_CFLAGS="-fPIC" +@@ -1214,7 +1227,6 @@ dnl AC_CHECK_TOOL(AR, ar) AC_CHECK_HEADER(dlfcn.h, [ # NetBSD/SPARC needs -fPIC, -fpic will not do. SHLIB_CFLAGS="-fPIC" @@ -18,7 +58,7 @@ $NetBSD: patch-ac,v 1.6 2004/03/08 22:14:19 minskim Exp $ SHLIB_LD_LIBS="" SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" -@@ -1227,11 +1227,19 @@ dnl AC_CHECK_TOOL(AR, ar) +@@ -1227,11 +1239,19 @@ dnl AC_CHECK_TOOL(AR, ar) #ifdef __ELF__ yes #endif @@ -40,7 +80,7 @@ $NetBSD: patch-ac,v 1.6 2004/03/08 22:14:19 minskim Exp $ ) ], [ SHLIB_CFLAGS="" -@@ -1526,6 +1534,9 @@ dnl AC_CHECK_TOOL(AR, ar) +@@ -1526,6 +1546,9 @@ dnl AC_CHECK_TOOL(AR, ar) CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}' fi @@ -50,7 +90,7 @@ $NetBSD: patch-ac,v 1.6 2004/03/08 22:14:19 minskim Exp $ ;; ULTRIX-4.*) SHLIB_CFLAGS="-G 0" -@@ -1710,8 +1721,8 @@ dnl AC_CHECK_TOOL(AR, ar) +@@ -1710,8 +1733,8 @@ dnl AC_CHECK_TOOL(AR, ar) if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then LIB_SUFFIX=${SHARED_LIB_SUFFIX} @@ -61,7 +101,7 @@ $NetBSD: patch-ac,v 1.6 2004/03/08 22:14:19 minskim Exp $ else LIB_SUFFIX=${UNSHARED_LIB_SUFFIX} -@@ -2056,7 +2067,11 @@ AC_DEFUN(SC_PATH_X, [ +@@ -2056,7 +2079,11 @@ AC_DEFUN(SC_PATH_X, [ for i in $dirs ; do if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl; then AC_MSG_RESULT($i) @@ -74,7 +114,7 @@ $NetBSD: patch-ac,v 1.6 2004/03/08 22:14:19 minskim Exp $ x_libraries="$i" break fi -@@ -2065,7 +2080,11 @@ AC_DEFUN(SC_PATH_X, [ +@@ -2065,7 +2092,11 @@ AC_DEFUN(SC_PATH_X, [ if test "$x_libraries" = ""; then XLIBSW=-lX11 else |