Don't rely on libtool>1.4 functionality... yet.

3 files changed, 13 insertions, 5 deletions

diff --git a/x11/qt2-libs/Makefile b/x11/qt2-libs/Makefile
index 1da1e16c2b4..275bbf0f2ec 100644
--- a/x11/qt2-libs/Makefile
+++ b/x11/qt2-libs/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2000/12/09 17:21:49 skrll Exp $
+# $NetBSD: Makefile,v 1.5 2000/12/11 23:02:36 skrll Exp $
 #
-USE_MESA=	yes
+#USE_MESA=	yes
 
 .include "../qt2-libs/Makefile.common"
 
diff --git a/x11/qt2-libs/Makefile.common b/x11/qt2-libs/Makefile.common
index 806a363a26a..3d34c04c565 100644
--- a/x11/qt2-libs/Makefile.common
+++ b/x11/qt2-libs/Makefile.common
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile.common,v 1.3 2000/12/09 17:21:49 skrll Exp $
+# $NetBSD: Makefile.common,v 1.4 2000/12/11 23:02:36 skrll Exp $
 #
 
-
 DISTNAME=		qt-x11-${QTVERSION}
 WRKSRC=			${WRKDIR}/qt-${QTVERSION}
 CATEGORIES=		x11
diff --git a/x11/qt2-libs/patches/patch-ae b/x11/qt2-libs/patches/patch-ae
index a0292e1e115..1ab6d2a087a 100644
--- a/x11/qt2-libs/patches/patch-ae
+++ b/x11/qt2-libs/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.3 2000/12/09 17:21:50 skrll Exp $
+$NetBSD: patch-ae,v 1.4 2000/12/11 23:02:37 skrll Exp $
 
 --- src/Makefile.in.orig	Wed Nov  8 17:06:56 2000
 +++ src/Makefile.in
@@ -41,3 +41,12 @@ $NetBSD: patch-ae,v 1.3 2000/12/09 17:21:50 skrll Exp $
  
  ####### Build rules
  
+@@ -390,7 +378,7 @@
+ all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
+ 
+ $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
+-	$(SYSCONF_LINK_LIB)
++	$(SYSCONF_LINK_LIB) $(SYSCONF_RPATH_X11) $(SYSCONF_RPATH_OPENGL)
+ 
+ moc: $(SRCMOC)
+