10 files changed, 58 insertions, 18 deletions

diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index 685003c5e754..bc17c09fde0a 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -22,7 +22,6 @@ LIB_DEPENDS+=	audiofile:${PORTSDIR}/audio/libaudiofile \
 		FLAC:${PORTSDIR}/audio/flac \
 		cdda_paranoia:${PORTSDIR}/audio/cdparanoia \
 		musicbrainz:${PORTSDIR}/audio/libmusicbrainz \
-		mp3lame:${PORTSDIR}/audio/lame \
 		ogg:${PORTSDIR}/audio/libogg \
 		tag:${PORTSDIR}/audio/taglib \
 		vorbis.3:${PORTSDIR}/audio/libvorbis
@@ -44,12 +43,20 @@ CONFIGURE_ARGS+=	--with-vorbis="${LOCALBASE}"
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 
-OPTIONS=	XINE "Enable support for video playback, using libxine" off \
-		MPEGLIB "Use mpeglib for audio playback" on
+OPTIONS=	LAME "Enable support for mp3 encoding using LAME" off \
+		MPEGLIB "Use mpeglib for audio playback" on \
+		XINE "Enable support for video playback using libxine" off
 
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>
 
+.if exists(${LOCALBASE}/bin/lame)
+.	if !defined(WITH_LAME)
+LAME_OVERRIDE=	yes
+WITH_LAME=	yes
+.	endif
+.endif
+
 .if exists(${X11BASE}/bin/xine-config)
 .	if !defined(WITH_XINE)
 XINE_OVERRIDE=	yes
@@ -57,14 +64,19 @@ WITH_XINE=	yes
 .	endif
 .endif
 
+.if defined(WITH_LAME)
+PLIST_APPEND+=	plist.lame
+LIB_DEPENDS+=	mp3lame:${PORTSDIR}/audio/lame
+.endif
+
 .if defined(WITH_XINE)
 PLIST_APPEND+=	plist.xine
 LIB_DEPENDS+=	xine:${PORTSDIR}/multimedia/libxine
 BUILD_DEPENDS+=	xine-config:${PORTSDIR}/multimedia/libxine
 CONFIGURE_ARGS+=--with-xine-prefix=${X11BASE}
 .else
-DO_NOT_COMPILE+=        xine_artsplugin
-CONFIGURE_ARGS+=        --disable-xinetest
+DO_NOT_COMPILE+=	xine_artsplugin
+CONFIGURE_ARGS+=	--disable-xinetest
 .endif
 
 .if defined(WITH_MPEGLIB)
@@ -78,6 +90,14 @@ CONFIGURE_ENV+=	DO_NOT_COMPILE="${DO_NOT_COMPILE}"
 .endif # defined(DO_NOT_COMPILE)
 
 pre-everything::
+.if defined(LAME_OVERRIDE)
+	@${ECHO_MSG}
+	@${ECHO_MSG} "********************************************************"
+	@${ECHO_MSG} "*      LAME is installed but WITH_LAME is not set!     *"
+	@${ECHO_MSG} "*       WITH_LAME has been enabled automatically.      *"
+	@${ECHO_MSG} "********************************************************"
+	@${ECHO_MSG}
+.endif
 .if defined(XINE_OVERRIDE)
 	@${ECHO_MSG}
 	@${ECHO_MSG} "********************************************************"
diff --git a/multimedia/kdemultimedia3/files/plist.base b/multimedia/kdemultimedia3/files/plist.base
index 3a24ba9347ee..18042d0be608 100644
--- a/multimedia/kdemultimedia3/files/plist.base
+++ b/multimedia/kdemultimedia3/files/plist.base
@@ -183,8 +183,6 @@ lib/kde3/libkaboodlepart.la
 lib/kde3/libkaboodlepart.so
 lib/kde3/libkmidpart.la
 lib/kde3/libkmidpart.so
-lib/kde3/libkrecexport_mp3.la
-lib/kde3/libkrecexport_mp3.so
 lib/kde3/libkrecexport_ogg.la
 lib/kde3/libkrecexport_ogg.so
 lib/kde3/libkrecexport_wave.la
@@ -1045,7 +1043,6 @@ share/services/kfile_mp3.desktop
 share/services/kfile_ogg.desktop
 share/services/kfile_wav.desktop
 share/services/kmixctrl_restore.desktop
-share/services/krec_exportmp3.desktop
 share/services/krec_exportogg.desktop
 share/services/krec_exportwave.desktop
 share/servicetypes/audiomidi.desktop
diff --git a/multimedia/kdemultimedia3/files/plist.base.rm b/multimedia/kdemultimedia3/files/plist.base.rm
index cf7d314966d4..f314aaeb4941 100644
--- a/multimedia/kdemultimedia3/files/plist.base.rm
+++ b/multimedia/kdemultimedia3/files/plist.base.rm
@@ -130,7 +130,6 @@
 @dirrm lib/mcop
 @dirrm lib/kde3
 @dirrm include/noatun
-@dirrm include/mpeglib_artsplug
 @dirrm include/mpeglib/util/yaf/yafxplayer
 @dirrm include/mpeglib/util/yaf/yafcore
 @dirrm include/mpeglib/util/yaf
diff --git a/multimedia/kdemultimedia3/files/plist.lame b/multimedia/kdemultimedia3/files/plist.lame
new file mode 100644
index 000000000000..14d27ab6155b
--- /dev/null
+++ b/multimedia/kdemultimedia3/files/plist.lame
@@ -0,0 +1,3 @@
+lib/kde3/libkrecexport_mp3.la
+lib/kde3/libkrecexport_mp3.so
+share/services/krec_exportmp3.desktop
diff --git a/multimedia/kdemultimedia3/files/plist.mpeglib.rm b/multimedia/kdemultimedia3/files/plist.mpeglib.rm
new file mode 100644
index 000000000000..b3ae0f3a7787
--- /dev/null
+++ b/multimedia/kdemultimedia3/files/plist.mpeglib.rm
@@ -0,0 +1 @@
+@dirrm include/mpeglib_artsplug
diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile
index 685003c5e754..bc17c09fde0a 100644
--- a/multimedia/kdemultimedia4/Makefile
+++ b/multimedia/kdemultimedia4/Makefile
@@ -22,7 +22,6 @@ LIB_DEPENDS+=	audiofile:${PORTSDIR}/audio/libaudiofile \
 		FLAC:${PORTSDIR}/audio/flac \
 		cdda_paranoia:${PORTSDIR}/audio/cdparanoia \
 		musicbrainz:${PORTSDIR}/audio/libmusicbrainz \
-		mp3lame:${PORTSDIR}/audio/lame \
 		ogg:${PORTSDIR}/audio/libogg \
 		tag:${PORTSDIR}/audio/taglib \
 		vorbis.3:${PORTSDIR}/audio/libvorbis
@@ -44,12 +43,20 @@ CONFIGURE_ARGS+=	--with-vorbis="${LOCALBASE}"
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 
-OPTIONS=	XINE "Enable support for video playback, using libxine" off \
-		MPEGLIB "Use mpeglib for audio playback" on
+OPTIONS=	LAME "Enable support for mp3 encoding using LAME" off \
+		MPEGLIB "Use mpeglib for audio playback" on \
+		XINE "Enable support for video playback using libxine" off
 
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>
 
+.if exists(${LOCALBASE}/bin/lame)
+.	if !defined(WITH_LAME)
+LAME_OVERRIDE=	yes
+WITH_LAME=	yes
+.	endif
+.endif
+
 .if exists(${X11BASE}/bin/xine-config)
 .	if !defined(WITH_XINE)
 XINE_OVERRIDE=	yes
@@ -57,14 +64,19 @@ WITH_XINE=	yes
 .	endif
 .endif
 
+.if defined(WITH_LAME)
+PLIST_APPEND+=	plist.lame
+LIB_DEPENDS+=	mp3lame:${PORTSDIR}/audio/lame
+.endif
+
 .if defined(WITH_XINE)
 PLIST_APPEND+=	plist.xine
 LIB_DEPENDS+=	xine:${PORTSDIR}/multimedia/libxine
 BUILD_DEPENDS+=	xine-config:${PORTSDIR}/multimedia/libxine
 CONFIGURE_ARGS+=--with-xine-prefix=${X11BASE}
 .else
-DO_NOT_COMPILE+=        xine_artsplugin
-CONFIGURE_ARGS+=        --disable-xinetest
+DO_NOT_COMPILE+=	xine_artsplugin
+CONFIGURE_ARGS+=	--disable-xinetest
 .endif
 
 .if defined(WITH_MPEGLIB)
@@ -78,6 +90,14 @@ CONFIGURE_ENV+=	DO_NOT_COMPILE="${DO_NOT_COMPILE}"
 .endif # defined(DO_NOT_COMPILE)
 
 pre-everything::
+.if defined(LAME_OVERRIDE)
+	@${ECHO_MSG}
+	@${ECHO_MSG} "********************************************************"
+	@${ECHO_MSG} "*      LAME is installed but WITH_LAME is not set!     *"
+	@${ECHO_MSG} "*       WITH_LAME has been enabled automatically.      *"
+	@${ECHO_MSG} "********************************************************"
+	@${ECHO_MSG}
+.endif
 .if defined(XINE_OVERRIDE)
 	@${ECHO_MSG}
 	@${ECHO_MSG} "********************************************************"
diff --git a/multimedia/kdemultimedia4/files/plist.base b/multimedia/kdemultimedia4/files/plist.base
index 3a24ba9347ee..18042d0be608 100644
--- a/multimedia/kdemultimedia4/files/plist.base
+++ b/multimedia/kdemultimedia4/files/plist.base
@@ -183,8 +183,6 @@ lib/kde3/libkaboodlepart.la
 lib/kde3/libkaboodlepart.so
 lib/kde3/libkmidpart.la
 lib/kde3/libkmidpart.so
-lib/kde3/libkrecexport_mp3.la
-lib/kde3/libkrecexport_mp3.so
 lib/kde3/libkrecexport_ogg.la
 lib/kde3/libkrecexport_ogg.so
 lib/kde3/libkrecexport_wave.la
@@ -1045,7 +1043,6 @@ share/services/kfile_mp3.desktop
 share/services/kfile_ogg.desktop
 share/services/kfile_wav.desktop
 share/services/kmixctrl_restore.desktop
-share/services/krec_exportmp3.desktop
 share/services/krec_exportogg.desktop
 share/services/krec_exportwave.desktop
 share/servicetypes/audiomidi.desktop
diff --git a/multimedia/kdemultimedia4/files/plist.base.rm b/multimedia/kdemultimedia4/files/plist.base.rm
index cf7d314966d4..f314aaeb4941 100644
--- a/multimedia/kdemultimedia4/files/plist.base.rm
+++ b/multimedia/kdemultimedia4/files/plist.base.rm
@@ -130,7 +130,6 @@
 @dirrm lib/mcop
 @dirrm lib/kde3
 @dirrm include/noatun
-@dirrm include/mpeglib_artsplug
 @dirrm include/mpeglib/util/yaf/yafxplayer
 @dirrm include/mpeglib/util/yaf/yafcore
 @dirrm include/mpeglib/util/yaf
diff --git a/multimedia/kdemultimedia4/files/plist.lame b/multimedia/kdemultimedia4/files/plist.lame
new file mode 100644
index 000000000000..14d27ab6155b
--- /dev/null
+++ b/multimedia/kdemultimedia4/files/plist.lame
@@ -0,0 +1,3 @@
+lib/kde3/libkrecexport_mp3.la
+lib/kde3/libkrecexport_mp3.so
+share/services/krec_exportmp3.desktop
diff --git a/multimedia/kdemultimedia4/files/plist.mpeglib.rm b/multimedia/kdemultimedia4/files/plist.mpeglib.rm
new file mode 100644
index 000000000000..b3ae0f3a7787
--- /dev/null
+++ b/multimedia/kdemultimedia4/files/plist.mpeglib.rm
@@ -0,0 +1 @@
+@dirrm include/mpeglib_artsplug