Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 18 Oct 2013 09:54:09 +0200
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        Oliver Lehmann <oliver@FreeBSD.org>
Cc:        svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org
Subject:   Re: svn commit: r330725 - in head/games/heretic: . files
Message-ID:  <20131018075408.GI42657@ithaqua.etoilebsd.net>
In-Reply-To: <201310180705.r9I75eZV063407@svn.freebsd.org>
References:  <201310180705.r9I75eZV063407@svn.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help

--v2/QI0iRXglpx0hK
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

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
>=20
> Log:
>   fix build with clang by removing the forced set of CC
>=20
> Modified:
>   head/games/heretic/Makefile   (contents, props changed)
>   head/games/heretic/files/patch-aj   (contents, props changed)
>=20
> Modified: head/games/heretic/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- 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=3D	WAD:=3D"@comment "
> =20
>  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
>=20
> Modified: head/games/heretic/files/patch-aj
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- 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 =3D gcc
> +-CC =3D gcc
> ++#CC =3D gcc
>  =20
>  -CFLAGS=3D	-Wall -Wstrict-prototypes $(COPT.arch)
>  +CFLAGS=3D	-Wall -Wstrict-prototypes $(COPT.arch) -I/usr/include/sys

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

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

regards,
Bapt

--v2/QI0iRXglpx0hK
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (FreeBSD)

iEYEARECAAYFAlJg6SAACgkQ8kTtMUmk6Exi6QCfc6PhlssWreyaBLd4ltRXKyIK
uucAnRkl+OlOovrP17gzEpMVYGQEk76i
=TSKq
-----END PGP SIGNATURE-----

--v2/QI0iRXglpx0hK--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131018075408.GI42657>