ports/116631: [PATCH] net/httping: fails to build when CFLAGS is set in /etc/make.conf

[Beat Gaetzi]

>Number:         116631
>Category:       ports
>Synopsis:       [PATCH] net/httping: fails to build when CFLAGS is set in /etc/make.conf
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Sep 25 17:50:00 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Beat Gätzi
>Release:        FreeBSD 6.2-RELEASE-p5 i386
>Organization:
>Environment:
System: FreeBSD daedalus.network.local 6.2-RELEASE-p5 FreeBSD 6.2-RELEASE-p5 #1: Wed Jun 6 22:22:54 CEST 2007 root at daedalus.network.local:/usr/obj/usr/src/sys/BEASTIE i386


	
>Description:
	When CFLAGS are set in /etc/make.conf httping fails to build.
	
>How-To-Repeat:
	Set CFLAGS in /etc/make.conf like:
	CFLAGS= -O -pipe

	Build net/httping:
	/usr/ports/net/httping/> make install clean
	===>  Extracting for httping-1.2.5
	=> MD5 Checksum OK for httping-1.2.5.tgz.
	=> SHA256 Checksum OK for httping-1.2.5.tgz.
	===>  Patching for httping-1.2.5
	===>  Configuring for httping-1.2.5
	===>  Building for httping-1.2.5
	cc -O -pipe  -c mem.c
	cc -O -pipe  -c http.c
	cc -O -pipe  -c io.c
	cc -O -pipe  -c str.c
	cc -O -pipe  -c error.c
	cc -O -pipe  -c utils.c
	cc -O -pipe  -c main.c
	main.c: In function `version':
	main.c:53: error: syntax error before "VERSION"
	main.c: In function `main':
	main.c:422: error: syntax error before "VERSION"
	*** Error code 1

	Stop in /usr/ports/net/httping/work/httping-1.2.5.
	*** Error code 1

	Stop in /usr/ports/net/httping.

	
>Fix:

	Apply this patch in the httping directory and rebuild the port:
	patch -p1 < /path-to-patch/httping.patch
	

--- httping.patch begins here ---
diff -Naur httping.ori/Makefile httping/Makefile
--- httping.ori/Makefile	Sat Sep 22 16:12:25 2007
+++ httping/Makefile	Tue Sep 25 18:38:24 2007
@@ -19,11 +19,6 @@
 MAN1=		httping.1
 PLIST_FILES=	bin/httping
 
-CFLAGS+=	-DVERSION=\\\"${PORTVERSION}\\\"
-
-post-patch:
-	@${REINPLACE_CMD} -E '/^(DEBUG|CFLAGS)/d' ${WRKSRC}/${MAKEFILE}
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MANPREFIX}/man/man1
diff -Naur httping.ori/files/patch-Makefile httping/files/patch-Makefile
--- httping.ori/files/patch-Makefile	Thu Jan  1 01:00:00 1970
+++ httping/files/patch-Makefile	Tue Sep 25 18:37:39 2007
@@ -0,0 +1,13 @@
+--- Makefile.ori	Thu Jul 26 10:00:31 2007
++++ Makefile	Tue Sep 25 18:36:53 2007
+@@ -14,9 +14,8 @@
+ 
+ include version
+ 
+-DEBUG=-g # -D_DEBUG
+ LDFLAGS+=-lssl -lcrypto $(DEBUG)
+-CFLAGS+=-O2 -Wall -DVERSION=\"$(VERSION)\" $(DEBUG)
++CFLAGS+=-DVERSION=\"$(VERSION)\"
+ 
+ OBJS=mem.o http.o io.o str.o error.o utils.o main.o tcp.o mssl.o res.o
+ 
--- httping.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: