From owner-svn-ports-all@FreeBSD.ORG  Thu May  2 07:12:13 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id B0A67796;
 Thu,  2 May 2013 07:12:13 +0000 (UTC) (envelope-from hrs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id A38E518AB;
 Thu,  2 May 2013 07:12:13 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r427CDvr028718;
 Thu, 2 May 2013 07:12:13 GMT (envelope-from hrs@svn.freebsd.org)
Received: (from hrs@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r427CDCt028715;
 Thu, 2 May 2013 07:12:13 GMT (envelope-from hrs@svn.freebsd.org)
Message-Id: <201305020712.r427CDCt028715@svn.freebsd.org>
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Thu, 2 May 2013 07:12:13 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r317079 - in head/print/c2ps: . 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.14
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: Thu, 02 May 2013 07:12:13 -0000

Author: hrs
Date: Thu May  2 07:12:12 2013
New Revision: 317079
URL: http://svnweb.freebsd.org/changeset/ports/317079

Log:
  Fix a build breakage when CFLAGS is defined in make.conf.
  
  PR:	ports/178292

Modified:
  head/print/c2ps/Makefile
  head/print/c2ps/files/patch-Makefile

Modified: head/print/c2ps/Makefile
==============================================================================
--- head/print/c2ps/Makefile	Thu May  2 07:09:17 2013	(r317078)
+++ head/print/c2ps/Makefile	Thu May  2 07:12:12 2013	(r317079)
@@ -13,7 +13,7 @@ COMMENT=	A PostScript pretty-printer for
 
 LIB_DEPENDS=	paper:${PORTSDIR}/print/libpaper
 
-CFLAGS+=	-I${LOCALBASE}/include
+MAKE_ENV=	CCFLAGS="${CFLAGS} -I${LOCALBASE}/include"
 MAN1=		c2ps.1
 PLIST_FILES=	bin/c2ps
 

Modified: head/print/c2ps/files/patch-Makefile
==============================================================================
--- head/print/c2ps/files/patch-Makefile	Thu May  2 07:09:17 2013	(r317078)
+++ head/print/c2ps/files/patch-Makefile	Thu May  2 07:12:12 2013	(r317079)
@@ -1,5 +1,5 @@
 --- Makefile.orig	1997-05-16 00:50:56.000000000 +0900
-+++ Makefile	2013-04-27 18:57:47.000000000 +0900
++++ Makefile	2013-05-02 15:48:59.000000000 +0900
 @@ -2,12 +2,12 @@
  # Last modified: Sat Apr 19 1997
  
@@ -39,7 +39,7 @@
  
  compile:	c2ps.c
 -	$(CC) $(PREP_OPTIONS) $(CCFLAGS) -o c2ps c2ps.c
-+	$(CC) $(PREP_OPTIONS) $(CFLAGS) -o c2ps c2ps.c -L${LOCALBASE}/lib -lm -lpaper
++	$(CC) $(PREP_OPTIONS) $(CCFLAGS) -o c2ps c2ps.c -L${LOCALBASE}/lib -lm -lpaper
  
  clean:
  	$(RM) c2ps *.o core *~