Bug 173462 - [PATCH] emulators/linux-pete-xgl2gpu: update to 2.9, take maintainership
Summary: [PATCH] emulators/linux-pete-xgl2gpu: update to 2.9, take maintainership
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Boris Samorodov
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-11-08 05:20 UTC by Naram Qashat
Modified: 2013-05-20 08:40 UTC (History)
0 users

See Also:


Attachments
linux-pete-xgl2gpu-2.9.patch (3.93 KB, patch)
2012-11-08 05:20 UTC, Naram Qashat
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Naram Qashat 2012-11-08 05:20:00 UTC
- Update to 2.9
- Take maintainership

The reason for the added Makefile.inc is because 3 ports, this one,
  emulators/linux-pete-mesagpu, and emulators/linux-peops-softgpu
  share a common tarball for their configuration binaries.

Note: This PR superceeds PR ports/173459, that one should be closed.

Added file(s):
- Makefile.inc

Generated with FreeBSD Port Tools 0.99_6 (mode: update, diff: ports)
Comment 1 Boris Samorodov freebsd_committer freebsd_triage 2013-05-20 08:12:42 UTC
Responsible Changed
From-To: freebsd-ports-bugs->bsam

Take.
Comment 2 dfilter service freebsd_committer freebsd_triage 2013-05-20 08:31:49 UTC
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 <cyberbotx@cyberbotx.com>

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 <jylefort@FreeBSD.org>
-#
+# Created by: Jean-Yves Lefort <jylefort@FreeBSD.org>
 # $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 <bsd.port.options.mk>
+
+.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%%
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 3 Boris Samorodov freebsd_committer freebsd_triage 2013-05-20 08:32:02 UTC
State Changed
From-To: open->closed

Committed, thanks!