Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 5 Sep 2013 07:45:28 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r326364 - head/games/egl
Message-ID:  <201309050745.r857jSDf026599@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



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