Updated diff, for use with the gsm update sent a few minutes ago.
Add audio/gsm to LIB_DEPENDS, to let sox always pull in the installed
libgsm instead of building its own version. Fix license markers now
that gsm has a clearer license.
Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/sox/Makefile,v
retrieving revision 1.40
diff -u -p -r1.40 Makefile
--- Makefile 16 Jan 2009 16:42:56 -0000 1.40
+++ Makefile 5 Apr 2009 17:18:45 -0000
@@ -3,17 +3,17 @@
COMMENT= Sound eXchange, the Swiss Army knife of audio manipulation
DISTNAME= sox-14.2.0
-PKGNAME= ${DISTNAME}p1
+PKGNAME= ${DISTNAME}p2
SHARED_LIBS += sox 0.0 # .0.0
SHARED_LIBS += sfx 0.0 # .0.0
CATEGORIES= audio
HOMEPAGE= http://sox.sourceforge.net/
-# GPLv2, but the included gsm library was originally distributed with an
-# incomplete license.
-PERMIT_PACKAGE_CDROM= no redistribution
+# GPLv2.
+# The libgsm issues have been fixed (see libgsm-1.0.13).
+PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
-PERMIT_DISTFILES_CDROM= no redistribution
+PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sox/}
@@ -27,7 +27,8 @@ LIB_DEPENDS= vorbis.>=6,vorbisenc.>=2,vo
mp3lame.>=2::audio/lame \
wavpack.>=0::audio/wavpack \
png.>=8::graphics/png \
- samplerate.>=2::audio/libsamplerate
+ samplerate.>=2::audio/libsamplerate \
+ gsm.>=1::audio/gsm
WANTLIB= c iconv m ogg sndio z
AUTOCONF_VERSION=2.62 # 2.63
