Date: Fri, 07 Sep 2012 13:16:48 +0200 From: nemysis <nemysis@gmx.ch> To: FreeBSD-gnats-submit@FreeBSD.org Cc: acm@FreeBSD.org Subject: ports/171408: [PATCH] games/fretsonfire: Makefile changed, now find numpy, OptionsNG Message-ID: <20120907111651.873F41065677@hub.freebsd.org> Resent-Message-ID: <201209071120.q87BK2kx013824@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 171408
>Category: ports
>Synopsis: [PATCH] games/fretsonfire: Makefile changed, now find numpy, OptionsNG
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Sep 07 11:20:02 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: nemysis
>Release: FreeBSD 9.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan 3 07:46:30 UTC
>Description:
Makefile changed
Now find numpy
RUN_DEPENDS= ${PYNUMPY} \
Added OptionsNG
Don't install install.txt, not needed after Installation.
Port maintainer (acm@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports)
>How-To-Repeat:
>Fix:
--- fretsonfire-1.3.110_3.patch begins here ---
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/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%%
--- fretsonfire-1.3.110_3.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120907111651.873F41065677>