From owner-svn-ports-all@FreeBSD.ORG  Fri Aug 15 19:09:18 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id BC44DB3D;
 Fri, 15 Aug 2014 19:09:18 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A786D2CD6;
 Fri, 15 Aug 2014 19:09:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7FJ9Iox032187;
 Fri, 15 Aug 2014 19:09:18 GMT (envelope-from adamw@FreeBSD.org)
Received: (from adamw@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7FJ9Ijh032185;
 Fri, 15 Aug 2014 19:09:18 GMT (envelope-from adamw@FreeBSD.org)
Message-Id: <201408151909.s7FJ9Ijh032185@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: adamw set sender to
 adamw@FreeBSD.org using -f
From: Adam Weinberger <adamw@FreeBSD.org>
Date: Fri, 15 Aug 2014 19:09:18 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r365024 - in head/audio/cutmp3: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 15 Aug 2014 19:09:18 -0000

Author: adamw
Date: Fri Aug 15 19:09:17 2014
New Revision: 365024
URL: http://svnweb.freebsd.org/changeset/ports/365024
QAT: https://qat.redports.org/buildarchive/r365024/

Log:
  Fix build on -current and do a better job of honouring ${CC}.

Modified:
  head/audio/cutmp3/Makefile
  head/audio/cutmp3/files/patch-Makefile

Modified: head/audio/cutmp3/Makefile
==============================================================================
--- head/audio/cutmp3/Makefile	Fri Aug 15 19:03:27 2014	(r365023)
+++ head/audio/cutmp3/Makefile	Fri Aug 15 19:09:17 2014	(r365024)
@@ -18,9 +18,6 @@ PORTDOCS=	README README.timetable USAGE
 
 OPTIONS_DEFINE=	DOCS
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|gcc|${CC}|g' ${WRKSRC}/Makefile
-
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}

Modified: head/audio/cutmp3/files/patch-Makefile
==============================================================================
--- head/audio/cutmp3/files/patch-Makefile	Fri Aug 15 19:03:27 2014	(r365023)
+++ head/audio/cutmp3/files/patch-Makefile	Fri Aug 15 19:09:17 2014	(r365024)
@@ -17,9 +17,9 @@
 -	gcc -O ${CFLAGS} -c mpglib.c
 -	gcc -O ${CFLAGS} -c main.c
 -	gcc main.o mpglib.o -o ${NAME} -lm -lreadline -lncurses
-+	cc -O ${CFLAGS} -c mpglib.c
-+	cc -O ${CFLAGS} -c main.c
-+	cc main.o mpglib.o -o ${NAME} -lm -lreadline -lncurses
++	${CC} ${CFLAGS} ${CPPFLAGS} -c mpglib.c
++	${CC} ${CFLAGS} ${CPPFLAGS} -c main.c
++	${CC} ${CFLAGS} main.o mpglib.o -o ${NAME} ${LDFLAGS} -lm -lreadline -lncurses
  
  i386:
 -	gcc -Wall -O -c mpglib.c