Date: Wed, 26 May 2010 07:53:06 +0400 From: Anonymous <swell.k@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/147008: [patch] games/adonthell: fix typo and use default python version (2.6) Message-ID: <86bpc3nwt9.fsf@gmail.com> Resent-Message-ID: <201005260507.o4Q57oDj017473@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 147008
>Category: ports
>Synopsis: [patch] games/adonthell: fix typo and use default python version (2.6)
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Wed May 26 05:07:50 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Anonymous
>Release: FreeBSD 9.0-CURRENT amd64
>Organization:
>Environment:
>Description:
- I didn't notice any side effects when I played wastesedge a year ago
before python2.6 was even default.
- fix this byte-compile error during install target
Compiling ./player_text.py ...
Sorry: IndentationError: ('unexpected indent', ('./player_text.py', 1, 1, ' _("That clock seems to be late!")\n'))
gmake[2]: Leaving directory `/a/pkgbuild/a/freebsd-ports/games/adonthell/work/wastesedge-0.3.4/scripts/modules'
>How-To-Repeat:
>Fix:
--- a.diff begins here ---
Index: games/adonthell/Makefile
===================================================================
RCS file: /a/.cvsup/ports/games/adonthell/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- games/adonthell/Makefile 30 Jan 2010 09:42:45 -0000 1.30
+++ games/adonthell/Makefile 26 May 2010 03:41:07 -0000
@@ -20,7 +20,7 @@ LIB_DEPENDS= vorbis.4:${PORTSDIR}/audio/
freetype.9:${PORTSDIR}/print/freetype2
USE_SDL= mixer ttf sdl
-USE_PYTHON= -2.5
+USE_PYTHON= yes
USE_GETTEXT= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
@@ -47,6 +47,8 @@ post-patch:
s|-lpthread|${PTHREAD_LIBS}|g' configure
@cd ${WRKDIR}/wastesedge-${WEDGE_VERSION} && ${REINPLACE_CMD} -e \
's/test $$adonthell_major_ver -eq 0 .*/true ;/' configure
+ @cd ${WRKDIR}/wastesedge-${WEDGE_VERSION} && ${REINPLACE_CMD} -e \
+ 's/^[[:space:]]*_//' scripts/modules/player_text.py
post-install:
cd ${WRKDIR}/wastesedge-${WEDGE_VERSION} \
Index: games/adonthell/pkg-plist
===================================================================
RCS file: /a/.cvsup/ports/games/adonthell/pkg-plist,v
retrieving revision 1.5
diff -u -p -r1.5 pkg-plist
--- games/adonthell/pkg-plist 16 Jan 2009 23:26:45 -0000 1.5
+++ games/adonthell/pkg-plist 26 May 2010 03:44:11 -0000
@@ -379,6 +379,7 @@ bin/adonthell-wastesedge
%%DATADIR%%/games/wastesedge/scripts/modules/events.pyc
%%DATADIR%%/games/wastesedge/scripts/modules/intro.pyc
%%DATADIR%%/games/wastesedge/scripts/modules/main_menu.pyc
+%%DATADIR%%/games/wastesedge/scripts/modules/player_text.pyc
%%DATADIR%%/games/wastesedge/scripts/schedules/__init__.pyc
%%DATADIR%%/games/wastesedge/scripts/schedules/audio/__init__.pyc
%%DATADIR%%/games/wastesedge/scripts/schedules/audio/in_game.pyc
--- a.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86bpc3nwt9.fsf>