diff options
| author | Will Andrews <will@FreeBSD.org> | 2002-01-15 02:09:22 +0000 |
|---|---|---|
| committer | Will Andrews <will@FreeBSD.org> | 2002-01-15 02:09:22 +0000 |
| commit | 0c691bfc430fa0db93120289059a5816abf741d7 (patch) | |
| tree | 3fb0d71bdd49213d970ccfc48edf285a8545287a /multimedia/kdemultimedia3 | |
| parent | Forgot to mention that this port was: (diff) | |
Fix kdemultimedia2 build problem which basically boils down to the
inability to use --enable-final. Make OGGVORBIS support unconditional.
Remove @dirrm's that don't apply to this port. Bump PORTREVISION.
PR: 33891
PR submitted by: Patrick Murphy <murphyp1@ais.msu.edu>
Fix submitted by: Andy Fawcett <andy@athame.co.uk>
Reported by: Ryan Thompson <ryan@sasknow.com>,
Kent Stewart <kstewart@owt.com>
Notes
Notes:
svn path=/head/; revision=53084
Diffstat (limited to 'multimedia/kdemultimedia3')
| -rw-r--r-- | multimedia/kdemultimedia3/Makefile | 22 | ||||
| -rw-r--r-- | multimedia/kdemultimedia3/pkg-plist | 17 |
2 files changed, 9 insertions, 30 deletions
diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile index 16e24185ebe4..cd72a73f5d78 100644 --- a/multimedia/kdemultimedia3/Makefile +++ b/multimedia/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/multimedia/kdemultimedia3/pkg-plist b/multimedia/kdemultimedia3/pkg-plist index 3c765f1e1561..05c19b931d55 100644 --- a/multimedia/kdemultimedia3/pkg-plist +++ b/multimedia/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 |