Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/audio/sox/Makefile,v
retrieving revision 1.33
diff -u -r1.33 Makefile
--- Makefile	2 Jun 2006 15:24:21 -0000	1.33
+++ Makefile	4 Sep 2006 11:33:08 -0000
@@ -6,54 +6,66 @@
 #
 
 PORTNAME=	sox
-PORTVERSION=	12.18.1
+PORTVERSION=	12.18.2
 CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	dnelson@allantgroup.com
 COMMENT=	SOund eXchange - universal sound sample translator
 
 CONFLICTS=	play-[0-9]*
 
-MAN1=			sox.1 play.1 soxexam.1
-MLINKS=			play.1 rec.1 sox.1 soxmix.1
-GNU_CONFIGURE=		yes
-MAKE_ENV=		PLAY_SUPPORT=1
+MAN1=		sox.1 play.1 soxexam.1
+MLINKS=		play.1 rec.1 sox.1 soxmix.1
+GNU_CONFIGURE=	yes
+MAKE_ENV=	PLAY_SUPPORT=1
 
 OPTIONS=	LAME "Enable mp3 encoding with LAME" off \
 		MAD "Enable mp3 decoding with MAD" off \
-		VORBIS "Enable Ogg Vorbis support" off
+		VORBIS "Enable Ogg Vorbis support" off \
+		GSM "Enable GSM audio codec support" off
 
 PLIST_FILES=	bin/sox bin/soxmix bin/rec bin/play
+CONFIGURE_ARGS=	--disable-alsa-dsp --disable-sun-audio
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_VORBIS) || defined(WITH_LAME) || defined(WITH_MAD)
+.if defined(WITH_VORBIS) || defined(WITH_LAME) || defined(WITH_MAD) || defined(WITH_GSM)
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV+=	CPPFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 .endif
 
-.if defined(WITH_VORBIS)
+.ifdef	WITH_VORBIS
 CONFIGURE_ARGS+=	--enable-ogg-vorbis
 LIB_DEPENDS+=		vorbis.3:${PORTSDIR}/audio/libvorbis
 .else
 CONFIGURE_ARGS+=	--disable-ogg-vorbis
 .endif
 
-.if defined(WITH_LAME)
+.ifdef	WITH_LAME
 CONFIGURE_ARGS+=	--enable-lame
 LIB_DEPENDS+=		mp3lame.0:${PORTSDIR}/audio/lame
 .else
 CONFIGURE_ARGS+=	--disable-lame
 .endif
 
-.if defined(WITH_MAD)
+.ifdef	WITH_MAD
 CONFIGURE_ARGS+=	--enable-mad
 LIB_DEPENDS+=		mad.2:${PORTSDIR}/audio/libmad
 .else
 CONFIGURE_ARGS+=	--disable-mad
 .endif
 
+.ifdef	WITH_GSM
+CONFIGURE_ARGS+=	--enable-external-gsm
+LIB_DEPENDS+=		gsm.1:${PORTSDIR}/audio/gsm
+.else
+CONFIGURE_ARGS+=	--disable-external-gsm --disable-gsm
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -Ee 's![[:<:]]gsm/!!' ${WRKSRC}/configure ${WRKSRC}/src/Makefile.gcc \
+		${WRKSRC}/src/gsm.c ${WRKSRC}/src/wav.c
+
 .include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/audio/sox/distinfo,v
retrieving revision 1.14
diff -u -r1.14 distinfo
--- distinfo	2 Jun 2006 15:24:21 -0000	1.14
+++ distinfo	4 Sep 2006 11:33:08 -0000
@@ -1,3 +1,3 @@
-MD5 (sox-12.18.1.tar.gz) = b12507493d3c8571fa8b6e70a01d5438
-SHA256 (sox-12.18.1.tar.gz) = 2fc7bb73436e152a6cdd932bb772f13cc773da9596a45d17a64d88fa6726c283
-SIZE (sox-12.18.1.tar.gz) = 473181
+MD5 (sox-12.18.2.tar.gz) = ba25e512a6c824d6e56d76767a18af99
+SHA256 (sox-12.18.2.tar.gz) = 832bf98c95580af879fe51311c861ba7c57f07a5791628108ef29a027f0271ff
+SIZE (sox-12.18.2.tar.gz) = 486814
Index: files/patch-Makefile.in
===================================================================
RCS file: files/patch-Makefile.in
diff -N files/patch-Makefile.in
--- files/patch-Makefile.in	2 Jun 2006 15:24:22 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
---- ./Makefile.in.orig	Mon Nov  8 01:37:20 2004
-+++ ./Makefile.in	Fri Jun  2 10:55:50 2006
-@@ -30,6 +30,9 @@
- PLAY_INSTALL_0 =
- PLAY_INSTALL_1  = install-play
- 
-+PLAY_INSTALL_0  =
-+PLAY_INSTALL_1  = install-play
-+
- install: $(PLAY_INSTALL_$(PLAY_SUPPORT))
- 	cd src && $(MAKE) $@
- 	$(srcdir)/mkinstalldirs $(mandir)/man1