Attachment 127562 Details for Bug 171408 – fretsonfire.diff

[patch] fretsonfire.diff

fretsonfire.diff (text/x-patch), 3.95 KB, created by nemysis on 2012-09-07 12:31:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: nemysis

Created: 2012-09-07 12:31:04 UTC

Size: 3.95 KB

patch

obsolete

>===> Generating patch
>===> Viewing diff with more
>diff -ruN --exclude=CVS /usr/ports/games/fretsonfire/Makefile ./Makefile
>--- /usr/ports/games/fretsonfire/Makefile	2012-03-26 10:04:08.000000000 +0200
>+++ ./Makefile	2012-09-07 12:50:53.000000000 +0200
>@@ -1,13 +1,8 @@
>-# New ports collection makefile for:	fretsonfire
>-# Date created:		2006-09-01
>-# Whom:			Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
>-#
> # $FreeBSD: ports/games/fretsonfire/Makefile,v 1.13 2012/03/26 08:04:08 erwin Exp $
>-#
> 
> PORTNAME=	fretsonfire
> PORTVERSION=	1.3.110
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	games python
> MASTER_SITES=	SF
> DISTNAME=	${PORTNAME:S/f/F/g:S/o/O/}-${PORTVERSION}
>@@ -16,18 +11,16 @@
> MAINTAINER=	acm@FreeBSD.org
> COMMENT=	A game of musical skill and fast fingers
> 
>-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/numpy:${PORTSDIR}/math/py-numpy \
>-		${PYTHON_SITELIBDIR}/pygame/__init__.py:${PORTSDIR}/devel/py-game \
>-		${PYTHON_SITELIBDIR}/OpenGL/__init__.py:${PORTSDIR}/graphics/py-opengl \
>-		${PYTHON_SITELIBDIR}/PIL/__init__.py:${PORTSDIR}/graphics/py-imaging \
>+RUN_DEPENDS=	${PYNUMPY} \
>+		${PYTHON_PKGNAMEPREFIX}game>=0:${PORTSDIR}/devel/py-game \
>+		${PYTHON_PKGNAMEPREFIX}opengl>=0:${PORTSDIR}/graphics/py-opengl \
>+		${PYTHON_PKGNAMEPREFIX}imaging>=0:${PORTSDIR}/graphics/py-imaging \
> 		${LOCALBASE}/share/${PORTNAME}/default.ttf:${PORTSDIR}/games/fretsonfire-data
> 
> USE_PYTHON=	yes
> USE_DOS2UNIX=	*.txt
> NO_BUILD=	yes
> 
>-BROKEN=		does not build
>-
> DATADIR=	share/${PORTNAME}
> EXTRACT_AFTER_ARGS=	| ${TAR} -xf - --exclude 'data'
> SUB_FILES=	pkg-message FretsOnFire
>@@ -36,14 +29,16 @@
> 
> FOF_DIR=	${PREFIX}/lib/${PORTNAME}
> 
>-.include <bsd.port.pre.mk>
>+PORTDOCS=	readme.txt
> 
>-.if ${ARCH} != "i386"
>-WITHOUT_PSYCO=	yes
>-.endif
>+OPTIONS_DEFINE=	PSYCO
>+PSYCO_DESC=	Enable Psyco support (Only for i386)
>+
>+.include <bsd.port.pre.mk>
>+.include <bsd.port.options.mk>
> 
>-.if !defined(WITHOUT_PSYCO)
>-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/psyco/_psyco.so:${PORTSDIR}/devel/py-psyco
>+.if ${PORT_OPTIONS:MPSYCO}
>+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}psyco>=0:${PORTSDIR}/devel/py-psyco
> .endif
> 
> do-install:
>@@ -52,14 +47,15 @@
> 		${FIND} * -type d -exec ${MKDIR} "${FOF_DIR}/${PORTNAME:S/f/F/g:S/o/O/}/{}" \; && \
> 			${FIND} -E * -type f -iregex ".*\.(py)" -exec ${INSTALL_DATA} "{}" "${FOF_DIR}/${PORTNAME:S/f/F/g:S/o/O/}/{}" \;
> 
>+# Data
> 	${MKDIR} ${FOF_DIR}/data
> 	${LN} -s ${LOCALBASE}/${DATADIR}/* ${FOF_DIR}/data
> 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME:S/f/F/g:S/o/O/} ${PREFIX}/bin
> 
>-.if !defined(NOPORTDOCS)
>+# Documentation
>+.if ${PORT_OPTIONS:MDOCS}
> 	${MKDIR} ${DOCSDIR}
>-	${INSTALL_DATA} ${WRKSRC}/readme.txt ${DOCSDIR}/README
>-	${INSTALL_DATA} ${WRKSRC}/install.txt ${DOCSDIR}/INSTALL
>+	${INSTALL_DATA} ${WRKSRC}/readme.txt ${DOCSDIR}
> .endif
> 
> post-install:
>diff -ruN --exclude=CVS /usr/ports/games/fretsonfire/files/patch-src-Font.py ./files/patch-src-Font.py
>--- /usr/ports/games/fretsonfire/files/patch-src-Font.py	1970-01-01 01:00:00.000000000 +0100
>+++ ./files/patch-src-Font.py	2012-09-07 13:25:56.000000000 +0200
>@@ -0,0 +1,11 @@
>+--- src/Font.py.orig	2008-02-02 15:27:38.000000000 +0100
>++++ src/Font.py	2012-09-07 13:22:33.000000000 +0200
>+@@ -186,7 +186,7 @@
>+     glDisable(GL_TEXTURE_2D)
>+ 
>+   def _allocateGlyphTexture(self):
>+-    t = TextureAtlas(size = glGetInteger(GL_MAX_TEXTURE_SIZE))
>++    t= TextureAtlas()
>+     t.texture.setFilter(GL_LINEAR, GL_LINEAR)
>+     t.texture.setRepeat(GL_CLAMP, GL_CLAMP)
>+     self.glyphTextures.append(t)
>diff -ruN --exclude=CVS /usr/ports/games/fretsonfire/pkg-plist ./pkg-plist
>--- /usr/ports/games/fretsonfire/pkg-plist	2009-05-30 04:48:27.000000000 +0200
>+++ ./pkg-plist	2012-09-07 12:47:06.000000000 +0200
>@@ -199,10 +199,7 @@
> lib/fretsonfire/data/theme.ini
> lib/fretsonfire/data/title.ttf
> lib/fretsonfire/data/translations
>-%%PORTDOCS%%%%DOCSDIR%%/README
>-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
> @dirrm lib/fretsonfire/FretsOnFire/midi
> @dirrm lib/fretsonfire/FretsOnFire
> @dirrm lib/fretsonfire/data
> @dirrm lib/fretsonfire
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%
>===> Done

Actions: View | Diff

Attachments on bug 171408: 127561 | 127562 | 127563