aboutsummaryrefslogtreecommitdiffstats
path: root/audio/xmms
diff options
context:
space:
mode:
authorsobomax <sobomax@FreeBSD.org>2000-06-21 16:44:23 +0800
committersobomax <sobomax@FreeBSD.org>2000-06-21 16:44:23 +0800
commit2ae1d9af40a56a4cf62ed40ff3923d09fecf0a61 (patch)
treed4584c7f61a655d661e9619601c3f60b18fc7b6d /audio/xmms
parent434fef340f0aaa0ba1b18d33f4bf390998afe577 (diff)
downloadfreebsd-ports-graphics-2ae1d9af40a56a4cf62ed40ff3923d09fecf0a61.tar.gz
freebsd-ports-graphics-2ae1d9af40a56a4cf62ed40ff3923d09fecf0a61.tar.zst
freebsd-ports-graphics-2ae1d9af40a56a4cf62ed40ff3923d09fecf0a61.zip
Make building/installing of the esd and mikmod plugins conditional (turned on by
default). Also slightly clean GNOME support bits.
Diffstat (limited to 'audio/xmms')
-rw-r--r--audio/xmms/Makefile63
-rw-r--r--audio/xmms/files/patch-ad28
-rw-r--r--audio/xmms/pkg-plist7
3 files changed, 75 insertions, 23 deletions
diff --git a/audio/xmms/Makefile b/audio/xmms/Makefile
index 61ddbfc4c93..1328c8d701b 100644
--- a/audio/xmms/Makefile
+++ b/audio/xmms/Makefile
@@ -20,38 +20,65 @@ MAINTAINER= esk@ira.uka.de
LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
glib12.3:${PORTSDIR}/devel/glib12 \
- xml.5:${PORTSDIR}/textproc/libxml \
- mikmod.2:${PORTSDIR}/audio/libmikmod \
- esd.2:${PORTSDIR}/audio/esound
+ xml.5:${PORTSDIR}/textproc/libxml
-USE_X_PREFIX= yes
-USE_LIBTOOL= yes
-INSTALLS_SHLIB= yes
+USE_X_PREFIX= yes
+USE_LIBTOOL= yes
+INSTALLS_SHLIB= yes
+
+.if !defined(WITHOUT_MIKMOD)
+LIB_DEPENDS+= mikmod.2:${PORTSDIR}/audio/libmikmod
+HAVE_MIKMOD_OVERRIDE=
+PLIST_SUB+= MIKMODPLUGIN:=""
+.else
+HAVE_MIKMOD_OVERRIDE= yes
+PLIST_SUB+= MIKMODPLUGIN:="@comment "
+.endif
+
+.if !defined(WITHOUT_ESD)
+LIB_DEPENDS+= esd.2:${PORTSDIR}/audio/esound
+HAVE_ESD_OVERRIDE=
+PLIST_SUB+= ESDPLUGIN:=""
+.else
+HAVE_ESD_OVERRIDE= yes
+PLIST_SUB+= ESDPLUGIN:="@comment "
+.endif
.if defined(WITH_GNOME)
-CONFIGURE_ARGS= --with-gnome
+LIB_DEPENDS+= gnome.4:${PORTSDIR}/x11/gnomelibs \
+ panel_applet.4:${PORTSDIR}/x11/gnomecore
+CONFIGURE_ARGS+= --with-gnome
+PLIST_SUB+= GNOME:=""
.else
-CONFIGURE_ARGS= --without-gnome
+CONFIGURE_ARGS+= --without-gnome
+PLIST_SUB+= GNOME:="@comment "
.endif
GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
-CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \
+CONFIGURE_ENV+= GTK_CONFIG="${GTK_CONFIG}" \
GLIB_CONFIG="${GLIB_CONFIG}" \
CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+ LDFLAGS="-L${LOCALBASE}/lib" \
+ HAVE_ESD_OVERRIDE="${HAVE_ESD_OVERRIDE}" \
+ HAVE_MIKMOD_OVERRIDE="${HAVE_MIKMOD_OVERRIDE}"
-.if !defined(WITH_GNOME)
pre-extract:
- @${ECHO} "You can add support for GNOME by defining WITH_GNOME"
+.if !defined(WITH_GNOME) || !defined(WITHOUT_ESD) || !defined(WITHOUT_MIKMOD)
+ @${ECHO_MSG}
.endif
-
-.if defined(WITH_GNOME)
-post-install:
- @${ECHO} bin/gnomexmms >> ${TMPPLIST}
- @${ECHO} etc/CORBA/servers/gnomexmms.gnorba >> ${TMPPLIST}
- @${ECHO} share/gnome/applets/Multimedia/gnomexmms.desktop >> ${TMPPLIST}
+.if !defined(WITH_GNOME)
+ @${ECHO_MSG} "You can add support for GNOME by defining WITH_GNOME."
+.endif
+.if !defined(WITHOUT_ESD)
+ @${ECHO_MSG} "You can disable support for ESD sound daemon by defining WITHOUT_ESD."
+.endif
+.if !defined(WITHOUT_MIKMOD)
+ @${ECHO_MSG} "You can disable support for mikmod by defining WITHOUT_MIKMOD."
+.endif
+.if !defined(WITH_GNOME) || !defined(WITHOUT_ESD) || !defined(WITHOUT_MIKMOD)
+ @${ECHO_MSG}
.endif
.include <bsd.port.mk>
diff --git a/audio/xmms/files/patch-ad b/audio/xmms/files/patch-ad
index 181d0b81f0d..63149d20c29 100644
--- a/audio/xmms/files/patch-ad
+++ b/audio/xmms/files/patch-ad
@@ -1,5 +1,5 @@
--- configure.orig Mon Jun 19 16:19:25 2000
-+++ configure Tue Jun 20 11:35:37 2000
++++ configure Wed Jun 21 10:34:30 2000
@@ -3290,14 +3290,14 @@
fi
@@ -27,7 +27,29 @@
else
echo "$ac_t""no" 1>&6
fi
-@@ -5475,7 +5475,7 @@
+@@ -3927,7 +3927,9 @@
+ echo "$ac_t""no" 1>&6
+ fi
+
+-
++if [ x"${HAVE_ESD_OVERRIDE}" != x"" ]; then
++ have_esd=no
++fi
+
+ if test "x$have_esd" = xyes; then
+ HAVE_ESD_TRUE=
+@@ -4208,7 +4210,9 @@
+
+ rm -f conf.mikmodtest
+
+-
++if [ x"${HAVE_MIKMOD_OVERRIDE}" != x"" ]; then
++ have_mikmod=no
++fi
+
+ if test "x$have_mikmod" = xyes; then
+ HAVE_MIKMOD_TRUE=
+@@ -5475,7 +5479,7 @@
cat conftest.$ac_ext >&5
rm -rf conftest*
CATOBJEXT=.mo
@@ -36,7 +58,7 @@
fi
rm -f conftest*
INSTOBJEXT=.mo
-@@ -7113,14 +7113,14 @@
+@@ -7113,14 +7117,14 @@
if test -n "$GCC"
then
diff --git a/audio/xmms/pkg-plist b/audio/xmms/pkg-plist
index 92b95de717c..1b53d360ab8 100644
--- a/audio/xmms/pkg-plist
+++ b/audio/xmms/pkg-plist
@@ -1,6 +1,9 @@
bin/wmxmms
bin/xmms
bin/xmms-config
+%%GNOME:%%bin/gnomexmms
+%%GNOME:%%etc/CORBA/servers/gnomexmms.gnorba
+%%GNOME:%%share/gnome/applets/Multimedia/gnomexmms.desktop
include/xmms/configfile.h
include/xmms/dga.h
include/xmms/dirbrowser.h
@@ -22,11 +25,11 @@ lib/xmms/Input/libwav.so
lib/xmms/Input/libmpg123.so
lib/xmms/Input/libcdaudio.so
lib/xmms/Input/libidcin.so
-lib/xmms/Input/libmikmod.so
+%%MIKMODPLUGIN:%%lib/xmms/Input/libmikmod.so
lib/xmms/Input/libtonegen.so
lib/xmms/Output/libOSS.so
lib/xmms/Output/libdisk_writer.so
-lib/xmms/Output/libesdout.so
+%%ESDPLUGIN:%%lib/xmms/Output/libesdout.so
lib/xmms/Visualization/libbscope.so
lib/xmms/Visualization/libsanalyzer.so
share/aclocal/xmms.m4