svn commit: r330725 - in head/games/heretic: . files

[Baptiste Daroussin]

On Fri, Oct 18, 2013 at 07:05:40AM +0000, Oliver Lehmann wrote:
> Author: oliver
> Date: Fri Oct 18 07:05:40 2013
> New Revision: 330725
> URL: http://svnweb.freebsd.org/changeset/ports/330725
> 
> Log:
>   fix build with clang by removing the forced set of CC
> 
> Modified:
>   head/games/heretic/Makefile   (contents, props changed)
>   head/games/heretic/files/patch-aj   (contents, props changed)
> 
> Modified: head/games/heretic/Makefile
> ==============================================================================
> --- head/games/heretic/Makefile	Fri Oct 18 06:41:42 2013	(r330724)
> +++ head/games/heretic/Makefile	Fri Oct 18 07:05:40 2013	(r330725)
> @@ -55,7 +55,7 @@ PLIST_SUB=	WAD:="@comment "
>  
>  post-extract:
>  .if ${PORT_OPTIONS:MWAD}
> -	@${GZIP_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/heretic_share.wad.gz \
> +	@${GZIP_CMD} -dc ${_DISTDIR}/heretic_share.wad.gz \
>  		> ${WRKSRC}/heretic_share.wad
>  .endif
>  	@${FIND} ${WRKSRC} -name .depend -type f -delete
> 
> Modified: head/games/heretic/files/patch-aj
> ==============================================================================
> --- head/games/heretic/files/patch-aj	Fri Oct 18 06:41:42 2013	(r330724)
> +++ head/games/heretic/files/patch-aj	Fri Oct 18 07:05:40 2013	(r330725)
> @@ -1,7 +1,8 @@
>  --- sndserv/Makefile.orig	Sat Oct 23 11:02:21 1999
>  +++ sndserv/Makefile	Thu Jan 10 19:34:23 2002
>  @@ -1,6 +1,6 @@
> - CC = gcc
> +-CC = gcc
> ++#CC = gcc
>   
>  -CFLAGS=	-Wall -Wstrict-prototypes $(COPT.arch)
>  +CFLAGS=	-Wall -Wstrict-prototypes $(COPT.arch) -I/usr/include/sys

Passing CC and CFLAGS to MAKE_ARGS will achieve the same goal without the need
of an external patch.

MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}"

regards,
Bapt
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 196 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-all/attachments/20131018/b9a5e091/attachment.sig>