summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2003-11-25 13:38:57 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2003-11-25 13:38:57 +0800
commit91a81b5b599668239c716eb54ba34f3777dccf88 (patch)
tree23b513b55d93673fa0a29924042c8a7c35cbd6d2
parentc8ee91254444623c00165d56a40a3c53b32205fa (diff)
downloadmarcuscom-ports-91a81b5b599668239c716eb54ba34f3777dccf88.tar
marcuscom-ports-91a81b5b599668239c716eb54ba34f3777dccf88.tar.gz
marcuscom-ports-91a81b5b599668239c716eb54ba34f3777dccf88.tar.bz2
marcuscom-ports-91a81b5b599668239c716eb54ba34f3777dccf88.tar.lz
marcuscom-ports-91a81b5b599668239c716eb54ba34f3777dccf88.tar.xz
marcuscom-ports-91a81b5b599668239c716eb54ba34f3777dccf88.tar.zst
marcuscom-ports-91a81b5b599668239c716eb54ba34f3777dccf88.zip
Move the WITH_XINE check above bsd.port.pre.mk to give us more flexibility.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1365 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--audio/rhythmbox-devel/Makefile14
-rw-r--r--audio/rhythmbox/Makefile14
2 files changed, 14 insertions, 14 deletions
diff --git a/audio/rhythmbox-devel/Makefile b/audio/rhythmbox-devel/Makefile
index f5c8dd7a7..bfc9c3f83 100644
--- a/audio/rhythmbox-devel/Makefile
+++ b/audio/rhythmbox-devel/Makefile
@@ -27,6 +27,13 @@ USE_LIBTOOL= yes
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lm" \
CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"
+.ifdef (WITH_XINE)
+LIB_DEPENDS+= xine.7:${PORTSDIR}/multimedia/libxine
+CONFIGURE_ARGS+= --enable-xine
+.else
+LIB_DEPENDS+= gstplay-0.7.1:${PORTSDIR}/multimedia/gstreamer-plugins
+.endif
+
.include <bsd.port.pre.mk>
.if exists(${LOCALBASE}/lib/libvorbis.so)
@@ -39,13 +46,6 @@ LIB_DEPENDS+= vorbis.2:${PORTSDIR}/audio/libvorbis
CONFIGURE_ARGS+= --disable-vorbis --disable-vorbistest
.endif
-.ifdef (WITH_XINE)
-LIB_DEPENDS+= xine.7:${PORTSDIR}/multimedia/libxine
-CONFIGURE_ARGS+= --enable-xine
-.else
-LIB_DEPENDS+= gstplay-0.7.1:${PORTSDIR}/multimedia/gstreamer-plugins
-.endif
-
pre-everything::
.if !defined(WITH_XINE)
@${ECHO_MSG}
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index f5c8dd7a7..bfc9c3f83 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -27,6 +27,13 @@ USE_LIBTOOL= yes
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lm" \
CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"
+.ifdef (WITH_XINE)
+LIB_DEPENDS+= xine.7:${PORTSDIR}/multimedia/libxine
+CONFIGURE_ARGS+= --enable-xine
+.else
+LIB_DEPENDS+= gstplay-0.7.1:${PORTSDIR}/multimedia/gstreamer-plugins
+.endif
+
.include <bsd.port.pre.mk>
.if exists(${LOCALBASE}/lib/libvorbis.so)
@@ -39,13 +46,6 @@ LIB_DEPENDS+= vorbis.2:${PORTSDIR}/audio/libvorbis
CONFIGURE_ARGS+= --disable-vorbis --disable-vorbistest
.endif
-.ifdef (WITH_XINE)
-LIB_DEPENDS+= xine.7:${PORTSDIR}/multimedia/libxine
-CONFIGURE_ARGS+= --enable-xine
-.else
-LIB_DEPENDS+= gstplay-0.7.1:${PORTSDIR}/multimedia/gstreamer-plugins
-.endif
-
pre-everything::
.if !defined(WITH_XINE)
@${ECHO_MSG}