aboutsummaryrefslogtreecommitdiff
path: root/audio/mpg123
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/mpg123
parent48f4e97e04d74b70c63f73cf44de3e75c99fdfaa (diff)
downloadports-712a2199384437ea262fe698b283e4f616362747.tar.gz
ports-712a2199384437ea262fe698b283e4f616362747.zip
Implement WANT_ESOUND, USE_ESOUND.
Notes
Notes: svn path=/head/; revision=33420
Diffstat (limited to 'audio/mpg123')
-rw-r--r--audio/mpg123/Makefile16
-rw-r--r--audio/mpg123/files/patch-aa2
2 files changed, 4 insertions, 14 deletions
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