From owner-svn-ports-all@FreeBSD.ORG Sun Nov 17 02:30:27 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 412F81C3; Sun, 17 Nov 2013 02:30:27 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 172DF21B0; Sun, 17 Nov 2013 02:30:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAH2UQBY080022; Sun, 17 Nov 2013 02:30:26 GMT (envelope-from danilo@svn.freebsd.org) Received: (from danilo@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAH2UQtx080021; Sun, 17 Nov 2013 02:30:26 GMT (envelope-from danilo@svn.freebsd.org) Message-Id: <201311170230.rAH2UQtx080021@svn.freebsd.org> From: Danilo Egea Gondolfo Date: Sun, 17 Nov 2013 02:30:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334048 - head/games/linux-doom3-demo 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.16 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, 17 Nov 2013 02:30:27 -0000 Author: danilo Date: Sun Nov 17 02:30:26 2013 New Revision: 334048 URL: http://svnweb.freebsd.org/changeset/ports/334048 Log: - Remove NO_PACKAGE - Add stage support - Add DOCS and NVIDIA_GL options Modified: head/games/linux-doom3-demo/Makefile Modified: head/games/linux-doom3-demo/Makefile ============================================================================== --- head/games/linux-doom3-demo/Makefile Sun Nov 17 02:25:24 2013 (r334047) +++ head/games/linux-doom3-demo/Makefile Sun Nov 17 02:30:26 2013 (r334048) @@ -19,7 +19,6 @@ COMMENT= DOOM III demo for Linux ONLY_FOR_ARCHS= i386 amd64 USE_LINUX= yes USE_LINUX_APPS= xorglibs -NO_PACKAGE= Distfile size is 462MB, set FORCE_PACKAGE if you really want to build this package NO_CDROM= Redistribution is limited, see license NO_BUILD= yes NO_WRKSUBDIR= yes @@ -29,10 +28,12 @@ DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPR SUB_FILES= doom3-demo SUB_LIST= DOOMDIR="${DOOMDIR}" -NO_STAGE= yes -.include +OPTIONS_DEFINE= DOCS NVIDIA_GL +NVIDIA_GL_DESC= Use GL driver from nvidia-driver -.if defined(WITH_NVIDIA_GL) +.include + +.if ${PORT_OPTIONS:MNVIDIA_GL} RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver .else USE_LINUX_APPS+=dri @@ -43,23 +44,18 @@ do-extract: @cd ${WRKSRC} && ${TAIL} -c +8767 ${_DISTDIR}/${DISTFILES} | ${TAR} zxf - do-install: - ${INSTALL_SCRIPT} ${WRKDIR}/doom3-demo ${PREFIX}/bin/${PKGNAMEPREFIX}doom3-demo - - ${MKDIR} ${DOOMDIR}/demo - ${INSTALL_DATA} ${WRKSRC}/demo/demo00.pk4 ${DOOMDIR}/demo - - ${INSTALL_PROGRAM} ${WRKSRC}/bin/Linux/x86/doom.x86 ${DOOMDIR} + ${INSTALL_SCRIPT} ${WRKDIR}/doom3-demo ${STAGEDIR}${PREFIX}/bin/${PKGNAMEPREFIX}doom3-demo + ${MKDIR} ${STAGEDIR}${DOOMDIR}/demo + ${INSTALL_DATA} ${WRKSRC}/demo/demo00.pk4 ${STAGEDIR}${DOOMDIR}/demo + ${INSTALL_PROGRAM} ${WRKSRC}/bin/Linux/x86/doom.x86 ${STAGEDIR}${DOOMDIR} .for f in gamex86.so - ${INSTALL_DATA} ${WRKSRC}/${f} ${DOOMDIR} - -${CHOWN} ${LIBOWN}:${LIBGRP} ${DOOMDIR}/${f} - ${CHMOD} ${LIBMODE} ${DOOMDIR}/${f} + ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOOMDIR} + -${CHOWN} ${LIBOWN}:${LIBGRP} ${STAGEDIR}${DOOMDIR}/${f} + ${CHMOD} ${LIBMODE} ${STAGEDIR}${DOOMDIR}/${f} .endfor - -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in License.txt README - ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor -.endif -.include +.include