svn commit: r365000 - in head/misc/tempcontrol: . files

[Adam Weinberger]

Author: adamw
Date: Fri Aug 15 16:54:04 2014
New Revision: 365000
URL: http://svnweb.freebsd.org/changeset/ports/365000
QAT: https://qat.redports.org/buildarchive/r365000/

Log:
  Properly fix build on -current.

Added:
  head/misc/tempcontrol/files/
  head/misc/tempcontrol/files/patch-Makefile   (contents, props changed)
Modified:
  head/misc/tempcontrol/Makefile

Modified: head/misc/tempcontrol/Makefile
==============================================================================
--- head/misc/tempcontrol/Makefile	Fri Aug 15 16:46:38 2014	(r364999)
+++ head/misc/tempcontrol/Makefile	Fri Aug 15 16:54:04 2014	(r365000)
@@ -12,8 +12,6 @@ COMMENT=	Temperature control for ferment
 LICENSE=	BSD2CLAUSE
 
 USES=		readline
-MAKE_ARGS=	CFLAGS="${CFLAGS} -Wall -Wno-parentheses ${CPPFLAGS}" \
-		LFLAGS="${LDFLAGS}"
 NO_WRKSUBDIR=	yes
 
 PLIST_FILES=	bin/tempcontrol share/tempcontrol/temperaturecontrolrc.sample \
@@ -26,7 +24,7 @@ OPTIONS_DEFINE=	DOCS
 
 # Must (re)generate depedencies, otherwise parallel builds would not work
 pre-build:
-	${MAKE_CMD} -C ${WRKSRC} depend
+	${DO_MAKE_BUILD} -C ${WRKSRC} depend
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tempcontrol ${STAGEDIR}${PREFIX}/bin/

Added: head/misc/tempcontrol/files/patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/misc/tempcontrol/files/patch-Makefile	Fri Aug 15 16:54:04 2014	(r365000)
@@ -0,0 +1,20 @@
+--- Makefile.orig	2006-01-25 18:03:13.000000000 -0500
++++ Makefile	2014-08-15 12:53:03.000000000 -0400
+@@ -39,7 +39,7 @@
+ 
+ # Where to install the startup script
+ RCDIR	=	/usr/local/etc/rc.d
+-CFLAGS	=	-g -O3 -Wall -Wno-parentheses ${INCLUDES}
++CFLAGS	+=	-g -Wall -Wno-parentheses ${CPPFLAGS}
+ 
+ LINK=gcc
+ LFLAGS= -g
+@@ -88,7 +88,7 @@
+ .FORCE:
+ 
+ tempcontrol:	${OBJS}
+-	${CC} -o $@ ${CFLAGS} ${OBJS} -lreadline -lcurses -lutil
++	${CC} -o $@ ${CFLAGS} ${OBJS} ${LDFLAGS} -lreadline -lcurses -lutil
+ 
+ clean:
+ 	rm -f *~ myparser* parser.h parserc.h parsercommands.c.sample parserkeys.h *.o ${PROG}