1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-22 20:41:26 +00:00

Change WITH_OGG to WITH_VORBIS since Ogg will exist in the default instance

where Vorbis may not.  This should fix the configure problem on bento.
This commit is contained in:
Joe Marcus Clarke 2003-08-07 16:21:24 +00:00
parent aee4f5d14a
commit 1712ad512e
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=86512
3 changed files with 21 additions and 27 deletions

View File

@ -14,8 +14,6 @@ MASTER_SITES= http://web.verbum.org/net-rhythmbox/
MAINTAINER= hendrik@scholz.net
COMMENT= Audio player for the Gnome 2 desktop environment
BROKEN= Does not configure
LIB_DEPENDS= musicbrainz.2:${PORTSDIR}/audio/libmusicbrainz \
gstplay-0.6.1:${PORTSDIR}/multimedia/gstreamer-plugins \
FLAC.5:${PORTSDIR}/audio/flac \
@ -34,8 +32,8 @@ CONFIGURE_ARGS= --disable-lirc
.if exists(${LOCALBASE}/lib/libxosd.so)
WITH_XOSD= yes
.endif
.if exists(${LOCALBASE}/lib/libogg.so)
WITH_OGG= yes
.if exists(${LOCALBASE}/lib/libvorbis.so)
WITH_VORBIS= yes
.endif
.ifdef (WITH_XOSD)
@ -43,10 +41,10 @@ LIB_DEPENDS+= xosd.4:${PORTSDIR}/misc/xosd
.else
CONFIGURE_ARGS+= --disable-xosd
.endif
.ifdef (WITH_OGG)
LIB_DEPENDS+= ogg.4:${PORTSDIR}/audio/libogg
.ifdef (WITH_VORBIS)
LIB_DEPENDS+= vorbis.2:${PORTSDIR}/audio/libvorbis
.else
CONFIGURE_ARGS+= --disable-oggtest
CONFIGURE_ARGS+= --disable-vorbistest
.endif
pre-everything::
@ -55,9 +53,9 @@ pre-everything::
@${ECHO_CMD} "define WITH_XOSD to enable On-Screen-Display support"
@${ECHO_CMD}
.endif
.if !defined(WITH_OGG)
.if !defined(WITH_VORBIS)
@${ECHO_CMD}
@${ECHO_CMD} "define WITH_OGG to enable Ogg support"
@${ECHO_CMD} "define WITH_VORBIS to enable Vorbis support"
@${ECHO_CMD}
.endif

View File

@ -14,8 +14,6 @@ MASTER_SITES= http://web.verbum.org/net-rhythmbox/
MAINTAINER= hendrik@scholz.net
COMMENT= Audio player for the Gnome 2 desktop environment
BROKEN= Does not configure
LIB_DEPENDS= musicbrainz.2:${PORTSDIR}/audio/libmusicbrainz \
gstplay-0.6.1:${PORTSDIR}/multimedia/gstreamer-plugins \
FLAC.5:${PORTSDIR}/audio/flac \
@ -34,8 +32,8 @@ CONFIGURE_ARGS= --disable-lirc
.if exists(${LOCALBASE}/lib/libxosd.so)
WITH_XOSD= yes
.endif
.if exists(${LOCALBASE}/lib/libogg.so)
WITH_OGG= yes
.if exists(${LOCALBASE}/lib/libvorbis.so)
WITH_VORBIS= yes
.endif
.ifdef (WITH_XOSD)
@ -43,10 +41,10 @@ LIB_DEPENDS+= xosd.4:${PORTSDIR}/misc/xosd
.else
CONFIGURE_ARGS+= --disable-xosd
.endif
.ifdef (WITH_OGG)
LIB_DEPENDS+= ogg.4:${PORTSDIR}/audio/libogg
.ifdef (WITH_VORBIS)
LIB_DEPENDS+= vorbis.2:${PORTSDIR}/audio/libvorbis
.else
CONFIGURE_ARGS+= --disable-oggtest
CONFIGURE_ARGS+= --disable-vorbistest
.endif
pre-everything::
@ -55,9 +53,9 @@ pre-everything::
@${ECHO_CMD} "define WITH_XOSD to enable On-Screen-Display support"
@${ECHO_CMD}
.endif
.if !defined(WITH_OGG)
.if !defined(WITH_VORBIS)
@${ECHO_CMD}
@${ECHO_CMD} "define WITH_OGG to enable Ogg support"
@${ECHO_CMD} "define WITH_VORBIS to enable Vorbis support"
@${ECHO_CMD}
.endif

View File

@ -14,8 +14,6 @@ MASTER_SITES= http://web.verbum.org/net-rhythmbox/
MAINTAINER= hendrik@scholz.net
COMMENT= Audio player for the Gnome 2 desktop environment
BROKEN= Does not configure
LIB_DEPENDS= musicbrainz.2:${PORTSDIR}/audio/libmusicbrainz \
gstplay-0.6.1:${PORTSDIR}/multimedia/gstreamer-plugins \
FLAC.5:${PORTSDIR}/audio/flac \
@ -34,8 +32,8 @@ CONFIGURE_ARGS= --disable-lirc
.if exists(${LOCALBASE}/lib/libxosd.so)
WITH_XOSD= yes
.endif
.if exists(${LOCALBASE}/lib/libogg.so)
WITH_OGG= yes
.if exists(${LOCALBASE}/lib/libvorbis.so)
WITH_VORBIS= yes
.endif
.ifdef (WITH_XOSD)
@ -43,10 +41,10 @@ LIB_DEPENDS+= xosd.4:${PORTSDIR}/misc/xosd
.else
CONFIGURE_ARGS+= --disable-xosd
.endif
.ifdef (WITH_OGG)
LIB_DEPENDS+= ogg.4:${PORTSDIR}/audio/libogg
.ifdef (WITH_VORBIS)
LIB_DEPENDS+= vorbis.2:${PORTSDIR}/audio/libvorbis
.else
CONFIGURE_ARGS+= --disable-oggtest
CONFIGURE_ARGS+= --disable-vorbistest
.endif
pre-everything::
@ -55,9 +53,9 @@ pre-everything::
@${ECHO_CMD} "define WITH_XOSD to enable On-Screen-Display support"
@${ECHO_CMD}
.endif
.if !defined(WITH_OGG)
.if !defined(WITH_VORBIS)
@${ECHO_CMD}
@${ECHO_CMD} "define WITH_OGG to enable Ogg support"
@${ECHO_CMD} "define WITH_VORBIS to enable Vorbis support"
@${ECHO_CMD}
.endif