From owner-svn-ports-all@FreeBSD.ORG Mon May 20 07:31:36 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 890F1CA1; Mon, 20 May 2013 07:31:36 +0000 (UTC) (envelope-from bsam@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 6A68313A; Mon, 20 May 2013 07:31:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4K7VapY063905; Mon, 20 May 2013 07:31:36 GMT (envelope-from bsam@svn.freebsd.org) Received: (from bsam@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4K7VZQc063899; Mon, 20 May 2013 07:31:35 GMT (envelope-from bsam@svn.freebsd.org) Message-Id: <201305200731.r4K7VZQc063899@svn.freebsd.org> From: Boris Samorodov Date: Mon, 20 May 2013 07:31:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r318578 - head/emulators/linux-pete-xgl2gpu 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: Mon, 20 May 2013 07:31:36 -0000 Author: bsam Date: Mon May 20 07:31:35 2013 New Revision: 318578 URL: http://svnweb.freebsd.org/changeset/ports/318578 Log: . update to version 2.9; . trim Makefile headers; . land maintainership to the submitter. While here: remove the indefinite article from COMMENT. PR: ports/173462 Submitted by: Naram Qashat Added: head/emulators/linux-pete-xgl2gpu/Makefile.inc (contents, props changed) Modified: head/emulators/linux-pete-xgl2gpu/Makefile head/emulators/linux-pete-xgl2gpu/distinfo head/emulators/linux-pete-xgl2gpu/pkg-plist Modified: head/emulators/linux-pete-xgl2gpu/Makefile ============================================================================== --- head/emulators/linux-pete-xgl2gpu/Makefile Mon May 20 07:25:48 2013 (r318577) +++ head/emulators/linux-pete-xgl2gpu/Makefile Mon May 20 07:31:35 2013 (r318578) @@ -1,32 +1,28 @@ -# New ports collection makefile for: linux-pete-xgl2gpu -# Date created: 16 Jul 2005 -# Whom: Jean-Yves Lefort -# +# Created by: Jean-Yves Lefort # $FreeBSD$ -# -PORTNAME= linux-pete-xgl2gpu -PORTVERSION= 2.8 +PORTNAME= pete-xgl2gpu +PORTVERSION= ${XGL2GPU_VERSION} CATEGORIES= emulators linux MASTER_SITES= http://www.pbernert.com/ -DISTNAME= gpupetexgl${MAJOR}0${MINOR} +PKGNAMEPREFIX= linux- +DISTFILES= gpupetexgl${MAJOR}0${MINOR}${EXTRACT_SUFX} \ + ${CFG_DISTFILE} -MAINTAINER= ports@FreeBSD.org -COMMENT= A PSEmu Pro GPU plugin using a modern OpenGL renderer (Linux version) - -.if defined(WITH_NVIDIA_GL) -RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver -.else -USE_LINUX_APPS+=dri -.endif +MAINTAINER= cyberbotx@cyberbotx.com +COMMENT= PSEmu Pro GPU plugin using a modern OpenGL renderer (Linux version) NO_WRKSUBDIR= yes NO_BUILD= yes USE_LINUX= yes USE_LINUX_APPS= gtk xorglibs +PORTDOCS= * ONLY_FOR_ARCHS= i386 amd64 +OPTIONS_DEFINE= NVIDIA_GL +NVIDIA_GL_DESC= Use nVidia OpenGL driver + MAJOR= ${PORTVERSION:R} MINOR= ${PORTVERSION:E} PLIST_SUB+= MAJOR=${MAJOR} MINOR=${MINOR} @@ -35,6 +31,16 @@ PSEMUPRO_PLUGINS_DIR= ${PREFIX}/lib/psem PSEMUPRO_CFGBINS_DIR= ${PREFIX}/libexec/psemupro/cfg PSEMUPRO_CFGFILES_DIR= ${PREFIX}/share/psemupro/cfg +.include + +.include "${.CURDIR}/../linux-pete-xgl2gpu/Makefile.inc" + +.if ${PORT_OPTIONS:MNVIDIA_GL} +RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver +.else +USE_LINUX_APPS+=dri +.endif + # by default, disable options which may crash the plugin post-patch: @${REINPLACE_CMD} -e '/^TWinShader/ s|= 1|= 0|' \ @@ -45,12 +51,12 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/libgpuPeteXGL2.so.${MAJOR}.0.${MINOR} ${PSEMUPRO_PLUGINS_DIR} ${MKDIR} ${PSEMUPRO_CFGBINS_DIR} - ${INSTALL_PROGRAM} ${WRKSRC}/cfgPeteXGL2 ${PSEMUPRO_CFGBINS_DIR} + ${INSTALL_PROGRAM} ${WRKSRC}/cfg/cfgPeteXGL2 ${PSEMUPRO_CFGBINS_DIR} ${MKDIR} ${PSEMUPRO_CFGFILES_DIR} ${INSTALL_DATA} ${WRKSRC}/gpuPeteXGL2.cfg ${PSEMUPRO_CFGFILES_DIR} -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/*.txt ${DOCSDIR} .endif Added: head/emulators/linux-pete-xgl2gpu/Makefile.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/linux-pete-xgl2gpu/Makefile.inc Mon May 20 07:31:35 2013 (r318578) @@ -0,0 +1,7 @@ +# $FreeBSD$ + +XGL2GPU_VERSION= 2.9 +MESAGPU_VERSION= 1.77 +SOFTGPU_VERSION= 1.18 + +CFG_DISTFILE= petegpucfg_V${XGL2GPU_VERSION:C/\./-/}_V${MESAGPU_VERSION:C/\./-/}_V${SOFTGPU_VERSION:C/\./-/}${EXTRACT_SUFX} Modified: head/emulators/linux-pete-xgl2gpu/distinfo ============================================================================== --- head/emulators/linux-pete-xgl2gpu/distinfo Mon May 20 07:25:48 2013 (r318577) +++ head/emulators/linux-pete-xgl2gpu/distinfo Mon May 20 07:31:35 2013 (r318578) @@ -1,2 +1,4 @@ -SHA256 (gpupetexgl208.tar.gz) = 01486fd9c644e44abd7aa303cbdccd4139d2a133b75f53436b6b8e5fb14dc9d0 -SIZE (gpupetexgl208.tar.gz) = 189449 +SHA256 (gpupetexgl209.tar.gz) = 83427665c31bbae16c1fbd7c695d0bc9acc4cfcf911302c031f852c850c9cc5d +SIZE (gpupetexgl209.tar.gz) = 173744 +SHA256 (petegpucfg_V2-9_V1-77_V1-18.tar.gz) = 1488750fb2f158b68ef11b693fc1f45948ec41e84b1329315703adc91679fd91 +SIZE (petegpucfg_V2-9_V1-77_V1-18.tar.gz) = 59589 Modified: head/emulators/linux-pete-xgl2gpu/pkg-plist ============================================================================== --- head/emulators/linux-pete-xgl2gpu/pkg-plist Mon May 20 07:25:48 2013 (r318577) +++ head/emulators/linux-pete-xgl2gpu/pkg-plist Mon May 20 07:31:35 2013 (r318578) @@ -7,6 +7,3 @@ share/psemupro/cfg/gpuPeteXGL2.cfg @dirrmtry libexec/psemupro @dirrmtry share/psemupro/cfg @dirrmtry share/psemupro -%%PORTDOCS%%%%DOCSDIR%%/readme.txt -%%PORTDOCS%%%%DOCSDIR%%/version.txt -%%PORTDOCS%%@dirrm %%DOCSDIR%%