Remove KDE1 packages (and dependencies) from pkgsrc, since the KDE

authors have dropped support for it and have not been backporting
security fixes.

As proposed on tech-pkg numerous times (last one: Dec 27 2003).

10 files changed, 1 insertions, 1561 deletions

diff --git a/audio/Makefile b/audio/Makefile
index b6950306e8b..43159d9a7c6 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.195 2004/01/09 17:17:56 xtraeme Exp $
+# $NetBSD: Makefile,v 1.196 2004/01/10 22:43:06 wiz Exp $
 #
 
 COMMENT=	Audio tools
@@ -82,7 +82,6 @@ SUBDIR+=	id3ed
 SUBDIR+=	id3lib
 SUBDIR+=	id3v2
 SUBDIR+=	juke
-SUBDIR+=	kdemultimedia
 SUBDIR+=	kdemultimedia2
 SUBDIR+=	kdemultimedia3
 SUBDIR+=	krio
diff --git a/audio/kdemultimedia/DESCR b/audio/kdemultimedia/DESCR
deleted file mode 100644
index 90ae45773be..00000000000
--- a/audio/kdemultimedia/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-KDE provides an integrated X11 based environment, much like CDE.
diff --git a/audio/kdemultimedia/Makefile b/audio/kdemultimedia/Makefile
deleted file mode 100644
index c7135c99a49..00000000000
--- a/audio/kdemultimedia/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# $NetBSD: Makefile,v 1.19 2003/12/26 19:56:40 wiz Exp $
-
-DISTNAME=	kdemultimedia-1.1.2
-PKGREVISION=	2
-CATEGORIES=	audio kde
-MASTER_SITES=	${MASTER_SITE_LOCAL}/kde1
-EXTRACT_SUFX=	.tar.bz2
-
-MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://www.kde.org/
-COMMENT=	KDE audio tools
-
-DEPENDS+=	kdebase-1.1.2nb4:../../x11/kdebase
-
-USE_X11BASE=	yes
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-
-EVAL_PREFIX=	QT1DIR=qt1 KDEBASEDIR=kdebase
-CONFIGURE_ARGS=	"--datadir=${KDEBASEDIR}/share/kde" \
-		"--with-qt-dir=${QT1DIR}/qt1"
-CFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	KDEDIR=${KDEBASEDIR} \
-		CXXFLAGS="${CFLAGS}" \
-		all_libraries="${KDE_LDFLAGS}"
-
-KDE_LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib
-KDE_LDFLAGS+=	-Wl,${RPATH_FLAG}${LOCALBASE}/lib -Wl,${RPATH_FLAG}${X11BASE}/lib
-FIX_RPATH+=	KDE_LDFLAGS
-
-post-install:
-	@${CHMOD} -R go-w ${KDEBASEDIR}/share/kde/apps/kscd/cddb
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/kdemultimedia/PLIST b/audio/kdemultimedia/PLIST
deleted file mode 100644
index 45f45d727bf..00000000000
--- a/audio/kdemultimedia/PLIST
+++ /dev/null
@@ -1,279 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:16:54 zuntum Exp $
-bin/kmedia
-bin/kmidi
-bin/kmix
-bin/kscdmagic
-bin/kscd
-bin/cddaslave
-bin/workman2cddb.pl
-share/doc/kde/HTML/en/kmedia/index-1.html
-share/doc/kde/HTML/en/kmedia/index-2.html
-share/doc/kde/HTML/en/kmedia/index-3.html
-share/doc/kde/HTML/en/kmedia/index-4.html
-share/doc/kde/HTML/en/kmedia/index-5.html
-share/doc/kde/HTML/en/kmedia/index.html
-share/doc/kde/HTML/en/kmedia/logotp3.gif
-share/doc/kde/HTML/en/kmidi/kmidi-1.html
-share/doc/kde/HTML/en/kmidi/kmidi-2.html
-share/doc/kde/HTML/en/kmidi/kmidi-3.html
-share/doc/kde/HTML/en/kmidi/kmidi-4.html
-share/doc/kde/HTML/en/kmidi/kmidi-5.html
-share/doc/kde/HTML/en/kmidi/kmidi.html
-share/doc/kde/HTML/en/kmidi/kmidi.nif
-share/doc/kde/HTML/en/kmidi/kmidi.sgml
-share/doc/kde/HTML/en/kmidi/logotp3.gif
-share/doc/kde/HTML/en/kmix/index-1.html
-share/doc/kde/HTML/en/kmix/index-2.html
-share/doc/kde/HTML/en/kmix/index-3.html
-share/doc/kde/HTML/en/kmix/index-4.html
-share/doc/kde/HTML/en/kmix/index-5.html
-share/doc/kde/HTML/en/kmix/index-6.html
-share/doc/kde/HTML/en/kmix/index.html
-share/doc/kde/HTML/en/kmix/logotp3.gif
-share/doc/kde/HTML/en/kscd/kscd-1.html
-share/doc/kde/HTML/en/kscd/kscd-2.html
-share/doc/kde/HTML/en/kscd/kscd-3.html
-share/doc/kde/HTML/en/kscd/kscd-4.html
-share/doc/kde/HTML/en/kscd/kscd-5.html
-share/doc/kde/HTML/en/kscd/kscd-6.html
-share/doc/kde/HTML/en/kscd/kscd-7.html
-share/doc/kde/HTML/en/kscd/kscd-8.html
-share/doc/kde/HTML/en/kscd/kscd.html
-share/doc/kde/HTML/en/kscd/logotp3.gif
-share/doc/kde/HTML/en/kscd/kscd1.gif
-share/doc/kde/HTML/en/kscd/kscd12.gif
-share/doc/kde/HTML/en/kscd/kscd15.gif
-share/doc/kde/HTML/en/kscd/kscd2a.gif
-share/doc/kde/HTML/en/kscd/kscd5.gif
-share/doc/kde/HTML/en/kscd/kscd8.gif
-share/doc/kde/HTML/en/kscd/kscd10.gif
-share/doc/kde/HTML/en/kscd/kscd13.gif
-share/doc/kde/HTML/en/kscd/kscd16.gif
-share/doc/kde/HTML/en/kscd/kscd3.gif
-share/doc/kde/HTML/en/kscd/kscd6.gif
-share/doc/kde/HTML/en/kscd/kscd9.gif
-share/doc/kde/HTML/en/kscd/kscd11.gif
-share/doc/kde/HTML/en/kscd/kscd14.gif
-share/doc/kde/HTML/en/kscd/kscd2.gif
-share/doc/kde/HTML/en/kscd/kscd4.gif
-share/doc/kde/HTML/en/kscd/kscd7.gif
-share/doc/kde/HTML/de/kmidi/kmidi-1.html
-share/doc/kde/HTML/de/kmidi/kmidi-2.html
-share/doc/kde/HTML/de/kmidi/kmidi-3.html
-share/doc/kde/HTML/de/kmidi/kmidi-4.html
-share/doc/kde/HTML/de/kmidi/kmidi-5.html
-share/doc/kde/HTML/de/kmidi/kmidi.html
-share/doc/kde/HTML/de/kmidi/kmidi.sgml
-share/doc/kde/HTML/de/kmidi/logotp3.gif
-share/kde/apps/kmedia/pics/eject.xbm
-share/kde/apps/kmedia/pics/ff.xbm
-share/kde/apps/kmedia/pics/kmedia.xpm
-share/kde/apps/kmedia/pics/kmedia_mini.xpm
-share/kde/apps/kmedia/pics/lock.xbm
-share/kde/apps/kmedia/pics/logo.xbm
-share/kde/apps/kmedia/pics/nexttrk.xbm
-share/kde/apps/kmedia/pics/playpause.xbm
-share/kde/apps/kmedia/pics/playpause_both.xpm
-share/kde/apps/kmedia/pics/playpause_play.xpm
-share/kde/apps/kmedia/pics/poweroff.xbm
-share/kde/apps/kmedia/pics/prevtrk.xbm
-share/kde/apps/kmedia/pics/rew.xbm
-share/kde/apps/kmedia/pics/stop.xbm
-share/kde/apps/kmidi/config/gravis.cfg
-share/kde/apps/kmidi/config/gsdrum.cfg
-share/kde/apps/kmidi/config/midia.cfg
-share/kde/apps/kmidi/config/mt32.cfg
-share/kde/apps/kmidi/config/sndfont.cfg
-share/kde/apps/kmidi/config/timidity.cfg
-share/kde/apps/kmidi/config/wowpats.cfg
-share/kde/apps/kmidi/config/chaos12-voices
-share/kde/apps/kmidi/config/chaos8-voices
-share/kde/apps/kmidi/config/megadrum
-share/kde/apps/kmidi/config/megainst
-share/kde/apps/kmidi/config/pila-voices
-share/kde/apps/kmidi/config/sound-canvas-drums
-share/kde/apps/kmidi/config/patch/acpiano.pat
-share/kde/apps/kmidi/config/patch/nylongt2.pat
-share/kde/apps/kmidi/pics/kmidilogo.xpm
-share/kde/apps/kmix/pics/mix_audio.xpm
-share/kde/apps/kmix/pics/mix_bass.xpm
-share/kde/apps/kmix/pics/mix_cd.xpm
-share/kde/apps/kmix/pics/mix_ext.xpm
-share/kde/apps/kmix/pics/mix_microphone.xpm
-share/kde/apps/kmix/pics/mix_midi.xpm
-share/kde/apps/kmix/pics/mix_recmon.xpm
-share/kde/apps/kmix/pics/mix_treble.xpm
-share/kde/apps/kmix/pics/mix_unknown.xpm
-share/kde/apps/kmix/pics/mix_volume.xpm
-share/kde/apps/kmix/pics/kmixdocked.xpm
-share/kde/apps/kscd/pics/kscdlogo.xpm
-share/kde/apps/kscd/pics/cdsmall.xpm
-share/kde/locale/de/LC_MESSAGES/kmix.mo
-share/kde/locale/de/LC_MESSAGES/kmedia.mo
-share/kde/locale/de/LC_MESSAGES/kscd.mo
-share/kde/locale/de/LC_MESSAGES/kmid.mo
-share/kde/locale/de/LC_MESSAGES/kmidi.mo
-share/kde/locale/fr/LC_MESSAGES/kmedia.mo
-share/kde/locale/fr/LC_MESSAGES/kmid.mo
-share/kde/locale/fr/LC_MESSAGES/kmix.mo
-share/kde/locale/fr/LC_MESSAGES/kscd.mo
-share/kde/locale/fr/LC_MESSAGES/kmidi.mo
-share/kde/locale/sv/LC_MESSAGES/kmedia.mo
-share/kde/locale/sv/LC_MESSAGES/kmix.mo
-share/kde/locale/sv/LC_MESSAGES/kscd.mo
-share/kde/locale/sv/LC_MESSAGES/kmid.mo
-share/kde/locale/cs/LC_MESSAGES/kmedia.mo
-share/kde/locale/cs/LC_MESSAGES/kmix.mo
-share/kde/locale/cs/LC_MESSAGES/kscd.mo
-share/kde/locale/cs/LC_MESSAGES/kmid.mo
-share/kde/locale/cs/LC_MESSAGES/kmidi.mo
-share/kde/locale/es/LC_MESSAGES/kmedia.mo
-share/kde/locale/es/LC_MESSAGES/kmid.mo
-share/kde/locale/es/LC_MESSAGES/kmix.mo
-share/kde/locale/es/LC_MESSAGES/kscd.mo
-share/kde/locale/hu/LC_MESSAGES/kscd.mo
-share/kde/locale/hu/LC_MESSAGES/kmid.mo
-share/kde/locale/hu/LC_MESSAGES/kmidi.mo
-share/kde/locale/hu/LC_MESSAGES/kmix.mo
-share/kde/locale/da/LC_MESSAGES/kmedia.mo
-share/kde/locale/da/LC_MESSAGES/kmix.mo
-share/kde/locale/da/LC_MESSAGES/kscd.mo
-share/kde/locale/da/LC_MESSAGES/kmid.mo
-share/kde/locale/da/LC_MESSAGES/kmidi.mo
-share/kde/locale/it/LC_MESSAGES/kmedia.mo
-share/kde/locale/it/LC_MESSAGES/kmix.mo
-share/kde/locale/it/LC_MESSAGES/kscd.mo
-share/kde/locale/it/LC_MESSAGES/kmidi.mo
-share/kde/locale/nl/LC_MESSAGES/kmedia.mo
-share/kde/locale/nl/LC_MESSAGES/kscd.mo
-share/kde/locale/pt/LC_MESSAGES/kmedia.mo
-share/kde/locale/pt/LC_MESSAGES/kmix.mo
-share/kde/locale/pt/LC_MESSAGES/kmid.mo
-share/kde/locale/pt/LC_MESSAGES/kscd.mo
-share/kde/locale/no/LC_MESSAGES/kmedia.mo
-share/kde/locale/no/LC_MESSAGES/kmix.mo
-share/kde/locale/no/LC_MESSAGES/kmid.mo
-share/kde/locale/no/LC_MESSAGES/kscd.mo
-share/kde/locale/no/LC_MESSAGES/kmidi.mo
-share/kde/locale/pl/LC_MESSAGES/kmix.mo
-share/kde/locale/pl/LC_MESSAGES/kmedia.mo
-share/kde/locale/pl/LC_MESSAGES/kscd.mo
-share/kde/locale/pl/LC_MESSAGES/kmid.mo
-share/kde/locale/pl/LC_MESSAGES/kmidi.mo
-share/kde/locale/el/LC_MESSAGES/kmedia.mo
-share/kde/locale/el/LC_MESSAGES/kmix.mo
-share/kde/locale/el/LC_MESSAGES/kscd.mo
-share/kde/locale/fi/LC_MESSAGES/kmedia.mo
-share/kde/locale/fi/LC_MESSAGES/kmix.mo
-share/kde/locale/fi/LC_MESSAGES/kmid.mo
-share/kde/locale/fi/LC_MESSAGES/kscd.mo
-share/kde/locale/hr/LC_MESSAGES/kmedia.mo
-share/kde/locale/hr/LC_MESSAGES/kmix.mo
-share/kde/locale/hr/LC_MESSAGES/kscd.mo
-share/kde/locale/hr/LC_MESSAGES/kmid.mo
-share/kde/locale/ro/LC_MESSAGES/kmedia.mo
-share/kde/locale/ro/LC_MESSAGES/kmix.mo
-share/kde/locale/zh_TW.Big5/LC_MESSAGES/kmedia.mo
-share/kde/locale/zh_TW.Big5/LC_MESSAGES/kmix.mo
-share/kde/locale/zh_TW.Big5/LC_MESSAGES/kmid.mo
-share/kde/locale/zh_TW.Big5/LC_MESSAGES/kscd.mo
-share/kde/locale/zh_CN.GB2312/LC_MESSAGES/kmedia.mo
-share/kde/locale/zh_CN.GB2312/LC_MESSAGES/kmix.mo
-share/kde/locale/zh_CN.GB2312/LC_MESSAGES/kmid.mo
-share/kde/locale/zh_CN.GB2312/LC_MESSAGES/kscd.mo
-share/kde/locale/sk/LC_MESSAGES/kmedia.mo
-share/kde/locale/sk/LC_MESSAGES/kmix.mo
-share/kde/locale/sk/LC_MESSAGES/kscd.mo
-share/kde/locale/sk/LC_MESSAGES/kmid.mo
-share/kde/locale/sk/LC_MESSAGES/kmidi.mo
-share/kde/locale/ca/LC_MESSAGES/kmedia.mo
-share/kde/locale/ca/LC_MESSAGES/kmid.mo
-share/kde/locale/ca/LC_MESSAGES/kmidi.mo
-share/kde/locale/ca/LC_MESSAGES/kmix.mo
-share/kde/locale/ca/LC_MESSAGES/kscd.mo
-share/kde/locale/sl/LC_MESSAGES/kmedia.mo
-share/kde/locale/sl/LC_MESSAGES/kmix.mo
-share/kde/locale/sl/LC_MESSAGES/kscd.mo
-share/kde/locale/sl/LC_MESSAGES/kmid.mo
-share/kde/locale/sl/LC_MESSAGES/kmidi.mo
-share/kde/locale/pt_BR/LC_MESSAGES/kmedia.mo
-share/kde/locale/pt_BR/LC_MESSAGES/kmix.mo
-share/kde/locale/pt_BR/LC_MESSAGES/kscd.mo
-share/kde/locale/pt_BR/LC_MESSAGES/kmid.mo
-share/kde/locale/pt_BR/LC_MESSAGES/kmidi.mo
-share/kde/locale/eo/LC_MESSAGES/kmedia.mo
-share/kde/locale/eo/LC_MESSAGES/kmix.mo
-share/kde/locale/eo/LC_MESSAGES/kscd.mo
-share/kde/locale/eo/LC_MESSAGES/kmid.mo
-share/kde/locale/is/LC_MESSAGES/kmix.mo
-share/kde/locale/is/LC_MESSAGES/kscd.mo
-share/kde/locale/is/LC_MESSAGES/kmedia.mo
-share/kde/locale/is/LC_MESSAGES/kmid.mo
-share/kde/locale/is/LC_MESSAGES/kmidi.mo
-share/kde/locale/ko/LC_MESSAGES/kmedia.mo
-share/kde/locale/ko/LC_MESSAGES/kmix.mo
-share/kde/locale/ko/LC_MESSAGES/kscd.mo
-share/kde/locale/ko/LC_MESSAGES/kmid.mo
-share/kde/locale/tr/LC_MESSAGES/kmedia.mo
-share/kde/locale/tr/LC_MESSAGES/kmix.mo
-share/kde/locale/tr/LC_MESSAGES/kscd.mo
-share/kde/locale/tr/LC_MESSAGES/kmid.mo
-share/kde/locale/et/LC_MESSAGES/kmedia.mo
-share/kde/locale/et/LC_MESSAGES/kmix.mo
-share/kde/locale/et/LC_MESSAGES/kscd.mo
-share/kde/locale/et/LC_MESSAGES/kmid.mo
-share/kde/locale/et/LC_MESSAGES/kmidi.mo
-share/kde/locale/br/LC_MESSAGES/kmedia.mo
-share/kde/locale/br/LC_MESSAGES/kmid.mo
-share/kde/locale/br/LC_MESSAGES/kmidi.mo
-share/kde/locale/br/LC_MESSAGES/kmix.mo
-share/kde/locale/br/LC_MESSAGES/kscd.mo
-share/kde/locale/ja/LC_MESSAGES/kmedia.mo
-share/kde/locale/ja/LC_MESSAGES/kmix.mo
-share/kde/locale/ja/LC_MESSAGES/kscd.mo
-share/kde/locale/ja/LC_MESSAGES/kmid.mo
-share/kde/locale/ja/LC_MESSAGES/kmidi.mo
-share/kde/icons/mini/kmedia.xpm
-share/kde/icons/mini/kmidi.xpm
-share/kde/icons/mini/kmix.xpm
-share/kde/icons/mini/kscd.xpm
-share/kde/icons/large/kmedia.xpm
-share/kde/icons/large/kmidi.xpm
-share/kde/icons/large/kmix.xpm
-share/kde/icons/large/kscd.xpm
-share/kde/icons/kmedia.xpm
-share/kde/icons/kmidi.xpm
-share/kde/icons/kmix.xpm
-share/kde/icons/kscd.xpm
-share/kde/icons/cd.xpm
-share/kde/mimelnk/text/xmcd.kdelnk
-share/kde/applnk/Multimedia/KMedia.kdelnk
-share/kde/applnk/Multimedia/KMidi.kdelnk
-share/kde/applnk/Multimedia/KMix.kdelnk
-share/kde/applnk/Multimedia/kscd.kdelnk
-@dirrm share/doc/kde/HTML/en/kmidi
-@dirrm share/doc/kde/HTML/en/kmix
-@dirrm share/doc/kde/HTML/en/kscd
-@dirrm share/doc/kde/HTML/de/kmidi
-@dirrm share/kde/apps/kmedia/pics
-@dirrm share/kde/apps/kmedia
-@dirrm share/kde/apps/kmidi/config/patch
-@dirrm share/kde/apps/kmidi/config
-@dirrm share/kde/apps/kmidi/pics
-@dirrm share/kde/apps/kmidi
-@dirrm share/kde/apps/kmix/pics
-@dirrm share/kde/apps/kmix
-@dirrm share/kde/apps/kscd/cddb/rock
-@dirrm share/kde/apps/kscd/cddb/blues
-@dirrm share/kde/apps/kscd/cddb/classical
-@dirrm share/kde/apps/kscd/cddb/jazz
-@dirrm share/kde/apps/kscd/cddb/newage
-@dirrm share/kde/apps/kscd/cddb/soundtrack
-@dirrm share/kde/apps/kscd/cddb/reggae
-@dirrm share/kde/apps/kscd/cddb/folk
-@dirrm share/kde/apps/kscd/cddb/country
-@dirrm share/kde/apps/kscd/cddb/misc
-@dirrm share/kde/apps/kscd/cddb/data
-@dirrm share/kde/apps/kscd/cddb
-@dirrm share/kde/apps/kscd/pics
-@dirrm share/kde/apps/kscd
diff --git a/audio/kdemultimedia/distinfo b/audio/kdemultimedia/distinfo
deleted file mode 100644
index 5ba022299f4..00000000000
--- a/audio/kdemultimedia/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 12:14:31 agc Exp $
-
-SHA1 (kdemultimedia-1.1.2.tar.bz2) = 8a8942f9fb0c768748cd68f1cc474e55d5db62f6
-Size (kdemultimedia-1.1.2.tar.bz2) = 1543683 bytes
-SHA1 (patch-aa) = 940d69d80dc6623072ea6ad4bc04bd809573d38a
-SHA1 (patch-ab) = f18812025a2e8976af520e69cf8dbcae812851b6
-SHA1 (patch-ac) = 6d5f1b9ba32554a44f296ffb90ff6685f2097e24
-SHA1 (patch-ae) = ed57b672c12fa004b747b6f2f9572baf0274ac98
-SHA1 (patch-af) = f6546fab2f09349b7216832ce7dcd0e0f0f148b3
diff --git a/audio/kdemultimedia/patches/patch-aa b/audio/kdemultimedia/patches/patch-aa
deleted file mode 100644
index 444a30cbd32..00000000000
--- a/audio/kdemultimedia/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.3 1999/11/24 15:01:56 hubertf Exp $
-
---- kmidi/config.h.orig	Mon Mar 29 14:24:38 1999
-+++ kmidi/config.h	Wed Nov 24 15:17:17 1999
-@@ -263,8 +263,9 @@
- # endif        
- #endif /* linux */
- 
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
- #include <errno.h>
-+#include <sys/types.h>
- #include <machine/endian.h>
- #if BYTE_ORDER == LITTLE_ENDIAN
- #undef BIG_ENDIAN
diff --git a/audio/kdemultimedia/patches/patch-ab b/audio/kdemultimedia/patches/patch-ab
deleted file mode 100644
index 8fc31cd2567..00000000000
--- a/audio/kdemultimedia/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-A fix for this problem has been pulled up into KDE, though implemented
-in way not breaking the build for non-NetBSD systems.
-
-$NetBSD: patch-ab,v 1.3 1999/12/06 20:44:57 bouyer Exp $
---- kmix/Makefile.in.orig	Sun Sep 26 02:36:54 1999
-+++ kmix/Makefile.in	Sun Sep 26 02:37:38 1999
-@@ -286,7 +286,7 @@
- 
- kmix: $(kmix_OBJECTS) $(kmix_DEPENDENCIES)
- 	@rm -f kmix
--	$(CXXLINK) $(kmix_LDFLAGS) $(kmix_OBJECTS) $(kmix_LDADD) $(LIBS)
-+	$(CXXLINK) $(kmix_LDFLAGS) $(kmix_OBJECTS) $(kmix_LDADD) $(LIBS) @LIBOSSAUDIO@
- .cpp.o:
- 	$(CXXCOMPILE) -c $<
- .cpp.lo:
diff --git a/audio/kdemultimedia/patches/patch-ac b/audio/kdemultimedia/patches/patch-ac
deleted file mode 100644
index f2a88b26b67..00000000000
--- a/audio/kdemultimedia/patches/patch-ac
+++ /dev/null
@@ -1,69 +0,0 @@
-Patch pulled up to KDE tree. (jdolecek 1999/11/15)
-
-$NetBSD: patch-ac,v 1.2 1999/11/15 23:01:52 jdolecek Exp $
---- kscd/plat_freebsd.c.orig	Sun Sep 26 02:18:22 1999
-+++ kscd/plat_freebsd.c	Sun Sep 26 02:27:36 1999
-@@ -41,15 +41,6 @@
- #include <sys/ioctl.h>
- #include <sys/cdio.h>
- 
--#ifdef __NetBSD__
--
--#define MSF_MINUTES 1
--#define MSF_SECONDS 2
--#define MSF_FRAMES 3
--
--#include "/sys/scsi/scsi_all.h"
--#include "/sys/scsi/scsi_cd.h"
--#endif
- 
- #include "struct.h"
- 
-@@ -110,15 +101,9 @@
- 		return (-1);
- 
- 
--#ifdef __NetBSD__
--	*min = toc_buffer.addr[MSF_MINUTES];
--	*sec = toc_buffer.addr[MSF_SECONDS];
--	*frm = toc_buffer.addr[MSF_FRAMES];
--#else
- 	*min = toc_buffer.addr.msf.minute;
- 	*sec = toc_buffer.addr.msf.second;
- 	*frm = toc_buffer.addr.msf.frame;
--#endif
- 
- 	
- 	return (0);
-@@ -148,15 +133,9 @@
- 
- 	*data = ((toc_buffer.control & 0x4) != 0);
- 
--#ifdef __NetBSD__
--	*startframe = toc_buffer.addr[MSF_MINUTES]*60*75 +
--		toc_buffer.addr[MSF_SECONDS] * 75 +
--		toc_buffer.addr[MSF_FRAMES];
--#else
- 	*startframe = toc_buffer.addr.msf.minute*60*75 +
- 		toc_buffer.addr.msf.second * 75 +
- 		toc_buffer.addr.msf.frame;
--#endif
- 
- 	return (0);
- }
-@@ -224,15 +203,9 @@
- 	case CD_AS_PLAY_IN_PROGRESS:
- 		*mode = PLAYING;
- dopos:
--#ifdef __NetBSD__
--		*pos = scd.what.position.absaddr[MSF_MINUTES] * 60 * 75 +
--			scd.what.position.absaddr[MSF_SECONDS] * 75 +
--			scd.what.position.absaddr[MSF_FRAMES];
--#else
- 		*pos = scd.what.position.absaddr.msf.minute * 60 * 75 +
- 			scd.what.position.absaddr.msf.second * 75 +
- 			scd.what.position.absaddr.msf.frame;
--#endif
- 		*track = scd.what.position.track_number;
- 		*index = scd.what.position.index_number;
- 		break;
diff --git a/audio/kdemultimedia/patches/patch-ae b/audio/kdemultimedia/patches/patch-ae
deleted file mode 100644
index eedb2e06058..00000000000
--- a/audio/kdemultimedia/patches/patch-ae
+++ /dev/null
@@ -1,23 +0,0 @@
-Slighly modified fix pulled up to KDE tree, together with similar fix
-to kscd-script. (jdolecek 1999/11/15)
-
-$NetBSD: patch-ae,v 1.2 1999/11/15 23:01:52 jdolecek Exp $
---- kscd/config.h.std.orig	Wed Nov 10 22:16:15 1999
-+++ kscd/config.h.std	Wed Nov 10 22:18:53 1999
-@@ -123,13 +123,13 @@
- 
- #if defined(__FreeBSD__) || defined(__NetBSD__)
- 
-+#ifdef __FreeBSD__
- /* Is this the most commonly used cd device on FreeBSD ? */
--
- #define DEFAULT_CD_DEVICE       "/dev/rmatcd0c"
- 
--/*
-+#else /* __NetBSD__ */
- #define DEFAULT_CD_DEVICE       "/dev/rcd0d"
--*/
-+#endif /* __FreeBSD__ */
- 
- /* Please have a look at void KSCD::playClicked() in kscd.cpp. You will find there
-    the following code:
diff --git a/audio/kdemultimedia/patches/patch-af b/audio/kdemultimedia/patches/patch-af
deleted file mode 100644
index 4077d25b59b..00000000000
--- a/audio/kdemultimedia/patches/patch-af
+++ /dev/null
@@ -1,1114 +0,0 @@
-$NetBSD: patch-af,v 1.2 1999/12/06 21:01:37 bouyer Exp $
-
---- configure.old	Mon Dec  6 00:04:57 1999
-+++ configure	Mon Dec  6 00:08:05 1999
-@@ -2521,8 +2521,45 @@
- fi
-  
- 
-+echo $ac_n "checking for main in -lossaudio""... $ac_c" 1>&6
-+echo "configure:2526: checking for main in -lossaudio" >&5
-+ac_lib_var=`echo ossaudio'_'main | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  ac_save_LIBS="$LIBS"
-+LIBS="-lossaudio  $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 2534 "configure"
-+#include "confdefs.h"
-+
-+int main() {
-+main()
-+; return 0; }
-+EOF
-+if { (eval echo configure:2541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
-+
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  LIBOSSAUDIO="-lossaudio"
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+ 
-+
- echo $ac_n "checking for main in -lAlib""... $ac_c" 1>&6
--echo "configure:2526: checking for main in -lAlib" >&5
-+echo "configure:2563: checking for main in -lAlib" >&5
- ac_lib_var=`echo Alib'_'main | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -2530,14 +2567,14 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lAlib  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2534 "configure"
-+#line 2571 "configure"
- #include "confdefs.h"
- 
- int main() {
- main()
- ; return 0; }
- EOF
--if { (eval echo configure:2541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -2558,7 +2595,7 @@
- fi
-  
- echo $ac_n "checking for main in -laudio""... $ac_c" 1>&6
--echo "configure:2562: checking for main in -laudio" >&5
-+echo "configure:2599: checking for main in -laudio" >&5
- ac_lib_var=`echo audio'_'main | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -2566,14 +2603,14 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-laudio  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2570 "configure"
-+#line 2607 "configure"
- #include "confdefs.h"
- 
- int main() {
- main()
- ; return 0; }
- EOF
--if { (eval echo configure:2577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -2594,7 +2631,7 @@
- fi
-  
- echo $ac_n "checking for main in -lmme""... $ac_c" 1>&6
--echo "configure:2598: checking for main in -lmme" >&5
-+echo "configure:2635: checking for main in -lmme" >&5
- ac_lib_var=`echo mme'_'main | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -2602,14 +2639,14 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lmme  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2606 "configure"
-+#line 2643 "configure"
- #include "confdefs.h"
- 
- int main() {
- main()
- ; return 0; }
- EOF
--if { (eval echo configure:2613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -2636,7 +2673,7 @@
- 
- 
- echo $ac_n "checking for X""... $ac_c" 1>&6
--echo "configure:2640: checking for X" >&5
-+echo "configure:2677: checking for X" >&5
- 
- ac_ext=c
- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-@@ -2665,12 +2702,12 @@
- 
-   # First, try using that file with no special directory specified.
- cat > conftest.$ac_ext <<EOF
--#line 2669 "configure"
-+#line 2706 "configure"
- #include "confdefs.h"
- #include <$x_direct_test_include>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2674: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2711: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -2739,14 +2776,14 @@
-   ac_save_LIBS="$LIBS"
-   LIBS="-l$x_direct_test_library $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2743 "configure"
-+#line 2780 "configure"
- #include "confdefs.h"
- 
- int main() {
- ${x_direct_test_function}()
- ; return 0; }
- EOF
--if { (eval echo configure:2750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   LIBS="$ac_save_LIBS"
- # We can link X programs with no special library path.
-@@ -2910,7 +2947,7 @@
- cross_compiling=$ac_cv_prog_cc_cross
- 
-       echo $ac_n "checking for main in -lcompat""... $ac_c" 1>&6
--echo "configure:2914: checking for main in -lcompat" >&5
-+echo "configure:2951: checking for main in -lcompat" >&5
- ac_lib_var=`echo compat'_'main | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -2918,14 +2955,14 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lcompat  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2922 "configure"
-+#line 2959 "configure"
- #include "confdefs.h"
- 
- int main() {
- main()
- ; return 0; }
- EOF
--if { (eval echo configure:2929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -2946,7 +2983,7 @@
- fi
-     
-    echo $ac_n "checking for main in -lcrypt""... $ac_c" 1>&6
--echo "configure:2950: checking for main in -lcrypt" >&5
-+echo "configure:2987: checking for main in -lcrypt" >&5
- ac_lib_var=`echo crypt'_'main | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -2954,14 +2991,14 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lcrypt  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2958 "configure"
-+#line 2995 "configure"
- #include "confdefs.h"
- 
- int main() {
- main()
- ; return 0; }
- EOF
--if { (eval echo configure:2965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -2982,7 +3019,7 @@
- fi
-     
-    echo $ac_n "checking for the third argument of getsockname""... $ac_c" 1>&6
--echo "configure:2986: checking for the third argument of getsockname" >&5  
-+echo "configure:3023: checking for the third argument of getsockname" >&5  
- ac_ext=C
- # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
- ac_cpp='$CXXCPP $CPPFLAGS'
-@@ -2994,7 +3031,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2998 "configure"
-+#line 3035 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -3007,7 +3044,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:3011: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:3048: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_ksize_t=socklen_t
- else
-@@ -3023,7 +3060,7 @@
-   CXXFLAGS="-Werror $CXXFLAGS"
- fi
- cat > conftest.$ac_ext <<EOF
--#line 3027 "configure"
-+#line 3064 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -3036,7 +3073,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:3040: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:3077: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_ksize_t=int
- else
-@@ -3071,7 +3108,7 @@
- cross_compiling=$ac_cv_prog_cc_cross
- 
-    echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
--echo "configure:3075: checking for dnet_ntoa in -ldnet" >&5
-+echo "configure:3112: checking for dnet_ntoa in -ldnet" >&5
- ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3079,7 +3116,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-ldnet  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3083 "configure"
-+#line 3120 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -3090,7 +3127,7 @@
- dnet_ntoa()
- ; return 0; }
- EOF
--if { (eval echo configure:3094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -3112,7 +3149,7 @@
- 
-    if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-       echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
--echo "configure:3116: checking for dnet_ntoa in -ldnet_stub" >&5
-+echo "configure:3153: checking for dnet_ntoa in -ldnet_stub" >&5
- ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3120,7 +3157,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-ldnet_stub  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3124 "configure"
-+#line 3161 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -3131,7 +3168,7 @@
- dnet_ntoa()
- ; return 0; }
- EOF
--if { (eval echo configure:3135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -3153,12 +3190,12 @@
- 
-    fi
-    echo $ac_n "checking for inet_ntoa""... $ac_c" 1>&6
--echo "configure:3157: checking for inet_ntoa" >&5
-+echo "configure:3194: checking for inet_ntoa" >&5
- if eval "test \"`echo '$''{'ac_cv_func_inet_ntoa'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3162 "configure"
-+#line 3199 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char inet_ntoa(); below.  */
-@@ -3181,7 +3218,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:3185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_inet_ntoa=yes"
- else
-@@ -3202,7 +3239,7 @@
- 
-    if test $ac_cv_func_inet_ntoa = no; then
-      echo $ac_n "checking for inet_ntoa in -lnsl""... $ac_c" 1>&6
--echo "configure:3206: checking for inet_ntoa in -lnsl" >&5
-+echo "configure:3243: checking for inet_ntoa in -lnsl" >&5
- ac_lib_var=`echo nsl'_'inet_ntoa | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3210,7 +3247,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lnsl  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3214 "configure"
-+#line 3251 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -3221,7 +3258,7 @@
- inet_ntoa()
- ; return 0; }
- EOF
--if { (eval echo configure:3225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -3243,12 +3280,12 @@
- 
-    fi
-    echo $ac_n "checking for connect""... $ac_c" 1>&6
--echo "configure:3247: checking for connect" >&5
-+echo "configure:3284: checking for connect" >&5
- if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3252 "configure"
-+#line 3289 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char connect(); below.  */
-@@ -3271,7 +3308,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:3275: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_connect=yes"
- else
-@@ -3292,7 +3329,7 @@
- 
-    if test $ac_cv_func_connect = no; then
-       echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
--echo "configure:3296: checking for connect in -lsocket" >&5
-+echo "configure:3333: checking for connect in -lsocket" >&5
- ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3300,7 +3337,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3304 "configure"
-+#line 3341 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -3311,7 +3348,7 @@
- connect()
- ; return 0; }
- EOF
--if { (eval echo configure:3315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -3334,12 +3371,12 @@
-    fi
- 
-    echo $ac_n "checking for remove""... $ac_c" 1>&6
--echo "configure:3338: checking for remove" >&5
-+echo "configure:3375: checking for remove" >&5
- if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3343 "configure"
-+#line 3380 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char remove(); below.  */
-@@ -3362,7 +3399,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:3366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_remove=yes"
- else
-@@ -3383,7 +3420,7 @@
- 
-    if test $ac_cv_func_remove = no; then
-       echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
--echo "configure:3387: checking for remove in -lposix" >&5
-+echo "configure:3424: checking for remove in -lposix" >&5
- ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3391,7 +3428,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lposix  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3395 "configure"
-+#line 3432 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -3402,7 +3439,7 @@
- remove()
- ; return 0; }
- EOF
--if { (eval echo configure:3406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -3426,12 +3463,12 @@
-  
-    # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo $ac_n "checking for shmat""... $ac_c" 1>&6
--echo "configure:3430: checking for shmat" >&5
-+echo "configure:3467: checking for shmat" >&5
- if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3435 "configure"
-+#line 3472 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char shmat(); below.  */
-@@ -3454,7 +3491,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:3458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_shmat=yes"
- else
-@@ -3475,7 +3512,7 @@
- 
-    if test $ac_cv_func_shmat = no; then
-      echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
--echo "configure:3479: checking for shmat in -lipc" >&5
-+echo "configure:3516: checking for shmat in -lipc" >&5
- ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3483,7 +3520,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lipc  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3487 "configure"
-+#line 3524 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -3494,7 +3531,7 @@
- shmat()
- ; return 0; }
- EOF
--if { (eval echo configure:3498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -3520,7 +3557,7 @@
-    
-    
-    echo $ac_n "checking for killpg in -lucb""... $ac_c" 1>&6
--echo "configure:3524: checking for killpg in -lucb" >&5
-+echo "configure:3561: checking for killpg in -lucb" >&5
- ac_lib_var=`echo ucb'_'killpg | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3528,7 +3565,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lucb  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3532 "configure"
-+#line 3569 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -3539,7 +3576,7 @@
- killpg()
- ; return 0; }
- EOF
--if { (eval echo configure:3543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -3562,11 +3599,11 @@
- 
-    case $host in     *-*-lynxos* )
-         echo $ac_n "checking LynxOS header file wrappers""... $ac_c" 1>&6
--echo "configure:3566: checking LynxOS header file wrappers" >&5
-+echo "configure:3603: checking LynxOS header file wrappers" >&5
-         CFLAGS="$CFLAGS -D__NO_INCLUDE_WARN__"
-         echo "$ac_t""disabled" 1>&6
-         echo $ac_n "checking for gethostbyname in -lbsd""... $ac_c" 1>&6
--echo "configure:3570: checking for gethostbyname in -lbsd" >&5
-+echo "configure:3607: checking for gethostbyname in -lbsd" >&5
- ac_lib_var=`echo bsd'_'gethostbyname | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3574,7 +3611,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lbsd  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3578 "configure"
-+#line 3615 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -3585,7 +3622,7 @@
- gethostbyname()
- ; return 0; }
- EOF
--if { (eval echo configure:3589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -3613,7 +3650,7 @@
- 
- 
- echo $ac_n "checking for Qt""... $ac_c" 1>&6
--echo "configure:3617: checking for Qt" >&5
-+echo "configure:3654: checking for Qt" >&5
- LIBQT="-lqt -lXext -lX11 $LIBSOCKET"
- ac_qt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO
- qt_libraries=""
-@@ -3718,7 +3755,7 @@
- EOF
- 
- 
--if { (eval echo configure:3722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-   rm -f conftest*
- else
-   echo "configure: failed program was:" >&5
-@@ -3767,7 +3804,7 @@
- if test ! "$kde_qt_libs_given" = "yes"; then
- 
- echo $ac_n "checking if Qt compiles without flags""... $ac_c" 1>&6
--echo "configure:3771: checking if Qt compiles without flags" >&5
-+echo "configure:3808: checking if Qt compiles without flags" >&5
- if eval "test \"`echo '$''{'kde_cv_qt_direct'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -3810,7 +3847,7 @@
- EOF
- 
- 
--if { (eval echo configure:3814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-   kde_cv_qt_direct="yes"
- else
-   kde_cv_qt_direct="no"
-@@ -3862,7 +3899,7 @@
- 
-    
-    echo $ac_n "checking for moc""... $ac_c" 1>&6
--echo "configure:3866: checking for moc" >&5
-+echo "configure:3903: checking for moc" >&5
-    if eval "test \"`echo '$''{'kde_cv_path_moc'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -3925,8 +3962,8 @@
-      if test -n "$ac_cv_path_moc"; then
-        output=`eval "$ac_cv_path_moc --help 2>&1 | sed -e '1q' | grep Qt"`
-      fi
--     echo "configure:3929: tried to call $ac_cv_path_moc --help 2>&1 | sed -e '1q' | grep Qt" >&5
--     echo "configure:3930: moc output: $output" >&5
-+     echo "configure:3966: tried to call $ac_cv_path_moc --help 2>&1 | sed -e '1q' | grep Qt" >&5
-+     echo "configure:3967: moc output: $output" >&5
- 
-      if test -z "$output"; then
-        
-@@ -3952,7 +3989,7 @@
- 
- 
- echo $ac_n "checking for extra includes""... $ac_c" 1>&6
--echo "configure:3956: checking for extra includes" >&5
-+echo "configure:3993: checking for extra includes" >&5
- # Check whether --with-extra-includes or --without-extra-includes was given.
- if test "${with_extra_includes+set}" = set; then
-   withval="$with_extra_includes"
-@@ -3980,7 +4017,7 @@
- echo "$ac_t""$kde_use_extra_includes" 1>&6
- 
- echo $ac_n "checking for extra libs""... $ac_c" 1>&6
--echo "configure:3984: checking for extra libs" >&5
-+echo "configure:4021: checking for extra libs" >&5
- # Check whether --with-extra-libs or --without-extra-libs was given.
- if test "${with_extra_libs+set}" = set; then
-   withval="$with_extra_libs"
-@@ -4011,7 +4048,7 @@
- 
- 
- echo $ac_n "checking for rpath""... $ac_c" 1>&6
--echo "configure:4015: checking for rpath" >&5
-+echo "configure:4052: checking for rpath" >&5
- # Check whether --enable-rpath or --disable-rpath was given.
- if test "${enable_rpath+set}" = set; then
-   enableval="$enable_rpath"
-@@ -4041,7 +4078,7 @@
- 
- 
- 	echo $ac_n "checking for bool""... $ac_c" 1>&6
--echo "configure:4045: checking for bool" >&5
-+echo "configure:4082: checking for bool" >&5
-         if eval "test \"`echo '$''{'ac_cv_have_bool'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -4054,14 +4091,14 @@
- cross_compiling=$ac_cv_prog_cxx_cross
- 
-           	cat > conftest.$ac_ext <<EOF
--#line 4058 "configure"
-+#line 4095 "configure"
- #include "confdefs.h"
- 
- int main() {
- bool aBool = true;
- ; return 0; }
- EOF
--if { (eval echo configure:4065: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4102: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_have_bool="yes"
- else
-@@ -4086,7 +4123,7 @@
- 
- 
- echo $ac_n "checking for KDE""... $ac_c" 1>&6
--echo "configure:4090: checking for KDE" >&5
-+echo "configure:4127: checking for KDE" >&5
- 
- if test "${prefix}" != NONE; then
-   kde_includes=${prefix}/include
-@@ -4269,7 +4306,7 @@
- 
- 
- echo $ac_n "checking for KDE paths""... $ac_c" 1>&6
--echo "configure:4273: checking for KDE paths" >&5
-+echo "configure:4310: checking for KDE paths" >&5
- kde_result=""
- 
- if eval "test \"`echo '$''{'kde_cv_all_paths'+set}'`\" = set"; then
-@@ -4340,7 +4377,7 @@
- 
- 
-     echo $ac_n "checking for KDE headers installed""... $ac_c" 1>&6
--echo "configure:4344: checking for KDE headers installed" >&5
-+echo "configure:4381: checking for KDE headers installed" >&5
-     ac_ext=C
- # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
- ac_cpp='$CXXCPP $CPPFLAGS'
-@@ -4373,7 +4410,7 @@
- EOF
- 
- ac_compile='${CXX-g++} -c $CXXFLAGS $all_includes $CPPFLAGS conftest.$ac_ext'
--if { (eval echo configure:4377: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4414: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   echo "$ac_t""yes" 1>&6
- else
-   { echo "configure: error: your system is not able to compile a small KDE application!
-@@ -4401,10 +4438,10 @@
- fi
- 
- echo $ac_n "checking for KDE libraries installed""... $ac_c" 1>&6
--echo "configure:4405: checking for KDE libraries installed" >&5
-+echo "configure:4442: checking for KDE libraries installed" >&5
- ac_link='/bin/sh ./libtool --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
- 
--if { (eval echo configure:4408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then 
-+if { (eval echo configure:4445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then 
-   echo "$ac_t""yes" 1>&6
- else
-   { echo "configure: error: your system fails at linking a small KDE application!
-@@ -4550,7 +4587,7 @@
- cross_compiling=$ac_cv_prog_cxx_cross
- 
- echo $ac_n "checking for main in -lcompat""... $ac_c" 1>&6
--echo "configure:4554: checking for main in -lcompat" >&5
-+echo "configure:4591: checking for main in -lcompat" >&5
- ac_lib_var=`echo compat'_'main | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4558,14 +4595,14 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lcompat  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4562 "configure"
-+#line 4599 "configure"
- #include "confdefs.h"
- 
- int main() {
- main()
- ; return 0; }
- EOF
--if { (eval echo configure:4569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4586,7 +4623,7 @@
- fi
-  
- echo $ac_n "checking for main in -lcrypt""... $ac_c" 1>&6
--echo "configure:4590: checking for main in -lcrypt" >&5
-+echo "configure:4627: checking for main in -lcrypt" >&5
- ac_lib_var=`echo crypt'_'main | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4594,14 +4631,14 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lcrypt  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4598 "configure"
-+#line 4635 "configure"
- #include "confdefs.h"
- 
- int main() {
- main()
- ; return 0; }
- EOF
--if { (eval echo configure:4605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4624,7 +4661,7 @@
- LIBKHTMLW="-lkhtmlw -ljscript" 
- 
- echo $ac_n "checking for jpeglib""... $ac_c" 1>&6
--echo "configure:4628: checking for jpeglib" >&5
-+echo "configure:4665: checking for jpeglib" >&5
- if eval "test \"`echo '$''{'ac_cv_lib_jpeg'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -4639,7 +4676,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="$all_libraries -ljpeg -lm"
- cat > conftest.$ac_ext <<EOF
--#line 4643 "configure"
-+#line 4680 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- struct jpeg_decompress_struct;
-@@ -4660,7 +4697,7 @@
- jpeg_CreateDecompress(0L, 0, 0);
- ; return 0; }
- EOF
--if { (eval echo configure:4664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_jpeg=-ljpeg"
- else
-@@ -4711,12 +4748,12 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
--echo "configure:4715: checking for $ac_hdr that defines DIR" >&5
-+echo "configure:4752: checking for $ac_hdr that defines DIR" >&5
- if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4720 "configure"
-+#line 4757 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <$ac_hdr>
-@@ -4724,7 +4761,7 @@
- DIR *dirp = 0;
- ; return 0; }
- EOF
--if { (eval echo configure:4728: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4765: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   eval "ac_cv_header_dirent_$ac_safe=yes"
- else
-@@ -4749,7 +4786,7 @@
- # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
- if test $ac_header_dirent = dirent.h; then
- echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
--echo "configure:4753: checking for opendir in -ldir" >&5
-+echo "configure:4790: checking for opendir in -ldir" >&5
- ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4757,7 +4794,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-ldir  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4761 "configure"
-+#line 4798 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -4768,7 +4805,7 @@
- opendir()
- ; return 0; }
- EOF
--if { (eval echo configure:4772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4790,7 +4827,7 @@
- 
- else
- echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
--echo "configure:4794: checking for opendir in -lx" >&5
-+echo "configure:4831: checking for opendir in -lx" >&5
- ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4798,7 +4835,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lx  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4802 "configure"
-+#line 4839 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -4809,7 +4846,7 @@
- opendir()
- ; return 0; }
- EOF
--if { (eval echo configure:4813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4832,12 +4869,12 @@
- fi
- 
- echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
--echo "configure:4836: checking for ANSI C header files" >&5
-+echo "configure:4873: checking for ANSI C header files" >&5
- if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4841 "configure"
-+#line 4878 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -4845,7 +4882,7 @@
- #include <float.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:4849: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:4886: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -4862,7 +4899,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat > conftest.$ac_ext <<EOF
--#line 4866 "configure"
-+#line 4903 "configure"
- #include "confdefs.h"
- #include <string.h>
- EOF
-@@ -4880,7 +4917,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat > conftest.$ac_ext <<EOF
--#line 4884 "configure"
-+#line 4921 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- EOF
-@@ -4901,7 +4938,7 @@
-   :
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4905 "configure"
-+#line 4942 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-@@ -4912,7 +4949,7 @@
- exit (0); }
- 
- EOF
--if { (eval echo configure:4916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:4953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   :
- else
-@@ -4939,17 +4976,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:4943: checking for $ac_hdr" >&5
-+echo "configure:4980: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4948 "configure"
-+#line 4985 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:4953: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:4990: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -4978,12 +5015,12 @@
- for ac_func in usleep
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:4982: checking for $ac_func" >&5
-+echo "configure:5019: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4987 "configure"
-+#line 5024 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -5006,7 +5043,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:5010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -5058,12 +5095,12 @@
- fi
- 
- echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
--echo "configure:5062: checking whether time.h and sys/time.h may both be included" >&5
-+echo "configure:5099: checking whether time.h and sys/time.h may both be included" >&5
- if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5067 "configure"
-+#line 5104 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/time.h>
-@@ -5072,7 +5109,7 @@
- struct tm *tp;
- ; return 0; }
- EOF
--if { (eval echo configure:5076: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5113: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_header_time=yes
- else
-@@ -5095,7 +5132,7 @@
- 
- 
- 	echo $ac_n "checking for bool""... $ac_c" 1>&6
--echo "configure:5099: checking for bool" >&5
-+echo "configure:5136: checking for bool" >&5
-         if eval "test \"`echo '$''{'ac_cv_have_bool'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -5108,14 +5145,14 @@
- cross_compiling=$ac_cv_prog_cxx_cross
- 
-           	cat > conftest.$ac_ext <<EOF
--#line 5112 "configure"
-+#line 5149 "configure"
- #include "confdefs.h"
- 
- int main() {
- bool aBool = true;
- ; return 0; }
- EOF
--if { (eval echo configure:5119: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5156: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_have_bool="yes"
- else
-@@ -5137,7 +5174,7 @@
- 
- 
- echo $ac_n "checking for setenv""... $ac_c" 1>&6
--echo "configure:5141: checking for setenv" >&5
-+echo "configure:5178: checking for setenv" >&5
- if eval "test \"`echo '$''{'ac_cv_func_setenv'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -5149,7 +5186,7 @@
- cross_compiling=$ac_cv_prog_cc_cross
- 
- cat > conftest.$ac_ext <<EOF
--#line 5153 "configure"
-+#line 5190 "configure"
- #include "confdefs.h"
- #include <assert.h>
- /* We use char because int might match the return type of a gcc2
-@@ -5169,7 +5206,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:5173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_setenv=yes"
- else
-@@ -5194,13 +5231,13 @@
- 
- 
- echo $ac_n "checking if kmid would compile""... $ac_c" 1>&6
--echo "configure:5198: checking if kmid would compile" >&5
-+echo "configure:5235: checking if kmid would compile" >&5
- if eval "test \"`echo '$''{'kde_kmid_compiles'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
- cat > conftest.$ac_ext <<EOF
--#line 5204 "configure"
-+#line 5241 "configure"
- #include "confdefs.h"
- 
- #ifndef __FreeBSD__
-@@ -5214,7 +5251,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:5218: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5255: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   kde_mid_compiles=yes
- else
-@@ -5293,7 +5330,7 @@
- 
- for i in $ac_topsubdirs; do
-   echo $ac_n "checking if $i should be compiled""... $ac_c" 1>&6
--echo "configure:5297: checking if $i should be compiled" >&5
-+echo "configure:5334: checking if $i should be compiled" >&5
-   if test -d $srcdir/$i; then
-     install_it="yes"
-     for j in $DO_NOT_COMPILE; do 
-@@ -5493,6 +5530,7 @@
- s%@LIBCDAUDIO@%$LIBCDAUDIO%g
- s%@LIBFPE@%$LIBFPE%g
- s%@LIBCDROM@%$LIBCDROM%g
-+s%@LIBOSSAUDIO@%$LIBOSSAUDIO%g
- s%@LIBALIB@%$LIBALIB%g
- s%@LIBAUDIO@%$LIBAUDIO%g
- s%@LIBMME@%$LIBMME%g