From 94c5bc3c6f35b9b3c976df47a6903da1e3f3d370 Mon Sep 17 00:00:00 2001 From: brad Date: Thu, 3 Jun 1999 20:42:39 +0000 Subject: [PATCH] make the port respect CC and CFLAGS --- audio/sox/Makefile | 7 +++---- audio/sox/patches/patch-ab | 13 ++++++++++--- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/audio/sox/Makefile b/audio/sox/Makefile index fb8cd1d3613..87dc04ff40c 100644 --- a/audio/sox/Makefile +++ b/audio/sox/Makefile @@ -1,13 +1,12 @@ -# $OpenBSD: Makefile,v 1.5 1999/04/01 02:57:51 brad Exp $ +# $OpenBSD: Makefile,v 1.6 1999/06/03 20:42:39 brad Exp $ DISTNAME= sox-12.15 CATEGORIES= audio - -MAINTAINER= angelos@openbsd.org - MASTER_SITES= http://metalab.unc.edu/pub/Linux/apps/sound/convert/ \ http://home.sprynet.com/~cbagwell/ +MAINTAINER= angelos@openbsd.org + MAKEFILE= Makefile.unx do-install: diff --git a/audio/sox/patches/patch-ab b/audio/sox/patches/patch-ab index ecd2d94f111..e32a452f4e9 100644 --- a/audio/sox/patches/patch-ab +++ b/audio/sox/patches/patch-ab @@ -1,11 +1,11 @@ --- Makefile.unx.orig Wed Sep 30 23:06:13 1998 -+++ Makefile.unx Sun Mar 21 20:17:35 1999 ++++ Makefile.unx Thu Jun 3 16:28:24 1999 @@ -95,7 +95,7 @@ # Chose the best compiler you got from the following: # # GCC with all warnings and debug info -CC = gcc -g -Wall -+CC = cc ++# CC = gcc -g -Wall # # GCC with no special options # CC = gcc @@ -18,7 +18,7 @@ # Uncomment the following if your system does not have a built in # strerror(). This includes SunOS. -@@ -217,7 +217,7 @@ +@@ -217,13 +217,13 @@ ############################################################################## SOX_PRE_LIBS = $(GSM_PRE_LIBS) @@ -27,3 +27,10 @@ SOX_INCLUDES = $(GSM_INCLUDES) SOX_DEFINES = $(GSM_DEFINES) $(OSS_DEFINES) $(SUNAUDIO_DEFINES) \ $(BLASTER) $(GETOPT_DEFINES) $(STRERR_DEFINES) $(MEMMOVE_DEFINES) \ + $(NEXT_DEFINES) $(MAC_DEFINES) $(MISC_DEFINES) + +-CFLAGS = $O $(SOX_DEFINES) $(SOX_INCLUDES) ++CFLAGS += $(SOX_DEFINES) $(SOX_INCLUDES) + + all: sox +