Attachment #17287 for bug #31413

View | Details | Raw Unified | Return to bug 31413
Collapse All | Expand All





PORTNAME=	sox
PORTVERSION=	12.17.2
PORTREVISION=	1
CATEGORIES=	audio
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	sox

CONFIGURE_ARGS=	--enable-fast-ulaw --enable-fast-alaw

.if defined(WITH_GSM)
CONFIGURE_ARGS+= --with-gsmlib=${LOCALBASE}/lib \
		 --with-gsminc=${LOCALBASE}/include
LIB_DEPENDS+=	gsm.1:${PORTSDIR}/audio/gsm
.else
CONFIGURE_ARGS+= --with-gsminc=no
.endif

.if defined(WITH_VORBIS)
CONFIGURE_ARGS+= --with-ogg-vorbisinc=${LOCALBASE}/include \
		 --with-ogg-vorbislib=${LOCALBASE}/lib
LIB_DEPENDS+=	vorbis.0:${PORTSDIR}/audio/libvorbis
.else
CONFIGURE_ARGS+= --with-ogg-vorbisinc=no
.endif

.include <bsd.port.mk>





$FreeBSD$

--- ima_rw.c.orig	Sun Oct 21 00:11:17 2001
+++ ima_rw.c	Sun Oct 21 00:11:25 2001
@@ -23,8 +23,8 @@
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "ima_rw.h"
 #include "st.h"
+#include "ima_rw.h"
 
 /*
  *





$FreeBSD$

--- st.h.orig	Sun Oct 21 00:13:45 2001
+++ st.h	Sun Oct 21 00:13:56 2001
@@ -33,14 +33,9 @@
 #define st_free free
 
 /* FIXME: Move to separate header */
-#ifdef __alpha__
 #include <sys/types.h>   /* To get defines for 32-bit integers */
 #define LONG    int32_t
 #define ULONG   u_int32_t
-#else
-#define LONG    long
-#define ULONG   unsigned long
-#endif
 
 #define MAXLONG 0x7fffffffL
 #define MAXULONG 0xffffffffL

Return to bug 31413

Lines 7-12 Link Here

(-)Makefile (-1 / +13 lines)
7		7
8	PORTNAME= sox	8	PORTNAME= sox
9	PORTVERSION= 12.17.2	9	PORTVERSION= 12.17.2
		10	PORTREVISION= 1
10	CATEGORIES= audio	11	CATEGORIES= audio
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= sox	13	MASTER_SITE_SUBDIR= sox
Lines 19-26 Link Here
19	CONFIGURE_ARGS= --enable-fast-ulaw --enable-fast-alaw	20	CONFIGURE_ARGS= --enable-fast-ulaw --enable-fast-alaw
20		21
21	.if defined(WITH_GSM)	22	.if defined(WITH_GSM)
22	CONFIGURE_ARGS+= --with-gsmlib=${PREFIX}/lib --with-gsminc=${PREFIX}/include	23	CONFIGURE_ARGS+= --with-gsmlib=${LOCALBASE}/lib \
		24	--with-gsminc=${LOCALBASE}/include
23	LIB_DEPENDS+= gsm.1:${PORTSDIR}/audio/gsm	25	LIB_DEPENDS+= gsm.1:${PORTSDIR}/audio/gsm
		26	.else
		27	CONFIGURE_ARGS+= --with-gsminc=no
		28	.endif
		29
		30	.if defined(WITH_VORBIS)
		31	CONFIGURE_ARGS+= --with-ogg-vorbisinc=${LOCALBASE}/include \
		32	--with-ogg-vorbislib=${LOCALBASE}/lib
		33	LIB_DEPENDS+= vorbis.0:${PORTSDIR}/audio/libvorbis
		34	.else
		35	CONFIGURE_ARGS+= --with-ogg-vorbisinc=no
24	.endif	36	.endif
25		37
26	.include <bsd.port.mk>	38	.include <bsd.port.mk>

Added Link Here

(-)files/patch-ad (+15 lines)
1
2	$FreeBSD$
3
4	--- ima_rw.c.orig Sun Oct 21 00:11:17 2001
5	+++ ima_rw.c Sun Oct 21 00:11:25 2001
6	@@ -23,8 +23,8 @@
7	#include <math.h>
8	#include <stdio.h>
9	#include <stdlib.h>
10	-#include "ima_rw.h"
11	#include "st.h"
12	+#include "ima_rw.h"
13
14	/*
15	*

Added Link Here

(-)files/patch-ae (+20 lines)
1
2	$FreeBSD$
3
4	--- st.h.orig Sun Oct 21 00:13:45 2001
5	+++ st.h Sun Oct 21 00:13:56 2001
6	@@ -33,14 +33,9 @@
7	#define st_free free
8
9	/* FIXME: Move to separate header */
10	-#ifdef __alpha__
11	#include <sys/types.h> /* To get defines for 32-bit integers */
12	#define LONG int32_t
13	#define ULONG u_int32_t
14	-#else
15	-#define LONG long
16	-#define ULONG unsigned long
17	-#endif
18
19	#define MAXLONG 0x7fffffffL
20	#define MAXULONG 0xffffffffL