4 files changed, 18 insertions, 60 deletions

diff --git a/audio/kdemultimedia2/Makefile b/audio/kdemultimedia2/Makefile
index 16e24185ebe4..cd72a73f5d78 100644
--- a/audio/kdemultimedia2/Makefile
+++ b/audio/kdemultimedia2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kdemultimedia
 PORTVERSION=	2.2.2
+PORTREVISION=	1
 CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
@@ -16,6 +17,8 @@ MAINTAINER=	kde@FreeBSD.org
 
 BUILD_DEPENDS=	autoconf213:${PORTSDIR}/devel/autoconf213 \
 		automake14:${PORTSDIR}/devel/automake14
+LIB_DEPENDS=	ogg.2:${PORTSDIR}/audio/libogg \
+		vorbis.0:${PORTSDIR}/audio/libvorbis
 RUN_DEPENDS=	xanim:${PORTSDIR}/graphics/xanim
 
 USE_KDELIBS_VER=2
@@ -25,6 +28,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
 		--with-qt-libraries=${X11BASE}/lib
 
+_NO_KDE_FINAL=	yes
 .include "${.CURDIR}/../../x11/kde2/Makefile.kde"
 
 USE_GMAKE=	yes
@@ -32,24 +36,6 @@ MAKE_ENV=	${CONFIGURE_ENV}
 
 .include <bsd.port.pre.mk>
 
-.if exists(${LOCALBASE}/include/ogg/ogg.h) \
-    || exists(${LOCALBASE}/include/vorbis/vorbisfile.h)
-WITH_OGGVORBIS=	yes
-.endif
-
-.if defined(WITH_OGGVORBIS) && ${WITH_OGGVORBIS} == yes
-LIB_DEPENDS+=	ogg.2:${PORTSDIR}/audio/libogg \
-		vorbis.0:${PORTSDIR}/audio/libvorbis
-PLIST_SUB+=	OGGVORBIS=""
-.else
-PLIST_SUB+=	OGGVORBIS="@comment "
-pre-everything::
-	@${ECHO_MSG}
-	@${ECHO_MSG} "If you want to compile with ogg/vorbis support,"
-	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_OGGVORBIS=yes\""
-	@${ECHO_MSG}
-.endif
-
 pre-configure:
 	${PERL} -pi -e "s@all_includes=\"@all_includes=\"-I/usr/include @g" \
 		${WRKSRC}/acinclude.m4 ${WRKSRC}/aclocal.m4
diff --git a/audio/kdemultimedia2/pkg-plist b/audio/kdemultimedia2/pkg-plist
index 3c765f1e1561..05c19b931d55 100644
--- a/audio/kdemultimedia2/pkg-plist
+++ b/audio/kdemultimedia2/pkg-plist
@@ -127,8 +127,8 @@ lib/libnoatunui.la
 lib/libnoatunui.so
 lib/libnoatunvoiceprint.la
 lib/libnoatunvoiceprint.so
-%%OGGVORBIS%%lib/liboggarts.la
-%%OGGVORBIS%%lib/liboggarts.so
+lib/liboggarts.la
+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
-%%OGGVORBIS%%lib/mcop/Arts/oggPlayObject.mcopclass
+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
-%%OGGVORBIS%%lib/mcop/oggarts.mcopclass
-%%OGGVORBIS%%lib/mcop/oggarts.mcoptype
+lib/mcop/oggarts.mcopclass
+lib/mcop/oggarts.mcoptype
 share/applnk/Multimedia/aktion.desktop
 share/applnk/Multimedia/artsbuilder.desktop
 share/applnk/Multimedia/artscontrol.desktop
@@ -756,9 +756,6 @@ 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
@@ -823,8 +820,6 @@ 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
@@ -833,8 +828,6 @@ 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
diff --git a/audio/kdemultimedia3/Makefile b/audio/kdemultimedia3/Makefile
index 16e24185ebe4..cd72a73f5d78 100644
--- a/audio/kdemultimedia3/Makefile
+++ b/audio/kdemultimedia3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kdemultimedia
 PORTVERSION=	2.2.2
+PORTREVISION=	1
 CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
@@ -16,6 +17,8 @@ MAINTAINER=	kde@FreeBSD.org
 
 BUILD_DEPENDS=	autoconf213:${PORTSDIR}/devel/autoconf213 \
 		automake14:${PORTSDIR}/devel/automake14
+LIB_DEPENDS=	ogg.2:${PORTSDIR}/audio/libogg \
+		vorbis.0:${PORTSDIR}/audio/libvorbis
 RUN_DEPENDS=	xanim:${PORTSDIR}/graphics/xanim
 
 USE_KDELIBS_VER=2
@@ -25,6 +28,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
 		--with-qt-libraries=${X11BASE}/lib
 
+_NO_KDE_FINAL=	yes
 .include "${.CURDIR}/../../x11/kde2/Makefile.kde"
 
 USE_GMAKE=	yes
@@ -32,24 +36,6 @@ MAKE_ENV=	${CONFIGURE_ENV}
 
 .include <bsd.port.pre.mk>
 
-.if exists(${LOCALBASE}/include/ogg/ogg.h) \
-    || exists(${LOCALBASE}/include/vorbis/vorbisfile.h)
-WITH_OGGVORBIS=	yes
-.endif
-
-.if defined(WITH_OGGVORBIS) && ${WITH_OGGVORBIS} == yes
-LIB_DEPENDS+=	ogg.2:${PORTSDIR}/audio/libogg \
-		vorbis.0:${PORTSDIR}/audio/libvorbis
-PLIST_SUB+=	OGGVORBIS=""
-.else
-PLIST_SUB+=	OGGVORBIS="@comment "
-pre-everything::
-	@${ECHO_MSG}
-	@${ECHO_MSG} "If you want to compile with ogg/vorbis support,"
-	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_OGGVORBIS=yes\""
-	@${ECHO_MSG}
-.endif
-
 pre-configure:
 	${PERL} -pi -e "s@all_includes=\"@all_includes=\"-I/usr/include @g" \
 		${WRKSRC}/acinclude.m4 ${WRKSRC}/aclocal.m4
diff --git a/audio/kdemultimedia3/pkg-plist b/audio/kdemultimedia3/pkg-plist
index 3c765f1e1561..05c19b931d55 100644
--- a/audio/kdemultimedia3/pkg-plist
+++ b/audio/kdemultimedia3/pkg-plist
@@ -127,8 +127,8 @@ lib/libnoatunui.la
 lib/libnoatunui.so
 lib/libnoatunvoiceprint.la
 lib/libnoatunvoiceprint.so
-%%OGGVORBIS%%lib/liboggarts.la
-%%OGGVORBIS%%lib/liboggarts.so
+lib/liboggarts.la
+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
-%%OGGVORBIS%%lib/mcop/Arts/oggPlayObject.mcopclass
+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
-%%OGGVORBIS%%lib/mcop/oggarts.mcopclass
-%%OGGVORBIS%%lib/mcop/oggarts.mcoptype
+lib/mcop/oggarts.mcopclass
+lib/mcop/oggarts.mcoptype
 share/applnk/Multimedia/aktion.desktop
 share/applnk/Multimedia/artsbuilder.desktop
 share/applnk/Multimedia/artscontrol.desktop
@@ -756,9 +756,6 @@ 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
@@ -823,8 +820,6 @@ 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
@@ -833,8 +828,6 @@ 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