svn commit: r365024 - in head/audio/cutmp3: . files

[Adam Weinberger]

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