- Make Python 2.5.1 the default Python version

 - Add significantly better support in bsd.python.mk for working with
   Python Eggs and the easy_install system

Tested by:	pointyhat runs
Approved by:	pav (portmgr)
Most work by:	perky
Thanks to:	pav

7 files changed, 39 insertions, 2 deletions

diff --git a/games/adonthell/Makefile b/games/adonthell/Makefile
index 2c23abefeb7e..ef100a64d6ea 100644
--- a/games/adonthell/Makefile
+++ b/games/adonthell/Makefile
@@ -22,13 +22,14 @@ BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13 \
 LIB_DEPENDS=	vorbis.4:${PORTSDIR}/audio/libvorbis
 
 USE_SDL=	mixer sdl
-USE_PYTHON=	yes
+USE_PYTHON=	-2.4
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--disable-py-debug
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	LDFLAGS=-L${LOCALBASE}/lib
+CONFIGURE_ENV=	LDFLAGS=-L${LOCALBASE}/lib \
+		PYPACKAGE=${PYTHON_CMD}
 
 .include <bsd.port.pre.mk>
 
diff --git a/games/balazar/Makefile b/games/balazar/Makefile
index 34bcee1616d7..d4fbad01fe1e 100644
--- a/games/balazar/Makefile
+++ b/games/balazar/Makefile
@@ -34,6 +34,8 @@ USE_GL=		yes
 USE_SDL=	sdl mixer
 USE_GETTEXT=	yes
 
+PYDISTUTILS_PKGNAME=	Balazar
+
 post-patch:
 	@${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX},g" ${WRKSRC}/setup.cfg
 
diff --git a/games/balazarbrothers/Makefile b/games/balazarbrothers/Makefile
index 26906d2ed805..b590efb935bf 100644
--- a/games/balazarbrothers/Makefile
+++ b/games/balazarbrothers/Makefile
@@ -31,6 +31,7 @@ USE_TWISTED=	yes
 USE_GL=		yes
 USE_GMAKE=	yes
 
+PYDISTUTILS_PKGNAME=	BalazarBrothers
 DATADIR=	share/balazar_brothers
 
 OPTIONS=	OPENAL	"Use openal sound system" on \
diff --git a/games/bubbros/files/patch-bubbob-statesaver.c b/games/bubbros/files/patch-bubbob-statesaver.c
new file mode 100644
index 000000000000..129aed58b730
--- /dev/null
+++ b/games/bubbros/files/patch-bubbob-statesaver.c
@@ -0,0 +1,28 @@
+--- bubbob/statesaver.c.orig	Sun Jul 15 08:59:52 2007
++++ bubbob/statesaver.c	Sun Jul 15 09:01:41 2007
+@@ -44,10 +44,12 @@
+     Py_INCREF(g);  /* exhausted -- can return 'g' itself */
+     return g;
+   }
++#if PY_VERSION_HEX < 0x02050000
+   if (f->f_nfreevars || f->f_ncells) {
+     PyErr_SetString(PyExc_ValueError, "generator has cell or free vars");
+     return NULL;
+   }
++#endif
+ 
+   dummy = (PyObject**) malloc(co->co_argcount * sizeof(PyObject*));
+   if (dummy == NULL)
+@@ -95,10 +97,12 @@
+         return -1;
+       }
+       f2 = (PyFrameObject*) x;
++#if PY_VERSION_HEX < 0x02050000
+       if (f2->f_stacksize != f->f_stacksize) {
+         PyErr_SetString(PyExc_TypeError, "stack size mismatch");
+         return -1;
+       }
++#endif
+ 
+       if (f2->f_stacktop != NULL)
+         while (f2->f_stacktop != f2->f_localsplus)
diff --git a/games/gnomesudoku/Makefile b/games/gnomesudoku/Makefile
index ce84de3e5d86..049316599fa8 100644
--- a/games/gnomesudoku/Makefile
+++ b/games/gnomesudoku/Makefile
@@ -32,6 +32,8 @@ USE_PYTHON=	2.4+
 USE_PYDISTUTILS=yes
 USE_GNOME=	gnomehack gnomeprefix pygnome2 pygnomedesktop
 
+PYDISTUTILS_PKGNAME=	gnome-sudoku
+
 .if !defined(DISPLAY)
 pre-configure:
 	@if [ -f ${WRKDIR}/.Xvfb.pid ]; then \
diff --git a/games/pydance/Makefile b/games/pydance/Makefile
index 321f4d070b25..6527a6f2862b 100644
--- a/games/pydance/Makefile
+++ b/games/pydance/Makefile
@@ -25,6 +25,7 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pygame/__init__.py:${PORTSDIR}/devel/py-game
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
+PYDISTUTILS_NOEGGINFO=	yes
 
 .if !defined(WITHOUT_PYDANCE_SONGS)
 PLIST_SUB=	SONGS=""
diff --git a/games/slune/Makefile b/games/slune/Makefile
index ee2ef5f1522e..fe871b4bd43b 100644
--- a/games/slune/Makefile
+++ b/games/slune/Makefile
@@ -30,6 +30,8 @@ USE_PYDISTUTILS=	yes
 USE_GL=		yes
 USE_SDL=	sdl mixer
 
+PYDISTUTILS_PKGNAME=	Slune
+
 post-patch:
 	@${REINPLACE_CMD} -i "" -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/setup.cfg