Update "kdesupport" package to version 1.1.

5 files changed, 28 insertions, 45 deletions

diff --git a/converters/kdesupport/Makefile b/converters/kdesupport/Makefile
index 5b4f5fdb950..95673e8e40b 100644
--- a/converters/kdesupport/Makefile
+++ b/converters/kdesupport/Makefile
@@ -1,24 +1,23 @@
-# $NetBSD: Makefile,v 1.19 1999/02/15 21:41:32 tron Exp $
+# $NetBSD: Makefile,v 1.20 1999/02/15 22:34:57 tron Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/11/05 04:19:46 asami Exp
 #
 
-DISTNAME=	kdesupport-1.0
+DISTNAME=	kdesupport-1.1
 CATEGORIES=	converters kde
-MASTER_SITES=	ftp://ftp.kde.org/pub/kde/stable/1.0/distribution/tar/generic/source/ \
-		ftp://ftp.de.kde.org/pub/kde/stable/1.0/distribution/tar/generic/source/
+MASTER_SITES=	ftp://ftp.kde.org/pub/kde/stable/1.1/distribution/tar/generic/source/bz2/ \
+		ftp://ftp.de.kde.org/pub/kde/stable/1.1/distribution/tar/generic/source/bz2/
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://www.kde.org/
 
 DEPENDS+=	qt-1.42:../../x11/qt
 
-CONFLICTS=	kdesupport-2.1b kdesupport-3.1b kdesupport-4.1b
-
-IGNORE=		"needs to be updated"
+CONFLICTS=	kdesupport-*
 
 USE_X11BASE=	yes
-GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--datadir=${PREFIX}/share/kde" \
 		"--with-qt-includes=${PREFIX}/include/qt" \
 		"--with-qt-libraries=${PREFIX}/lib" \
diff --git a/converters/kdesupport/files/md5 b/converters/kdesupport/files/md5
index 5d1051cbfd3..cc8c97e529b 100644
--- a/converters/kdesupport/files/md5
+++ b/converters/kdesupport/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.6 1998/08/07 13:17:03 agc Exp $
+$NetBSD: md5,v 1.7 1999/02/15 22:34:57 tron Exp $
 
-MD5 (kdesupport-1.0.tar.gz) = 2701c55a1f6e3a2423845873595ad754
+MD5 (kdesupport-1.1.tar.bz2) = 0a19060de102b37ed52f628ca7de2ca1
diff --git a/converters/kdesupport/patches/patch-aa b/converters/kdesupport/patches/patch-aa
index fb6f81e8622..1d56c05cd8c 100644
--- a/converters/kdesupport/patches/patch-aa
+++ b/converters/kdesupport/patches/patch-aa
@@ -1,21 +1,21 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 10:40:15 agc Exp $
+$NetBSD: patch-aa,v 1.3 1999/02/15 22:34:58 tron Exp $
 
---- configure.orig	Sun Jul 19 17:15:00 1998
-+++ configure	Sun Jul 19 17:15:22 1998
-@@ -1632,6 +1632,8 @@
- ac_save_cflags="$CFLAGS"
+--- configure.orig	Sat Feb  6 18:56:20 1999
++++ configure	Mon Feb 15 22:47:27 1999
+@@ -1941,6 +1941,8 @@
+ kde_save_cflags="$CFLAGS"
  CC=$CXX
  CFLAGS="$CXXFLAGS"
 +
 +if false; then
  # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent'
  
-@@ -1679,6 +1681,7 @@
+@@ -2170,6 +2172,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; }
-  CC=$ac_save_cc
- CFLAGS="$ac_save_cflags"
 +fi
-  
- echo $ac_n "checking for AIX""... $ac_c" 1>&6
- echo "configure:1685: checking for AIX" >&5
+ 
+ # Redirect the config.log output again, so that the ltconfig log is not
+ # clobbered by the next message.
diff --git a/converters/kdesupport/patches/patch-ab b/converters/kdesupport/patches/patch-ab
deleted file mode 100644
index 710799d5f16..00000000000
--- a/converters/kdesupport/patches/patch-ab
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ab,v 1.1 1998/12/29 06:09:26 garbled Exp $
---- QwSpriteField/Makefile.in.orig	Mon Dec 28 22:58:46 1998
-+++ QwSpriteField/Makefile.in	Mon Dec 28 22:59:06 1998
-@@ -139,7 +139,7 @@
- # the difference between the first and the last, is the major number
- # the last is the minor number
- # the number in the middle is the minor-minor number
--libQwSpriteField_la_LDFLAGS = -version-info 5:2:4 -lqt -lX11 $(LIBSOCKET)
-+libQwSpriteField_la_LDFLAGS = -version-info 5:2:4 -lqt -lX11 -lXext $(LIBSOCKET)
- 
- INCLUDES = $(QT_INCLUDES)
- lib_LTLIBRARIES = libQwSpriteField.la
-@@ -157,7 +157,7 @@
- 
- noinst_PROGRAMS = example
- example_SOURCES = example.cpp
--example_LDADD = libQwSpriteField.la -lqt -lX11 $(LIBSOCKET) 
-+example_LDADD = libQwSpriteField.la -lqt -lX11 -lXext $(LIBSOCKET) 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
- CONFIG_CLEAN_FILES = 
diff --git a/converters/kdesupport/pkg/PLIST b/converters/kdesupport/pkg/PLIST
index 7724d991e4b..f4c73af5ea5 100644
--- a/converters/kdesupport/pkg/PLIST
+++ b/converters/kdesupport/pkg/PLIST
@@ -1,8 +1,10 @@
-@comment $NetBSD: PLIST,v 1.9 1998/07/21 21:13:46 tv Exp $
+@comment $NetBSD: PLIST,v 1.10 1999/02/15 22:34:58 tron Exp $
 include/Pix.h
 include/QwCluster.h
 include/QwPublicList.h
 include/QwSpriteField.h
+include/js.h
+include/jsint.h
 include/mimelib/address.h
 include/mimelib/addrlist.h
 include/mimelib/body.h
@@ -39,7 +41,10 @@ include/mimelib/uuencode.h
 include/mimelib/binhex.h
 lib/libQwSpriteField.a
 lib/libQwSpriteField.la
-lib/libQwSpriteField.so.5.2
+lib/libQwSpriteField.so.6.0
+lib/libjs.a
+lib/libjs.la
+lib/libjs.so.2.0
 lib/libmimelib.a
 lib/libmimelib.la
 lib/libmimelib.so.1.0