Update to QT 2.2.1 / KDE 2.0 final release. At last! What a long road...

All KDE2 ports now use default USE_QT2.  Still todo: Merge in MTREE stuff.

6 files changed, 78 insertions, 64 deletions

diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index 1ec188ca4aa3..ec04188e41de 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -6,17 +6,17 @@
 #
 
 PORTNAME=	kdemultimedia
-PORTVERSION=	1.94
+PORTVERSION=	2.0
 CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	unstable/distribution/2.0Beta5/tar/src
+MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
 
 MAINTAINER=	will@FreeBSD.org
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		kdecore.4:${PORTSDIR}/x11/kdelibs2 \
-		qt2.4:${PORTSDIR}/x11-toolkits/qt22
+		kdecore.4:${PORTSDIR}/x11/kdelibs2
 
+USE_QT2=	yes
 MOC?=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
diff --git a/multimedia/kdemultimedia3/distinfo b/multimedia/kdemultimedia3/distinfo
index e1b274b524a1..6f6dbcdf4e2c 100644
--- a/multimedia/kdemultimedia3/distinfo
+++ b/multimedia/kdemultimedia3/distinfo
@@ -1 +1 @@
-MD5 (kdemultimedia-1.94.tar.bz2) = bae3c4421e28631a0646c59e47e13b32
+MD5 (kdemultimedia-2.0.tar.bz2) = a56ed60810c222a6a2714f261ba1e809
diff --git a/multimedia/kdemultimedia3/pkg-plist b/multimedia/kdemultimedia3/pkg-plist
index 9686179e2512..e431fa241496 100644
--- a/multimedia/kdemultimedia3/pkg-plist
+++ b/multimedia/kdemultimedia3/pkg-plist
@@ -19,22 +19,19 @@ lib/Arts/Synth_WAVE_TRI.mcopclass
 lib/Arts/Synth_XFADE.mcopclass
 lib/artsmodules.mcopclass
 lib/artsmodules.mcoptype
+lib/kmixctrl.la
+lib/kmixctrl.so
 lib/libaktion.la
-lib/libaktion.so
 lib/libaktion.so.1
 lib/libartsbuilder.la
-lib/libartsbuilder.so
 lib/libartsbuilder.so.0
 lib/libartsmodules.la
-lib/libartsmodules.so
 lib/libartsmodules.so.0
 lib/libkcm_kmix.la
 lib/libkcm_kmix.so
 lib/libkmidpart.la
-lib/libkmidpart.so
 lib/libkmidpart.so.1
 lib/libkmixapplet.la
-lib/libkmixapplet.so
 lib/libkmixapplet.so.1
 share/applnk/Multimedia/aktion.desktop
 share/applnk/Multimedia/artsbuilder.desktop
@@ -59,6 +56,24 @@ share/apps/aktion/toolbar/parar.png
 share/apps/aktion/toolbar/pause.png
 share/apps/aktion/toolbar/retroceder.png
 share/apps/aktion/toolbar/tocar.png
+share/apps/artsbuilder/pics/Synth_ADD.xpm
+share/apps/artsbuilder/pics/Synth_ATAN_SATURATE.xpm
+share/apps/artsbuilder/pics/Synth_BUS_DOWNLINK.xpm
+share/apps/artsbuilder/pics/Synth_BUS_UPLINK.xpm
+share/apps/artsbuilder/pics/Synth_DEBUG.xpm
+share/apps/artsbuilder/pics/Synth_ENVELOPE_ADSR.xpm
+share/apps/artsbuilder/pics/Synth_FILEPLAY.xpm
+share/apps/artsbuilder/pics/Synth_MIDI_DEBUG.xpm
+share/apps/artsbuilder/pics/Synth_MUL.xpm
+share/apps/artsbuilder/pics/Synth_PLAY.xpm
+share/apps/artsbuilder/pics/Synth_PLAY_WAV.xpm
+share/apps/artsbuilder/pics/Synth_PSCALE.xpm
+share/apps/artsbuilder/pics/Synth_SEQUENCE.xpm
+share/apps/artsbuilder/pics/Synth_WAVE_SAW.xpm
+share/apps/artsbuilder/pics/Synth_WAVE_SIN.xpm
+share/apps/artsbuilder/pics/Synth_WAVE_SQUARE.xpm
+share/apps/artsbuilder/pics/Synth_WAVE_TRI.xpm
+share/apps/artsbuilder/pics/Synth_XFADE.xpm
 share/apps/artscontrol/artscontrol.rc
 share/apps/kaiman/Skins/car-preset/btn_exit.png
 share/apps/kaiman/Skins/car-preset/btn_iconify.png
@@ -206,7 +221,6 @@ share/apps/kmix/pics/mix_video.png
 share/apps/kmix/pics/mix_volume.png
 share/config/aktionrc
 share/doc/HTML/en/artsbuilder/.anchors
-share/doc/HTML/en/artsbuilder/common
 share/doc/HTML/en/artsbuilder/index.docbook
 share/doc/HTML/en/artsbuilder/index.html
 share/doc/HTML/en/artsbuilder/insidearts.html
@@ -217,7 +231,6 @@ share/doc/HTML/en/kmid/abouttheauthor.html
 share/doc/HTML/en/kmid/addingsongstoacollectionhowtouseautoadd.html
 share/doc/HTML/en/kmid/advancedfeatures.html
 share/doc/HTML/en/kmid/collections.html
-share/doc/HTML/en/kmid/common
 share/doc/HTML/en/kmid/compilationandinstallation.html
 share/doc/HTML/en/kmid/creatingamidimap.html
 share/doc/HTML/en/kmid/deletingacollection.html
@@ -245,7 +258,6 @@ share/doc/HTML/en/kmid/usingmidimaps.html
 share/doc/HTML/en/kmidi/.anchors
 share/doc/HTML/en/kmidi/FAQ
 share/doc/HTML/en/kmidi/commandlineoptions.html
-share/doc/HTML/en/kmidi/common
 share/doc/HTML/en/kmidi/compilationandinstallation.html
 share/doc/HTML/en/kmidi/computationissues.html
 share/doc/HTML/en/kmidi/configuring.html
@@ -271,31 +283,23 @@ share/doc/HTML/en/kmidi/synthesismodel.html
 share/doc/HTML/en/kmidi/usage.html
 share/doc/HTML/en/kmidi/volume.html
 share/doc/HTML/en/kmix/.anchors
-share/doc/HTML/en/kmix/advancedfeatures.html
-share/doc/HTML/en/kmix/commandlinearguments.html
-share/doc/HTML/en/kmix/common
-share/doc/HTML/en/kmix/compilationandinstallation.html
-share/doc/HTML/en/kmix/configurationoptions.html
-share/doc/HTML/en/kmix/help.html
-share/doc/HTML/en/kmix/index.cvlog
+share/doc/HTML/en/kmix/compilation.html
+share/doc/HTML/en/kmix/configuration-options.html
+share/doc/HTML/en/kmix/control-panel.html
+share/doc/HTML/en/kmix/credits.html
 share/doc/HTML/en/kmix/index.docbook
 share/doc/HTML/en/kmix/index.html
 share/doc/HTML/en/kmix/installation.html
 share/doc/HTML/en/kmix/introduction.html
-share/doc/HTML/en/kmix/keybindings.html
-share/doc/HTML/en/kmix/multiplesoundcards.html
-share/doc/HTML/en/kmix/panningslider.html
-share/doc/HTML/en/kmix/questionsandanswers.html
+share/doc/HTML/en/kmix/panning-slider.html
 share/doc/HTML/en/kmix/requirements.html
-share/doc/HTML/en/kmix/themenuentries.html
-share/doc/HTML/en/kmix/workingwithkmix.html
+share/doc/HTML/en/kmix/working-with-kmix.html
 share/doc/HTML/en/kscd/.anchors
 share/doc/HTML/en/kscd/about.html
 share/doc/HTML/en/kscd/cddb-editor.html
 share/doc/HTML/en/kscd/cddb-support.html
 share/doc/HTML/en/kscd/cddb-tab.html
 share/doc/HTML/en/kscd/cddb.howto
-share/doc/HTML/en/kscd/common
 share/doc/HTML/en/kscd/configuring-kscd.html
 share/doc/HTML/en/kscd/credits-and-license.html
 share/doc/HTML/en/kscd/index.docbook
@@ -348,26 +352,31 @@ share/icons/locolor/32x32/apps/kmid.png
 share/icons/locolor/32x32/apps/kmidi.png
 share/icons/locolor/32x32/apps/kmix.png
 share/mimelnk/audio/x-karaoke.desktop
+share/services/kmixctrl_restore.desktop
+@dirrm share/services
 @dirrm share/mimelnk/audio
 @dirrm share/icons/locolor/32x32/apps
 @dirrm share/icons/locolor/16x16/apps
 @dirrm share/icons/hicolor/48x48/apps
 @dirrm share/icons/hicolor/32x32/apps
 @dirrm share/icons/hicolor/22x22/apps
+@dirrm share/icons/hicolor/22x22
 @dirrm share/doc/HTML/en/kscd
 @dirrm share/doc/HTML/en/kmix
 @dirrm share/doc/HTML/en/kmidi
 @dirrm share/doc/HTML/en/kmid
 @dirrm share/doc/HTML/en/artsbuilder
-@dirrm share/config
 @dirrm share/apps/kmix/pics
 @dirrm share/apps/kmix
 @dirrm share/apps/kmidi/pics
 @dirrm share/apps/kmidi
 @dirrm share/apps/kmid/maps
 @dirrm share/apps/kmid/icons/locolor/16x16/actions
+@dirrm share/apps/kmid/icons/locolor/16x16
 @dirrm share/apps/kmid/icons/hicolor/32x32/actions
+@dirrm share/apps/kmid/icons/hicolor/32x32
 @dirrm share/apps/kmid/icons/hicolor/22x22/actions
+@dirrm share/apps/kmid/icons/hicolor/22x22
 @dirrm share/apps/kmid/icons
 @dirrm share/apps/kmid/fm
 @dirrm share/apps/kmid
@@ -375,12 +384,10 @@ share/mimelnk/audio/x-karaoke.desktop
 @dirrm share/apps/kaiman/Skins/k9
 @dirrm share/apps/kaiman/Skins/circle
 @dirrm share/apps/kaiman/Skins/car-preset
+@dirrm share/apps/kaiman/Skins
 @dirrm share/apps/kaiman
 @dirrm share/apps/artscontrol
+@dirrm share/apps/artsbuilder/pics
 @dirrm share/apps/aktion/toolbar
 @dirrm share/apps/aktion
-@dirrm share/applnk/Settings/Sound
-@dirrm share/applnk/Multimedia
 @dirrm lib/Arts
-@dirrm lib
-@dirrm bin
diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile
index 1ec188ca4aa3..ec04188e41de 100644
--- a/multimedia/kdemultimedia4/Makefile
+++ b/multimedia/kdemultimedia4/Makefile
@@ -6,17 +6,17 @@
 #
 
 PORTNAME=	kdemultimedia
-PORTVERSION=	1.94
+PORTVERSION=	2.0
 CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	unstable/distribution/2.0Beta5/tar/src
+MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
 
 MAINTAINER=	will@FreeBSD.org
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		kdecore.4:${PORTSDIR}/x11/kdelibs2 \
-		qt2.4:${PORTSDIR}/x11-toolkits/qt22
+		kdecore.4:${PORTSDIR}/x11/kdelibs2
 
+USE_QT2=	yes
 MOC?=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
diff --git a/multimedia/kdemultimedia4/distinfo b/multimedia/kdemultimedia4/distinfo
index e1b274b524a1..6f6dbcdf4e2c 100644
--- a/multimedia/kdemultimedia4/distinfo
+++ b/multimedia/kdemultimedia4/distinfo
@@ -1 +1 @@
-MD5 (kdemultimedia-1.94.tar.bz2) = bae3c4421e28631a0646c59e47e13b32
+MD5 (kdemultimedia-2.0.tar.bz2) = a56ed60810c222a6a2714f261ba1e809
diff --git a/multimedia/kdemultimedia4/pkg-plist b/multimedia/kdemultimedia4/pkg-plist
index 9686179e2512..e431fa241496 100644
--- a/multimedia/kdemultimedia4/pkg-plist
+++ b/multimedia/kdemultimedia4/pkg-plist
@@ -19,22 +19,19 @@ lib/Arts/Synth_WAVE_TRI.mcopclass
 lib/Arts/Synth_XFADE.mcopclass
 lib/artsmodules.mcopclass
 lib/artsmodules.mcoptype
+lib/kmixctrl.la
+lib/kmixctrl.so
 lib/libaktion.la
-lib/libaktion.so
 lib/libaktion.so.1
 lib/libartsbuilder.la
-lib/libartsbuilder.so
 lib/libartsbuilder.so.0
 lib/libartsmodules.la
-lib/libartsmodules.so
 lib/libartsmodules.so.0
 lib/libkcm_kmix.la
 lib/libkcm_kmix.so
 lib/libkmidpart.la
-lib/libkmidpart.so
 lib/libkmidpart.so.1
 lib/libkmixapplet.la
-lib/libkmixapplet.so
 lib/libkmixapplet.so.1
 share/applnk/Multimedia/aktion.desktop
 share/applnk/Multimedia/artsbuilder.desktop
@@ -59,6 +56,24 @@ share/apps/aktion/toolbar/parar.png
 share/apps/aktion/toolbar/pause.png
 share/apps/aktion/toolbar/retroceder.png
 share/apps/aktion/toolbar/tocar.png
+share/apps/artsbuilder/pics/Synth_ADD.xpm
+share/apps/artsbuilder/pics/Synth_ATAN_SATURATE.xpm
+share/apps/artsbuilder/pics/Synth_BUS_DOWNLINK.xpm
+share/apps/artsbuilder/pics/Synth_BUS_UPLINK.xpm
+share/apps/artsbuilder/pics/Synth_DEBUG.xpm
+share/apps/artsbuilder/pics/Synth_ENVELOPE_ADSR.xpm
+share/apps/artsbuilder/pics/Synth_FILEPLAY.xpm
+share/apps/artsbuilder/pics/Synth_MIDI_DEBUG.xpm
+share/apps/artsbuilder/pics/Synth_MUL.xpm
+share/apps/artsbuilder/pics/Synth_PLAY.xpm
+share/apps/artsbuilder/pics/Synth_PLAY_WAV.xpm
+share/apps/artsbuilder/pics/Synth_PSCALE.xpm
+share/apps/artsbuilder/pics/Synth_SEQUENCE.xpm
+share/apps/artsbuilder/pics/Synth_WAVE_SAW.xpm
+share/apps/artsbuilder/pics/Synth_WAVE_SIN.xpm
+share/apps/artsbuilder/pics/Synth_WAVE_SQUARE.xpm
+share/apps/artsbuilder/pics/Synth_WAVE_TRI.xpm
+share/apps/artsbuilder/pics/Synth_XFADE.xpm
 share/apps/artscontrol/artscontrol.rc
 share/apps/kaiman/Skins/car-preset/btn_exit.png
 share/apps/kaiman/Skins/car-preset/btn_iconify.png
@@ -206,7 +221,6 @@ share/apps/kmix/pics/mix_video.png
 share/apps/kmix/pics/mix_volume.png
 share/config/aktionrc
 share/doc/HTML/en/artsbuilder/.anchors
-share/doc/HTML/en/artsbuilder/common
 share/doc/HTML/en/artsbuilder/index.docbook
 share/doc/HTML/en/artsbuilder/index.html
 share/doc/HTML/en/artsbuilder/insidearts.html
@@ -217,7 +231,6 @@ share/doc/HTML/en/kmid/abouttheauthor.html
 share/doc/HTML/en/kmid/addingsongstoacollectionhowtouseautoadd.html
 share/doc/HTML/en/kmid/advancedfeatures.html
 share/doc/HTML/en/kmid/collections.html
-share/doc/HTML/en/kmid/common
 share/doc/HTML/en/kmid/compilationandinstallation.html
 share/doc/HTML/en/kmid/creatingamidimap.html
 share/doc/HTML/en/kmid/deletingacollection.html
@@ -245,7 +258,6 @@ share/doc/HTML/en/kmid/usingmidimaps.html
 share/doc/HTML/en/kmidi/.anchors
 share/doc/HTML/en/kmidi/FAQ
 share/doc/HTML/en/kmidi/commandlineoptions.html
-share/doc/HTML/en/kmidi/common
 share/doc/HTML/en/kmidi/compilationandinstallation.html
 share/doc/HTML/en/kmidi/computationissues.html
 share/doc/HTML/en/kmidi/configuring.html
@@ -271,31 +283,23 @@ share/doc/HTML/en/kmidi/synthesismodel.html
 share/doc/HTML/en/kmidi/usage.html
 share/doc/HTML/en/kmidi/volume.html
 share/doc/HTML/en/kmix/.anchors
-share/doc/HTML/en/kmix/advancedfeatures.html
-share/doc/HTML/en/kmix/commandlinearguments.html
-share/doc/HTML/en/kmix/common
-share/doc/HTML/en/kmix/compilationandinstallation.html
-share/doc/HTML/en/kmix/configurationoptions.html
-share/doc/HTML/en/kmix/help.html
-share/doc/HTML/en/kmix/index.cvlog
+share/doc/HTML/en/kmix/compilation.html
+share/doc/HTML/en/kmix/configuration-options.html
+share/doc/HTML/en/kmix/control-panel.html
+share/doc/HTML/en/kmix/credits.html
 share/doc/HTML/en/kmix/index.docbook
 share/doc/HTML/en/kmix/index.html
 share/doc/HTML/en/kmix/installation.html
 share/doc/HTML/en/kmix/introduction.html
-share/doc/HTML/en/kmix/keybindings.html
-share/doc/HTML/en/kmix/multiplesoundcards.html
-share/doc/HTML/en/kmix/panningslider.html
-share/doc/HTML/en/kmix/questionsandanswers.html
+share/doc/HTML/en/kmix/panning-slider.html
 share/doc/HTML/en/kmix/requirements.html
-share/doc/HTML/en/kmix/themenuentries.html
-share/doc/HTML/en/kmix/workingwithkmix.html
+share/doc/HTML/en/kmix/working-with-kmix.html
 share/doc/HTML/en/kscd/.anchors
 share/doc/HTML/en/kscd/about.html
 share/doc/HTML/en/kscd/cddb-editor.html
 share/doc/HTML/en/kscd/cddb-support.html
 share/doc/HTML/en/kscd/cddb-tab.html
 share/doc/HTML/en/kscd/cddb.howto
-share/doc/HTML/en/kscd/common
 share/doc/HTML/en/kscd/configuring-kscd.html
 share/doc/HTML/en/kscd/credits-and-license.html
 share/doc/HTML/en/kscd/index.docbook
@@ -348,26 +352,31 @@ share/icons/locolor/32x32/apps/kmid.png
 share/icons/locolor/32x32/apps/kmidi.png
 share/icons/locolor/32x32/apps/kmix.png
 share/mimelnk/audio/x-karaoke.desktop
+share/services/kmixctrl_restore.desktop
+@dirrm share/services
 @dirrm share/mimelnk/audio
 @dirrm share/icons/locolor/32x32/apps
 @dirrm share/icons/locolor/16x16/apps
 @dirrm share/icons/hicolor/48x48/apps
 @dirrm share/icons/hicolor/32x32/apps
 @dirrm share/icons/hicolor/22x22/apps
+@dirrm share/icons/hicolor/22x22
 @dirrm share/doc/HTML/en/kscd
 @dirrm share/doc/HTML/en/kmix
 @dirrm share/doc/HTML/en/kmidi
 @dirrm share/doc/HTML/en/kmid
 @dirrm share/doc/HTML/en/artsbuilder
-@dirrm share/config
 @dirrm share/apps/kmix/pics
 @dirrm share/apps/kmix
 @dirrm share/apps/kmidi/pics
 @dirrm share/apps/kmidi
 @dirrm share/apps/kmid/maps
 @dirrm share/apps/kmid/icons/locolor/16x16/actions
+@dirrm share/apps/kmid/icons/locolor/16x16
 @dirrm share/apps/kmid/icons/hicolor/32x32/actions
+@dirrm share/apps/kmid/icons/hicolor/32x32
 @dirrm share/apps/kmid/icons/hicolor/22x22/actions
+@dirrm share/apps/kmid/icons/hicolor/22x22
 @dirrm share/apps/kmid/icons
 @dirrm share/apps/kmid/fm
 @dirrm share/apps/kmid
@@ -375,12 +384,10 @@ share/mimelnk/audio/x-karaoke.desktop
 @dirrm share/apps/kaiman/Skins/k9
 @dirrm share/apps/kaiman/Skins/circle
 @dirrm share/apps/kaiman/Skins/car-preset
+@dirrm share/apps/kaiman/Skins
 @dirrm share/apps/kaiman
 @dirrm share/apps/artscontrol
+@dirrm share/apps/artsbuilder/pics
 @dirrm share/apps/aktion/toolbar
 @dirrm share/apps/aktion
-@dirrm share/applnk/Settings/Sound
-@dirrm share/applnk/Multimedia
 @dirrm lib/Arts
-@dirrm lib
-@dirrm bin