From ddad79578fb18c7c0d77656af14a9fa69596a8ca Mon Sep 17 00:00:00 2001
From: lebel <lebel@openbsd.org>
Date: Wed, 17 Jul 2002 21:17:10 +0000
Subject: [PATCH] respect ${CC}.

---
 audio/timidity/Makefile             |  3 ++-
 audio/tosha/Makefile                |  4 ++--
 audio/wmix/Makefile                 |  3 ++-
 audio/wmtune/Makefile               |  3 ++-
 audio/wmtune/patches/patch-Makefile | 10 +++++-----
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/audio/timidity/Makefile b/audio/timidity/Makefile
index e3d5916da04..1ef56b180e5 100644
--- a/audio/timidity/Makefile
+++ b/audio/timidity/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2002/03/21 20:35:42 espie Exp $
+# $OpenBSD: Makefile,v 1.22 2002/07/17 21:22:01 lebel Exp $
 
 COMMENT=	"MIDI to WAV renderer and player"
 DISTNAME=	timidity-0.2i
@@ -33,6 +33,7 @@ MAKE_FLAGS+=-DSLANG
 LIB_DEPENDS+=slang.::devel/libslang
 .endif
 
+MAKE_ENV=	CC="${CC}"
 INSTALL_TARGET= install.all
 FAKE_FLAGS=PREFIX=${PREFIX} DESTDIR=${WRKINST} ${MAKE_FLAGS}
 
diff --git a/audio/tosha/Makefile b/audio/tosha/Makefile
index 6418f80f0c9..8e4dc146d08 100644
--- a/audio/tosha/Makefile
+++ b/audio/tosha/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2002/05/13 18:50:37 espie Exp $
+# $OpenBSD: Makefile,v 1.19 2002/07/17 21:17:10 lebel Exp $
 
 COMMENT=	"read CD digital audio data through the SCSI bus"
 DISTNAME=	tosha-0.6
@@ -13,6 +13,6 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=		${MASTER_SITE_FREEBSD_LOCAL:=markp/}
 
-MAKE_ENV=	SYSCONFDIR='${SYSCONFDIR}'
+MAKE_ENV=	SYSCONFDIR='${SYSCONFDIR}' CC="${CC}"
 
 .include <bsd.port.mk>
diff --git a/audio/wmix/Makefile b/audio/wmix/Makefile
index 2aec3228179..cb3d2da9cd1 100644
--- a/audio/wmix/Makefile
+++ b/audio/wmix/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2002/01/26 14:14:53 wilfried Exp $
+# $OpenBSD: Makefile,v 1.3 2002/07/17 21:17:10 lebel Exp $
 
 COMMENT=		'wm-dockapp; audio mixer'
 
@@ -18,6 +18,7 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=		${HOMEPAGE}software/
 
+MAKE_ENV=		CC="${CC}"
 USE_X11=		Yes
 NO_REGRESS=		Yes
 
diff --git a/audio/wmtune/Makefile b/audio/wmtune/Makefile
index 8fbf027544d..6467d7e8e84 100644
--- a/audio/wmtune/Makefile
+++ b/audio/wmtune/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2001/12/22 15:15:54 naddy Exp $
+# $OpenBSD: Makefile,v 1.6 2002/07/17 21:19:12 lebel Exp $
 
 COMMENT=	"premier dockable radio tuner"
 
@@ -17,6 +17,7 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=		${HOMEPAGE}dl/
 
+MAKE_ENV=		CC="${CC}"
 USE_X11=		Yes
 
 FLAVORS=		zoltrix
diff --git a/audio/wmtune/patches/patch-Makefile b/audio/wmtune/patches/patch-Makefile
index 517e518174e..208c9f77772 100644
--- a/audio/wmtune/patches/patch-Makefile
+++ b/audio/wmtune/patches/patch-Makefile
@@ -1,6 +1,6 @@
-$OpenBSD: patch-Makefile,v 1.2 2001/12/20 21:18:02 naddy Exp $
---- Makefile.orig	Mon Mar  1 16:01:17 1999
-+++ Makefile	Fri Dec  7 14:49:42 2001
+$OpenBSD: patch-Makefile,v 1.3 2002/07/17 21:19:12 lebel Exp $
+--- Makefile.orig	Mon Mar  1 06:01:17 1999
++++ Makefile	Wed Jul 17 17:01:14 2002
 @@ -1,24 +1,21 @@
 -RADIOCARD = 	ZOLTRIX # Can be RADIOTRACK, ZOLTRIX, KERNEL
 -INCDIR	=	-I/usr/X11R6/include
@@ -18,11 +18,11 @@ $OpenBSD: patch-Makefile,v 1.2 2001/12/20 21:18:02 naddy Exp $
  all: wmtune
  
 +.c.o:
-+	cc $(CFLAGS) -c $< -o $@
++	$(CC) $(CFLAGS) -c $< -o $@
 +
  wmtune: $(OBJS)
 -	cc -o wmtune $^ $(LIBDIR) $(LIBS)
-+	cc -o wmtune $(OBJS) $(LIBDIR) $(LIBS)
++	$(CC) -o wmtune $(OBJS) $(LIBDIR) $(LIBS)
  
  install:: all
 -	install -s -m 4755 -o root wmtune /usr/X11R6/bin