From 2ea620655cfa730b84eb103c92c973f1f59d4dbf Mon Sep 17 00:00:00 2001
From: hubertf <hubertf@pkgsrc.org>
Date: Tue, 26 Sep 2000 02:46:37 +0000
Subject: ELF lib fix for floppyd, which is only built on systems that actually
 have X installed, so a USE_X11=yes would be overkill, as it prevents using
 mtools on systems that don't have X installed.

---
 sysutils/mtools/files/patch-sum  |  4 ++--
 sysutils/mtools/patches/patch-ab | 26 ++++++++++++++++++++++----
 2 files changed, 24 insertions(+), 6 deletions(-)

(limited to 'sysutils/mtools')

diff --git a/sysutils/mtools/files/patch-sum b/sysutils/mtools/files/patch-sum
index 8a7c9c04a5b..51b820f4ac0 100644
--- a/sysutils/mtools/files/patch-sum
+++ b/sysutils/mtools/files/patch-sum
@@ -1,7 +1,7 @@
-$NetBSD: patch-sum,v 1.2 2000/01/04 17:49:43 bouyer Exp $
+$NetBSD: patch-sum,v 1.3 2000/09/26 02:46:37 hubertf Exp $
 
 MD5 (patch-aa) = edf769ee7f71b1bac02185b003eff69f
-MD5 (patch-ab) = f7f2bd87ed7656147a5b69b1a3f17496
+MD5 (patch-ab) = 24f199476d294f5d136b27a4a1053825
 MD5 (patch-ac) = 514d49464ae21e296bfa27f0f9023834
 MD5 (patch-ad) = 3c1e5aba6d4bb0d82052f08c1de94867
 MD5 (patch-ae) = 30bfddbbc43f7a9a196f280215ce8d77
diff --git a/sysutils/mtools/patches/patch-ab b/sysutils/mtools/patches/patch-ab
index ba40d2b415b..6ad46d868e6 100644
--- a/sysutils/mtools/patches/patch-ab
+++ b/sysutils/mtools/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 1998/08/17 00:11:34 kim Exp $
+$NetBSD: patch-ab,v 1.2 2000/09/26 02:46:38 hubertf Exp $
 
---- configure.ORIG	Sun Aug 16 19:58:30 1998
-+++ configure	Sun Aug 16 20:00:49 1998
-@@ -2550,7 +2550,7 @@
+--- configure.orig	Tue Sep 26 04:39:41 2000
++++ configure
+@@ -2471,7 +2471,7 @@
  fi
  
  
@@ -11,3 +11,21 @@ $NetBSD: patch-ab,v 1.1 1998/08/17 00:11:34 kim Exp $
      LDFLAGS="$LDFLAGS -z"
  fi
  
+@@ -2753,7 +2753,7 @@
+ 
+   # It would also be nice to do this for all -L options, not just this one.
+   if test -n "$x_libraries"; then
+-    X_LIBS="$X_LIBS -L$x_libraries"
++    X_LIBS="$X_LIBS -Wl,-R$x_libraries -L$x_libraries"
+     # For Solaris; some versions of Sun CC require a space after -R and
+     # others require no space.  Words are not sufficient . . . .
+     case "`(uname -sr) 2>/dev/null`" in
+@@ -3288,7 +3288,7 @@
+ 
+   # Check for libraries that X11R6 Xt/Xaw programs need.
+   ac_save_LDFLAGS="$LDFLAGS"
+-  test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
++  test -n "$x_libraries" && LDFLAGS="$LDFLAGS -Wl,-R$x_libraries -L$x_libraries"
+   # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
+   # check for ICE first), but we must link in the order -lSM -lICE or
+   # we get undefined symbols.  So assume we have SM if we have ICE.
-- 
cgit v1.2.3