Date: Wed, 16 Jul 2003 21:23:11 -0500 (CDT) From: Dan Nelson <dnelson@allantgroup.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/54562: [PATCH] maintainer update sox to 12.17.4 Message-ID: <200307170223.h6H2NB4K076215@dan.emsphone.com> Resent-Message-ID: <200307170230.h6H2U8G2016587@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 54562
>Category: ports
>Synopsis: [PATCH] maintainer update sox to 12.17.4
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed Jul 16 19:30:07 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Dan Nelson
>Release: FreeBSD 5.1-CURRENT i386
>Organization:
The Allant Group
>Environment:
System: FreeBSD dan.emsphone.com 5.1-CURRENT FreeBSD 5.1-CURRENT #278: Fri Jul 11 15:17:44 CDT 2003 dan@dan.emsphone.com:/usr/src/sys/i386/compile/DANSMP i386
>Description:
>How-To-Repeat:
>Fix:
Update to 12.17.4
Update MAINTAINER address
Add WITH_* variables
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/audio/sox/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- Makefile 21 Feb 2003 10:59:34 -0000 1.22
+++ Makefile 17 Jul 2003 02:11:01 -0000
@@ -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>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/audio/sox/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo 17 Jan 2002 19:22:41 -0000 1.7
+++ distinfo 28 Mar 2003 04:00:42 -0000
@@ -1 +1 @@
-MD5 (sox-12.17.3.tar.gz) = 1b9998387616ce0638c8edd1145f9932
+MD5 (sox-12.17.4.tar.gz) = 39bdb64e06a8c456057e87eff7d0b339
Index: files/patch-Makefile.in
===================================================================
RCS file: files/patch-Makefile.in
diff -N files/patch-Makefile.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-Makefile.in 28 Mar 2003 04:25:13 -0000
@@ -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@
+
Index: files/patch-ac
===================================================================
RCS file: files/patch-ac
diff -N files/patch-ac
--- files/patch-ac 11 Oct 2001 11:16:32 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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)
Index: files/patch-vorbis.c
===================================================================
RCS file: files/patch-vorbis.c
diff -N files/patch-vorbis.c
--- files/patch-vorbis.c 17 Jan 2002 19:22:41 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-
-$FreeBSD: ports/audio/sox/files/patch-vorbis.c,v 1.1 2002/01/17 19:22:41 naddy Exp $
-
---- 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);
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200307170223.h6H2NB4K076215>