5 files changed, 62 insertions, 36 deletions
diff --git a/audio/sox/Makefile b/audio/sox/Makefile
index c49ece1..b16d02e 100644
--- a/audio/sox/Makefile
+++ b/audio/sox/Makefile
@@ -6,25 +6,68 @@
 #
 
 PORTNAME=	sox
-PORTVERSION=	12.17.3
-PORTREVISION=	1
+PORTVERSION=	12.17.4
+PORTREVISION=	0
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sox
 
-MAINTAINER=		dnelson@emsphone.com
+MAINTAINER=	dnelson@allantgroup.com
 COMMENT=	SOund eXchange - universal sound sample translator
 
 MAN1=			sox.1 play.1 soxexam.1
 MLINKS=			play.1 rec.1 sox.1 soxmix.1
 GNU_CONFIGURE=		yes
 
+.include <bsd.port.pre.mk>
+
+.if exists(${LOCALBASE}/lib/libmp3lame.so.0)
+WITH_LAME=	YES
+.endif
+
+.if exists(${LOCALBASE}/lib/libmad.so.1)
+WITH_MAD=	YES
+.endif
+
+.if exists(${LOCALBASE}/lib/libvorbis.so.2)
+WITH_VORBIS=	YES
+.endif
+
+.if defined(WITH_VORBIS) || defined(WITH_LAME) || defined(WITH_MAD)
+CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+.endif
+
 .if defined(WITH_VORBIS)
-CONFIGURE_ARGS+=	--with-ogg-vorbisinc=${LOCALBASE}/include \
-		 	--with-ogg-vorbislib=${LOCALBASE}/lib
+CONFIGURE_ARGS+=	--enable-ogg-vorbis
 LIB_DEPENDS+=		vorbis.2:${PORTSDIR}/audio/libvorbis
 .else
-CONFIGURE_ARGS+=	--with-ogg-vorbisinc=no
+CONFIGURE_ARGS+=	--disable-ogg-vorbis
+.endif
+
+.if defined(WITH_LAME)
+CONFIGURE_ARGS+=	--enable-lame
+LIB_DEPENDS+=		mp3lame.0:${PORTSDIR}/audio/lame
+.else
+CONFIGURE_ARGS+=	--disable-lame
+.endif
+
+.if defined(WITH_MAD)
+CONFIGURE_ARGS+=	--enable-mad
+LIB_DEPENDS+=		mad.1:${PORTSDIR}/audio/mad
+.else
+CONFIGURE_ARGS+=	--disable-mad
+.endif
+
+pre-fetch:
+.if !defined(WITH_LAME)
+	@${ECHO_MSG} "You can enable mp3 encoding by defining WITH_LAME."
+.endif
+.if !defined(WITH_MAD)
+	@${ECHO_MSG} "You can enable mp3 decoding by defining WITH_MAD."
+.endif
+.if !defined(WITH_VORBIS)
+	@${ECHO_MSG} "You can enable Ogg Vorbis support by defining WITH_VORBIS."
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/audio/sox/distinfo b/audio/sox/distinfo
index 725226a..56cd023 100644
--- a/audio/sox/distinfo
+++ b/audio/sox/distinfo
@@ -1 +1 @@
-MD5 (sox-12.17.3.tar.gz) = 1b9998387616ce0638c8edd1145f9932
+MD5 (sox-12.17.4.tar.gz) = 39bdb64e06a8c456057e87eff7d0b339
diff --git a/audio/sox/files/patch-Makefile.in b/audio/sox/files/patch-Makefile.in
new file mode 100644
index 0000000..ed83c3b
--- /dev/null
+++ b/audio/sox/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in~	Sat Feb  8 08:39:19 2003
++++ Makefile.in	Thu Mar 27 22:24:53 2003
+@@ -28,7 +28,7 @@
+ GSM_LIB_1 = -lgsm
+ GSM_SUPPORT  = @GSM_SUPPORT@
+ 
+-CFLAGS	= @CFLAGS@ -I$(srcdir) -I$(builddir)
++CFLAGS	= @CFLAGS@ @CPPFLAGS@ -I$(srcdir) -I$(builddir)
+ LDFLAGS	= -L. -L./gsm @LDFLAGS@
+ LIBS	= -lst $(GSM_LIB_$(GSM_SUPPORT)) @LIBS@
+ 
diff --git a/audio/sox/files/patch-ac b/audio/sox/files/patch-ac
deleted file mode 100644
index 6bd7096..0000000
--- a/audio/sox/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in~	Wed Sep  5 11:06:01 2001
-+++ Makefile.in	Tue Oct  9 11:59:26 2001
-@@ -74,7 +74,7 @@
- 	$(CC) $(LDFLAGS) -o sox sox.o $(LIBS)
- 
- soxmix.o: sox.c
--	$(CC) $(CFLAGS) -DSOXMIX -c -o soxmix.o $<
-+	$(CC) $(CFLAGS) -DSOXMIX -c -o soxmix.o sox.c
- 
- soxmix: libst.a soxmix.o
- 	$(CC) $(LDFLAGS) -o soxmix soxmix.o $(LIBS)
diff --git a/audio/sox/files/patch-vorbis.c b/audio/sox/files/patch-vorbis.c
deleted file mode 100644
index ac14ee5..0000000
--- a/audio/sox/files/patch-vorbis.c
+++ /dev/null
@@ -1,17 +0,0 @@
-
-$FreeBSD$
-
---- vorbis.c.orig	Thu Jan 17 01:11:39 2002
-+++ vorbis.c	Thu Jan 17 01:13:07 2002
-@@ -337,9 +337,8 @@
- 	fprintf(stdout, "Channels: %d  Rate: %ld\n", ft->info.channels,
- 		rate);
- 
--	/* Set encoding to average bit rate of 128kbps with no min or max */
--	vorbis_encode_init(&ve->vi, ft->info.channels, ft->info.rate,
--			   -1, 128000, -1);
-+	/* Set encoding to average bit rate of 112kbps VBR */
-+	vorbis_encode_init_vbr(&ve->vi, ft->info.channels, ft->info.rate, 0.3f);
- 
- 	vorbis_analysis_init(&ve->vd, &ve->vi);
- 	vorbis_block_init(&ve->vd, &ve->vb);