Please welcome Qt3/KDE3 to our ports tree. This includes work since the

original versions of these ports, so some PORTREVISIONs were bumped.  See
http://freebsd.kde.org/ and mailing lists linked to from there for info
on the packages generated to test these ports.

bsd.kde.mk has already been updated a few days ago to work with these.

Some patches applied to fix a few bugs were:

deskutils/kdepim3:
        [1] Remove kpilot from build because it wasn't ready at release.
editors/koffice-kde3:
        [2] Fix compile time bugs for FreeBSD.
misc/kdeedu3:
        [3] Fix compile problem with kvoctrain.
x11/kdebase3:
        [4] Fix KDM CPU usage and login bug.

Some caveats:
        * All PLISTs are broken for deinstall due to script bug that I
          didn't notice until very recently.  This will be fixed when I
          commit an update tomorrow.  These ports should still install
          perfectly fine though.  They should also deinstall without
          giving errors, but will leave directories behind.
        * You can't install this with any other version of QT or KDE
          already installed.  I am not sure the checks are 100% working,
          but fixes for these will be forthcoming.  This is mainly due
          to a policy decision made by kde@ to make QT/KDE ports install
          the way the rest of the world expects it to while also still
          conforming to FreeBSD's hier(7).  For reference on this decision,
          please consult the KDE/FreeBSD mailing list archives.  This
          decision fixes 2-year-old bug reports relating to how we handled
          this for KDE2 vs KDE1.

Submitted by:   [1] Adrian de Groot <adridg@cs.kun.nl>,
                [2] David Faure <faure@kde.org>,
                    Andy Fawcett <andy@athame.co.uk>
                    Lauri Watts <lauri@kde.org>
                [3] Lauri Watts <lauri@kde.org>
                [4] Alan Eldridge <alane@geeksrus.net>
                    Oswald Buddenhagen <ossi@kde.org>
Reviewed by:    kde

9 files changed, 25 insertions, 262 deletions

diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile
index d67ccbedea49..ac2b221f2d01 100644
--- a/multimedia/kdemultimedia4/Makefile
+++ b/multimedia/kdemultimedia4/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	kdemultimedia
-PORTVERSION=	2.2.2
-PORTREVISION=	2
+PORTVERSION=	3.0
+PORTREVISION=	1
 CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
@@ -15,47 +15,25 @@ DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
 
-BUILD_DEPENDS=	autoconf213:${PORTSDIR}/devel/autoconf213 \
-		automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS=	ogg.3:${PORTSDIR}/audio/libogg \
-		vorbis.1:${PORTSDIR}/audio/libvorbis
 RUN_DEPENDS=	xanim:${PORTSDIR}/graphics/xanim
+LIB_DEPENDS+=	ogg.3:${PORTSDIR}/audio/libogg \
+		vorbis.1:${PORTSDIR}/audio/libvorbis
 
-USE_KDELIBS_VER=2
+USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
-		--with-qt-libraries=${X11BASE}/lib
-
+CONFIGURE_TARGET=
+CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG)
+CONFIGURE_ARGS+=--disable-debug
+.endif
 USE_GMAKE=	yes
 MAKE_ENV=	${CONFIGURE_ENV}
 
+# spurious, but i don't care
 .include <bsd.port.pre.mk>
 
-_NO_KDE_FINAL=	yes
-.if ${OSVERSION} >= 500029
-_NO_KDE_OBJPRELINK=yes
-.endif
-.include "${.CURDIR}/../../x11/kde2/Makefile.kde"
-
-pre-configure:
-	${PERL} -pi -e "s@all_includes=\"@all_includes=\"-I/usr/include @g" \
-		${WRKSRC}/acinclude.m4 ${WRKSRC}/aclocal.m4
-	${PERL} -pi -e \
-		's,kscd_compile=no,kscd_compile=yes,g; \
-		s,kde_artsplug_compiles = xno,kde_artsplug_compiles = x,g' \
-		${WRKSRC}/kscd/configure.in.in
-	${MKDIR} ${WRKSRC}/auto-bin
-.for AC in autoconf autoheader
-	${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC}
-.endfor
-.for AM in automake aclocal
-	${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM}
-.endfor
-	cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \
-		${GMAKE} -f Makefile.cvs
-
 post-install:
 	@${ECHO_MSG}
 	@${ECHO_MSG} "In order to run the kscd program properly, please run as root:"
diff --git a/multimedia/kdemultimedia4/distinfo b/multimedia/kdemultimedia4/distinfo
index b2e1bbcb1e21..9edf6240fbce 100644
--- a/multimedia/kdemultimedia4/distinfo
+++ b/multimedia/kdemultimedia4/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdemultimedia-2.2.2.tar.bz2) = 76981ca284663093cd0bc37500e10441
+MD5 (KDE/kdemultimedia-3.0.tar.bz2) = a7b75d29dd29631e576537db22f19bec
diff --git a/multimedia/kdemultimedia4/files/patch-cdrom.c b/multimedia/kdemultimedia4/files/patch-cdrom.c
deleted file mode 100644
index f833b837a051..000000000000
--- a/multimedia/kdemultimedia4/files/patch-cdrom.c
+++ /dev/null
@@ -1,163 +0,0 @@
---- kscd/libwm/cdrom.c	Mon Jun 18 07:01:07 2001
-+++ kscd/libwm/cdrom.c.new	Thu Nov 29 21:37:42 2001
-@@ -182,6 +182,13 @@
-         struct wm_playlist *l;
-         int    i;
-         int    pos;
-+
-+	if(drive.get_trackcount == NULL)
-+	{
-+		perror("trackcount: function pointer NULL");
-+		return (NULL);
-+	}
-+
- 	if ((drive.get_trackcount)(&drive, &thiscd.ntracks) < 0)
- 	{
- 		perror("trackcount");
-@@ -217,6 +224,12 @@
- 
- 	for (i = 0; i < thiscd.ntracks; i++)
- 	{
-+		if(drive.get_trackinfo == NULL)
-+		{
-+			perror("CD track info read: function pointer null");
-+			return (NULL);
-+		}
-+
- 		if ((drive.get_trackinfo)(&drive, i + 1, &thiscd.trk[i].data,
- 					&thiscd.trk[i].start) < 0)
- 		{
-@@ -235,6 +248,12 @@
- 		thiscd.trk[i].section = 0;
- 	}
- 
-+	if(drive.get_cdlen == NULL)
-+	{
-+		perror("CD length read: function pointer null");
-+		return (NULL);
-+	}
-+
- 	if ((drive.get_cdlen)(&drive, &thiscd.trk[i].start) < 0)
- 	{
- 		perror("CD length read");
-@@ -305,6 +324,12 @@
- 	if( (cur_cdmode == WM_CDM_STOPPED) || (cur_cdmode == WM_CDM_PLAYING) )
- 		oldmode = cur_cdmode;
- 
-+	if(drive.get_drive_status == NULL)
-+	{
-+		perror("CD get drive status: function pointer NULL");
-+		return (-1);
-+	}
-+
- 	if( (drive.get_drive_status)(&drive, oldmode, &mode, &cur_frame,
- 					&trackno, &cur_index) < 0)
- 	{
-@@ -474,7 +499,8 @@
- 	right = right < 0 ? 0 : right > 100 ? 100 : right;
- /*	printf("Left = %d, Right = %d\n", left, right);
- */
--	(void) (drive.set_volume)(&drive, left, right);
-+	if(drive.set_volume != NULL)
-+		(void) (drive.set_volume)(&drive, left, right);
- } /* cd_volume() */
- 
- #else
-@@ -513,7 +539,8 @@
- 	if (right > 100)
- 		right = 100;
- 
--	(void) (drive.set_volume)(&drive, left, right);
-+	if(drive.set_volume != NULL)
-+		(void) (drive.set_volume)(&drive, left, right);
- } /* cd_volume() */
- 
- #endif /* CLIF_VOL */
-@@ -536,18 +563,20 @@
- 	switch (cur_cdmode) {
- 	case WM_CDM_PLAYING:		/* playing */
- 		cur_cdmode = WM_CDM_PAUSED;
--		(drive.pause)(&drive);
--                paused_pos = cur_pos_rel;
-+		if(drive.pause != NULL)
-+			(drive.pause)(&drive);
-+
-+		paused_pos = cur_pos_rel;
- 		break;
- 
- 	case WM_CDM_PAUSED:		/* paused */
- 		cur_cdmode = WM_CDM_PLAYING;
- /*		(drive.resume)(&drive); */
--		if ((drive.resume)(&drive) > 0 )
--                  {
--			wm_cd_play(cur_track, paused_pos,
--				playlist[cur_listno-1].end);
--                  }
-+		if(drive.resume != NULL)
-+			if ((drive.resume)(&drive) > 0 )
-+      	wm_cd_play(cur_track, paused_pos, playlist[cur_listno-1].end);
-+		break;
-+
- 	default: /* */
- 		break;	
- 	}
-@@ -568,7 +597,10 @@
- 	{
- 		cur_lasttrack = cur_firsttrack = -1;
- 		cur_cdmode = WM_CDM_STOPPED;
--		(drive.stop)(&drive);
-+		
-+    if(drive.stop != NULL)
-+			(drive.stop)(&drive);
-+
- 		cur_track = 1;
- 	}
- } /* wm_cd_stop() */
-@@ -595,7 +627,8 @@
- 	if (start >= end)
- 		start = end-1;
- 
--	(drive.play)(&drive, start, end, realstart);
-+	if(drive.play != NULL)
-+		(drive.play)(&drive, start, end, realstart);
- }
- 
- /*
-@@ -681,6 +714,12 @@
- {
- 	int	status;
- 
-+	if(drive.eject == NULL)
-+	{
-+		perror("Could not eject CD: function pointer NULL");
-+		return (1);
-+	}
-+
- 	status = (drive.eject)(&drive);
- 	if (status < 0)
- 	{
-@@ -705,6 +744,12 @@
- 
- int wm_cd_closetray(void)
- {
-+	if(drive.closetray == NULL)
-+	{
-+		perror("Could not close drive tray: function pointer NULL");
-+		return (1);
-+	}
-+
- 	return((drive.closetray)(&drive) ? 0 : wm_cd_status()==2 ? 1 : 0);
- } /* wm_cd_closetray() */
- 
-@@ -785,8 +830,9 @@
- {
- 	int	left, right;
- 
--	if ((drive.get_volume)(&drive, &left, &right) < 0 || left == -1)
--		return (max);
-+	if(drive.get_volume != NULL)
-+		if ((drive.get_volume)(&drive, &left, &right) < 0 || left == -1)
-+			return (max);
- 
- 	left = (left * max + 99) / 100;
- 	right = (right * max + 99) / 100;
diff --git a/multimedia/kdemultimedia4/files/patch-kmidi::config.h b/multimedia/kdemultimedia4/files/patch-kmidi::config.h
deleted file mode 100644
index c0b516c77c21..000000000000
--- a/multimedia/kdemultimedia4/files/patch-kmidi::config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-Apply a patch next. But this is not good solution, I think. I 
---- kmidi/config.h.orig	Thu Jun  7 03:55:40 2001
-+++ kmidi/config.h	Mon Apr  1 20:53:28 2002
-@@ -263,9 +263,12 @@
- 	#if __FreeBSD_version <= 500000
- 		#define XCHG_SHORT(x) __byte_swap_word(x)
- 		#define XCHG_LONG(x) __byte_swap_long(x)
--	#else
-+	#elif __FreeBSD_version <= 500031
- 		#define XCHG_SHORT(x) __uint8_swap_uint16(x)
- 		#define XCHG_LONG(x) __uint8_swap_uint32(x)
-+	#else
-+		#define XCHG_SHORT(x) __bswap16(x)
-+		#define XCHG_LONG(x) __bswap32(x)
- 	#endif
- #else
- 	#define XCHG_SHORT(x) ((((x)&0xFF)<<8) | (((x)>>8)&0xFF))
-
-
diff --git a/multimedia/kdemultimedia4/files/patch-kscd.cpp b/multimedia/kdemultimedia4/files/patch-kscd.cpp
deleted file mode 100644
index 905e3b303f9d..000000000000
--- a/multimedia/kdemultimedia4/files/patch-kscd.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
---- kscd/kscd.cpp	Sun Dec  2 15:08:44 2001
-+++ kscd/kscd.cpp.new	Sun Dec  2 15:10:04 2001
-@@ -1313,7 +1313,6 @@
- /*
-  * cdMode
-  *
-- * - 'No disc' handling is missing
-  * - Data discs not recognized as data discs.
-  *
-  */
-@@ -1329,7 +1328,7 @@
-   if( sss == 2 )
-       have_new_cd = true;
- 
--  if(sss < 0)
-+  if(sss < 0 || sss == WM_CDS_NO_DISC)
-   {
-         if(cddrive_is_ok && (sss != WM_ERR_SCSI_INQUIRY_FAILED))
-         {
diff --git a/multimedia/kdemultimedia4/files/patch-plat_freebsd.c b/multimedia/kdemultimedia4/files/patch-plat_freebsd.c
deleted file mode 100644
index dd6c062ab01d..000000000000
--- a/multimedia/kdemultimedia4/files/patch-plat_freebsd.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- kscd/libwm/plat_freebsd.c	Tue Apr 10 13:34:52 2001
-+++ kscd/libwm/plat_freebsd.c.new	Thu Nov 29 22:20:56 2001
-@@ -159,6 +159,8 @@
-     wm_lib_message(WM_MSG_LEVEL_DEBUG|WM_MSG_CLASS, "calling wmcd_open()\n");
-     status = wmcd_open( d ); /* open it as usual */
-     wm_susleep( 1000 );
-+    if(status == -EACCES || status == 1)
-+        return status;
-   } while ( status != 0 );
-   return status;
- } /* wmcd_reopen() */
diff --git a/multimedia/kdemultimedia4/files/patch-wm_helpers.c b/multimedia/kdemultimedia4/files/patch-wm_helpers.c
deleted file mode 100644
index 89c62a83c7ce..000000000000
--- a/multimedia/kdemultimedia4/files/patch-wm_helpers.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- kscd/libwm/wm_helpers.c	Mon Dec 10 20:02:44 2001
-+++ kscd/libwm/wm_helpers.c.new	Mon Dec 10 20:02:51 2001
-@@ -30,7 +30,6 @@
- 
- #include <stdio.h>
- #include <string.h>
--#include <malloc.h>
- #include <errno.h>
- #include <stdarg.h>
- #include <sys/time.h>
diff --git a/multimedia/kdemultimedia4/pkg-comment b/multimedia/kdemultimedia4/pkg-comment
index 186230f9287d..d53b912ab5d9 100644
--- a/multimedia/kdemultimedia4/pkg-comment
+++ b/multimedia/kdemultimedia4/pkg-comment
@@ -1 +1 @@
-Utilities for the KDE integrated X11 desktop
+Multimedia utilities for the KDE integrated X11 desktop
diff --git a/multimedia/kdemultimedia4/pkg-plist b/multimedia/kdemultimedia4/pkg-plist
index 05c19b931d55..3c765f1e1561 100644
--- a/multimedia/kdemultimedia4/pkg-plist
+++ b/multimedia/kdemultimedia4/pkg-plist
@@ -127,8 +127,8 @@ lib/libnoatunui.la
 lib/libnoatunui.so
 lib/libnoatunvoiceprint.la
 lib/libnoatunvoiceprint.so
-lib/liboggarts.la
-lib/liboggarts.so
+%%OGGVORBIS%%lib/liboggarts.la
+%%OGGVORBIS%%lib/liboggarts.so
 lib/libsplitplaylist.la
 lib/libsplitplaylist.so
 lib/libworkman.la
@@ -178,7 +178,7 @@ lib/mcop/Arts/Synth_XFADE.mcopclass
 lib/mcop/Arts/VBox.mcopclass
 lib/mcop/Arts/Widget.mcopclass
 lib/mcop/Arts/mpg123PlayObject.mcopclass
-lib/mcop/Arts/oggPlayObject.mcopclass
+%%OGGVORBIS%%lib/mcop/Arts/oggPlayObject.mcopclass
 lib/mcop/ExtraStereo.mcopclass
 lib/mcop/ExtraStereoGuiFactory.mcopclass
 lib/mcop/Noatun/Equalizer.mcopclass
@@ -208,8 +208,8 @@ lib/mcop/mpg123arts.mcopclass
 lib/mcop/mpg123arts.mcoptype
 lib/mcop/noatunarts.mcopclass
 lib/mcop/noatunarts.mcoptype
-lib/mcop/oggarts.mcopclass
-lib/mcop/oggarts.mcoptype
+%%OGGVORBIS%%lib/mcop/oggarts.mcopclass
+%%OGGVORBIS%%lib/mcop/oggarts.mcoptype
 share/applnk/Multimedia/aktion.desktop
 share/applnk/Multimedia/artsbuilder.desktop
 share/applnk/Multimedia/artscontrol.desktop
@@ -756,6 +756,9 @@ share/mimelnk/audio/x-karaoke.desktop
 share/mimelnk/text/xmcd.desktop
 share/services/kmixctrl_restore.desktop
 share/servicetypes/audiomidi.desktop
+@dirrm share/icons/hicolor/48x48/apps
+@dirrm share/icons/hicolor/32x32/apps
+@dirrm share/icons/hicolor/22x22/apps
 @dirrm share/doc/HTML/en/noatun
 @dirrm share/doc/HTML/en/kscd
 @dirrm share/doc/HTML/en/kmix
@@ -820,6 +823,8 @@ share/servicetypes/audiomidi.desktop
 @dirrm share/apps/kmid/icons
 @dirrm share/apps/kmid/fm
 @dirrm share/apps/kmid
+@dirrm share/apps/kicker/applets
+@dirrm share/apps/kicker
 @dirrm share/apps/artscontrol
 @dirrm share/apps/artsbuilder/pics
 @dirrm share/apps/artsbuilder/examples/todo
@@ -828,6 +833,8 @@ share/servicetypes/audiomidi.desktop
 @dirrm share/apps/aktion/toolbar
 @dirrm share/apps/aktion
 @dirrm share/applnk/Settings/Sound
+@dirrm share/applnk/Settings
 @dirrm share/applnk/Multimedia
+@dirrm share/applnk
 @dirrm lib/mcop/Noatun
 @dirrm include/noatun