From owner-svn-ports-head@FreeBSD.ORG  Thu Sep  5 07:45:29 2013
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 ESMTP id 28DB51A0;
 Thu,  5 Sep 2013 07:45:29 +0000 (UTC)
 (envelope-from danfe@FreeBSD.org)
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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 160C023EA;
 Thu,  5 Sep 2013 07:45:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r857jS0c026600;
 Thu, 5 Sep 2013 07:45:28 GMT (envelope-from danfe@svn.freebsd.org)
Received: (from danfe@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r857jSDf026599;
 Thu, 5 Sep 2013 07:45:28 GMT (envelope-from danfe@svn.freebsd.org)
Message-Id: <201309050745.r857jSDf026599@svn.freebsd.org>
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Thu, 5 Sep 2013 07:45:28 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r326364 - head/games/egl
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.14
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: Thu, 05 Sep 2013 07:45:29 -0000

Author: danfe
Date: Thu Sep  5 07:45:28 2013
New Revision: 326364
URL: http://svnweb.freebsd.org/changeset/ports/326364

Log:
  - Fix the build against Clang
  - Add LICENSE (GPLv2), convert USE_GMAKE
  - Kill bogus and useless line (from r297915)
  - Get rid of .for loop in do-install
  
  Reported by:	pkg-fallout

Modified:
  head/games/egl/Makefile

Modified: head/games/egl/Makefile
==============================================================================
--- head/games/egl/Makefile	Thu Sep  5 07:40:06 2013	(r326363)
+++ head/games/egl/Makefile	Thu Sep  5 07:45:28 2013	(r326364)
@@ -13,9 +13,11 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Enhanced OpenGL-only Quake II engine
 
+LICENSE=	GPLv2
+
+USES=		gmake
 USE_ZIP=	yes
 USE_DOS2UNIX=	yes
-USE_GMAKE=	yes
 MAKEFILE=	makefile
 NO_WRKSUBDIR=	yes
 
@@ -33,11 +35,10 @@ GAME_DESC=	Build main game (default mod)
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCLIENT}
-LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
-		png15:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
+		libpng15.so:${PORTSDIR}/graphics/png
 USE_GL=		gl
 CFLAGS+=	-I${LOCALBASE}/include/libpng15
-MAKE_ENV*=	CFLAGS="${CFLAGS}"
 PLIST_SUB+=	CLIENT=""
 EGL_BIN+=	egl
 .else
@@ -65,10 +66,13 @@ PLIST_SUB+=	GAME="@comment "
 MAKE_ENV+=	WITH_OPT_CFLAGS=NO
 .endif
 
+# Fix the build against Clang
+post-patch:
+	@${REINPLACE_CMD} -e '145s/return qFalse/return/' \
+		${WRKSRC}/unix/unix_snd_main.c
+
 do-install:
-.for f in ${EGL_BIN}
-	${INSTALL_PROGRAM} ${WRKSRC}/release/${f} ${PREFIX}/bin
-.endfor
+	${INSTALL_PROGRAM} ${EGL_BIN:S,^,${WRKSRC}/release/,} ${PREFIX}/bin
 	@${MKDIR} ${LIBDIR}/baseq2
 	${INSTALL_PROGRAM} ${WRKSRC}/release/baseq2/*.so ${LIBDIR}/baseq2
 	${INSTALL_DATA} ${DISTDIR}/egl.pkz ${LIBDIR}/baseq2