From owner-svn-ports-head@FreeBSD.ORG  Sat Aug 30 17:44:40 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A15B597A;
 Sat, 30 Aug 2014 17:44:40 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8C50613AC;
 Sat, 30 Aug 2014 17:44:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7UHie6T058816;
 Sat, 30 Aug 2014 17:44:40 GMT (envelope-from adamw@FreeBSD.org)
Received: (from adamw@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7UHieFQ058815;
 Sat, 30 Aug 2014 17:44:40 GMT (envelope-from adamw@FreeBSD.org)
Message-Id: <201408301744.s7UHieFQ058815@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: adamw set sender to
 adamw@FreeBSD.org using -f
From: Adam Weinberger <adamw@FreeBSD.org>
Date: Sat, 30 Aug 2014 17:44:40 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r366655 - head/www/tokyopromenade
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Aug 2014 17:44:40 -0000

Author: adamw
Date: Sat Aug 30 17:44:39 2014
New Revision: 366655
URL: http://svnweb.freebsd.org/changeset/ports/366655
QAT: https://qat.redports.org/buildarchive/r366655/

Log:
  Fix build with gcc. While here, stop clobbering CFLAGS.

Modified:
  head/www/tokyopromenade/Makefile

Modified: head/www/tokyopromenade/Makefile
==============================================================================
--- head/www/tokyopromenade/Makefile	Sat Aug 30 17:31:12 2014	(r366654)
+++ head/www/tokyopromenade/Makefile	Sat Aug 30 17:44:39 2014	(r366655)
@@ -19,8 +19,7 @@ OPTIONS_DEFINE=	LUA
 
 CONFIGURE_ARGS=	--enable-fcgi
 GNU_CONFIGURE=	yes
-USES=		gmake lua
-CFLAGS=		-Wno-incompatible-pointer-types-discards-qualifiers
+USES=		gmake lua compiler
 
 SUB_FILES=	pkg-message
 
@@ -28,7 +27,13 @@ LUA_CONFIGURE_ENABLE+=	lua
 LUA_LDFLAGS+=	-L${LUA_LIBDIR}
 LUA_CFLAGS+=	-I${LUA_INCDIR}
 
+.include <bsd.port.pre.mk>
+
+.if ${COMPILER_TYPE} == "clang"
+CFLAGS+=		-Wno-incompatible-pointer-types-discards-qualifiers
+.endif
+
 post-patch:
 	${REINPLACE_CMD} -e "s/llua/llua-${LUA_VER}/g" ${WRKSRC}/configure
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>