From owner-freebsd-ports Sun Oct 21 12:30:14 2001 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 2CC5D37B405 for ; Sun, 21 Oct 2001 12:30:02 -0700 (PDT) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.4/8.11.4) id f9LJU2s70228; Sun, 21 Oct 2001 12:30:02 -0700 (PDT) (envelope-from gnats) Received: from dan.emsphone.com (dan.emsphone.com [199.67.51.101]) by hub.freebsd.org (Postfix) with ESMTP id 7F17437B401 for ; Sun, 21 Oct 2001 12:28:55 -0700 (PDT) Received: (from dan@localhost) by dan.emsphone.com (8.11.6/8.11.6) id f9LJSsO45551; Sun, 21 Oct 2001 14:28:54 -0500 (CDT) (envelope-from dan) Message-Id: <200110211928.f9LJSsO45551@dan.emsphone.com> Date: Sun, 21 Oct 2001 14:28:54 -0500 (CDT) From: Dan Nelson To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/31413: Maintainer Update: audio/sox Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 31413 >Category: ports >Synopsis: Maintainer Update: audio/sox >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Oct 21 12:30:01 PDT 2001 >Closed-Date: >Last-Modified: >Originator: Dan Nelson >Release: FreeBSD 5.0-CURRENT i386 >Organization: The Allant Group >Environment: System: FreeBSD dan.emsphone.com 5.0-CURRENT FreeBSD 5.0-CURRENT #118: Wed Oct 3 18:31:56 CDT 2001 zsh@dan.emsphone.com:/usr/src/sys/i386/compile/DANSMP i386 >Description: * Unbreak alpha, and prepare for other 64-bit platforms (misordered includes, always use int32_t instead of long) * Add WITH_VORBIS build option, and fix WITH_GSM * bump PORTREVISION Submitted by: Christian Weisgerber >How-To-Repeat: >Fix: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/audio/sox/Makefile,v retrieving revision 1.18 diff -u -r1.18 Makefile --- Makefile 11 Oct 2001 11:16:31 -0000 1.18 +++ Makefile 21 Oct 2001 19:18:57 -0000 @@ -7,6 +7,7 @@ PORTNAME= sox PORTVERSION= 12.17.2 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= sox @@ -19,8 +20,19 @@ CONFIGURE_ARGS= --enable-fast-ulaw --enable-fast-alaw .if defined(WITH_GSM) -CONFIGURE_ARGS+= --with-gsmlib=${PREFIX}/lib --with-gsminc=${PREFIX}/include +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 Index: files/patch-ad =================================================================== RCS file: files/patch-ad diff -N files/patch-ad --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-ad 21 Oct 2001 18:46:22 -0000 @@ -0,0 +1,15 @@ + +$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 + #include + #include +-#include "ima_rw.h" + #include "st.h" ++#include "ima_rw.h" + + /* + * Index: files/patch-ae =================================================================== RCS file: files/patch-ae diff -N files/patch-ae --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-ae 21 Oct 2001 18:46:22 -0000 @@ -0,0 +1,20 @@ + +$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 /* 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 >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message