From ahze@gentoo.ahze.net  Sun Apr  4 23:36:54 2004
Return-Path: <ahze@gentoo.ahze.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 943FA16A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  4 Apr 2004 23:36:54 -0700 (PDT)
Received: from gentoo.ahze.net (adsl-068-209-163-003.sip.clt.bellsouth.net [68.209.163.3])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A3EE243D31
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  4 Apr 2004 23:36:53 -0700 (PDT)
	(envelope-from ahze@gentoo.ahze.net)
Received: from gentoo.ahze.net (localhost [127.0.0.1])
	by gentoo.ahze.net (8.12.11/8.12.11) with ESMTP id i356bJR3071720;
	Mon, 5 Apr 2004 02:37:19 -0400 (EDT)
	(envelope-from ahze@gentoo.ahze.net)
Received: (from root@localhost)
	by gentoo.ahze.net (8.12.11/8.12.11/Submit) id i356bJmV071694;
	Mon, 5 Apr 2004 02:37:19 -0400 (EDT)
	(envelope-from ahze)
Message-Id: <200404050637.i356bJmV071694@gentoo.ahze.net>
Date: Mon, 5 Apr 2004 02:37:19 -0400 (EDT)
From: michael johnson <ahze@ahze.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: rooneg@electricjellyfish.net
Subject: [PATCH] misc/dog: [CC does not work from /etc/make.conf]
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         65196
>Category:       ports
>Synopsis:       [PATCH] misc/dog: [CC does not work from /etc/make.conf]
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Apr 04 23:40:08 PDT 2004
>Closed-Date:    Tue Apr 06 07:07:33 PDT 2004
>Last-Modified:  Tue Apr 06 07:07:33 PDT 2004
>Originator:     michael johnson
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD gentoo.ahze.net 5.2-CURRENT FreeBSD 5.2-CURRENT #37: Sat Mar 27 18:30:44 EST 2004
>Description:
CC does not work from /etc/make but it works in "make CC=XXX"

Port maintainer (rooneg@electricjellyfish.net) is cc'd.

Generated with FreeBSD Port Tools 0.50
>How-To-Repeat:
>Fix:

--- dog-1.7_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/misc/dog/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- Makefile	6 Feb 2004 13:11:46 -0000	1.5
+++ Makefile	5 Apr 2004 06:33:30 -0000
@@ -15,9 +15,14 @@
 
 USE_GMAKE=	yes
 ALL_TARGET=	dog
+USE_REINPLACE=	yes
 
 MAN1=		dog.1
 PLIST_FILES=	bin/dog
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|-O3 -Wall|${CFLAGS}|; s|gcc|${CC}|' \
+		${WRKSRC}/${MAKEFILE}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/dog ${PREFIX}/bin/
Index: files/patch-aa
===================================================================
RCS file: /home/ncvs/ports/misc/dog/files/patch-aa,v
retrieving revision 1.1
diff -u -r1.1 patch-aa
--- files/patch-aa	10 Jun 2000 05:45:34 -0000	1.1
+++ files/patch-aa	5 Apr 2004 06:34:32 -0000
@@ -1,24 +0,0 @@
---- Makefile	Tue Jul 13 14:32:24 1999
-+++ Makefile.new	Sat Jun 10 01:27:09 2000
-@@ -13,17 +13,18 @@
- 
- INSTALL = /usr/bin/install -c
- OBJS = dog.o getopt.o getopt1.o
--CFLAGS = -O3 -Wall
-+CC ?= cc
-+CFLAGS ?= -O -pipe
- 
- prefix = /usr/local
- bindir = ${prefix}/bin
- mandir = ${prefix}/man
- 
- %.o: %.c
--	gcc ${CFLAGS} -c $< -o $@
-+	$(CC) ${CFLAGS} -c $< -o $@
- 
- dog:	${OBJS}
--	gcc ${CFLAGS} -o dog ${OBJS}
-+	$(CC) ${CFLAGS} -o dog ${OBJS}
- 
- install:	dog
- 	$(INSTALL) -m 644 dog.1 ${mandir}/man1
--- dog-1.7_1.patch ends here ---

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: krion 
State-Changed-When: Tue Apr 6 07:07:28 PDT 2004 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=65196 
>Unformatted:
