Use LTCONFIG_OVERRIDE and remove the libtool part of a patch.

4 files changed, 13 insertions, 50 deletions

diff --git a/converters/kdesupport/Makefile b/converters/kdesupport/Makefile
index 2dde88d44e6..e14bab844fc 100644
--- a/converters/kdesupport/Makefile
+++ b/converters/kdesupport/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2000/08/16 00:38:49 hubertf Exp $
+# $NetBSD: Makefile,v 1.34 2000/08/22 21:23:23 skrll Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/11/05 04:19:46 asami Exp
 #
 
@@ -12,6 +12,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.kde.org/
 
 USE_LIBTOOL=	yes
+LTCONFIG_OVERRIDE=	${WRKSRC}/admin/ltconfig
 GNU_CONFIGURE=	yes
 
 EVAL_PREFIX+=	QT1DIR=qt1
diff --git a/converters/kdesupport/files/patch-sum b/converters/kdesupport/files/patch-sum
index 3799d49c4e6..035b991eeac 100644
--- a/converters/kdesupport/files/patch-sum
+++ b/converters/kdesupport/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.3 1999/11/22 20:32:05 jdolecek Exp $
+$NetBSD: patch-sum,v 1.4 2000/08/22 21:23:24 skrll Exp $
 
-MD5 (patch-aa) = 6497ec4fcd17e0da83600d0db3883529
-MD5 (patch-ab) = b05a82b306e62f35f2af196b5b589cc4
+MD5 (patch-aa) = 76acadd3797919a7ebc12316acd4705e
+MD5 (patch-ab) = eb4a21a211c023fc65e0f170372edfa6
diff --git a/converters/kdesupport/patches/patch-aa b/converters/kdesupport/patches/patch-aa
index 8f6f7ffbafc..8d962ef4e67 100644
--- a/converters/kdesupport/patches/patch-aa
+++ b/converters/kdesupport/patches/patch-aa
@@ -1,46 +1,11 @@
-$NetBSD: patch-aa,v 1.6 1999/11/22 20:31:31 jdolecek Exp $
+$NetBSD: patch-aa,v 1.7 2000/08/22 21:23:24 skrll Exp $
 
 The libtool staff pulled to KDE in rev. 331 of
 	kde-common/admin/acinclude.m4.in (jdolecek)
 
---- ./configure	Tue Sep  7 17:24:53 1999
-+++ /usr/pkgsrc/converters/kdesupport/work.i386.unpatched/kdesupport-1.1.2/configure	Fri Nov 12 06:31:53 1999
-@@ -1973,6 +1973,8 @@
- kde_save_cflags="$CFLAGS"
- CC=$CXX
- CFLAGS="$CXXFLAGS"
-+
-+if false; then
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent'
- 
-@@ -2206,6 +2208,7 @@
- ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
- $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
- || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
-+fi
- 
- # Redirect the config.log output again, so that the ltconfig log is not
- # clobbered by the next message.
-@@ -3265,7 +3268,7 @@
- 
- 
- 
--
-+if false; then
- echo $ac_n "checking for Qt""... $ac_c" 1>&6
- echo "configure:3271: checking for Qt" >&5
- LIBQT="-lqt -lXext -lX11 $LIBSOCKET"
-@@ -3600,7 +3603,7 @@
- 
- 
- LIB_QT='-lqt $(LIB_X11)'
--
-+fi
- 
- 
- 
-@@ -5479,7 +5482,7 @@
+--- configure.orig	Tue Sep  7 16:24:53 1999
++++ configure	Mon Aug 14 17:50:44 2000
+@@ -5479,7 +5479,7 @@
  
  
  
@@ -49,7 +14,7 @@ The libtool staff pulled to KDE in rev. 331 of
  echo $ac_n "checking for main in -ljs""... $ac_c" 1>&6
  echo "configure:5485: checking for main in -ljs" >&5
  ac_lib_var=`echo js'_'main | sed 'y%./+-%__p_%'`
-@@ -5525,7 +5528,7 @@
+@@ -5525,7 +5525,7 @@
  For this have a look at http://people.ssh.fi/mtr/js
  " 1>&2
   	TOPSUBDIRS="$TOPSUBDIRS js"
diff --git a/converters/kdesupport/patches/patch-ab b/converters/kdesupport/patches/patch-ab
index 59c8a5bba1d..f508aa01677 100644
--- a/converters/kdesupport/patches/patch-ab
+++ b/converters/kdesupport/patches/patch-ab
@@ -1,9 +1,7 @@
-$NetBSD: patch-ab,v 1.5 1999/11/22 20:31:03 jdolecek Exp $
+$NetBSD: patch-ab,v 1.6 2000/08/22 21:23:24 skrll Exp $
 
-Pulled into KDE	(jdolecek)
-
---- ./mimelib/mimelib/config.h	Sat Sep 27 13:55:18 1997
-+++ /usr/pkgsrc/converters/kdesupport/work.i386.unpatched/kdesupport-1.1.2/mimelib/mimelib/config.h	Fri Nov 12 06:31:53 1999
+--- mimelib/mimelib/config.h.orig	Sat Sep 27 12:55:18 1997
++++ mimelib/mimelib/config.h	Mon Aug 14 17:48:31 2000
 @@ -35,7 +35,7 @@
  #   define DW_WIN32
  #endif
@@ -13,4 +11,3 @@ Pulled into KDE	(jdolecek)
  #   define DW_UNIX
  #endif
  
-