Change to use pkg version of libtool rather than a private copy.

3 files changed, 41 insertions, 20 deletions

diff --git a/x11/kdelibs/Makefile b/x11/kdelibs/Makefile
index 28af4d72623..8880d37c1fb 100644
--- a/x11/kdelibs/Makefile
+++ b/x11/kdelibs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 1998/07/19 21:09:23 tv Exp $
+# $NetBSD: Makefile,v 1.16 1998/07/20 00:01:56 tv Exp $
 # FreeBSD Id: Makefile,v 1.5 1997/11/27 00:25:46 se Exp
 #
 
@@ -9,6 +9,7 @@ MASTER_SITES=	ftp://ftp.us.kde.org/pub/kde/stable/1.0/distribution/tar/generic/s
 
 MAINTAINER=	tron@netbsd.org
 
+BUILD_DEPENDS=	${LOCALBASE}/bin/libtool:../../devel/libtool
 DEPENDS+=	jpeg-6b:../../graphics/jpeg
 DEPENDS+=	qt-1.40:../../x11/qt
 DEPENDS+=	giflib-3.0:../../graphics/giflib
@@ -16,13 +17,13 @@ DEPENDS+=	giflib-3.0:../../graphics/giflib
 CONFLICTS=	kdelibs-2.1b kdelibs-3.1b kdelibs-4.1b
 
 USE_X11=	yes
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--prefix=${PREFIX}" \
-		"--x-inc=${X11BASE}/include -I${LOCALBASE}/include -I${LOCALBASE}/include/giflib" \
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	"--x-inc=${X11BASE}/include -I${LOCALBASE}/include -I${LOCALBASE}/include/giflib" \
 		"--x-lib=${X11BASE}/lib -L${LOCALBASE}/lib" \
 		"--datadir=${PREFIX}/share/kde" \
 		"--with-qt-dir=${PREFIX}" \
 		"--with-qt-includes=${PREFIX}/include/qt"
-CONFIGURE_ENV=	CXXFLAGS="${CFLAGS}"
+CONFIGURE_ENV=	CXXFLAGS="${CFLAGS}" \
+		LIBTOOL=${LOCALBASE}/bin/libtool
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kdelibs/patches/patch-aa b/x11/kdelibs/patches/patch-aa
new file mode 100644
index 00000000000..4ae18a1c0d0
--- /dev/null
+++ b/x11/kdelibs/patches/patch-aa
@@ -0,0 +1,20 @@
+--- configure.orig	Sun Jul 19 18:35:14 1998
++++ configure	Sun Jul 19 18:35:48 1998
+@@ -1688,6 +1688,8 @@
+ ac_save_cflags="$CFLAGS"
+ CC=$CXX
+ CFLAGS="$CXXFLAGS"
++
++if false; then
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ 
+@@ -1733,6 +1735,8 @@
+ ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \
+ $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
+ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
++fi
++
+  CC=$ac_save_cc
+ CFLAGS="$ac_save_cflags"
+ 
diff --git a/x11/kdelibs/pkg/PLIST b/x11/kdelibs/pkg/PLIST
index 1604a74f281..8d711e34fbf 100644
--- a/x11/kdelibs/pkg/PLIST
+++ b/x11/kdelibs/pkg/PLIST
@@ -1,18 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 1998/07/15 12:51:37 agc Exp $
-lib/libkdecore.so.1.0
-lib/libkdecore.la
-lib/libkdeui.so.1.0
-lib/libkdeui.la
-lib/libjscript.so.0.90
-lib/libjscript.la
-lib/libkhtmlw.so.1.0
-lib/libkhtmlw.la
-lib/libkfile.so.1.0
-lib/libkfile.la
-lib/libkfm.so.1.0
-lib/libkfm.la
-lib/libmediatool.so.1.0
-lib/libmediatool.la
+@comment $NetBSD: PLIST,v 1.9 1998/07/20 00:01:57 tv Exp $
 include/kpixmap.h
 include/kled.h
 include/kcontainer.h
@@ -114,6 +100,20 @@ include/kcombiview.h
 include/kpreview.h
 include/xview.h
 include/kfilepreview.h
+lib/libkdecore.a
+lib/libkdecore.so.1.0
+lib/libkdeui.a
+lib/libkdeui.so.1.0
+lib/libjscript.a
+lib/libjscript.so.0.90
+lib/libkhtmlw.a
+lib/libkhtmlw.so.1.0
+lib/libkfile.a
+lib/libkfile.so.1.0
+lib/libkfm.a
+lib/libkfm.so.1.0
+lib/libmediatool.a
+lib/libmediatool.so.1.0
 share/apps/kde/pics/arrow_up.xbm
 share/apps/kde/pics/arrow_down.xbm
 share/apps/kde/pics/arrow_left.xbm