summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorJeremy Lea <reg@FreeBSD.org>2000-10-05 05:19:38 +0000
committerJeremy Lea <reg@FreeBSD.org>2000-10-05 05:19:38 +0000
commit712a2199384437ea262fe698b283e4f616362747 (patch)
tree945bab070253f362d6ebb5a75a9c90ce751c10c7 /audio
parentI maintain this port. (diff)
Implement WANT_ESOUND, USE_ESOUND.
Diffstat (limited to 'audio')
-rw-r--r--audio/kmikmod/Makefile14
-rw-r--r--audio/libmikmod/Makefile3
-rw-r--r--audio/mpg123/Makefile16
-rw-r--r--audio/mpg123/files/patch-aa2
-rw-r--r--audio/timidity++/Makefile15
-rw-r--r--audio/wsoundserver/Makefile20
6 files changed, 33 insertions, 37 deletions
diff --git a/audio/kmikmod/Makefile b/audio/kmikmod/Makefile
index 7eda68f9d11e..019b408d0d92 100644
--- a/audio/kmikmod/Makefile
+++ b/audio/kmikmod/Makefile
@@ -20,12 +20,18 @@ LIB_DEPENDS= kdecore.3:${PORTSDIR}/x11/kdelibs11 \
USE_BZIP2= yes
WRKSRC= ${WRKDIR}/kmikmod
USE_QT= yes
-GNU_CONFIGURE= yes
USE_GMAKE= yes
-CONFIGURE_ENV= CXXFLAGS="${CXXFLAGS}" \
- INSTALL_SCRIPT="${INSTALL_SCRIPT}"
+WANT_ESOUND= yes
+USE_LIBTOOL= yes
+LIBTOOLFILES= configure libmikmod/configure
+
+.include <bsd.port.pre.mk>
+
+.if defined(HAVE_ESOUND)
+USE_ESOUND= yes
+.endif
pre-configure:
cd ${WRKSRC}/libmikmod; ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/audio/libmikmod/Makefile b/audio/libmikmod/Makefile
index 53017c908dcb..88bb7aeb24ea 100644
--- a/audio/libmikmod/Makefile
+++ b/audio/libmikmod/Makefile
@@ -12,8 +12,7 @@ MASTER_SITES= http://www.mikmod.darkorb.net/libmikmod/
MAINTAINER= mharo@FreeBSD.org
-LIB_DEPENDS= esd.2:${PORTSDIR}/audio/esound
-
+USE_ESOUND= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
USE_GMAKE= yes
diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile
index 69bbc6c45191..86ac4804ba8a 100644
--- a/audio/mpg123/Makefile
+++ b/audio/mpg123/Makefile
@@ -22,9 +22,7 @@ PATCH_DIST_STRIP= -p1
MAINTAINER= jkoshy@freebsd.org
-.if defined(OPT_ESOUND)
-LIB_DEPENDS= esd.2:${PORTSDIR}/audio/esound
-.endif
+WANT_ESOUND= yes
MAN1= mpg123.1
@@ -34,18 +32,14 @@ MAN1= mpg123.1
MAKE_ENV+= USE_INET6=yes
.endif
-.if defined(OPT_ESOUND)
+.if defined(HAVE_ESOUND)
+USE_ESOUND= yes
ALL_TARGET= freebsd-esd
.else
ALL_TARGET= freebsd
.endif
pre-configure:
-.if !defined(OPT_ESOUND) && exists(${PREFIX}/lib/libesd.a)
- @${ECHO_MSG} "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
- @${ECHO_MSG} "Note: you can set OPT_ESOUND to \"yes\" to compile mpg123 with esd support."
- @${ECHO_MSG} "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
-.endif
.if ${MACHINE_ARCH} == "i386"
.if !defined(OPT_ARCH) || ((${OPT_ARCH} != "i486") && (${OPT_ARCH} != "i586") \
&& (${OPT_ARCH} != "3dnow"))
@@ -69,8 +63,4 @@ OPT_ARCH?= i486
MAKE_ARGS+= OPT_ARCH=${OPT_ARCH}
.endif
-.if defined(OPT_ESOUND)
-MAKE_ARGS+= OPT_ESOUND=${OPT_ESOUND}
-.endif
-
.include <bsd.port.post.mk>
diff --git a/audio/mpg123/files/patch-aa b/audio/mpg123/files/patch-aa
index 4191e08e1af1..67fb217d9af7 100644
--- a/audio/mpg123/files/patch-aa
+++ b/audio/mpg123/files/patch-aa
@@ -54,7 +54,7 @@
+CFLAGS +=-Wall -ansi -pedantic ${ARCHOPT} \
+ -DREAD_MMAP -DUSE_MMAP -DOSS -DTERM_CONTROL
+
-+.if defined(OPT_ESOUND)
++.if defined(HAVE_ESOUND)
+CFLAGS +=-I${LOCALBASE}/include
+LDFLAGS+=-L${LOCALBASE}/lib
+.endif
diff --git a/audio/timidity++/Makefile b/audio/timidity++/Makefile
index 90ce4069e918..5846af5b4b5b 100644
--- a/audio/timidity++/Makefile
+++ b/audio/timidity++/Makefile
@@ -22,6 +22,7 @@ SLAVEDIRS+= audio/timidity++-gtk audio/timidity++-motif \
audio/timidity++-slang audio/timidity++-tcltk \
audio/timidity++-xaw audio/timidity++-xskin
USE_BZIP2= yes
+WANT_ESOUND= yes
GNU_CONFIGURE= yes
.if !defined(WITHOUT_X11)
USE_XLIB= yes
@@ -40,13 +41,6 @@ CONFIGURE_ARGS= --enable-ncurses --enable-vt100 \
--enable-network --disable-spectrogram --disable-wrd
.endif
-.if defined(WITH_ESOUND)
-LIB_DEPENDS+= esd.2:${PORTSDIR}/audio/esound
-CONFIGURE_ARGS+= --enable-audio=oss,esd
-.else
-CONFIGURE_ARGS+= --enable-audio=oss
-.endif
-
MAN1= timidity.1
MAN5= timidity.cfg.5
@@ -56,6 +50,13 @@ DOCLANG= C ja_JP.ujis
.include <bsd.port.pre.mk>
+.if defined(HAVE_ESOUND)
+USE_ESOUND= yes
+CONFIGURE_ARGS+=--enable-audio=oss,esd
+.else
+CONFIGURE_ARGS+=--enable-audio=oss
+.endif
+
.if ${PORTOBJFORMAT} == "elf"
CONFIGURE_ENV= LDFLAGS=-export-dynamic
.endif
diff --git a/audio/wsoundserver/Makefile b/audio/wsoundserver/Makefile
index 0bfa0f1ee90d..33abdf8fd177 100644
--- a/audio/wsoundserver/Makefile
+++ b/audio/wsoundserver/Makefile
@@ -16,21 +16,14 @@ MAINTAINER= sobomax@FreeBSD.org
BUILD_DEPENDS= wmaker:${PORTSDIR}/x11-wm/windowmaker
LIB_DEPENDS= PropList.2:${PORTSDIR}/devel/libPropList \
audiofile.0:${PORTSDIR}/audio/libaudiofile \
- dockapp.1:${PORTSDIR}/x11-wm/libdockapp \
- ${ESD_DEPENDS}
+ dockapp.1:${PORTSDIR}/x11-wm/libdockapp
RUN_DEPENDS= wmaker:${PORTSDIR}/x11-wm/windowmaker
USE_X_PREFIX= yes
+WANT_ESOUND= yes
INSTALLS_SHLIB= yes
USE_LIBTOOL= yes
-.if defined(WITH_ESD)
-ESD_DEPENDS= esd.2:${PORTSDIR}/audio/esound
-CONFIGURE_ARGS+=--enable-esd
-.else
-ESD_DEPENDS=
-.endif
-
MAN1= get-wsound-flags.1x getsoundset.1x setsoundset.1x \
wsoundplay.1x wsoundserver.1x
@@ -40,4 +33,11 @@ post-install:
${INSTALL_DATA} ${WRKDIR}/WMSound \
${PREFIX}/etc/WindowMaker/WMSound
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if defined(HAVE_ESOUND)
+USE_ESOUND= yes
+CONFIGURE_ARGS+=--enable-esd
+.endif
+
+.include <bsd.port.post.mk>