Add the optional WITH_OGGVORBIS variable. It will also be automatically set

if ogg/vorbis tools are detected (audio/libogg and audio/libvorbis), fixing
the plist for both bento and users who have ogg/vorbis already installed.

8 files changed, 104 insertions, 4 deletions

diff --git a/audio/kdemultimedia2/Makefile b/audio/kdemultimedia2/Makefile
index 1f20ad44c648..14b7428adcfb 100644
--- a/audio/kdemultimedia2/Makefile
+++ b/audio/kdemultimedia2/Makefile
@@ -24,6 +24,26 @@ CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
 USE_GMAKE=	yes
 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
 	${PERL} -pi -e 's,kscd_compile=no,kscd_compile=yes,g; \
@@ -43,4 +63,4 @@ post-install:
 	@${ECHO_MSG} " # ${CHMOD} 666 /dev/racd0c"
 	@${ECHO_MSG}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/audio/kdemultimedia2/pkg-plist b/audio/kdemultimedia2/pkg-plist
index 147b9616ea38..14a1ef6c8d11 100644
--- a/audio/kdemultimedia2/pkg-plist
+++ b/audio/kdemultimedia2/pkg-plist
@@ -125,6 +125,8 @@ lib/libnoatunui.la
 lib/libnoatunui.so
 lib/libnoatunvoiceprint.la
 lib/libnoatunvoiceprint.so
+%%OGGVORBIS:%%lib/liboggarts.la
+%%OGGVORBIS:%%lib/liboggarts.so
 lib/libsplitplaylist.la
 lib/libsplitplaylist.so
 lib/libworkman.la
@@ -174,6 +176,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/ExtraStereo.mcopclass
 lib/mcop/ExtraStereoGuiFactory.mcopclass
 lib/mcop/Noatun/Equalizer.mcopclass
@@ -203,6 +206,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/noatun.la
 lib/noatun.so
 share/applnk/Multimedia/aktion.desktop
diff --git a/audio/kdemultimedia3/Makefile b/audio/kdemultimedia3/Makefile
index 1f20ad44c648..14b7428adcfb 100644
--- a/audio/kdemultimedia3/Makefile
+++ b/audio/kdemultimedia3/Makefile
@@ -24,6 +24,26 @@ CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
 USE_GMAKE=	yes
 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
 	${PERL} -pi -e 's,kscd_compile=no,kscd_compile=yes,g; \
@@ -43,4 +63,4 @@ post-install:
 	@${ECHO_MSG} " # ${CHMOD} 666 /dev/racd0c"
 	@${ECHO_MSG}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/audio/kdemultimedia3/pkg-plist b/audio/kdemultimedia3/pkg-plist
index 147b9616ea38..14a1ef6c8d11 100644
--- a/audio/kdemultimedia3/pkg-plist
+++ b/audio/kdemultimedia3/pkg-plist
@@ -125,6 +125,8 @@ lib/libnoatunui.la
 lib/libnoatunui.so
 lib/libnoatunvoiceprint.la
 lib/libnoatunvoiceprint.so
+%%OGGVORBIS:%%lib/liboggarts.la
+%%OGGVORBIS:%%lib/liboggarts.so
 lib/libsplitplaylist.la
 lib/libsplitplaylist.so
 lib/libworkman.la
@@ -174,6 +176,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/ExtraStereo.mcopclass
 lib/mcop/ExtraStereoGuiFactory.mcopclass
 lib/mcop/Noatun/Equalizer.mcopclass
@@ -203,6 +206,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/noatun.la
 lib/noatun.so
 share/applnk/Multimedia/aktion.desktop
diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index 1f20ad44c648..14b7428adcfb 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -24,6 +24,26 @@ CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
 USE_GMAKE=	yes
 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
 	${PERL} -pi -e 's,kscd_compile=no,kscd_compile=yes,g; \
@@ -43,4 +63,4 @@ post-install:
 	@${ECHO_MSG} " # ${CHMOD} 666 /dev/racd0c"
 	@${ECHO_MSG}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/multimedia/kdemultimedia3/pkg-plist b/multimedia/kdemultimedia3/pkg-plist
index 147b9616ea38..14a1ef6c8d11 100644
--- a/multimedia/kdemultimedia3/pkg-plist
+++ b/multimedia/kdemultimedia3/pkg-plist
@@ -125,6 +125,8 @@ lib/libnoatunui.la
 lib/libnoatunui.so
 lib/libnoatunvoiceprint.la
 lib/libnoatunvoiceprint.so
+%%OGGVORBIS:%%lib/liboggarts.la
+%%OGGVORBIS:%%lib/liboggarts.so
 lib/libsplitplaylist.la
 lib/libsplitplaylist.so
 lib/libworkman.la
@@ -174,6 +176,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/ExtraStereo.mcopclass
 lib/mcop/ExtraStereoGuiFactory.mcopclass
 lib/mcop/Noatun/Equalizer.mcopclass
@@ -203,6 +206,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/noatun.la
 lib/noatun.so
 share/applnk/Multimedia/aktion.desktop
diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile
index 1f20ad44c648..14b7428adcfb 100644
--- a/multimedia/kdemultimedia4/Makefile
+++ b/multimedia/kdemultimedia4/Makefile
@@ -24,6 +24,26 @@ CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
 USE_GMAKE=	yes
 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
 	${PERL} -pi -e 's,kscd_compile=no,kscd_compile=yes,g; \
@@ -43,4 +63,4 @@ post-install:
 	@${ECHO_MSG} " # ${CHMOD} 666 /dev/racd0c"
 	@${ECHO_MSG}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/multimedia/kdemultimedia4/pkg-plist b/multimedia/kdemultimedia4/pkg-plist
index 147b9616ea38..14a1ef6c8d11 100644
--- a/multimedia/kdemultimedia4/pkg-plist
+++ b/multimedia/kdemultimedia4/pkg-plist
@@ -125,6 +125,8 @@ lib/libnoatunui.la
 lib/libnoatunui.so
 lib/libnoatunvoiceprint.la
 lib/libnoatunvoiceprint.so
+%%OGGVORBIS:%%lib/liboggarts.la
+%%OGGVORBIS:%%lib/liboggarts.so
 lib/libsplitplaylist.la
 lib/libsplitplaylist.so
 lib/libworkman.la
@@ -174,6 +176,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/ExtraStereo.mcopclass
 lib/mcop/ExtraStereoGuiFactory.mcopclass
 lib/mcop/Noatun/Equalizer.mcopclass
@@ -203,6 +206,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/noatun.la
 lib/noatun.so
 share/applnk/Multimedia/aktion.desktop