diff options
| author | jwise <jwise> | 2000-09-01 17:26:54 +0000 |
|---|---|---|
| committer | jwise <jwise> | 2000-09-01 17:26:54 +0000 |
| commit | f7b969e90c940c66df46b607c48f79bddb724841 (patch) | |
| tree | 8cb0f9c2bf7f918768a084b3d8e6205824cba773 /x11/blt/patches | |
| parent | a1e19bcc1f5eed0aa69550c759850f07b8b04e1b (diff) | |
| download | pkgsrc-f7b969e90c940c66df46b607c48f79bddb724841.tar.gz | |
Adapt this package to tk-8.3.2. There is actually a newer blt out there
(2.4u), but the master site has been down all week, so I am adapting the
old one, as the new one has few major changes...
Diffstat (limited to 'x11/blt/patches')
| -rw-r--r-- | x11/blt/patches/patch-aa | 28 | ||||
| -rw-r--r-- | x11/blt/patches/patch-ab | 28 |
2 files changed, 38 insertions, 18 deletions
diff --git a/x11/blt/patches/patch-aa b/x11/blt/patches/patch-aa index 8868d0e3b59..6f2aafd0535 100644 --- a/x11/blt/patches/patch-aa +++ b/x11/blt/patches/patch-aa @@ -1,19 +1,27 @@ -$NetBSD: patch-aa,v 1.2 2000/05/22 03:47:55 sakamoto Exp $ ---- configure.in.orig Thu Jan 13 05:15:36 2000 -+++ configure.in Mon May 22 11:52:47 2000 -@@ -581,5 +581,7 @@ +--- configure.in.orig Wed Jan 12 15:15:36 2000 ++++ configure.in Fri Sep 1 13:03:55 2000 +@@ -580,9 +580,9 @@ + TK_LIB_DIR=${TK_EXEC_PREFIX}/lib case $target in - *-sunos4*|NetBSD-*|FreeBSD-*|OpenBSD-*) +- TCL_LIB_SPEC="-ltcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}" +- TK_LIB_SPEC="-ltk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}" + *-sunos4*|*-*-netbsd|FreeBSD-*|OpenBSD-*) -+ TCL_INC_DIR=${TCL_PREFIX}/include/tcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION} -+ TK_INC_DIR=${TK_PREFIX}/include/tk${TK_MAJOR_VERSION}.${TK_MINOR_VERSION} - TCL_LIB_SPEC="-ltcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}" - TK_LIB_SPEC="-ltk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}" -@@ -936,5 +938,5 @@ ++ TCL_LIB_SPEC="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -ltcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}" ++ TK_LIB_SPEC="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -ltk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}" + ;; + *) + TCL_LIB_SPEC="-ltcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}" +@@ -933,9 +933,10 @@ + # Not available on all versions: check for include file. + AC_CHECK_HEADER(dlfcn.h, test_ok=yes, test_ok=no) + if test "$test_ok" = yes; then ++ LDFLAGS="-L${PREFIX}/lib -L${X11BASE}/lib -Wl,-R${PREFIX}/lib -Wl,-R${X11BASE}/lib" SHLIB_CFLAGS="-fpic" SHLIB_LD="ld" - SHLIB_LD_FLAGS="-Bshareable -x" -+ SHLIB_LD_FLAGS="-Bshareable -x -rpath ${LD_RUN_PATH}" ++ SHLIB_LD_FLAGS="-Bshareable -x -R${PREFIX}/lib -R${X11BASE}/lib" fi ;; + diff --git a/x11/blt/patches/patch-ab b/x11/blt/patches/patch-ab index 6d7d64c2d25..243d5b50ba6 100644 --- a/x11/blt/patches/patch-ab +++ b/x11/blt/patches/patch-ab @@ -1,19 +1,31 @@ -$NetBSD: patch-ab,v 1.2 2000/05/22 03:47:55 sakamoto Exp $ ---- configure.orig Thu Jan 13 05:15:36 2000 -+++ configure Mon May 22 11:53:05 2000 -@@ -2695,5 +2695,7 @@ +--- configure.orig Wed Jan 12 15:15:36 2000 ++++ configure Fri Sep 1 13:03:47 2000 +@@ -2694,13 +2694,13 @@ + TK_LIB_DIR=${TK_EXEC_PREFIX}/lib case $target in - *-sunos4*|NetBSD-*|FreeBSD-*|OpenBSD-*) + *-sunos4*|*-*-netbsd|FreeBSD-*|OpenBSD-*) -+ TCL_INC_DIR=${TCL_PREFIX}/include/tcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION} -+ TK_INC_DIR=${TK_PREFIX}/include/tk${TK_MAJOR_VERSION}.${TK_MINOR_VERSION} TCL_LIB_SPEC="-ltcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}" TK_LIB_SPEC="-ltk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}" -@@ -3394,5 +3396,5 @@ + ;; + *) +- TCL_LIB_SPEC="-ltcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}" +- TK_LIB_SPEC="-ltk${TK_MAJOR_VERSION}.${TK_MINOR_VERSION}" ++ TCL_LIB_SPEC="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -ltcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}" ++ TK_LIB_SPEC="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -ltk${TK_MAJOR_VERSION}.${TK_MINOR_VERSION}" + ;; + esac + +@@ -3391,9 +3391,10 @@ + fi + + if test "$test_ok" = yes; then ++ LDFLAGS="-L${PREFIX}/lib -L${X11BASE}/lib -Wl,-R${PREFIX}/lib -Wl,-R${X11BASE}/lib" SHLIB_CFLAGS="-fpic" SHLIB_LD="ld" - SHLIB_LD_FLAGS="-Bshareable -x" -+ SHLIB_LD_FLAGS="-Bshareable -x -rpath ${LD_RUN_PATH}" ++ SHLIB_LD_FLAGS="-Bshareable -x -R${PREFIX}/lib -R${X11BASE}/lib" fi ;; + |