Add ELF -rpath incantations.

3 files changed, 23 insertions, 14 deletions

diff --git a/lang/clisp/files/md5 b/lang/clisp/files/md5
index f3244f8533a..5d992433aef 100644
--- a/lang/clisp/files/md5
+++ b/lang/clisp/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.4 1999/04/17 01:55:55 mjl Exp $
+$NetBSD: md5,v 1.5 1999/07/21 23:25:07 mjl Exp $
 
 MD5 (clispsrc.tar.gz) = 2faa2d691742f2ab4d259c51fe1afaf5
diff --git a/lang/clisp/files/patch-sum b/lang/clisp/files/patch-sum
index 35e75023bac..4da4fe22623 100644
--- a/lang/clisp/files/patch-sum
+++ b/lang/clisp/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:54:06 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/07/21 23:25:07 mjl Exp $
 
-MD5 (patch-aa) = ee7a7bee6ea128f393f8f026e8106fa8
+MD5 (patch-aa) = fab0d13b56e2151afc70560ebd772404
 MD5 (patch-ab) = 68ed5a3e2c24ed9cdc722e0a679e835e
 MD5 (patch-ac) = 5fa885c40d5d3adc399767d2662e9928
 MD5 (patch-ad) = 8fc4ada35519036076aa6f05f92fa12f
diff --git a/lang/clisp/patches/patch-aa b/lang/clisp/patches/patch-aa
index 6bb0ff243d5..b80c60c7fb8 100644
--- a/lang/clisp/patches/patch-aa
+++ b/lang/clisp/patches/patch-aa
@@ -1,8 +1,17 @@
-$NetBSD: patch-aa,v 1.4 1999/04/17 01:55:55 mjl Exp $
+$NetBSD: patch-aa,v 1.5 1999/07/21 23:25:08 mjl Exp $
 
---- makemake.in.orig	Sun Aug  9 21:27:13 1998
-+++ makemake.in	Sun Sep  6 21:55:57 1998
-@@ -1034,6 +1034,9 @@
+--- makemake.in.orig	Thu Jan  7 16:23:48 1999
++++ makemake.in	Wed Jul 21 20:07:38 1999
+@@ -280,7 +280,7 @@
+      LIBTERMCAP='@LIBTERMCAP@'           # either '-ltermcap' or '-lncurses'
+      LIBDL='@LIBDL@'                     # either '-ldl' or ''
+      X_INCLUDES='@X_INCLUDES@'           # either '-I/usr/somewhere/include' or ''
+-     X_LIBS='@X_LIBS@'                   # either '-L/usr/somewhere/lib -lX11' or ''
++     X_LIBS='-Wl,-rpath ${X11BASE}/lib @X_LIBS@'                   # either '-L/usr/somewhere/lib -lX11' or ''
+      host='@host@'                       # something like 'sparc-sun-sunos4'
+      host_cpu='@host_cpu@'               # something like 'sparc'
+      host_vendor='@host_vendor@'         # something like 'sun'
+@@ -1056,6 +1056,9 @@
      *) ;;
    esac
  fi
@@ -12,7 +21,7 @@ $NetBSD: patch-aa,v 1.4 1999/04/17 01:55:55 mjl Exp $
  
  if [ $TSYS = sun4 -a $CROSS = false ] ; then
    ARCH_K=`(arch -k) 2>/dev/null || uname -m 2>/dev/null` # kernel architecture, see arch(1)
-@@ -2326,7 +2329,7 @@
+@@ -2380,7 +2383,7 @@
    if [ $HOS = unix ] ; then
      echotab "if test -d locale; then rm -rf locale; fi"
      echotab "mkdir locale"
@@ -21,16 +30,16 @@ $NetBSD: patch-aa,v 1.4 1999/04/17 01:55:55 mjl Exp $
    else
      echotab "mkdir locale"
      eval `grep ALL_LINGUAS= src/gettext/configure.in`
-@@ -2842,7 +2845,7 @@
+@@ -2919,7 +2922,7 @@
      fi
      case "$fsstnd" in
        gnu_ext)
 -        echotab "if [ ! -d \$(mandir)/html ] ; then mkdir \$(mandir)/html ; fi"
 +        echotab "if [ ! -d \$(prefix)/share/doc/clisp ] ; then mkdir \$(prefix)/share/doc/clisp ; fi"
          ;;
-       suse)
+       suse | redhat | debian)
          echotab "if [ ! -d \$(docdir) ] ; then mkdir \$(docdir) ; fi"
-@@ -2894,10 +2897,10 @@
+@@ -2977,10 +2980,10 @@
      fi
      case "$fsstnd" in
        gnu_ext)
@@ -43,8 +52,8 @@ $NetBSD: patch-aa,v 1.4 1999/04/17 01:55:55 mjl Exp $
 +          echotab "\$(INSTALL_DATA) clreadline.html \$(prefix)/share/doc/clisp/clreadline.html"
          fi
          ;;
-       suse)
-@@ -2931,9 +2934,9 @@
+       suse | redhat | debian)
+@@ -3016,9 +3019,9 @@
      fi
      case "$fsstnd" in
        gnu_ext)
@@ -55,4 +64,4 @@ $NetBSD: patch-aa,v 1.4 1999/04/17 01:55:55 mjl Exp $
 +          echotab "\$(RM) \$(prefix)/share/doc/clisp/clreadline.html"
          fi
          ;;
-       suse)
+       suse | redhat | debian)