From owner-svn-ports-all@FreeBSD.ORG  Tue Dec 25 08:30:09 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 6E14C7B4;
 Tue, 25 Dec 2012 08:30:09 +0000 (UTC)
 (envelope-from kevlo@FreeBSD.org)
Received: from ns.kevlo.org (kevlo.org [220.128.136.52])
 by mx1.freebsd.org (Postfix) with ESMTP id DCF6B8FC14;
 Tue, 25 Dec 2012 08:30:08 +0000 (UTC)
Received: from [127.0.0.1] (git.kevlo.org [220.128.136.52])
 by ns.kevlo.org (8.14.5/8.14.5) with ESMTP id qBP8Tm93035731;
 Tue, 25 Dec 2012 16:29:49 +0800 (CST)
 (envelope-from kevlo@FreeBSD.org)
Message-ID: <1356424205.2276.0.camel@nsl>
Subject: Re: svn commit: r309459 - head/devel/gccmakedep
From: Kevin Lo <kevlo@FreeBSD.org>
To: Jan Beich <jbeich@tormail.org>
Date: Tue, 25 Dec 2012 16:30:05 +0800
In-Reply-To: <1TnLUj-000DWe-DJ@internal.tormail.org>
References: <201212241325.qBODPXhN013126@svn.freebsd.org>
 <1TnLUj-000DWe-DJ@internal.tormail.org>
Content-Type: text/plain; charset="UTF-8"
X-Mailer: Evolution 3.2.3-0ubuntu6 
Content-Transfer-Encoding: 7bit
Mime-Version: 1.0
Cc: svn-ports-head@FreeBSD.org, svn-ports-all@FreeBSD.org,
 ports-committers@FreeBSD.org, Niclas Zeising <zeising@FreeBSD.org>
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: Tue, 25 Dec 2012 08:30:09 -0000

Jan Beich wrote:
> Niclas Zeising <zeising@FreeBSD.org> writes:
> 
> > Author: zeising
> > Date: Mon Dec 24 13:25:33 2012
> > New Revision: 309459
> > URL: http://svnweb.freebsd.org/changeset/ports/309459
> >
> > Log:
> >   Attempt to fix build when clang is used.
> >   Add depenency on ucpp and use that as cpp when clang is cc. [1]
> >   While here, trim makefile headers. [2]
> >   
> >   Submitted by:	kevlo [1], zeising [2]
> >   Approved by:	kwm, miwi (mentors, implicit)
> [...]
> > -.include <bsd.port.mk>
> > +.include <bsd.port.pre.mk>
> > +
> > +.if defined(CC) && ${CC:T:M*clang*} == "clang" || ${OSVERSION} >= 1000024
> > +BUILD_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
> > +RUN_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
> > +CONFIGURE_ENV+=	ac_cv_path_RAWCPP="ucpp -s"
> > +.endif
> > +
> > +.include <bsd.port.post.mk>
> 
> Leaving runtime broken?
> 
>   $ gccmakedep
>   cc: error: no input files
>   /usr/local/bin/gccmakedep: rm -f: not found
>   usage: ln [-s [-F] | -L | -P] [-f | -i] [-hnv] source_file [target_file]
>          ln [-s [-F] | -L | -P] [-f | -i] [-hnv] source_file ... target_dir
>          link source_file target_file
>   usage: mv [-f | -i | -n] [-hv] source target
>          mv [-f | -i | -n] [-v] source ... directory
>   /usr/local/bin/gccmakedep: mdep33211.tmp: not found
> 
> Notice that devel/imake tries to clean up after ucpp:
> 
>   ${REINPLACE_CMD} -e 's|^configdirspec= *|configdirspec=|' ${WRKSRC}/xmkmf

Here's the diff to fix it.

Index: Makefile
===================================================================
--- Makefile    (revision 309469)
+++ Makefile    (working copy)
@@ -20,6 +20,12 @@ PLIST_FILES= bin/gccmakedep
 BUILD_DEPENDS+=        ucpp:${PORTSDIR}/devel/ucpp
 RUN_DEPENDS+=  ucpp:${PORTSDIR}/devel/ucpp
 CONFIGURE_ENV+=        ac_cv_path_RAWCPP="ucpp -s"
+
+post-build:
+       ${REINPLACE_CMD} -e 's|^CC= *|CC=|' \
+               -e 's|^RM= *|RM=|' \
+               -e 's|^LN= *|LN=|' \
+               -e 's|^MV= *|MV=|' ${WRKSRC}/gccmakedep
 .endif
 
 .include <bsd.port.post.mk>