From owner-svn-ports-all@FreeBSD.ORG Mon Nov 18 18:31:25 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 32E36549; Mon, 18 Nov 2013 18:31:25 +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 132F82D92; Mon, 18 Nov 2013 18:31:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAIIVOWt023507; Mon, 18 Nov 2013 18:31:24 GMT (envelope-from danilo@svn.freebsd.org) Received: (from danilo@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAIIVOvE023506; Mon, 18 Nov 2013 18:31:24 GMT (envelope-from danilo@svn.freebsd.org) Message-Id: <201311181831.rAIIVOvE023506@svn.freebsd.org> From: Danilo Egea Gondolfo Date: Mon, 18 Nov 2013 18:31:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334237 - head/games/linux-ut2003-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: Mon, 18 Nov 2013 18:31:25 -0000 Author: danilo Date: Mon Nov 18 18:31:24 2013 New Revision: 334237 URL: http://svnweb.freebsd.org/changeset/ports/334237 Log: - Remove NO_PACKAGE - Add sdl12 to USE_LINUX_APPS - Add DOCS and NVIDIA_GL options - Fix an error with the libSDL included in the package - Add stage support Modified: head/games/linux-ut2003-demo/Makefile Modified: head/games/linux-ut2003-demo/Makefile ============================================================================== --- head/games/linux-ut2003-demo/Makefile Mon Nov 18 18:22:52 2013 (r334236) +++ head/games/linux-ut2003-demo/Makefile Mon Nov 18 18:31:24 2013 (r334237) @@ -14,8 +14,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Unreal Tournament 2003 demo USE_LINUX= yes -USE_LINUX_APPS= xorglibs -NO_PACKAGE= Distfile is 130MB, set FORCE_PACKAGE if you really want to build this package +USE_LINUX_APPS= sdl12 xorglibs RESTRICTED= Redistribution is limited, see license NO_BUILD= yes NO_WRKSUBDIR= yes @@ -36,12 +35,14 @@ PORTDOCS= * LIBDIRS= Animations Benchmark ForceFeedback KarmaData Maps Music \ Sounds StaticMeshes System Textures Web -NO_STAGE= yes -.include +OPTIONS_DEFINE= DOCS NVIDIA_GL +NVIDIA_GL_DESC= Use GL driver from nvidia-driver -.if defined(WITH_NVIDIA_GL) -RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver -.else +NVIDIA_GL_RUN_DEPENDS= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver + +.include + +.if ! ${PORT_OPTIONS:MNVIDIA_GL} USE_LINUX_APPS+=dri .endif @@ -59,31 +60,27 @@ pre-install: ${FIND} ${LIBDIRS} -type d ! -empty | ${SORT} -r \ | ${SED} -e 's|^|@dirrm ${UTDIR_REL}/|' >> ${PLIST} + # This fix an error with the libSDL included in the ut2003 package + @${ECHO_CMD} "@exec cp ${LINUXBASE}/usr/lib/libSDL-1.2.so.0 ${UTDIR}/System/" \ + >> ${PLIST} + do-install: - ${INSTALL_SCRIPT} ${WRKDIR}/ut2003-demo ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKDIR}/ut2003-demo ${STAGEDIR}${PREFIX}/bin cd ${WRKSRC} && \ ${FIND} ${LIBDIRS} -type d ! -empty -exec \ - ${MKDIR} "${UTDIR}/{}" \; && \ + ${MKDIR} "${STAGEDIR}${UTDIR}/{}" \; && \ ${FIND} ${LIBDIRS} -type f -exec \ - ${INSTALL_DATA} "{}" "${UTDIR}/{}" \; - - -${CHOWN} ${BINOWN}:${BINGRP} ${UTDIR}/Benchmark/*.sh ${UTDIR}/System/*-bin - ${CHMOD} ${BINMODE} ${UTDIR}/Benchmark/*.sh ${UTDIR}/System/*-bin - - -${CHOWN} ${LIBOWN}:${LIBGRP} ${UTDIR}/System/*.so* - ${CHMOD} ${LIBMODE} ${UTDIR}/System/*.so* - - ${MKDIR} ${DATADIR} + ${INSTALL_DATA} "{}" "${STAGEDIR}${UTDIR}/{}" \; + ${CHMOD} ${BINMODE} ${STAGEDIR}${UTDIR}/Benchmark/*.sh ${STAGEDIR}${UTDIR}/System/*-bin + ${CHMOD} ${LIBMODE} ${STAGEDIR}${UTDIR}/System/*.so* + @${MKDIR} ${STAGEDIR}${DATADIR} .for f in Help/UT2003Logo.bmp Unreal.xpm - ${INSTALL_DATA} ${WRKSRC}/${f} ${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DATADIR} +.endfor + @${MKDIR} ${STAGEDIR}${DOCSDIR} +.for f in README.linux Help/ReadMe-* eula/* + ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} -. for f in README.linux Help/ReadMe-* eula/* - ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} -. endfor -.endif - -.include +.include