aboutsummaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorMichael Nottebrock <lofi@FreeBSD.org>2004-03-28 12:55:41 +0000
committerMichael Nottebrock <lofi@FreeBSD.org>2004-03-28 12:55:41 +0000
commit4dcaa9a533ab97b446bc08b18f2bbe9ed87fd135 (patch)
tree79db8dfaa15173f3a0823eaa619d46cfb8429eb0 /multimedia
parent38e947497b166376b98bca3c3dec889bbc99c083 (diff)
downloadports-4dcaa9a533ab97b446bc08b18f2bbe9ed87fd135.tar.gz
ports-4dcaa9a533ab97b446bc08b18f2bbe9ed87fd135.zip
Respect WITHOUT_FOO.
Notes
Notes: svn path=/head/; revision=105500
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/kdemultimedia3/Makefile42
-rw-r--r--multimedia/kdemultimedia4/Makefile42
2 files changed, 12 insertions, 72 deletions
diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index bc17c09fde0a..32e4a5b02b65 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -25,8 +25,8 @@ LIB_DEPENDS+= audiofile:${PORTSDIR}/audio/libaudiofile \
ogg:${PORTSDIR}/audio/libogg \
tag:${PORTSDIR}/audio/taglib \
vorbis.3:${PORTSDIR}/audio/libvorbis
-BUILD_DEPENDS= trm:${PORTSDIR}/audio/trm
-RUN_DEPENDS= trm:${PORTSDIR}/audio/trm
+BUILD_DEPENDS+= trm:${PORTSDIR}/audio/trm
+RUN_DEPENDS+= trm:${PORTSDIR}/audio/trm
USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
@@ -50,23 +50,11 @@ OPTIONS= LAME "Enable support for mp3 encoding using LAME" 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
-WITH_XINE= yes
-. endif
-.endif
-
.if defined(WITH_LAME)
PLIST_APPEND+= plist.lame
LIB_DEPENDS+= mp3lame:${PORTSDIR}/audio/lame
+.elseif defined(WITHOUT_LAME)
+CONFIGURE_ARGS+= --without-lame --disable-lametest
.endif
.if defined(WITH_XINE)
@@ -74,14 +62,14 @@ PLIST_APPEND+= plist.xine
LIB_DEPENDS+= xine:${PORTSDIR}/multimedia/libxine
BUILD_DEPENDS+= xine-config:${PORTSDIR}/multimedia/libxine
CONFIGURE_ARGS+=--with-xine-prefix=${X11BASE}
-.else
+.elseif defined(WITHOUT_XINE)
DO_NOT_COMPILE+= xine_artsplugin
CONFIGURE_ARGS+= --disable-xinetest
.endif
.if defined(WITH_MPEGLIB)
PLIST_APPEND+= plist.mpeglib
-.else
+.elseif defined(WITHOUT_MPEGLIB)
PLIST_APPEND+= plist.no-mpeglib
.endif
@@ -89,24 +77,6 @@ PLIST_APPEND+= plist.no-mpeglib
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} "********************************************************"
- @${ECHO_MSG} "* libxine is installed but WITH_XINE is not set! *"
- @${ECHO_MSG} "* WITH_XINE has been enabled automatically. *"
- @${ECHO_MSG} "********************************************************"
- @${ECHO_MSG}
-.endif
-
pre-configure:
.if !defined(WITH_MPEGLIB)
${REINPLACE_CMD} -e \
diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile
index bc17c09fde0a..32e4a5b02b65 100644
--- a/multimedia/kdemultimedia4/Makefile
+++ b/multimedia/kdemultimedia4/Makefile
@@ -25,8 +25,8 @@ LIB_DEPENDS+= audiofile:${PORTSDIR}/audio/libaudiofile \
ogg:${PORTSDIR}/audio/libogg \
tag:${PORTSDIR}/audio/taglib \
vorbis.3:${PORTSDIR}/audio/libvorbis
-BUILD_DEPENDS= trm:${PORTSDIR}/audio/trm
-RUN_DEPENDS= trm:${PORTSDIR}/audio/trm
+BUILD_DEPENDS+= trm:${PORTSDIR}/audio/trm
+RUN_DEPENDS+= trm:${PORTSDIR}/audio/trm
USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
@@ -50,23 +50,11 @@ OPTIONS= LAME "Enable support for mp3 encoding using LAME" 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
-WITH_XINE= yes
-. endif
-.endif
-
.if defined(WITH_LAME)
PLIST_APPEND+= plist.lame
LIB_DEPENDS+= mp3lame:${PORTSDIR}/audio/lame
+.elseif defined(WITHOUT_LAME)
+CONFIGURE_ARGS+= --without-lame --disable-lametest
.endif
.if defined(WITH_XINE)
@@ -74,14 +62,14 @@ PLIST_APPEND+= plist.xine
LIB_DEPENDS+= xine:${PORTSDIR}/multimedia/libxine
BUILD_DEPENDS+= xine-config:${PORTSDIR}/multimedia/libxine
CONFIGURE_ARGS+=--with-xine-prefix=${X11BASE}
-.else
+.elseif defined(WITHOUT_XINE)
DO_NOT_COMPILE+= xine_artsplugin
CONFIGURE_ARGS+= --disable-xinetest
.endif
.if defined(WITH_MPEGLIB)
PLIST_APPEND+= plist.mpeglib
-.else
+.elseif defined(WITHOUT_MPEGLIB)
PLIST_APPEND+= plist.no-mpeglib
.endif
@@ -89,24 +77,6 @@ PLIST_APPEND+= plist.no-mpeglib
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} "********************************************************"
- @${ECHO_MSG} "* libxine is installed but WITH_XINE is not set! *"
- @${ECHO_MSG} "* WITH_XINE has been enabled automatically. *"
- @${ECHO_MSG} "********************************************************"
- @${ECHO_MSG}
-.endif
-
pre-configure:
.if !defined(WITH_MPEGLIB)
${REINPLACE_CMD} -e \