From owner-svn-ports-all@FreeBSD.ORG Sun Nov 10 20:36:26 2013 Return-Path: Delivered-To: svn-ports-all@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 581CC919; Sun, 10 Nov 2013 20:36:26 +0000 (UTC) (envelope-from danilo@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 4547B20A5; Sun, 10 Nov 2013 20:36:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAAKaQcI028139; Sun, 10 Nov 2013 20:36:26 GMT (envelope-from danilo@svn.freebsd.org) Received: (from danilo@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAAKaPq5028137; Sun, 10 Nov 2013 20:36:25 GMT (envelope-from danilo@svn.freebsd.org) Message-Id: <201311102036.rAAKaPq5028137@svn.freebsd.org> From: Danilo Egea Gondolfo Date: Sun, 10 Nov 2013 20:36:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333444 - head/games/sdlquake2 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Nov 2013 20:36:26 -0000 Author: danilo Date: Sun Nov 10 20:36:25 2013 New Revision: 333444 URL: http://svnweb.freebsd.org/changeset/ports/333444 Log: - Convert LIB_DEPENDS to new syntax - Convert USE_GMAKE to USES - Use options helpers - Add stage support Modified: head/games/sdlquake2/Makefile head/games/sdlquake2/pkg-plist Modified: head/games/sdlquake2/Makefile ============================================================================== --- head/games/sdlquake2/Makefile Sun Nov 10 20:30:47 2013 (r333443) +++ head/games/sdlquake2/Makefile Sun Nov 10 20:36:25 2013 (r333444) @@ -10,10 +10,10 @@ MASTER_SITES= http://koti.mbnet.fi/~turo MAINTAINER= ports@FreeBSD.org COMMENT= Combination of R1Q2 and R1GL with SDL code from Quake2Forge -LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo +LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo USE_BZIP2= yes -USE_GMAKE= yes +USES= gmake OPTIONS_DEFINE= CLIENT DEDICATED GAME OPTIONS_DEFAULT= CLIENT DEDICATED @@ -21,57 +21,38 @@ CLIENT_DESC= Build client DEDICATED_DESC= Build dedicated server GAME_DESC= Build a main game .so file +OPTIONS_SUB= yes + LIBDIR= ${PREFIX}/lib/${PORTNAME} MAKE_ENV= LIBDIR="${LIBDIR}" PLIST_SUB= LIBDIR=${LIBDIR:S/${PREFIX}\///} -NO_STAGE= yes .include "${.CURDIR}/../quake2-data/Makefile.include" -.include +CLIENT_LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ + libpng15.so:${PORTSDIR}/graphics/png +CLIENT_USE= GL=yes +CLIENT_USE= SDL=sdl +CLIENT_MAKE_ENV= BUILD_CLIENT=YES +CLIENT_CFLAGS= -I${LOCALBASE}/include/libpng15 -.if ${PORT_OPTIONS:MCLIENT} -LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \ - png15:${PORTSDIR}/graphics/png -USE_GL= yes -USE_SDL= sdl -MAKE_ENV+= BUILD_CLIENT=YES -CFLAGS+= -I${LOCALBASE}/include/libpng15 -PLIST_SUB+= CLIENT="" -.else -PLIST_SUB+= CLIENT="@comment " -.endif +DEDICATED_MAKE_ENV= BUILD_DEDICATED=YES -.if ${PORT_OPTIONS:MDEDICATED} -MAKE_ENV+= BUILD_DEDICATED=YES -PLIST_SUB+= DEDICATED="" -.else -PLIST_SUB+= DEDICATED="@comment " -.endif +GAME_MAKE_ENV= BUILD_GAME=YES -.if ${PORT_OPTIONS:MGAME} -MAKE_ENV+= BUILD_GAME=YES -PLIST_SUB+= GAME="" -.else -PLIST_SUB+= GAME="@comment " -.endif +.include do-install: - ${MKDIR} ${LIBDIR}/baseq2 + @${MKDIR} ${STAGEDIR}${LIBDIR}/baseq2 .if ${PORT_OPTIONS:MCLIENT} - ${INSTALL_PROGRAM} ${WRKSRC}/quake2 ${PREFIX}/bin/${PORTNAME} - ${INSTALL_PROGRAM} ${WRKSRC}/ref_sdlgl.so ${LIBDIR} + ${INSTALL_PROGRAM} ${WRKSRC}/quake2 ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + ${INSTALL_PROGRAM} ${WRKSRC}/ref_sdlgl.so ${STAGEDIR}${LIBDIR} .endif .if ${PORT_OPTIONS:MDEDICATED} - ${INSTALL_PROGRAM} ${WRKSRC}/q2ded ${PREFIX}/bin/${PORTNAME}-ded + ${INSTALL_PROGRAM} ${WRKSRC}/q2ded ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-ded .endif .if ${PORT_OPTIONS:MGAME} - ${INSTALL_PROGRAM} ${WRKSRC}/baseq2/game.so ${LIBDIR}/baseq2 + ${INSTALL_PROGRAM} ${WRKSRC}/baseq2/game.so ${STAGEDIR}${LIBDIR}/baseq2 .endif -post-install: - @${ECHO_CMD} - @${CAT} ${PKGMESSAGE} - @${ECHO_CMD} - .include Modified: head/games/sdlquake2/pkg-plist ============================================================================== --- head/games/sdlquake2/pkg-plist Sun Nov 10 20:30:47 2013 (r333443) +++ head/games/sdlquake2/pkg-plist Sun Nov 10 20:36:25 2013 (r333444) @@ -1,6 +1,6 @@ %%CLIENT%%bin/sdlquake2 %%DEDICATED%%bin/sdlquake2-ded -%%GAME%%%%LIBDIR%%/baseq2/game.so -%%CLIENT%%%%LIBDIR%%/ref_sdlgl.so -@dirrm %%LIBDIR%%/baseq2 -@dirrm %%LIBDIR%% +%%GAME%%lib/sdlquake2/baseq2/game.so +%%CLIENT%%lib/sdlquake2/ref_sdlgl.so +@dirrm lib/sdlquake2/baseq2 +@dirrm lib/sdlquake2